diff --git a/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTests.java b/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTests.java index 28f56dce..682aad9c 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTests.java @@ -31,7 +31,7 @@ public abstract class AbstractWebServiceMessageFactoryTests { } @Test - public void testCreateEmptyMessage() { + protected void testCreateEmptyMessage() { WebServiceMessage message = this.messageFactory.createWebServiceMessage(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTests.java b/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTests.java index a776656a..85598cdb 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTests.java @@ -87,7 +87,7 @@ public abstract class AbstractWebServiceMessageTests { } @Test - public void testDomPayload() throws Exception { + void testDomPayload() throws Exception { DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); @@ -105,7 +105,7 @@ public abstract class AbstractWebServiceMessageTests { } @Test - public void testEventReaderPayload() throws Exception { + void testEventReaderPayload() throws Exception { XMLInputFactory inputFactory = XMLInputFactoryUtils.newInstance(); XMLEventReader eventReader = inputFactory.createXMLEventReader(this.payload.getInputStream()); @@ -124,7 +124,7 @@ public abstract class AbstractWebServiceMessageTests { } @Test - public void testReaderPayload() throws Exception { + void testReaderPayload() throws Exception { Reader reader = new InputStreamReader(this.payload.getInputStream(), StandardCharsets.UTF_8); StreamSource streamSource = new StreamSource(reader, this.payload.getURL().toString()); @@ -137,7 +137,7 @@ public abstract class AbstractWebServiceMessageTests { } @Test - public void testSaxPayload() throws Exception { + void testSaxPayload() throws Exception { SAXSource saxSource = new SAXSource(SaxUtils.createInputSource(this.payload)); this.transformer.transform(saxSource, this.webServiceMessage.getPayloadResult()); @@ -150,7 +150,7 @@ public abstract class AbstractWebServiceMessageTests { } @Test - public void testStreamPayload() throws Exception { + void testStreamPayload() throws Exception { StreamSource streamSource = new StreamSource(this.payload.getInputStream(), this.payload.getURL().toString()); this.transformer.transform(streamSource, this.webServiceMessage.getPayloadResult()); @@ -168,7 +168,7 @@ public abstract class AbstractWebServiceMessageTests { } @Test - public void testStreamReaderPayload() throws Exception { + void testStreamReaderPayload() throws Exception { XMLInputFactory inputFactory = XMLInputFactoryUtils.newInstance(); XMLStreamReader streamReader = inputFactory.createXMLStreamReader(this.payload.getInputStream()); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTests.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTests.java index 921cfbca..2b73bed7 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTests.java @@ -84,7 +84,7 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTests { private Logger logger = LogManager.getLogger(); @BeforeAll - public static void startJetty() throws Exception { + static void startJetty() throws Exception { int port = FreePortScanner.getFreePort(); baseUrl = "http://localhost:" + port; @@ -116,7 +116,7 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTests { } @AfterAll - public static void stopJetty() throws Exception { + static void stopJetty() throws Exception { if (jettyServer.isRunning()) { jettyServer.stop(); @@ -124,16 +124,16 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTests { } @BeforeEach - public void createWebServiceTemplate() throws Exception { + void createWebServiceTemplate() throws Exception { this.template = new WebServiceTemplate(createMessageFactory()); this.template.setMessageSender(new HttpComponentsMessageSender()); } - public abstract SoapMessageFactory createMessageFactory() throws Exception; + protected abstract SoapMessageFactory createMessageFactory() throws Exception; @Test - public void sendSourceAndReceiveToResult() { + void sendSourceAndReceiveToResult() { this.logger.info(">>> Test case"); @@ -146,7 +146,7 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTests { } @Test - public void sendSourceAndReceiveToResultNoResponse() { + void sendSourceAndReceiveToResultNoResponse() { boolean b = this.template.sendSourceAndReceiveToResult(baseUrl + "/soap/noResponse", new StringSource(this.messagePayload), new StringResult()); @@ -155,7 +155,7 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTests { } @Test - public void marshalSendAndReceiveResponse() throws TransformerConfigurationException { + void marshalSendAndReceiveResponse() throws TransformerConfigurationException { final Transformer transformer = TransformerFactoryUtils.newInstance().newTransformer(); final Object requestObject = new Object(); @@ -209,7 +209,7 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTests { } @Test - public void marshalSendAndReceiveNoResponse() throws TransformerConfigurationException { + void marshalSendAndReceiveNoResponse() throws TransformerConfigurationException { final Transformer transformer = TransformerFactoryUtils.newInstance().newTransformer(); final Object requestObject = new Object(); @@ -245,7 +245,7 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTests { } @Test - public void notFound() { + void notFound() { assertThatExceptionOfType(WebServiceTransportException.class) .isThrownBy(() -> this.template.sendSourceAndReceiveToResult(baseUrl + "/errors/notfound", @@ -253,7 +253,7 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTests { } @Test - public void fault() { + void fault() { Result result = new StringResult(); @@ -262,7 +262,7 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTests { } @Test - public void faultNonCompliant() { + void faultNonCompliant() { Result result = new StringResult(); this.template.setCheckConnectionForFault(false); @@ -274,7 +274,7 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTests { } @Test - public void attachment() { + void attachment() { this.template.sendSourceAndReceiveToResult(baseUrl + "/soap/attachment", new StringSource(this.messagePayload), message -> { @@ -311,7 +311,7 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTests { private int sc = -1; - public void setSc(int sc) { + void setSc(int sc) { this.sc = sc; } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTests.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTests.java index 9327a23d..f671f6de 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTests.java @@ -123,7 +123,7 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTests { * basically reset the command map */ @BeforeEach - public void removeXmlDataContentHandler() throws SOAPException { + void removeXmlDataContentHandler() throws SOAPException { MessageFactory messageFactory = MessageFactory.newInstance(); SOAPMessage message = messageFactory.createMessage(); @@ -132,16 +132,16 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTests { } @BeforeEach - public void createWebServiceTemplate() throws Exception { + void createWebServiceTemplate() throws Exception { this.template = new WebServiceTemplate(createMessageFactory()); this.template.setMessageSender(new HttpComponentsMessageSender()); } - public abstract SoapMessageFactory createMessageFactory() throws Exception; + protected abstract SoapMessageFactory createMessageFactory() throws Exception; @Test - public void sendSourceAndReceiveToResult() { + void sendSourceAndReceiveToResult() { StringResult result = new StringResult(); boolean b = this.template.sendSourceAndReceiveToResult(baseUrl + "/soap/echo", @@ -152,7 +152,7 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTests { } @Test - public void sendSourceAndReceiveToResultNoResponse() { + void sendSourceAndReceiveToResultNoResponse() { boolean b = this.template.sendSourceAndReceiveToResult(baseUrl + "/soap/noResponse", new StringSource(this.messagePayload), new StringResult()); @@ -160,7 +160,7 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTests { } @Test - public void marshalSendAndReceiveResponse() throws TransformerConfigurationException { + void marshalSendAndReceiveResponse() throws TransformerConfigurationException { final Transformer transformer = TransformerFactoryUtils.newInstance().newTransformer(); final Object requestObject = new Object(); @@ -214,7 +214,7 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTests { } @Test - public void marshalSendAndReceiveNoResponse() throws TransformerConfigurationException { + void marshalSendAndReceiveNoResponse() throws TransformerConfigurationException { final Transformer transformer = TransformerFactoryUtils.newInstance().newTransformer(); final Object requestObject = new Object(); @@ -250,7 +250,7 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTests { } @Test - public void notFound() { + void notFound() { assertThatExceptionOfType(WebServiceTransportException.class) .isThrownBy(() -> this.template.sendSourceAndReceiveToResult(baseUrl + "/errors/notfound", @@ -258,7 +258,7 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTests { } @Test - public void receiverFault() { + void receiverFault() { Result result = new StringResult(); @@ -268,7 +268,7 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTests { } @Test - public void senderFault() { + void senderFault() { Result result = new StringResult(); @@ -278,7 +278,7 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTests { } @Test - public void attachment() { + void attachment() { this.template.sendSourceAndReceiveToResult(baseUrl + "/soap/attachment", new StringSource(this.messagePayload), message -> { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/DomPoxWebServiceTemplateIntegrationTests.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/DomPoxWebServiceTemplateIntegrationTests.java index 98489a4b..7c513260 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/DomPoxWebServiceTemplateIntegrationTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/core/DomPoxWebServiceTemplateIntegrationTests.java @@ -52,14 +52,14 @@ import org.springframework.xml.transform.TransformerFactoryUtils; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -public class DomPoxWebServiceTemplateIntegrationTests { +class DomPoxWebServiceTemplateIntegrationTests { private static Server jettyServer; private static String baseUrl; @BeforeAll - public static void startJetty() throws Exception { + static void startJetty() throws Exception { int port = FreePortScanner.getFreePort(); baseUrl = "http://localhost:" + port; @@ -84,7 +84,7 @@ public class DomPoxWebServiceTemplateIntegrationTests { } @AfterAll - public static void stopJetty() throws Exception { + static void stopJetty() throws Exception { if (jettyServer.isRunning()) { jettyServer.stop(); @@ -92,7 +92,7 @@ public class DomPoxWebServiceTemplateIntegrationTests { } @Test - public void domPox() { + void domPox() { WebServiceTemplate template = new WebServiceTemplate(new DomPoxMessageFactory()); template.setMessageSender(new HttpComponentsMessageSender()); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/SaajSoap11WebServiceTemplateIntegrationTests.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/SaajSoap11WebServiceTemplateIntegrationTests.java index 91c67fdd..299c9a3f 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/SaajSoap11WebServiceTemplateIntegrationTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/core/SaajSoap11WebServiceTemplateIntegrationTests.java @@ -25,10 +25,10 @@ import org.springframework.ws.soap.saaj.SaajSoapMessageFactory; /** * @author Arjen Poutsma */ -public class SaajSoap11WebServiceTemplateIntegrationTests extends AbstractSoap11WebServiceTemplateIntegrationTests { +class SaajSoap11WebServiceTemplateIntegrationTests extends AbstractSoap11WebServiceTemplateIntegrationTests { @Override - public SoapMessageFactory createMessageFactory() throws Exception { + protected SoapMessageFactory createMessageFactory() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); return new SaajSoapMessageFactory(messageFactory); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/SaajSoap12WebServiceTemplateIntegrationTests.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/SaajSoap12WebServiceTemplateIntegrationTests.java index 56ec3c25..a2233832 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/SaajSoap12WebServiceTemplateIntegrationTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/core/SaajSoap12WebServiceTemplateIntegrationTests.java @@ -25,10 +25,10 @@ import org.springframework.ws.soap.saaj.SaajSoapMessageFactory; /** * @author Arjen Poutsma */ -public class SaajSoap12WebServiceTemplateIntegrationTests extends AbstractSoap12WebServiceTemplateIntegrationTests { +class SaajSoap12WebServiceTemplateIntegrationTests extends AbstractSoap12WebServiceTemplateIntegrationTests { @Override - public SoapMessageFactory createMessageFactory() throws Exception { + protected SoapMessageFactory createMessageFactory() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); return new SaajSoapMessageFactory(messageFactory); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/SimpleFaultMessageResolverTests.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/SimpleFaultMessageResolverTests.java index 52745c91..c7756959 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/SimpleFaultMessageResolverTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/core/SimpleFaultMessageResolverTests.java @@ -28,17 +28,17 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class SimpleFaultMessageResolverTests { +class SimpleFaultMessageResolverTests { private SimpleFaultMessageResolver resolver; @BeforeEach - public void setUp() { + void setUp() { this.resolver = new SimpleFaultMessageResolver(); } @Test - public void testResolveFault() { + void testResolveFault() { FaultAwareWebServiceMessage messageMock = createMock(FaultAwareWebServiceMessage.class); String message = "message"; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTests.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTests.java index c4c53239..38bb9fcc 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTests.java @@ -50,7 +50,7 @@ import static org.mockito.Mockito.reset; import static org.mockito.Mockito.when; @SuppressWarnings("unchecked") -public class WebServiceTemplateTests { +class WebServiceTemplateTests { private WebServiceTemplate template; @@ -59,7 +59,7 @@ public class WebServiceTemplateTests { private MockWebServiceMessageFactory messageFactory; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.messageFactory = new MockWebServiceMessageFactory(); this.template = new WebServiceTemplate(this.messageFactory); @@ -85,7 +85,7 @@ public class WebServiceTemplateTests { } @Test - public void testMarshalAndSendNoMarshallerSet() throws Exception { + void testMarshalAndSendNoMarshallerSet() throws Exception { this.connectionMock.close(); @@ -95,7 +95,7 @@ public class WebServiceTemplateTests { } @Test - public void testMarshalAndSendNoUnmarshallerSet() throws Exception { + void testMarshalAndSendNoUnmarshallerSet() throws Exception { this.connectionMock.close(); @@ -104,7 +104,7 @@ public class WebServiceTemplateTests { } @Test - public void testSendAndReceiveMessageResponse() throws Exception { + void testSendAndReceiveMessageResponse() throws Exception { WebServiceMessageCallback requestCallback = mock(WebServiceMessageCallback.class); requestCallback.doWithMessage(isA(WebServiceMessage.class)); @@ -125,7 +125,7 @@ public class WebServiceTemplateTests { } @Test - public void testSendAndReceiveMessageNoResponse() throws Exception { + void testSendAndReceiveMessageNoResponse() throws Exception { WebServiceMessageExtractor extractorMock = mockWebServiceMessageExtractor(); @@ -140,7 +140,7 @@ public class WebServiceTemplateTests { } @Test - public void testSendAndReceiveMessageFault() throws Exception { + void testSendAndReceiveMessageFault() throws Exception { WebServiceMessageExtractor extractorMock = mockWebServiceMessageExtractor(); @@ -163,7 +163,7 @@ public class WebServiceTemplateTests { } @Test - public void testSendAndReceiveConnectionError() throws Exception { + void testSendAndReceiveConnectionError() throws Exception { WebServiceMessageExtractor extractorMock = mockWebServiceMessageExtractor(); @@ -182,7 +182,7 @@ public class WebServiceTemplateTests { } @Test - public void testSendAndReceiveSourceResponse() throws Exception { + void testSendAndReceiveSourceResponse() throws Exception { SourceExtractor extractorMock = mockSourceExtractor(); Object extracted = new Object(); @@ -200,7 +200,7 @@ public class WebServiceTemplateTests { } @Test - public void testSendAndReceiveSourceNoResponse() throws Exception { + void testSendAndReceiveSourceNoResponse() throws Exception { SourceExtractor extractorMock = mockSourceExtractor(); @@ -215,7 +215,7 @@ public class WebServiceTemplateTests { } @Test - public void testSendAndReceiveResultResponse() throws Exception { + void testSendAndReceiveResultResponse() throws Exception { this.connectionMock.send(isA(WebServiceMessage.class)); when(this.connectionMock.hasError()).thenReturn(false); @@ -230,7 +230,7 @@ public class WebServiceTemplateTests { } @Test - public void testSendAndReceiveResultNoResponse() throws Exception { + void testSendAndReceiveResultNoResponse() throws Exception { this.connectionMock.send(isA(WebServiceMessage.class)); when(this.connectionMock.hasError()).thenReturn(false); @@ -244,7 +244,7 @@ public class WebServiceTemplateTests { } @Test - public void testSendAndReceiveResultNoResponsePayload() throws Exception { + void testSendAndReceiveResultNoResponsePayload() throws Exception { this.connectionMock.send(isA(WebServiceMessage.class)); when(this.connectionMock.hasError()).thenReturn(false); @@ -261,7 +261,7 @@ public class WebServiceTemplateTests { } @Test - public void testSendAndReceiveMarshalResponse() throws Exception { + void testSendAndReceiveMarshalResponse() throws Exception { Marshaller marshallerMock = mock(Marshaller.class); this.template.setMarshaller(marshallerMock); @@ -284,7 +284,7 @@ public class WebServiceTemplateTests { } @Test - public void testSendAndReceiveMarshalNoResponse() throws Exception { + void testSendAndReceiveMarshalNoResponse() throws Exception { Marshaller marshallerMock = mock(Marshaller.class); this.template.setMarshaller(marshallerMock); @@ -301,7 +301,7 @@ public class WebServiceTemplateTests { } @Test - public void testSendAndReceiveCustomUri() throws Exception { + void testSendAndReceiveCustomUri() throws Exception { final URI customUri = new URI("http://www.springframework.org/spring-ws/custom"); this.template.setMessageSender(new WebServiceMessageSender() { @@ -337,7 +337,7 @@ public class WebServiceTemplateTests { } @Test - public void testInterceptors() throws Exception { + void testInterceptors() throws Exception { ClientInterceptor interceptorMock1 = mock(ClientInterceptor.class); ClientInterceptor interceptorMock2 = mock(ClientInterceptor.class); @@ -368,7 +368,7 @@ public class WebServiceTemplateTests { } @Test - public void testInterceptorsInterceptedNoResponse() throws Exception { + void testInterceptorsInterceptedNoResponse() throws Exception { MessageContext messageContext = new DefaultMessageContext(this.messageFactory); @@ -390,7 +390,7 @@ public class WebServiceTemplateTests { } @Test - public void testInterceptorsInterceptedCreateResponse() throws Exception { + void testInterceptorsInterceptedCreateResponse() throws Exception { MessageContext messageContext = new DefaultMessageContext(this.messageFactory); // force creation of response @@ -419,7 +419,7 @@ public class WebServiceTemplateTests { } @Test - public void testDestinationResolver() throws Exception { + void testDestinationResolver() throws Exception { DestinationProvider providerMock = mock(DestinationProvider.class); this.template.setDestinationProvider(providerMock); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProviderTests.java b/spring-ws-core/src/test/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProviderTests.java index 5d505757..f015870e 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProviderTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProviderTests.java @@ -27,17 +27,17 @@ import org.springframework.core.io.Resource; import static org.assertj.core.api.Assertions.assertThat; -public class Wsdl11DestinationProviderTests { +class Wsdl11DestinationProviderTests { private Wsdl11DestinationProvider provider; @BeforeEach - public void setUp() { + void setUp() { this.provider = new Wsdl11DestinationProvider(); } @Test - public void testSimple() throws URISyntaxException { + void testSimple() throws URISyntaxException { Resource wsdl = new ClassPathResource("simple.wsdl", getClass()); this.provider.setWsdl(wsdl); @@ -48,7 +48,7 @@ public class Wsdl11DestinationProviderTests { } @Test - public void testComplex() throws URISyntaxException { + void testComplex() throws URISyntaxException { Resource wsdl = new ClassPathResource("complex.wsdl", getClass()); this.provider.setWsdl(wsdl); @@ -58,7 +58,7 @@ public class Wsdl11DestinationProviderTests { } @Test - public void testCustomExpression() throws URISyntaxException { + void testCustomExpression() throws URISyntaxException { this.provider.setLocationExpression("/wsdl:definitions/wsdl:service/wsdl:port/soap12:address/@location"); Resource wsdl = new ClassPathResource("complex.wsdl", getClass()); this.provider.setWsdl(wsdl); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapterTests.java b/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapterTests.java index 34b0df87..a3c208e4 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapterTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapterTests.java @@ -29,10 +29,10 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Greg Turnquist */ -public class ClientInterceptorAdapterTests { +class ClientInterceptorAdapterTests { @Test - public void handleEmptyInterceptor() { + void handleEmptyInterceptor() { ClientInterceptor interceptor = new ClientInterceptorAdapter() { }; @@ -45,7 +45,7 @@ public class ClientInterceptorAdapterTests { } @Test - public void handleTestAdapter() { + void handleTestAdapter() { TestClientInterceptorAdapter interceptor = new TestClientInterceptorAdapter(new ArrayList<>()); assertThat(interceptor.handleRequest(null)).isFalse(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptorTests.java b/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptorTests.java index b25183a0..1df54dd8 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptorTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptorTests.java @@ -45,7 +45,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -public class PayloadValidatingInterceptorTests { +class PayloadValidatingInterceptorTests { private PayloadValidatingInterceptor interceptor; @@ -70,7 +70,7 @@ public class PayloadValidatingInterceptorTests { private static final String SCHEMA2 = "schema2.xsd"; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.interceptor = new PayloadValidatingInterceptor(); this.interceptor.setSchema(new ClassPathResource(SCHEMA, getClass())); @@ -84,7 +84,7 @@ public class PayloadValidatingInterceptorTests { } @Test - public void testHandleInvalidRequest() throws Exception { + void testHandleInvalidRequest() throws Exception { SoapMessage invalidMessage = this.soap11Factory.createWebServiceMessage(); InputStream inputStream = getClass().getResourceAsStream(INVALID_MESSAGE); @@ -97,7 +97,7 @@ public class PayloadValidatingInterceptorTests { } @Test - public void testHandlerInvalidRequest() throws Exception { + void testHandlerInvalidRequest() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(); request.setPayload(new ClassPathResource(INVALID_MESSAGE, getClass())); @@ -109,7 +109,7 @@ public class PayloadValidatingInterceptorTests { } @Test - public void testHandleValidRequest() throws Exception { + void testHandleValidRequest() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(); request.setPayload(new ClassPathResource(VALID_MESSAGE, getClass())); @@ -121,7 +121,7 @@ public class PayloadValidatingInterceptorTests { } @Test - public void testHandleInvalidResponse() throws Exception { + void testHandleInvalidResponse() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(); this.context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); @@ -134,7 +134,7 @@ public class PayloadValidatingInterceptorTests { } @Test - public void testHandleValidResponse() throws Exception { + void testHandleValidResponse() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(); this.context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); @@ -146,7 +146,7 @@ public class PayloadValidatingInterceptorTests { } @Test - public void testNamespacesInType() throws Exception { + void testNamespacesInType() throws Exception { // Make sure we use Xerces for this testcase: the JAXP implementation used // internally by JDK 1.5 has a bug @@ -179,7 +179,7 @@ public class PayloadValidatingInterceptorTests { } @Test - public void testNonExistingSchema() { + void testNonExistingSchema() { assertThatIllegalArgumentException().isThrownBy(() -> { @@ -189,7 +189,7 @@ public class PayloadValidatingInterceptorTests { } @Test - public void testHandlerInvalidRequestMultipleSchemas() throws Exception { + void testHandlerInvalidRequestMultipleSchemas() throws Exception { this.interceptor.setSchemas(new ClassPathResource(PRODUCT_SCHEMA, getClass()), new ClassPathResource(SIZE_SCHEMA, getClass())); @@ -203,7 +203,7 @@ public class PayloadValidatingInterceptorTests { } @Test - public void testHandleValidRequestMultipleSchemas() throws Exception { + void testHandleValidRequestMultipleSchemas() throws Exception { this.interceptor.setSchemas(new ClassPathResource(PRODUCT_SCHEMA, getClass()), new ClassPathResource(SIZE_SCHEMA, getClass())); @@ -218,7 +218,7 @@ public class PayloadValidatingInterceptorTests { } @Test - public void testHandleInvalidResponseMultipleSchemas() throws Exception { + void testHandleInvalidResponseMultipleSchemas() throws Exception { this.interceptor.setSchemas(new ClassPathResource(PRODUCT_SCHEMA, getClass()), new ClassPathResource(SIZE_SCHEMA, getClass())); @@ -233,7 +233,7 @@ public class PayloadValidatingInterceptorTests { } @Test - public void testHandleValidResponseMultipleSchemas() throws Exception { + void testHandleValidResponseMultipleSchemas() throws Exception { this.interceptor.setSchemas(new ClassPathResource(PRODUCT_SCHEMA, getClass()), new ClassPathResource(SIZE_SCHEMA, getClass())); @@ -248,7 +248,7 @@ public class PayloadValidatingInterceptorTests { } @Test - public void testXsdSchema() throws Exception { + void testXsdSchema() throws Exception { PayloadValidatingInterceptor interceptor = new PayloadValidatingInterceptor(); SimpleXsdSchema schema = new SimpleXsdSchema(new ClassPathResource(SCHEMA, getClass())); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParserTests.java b/spring-ws-core/src/test/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParserTests.java index b5ed9056..2db92449 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParserTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParserTests.java @@ -53,18 +53,18 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Arjen Poutsma */ -public class AnnotationDrivenBeanDefinitionParserTests { +class AnnotationDrivenBeanDefinitionParserTests { private ApplicationContext applicationContext; @BeforeEach - public void setUp() { + void setUp() { this.applicationContext = new ClassPathXmlApplicationContext("annotationDrivenBeanDefinitionParserTest.xml", getClass()); } @Test - public void endpointMappings() { + void endpointMappings() { Map result = this.applicationContext.getBeansOfType(EndpointMapping.class); @@ -75,7 +75,7 @@ public class AnnotationDrivenBeanDefinitionParserTests { } @Test - public void endpointAdapters() { + void endpointAdapters() { Map result = this.applicationContext.getBeansOfType(EndpointAdapter.class); @@ -104,7 +104,7 @@ public class AnnotationDrivenBeanDefinitionParserTests { } @Test - public void endpointExceptionResolver() { + void endpointExceptionResolver() { Map result = this.applicationContext .getBeansOfType(EndpointExceptionResolver.class); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/InterceptorsBeanDefinitionParserTests.java b/spring-ws-core/src/test/java/org/springframework/ws/config/InterceptorsBeanDefinitionParserTests.java index b48613cd..1a1a386a 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/config/InterceptorsBeanDefinitionParserTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/config/InterceptorsBeanDefinitionParserTests.java @@ -30,10 +30,10 @@ import org.springframework.ws.soap.server.endpoint.interceptor.SoapActionSmartEn import static org.assertj.core.api.Assertions.assertThat; -public class InterceptorsBeanDefinitionParserTests { +class InterceptorsBeanDefinitionParserTests { @Test - public void namespace() { + void namespace() { ApplicationContext applicationContext = new ClassPathXmlApplicationContext( "interceptorsBeanDefinitionParserTest.xml", getClass()); @@ -51,7 +51,7 @@ public class InterceptorsBeanDefinitionParserTests { } @Test - public void ordering() { + void ordering() { ApplicationContext applicationContext = new ClassPathXmlApplicationContext( "interceptorsBeanDefinitionParserOrderTest.xml", getClass()); @@ -71,7 +71,7 @@ public class InterceptorsBeanDefinitionParserTests { } @Test - public void injection() { + void injection() { ApplicationContext applicationContext = new ClassPathXmlApplicationContext( "interceptorsBeanDefinitionParserInjectionTest.xml", getClass()); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTests.java b/spring-ws-core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTests.java index 632b1fcc..f3de99a5 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTests.java @@ -28,17 +28,17 @@ import org.springframework.ws.server.endpoint.adapter.MarshallingMethodEndpointA import static org.assertj.core.api.Assertions.assertThat; @Deprecated -public class WebServiceNamespaceHandlerTests { +class WebServiceNamespaceHandlerTests { private ApplicationContext applicationContext; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.applicationContext = new ClassPathXmlApplicationContext("webServiceNamespaceHandlerTest.xml", getClass()); } @Test - public void testMarshallingMethods() throws Exception { + void testMarshallingMethods() throws Exception { Map result = this.applicationContext .getBeansOfType(MarshallingMethodEndpointAdapter.class); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTests.java b/spring-ws-core/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTests.java index fc68f31f..af143445 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTests.java @@ -29,18 +29,18 @@ import org.springframework.ws.server.endpoint.adapter.XPathParamAnnotationMethod import static org.assertj.core.api.Assertions.assertThat; @Deprecated -public class WebServicesNamespaceHandlerTigerTests { +class WebServicesNamespaceHandlerTigerTests { private ApplicationContext applicationContext; @BeforeEach - public void setUp() { + void setUp() { this.applicationContext = new ClassPathXmlApplicationContext("webServicesNamespaceHandlerTest-tiger.xml", getClass()); } @Test - public void testMarshallingEndpoints() { + void testMarshallingEndpoints() { Map result = this.applicationContext .getBeansOfType(GenericMarshallingMethodEndpointAdapter.class); @@ -49,7 +49,7 @@ public class WebServicesNamespaceHandlerTigerTests { } @Test - public void testXpathEndpoints() { + void testXpathEndpoints() { Map result = this.applicationContext .getBeansOfType(XPathParamAnnotationMethodEndpointAdapter.class); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/WsdlBeanDefinitionParserTests.java b/spring-ws-core/src/test/java/org/springframework/ws/config/WsdlBeanDefinitionParserTests.java index 90ed115b..cb91bdff 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/config/WsdlBeanDefinitionParserTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/config/WsdlBeanDefinitionParserTests.java @@ -32,17 +32,17 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Arjen Poutsma */ -public class WsdlBeanDefinitionParserTests { +class WsdlBeanDefinitionParserTests { private ApplicationContext applicationContext; @BeforeEach - public void setUp() { + void setUp() { this.applicationContext = new ClassPathXmlApplicationContext("wsdlBeanDefinitionParserTest.xml", getClass()); } @Test - public void staticWsdl() { + void staticWsdl() { Map result = this.applicationContext .getBeansOfType(SimpleWsdl11Definition.class); @@ -55,7 +55,7 @@ public class WsdlBeanDefinitionParserTests { } @Test - public void dynamicWsdl() { + void dynamicWsdl() { Map result = this.applicationContext.getBeansOfType(DefaultWsdl11Definition.class); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/DefaultWsConfigurationTests.java b/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/DefaultWsConfigurationTests.java index 1efafda8..2a545cd3 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/DefaultWsConfigurationTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/DefaultWsConfigurationTests.java @@ -35,12 +35,12 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Arjen Poutsma */ -public class DefaultWsConfigurationTests { +class DefaultWsConfigurationTests { private ApplicationContext applicationContext; @BeforeEach - public void setUp() { + void setUp() { AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(); applicationContext.register(TestConfig.class); @@ -50,7 +50,7 @@ public class DefaultWsConfigurationTests { } @Test - public void payloadRootAnnotationMethodEndpointMapping() { + void payloadRootAnnotationMethodEndpointMapping() { PayloadRootAnnotationMethodEndpointMapping endpointMapping = this.applicationContext .getBean(PayloadRootAnnotationMethodEndpointMapping.class); @@ -59,7 +59,7 @@ public class DefaultWsConfigurationTests { } @Test - public void soapActionAnnotationMethodEndpointMapping() { + void soapActionAnnotationMethodEndpointMapping() { SoapActionAnnotationMethodEndpointMapping endpointMapping = this.applicationContext .getBean(SoapActionAnnotationMethodEndpointMapping.class); @@ -68,7 +68,7 @@ public class DefaultWsConfigurationTests { } @Test - public void annotationActionEndpointMapping() { + void annotationActionEndpointMapping() { AnnotationActionEndpointMapping endpointMapping = this.applicationContext .getBean(AnnotationActionEndpointMapping.class); @@ -77,7 +77,7 @@ public class DefaultWsConfigurationTests { } @Test - public void defaultMethodEndpointAdapter() { + void defaultMethodEndpointAdapter() { DefaultMethodEndpointAdapter adapter = this.applicationContext.getBean(DefaultMethodEndpointAdapter.class); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurationSupportTests.java b/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurationSupportTests.java index c635f714..f3902b86 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurationSupportTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurationSupportTests.java @@ -35,12 +35,12 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Arjen Poutsma */ -public class WsConfigurationSupportTests { +class WsConfigurationSupportTests { private ApplicationContext applicationContext; @BeforeEach - public void setUp() { + void setUp() { AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(); applicationContext.register(TestConfig.class); @@ -50,7 +50,7 @@ public class WsConfigurationSupportTests { } @Test - public void interceptors() { + void interceptors() { PayloadRootAnnotationMethodEndpointMapping endpointMapping = this.applicationContext .getBean(PayloadRootAnnotationMethodEndpointMapping.class); @@ -64,7 +64,7 @@ public class WsConfigurationSupportTests { } @Test - public void defaultMethodEndpointAdapter() { + void defaultMethodEndpointAdapter() { DefaultMethodEndpointAdapter endpointAdapter = this.applicationContext .getBean(DefaultMethodEndpointAdapter.class); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurerAdapterTests.java b/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurerAdapterTests.java index b2fded62..6b75c84b 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurerAdapterTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurerAdapterTests.java @@ -38,12 +38,12 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Arjen Poutsma */ -public class WsConfigurerAdapterTests { +class WsConfigurerAdapterTests { private ApplicationContext applicationContext; @BeforeEach - public void setUp() { + void setUp() { AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(); applicationContext.register(TestConfig.class); @@ -53,7 +53,7 @@ public class WsConfigurerAdapterTests { } @Test - public void interceptors() { + void interceptors() { PayloadRootAnnotationMethodEndpointMapping endpointMapping = this.applicationContext .getBean(PayloadRootAnnotationMethodEndpointMapping.class); @@ -67,7 +67,7 @@ public class WsConfigurerAdapterTests { } @Test - public void argumentResolvers() { + void argumentResolvers() { DefaultMethodEndpointAdapter endpointAdapter = this.applicationContext .getBean(DefaultMethodEndpointAdapter.class); @@ -83,7 +83,7 @@ public class WsConfigurerAdapterTests { } @Test - public void returnValueHandlers() { + void returnValueHandlers() { DefaultMethodEndpointAdapter endpointAdapter = this.applicationContext .getBean(DefaultMethodEndpointAdapter.class); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/context/DefaultMessageContextTests.java b/spring-ws-core/src/test/java/org/springframework/ws/context/DefaultMessageContextTests.java index ffe911c6..abb1b017 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/context/DefaultMessageContextTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/context/DefaultMessageContextTests.java @@ -29,7 +29,7 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class DefaultMessageContextTests { +class DefaultMessageContextTests { private DefaultMessageContext context; @@ -38,7 +38,7 @@ public class DefaultMessageContextTests { private WebServiceMessage request; @BeforeEach - public void setUp() { + void setUp() { this.factoryMock = createMock(WebServiceMessageFactory.class); this.request = new MockWebServiceMessage(); @@ -46,12 +46,12 @@ public class DefaultMessageContextTests { } @Test - public void testRequest() { + void testRequest() { assertThat(this.context.getRequest()).isEqualTo(this.request); } @Test - public void testResponse() { + void testResponse() { WebServiceMessage response = new MockWebServiceMessage(); expect(this.factoryMock.createWebServiceMessage()).andReturn(response); @@ -65,7 +65,7 @@ public class DefaultMessageContextTests { } @Test - public void testProperties() { + void testProperties() { assertThat(this.context.getPropertyNames()).hasSize(0); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTests.java b/spring-ws-core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTests.java index 0fcdd959..fbf70b5c 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTests.java @@ -52,7 +52,7 @@ public abstract class AbstractMimeMessageTests extends AbstractWebServiceMessage protected abstract MimeMessage createMimeMessage() throws Exception; @Test - public void testEmptyMessage() { + void testEmptyMessage() { Iterator iterator = this.mimeMessage.getAttachments(); @@ -60,14 +60,14 @@ public abstract class AbstractMimeMessageTests extends AbstractWebServiceMessage } @Test - public void testAddAttachment() throws Exception { + void testAddAttachment() throws Exception { Attachment attachment = this.mimeMessage.addAttachment(this.contentId, this.picture, this.contentType); testAttachment(attachment); } @Test - public void testGetAttachment() throws Exception { + void testGetAttachment() throws Exception { this.mimeMessage.addAttachment(this.contentId, this.picture, this.contentType); Attachment attachment = this.mimeMessage.getAttachment(this.contentId); @@ -78,7 +78,7 @@ public abstract class AbstractMimeMessageTests extends AbstractWebServiceMessage } @Test - public void testGetAttachments() throws Exception { + void testGetAttachments() throws Exception { this.mimeMessage.addAttachment(this.contentId, this.picture, this.contentType); Iterator iterator = this.mimeMessage.getAttachments(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageFactoryTests.java b/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageFactoryTests.java index 3cd4e7b1..f47a2bb8 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageFactoryTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageFactoryTests.java @@ -19,7 +19,7 @@ package org.springframework.ws.pox.dom; import org.springframework.ws.AbstractWebServiceMessageFactoryTests; import org.springframework.ws.WebServiceMessageFactory; -public class DomPoxMessageFactoryTests extends AbstractWebServiceMessageFactoryTests { +class DomPoxMessageFactoryTests extends AbstractWebServiceMessageFactoryTests { @Override protected WebServiceMessageFactory createMessageFactory() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageTests.java b/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageTests.java index 8ac6db2b..e42d9a02 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageTests.java @@ -35,14 +35,14 @@ import org.springframework.xml.transform.TransformerFactoryUtils; import static org.xmlunit.assertj.XmlAssert.assertThat; -public class DomPoxMessageTests { +class DomPoxMessageTests { private DomPoxMessage message; private Transformer transformer; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); @@ -53,7 +53,7 @@ public class DomPoxMessageTests { } @Test - public void testGetPayload() throws Exception { + void testGetPayload() throws Exception { String content = "" + ""; StringSource source = new StringSource(content); @@ -65,7 +65,7 @@ public class DomPoxMessageTests { } @Test - public void testGetPayloadResultTwice() throws Exception { + void testGetPayloadResultTwice() throws Exception { String content = ""; this.transformer.transform(new StringSource(content), this.message.getPayloadResult()); @@ -77,7 +77,7 @@ public class DomPoxMessageTests { } @Test - public void testWriteTo() throws Exception { + void testWriteTo() throws Exception { String content = "" + ""; StringSource source = new StringSource(content); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/MessageDispatcherTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/MessageDispatcherTests.java index 29718e02..aab6a144 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/MessageDispatcherTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/MessageDispatcherTests.java @@ -41,7 +41,7 @@ import static org.easymock.EasyMock.expectLastCall; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class MessageDispatcherTests { +class MessageDispatcherTests { private MessageDispatcher dispatcher; @@ -50,7 +50,7 @@ public class MessageDispatcherTests { private WebServiceMessageFactory factoryMock; @BeforeEach - public void setUp() { + void setUp() { this.dispatcher = new MessageDispatcher(); this.factoryMock = createMock(WebServiceMessageFactory.class); @@ -58,7 +58,7 @@ public class MessageDispatcherTests { } @Test - public void testGetEndpoint() throws Exception { + void testGetEndpoint() throws Exception { EndpointMapping mappingMock = createMock(EndpointMapping.class); this.dispatcher.setEndpointMappings(Collections.singletonList(mappingMock)); @@ -77,7 +77,7 @@ public class MessageDispatcherTests { } @Test - public void testGetEndpointAdapterSupportedEndpoint() { + void testGetEndpointAdapterSupportedEndpoint() { EndpointAdapter adapterMock = createMock(EndpointAdapter.class); this.dispatcher.setEndpointAdapters(Collections.singletonList(adapterMock)); @@ -95,7 +95,7 @@ public class MessageDispatcherTests { } @Test - public void testGetEndpointAdapterUnsupportedEndpoint() { + void testGetEndpointAdapterUnsupportedEndpoint() { EndpointAdapter adapterMock = createMock(EndpointAdapter.class); this.dispatcher.setEndpointAdapters(Collections.singletonList(adapterMock)); @@ -111,7 +111,7 @@ public class MessageDispatcherTests { } @Test - public void testResolveException() throws Exception { + void testResolveException() throws Exception { final Exception ex = new Exception(); @@ -144,7 +144,7 @@ public class MessageDispatcherTests { } @Test - public void testProcessUnsupportedEndpointException() { + void testProcessUnsupportedEndpointException() { EndpointExceptionResolver resolverMock = createMock(EndpointExceptionResolver.class); this.dispatcher.setEndpointExceptionResolvers(Collections.singletonList(resolverMock)); @@ -167,7 +167,7 @@ public class MessageDispatcherTests { } @Test - public void testNormalFlow() throws Exception { + void testNormalFlow() throws Exception { EndpointAdapter adapterMock = createMock(EndpointAdapter.class); this.dispatcher.setEndpointAdapters(Collections.singletonList(adapterMock)); @@ -208,7 +208,7 @@ public class MessageDispatcherTests { } @Test - public void testFlowNoResponse() throws Exception { + void testFlowNoResponse() throws Exception { EndpointAdapter adapterMock = createMock(EndpointAdapter.class); this.dispatcher.setEndpointAdapters(Collections.singletonList(adapterMock)); @@ -241,7 +241,7 @@ public class MessageDispatcherTests { } @Test - public void testInterceptedRequestFlow() throws Exception { + void testInterceptedRequestFlow() throws Exception { EndpointAdapter adapterMock = createMock(EndpointAdapter.class); this.dispatcher.setEndpointAdapters(Collections.singletonList(adapterMock)); @@ -275,7 +275,7 @@ public class MessageDispatcherTests { } @Test - public void testInterceptedResponseFlow() throws Exception { + void testInterceptedResponseFlow() throws Exception { EndpointAdapter adapterMock = createMock(EndpointAdapter.class); this.dispatcher.setEndpointAdapters(Collections.singletonList(adapterMock)); @@ -310,7 +310,7 @@ public class MessageDispatcherTests { } @Test - public void testResolveExceptionsWithInterceptors() throws Exception { + void testResolveExceptionsWithInterceptors() throws Exception { EndpointAdapter adapterMock = createMock(EndpointAdapter.class); this.dispatcher.setEndpointAdapters(Collections.singletonList(adapterMock)); @@ -359,7 +359,7 @@ public class MessageDispatcherTests { } @Test - public void testFaultFlow() throws Exception { + void testFaultFlow() throws Exception { EndpointAdapter adapterMock = createMock(EndpointAdapter.class); this.dispatcher.setEndpointAdapters(Collections.singletonList(adapterMock)); @@ -395,7 +395,7 @@ public class MessageDispatcherTests { } @Test - public void testNoEndpointFound() { + void testNoEndpointFound() { this.dispatcher.setEndpointMappings(Collections.emptyList()); @@ -404,7 +404,7 @@ public class MessageDispatcherTests { } @Test - public void testDetectStrategies() { + void testDetectStrategies() { StaticApplicationContext applicationContext = new StaticApplicationContext(); @@ -426,7 +426,7 @@ public class MessageDispatcherTests { } @Test - public void testDefaultStrategies() { + void testDefaultStrategies() { StaticApplicationContext applicationContext = new StaticApplicationContext(); this.dispatcher.setApplicationContext(applicationContext); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractEndpointTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractEndpointTests.java index d2a685ee..ee320341 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractEndpointTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractEndpointTests.java @@ -56,7 +56,7 @@ public abstract class AbstractEndpointTests { protected static final String RESPONSE = "<" + RESPONSE_ELEMENT + " xmlns=\"" + NAMESPACE_URI + "\"/>"; @Test - public void testDomSource() throws Exception { + void testDomSource() throws Exception { DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); @@ -66,14 +66,14 @@ public abstract class AbstractEndpointTests { } @Test - public void testSaxSource() throws Exception { + void testSaxSource() throws Exception { XMLReader reader = SaxUtils.namespaceAwareXmlReader(); InputSource inputSource = new InputSource(new StringReader(REQUEST)); testSource(new SAXSource(reader, inputSource)); } @Test - public void testStaxSourceEventReader() throws Exception { + void testStaxSourceEventReader() throws Exception { XMLInputFactory inputFactory = XMLInputFactoryUtils.newInstance(); XMLEventReader eventReader = inputFactory.createXMLEventReader(new StringReader(REQUEST)); @@ -81,7 +81,7 @@ public abstract class AbstractEndpointTests { } @Test - public void testStaxSourceStreamReader() throws Exception { + void testStaxSourceStreamReader() throws Exception { XMLInputFactory inputFactory = XMLInputFactoryUtils.newInstance(); XMLStreamReader streamReader = inputFactory.createXMLStreamReader(new StringReader(REQUEST)); @@ -89,14 +89,14 @@ public abstract class AbstractEndpointTests { } @Test - public void testStreamSourceInputStream() throws Exception { + void testStreamSourceInputStream() throws Exception { InputStream is = new ByteArrayInputStream(REQUEST.getBytes(StandardCharsets.UTF_8)); testSource(new StreamSource(is)); } @Test - public void testStreamSourceReader() throws Exception { + void testStreamSourceReader() throws Exception { Reader reader = new StringReader(REQUEST); testSource(new StreamSource(reader)); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTests.java index d9f1a155..cb06be2d 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTests.java @@ -35,12 +35,12 @@ public abstract class AbstractMessageEndpointTests extends AbstractEndpointTests private MessageEndpoint endpoint; @BeforeEach - public void createEndpoint() throws Exception { + void createEndpoint() { this.endpoint = createResponseEndpoint(); } @Test - public void testNoResponse() throws Exception { + void testNoResponse() throws Exception { this.endpoint = createNoResponseEndpoint(); StringSource requestSource = new StringSource(REQUEST); @@ -53,7 +53,7 @@ public abstract class AbstractMessageEndpointTests extends AbstractEndpointTests } @Test - public void testNoRequestPayload() throws Exception { + void testNoRequestPayload() throws Exception { this.endpoint = createNoRequestPayloadEndpoint(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTests.java index c639317c..ec0101e5 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTests.java @@ -36,14 +36,14 @@ public abstract class AbstractPayloadEndpointTests extends AbstractEndpointTests private Transformer transformer; @BeforeEach - public void createEndpoint() throws Exception { + void createEndpoint() throws Exception { this.endpoint = createResponseEndpoint(); this.transformer = TransformerFactoryUtils.newInstance().newTransformer(); } @Test - public void testNoResponse() throws Exception { + void testNoResponse() throws Exception { this.endpoint = createNoResponseEndpoint(); StringSource requestSource = new StringSource(REQUEST); @@ -53,7 +53,7 @@ public abstract class AbstractPayloadEndpointTests extends AbstractEndpointTests } @Test - public void testNoRequest() throws Exception { + void testNoRequest() throws Exception { this.endpoint = createNoRequestEndpoint(); Source resultSource = this.endpoint.invoke(null); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/Dom4jPayloadEndpointTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/Dom4jPayloadEndpointTests.java index b03e29b4..aae4992a 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/Dom4jPayloadEndpointTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/Dom4jPayloadEndpointTests.java @@ -22,7 +22,7 @@ import org.dom4j.Element; import static org.assertj.core.api.Assertions.assertThat; @Deprecated -public class Dom4jPayloadEndpointTests extends AbstractPayloadEndpointTests { +class Dom4jPayloadEndpointTests extends AbstractPayloadEndpointTests { @Override protected PayloadEndpoint createResponseEndpoint() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/DomPayloadEndpointTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/DomPayloadEndpointTests.java index d5c34c25..84c3e9a1 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/DomPayloadEndpointTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/DomPayloadEndpointTests.java @@ -22,7 +22,7 @@ import org.w3c.dom.Element; import static org.assertj.core.api.Assertions.assertThat; @Deprecated -public class DomPayloadEndpointTests extends AbstractPayloadEndpointTests { +class DomPayloadEndpointTests extends AbstractPayloadEndpointTests { @Override protected PayloadEndpoint createNoResponseEndpoint() throws Exception { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/EndpointExceptionResolverTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/EndpointExceptionResolverTests.java index 6e133425..967cbb4c 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/EndpointExceptionResolverTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/EndpointExceptionResolverTests.java @@ -31,14 +31,14 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Tareq Abed Rabbo * @author Arjen Poutsma */ -public class EndpointExceptionResolverTests { +class EndpointExceptionResolverTests { private MethodEndpoint methodEndpoint; private AbstractEndpointExceptionResolver exceptionResolver; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.exceptionResolver = new AbstractEndpointExceptionResolver() { @@ -53,7 +53,7 @@ public class EndpointExceptionResolverTests { } @Test - public void testMatchMethodEndpoint() { + void testMatchMethodEndpoint() { boolean matched = this.exceptionResolver.resolveException(null, this.methodEndpoint, null); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/JDomPayloadEndpointTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/JDomPayloadEndpointTests.java index 7d88b71a..ff51c301 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/JDomPayloadEndpointTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/JDomPayloadEndpointTests.java @@ -22,7 +22,7 @@ import org.jdom2.Namespace; import static org.assertj.core.api.Assertions.assertThat; @Deprecated -public class JDomPayloadEndpointTests extends AbstractPayloadEndpointTests { +class JDomPayloadEndpointTests extends AbstractPayloadEndpointTests { @Override protected PayloadEndpoint createNoResponseEndpoint() throws Exception { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTests.java index 9cfcad2d..72c16a86 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTests.java @@ -55,7 +55,7 @@ import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; @Deprecated -public class MarshallingPayloadEndpointTests { +class MarshallingPayloadEndpointTests { private Transformer transformer; @@ -64,7 +64,7 @@ public class MarshallingPayloadEndpointTests { private WebServiceMessageFactory factoryMock; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(""); this.transformer = TransformerFactoryUtils.newInstance().newTransformer(); @@ -73,7 +73,7 @@ public class MarshallingPayloadEndpointTests { } @Test - public void testInvoke() throws Exception { + void testInvoke() throws Exception { Unmarshaller unmarshaller = new SimpleMarshaller() { @@ -141,7 +141,7 @@ public class MarshallingPayloadEndpointTests { } @Test - public void testInvokeNullResponse() throws Exception { + void testInvokeNullResponse() throws Exception { Unmarshaller unmarshaller = new SimpleMarshaller() { @@ -193,7 +193,7 @@ public class MarshallingPayloadEndpointTests { } @Test - public void testInvokeNoRequest() throws Exception { + void testInvokeNoRequest() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage((StringBuilder) null); this.context = new DefaultMessageContext(request, this.factoryMock); @@ -220,7 +220,7 @@ public class MarshallingPayloadEndpointTests { } @Test - public void testInvokeMimeMarshaller() throws Exception { + void testInvokeMimeMarshaller() throws Exception { MimeUnmarshaller unmarshaller = createMock(MimeUnmarshaller.class); MimeMarshaller marshaller = createMock(MimeMarshaller.class); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MethodEndpointTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MethodEndpointTests.java index 3e87415e..c65c8237 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MethodEndpointTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MethodEndpointTests.java @@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -public class MethodEndpointTests { +class MethodEndpointTests { private MethodEndpoint endpoint; @@ -32,7 +32,7 @@ public class MethodEndpointTests { private Method method; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.myMethodInvoked = false; this.method = getClass().getMethod("myMethod", String.class); @@ -40,14 +40,14 @@ public class MethodEndpointTests { } @Test - public void testGetters() { + void testGetters() { assertThat(this.endpoint.getBean()).isEqualTo(this); assertThat(this.endpoint.getMethod()).isEqualTo(this.method); } @Test - public void testInvoke() throws Exception { + void testInvoke() throws Exception { assertThat(this.myMethodInvoked).isFalse(); @@ -57,27 +57,27 @@ public class MethodEndpointTests { } @Test - public void testEquals() throws Exception { + void testEquals() throws Exception { assertThat(this.endpoint).isEqualTo(new MethodEndpoint(this, this.method)); - Method otherMethod = getClass().getMethod("testEquals"); + Method otherMethod = getClass().getDeclaredMethod("testEquals"); assertThat(new MethodEndpoint(this, otherMethod).equals(this.endpoint)).isFalse(); } @Test - public void testHashCode() throws Exception { + void testHashCode() throws Exception { assertThat(this.endpoint.hashCode()).isEqualTo(new MethodEndpoint(this, this.method).hashCode()); - Method otherMethod = getClass().getMethod("testEquals"); + Method otherMethod = getClass().getDeclaredMethod("testEquals"); assertThat(new MethodEndpoint(this, otherMethod).hashCode() == this.endpoint.hashCode()).isFalse(); } @Test - public void testToString() { + void testToString() { assertThat(this.endpoint.toString()).isNotNull(); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTests.java index 49543f9e..e97f0e03 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTests.java @@ -28,7 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @Deprecated -public class SaxPayloadEndpointTests extends AbstractPayloadEndpointTests { +class SaxPayloadEndpointTests extends AbstractPayloadEndpointTests { @Override protected PayloadEndpoint createNoResponseEndpoint() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxEventPayloadEndpointTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxEventPayloadEndpointTests.java index 8f125708..7158cf6c 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxEventPayloadEndpointTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxEventPayloadEndpointTests.java @@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @see AbstractStaxEventPayloadEndpoint */ @Deprecated -public class StaxEventPayloadEndpointTests extends AbstractMessageEndpointTests { +class StaxEventPayloadEndpointTests extends AbstractMessageEndpointTests { @Override protected MessageEndpoint createNoResponseEndpoint() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxStreamPayloadEndpointTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxStreamPayloadEndpointTests.java index 20826951..fdd4e91e 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxStreamPayloadEndpointTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxStreamPayloadEndpointTests.java @@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @see AbstractStaxStreamPayloadEndpoint */ @Deprecated -public class StaxStreamPayloadEndpointTests extends AbstractMessageEndpointTests { +class StaxStreamPayloadEndpointTests extends AbstractMessageEndpointTests { @Override protected MessageEndpoint createNoResponseEndpoint() { @@ -103,7 +103,7 @@ public class StaxStreamPayloadEndpointTests extends AbstractMessageEndpointTests } @Test - public void testSaajResponse() throws Exception { + void testSaajResponse() throws Exception { Transformer transformer = TransformerFactoryUtils.newInstance().newTransformer(); MessageFactory messageFactory = MessageFactory.newInstance(); @@ -125,7 +125,7 @@ public class StaxStreamPayloadEndpointTests extends AbstractMessageEndpointTests } @Test - public void testAxiomResponse() throws Exception { + void testAxiomResponse() throws Exception { Transformer transformer = TransformerFactoryUtils.newInstance().newTransformer(); MessageFactory messageFactory = MessageFactory.newInstance(); @@ -147,7 +147,7 @@ public class StaxStreamPayloadEndpointTests extends AbstractMessageEndpointTests } @Test - public void testAxiomNoResponse() throws Exception { + void testAxiomNoResponse() throws Exception { Transformer transformer = TransformerFactoryUtils.newInstance().newTransformer(); MessageFactory messageFactory = MessageFactory.newInstance(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/XomPayloadEndpointTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/XomPayloadEndpointTests.java index 01dfb32f..6936116a 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/XomPayloadEndpointTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/XomPayloadEndpointTests.java @@ -21,7 +21,7 @@ import nu.xom.Element; import static org.assertj.core.api.Assertions.assertThat; @Deprecated -public class XomPayloadEndpointTests extends AbstractPayloadEndpointTests { +class XomPayloadEndpointTests extends AbstractPayloadEndpointTests { @Override protected PayloadEndpoint createNoResponseEndpoint() { @@ -67,13 +67,13 @@ public class XomPayloadEndpointTests extends AbstractPayloadEndpointTests { } @Override - public void testStaxSourceEventReader() { - // overriden, because XOM doesn't not support it + void testStaxSourceEventReader() { + // overridden, because XOM doesn't not support it } @Override - public void testStaxSourceStreamReader() { - // overriden, because XOM doesn't not support it + void testStaxSourceStreamReader() { + // overridden, because XOM doesn't not support it } } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapterTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapterTests.java index 2ba62a44..fb1be8e5 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapterTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapterTests.java @@ -45,7 +45,7 @@ import static org.easymock.EasyMock.verify; /** * @author Arjen Poutsma */ -public class DefaultMethodEndpointAdapterTests { +class DefaultMethodEndpointAdapterTests { private DefaultMethodEndpointAdapter adapter; @@ -66,7 +66,7 @@ public class DefaultMethodEndpointAdapterTests { private String supportedArgument; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.adapter = new DefaultMethodEndpointAdapter(); this.argumentResolver1 = createMock("stringResolver", MethodArgumentResolver.class); @@ -81,7 +81,7 @@ public class DefaultMethodEndpointAdapterTests { } @Test - public void initDefaultStrategies() throws Exception { + void initDefaultStrategies() throws Exception { this.adapter = new DefaultMethodEndpointAdapter(); this.adapter.setBeanClassLoader(DefaultMethodEndpointAdapterTests.class.getClassLoader()); @@ -92,7 +92,7 @@ public class DefaultMethodEndpointAdapterTests { } @Test - public void supportsSupported() { + void supportsSupported() { expect(this.argumentResolver1.supportsParameter(isA(MethodParameter.class))).andReturn(true); expect(this.argumentResolver1.supportsParameter(isA(MethodParameter.class))).andReturn(false); @@ -109,7 +109,7 @@ public class DefaultMethodEndpointAdapterTests { } @Test - public void supportsUnsupportedParameter() { + void supportsUnsupportedParameter() { expect(this.argumentResolver1.supportsParameter(isA(MethodParameter.class))).andReturn(false); expect(this.argumentResolver2.supportsParameter(isA(MethodParameter.class))).andReturn(false); @@ -123,7 +123,7 @@ public class DefaultMethodEndpointAdapterTests { } @Test - public void supportsUnsupportedReturnType() { + void supportsUnsupportedReturnType() { expect(this.argumentResolver1.supportsParameter(isA(MethodParameter.class))).andReturn(true); expect(this.returnValueHandler.supportsReturnType(isA(MethodParameter.class))).andReturn(false); @@ -138,7 +138,7 @@ public class DefaultMethodEndpointAdapterTests { } @Test - public void invokeSupported() throws Exception { + void invokeSupported() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(""); MessageContext messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); @@ -166,7 +166,7 @@ public class DefaultMethodEndpointAdapterTests { } @Test - public void invokeNullReturnValue() throws Exception { + void invokeNullReturnValue() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(""); MessageContext messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); @@ -189,7 +189,7 @@ public class DefaultMethodEndpointAdapterTests { } @Test - public void invokeException() throws Exception { + void invokeException() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(""); MessageContext messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTests.java index f68360bc..ec24ecf8 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTests.java @@ -42,7 +42,7 @@ import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; @Deprecated -public class GenericMarshallingMethodEndpointAdapterTests { +class GenericMarshallingMethodEndpointAdapterTests { private GenericMarshallingMethodEndpointAdapter adapter; @@ -55,7 +55,7 @@ public class GenericMarshallingMethodEndpointAdapterTests { private boolean responseInvoked; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.adapter = new GenericMarshallingMethodEndpointAdapter(); this.marshallerMock = createMock(GenericMarshaller.class); @@ -66,7 +66,7 @@ public class GenericMarshallingMethodEndpointAdapterTests { } @Test - public void testNoResponse() throws Exception { + void testNoResponse() throws Exception { WebServiceMessage messageMock = createMock(WebServiceMessage.class); expect(messageMock.getPayloadSource()).andReturn(new StringSource("")); @@ -89,7 +89,7 @@ public class GenericMarshallingMethodEndpointAdapterTests { } @Test - public void testNoRequestPayload() throws Exception { + void testNoRequestPayload() throws Exception { WebServiceMessage messageMock = createMock(WebServiceMessage.class); expect(messageMock.getPayloadSource()).andReturn(null); @@ -111,7 +111,7 @@ public class GenericMarshallingMethodEndpointAdapterTests { } @Test - public void testResponse() throws Exception { + void testResponse() throws Exception { WebServiceMessage requestMock = createMock(WebServiceMessage.class); expect(requestMock.getPayloadSource()).andReturn(new StringSource("")); @@ -138,7 +138,7 @@ public class GenericMarshallingMethodEndpointAdapterTests { } @Test - public void testSupportedNoResponse() throws NoSuchMethodException { + void testSupportedNoResponse() throws NoSuchMethodException { Method noResponse = getClass().getMethod("noResponse", MyGenericType.class); MethodEndpoint methodEndpoint = new MethodEndpoint(this, noResponse); @@ -152,7 +152,7 @@ public class GenericMarshallingMethodEndpointAdapterTests { } @Test - public void testSupportedResponse() throws NoSuchMethodException { + void testSupportedResponse() throws NoSuchMethodException { Method response = getClass().getMethod("response", MyGenericType.class); MethodEndpoint methodEndpoint = new MethodEndpoint(this, response); @@ -168,7 +168,7 @@ public class GenericMarshallingMethodEndpointAdapterTests { } @Test - public void testUnsupportedMethodMultipleParams() throws NoSuchMethodException { + void testUnsupportedMethodMultipleParams() throws NoSuchMethodException { Method unsupported = getClass().getMethod("unsupportedMultipleParams", String.class, String.class); @@ -180,7 +180,7 @@ public class GenericMarshallingMethodEndpointAdapterTests { } @Test - public void testUnsupportedMethodWrongParam() throws NoSuchMethodException { + void testUnsupportedMethodWrongParam() throws NoSuchMethodException { Method unsupported = getClass().getMethod("unsupportedWrongParam", String.class); expect(this.unmarshallerMock.supports(unsupported.getGenericParameterTypes()[0])).andReturn(false); @@ -194,7 +194,7 @@ public class GenericMarshallingMethodEndpointAdapterTests { } @Test - public void testUnsupportedMethodWrongReturnType() throws NoSuchMethodException { + void testUnsupportedMethodWrongReturnType() throws NoSuchMethodException { Method unsupported = getClass().getMethod("unsupportedWrongParam", String.class); expect(this.marshallerMock.supports(unsupported.getGenericReturnType())).andReturn(false); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTests.java index 245eda4a..e03b88a3 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTests.java @@ -40,7 +40,7 @@ import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; @Deprecated -public class MarshallingMethodEndpointAdapterTests { +class MarshallingMethodEndpointAdapterTests { private MarshallingMethodEndpointAdapter adapter; @@ -55,7 +55,7 @@ public class MarshallingMethodEndpointAdapterTests { private boolean responseInvoked; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.adapter = new MarshallingMethodEndpointAdapter(); this.marshallerMock = createMock(Marshaller.class); @@ -68,7 +68,7 @@ public class MarshallingMethodEndpointAdapterTests { } @Test - public void testNoResponse() throws Exception { + void testNoResponse() throws Exception { Method noResponse = getClass().getMethod("noResponse", MyType.class); MethodEndpoint methodEndpoint = new MethodEndpoint(this, noResponse); @@ -86,7 +86,7 @@ public class MarshallingMethodEndpointAdapterTests { } @Test - public void testNoRequestPayload() throws Exception { + void testNoRequestPayload() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(); this.messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); @@ -104,7 +104,7 @@ public class MarshallingMethodEndpointAdapterTests { } @Test - public void testResponse() throws Exception { + void testResponse() throws Exception { Method response = getClass().getMethod("response", MyType.class); MethodEndpoint methodEndpoint = new MethodEndpoint(this, response); @@ -123,7 +123,7 @@ public class MarshallingMethodEndpointAdapterTests { } @Test - public void testSupportedNoResponse() throws NoSuchMethodException { + void testSupportedNoResponse() throws NoSuchMethodException { Method noResponse = getClass().getMethod("noResponse", MyType.class); MethodEndpoint methodEndpoint = new MethodEndpoint(this, noResponse); @@ -137,7 +137,7 @@ public class MarshallingMethodEndpointAdapterTests { } @Test - public void testSupportedResponse() throws NoSuchMethodException { + void testSupportedResponse() throws NoSuchMethodException { Method response = getClass().getMethod("response", MyType.class); MethodEndpoint methodEndpoint = new MethodEndpoint(this, response); @@ -152,7 +152,7 @@ public class MarshallingMethodEndpointAdapterTests { } @Test - public void testUnsupportedMethodMultipleParams() throws NoSuchMethodException { + void testUnsupportedMethodMultipleParams() throws NoSuchMethodException { Method unsupported = getClass().getMethod("unsupportedMultipleParams", String.class, String.class); @@ -164,7 +164,7 @@ public class MarshallingMethodEndpointAdapterTests { } @Test - public void testUnsupportedMethodWrongParam() throws NoSuchMethodException { + void testUnsupportedMethodWrongParam() throws NoSuchMethodException { Method unsupported = getClass().getMethod("unsupportedWrongParam", String.class); expect(this.unmarshallerMock.supports(String.class)).andReturn(false); @@ -178,7 +178,7 @@ public class MarshallingMethodEndpointAdapterTests { } @Test - public void testUnsupportedMethodWrongReturnType() throws NoSuchMethodException { + void testUnsupportedMethodWrongReturnType() throws NoSuchMethodException { Method unsupported = getClass().getMethod("unsupportedWrongParam", String.class); expect(this.marshallerMock.supports(String.class)).andReturn(false); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTests.java index 1e55f728..972c63b5 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTests.java @@ -29,25 +29,25 @@ import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class MessageEndpointAdapterTests { +class MessageEndpointAdapterTests { private MessageEndpointAdapter adapter; private MessageEndpoint endpointMock; @BeforeEach - public void setUp() { + void setUp() { this.adapter = new MessageEndpointAdapter(); this.endpointMock = createMock(MessageEndpoint.class); } @Test - public void testSupports() { + void testSupports() { assertThat(this.adapter.supports(this.endpointMock)).isTrue(); } @Test - public void testInvoke() throws Exception { + void testInvoke() throws Exception { MessageContext context = new DefaultMessageContext(new MockWebServiceMessageFactory()); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapterTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapterTests.java index 4dee2158..de126b16 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapterTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapterTests.java @@ -27,7 +27,7 @@ import org.springframework.ws.server.endpoint.MethodEndpoint; import static org.assertj.core.api.Assertions.assertThat; @Deprecated -public class MessageMethodEndpointAdapterTests { +class MessageMethodEndpointAdapterTests { private MessageMethodEndpointAdapter adapter; @@ -36,20 +36,20 @@ public class MessageMethodEndpointAdapterTests { private MessageContext messageContext; @BeforeEach - public void setUp() { + void setUp() { this.adapter = new MessageMethodEndpointAdapter(); this.messageContext = new DefaultMessageContext(new MockWebServiceMessageFactory()); } @Test - public void testSupported() throws NoSuchMethodException { + void testSupported() throws NoSuchMethodException { MethodEndpoint methodEndpoint = new MethodEndpoint(this, "supported", MessageContext.class); assertThat(this.adapter.supportsInternal(methodEndpoint)).isTrue(); } @Test - public void testUnsupportedMethodMultipleParams() throws NoSuchMethodException { + void testUnsupportedMethodMultipleParams() throws NoSuchMethodException { assertThat(this.adapter.supportsInternal( new MethodEndpoint(this, "unsupportedMultipleParams", MessageContext.class, MessageContext.class))) @@ -57,14 +57,14 @@ public class MessageMethodEndpointAdapterTests { } @Test - public void testUnsupportedMethodWrongParam() throws NoSuchMethodException { + void testUnsupportedMethodWrongParam() throws NoSuchMethodException { assertThat(this.adapter.supportsInternal(new MethodEndpoint(this, "unsupportedWrongParam", String.class))) .isFalse(); } @Test - public void testInvokeSupported() throws Exception { + void testInvokeSupported() throws Exception { MethodEndpoint methodEndpoint = new MethodEndpoint(this, "supported", MessageContext.class); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTests.java index ebb6e3f6..67323db7 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTests.java @@ -42,26 +42,26 @@ import static org.easymock.EasyMock.isA; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class PayloadEndpointAdapterTests { +class PayloadEndpointAdapterTests { private PayloadEndpointAdapter adapter; private PayloadEndpoint endpointMock; @BeforeEach - public void setUp() { + void setUp() { this.adapter = new PayloadEndpointAdapter(); this.endpointMock = createMock(PayloadEndpoint.class); } @Test - public void testSupports() { + void testSupports() { assertThat(this.adapter.supports(this.endpointMock)).isTrue(); } @Test - public void testInvoke() throws Exception { + void testInvoke() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(""); final Transformer transformer = TransformerFactoryUtils.newInstance().newTransformer(); @@ -86,7 +86,7 @@ public class PayloadEndpointAdapterTests { } @Test - public void testInvokeNoResponse() throws Exception { + void testInvokeNoResponse() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(""); MessageContext messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapterTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapterTests.java index 92a9003e..6df5eaa7 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapterTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapterTests.java @@ -33,7 +33,7 @@ import org.springframework.ws.server.endpoint.MethodEndpoint; import static org.assertj.core.api.Assertions.assertThat; @Deprecated -public class PayloadMethodEndpointAdapterTests { +class PayloadMethodEndpointAdapterTests { private PayloadMethodEndpointAdapter adapter; @@ -44,28 +44,28 @@ public class PayloadMethodEndpointAdapterTests { private MessageContext messageContext; @BeforeEach - public void setUp() { + void setUp() { this.adapter = new PayloadMethodEndpointAdapter(); this.messageContext = new DefaultMessageContext(new MockWebServiceMessageFactory()); } @Test - public void testSupportedNoResponse() throws NoSuchMethodException { + void testSupportedNoResponse() throws NoSuchMethodException { MethodEndpoint methodEndpoint = new MethodEndpoint(this, "noResponse", DOMSource.class); assertThat(this.adapter.supportsInternal(methodEndpoint)).isTrue(); } @Test - public void testSupportedResponse() throws NoSuchMethodException { + void testSupportedResponse() throws NoSuchMethodException { MethodEndpoint methodEndpoint = new MethodEndpoint(this, "response", StreamSource.class); assertThat(this.adapter.supportsInternal(methodEndpoint)).isTrue(); } @Test - public void testUnsupportedMethodMultipleParams() throws NoSuchMethodException { + void testUnsupportedMethodMultipleParams() throws NoSuchMethodException { assertThat(this.adapter .supportsInternal(new MethodEndpoint(this, "unsupportedMultipleParams", Source.class, Source.class))) @@ -73,21 +73,21 @@ public class PayloadMethodEndpointAdapterTests { } @Test - public void testUnsupportedMethodWrongReturnType() throws NoSuchMethodException { + void testUnsupportedMethodWrongReturnType() throws NoSuchMethodException { assertThat(this.adapter.supportsInternal(new MethodEndpoint(this, "unsupportedWrongReturnType", Source.class))) .isFalse(); } @Test - public void testUnsupportedMethodWrongParam() throws NoSuchMethodException { + void testUnsupportedMethodWrongParam() throws NoSuchMethodException { assertThat(this.adapter.supportsInternal(new MethodEndpoint(this, "unsupportedWrongParam", String.class))) .isFalse(); } @Test - public void testNoResponse() throws Exception { + void testNoResponse() throws Exception { MethodEndpoint methodEndpoint = new MethodEndpoint(this, "noResponse", DOMSource.class); @@ -99,7 +99,7 @@ public class PayloadMethodEndpointAdapterTests { } @Test - public void testResponse() throws Exception { + void testResponse() throws Exception { WebServiceMessage request = new MockWebServiceMessage(""); this.messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTests.java index 37cd7f43..bd6e965a 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTests.java @@ -49,7 +49,7 @@ import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; @Deprecated -public class XPathParamAnnotationMethodEndpointAdapterTests { +class XPathParamAnnotationMethodEndpointAdapterTests { private static final String CONTENTS = "text42.0"; @@ -62,14 +62,14 @@ public class XPathParamAnnotationMethodEndpointAdapterTests { private boolean namespacesInvoked; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.adapter = new XPathParamAnnotationMethodEndpointAdapter(); this.adapter.afterPropertiesSet(); } @Test - public void testUnsupportedInvalidParam() throws NoSuchMethodException { + void testUnsupportedInvalidParam() throws NoSuchMethodException { MethodEndpoint endpoint = new MethodEndpoint(this, "unsupportedInvalidParamType", Integer.TYPE); @@ -77,21 +77,21 @@ public class XPathParamAnnotationMethodEndpointAdapterTests { } @Test - public void testUnsupportedInvalidReturnType() throws NoSuchMethodException { + void testUnsupportedInvalidReturnType() throws NoSuchMethodException { MethodEndpoint endpoint = new MethodEndpoint(this, "unsupportedInvalidReturnType", String.class); assertThat(this.adapter.supports(endpoint)).isFalse(); } @Test - public void testUnsupportedInvalidParams() throws NoSuchMethodException { + void testUnsupportedInvalidParams() throws NoSuchMethodException { MethodEndpoint endpoint = new MethodEndpoint(this, "unsupportedInvalidParams", String.class, String.class); assertThat(this.adapter.supports(endpoint)).isFalse(); } @Test - public void testSupportedTypes() throws NoSuchMethodException { + void testSupportedTypes() throws NoSuchMethodException { MethodEndpoint endpoint = new MethodEndpoint(this, "supportedTypes", Boolean.TYPE, Double.TYPE, Node.class, NodeList.class, String.class); @@ -99,28 +99,28 @@ public class XPathParamAnnotationMethodEndpointAdapterTests { } @Test - public void testSupportsStringSource() throws NoSuchMethodException { + void testSupportsStringSource() throws NoSuchMethodException { MethodEndpoint endpoint = new MethodEndpoint(this, "supportedStringSource", String.class); assertThat(this.adapter.supports(endpoint)).isTrue(); } @Test - public void testSupportsSource() throws NoSuchMethodException { + void testSupportsSource() throws NoSuchMethodException { MethodEndpoint endpoint = new MethodEndpoint(this, "supportedSource", String.class); assertThat(this.adapter.supports(endpoint)).isTrue(); } @Test - public void testSupportsVoid() throws NoSuchMethodException { + void testSupportsVoid() throws NoSuchMethodException { MethodEndpoint endpoint = new MethodEndpoint(this, "supportedVoid", String.class); assertThat(this.adapter.supports(endpoint)).isTrue(); } @Test - public void testInvokeTypes() throws Exception { + void testInvokeTypes() throws Exception { WebServiceMessage messageMock = createMock(WebServiceMessage.class); expect(messageMock.getPayloadSource()).andReturn(new StringSource(CONTENTS)); @@ -138,7 +138,7 @@ public class XPathParamAnnotationMethodEndpointAdapterTests { } @Test - public void testInvokeSource() throws Exception { + void testInvokeSource() throws Exception { WebServiceMessage requestMock = createMock(WebServiceMessage.class); WebServiceMessage responseMock = createMock(WebServiceMessage.class); @@ -158,7 +158,7 @@ public class XPathParamAnnotationMethodEndpointAdapterTests { } @Test - public void testInvokeVoidDom() throws Exception { + void testInvokeVoidDom() throws Exception { DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessorTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessorTests.java index 8c1954a9..095d1ba4 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessorTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessorTests.java @@ -51,7 +51,7 @@ public abstract class AbstractPayloadMethodProcessorTests extends AbstractMethod protected abstract MethodParameter[] createSupportedReturnTypes() throws NoSuchMethodException; @Test - public void supportsParameter() throws NoSuchMethodException { + void supportsParameter() throws NoSuchMethodException { for (MethodParameter supportedParameter : this.supportedParameters) { assertThat(this.processor.supportsParameter(supportedParameter)).isTrue(); @@ -64,7 +64,7 @@ public abstract class AbstractPayloadMethodProcessorTests extends AbstractMethod } @Test - public void supportsReturnType() throws NoSuchMethodException { + void supportsReturnType() throws NoSuchMethodException { for (MethodParameter supportedReturnType : this.supportedReturnTypes) { assertThat(this.processor.supportsReturnType(supportedReturnType)).isTrue(); @@ -77,22 +77,22 @@ public abstract class AbstractPayloadMethodProcessorTests extends AbstractMethod } @Test - public void saajArgument() throws Exception { + void saajArgument() throws Exception { testResolveArgument(createSaajMessageContext()); } @Test - public void mockArgument() throws Exception { + void mockArgument() throws Exception { testResolveArgument(createMockMessageContext()); } @Test - public void axiomCachingArgument() throws Exception { + void axiomCachingArgument() throws Exception { testResolveArgument(createCachingAxiomMessageContext()); } @Test - public void axiomNonCachingArgument() throws Exception { + void axiomNonCachingArgument() throws Exception { testResolveArgument(createNonCachingAxiomMessageContext()); } @@ -111,22 +111,22 @@ public abstract class AbstractPayloadMethodProcessorTests extends AbstractMethod } @Test - public void saajReturnValue() throws Exception { + void saajReturnValue() throws Exception { testHandleReturnValue(createSaajMessageContext()); } @Test - public void mockReturnValue() throws Exception { + void mockReturnValue() throws Exception { testHandleReturnValue(createMockMessageContext()); } @Test - public void axiomCachingReturnValue() throws Exception { + void axiomCachingReturnValue() throws Exception { testHandleReturnValue(createCachingAxiomMessageContext()); } @Test - public void axiomNonCachingReturnValue() throws Exception { + void axiomNonCachingReturnValue() throws Exception { testHandleReturnValue(createNonCachingAxiomMessageContext()); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MarshallingPayloadMethodProcessorTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MarshallingPayloadMethodProcessorTests.java index 10bda393..431ec81b 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MarshallingPayloadMethodProcessorTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MarshallingPayloadMethodProcessorTests.java @@ -40,7 +40,7 @@ import static org.easymock.EasyMock.isA; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class MarshallingPayloadMethodProcessorTests extends AbstractMethodArgumentResolverTests { +class MarshallingPayloadMethodProcessorTests extends AbstractMethodArgumentResolverTests { private MarshallingPayloadMethodProcessor processor; @@ -53,7 +53,7 @@ public class MarshallingPayloadMethodProcessorTests extends AbstractMethodArgume private MethodParameter supportedReturnType; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.marshaller = createMock("marshaller", GenericMarshaller.class); this.unmarshaller = createMock("unmarshaller", GenericUnmarshaller.class); @@ -63,7 +63,7 @@ public class MarshallingPayloadMethodProcessorTests extends AbstractMethodArgume } @Test - public void supportsParameterSupported() { + void supportsParameterSupported() { expect(this.unmarshaller.supports(isA(Type.class))).andReturn(true); @@ -75,7 +75,7 @@ public class MarshallingPayloadMethodProcessorTests extends AbstractMethodArgume } @Test - public void supportsParameterUnsupported() { + void supportsParameterUnsupported() { expect(this.unmarshaller.supports(isA(Type.class))).andReturn(false); @@ -87,7 +87,7 @@ public class MarshallingPayloadMethodProcessorTests extends AbstractMethodArgume } @Test - public void supportsParameterNoUnmarshallerSupported() { + void supportsParameterNoUnmarshallerSupported() { this.processor = new MarshallingPayloadMethodProcessor(); this.processor.setMarshaller(this.marshaller); @@ -100,7 +100,7 @@ public class MarshallingPayloadMethodProcessorTests extends AbstractMethodArgume } @Test - public void supportsReturnTypeSupported() { + void supportsReturnTypeSupported() { expect(this.marshaller.supports(isA(Type.class))).andReturn(true); @@ -112,7 +112,7 @@ public class MarshallingPayloadMethodProcessorTests extends AbstractMethodArgume } @Test - public void supportsReturnTypeUnsupported() { + void supportsReturnTypeUnsupported() { expect(this.marshaller.supports(isA(Type.class))).andReturn(false); @@ -124,7 +124,7 @@ public class MarshallingPayloadMethodProcessorTests extends AbstractMethodArgume } @Test - public void supportsReturnTypeNoMarshaller() { + void supportsReturnTypeNoMarshaller() { this.processor = new MarshallingPayloadMethodProcessor(); this.processor.setUnmarshaller(this.unmarshaller); @@ -137,7 +137,7 @@ public class MarshallingPayloadMethodProcessorTests extends AbstractMethodArgume } @Test - public void resolveArgument() throws Exception { + void resolveArgument() throws Exception { MyObject expected = new MyObject(); @@ -154,7 +154,7 @@ public class MarshallingPayloadMethodProcessorTests extends AbstractMethodArgume } @Test - public void resolveArgumentNoUnmarshaller() { + void resolveArgumentNoUnmarshaller() { assertThatIllegalStateException().isThrownBy(() -> { @@ -170,7 +170,7 @@ public class MarshallingPayloadMethodProcessorTests extends AbstractMethodArgume } @Test - public void handleReturnValue() throws Exception { + void handleReturnValue() throws Exception { MyObject returnValue = new MyObject(); @@ -185,7 +185,7 @@ public class MarshallingPayloadMethodProcessorTests extends AbstractMethodArgume } @Test - public void handleReturnValueNoMarshaller() { + void handleReturnValueNoMarshaller() { assertThatIllegalStateException().isThrownBy(() -> { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MessageContextMethodArgumentResolverTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MessageContextMethodArgumentResolverTests.java index dad11e1e..898c6ec1 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MessageContextMethodArgumentResolverTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MessageContextMethodArgumentResolverTests.java @@ -26,26 +26,26 @@ import org.springframework.ws.context.MessageContext; import static org.assertj.core.api.Assertions.assertThat; -public class MessageContextMethodArgumentResolverTests { +class MessageContextMethodArgumentResolverTests { private MessageContextMethodArgumentResolver resolver; private MethodParameter supported; @BeforeEach - public void setUp() throws NoSuchMethodException { + void setUp() throws NoSuchMethodException { this.resolver = new MessageContextMethodArgumentResolver(); this.supported = new MethodParameter(getClass().getMethod("supported", MessageContext.class), 0); } @Test - public void supportsParameter() { + void supportsParameter() { assertThat(this.resolver.supportsParameter(this.supported)).isTrue(); } @Test - public void resolveArgument() throws Exception { + void resolveArgument() throws Exception { MessageContext messageContext = new DefaultMessageContext(new MockWebServiceMessageFactory()); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessorTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessorTests.java index 0d73b280..1d3c5bf1 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessorTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessorTests.java @@ -30,7 +30,7 @@ import org.springframework.xml.transform.StringSource; /** * @author Arjen Poutsma */ -public class SourcePayloadMethodProcessorTests extends AbstractPayloadMethodProcessorTests { +class SourcePayloadMethodProcessorTests extends AbstractPayloadMethodProcessorTests { @Override protected AbstractPayloadSourceMethodProcessor createProcessor() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolverTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolverTests.java index e7541357..a0f91cd9 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolverTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolverTests.java @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Arjen Poutsma */ @SuppressWarnings("Since15") -public class StaxPayloadMethodArgumentResolverTests extends AbstractMethodArgumentResolverTests { +class StaxPayloadMethodArgumentResolverTests extends AbstractMethodArgumentResolverTests { private StaxPayloadMethodArgumentResolver resolver; @@ -47,7 +47,7 @@ public class StaxPayloadMethodArgumentResolverTests extends AbstractMethodArgume private MethodParameter invalidParameter; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.resolver = new StaxPayloadMethodArgumentResolver(); this.streamParameter = new MethodParameter(getClass().getMethod("streamReader", XMLStreamReader.class), 0); @@ -56,7 +56,7 @@ public class StaxPayloadMethodArgumentResolverTests extends AbstractMethodArgume } @Test - public void supportsParameter() { + void supportsParameter() { assertThat(this.resolver.supportsParameter(this.streamParameter)).isTrue(); assertThat(this.resolver.supportsParameter(this.eventParameter)).isTrue(); @@ -64,7 +64,7 @@ public class StaxPayloadMethodArgumentResolverTests extends AbstractMethodArgume } @Test - public void resolveStreamReaderSaaj() throws Exception { + void resolveStreamReaderSaaj() throws Exception { MessageContext messageContext = createSaajMessageContext(); @@ -74,7 +74,7 @@ public class StaxPayloadMethodArgumentResolverTests extends AbstractMethodArgume } @Test - public void resolveStreamReaderAxiomCaching() throws Exception { + void resolveStreamReaderAxiomCaching() throws Exception { MessageContext messageContext = createCachingAxiomMessageContext(); @@ -84,7 +84,7 @@ public class StaxPayloadMethodArgumentResolverTests extends AbstractMethodArgume } @Test - public void resolveStreamReaderAxiomNonCaching() throws Exception { + void resolveStreamReaderAxiomNonCaching() throws Exception { MessageContext messageContext = createNonCachingAxiomMessageContext(); @@ -94,7 +94,7 @@ public class StaxPayloadMethodArgumentResolverTests extends AbstractMethodArgume } @Test - public void resolveStreamReaderStream() throws Exception { + void resolveStreamReaderStream() throws Exception { MessageContext messageContext = createMockMessageContext(); @@ -104,7 +104,7 @@ public class StaxPayloadMethodArgumentResolverTests extends AbstractMethodArgume } @Test - public void resolveEventReaderSaaj() throws Exception { + void resolveEventReaderSaaj() throws Exception { MessageContext messageContext = createSaajMessageContext(); @@ -114,7 +114,7 @@ public class StaxPayloadMethodArgumentResolverTests extends AbstractMethodArgume } @Test - public void resolveEventReaderAxiomCaching() throws Exception { + void resolveEventReaderAxiomCaching() throws Exception { MessageContext messageContext = createCachingAxiomMessageContext(); @@ -124,7 +124,7 @@ public class StaxPayloadMethodArgumentResolverTests extends AbstractMethodArgume } @Test - public void resolveEventReaderAxiomNonCaching() throws Exception { + void resolveEventReaderAxiomNonCaching() throws Exception { MessageContext messageContext = createNonCachingAxiomMessageContext(); @@ -134,7 +134,7 @@ public class StaxPayloadMethodArgumentResolverTests extends AbstractMethodArgume } @Test - public void resolveEventReaderStream() throws Exception { + void resolveEventReaderStream() throws Exception { MessageContext messageContext = createMockMessageContext(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolverTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolverTests.java index 4c6c3bb1..aa585419 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolverTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolverTests.java @@ -35,7 +35,7 @@ import org.springframework.ws.server.endpoint.annotation.XPathParam; import static org.assertj.core.api.Assertions.assertThat; @Namespaces(@Namespace(prefix = "tns", uri = "http://springframework.org/spring-ws")) -public class XPathParamMethodArgumentResolverTests { +class XPathParamMethodArgumentResolverTests { private static final String CONTENTS = "text42"; @@ -60,7 +60,7 @@ public class XPathParamMethodArgumentResolverTests { private MethodParameter namespaceClassParameter; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.resolver = new XPathParamMethodArgumentResolver(); Method supportedTypes = getClass().getMethod("supportedTypes", Boolean.TYPE, Double.TYPE, Node.class, @@ -77,7 +77,7 @@ public class XPathParamMethodArgumentResolverTests { } @Test - public void supportsParameter() { + void supportsParameter() { assertThat(this.resolver.supportsParameter(this.booleanParameter)).isTrue(); assertThat(this.resolver.supportsParameter(this.doubleParameter)).isTrue(); @@ -89,7 +89,7 @@ public class XPathParamMethodArgumentResolverTests { } @Test - public void resolveBoolean() throws Exception { + void resolveBoolean() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(CONTENTS); MessageContext messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); @@ -104,7 +104,7 @@ public class XPathParamMethodArgumentResolverTests { } @Test - public void resolveDouble() throws Exception { + void resolveDouble() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(CONTENTS); MessageContext messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); @@ -119,7 +119,7 @@ public class XPathParamMethodArgumentResolverTests { } @Test - public void resolveNode() throws Exception { + void resolveNode() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(CONTENTS); MessageContext messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); @@ -134,7 +134,7 @@ public class XPathParamMethodArgumentResolverTests { } @Test - public void resolveNodeList() throws Exception { + void resolveNodeList() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(CONTENTS); MessageContext messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); @@ -150,7 +150,7 @@ public class XPathParamMethodArgumentResolverTests { } @Test - public void resolveString() throws Exception { + void resolveString() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(CONTENTS); MessageContext messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); @@ -165,7 +165,7 @@ public class XPathParamMethodArgumentResolverTests { } @Test - public void resolveConvertedType() throws Exception { + void resolveConvertedType() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(CONTENTS); MessageContext messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); @@ -177,7 +177,7 @@ public class XPathParamMethodArgumentResolverTests { } @Test - public void resolveNamespacesMethod() throws Exception { + void resolveNamespacesMethod() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage( "text"); @@ -190,7 +190,7 @@ public class XPathParamMethodArgumentResolverTests { } @Test - public void resolveNamespacesClass() throws Exception { + void resolveNamespacesClass() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage( "text"); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/Dom4jPayloadMethodProcessorTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/Dom4jPayloadMethodProcessorTests.java index efc96717..89bfe75b 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/Dom4jPayloadMethodProcessorTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/Dom4jPayloadMethodProcessorTests.java @@ -28,7 +28,7 @@ import org.springframework.ws.server.endpoint.annotation.ResponsePayload; import static org.assertj.core.api.Assertions.assertThat; -public class Dom4jPayloadMethodProcessorTests extends AbstractPayloadMethodProcessorTests { +class Dom4jPayloadMethodProcessorTests extends AbstractPayloadMethodProcessorTests { @Override protected AbstractPayloadSourceMethodProcessor createProcessor() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/DomPayloadMethodProcessorTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/DomPayloadMethodProcessorTests.java index 856a3d83..8fb7a437 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/DomPayloadMethodProcessorTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/DomPayloadMethodProcessorTests.java @@ -32,7 +32,7 @@ import org.springframework.xml.DocumentBuilderFactoryUtils; import static org.assertj.core.api.Assertions.assertThat; -public class DomPayloadMethodProcessorTests extends AbstractPayloadMethodProcessorTests { +class DomPayloadMethodProcessorTests extends AbstractPayloadMethodProcessorTests { @Override protected AbstractPayloadSourceMethodProcessor createProcessor() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/JDomPayloadMethodProcessorTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/JDomPayloadMethodProcessorTests.java index d6e6ceb5..34d926b4 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/JDomPayloadMethodProcessorTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/JDomPayloadMethodProcessorTests.java @@ -26,7 +26,7 @@ import org.springframework.ws.server.endpoint.annotation.ResponsePayload; import static org.assertj.core.api.Assertions.assertThat; -public class JDomPayloadMethodProcessorTests extends AbstractPayloadMethodProcessorTests { +class JDomPayloadMethodProcessorTests extends AbstractPayloadMethodProcessorTests { @Override protected AbstractPayloadSourceMethodProcessor createProcessor() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/XomPayloadMethodProcessorTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/XomPayloadMethodProcessorTests.java index 26b62cd6..9e0a0ae9 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/XomPayloadMethodProcessorTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/XomPayloadMethodProcessorTests.java @@ -26,7 +26,7 @@ import org.springframework.ws.server.endpoint.annotation.ResponsePayload; import static org.assertj.core.api.Assertions.assertThat; -public class XomPayloadMethodProcessorTests extends AbstractPayloadMethodProcessorTests { +class XomPayloadMethodProcessorTests extends AbstractPayloadMethodProcessorTests { @Override protected AbstractPayloadSourceMethodProcessor createProcessor() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTests.java index de1d9403..021462b7 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTests.java @@ -37,7 +37,7 @@ import org.springframework.ws.server.endpoint.annotation.ResponsePayload; import static org.assertj.core.api.Assertions.assertThat; -public class JaxbElementPayloadMethodProcessorTests { +class JaxbElementPayloadMethodProcessorTests { private JaxbElementPayloadMethodProcessor processor; @@ -48,7 +48,7 @@ public class JaxbElementPayloadMethodProcessorTests { private MethodParameter stringReturnType; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.processor = new JaxbElementPayloadMethodProcessor(); this.supportedParameter = new MethodParameter(getClass().getMethod("supported", JAXBElement.class), 0); @@ -57,17 +57,17 @@ public class JaxbElementPayloadMethodProcessorTests { } @Test - public void supportsParameter() { + void supportsParameter() { assertThat(this.processor.supportsParameter(this.supportedParameter)).isTrue(); } @Test - public void supportsReturnType() { + void supportsReturnType() { assertThat(this.processor.supportsReturnType(this.supportedReturnType)).isTrue(); } @Test - public void resolveArgument() throws JAXBException { + void resolveArgument() throws JAXBException { WebServiceMessage request = new MockWebServiceMessage( "Foo"); @@ -83,7 +83,7 @@ public class JaxbElementPayloadMethodProcessorTests { } @Test - public void handleReturnValue() throws Exception { + void handleReturnValue() throws Exception { MessageContext messageContext = new DefaultMessageContext(new MockWebServiceMessageFactory()); @@ -104,7 +104,7 @@ public class JaxbElementPayloadMethodProcessorTests { } @Test - public void handleReturnValueString() throws Exception { + void handleReturnValueString() throws Exception { MessageContext messageContext = new DefaultMessageContext(new MockWebServiceMessageFactory()); @@ -124,7 +124,7 @@ public class JaxbElementPayloadMethodProcessorTests { } @Test - public void handleNullReturnValue() throws Exception { + void handleNullReturnValue() throws Exception { MessageContext messageContext = new DefaultMessageContext(new MockWebServiceMessageFactory()); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTests.java index 4c900d39..a2be9cfd 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTests.java @@ -47,7 +47,7 @@ import org.springframework.xml.sax.AbstractXmlReader; import static org.assertj.core.api.Assertions.assertThat; -public class XmlRootElementPayloadMethodProcessorTests { +class XmlRootElementPayloadMethodProcessorTests { private XmlRootElementPayloadMethodProcessor processor; @@ -58,7 +58,7 @@ public class XmlRootElementPayloadMethodProcessorTests { private MethodParameter rootElementReturnType; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.processor = new XmlRootElementPayloadMethodProcessor(); this.rootElementParameter = new MethodParameter(getClass().getMethod("rootElement", MyRootElement.class), 0); @@ -67,20 +67,20 @@ public class XmlRootElementPayloadMethodProcessorTests { } @Test - public void supportsParameter() { + void supportsParameter() { assertThat(this.processor.supportsParameter(this.rootElementParameter)).isTrue(); assertThat(this.processor.supportsParameter(this.typeParameter)).isTrue(); } @Test - public void supportsReturnType() { + void supportsReturnType() { assertThat(this.processor.supportsReturnType(this.rootElementReturnType)).isTrue(); } @Test - public void resolveArgumentRootElement() throws JAXBException { + void resolveArgumentRootElement() throws JAXBException { WebServiceMessage request = new MockWebServiceMessage( "Foo"); @@ -96,7 +96,7 @@ public class XmlRootElementPayloadMethodProcessorTests { } @Test - public void resolveArgumentType() throws JAXBException { + void resolveArgumentType() throws JAXBException { WebServiceMessage request = new MockWebServiceMessage( "Foo"); @@ -112,7 +112,7 @@ public class XmlRootElementPayloadMethodProcessorTests { } @Test - public void resolveArgumentFromCustomSAXSource() throws JAXBException { + void resolveArgumentFromCustomSAXSource() throws JAXBException { // Create a custom SAXSource that generates an appropriate sequence of events. XMLReader xmlReader = new AbstractXmlReader() { @@ -179,7 +179,7 @@ public class XmlRootElementPayloadMethodProcessorTests { } @Test - public void handleReturnValue() throws Exception { + void handleReturnValue() throws Exception { MessageContext messageContext = new DefaultMessageContext(new MockWebServiceMessageFactory()); @@ -198,7 +198,7 @@ public class XmlRootElementPayloadMethodProcessorTests { } @Test - public void handleNullReturnValue() throws Exception { + void handleNullReturnValue() throws Exception { MessageContext messageContext = new DefaultMessageContext(new MockWebServiceMessageFactory()); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTests.java index 10939d78..390124c9 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTests.java @@ -44,7 +44,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -public class PayloadTransformingInterceptorTests { +class PayloadTransformingInterceptorTests { private PayloadTransformingInterceptor interceptor; @@ -57,7 +57,7 @@ public class PayloadTransformingInterceptorTests { private Resource xslt; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.interceptor = new PayloadTransformingInterceptor(); TransformerFactory transformerFactory = TransformerFactoryUtils.newInstance(); @@ -68,7 +68,7 @@ public class PayloadTransformingInterceptorTests { } @Test - public void testHandleRequest() throws Exception { + void testHandleRequest() throws Exception { this.interceptor.setRequestXslt(this.xslt); this.interceptor.afterPropertiesSet(); @@ -86,7 +86,7 @@ public class PayloadTransformingInterceptorTests { } @Test - public void testHandleRequestNoXslt() throws Exception { + void testHandleRequestNoXslt() throws Exception { this.interceptor.setResponseXslt(this.xslt); this.interceptor.afterPropertiesSet(); @@ -103,7 +103,7 @@ public class PayloadTransformingInterceptorTests { } @Test - public void testHandleResponse() throws Exception { + void testHandleResponse() throws Exception { this.interceptor.setResponseXslt(this.xslt); this.interceptor.afterPropertiesSet(); @@ -123,7 +123,7 @@ public class PayloadTransformingInterceptorTests { } @Test - public void testHandleResponseNoXslt() throws Exception { + void testHandleResponseNoXslt() throws Exception { this.interceptor.setRequestXslt(this.xslt); this.interceptor.afterPropertiesSet(); @@ -143,7 +143,7 @@ public class PayloadTransformingInterceptorTests { } @Test - public void testSaaj() throws Exception { + void testSaaj() throws Exception { this.interceptor.setRequestXslt(this.xslt); this.interceptor.afterPropertiesSet(); @@ -164,7 +164,7 @@ public class PayloadTransformingInterceptorTests { } @Test - public void testPox() throws Exception { + void testPox() throws Exception { this.interceptor.setRequestXslt(this.xslt); this.interceptor.afterPropertiesSet(); @@ -185,7 +185,7 @@ public class PayloadTransformingInterceptorTests { } @Test - public void testNoStylesheetsSet() { + void testNoStylesheetsSet() { assertThatIllegalArgumentException().isThrownBy(() -> this.interceptor.afterPropertiesSet()); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/BridgedMethodRegistrationTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/BridgedMethodRegistrationTests.java index 088b27de..ffa3c766 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/BridgedMethodRegistrationTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/BridgedMethodRegistrationTests.java @@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat; @ExtendWith(SpringExtension.class) @ContextConfiguration("bridged-method-registration.xml") -public class BridgedMethodRegistrationTests { +class BridgedMethodRegistrationTests { @Autowired private PayloadRootAnnotationMethodEndpointMapping mapping; @@ -44,7 +44,7 @@ public class BridgedMethodRegistrationTests { private ApplicationContext applicationContext; @Test - public void registration() throws NoSuchMethodException { + void registration() throws NoSuchMethodException { MethodEndpoint bridgedMethod = this.mapping .lookupEndpoint(new QName("http://springframework.org/spring-ws", "Request")); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/CgLibProxyRegistrationTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/CgLibProxyRegistrationTests.java index 2d6da5a0..9cacb4ad 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/CgLibProxyRegistrationTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/CgLibProxyRegistrationTests.java @@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat; @ExtendWith(SpringExtension.class) @ContextConfiguration("cglib-proxy-registration.xml") -public class CgLibProxyRegistrationTests { +class CgLibProxyRegistrationTests { @Autowired private PayloadRootAnnotationMethodEndpointMapping mapping; @@ -46,7 +46,7 @@ public class CgLibProxyRegistrationTests { private ApplicationContext applicationContext; @Test - public void registration() throws NoSuchMethodException { + void registration() throws NoSuchMethodException { MethodEndpoint cglibProxy = this.mapping .lookupEndpoint(new QName("http://springframework.org/spring-ws", "Request")); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTests.java index e3988b07..4816fc94 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTests.java @@ -37,17 +37,17 @@ import static org.mockito.Mockito.verify; /** * Test case for {@link AbstractEndpointMapping}. */ -public class EndpointMappingTests { +class EndpointMappingTests { private MessageContext messageContext; @BeforeEach - public void setUp() { + void setUp() { this.messageContext = new DefaultMessageContext(new MockWebServiceMessageFactory()); } @Test - public void defaultEndpoint() throws Exception { + void defaultEndpoint() throws Exception { Object defaultEndpoint = new Object(); AbstractEndpointMapping mapping = new AbstractEndpointMapping() { @@ -66,7 +66,7 @@ public class EndpointMappingTests { } @Test - public void endpoint() throws Exception { + void endpoint() throws Exception { final Object endpoint = new Object(); AbstractEndpointMapping mapping = new AbstractEndpointMapping() { @@ -84,7 +84,7 @@ public class EndpointMappingTests { } @Test - public void endpointInterceptors() throws Exception { + void endpointInterceptors() throws Exception { final Object endpoint = new Object(); EndpointInterceptor interceptor = new EndpointInterceptorAdapter(); @@ -104,7 +104,7 @@ public class EndpointMappingTests { } @Test - public void smartEndpointInterceptors() throws Exception { + void smartEndpointInterceptors() throws Exception { StaticApplicationContext applicationContext = new StaticApplicationContext(); applicationContext.registerSingleton("smartInterceptor", MySmartEndpointInterceptor.class); @@ -178,7 +178,7 @@ public class EndpointMappingTests { } @Test - public void endpointBeanName() throws Exception { + void endpointBeanName() throws Exception { StaticApplicationContext applicationContext = new StaticApplicationContext(); applicationContext.registerSingleton("endpoint", Object.class); @@ -199,7 +199,7 @@ public class EndpointMappingTests { } @Test - public void endpointInvalidBeanName() throws Exception { + void endpointInvalidBeanName() throws Exception { StaticApplicationContext applicationContext = new StaticApplicationContext(); applicationContext.registerSingleton("endpoint", Object.class); @@ -220,7 +220,7 @@ public class EndpointMappingTests { } @Test - public void endpointPrototype() throws Exception { + void endpointPrototype() throws Exception { StaticApplicationContext applicationContext = new StaticApplicationContext(); applicationContext.registerPrototype("endpoint", MyEndpoint.class); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/JdkProxyRegistrationTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/JdkProxyRegistrationTests.java index e361169c..ff5d33c3 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/JdkProxyRegistrationTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/JdkProxyRegistrationTests.java @@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat; @ExtendWith(SpringExtension.class) @ContextConfiguration("jdk-proxy-registration.xml") -public class JdkProxyRegistrationTests { +class JdkProxyRegistrationTests { @Autowired private PayloadRootAnnotationMethodEndpointMapping mapping; @@ -46,7 +46,7 @@ public class JdkProxyRegistrationTests { private ApplicationContext applicationContext; @Test - public void registration() throws NoSuchMethodException { + void registration() throws NoSuchMethodException { MethodEndpoint jdkProxy = this.mapping .lookupEndpoint(new QName("http://springframework.org/spring-ws", "Request")); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTests.java index 60f009bc..0479a7d3 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTests.java @@ -30,10 +30,10 @@ import static org.assertj.core.api.Assertions.assertThat; /** * Test case for AbstractMapBasedEndpointMapping. */ -public class MapBasedSoapEndpointMappingTests { +class MapBasedSoapEndpointMappingTests { @Test - public void testBeanNames() throws Exception { + void testBeanNames() throws Exception { StaticApplicationContext context = new StaticApplicationContext(); context.registerSingleton("endpointMapping", MyMapBasedEndpointMapping.class); @@ -60,7 +60,7 @@ public class MapBasedSoapEndpointMappingTests { } @Test - public void testDisabledBeanNames() throws Exception { + void testDisabledBeanNames() throws Exception { StaticApplicationContext context = new StaticApplicationContext(); context.registerSingleton("endpoint", Object.class); @@ -75,7 +75,7 @@ public class MapBasedSoapEndpointMappingTests { } @Test - public void testEndpointMap() throws Exception { + void testEndpointMap() throws Exception { Map endpointMap = new TreeMap<>(); Object endpoint1 = new Object(); @@ -108,11 +108,11 @@ public class MapBasedSoapEndpointMappingTests { private String[] validKeys = new String[0]; - public void setKey(String key) { + void setKey(String key) { this.key = key; } - public void setValidKeys(String[] validKeys) { + void setValidKeys(String[] validKeys) { this.validKeys = validKeys; Arrays.sort(this.validKeys); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTests.java index b4018108..de4e1bf6 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTests.java @@ -49,7 +49,7 @@ import static org.assertj.core.api.Assertions.assertThat; @ExtendWith(SpringExtension.class) @ContextConfiguration("payloadRootAnnotationMethodEndpointMapping.xml") -public class PayloadRootAnnotationMethodEndpointMappingTests { +class PayloadRootAnnotationMethodEndpointMappingTests { @Autowired private PayloadRootAnnotationMethodEndpointMapping mapping; @@ -58,7 +58,7 @@ public class PayloadRootAnnotationMethodEndpointMappingTests { private ApplicationContext applicationContext; @Test - public void registrationSingle() throws NoSuchMethodException { + void registrationSingle() throws NoSuchMethodException { MethodEndpoint endpoint = this.mapping .lookupEndpoint(new QName("http://springframework.org/spring-ws", "Request")); @@ -72,7 +72,7 @@ public class PayloadRootAnnotationMethodEndpointMappingTests { } @Test - public void registrationMultiple() throws NoSuchMethodException { + void registrationMultiple() throws NoSuchMethodException { Method doItMultiple = MyEndpoint.class.getMethod("doItMultiple"); MethodEndpoint expected = new MethodEndpoint("endpoint", this.applicationContext, doItMultiple); @@ -90,7 +90,7 @@ public class PayloadRootAnnotationMethodEndpointMappingTests { } @Test - public void registrationRepeatable() throws NoSuchMethodException { + void registrationRepeatable() throws NoSuchMethodException { Method doItMultiple = MyEndpoint.class.getMethod("doItRepeatable"); MethodEndpoint expected = new MethodEndpoint("endpoint", this.applicationContext, doItMultiple); @@ -108,12 +108,12 @@ public class PayloadRootAnnotationMethodEndpointMappingTests { } @Test - public void registrationInvalid() { + void registrationInvalid() { assertThat(this.mapping.lookupEndpoint(new QName("http://springframework.org/spring-ws", "Invalid"))).isNull(); } @Test - public void invoke() throws Exception { + void invoke() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(); SOAPMessage request = messageFactory.createMessage(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMappingTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMappingTests.java index 91168124..7ce6de0d 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMappingTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMappingTests.java @@ -28,17 +28,17 @@ import org.springframework.ws.context.MessageContext; import static org.assertj.core.api.Assertions.assertThat; -public class PayloadRootQNameEndpointMappingTests { +class PayloadRootQNameEndpointMappingTests { private PayloadRootQNameEndpointMapping mapping; @BeforeEach - public void setUp() { + void setUp() { this.mapping = new PayloadRootQNameEndpointMapping(); } @Test - public void testResolveQNames() throws Exception { + void testResolveQNames() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(""); MessageContext context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); @@ -50,7 +50,7 @@ public class PayloadRootQNameEndpointMappingTests { } @Test - public void testGetQNameNameNamespace() throws Exception { + void testGetQNameNameNamespace() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(""); MessageContext context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTests.java index 25d182a2..c8dd1acc 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTests.java @@ -26,12 +26,12 @@ import org.springframework.ws.context.MessageContext; import static org.assertj.core.api.Assertions.assertThat; -public class SimpleMethodEndpointMappingTests { +class SimpleMethodEndpointMappingTests { private SimpleMethodEndpointMapping mapping; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.mapping = new SimpleMethodEndpointMapping(); this.mapping.setMethodPrefix("prefix"); @@ -44,14 +44,14 @@ public class SimpleMethodEndpointMappingTests { } @Test - public void testRegistration() { + void testRegistration() { assertThat(this.mapping.lookupEndpoint("MyRequest")).isNotNull(); assertThat(this.mapping.lookupEndpoint("request")).isNull(); } @Test - public void testGetLookupKeyForMessageNoNamespace() throws Exception { + void testGetLookupKeyForMessageNoNamespace() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(""); MessageContext messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); @@ -60,7 +60,7 @@ public class SimpleMethodEndpointMappingTests { } @Test - public void testGetLookupKeyForMessageNamespace() throws Exception { + void testGetLookupKeyForMessageNamespace() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage( ""); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMappingTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMappingTests.java index 1b2b74f2..57aaf16c 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMappingTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMappingTests.java @@ -35,26 +35,26 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class UriEndpointMappingTests { +class UriEndpointMappingTests { private UriEndpointMapping mapping; private MessageContext context; @BeforeEach - public void setUp() { + void setUp() { this.mapping = new UriEndpointMapping(); this.context = new DefaultMessageContext(new MockWebServiceMessageFactory()); } @AfterEach - public void clearContext() { + void clearContext() { TransportContextHolder.setTransportContext(null); } @Test - public void getLookupKeyForMessage() throws Exception { + void getLookupKeyForMessage() throws Exception { WebServiceConnection connectionMock = createMock(WebServiceConnection.class); TransportContextHolder.setTransportContext(new DefaultTransportContext(connectionMock)); @@ -70,7 +70,7 @@ public class UriEndpointMappingTests { } @Test - public void getLookupKeyForMessagePath() throws Exception { + void getLookupKeyForMessagePath() throws Exception { this.mapping.setUsePath(true); @@ -88,7 +88,7 @@ public class UriEndpointMappingTests { } @Test - public void testValidateLookupKey() { + void testValidateLookupKey() { assertThat(this.mapping.validateLookupKey("http://example.com/services")).isTrue(); assertThat(this.mapping.validateLookupKey("some string")).isFalse(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMappingTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMappingTests.java index 22e74563..a141ee37 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMappingTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMappingTests.java @@ -26,17 +26,17 @@ import org.springframework.ws.context.MessageContext; import static org.assertj.core.api.Assertions.assertThat; -public class XPathPayloadEndpointMappingTests { +class XPathPayloadEndpointMappingTests { private XPathPayloadEndpointMapping mapping; @BeforeEach - public void setUp() { + void setUp() { this.mapping = new XPathPayloadEndpointMapping(); } @Test - public void testGetLookupKeyForMessage() throws Exception { + void testGetLookupKeyForMessage() throws Exception { this.mapping.setExpression("/root/text()"); this.mapping.afterPropertiesSet(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMappingTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMappingTests.java index fedd560f..846fe124 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMappingTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMappingTests.java @@ -26,17 +26,17 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -public class XmlRootElementEndpointMappingTests { +class XmlRootElementEndpointMappingTests { private XmlRootElementEndpointMapping mapping; @BeforeEach - public void createMapping() { + void createMapping() { this.mapping = new XmlRootElementEndpointMapping(); } @Test - public void rootElement() throws NoSuchMethodException { + void rootElement() throws NoSuchMethodException { Method rootElement = getClass().getMethod("rootElement", MyRootElement.class); QName name = this.mapping.getLookupKeyForMethod(rootElement); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/NamespaceUtilsTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/NamespaceUtilsTests.java index a4d8beb2..9b6c7e2c 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/NamespaceUtilsTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/NamespaceUtilsTests.java @@ -29,10 +29,10 @@ import org.springframework.ws.server.endpoint.annotation.Namespaces; import static org.assertj.core.api.Assertions.assertThat; @Namespaces({ @Namespace(prefix = "prefix1", uri = "class1"), @Namespace(uri = "class2") }) -public class NamespaceUtilsTests { +class NamespaceUtilsTests { @Test - public void getNamespaceContextMethod() throws NoSuchMethodException { + void getNamespaceContextMethod() throws NoSuchMethodException { Method method = getClass().getMethod("method"); NamespaceContext namespaceContext = NamespaceUtils.getNamespaceContext(method); @@ -43,9 +43,9 @@ public class NamespaceUtilsTests { } @Test - public void getNamespaceContextClass() throws NoSuchMethodException { + void getNamespaceContextClass() throws NoSuchMethodException { - Method method = getClass().getMethod("getNamespaceContextClass"); + Method method = getClass().getDeclaredMethod("getNamespaceContextClass"); NamespaceContext namespaceContext = NamespaceUtils.getNamespaceContext(method); assertThat(namespaceContext.getNamespaceURI("prefix1")).isEqualTo("class1"); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/PayloadRootUtilsTests.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/PayloadRootUtilsTests.java index 3b4dae12..e6ac1bbe 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/PayloadRootUtilsTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/PayloadRootUtilsTests.java @@ -41,10 +41,10 @@ import org.springframework.xml.transform.TransformerFactoryUtils; import static org.assertj.core.api.Assertions.assertThat; -public class PayloadRootUtilsTests { +class PayloadRootUtilsTests { @Test - public void testGetQNameForDomSource() throws Exception { + void testGetQNameForDomSource() throws Exception { DocumentBuilderFactory factory = DocumentBuilderFactoryUtils.newInstance(); DocumentBuilder builder = factory.newDocumentBuilder(); @@ -61,7 +61,7 @@ public class PayloadRootUtilsTests { } @Test - public void testGetQNameForStaxSourceStreamReader() throws Exception { + void testGetQNameForStaxSourceStreamReader() throws Exception { String contents = ""; XMLInputFactory inputFactory = XMLInputFactoryUtils.newInstance(); @@ -76,7 +76,7 @@ public class PayloadRootUtilsTests { } @Test - public void testGetQNameForStaxSourceEventReader() throws Exception { + void testGetQNameForStaxSourceEventReader() throws Exception { String contents = ""; XMLInputFactory inputFactory = XMLInputFactoryUtils.newInstance(); @@ -91,7 +91,7 @@ public class PayloadRootUtilsTests { } @Test - public void testGetQNameForStreamSource() throws Exception { + void testGetQNameForStreamSource() throws Exception { String contents = ""; Source source = new StreamSource(new StringReader(contents)); QName qName = PayloadRootUtils.getPayloadRootQName(source, TransformerFactoryUtils.newInstance()); @@ -103,7 +103,7 @@ public class PayloadRootUtilsTests { } @Test - public void testGetQNameForSaxSource() throws Exception { + void testGetQNameForSaxSource() throws Exception { String contents = ""; Source source = new SAXSource(new InputSource(new StringReader(contents))); QName qName = PayloadRootUtils.getPayloadRootQName(source, TransformerFactoryUtils.newInstance()); @@ -115,7 +115,7 @@ public class PayloadRootUtilsTests { } @Test - public void testGetQNameForNullSource() throws Exception { + void testGetQNameForNullSource() throws Exception { QName qName = PayloadRootUtils.getPayloadRootQName(null, TransformerFactoryUtils.newInstance()); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTests.java index ced4c43a..ac5622ec 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTests.java @@ -45,7 +45,7 @@ public abstract class AbstractSoapBodyTests extends AbstractSoapElementTests { protected abstract SoapBody createSoapBody() throws Exception; @Test - public void testPayload() throws Exception { + void testPayload() throws Exception { String payload = ""; this.transformer.transform(new StringSource(payload), this.soapBody.getPayloadResult()); @@ -54,7 +54,7 @@ public abstract class AbstractSoapBodyTests extends AbstractSoapElementTests { } @Test - public void testGetPayloadResultTwice() throws Exception { + void testGetPayloadResultTwice() throws Exception { String payload = ""; this.transformer.transform(new StringSource(payload), this.soapBody.getPayloadResult()); @@ -68,12 +68,12 @@ public abstract class AbstractSoapBodyTests extends AbstractSoapElementTests { } @Test - public void testNoFault() { + void testNoFault() { assertThat(this.soapBody.hasFault()).isFalse(); } @Test - public void testAddFaultWithExistingPayload() throws Exception { + void testAddFaultWithExistingPayload() throws Exception { StringSource contents = new StringSource(""); this.transformer.transform(contents, this.soapBody.getPayloadResult()); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTests.java index 4f671c92..541415d1 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTests.java @@ -46,7 +46,7 @@ public abstract class AbstractSoapElementTests { protected abstract SoapElement createSoapElement() throws Exception; @Test - public void testAttributes() { + void testAttributes() { QName name = new QName("http://springframework.org/spring-ws", "attribute"); String value = "value"; @@ -60,7 +60,7 @@ public abstract class AbstractSoapElementTests { } @Test - public void testAddNamespaceDeclaration() { + void testAddNamespaceDeclaration() { String prefix = "p"; String namespace = "http://springframework.org/spring-ws"; @@ -68,7 +68,7 @@ public abstract class AbstractSoapElementTests { } @Test - public void testAddDefaultNamespaceDeclaration() { + void testAddDefaultNamespaceDeclaration() { String prefix = ""; String namespace = "http://springframework.org/spring-ws"; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTests.java index bb9f1327..47b3b302 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTests.java @@ -34,7 +34,7 @@ public abstract class AbstractSoapEnvelopeTests extends AbstractSoapElementTests protected abstract SoapEnvelope createSoapEnvelope() throws Exception; @Test - public void testGetHeader() { + void testGetHeader() { SoapHeader header = this.soapEnvelope.getHeader(); @@ -42,7 +42,7 @@ public abstract class AbstractSoapEnvelopeTests extends AbstractSoapElementTests } @Test - public void testGetBody() { + void testGetBody() { SoapBody body = this.soapEnvelope.getBody(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTests.java index 0e05e75f..3546896c 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTests.java @@ -46,7 +46,7 @@ public abstract class AbstractSoapHeaderTests extends AbstractSoapElementTests { protected abstract SoapHeader createSoapHeader() throws Exception; @Test - public void testAddHeaderElement() throws Exception { + void testAddHeaderElement() throws Exception { QName qName = new QName(NAMESPACE, "localName", PREFIX); SoapHeaderElement headerElement = this.soapHeader.addHeaderElement(qName); @@ -66,7 +66,7 @@ public abstract class AbstractSoapHeaderTests extends AbstractSoapElementTests { } @Test - public void testRemoveHeaderElement() { + void testRemoveHeaderElement() { QName qName = new QName(NAMESPACE, "localName", PREFIX); this.soapHeader.removeHeaderElement(qName); @@ -78,7 +78,7 @@ public abstract class AbstractSoapHeaderTests extends AbstractSoapElementTests { } @Test - public void testExamineAllHeaderElement() throws Exception { + void testExamineAllHeaderElement() throws Exception { QName qName = new QName(NAMESPACE, "localName", PREFIX); SoapHeaderElement headerElement = this.soapHeader.addHeaderElement(qName); @@ -108,7 +108,7 @@ public abstract class AbstractSoapHeaderTests extends AbstractSoapElementTests { } @Test - public void testExamineHeaderElementWithName() { + void testExamineHeaderElementWithName() { QName name1 = new QName(NAMESPACE, "name1", PREFIX); QName name2 = new QName(NAMESPACE, "name2", PREFIX); @@ -126,7 +126,7 @@ public abstract class AbstractSoapHeaderTests extends AbstractSoapElementTests { } @Test - public void testExamineMustUnderstandHeaderElements() { + void testExamineMustUnderstandHeaderElements() { QName qName1 = new QName(NAMESPACE, "localName1", PREFIX); SoapHeaderElement headerElement1 = this.soapHeader.addHeaderElement(qName1); @@ -150,7 +150,7 @@ public abstract class AbstractSoapHeaderTests extends AbstractSoapElementTests { } @Test - public void testGetResult() throws Exception { + void testGetResult() throws Exception { String content = ""; this.transformer.transform(new StringSource(content), this.soapHeader.getResult()); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageFactoryTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageFactoryTests.java index c378ca10..95fae950 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageFactoryTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageFactoryTests.java @@ -28,7 +28,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public abstract class AbstractSoapMessageFactoryTests extends AbstractWebServiceMessageFactoryTests { @Test - public void testCreateEmptySoapMessage() { + void testCreateEmptySoapMessage() { WebServiceMessage message = this.messageFactory.createWebServiceMessage(); @@ -36,22 +36,22 @@ public abstract class AbstractSoapMessageFactoryTests extends AbstractWebService } @Test - public void testCreateSoapMessageIllFormedXml() { + void testCreateSoapMessageIllFormedXml() { assertThatExceptionOfType(InvalidXmlException.class).isThrownBy(this::doTestCreateSoapMessageIllFormedXml); } - public abstract void doTestCreateSoapMessageIllFormedXml() throws Exception; + protected abstract void doTestCreateSoapMessageIllFormedXml() throws Exception; @Test - public abstract void testCreateSoapMessageNoAttachment() throws Exception; + protected abstract void testCreateSoapMessageNoAttachment() throws Exception; @Test - public abstract void testCreateSoapMessageSwA() throws Exception; + protected abstract void testCreateSoapMessageSwA() throws Exception; @Test - public abstract void testCreateSoapMessageMtom() throws Exception; + protected abstract void testCreateSoapMessageMtom() throws Exception; @Test - public abstract void testCreateSoapMessageMissingContentType() throws Exception; + protected abstract void testCreateSoapMessageMissingContentType() throws Exception; } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTests.java index 0b88371a..bc0c3dd7 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTests.java @@ -64,7 +64,7 @@ public abstract class AbstractSoapMessageTests extends AbstractMimeMessageTests protected abstract SoapMessage createSoapMessage() throws Exception; @Test - public void testValidate() throws Exception { + void testValidate() throws Exception { XmlValidator validator = XmlValidatorFactory.createValidator(getSoapSchemas(), XmlValidatorFactory.SCHEMA_W3C_XML); @@ -76,7 +76,7 @@ public abstract class AbstractSoapMessageTests extends AbstractMimeMessageTests } @Test - public void testSoapAction() { + void testSoapAction() { assertThat(this.soapMessage.getSoapAction()).isEqualTo("\"\""); @@ -86,7 +86,7 @@ public abstract class AbstractSoapMessageTests extends AbstractMimeMessageTests } @Test - public void testCharsetAttribute() throws Exception { + void testCharsetAttribute() throws Exception { MockTransportOutputStream outputStream = new MockTransportOutputStream(new ByteArrayOutputStream()); this.soapMessage.writeTo(outputStream); @@ -107,7 +107,7 @@ public abstract class AbstractSoapMessageTests extends AbstractMimeMessageTests } @Test - public void testSetStreamingPayload() throws Exception { + void testSetStreamingPayload() throws Exception { if (!(this.soapMessage instanceof StreamingWebServiceMessage streamingMessage)) { return; @@ -144,21 +144,21 @@ public abstract class AbstractSoapMessageTests extends AbstractMimeMessageTests protected abstract Resource[] getSoapSchemas(); @Test - public abstract void testGetVersion(); + protected abstract void testGetVersion(); @Test - public abstract void testWriteToTransportOutputStream() throws Exception; + protected abstract void testWriteToTransportOutputStream() throws Exception; @Test - public abstract void testWriteToTransportResponseAttachment() throws Exception; + protected abstract void testWriteToTransportResponseAttachment() throws Exception; @Test - public abstract void testToDocument() throws Exception; + protected abstract void testToDocument() throws Exception; @Test - public abstract void testSetLiveDocument() throws Exception; + protected abstract void testSetLiveDocument() throws Exception; @Test - public abstract void testSetOtherDocument() throws Exception; + protected abstract void testSetOtherDocument() throws Exception; } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTests.java index 69f41134..b0a99a80 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTests.java @@ -36,7 +36,7 @@ public abstract class AbstractWsAddressingTests { protected MessageFactory messageFactory; @BeforeEach - public void createMessageFactory() throws Exception { + void createMessageFactory() throws Exception { this.messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTests.java index 397bea47..06fdf012 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTests.java @@ -53,7 +53,7 @@ public abstract class AbstractActionCallbackTests extends AbstractWsAddressingTe private WebServiceConnection connectionMock; @BeforeEach - public void createMocks() { + void createMocks() { this.strategyMock = createMock(MessageIdStrategy.class); @@ -64,12 +64,12 @@ public abstract class AbstractActionCallbackTests extends AbstractWsAddressingTe } @AfterEach - public void clearContext() { + void clearContext() { TransportContextHolder.setTransportContext(null); } @Test - public void testValid() throws Exception { + void testValid() throws Exception { URI action = new URI("http://example.com/fabrikam/mail/Delete"); URI to = new URI("mailto:fabrikam@example.com"); @@ -91,7 +91,7 @@ public abstract class AbstractActionCallbackTests extends AbstractWsAddressingTe } @Test - public void testDefaults() throws Exception { + void testDefaults() throws Exception { URI action = new URI("http://example.com/fabrikam/mail/Delete"); URI connectionUri = new URI("mailto:fabrikam@example.com"); @@ -116,7 +116,7 @@ public abstract class AbstractActionCallbackTests extends AbstractWsAddressingTe } @Test - public void testNotInitializeTo() throws Exception { + void testNotInitializeTo() throws Exception { URI action = new URI("http://example.com/fabrikam/mail/Delete"); URI connectionUri = new URI("mailto:fabrikam@example.com"); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback10Tests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback10Tests.java index e192e4c3..ef0657cb 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback10Tests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback10Tests.java @@ -19,7 +19,7 @@ package org.springframework.ws.soap.addressing.client; import org.springframework.ws.soap.addressing.version.Addressing10; import org.springframework.ws.soap.addressing.version.AddressingVersion; -public class ActionCallback10Tests extends AbstractActionCallbackTests { +class ActionCallback10Tests extends AbstractActionCallbackTests { @Override protected AddressingVersion getVersion() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback200408Tests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback200408Tests.java index d641f4af..2168d6a4 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback200408Tests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback200408Tests.java @@ -19,7 +19,7 @@ package org.springframework.ws.soap.addressing.client; import org.springframework.ws.soap.addressing.version.Addressing200408; import org.springframework.ws.soap.addressing.version.AddressingVersion; -public class ActionCallback200408Tests extends AbstractActionCallbackTests { +class ActionCallback200408Tests extends AbstractActionCallbackTests { @Override protected AddressingVersion getVersion() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategyTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategyTests.java index ef351434..8406b9de 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategyTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategyTests.java @@ -23,17 +23,17 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -public class UuidMessageIdStrategyTests { +class UuidMessageIdStrategyTests { private MessageIdStrategy strategy; @BeforeEach - public final void setUp() { + final void setUp() { this.strategy = new UuidMessageIdStrategy(); } @Test - public void testStrategy() { + void testStrategy() { URI messageId1 = this.strategy.newMessageId(null); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTests.java index 624bc7d8..572dcc89 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTests.java @@ -49,7 +49,7 @@ public abstract class AbstractAddressingInterceptorTests extends AbstractWsAddre protected MessageIdStrategy strategyMock; @BeforeEach - public void createMocks() throws Exception { + void createMocks() throws Exception { this.strategyMock = createMock(MessageIdStrategy.class); expect(this.strategyMock.isDuplicate(isA(URI.class))).andReturn(false).anyTimes(); @@ -60,7 +60,7 @@ public abstract class AbstractAddressingInterceptorTests extends AbstractWsAddre } @Test - public void testUnderstands() throws Exception { + void testUnderstands() throws Exception { SaajSoapMessage validRequest = loadSaajMessage(getTestPath() + "/valid.xml"); Iterator iterator = validRequest.getSoapHeader().examineAllHeaderElements(); @@ -76,7 +76,7 @@ public abstract class AbstractAddressingInterceptorTests extends AbstractWsAddre } @Test - public void testValidRequest() throws Exception { + void testValidRequest() throws Exception { SaajSoapMessage valid = loadSaajMessage(getTestPath() + "/valid.xml"); MessageContext context = new DefaultMessageContext(valid, new SaajSoapMessageFactory(this.messageFactory)); @@ -92,7 +92,7 @@ public abstract class AbstractAddressingInterceptorTests extends AbstractWsAddre } @Test - public void testNoMessageId() throws Exception { + void testNoMessageId() throws Exception { SaajSoapMessage valid = loadSaajMessage(getTestPath() + "/request-no-message-id.xml"); MessageContext context = new DefaultMessageContext(valid, new SaajSoapMessageFactory(this.messageFactory)); @@ -112,7 +112,7 @@ public abstract class AbstractAddressingInterceptorTests extends AbstractWsAddre } @Test - public void testNoReplyTo() throws Exception { + void testNoReplyTo() throws Exception { SaajSoapMessage valid = loadSaajMessage(getTestPath() + "/request-no-reply-to.xml"); MessageContext context = new DefaultMessageContext(valid, new SaajSoapMessageFactory(this.messageFactory)); @@ -134,7 +134,7 @@ public abstract class AbstractAddressingInterceptorTests extends AbstractWsAddre } @Test - public void testAnonymousReplyTo() throws Exception { + void testAnonymousReplyTo() throws Exception { SaajSoapMessage valid = loadSaajMessage(getTestPath() + "/request-anonymous.xml"); MessageContext context = new DefaultMessageContext(valid, new SaajSoapMessageFactory(this.messageFactory)); @@ -155,7 +155,7 @@ public abstract class AbstractAddressingInterceptorTests extends AbstractWsAddre } @Test - public void testNoneReplyTo() throws Exception { + protected void testNoneReplyTo() throws Exception { SaajSoapMessage valid = loadSaajMessage(getTestPath() + "/request-none.xml"); MessageContext context = new DefaultMessageContext(valid, new SaajSoapMessageFactory(this.messageFactory)); @@ -169,7 +169,7 @@ public abstract class AbstractAddressingInterceptorTests extends AbstractWsAddre } @Test - public void testFaultTo() throws Exception { + void testFaultTo() throws Exception { SaajSoapMessage valid = loadSaajMessage(getTestPath() + "/request-fault-to.xml"); MessageContext context = new DefaultMessageContext(valid, new SaajSoapMessageFactory(this.messageFactory)); @@ -193,7 +193,7 @@ public abstract class AbstractAddressingInterceptorTests extends AbstractWsAddre } @Test - public void testOutOfBandReplyTo() throws Exception { + void testOutOfBandReplyTo() throws Exception { WebServiceMessageSender senderMock = createMock(WebServiceMessageSender.class); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Tests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Tests.java index be6cc150..ec275c25 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Tests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Tests.java @@ -18,6 +18,8 @@ package org.springframework.ws.soap.addressing.server; import java.net.URI; +import org.junit.jupiter.api.Test; + import org.springframework.ws.context.DefaultMessageContext; import org.springframework.ws.context.MessageContext; import org.springframework.ws.soap.SoapMessage; @@ -31,7 +33,7 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class AddressingInterceptor10Tests extends AbstractAddressingInterceptorTests { +class AddressingInterceptor10Tests extends AbstractAddressingInterceptorTests { @Override protected AddressingVersion getVersion() { @@ -43,7 +45,8 @@ public class AddressingInterceptor10Tests extends AbstractAddressingInterceptorT return "10"; } - public void testNoTo() throws Exception { + @Test + void testNoTo() throws Exception { SaajSoapMessage valid = loadSaajMessage(getTestPath() + "/request-no-to.xml"); MessageContext context = new DefaultMessageContext(valid, new SaajSoapMessageFactory(this.messageFactory)); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor200408Tests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor200408Tests.java index 58d05653..bd921140 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor200408Tests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor200408Tests.java @@ -19,7 +19,7 @@ package org.springframework.ws.soap.addressing.server; import org.springframework.ws.soap.addressing.version.Addressing200408; import org.springframework.ws.soap.addressing.version.AddressingVersion; -public class AddressingInterceptor200408Tests extends AbstractAddressingInterceptorTests { +class AddressingInterceptor200408Tests extends AbstractAddressingInterceptorTests { @Override protected AddressingVersion getVersion() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTests.java index e59c4fdf..d5712200 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTests.java @@ -45,7 +45,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Arjen Poutsma * @author Nate Stoddard */ -public class AnnotationActionMethodEndpointMappingTests { +class AnnotationActionMethodEndpointMappingTests { private StaticApplicationContext applicationContext; @@ -54,7 +54,7 @@ public class AnnotationActionMethodEndpointMappingTests { private MessageFactory messageFactory; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); @@ -69,7 +69,7 @@ public class AnnotationActionMethodEndpointMappingTests { } @Test - public void mapping() throws Exception { + void mapping() throws Exception { MessageContext messageContext = createMessageContext(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTests.java index 9c6f1092..6a15d53c 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTests.java @@ -35,14 +35,14 @@ import org.springframework.ws.soap.server.endpoint.interceptor.PayloadValidating import static org.assertj.core.api.Assertions.assertThat; -public class SimpleActionEndpointMappingTests extends AbstractWsAddressingTests { +class SimpleActionEndpointMappingTests extends AbstractWsAddressingTests { private SimpleActionEndpointMapping mapping; private Endpoint1 endpoint1; @BeforeEach - public void createMappings() throws Exception { + void createMappings() throws Exception { this.mapping = new SimpleActionEndpointMapping(); @@ -61,7 +61,7 @@ public class SimpleActionEndpointMappingTests extends AbstractWsAddressingTests } @Test - public void testMatch() throws Exception { + void testMatch() throws Exception { SaajSoapMessage message = loadSaajMessage("200408/valid.xml"); MessageContext messageContext = new DefaultMessageContext(message, @@ -81,7 +81,7 @@ public class SimpleActionEndpointMappingTests extends AbstractWsAddressingTests } @Test - public void testNoMatch() throws Exception { + void testNoMatch() throws Exception { SaajSoapMessage message = loadSaajMessage("200408/response-no-message-id.xml"); MessageContext messageContext = new DefaultMessageContext(message, diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/client/core/SaajSoapActionCallbackTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/client/core/SaajSoapActionCallbackTests.java index 9ccd66d0..75f2ba98 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/client/core/SaajSoapActionCallbackTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/client/core/SaajSoapActionCallbackTests.java @@ -32,14 +32,14 @@ import org.springframework.ws.transport.TransportConstants; import static org.assertj.core.api.Assertions.assertThat; -public class SaajSoapActionCallbackTests { +class SaajSoapActionCallbackTests { private SaajSoapMessageFactory saaj11Factory = new SaajSoapMessageFactory(); private SaajSoapMessageFactory saaj12Factory = new SaajSoapMessageFactory(); @BeforeEach - public void init() throws SOAPException { + void init() throws SOAPException { MessageFactory messageFactory11 = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); @@ -54,7 +54,7 @@ public class SaajSoapActionCallbackTests { } @Test - public void noSoapAction11ShouldProduceEmptySoapActionHeader() { + void noSoapAction11ShouldProduceEmptySoapActionHeader() { SaajSoapMessage message = this.saaj11Factory.createWebServiceMessage(); String[] soapActionHeaders = message.getSaajMessage() @@ -65,7 +65,7 @@ public class SaajSoapActionCallbackTests { } @Test - public void soapAction11ShouldProduceSoapActionHeader() throws IOException { + void soapAction11ShouldProduceSoapActionHeader() throws IOException { SaajSoapMessage message = this.saaj11Factory.createWebServiceMessage(); SoapActionCallback callback = new SoapActionCallback("testAction"); @@ -78,7 +78,7 @@ public class SaajSoapActionCallbackTests { } @Test - public void emptySoapAction11() throws IOException { + void emptySoapAction11() throws IOException { SaajSoapMessage message = this.saaj11Factory.createWebServiceMessage(); SoapActionCallback callback = new SoapActionCallback(null); @@ -91,7 +91,7 @@ public class SaajSoapActionCallbackTests { } @Test - public void noSoapAction12() { + void noSoapAction12() { SaajSoapMessage message = this.saaj12Factory.createWebServiceMessage(); String[] soapActionHeaders = message.getSaajMessage() @@ -102,7 +102,7 @@ public class SaajSoapActionCallbackTests { } @Test - public void soapAction12ShouldProduceNoSoapActionHeader() throws IOException { + void soapAction12ShouldProduceNoSoapActionHeader() throws IOException { SaajSoapMessage message = this.saaj12Factory.createWebServiceMessage(); SoapActionCallback callback = new SoapActionCallback("testAction"); @@ -119,7 +119,7 @@ public class SaajSoapActionCallbackTests { } @Test - public void emptySoapAction12ShouldProduceNoSoapActionHeader() throws IOException { + void emptySoapAction12ShouldProduceNoSoapActionHeader() throws IOException { SaajSoapMessage message = this.saaj12Factory.createWebServiceMessage(); SoapActionCallback callback = new SoapActionCallback(null); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11BodyTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11BodyTests.java index 53ca26cf..4d10776a 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11BodyTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11BodyTests.java @@ -29,7 +29,7 @@ import org.springframework.ws.soap.soap11.AbstractSoap11BodyTests; import static org.assertj.core.api.Assertions.assertThat; -public class SaajSoap11BodyTests extends AbstractSoap11BodyTests { +class SaajSoap11BodyTests extends AbstractSoap11BodyTests { @Override protected SoapBody createSoapBody() throws Exception { @@ -41,7 +41,7 @@ public class SaajSoap11BodyTests extends AbstractSoap11BodyTests { } @Test - public void testLangAttributeOnSoap11FaultString() throws Exception { + void testLangAttributeOnSoap11FaultString() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); SOAPMessage saajMessage = messageFactory.createMessage(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11EnvelopeTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11EnvelopeTests.java index 05c0c1d0..b6f2b80e 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11EnvelopeTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11EnvelopeTests.java @@ -23,7 +23,7 @@ import jakarta.xml.soap.SOAPMessage; import org.springframework.ws.soap.SoapEnvelope; import org.springframework.ws.soap.soap11.AbstractSoap11EnvelopeTests; -public class SaajSoap11EnvelopeTests extends AbstractSoap11EnvelopeTests { +class SaajSoap11EnvelopeTests extends AbstractSoap11EnvelopeTests { @Override protected SoapEnvelope createSoapEnvelope() throws Exception { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11HeaderTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11HeaderTests.java index 9a62ab1d..8c075c2b 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11HeaderTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11HeaderTests.java @@ -23,7 +23,7 @@ import jakarta.xml.soap.SOAPMessage; import org.springframework.ws.soap.SoapHeader; import org.springframework.ws.soap.soap11.AbstractSoap11HeaderTests; -public class SaajSoap11HeaderTests extends AbstractSoap11HeaderTests { +class SaajSoap11HeaderTests extends AbstractSoap11HeaderTests { @Override protected SoapHeader createSoapHeader() throws Exception { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageFactoryTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageFactoryTests.java index 914b4c53..b06c9f57 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageFactoryTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageFactoryTests.java @@ -33,7 +33,7 @@ import org.springframework.ws.soap.soap11.AbstractSoap11MessageFactoryTests; import static org.assertj.core.api.Assertions.assertThat; -public class SaajSoap11MessageFactoryTests extends AbstractSoap11MessageFactoryTests { +class SaajSoap11MessageFactoryTests extends AbstractSoap11MessageFactoryTests { @Override protected WebServiceMessageFactory createMessageFactory() throws Exception { @@ -43,7 +43,7 @@ public class SaajSoap11MessageFactoryTests extends AbstractSoap11MessageFactoryT } @Test - public void properties() throws IOException { + void properties() throws IOException { Map properties = Collections.singletonMap(SOAPMessage.WRITE_XML_DECLARATION, "true"); ((SaajSoapMessageFactory) this.messageFactory).setMessageProperties(properties); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTests.java index 7ad8d7a1..b45e4b6e 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTests.java @@ -36,7 +36,7 @@ import org.springframework.xml.transform.StringSource; import static org.assertj.core.api.Assertions.assertThat; -public class SaajSoap11MessageTests extends AbstractSoap11MessageTests { +class SaajSoap11MessageTests extends AbstractSoap11MessageTests { private SOAPMessage saajMessage; @@ -61,7 +61,7 @@ public class SaajSoap11MessageTests extends AbstractSoap11MessageTests { } @Test - public void testGetPayloadSource() throws Exception { + void testGetPayloadSource() throws Exception { this.saajMessage.getSOAPPart().getEnvelope().getBody().addChildElement("child"); Source source = this.soapMessage.getPayloadSource(); @@ -72,7 +72,7 @@ public class SaajSoap11MessageTests extends AbstractSoap11MessageTests { } @Test - public void testGetPayloadSourceText() throws Exception { + void testGetPayloadSourceText() throws Exception { SOAPBody body = this.saajMessage.getSOAPPart().getEnvelope().getBody(); body.addTextNode(" "); @@ -85,7 +85,7 @@ public class SaajSoap11MessageTests extends AbstractSoap11MessageTests { } @Test - public void testGetPayloadResult() throws Exception { + void testGetPayloadResult() throws Exception { StringSource source = new StringSource(""); Result result = this.soapMessage.getPayloadResult(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12BodyTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12BodyTests.java index ea81b776..6361ecc5 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12BodyTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12BodyTests.java @@ -23,7 +23,7 @@ import jakarta.xml.soap.SOAPMessage; import org.springframework.ws.soap.SoapBody; import org.springframework.ws.soap.soap12.AbstractSoap12BodyTests; -public class SaajSoap12BodyTests extends AbstractSoap12BodyTests { +class SaajSoap12BodyTests extends AbstractSoap12BodyTests { @Override protected SoapBody createSoapBody() throws Exception { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12EnvelopeTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12EnvelopeTests.java index 0aed9b89..18849141 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12EnvelopeTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12EnvelopeTests.java @@ -23,7 +23,7 @@ import jakarta.xml.soap.SOAPMessage; import org.springframework.ws.soap.SoapEnvelope; import org.springframework.ws.soap.soap12.AbstractSoap12EnvelopeTests; -public class SaajSoap12EnvelopeTests extends AbstractSoap12EnvelopeTests { +class SaajSoap12EnvelopeTests extends AbstractSoap12EnvelopeTests { @Override protected SoapEnvelope createSoapEnvelope() throws Exception { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12HeaderTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12HeaderTests.java index f1408f4c..35009534 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12HeaderTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12HeaderTests.java @@ -23,7 +23,7 @@ import jakarta.xml.soap.SOAPMessage; import org.springframework.ws.soap.SoapHeader; import org.springframework.ws.soap.soap12.AbstractSoap12HeaderTests; -public class SaajSoap12HeaderTests extends AbstractSoap12HeaderTests { +class SaajSoap12HeaderTests extends AbstractSoap12HeaderTests { @Override protected SoapHeader createSoapHeader() throws Exception { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageFactoryTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageFactoryTests.java index a4be0001..8fb4c752 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageFactoryTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageFactoryTests.java @@ -22,7 +22,7 @@ import jakarta.xml.soap.SOAPConstants; import org.springframework.ws.WebServiceMessageFactory; import org.springframework.ws.soap.soap12.AbstractSoap12MessageFactoryTests; -public class SaajSoap12MessageFactoryTests extends AbstractSoap12MessageFactoryTests { +class SaajSoap12MessageFactoryTests extends AbstractSoap12MessageFactoryTests { @Override protected WebServiceMessageFactory createMessageFactory() throws Exception { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTests.java index 491a6699..7469e4f3 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTests.java @@ -22,6 +22,7 @@ import javax.xml.transform.Source; import jakarta.xml.soap.MessageFactory; import jakarta.xml.soap.SOAPConstants; import jakarta.xml.soap.SOAPMessage; +import org.junit.jupiter.api.Test; import org.xmlunit.assertj.XmlAssert; import org.springframework.ws.soap.SoapMessage; @@ -31,7 +32,7 @@ import org.springframework.xml.transform.StringSource; import static org.assertj.core.api.Assertions.assertThat; -public class SaajSoap12MessageTests extends AbstractSoap12MessageTests { +class SaajSoap12MessageTests extends AbstractSoap12MessageTests { @Override protected String getNS() { @@ -54,7 +55,8 @@ public class SaajSoap12MessageTests extends AbstractSoap12MessageTests { return new SaajSoapMessage(this.saajMessage, true, messageFactory); } - public void testGetPayloadSource() throws Exception { + @Test + void testGetPayloadSource() throws Exception { this.saajMessage.getSOAPBody().addChildElement("child"); Source source = this.soapMessage.getPayloadSource(); @@ -64,7 +66,8 @@ public class SaajSoap12MessageTests extends AbstractSoap12MessageTests { XmlAssert.assertThat(result.toString()).and("").ignoreWhitespace().areIdentical(); } - public void testGetPayloadSourceText() throws Exception { + @Test + void testGetPayloadSourceText() throws Exception { this.saajMessage.getSOAPBody().addTextNode(" "); this.saajMessage.getSOAPBody().addChildElement("child"); @@ -75,7 +78,8 @@ public class SaajSoap12MessageTests extends AbstractSoap12MessageTests { XmlAssert.assertThat(result.toString()).and("").ignoreWhitespace().areIdentical(); } - public void testGetPayloadResult() throws Exception { + @Test + void testGetPayloadResult() throws Exception { StringSource source = new StringSource(""); Result result = this.soapMessage.getPayloadResult(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajContentHandlerTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajContentHandlerTests.java index 82ea7eb3..bbc6c675 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajContentHandlerTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajContentHandlerTests.java @@ -37,7 +37,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils; import static org.assertj.core.api.Assertions.assertThat; -public class SaajContentHandlerTests { +class SaajContentHandlerTests { private SaajContentHandler handler; @@ -46,7 +46,7 @@ public class SaajContentHandlerTests { private SOAPEnvelope envelope; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(); SOAPMessage message = messageFactory.createMessage(); @@ -56,7 +56,7 @@ public class SaajContentHandlerTests { } @Test - public void testHandler() throws Exception { + void testHandler() throws Exception { String content = "" diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTests.java index beb961ed..65ec4d35 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTests.java @@ -41,17 +41,17 @@ import org.springframework.xml.DocumentBuilderFactoryUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -public class SaajUtilsTests { +class SaajUtilsTests { private MessageFactory messageFactory; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.messageFactory = MessageFactory.newInstance(); } @Test - public void testToName() throws Exception { + void testToName() throws Exception { SOAPMessage message = this.messageFactory.createMessage(); QName qName = new QName("localPart"); @@ -65,7 +65,7 @@ public class SaajUtilsTests { } @Test - public void testToNameNamespace() throws Exception { + void testToNameNamespace() throws Exception { SOAPMessage message = this.messageFactory.createMessage(); QName qName = new QName("namespace", "localPart"); @@ -80,7 +80,7 @@ public class SaajUtilsTests { } @Test - public void testToNameNamespacePrefix() throws Exception { + void testToNameNamespacePrefix() throws Exception { SOAPMessage message = this.messageFactory.createMessage(); QName qName = new QName("namespace", "localPart", "prefix"); @@ -94,7 +94,7 @@ public class SaajUtilsTests { } @Test - public void testToQName() throws Exception { + void testToQName() throws Exception { SOAPMessage message = this.messageFactory.createMessage(); Name name = message.getSOAPPart().getEnvelope().createName("localPart", null, null); @@ -107,7 +107,7 @@ public class SaajUtilsTests { } @Test - public void testToQNameNamespace() throws Exception { + void testToQNameNamespace() throws Exception { SOAPMessage message = this.messageFactory.createMessage(); Name name = message.getSOAPPart().getEnvelope().createName("localPart", null, "namespace"); @@ -120,7 +120,7 @@ public class SaajUtilsTests { } @Test - public void testToQNamePrefixNamespace() throws Exception { + void testToQNamePrefixNamespace() throws Exception { SOAPMessage message = this.messageFactory.createMessage(); Name name = message.getSOAPPart().getEnvelope().createName("localPart", "prefix", "namespace"); @@ -133,7 +133,7 @@ public class SaajUtilsTests { } @Test - public void testLoadMessage() throws Exception { + void testLoadMessage() throws Exception { DocumentBuilderFactory factory = DocumentBuilderFactoryUtils.newInstance(); factory.setNamespaceAware(true); @@ -146,12 +146,12 @@ public class SaajUtilsTests { } @Test - public void testGetSaajVersion() { + void testGetSaajVersion() { assertThat(SaajUtils.getSaajVersion()).isEqualTo(SaajUtils.SAAJ_13); } @Test - public void testGetSaajVersionInvalidEnvelope() { + void testGetSaajVersionInvalidEnvelope() { assertThatExceptionOfType(SOAPException.class).isThrownBy(() -> { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajXmlReaderTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajXmlReaderTests.java index 2f48d768..478c8220 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajXmlReaderTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajXmlReaderTests.java @@ -33,7 +33,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils; import static org.xmlunit.assertj.XmlAssert.assertThat; -public class SaajXmlReaderTests { +class SaajXmlReaderTests { private SaajXmlReader saajReader; @@ -42,7 +42,7 @@ public class SaajXmlReaderTests { private Transformer transformer; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(); this.message = messageFactory.createMessage(); @@ -52,7 +52,7 @@ public class SaajXmlReaderTests { } @Test - public void testNamespacesPrefixes() throws Exception { + void testNamespacesPrefixes() throws Exception { this.saajReader.setFeature("http://xml.org/sax/features/namespaces", true); this.saajReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true); @@ -66,7 +66,7 @@ public class SaajXmlReaderTests { } @Test - public void testNamespacesNoPrefixes() throws Exception { + void testNamespacesNoPrefixes() throws Exception { this.saajReader.setFeature("http://xml.org/sax/features/namespaces", true); this.saajReader.setFeature("http://xml.org/sax/features/namespace-prefixes", false); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/SoapMessageDispatcherTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/SoapMessageDispatcherTests.java index 7f6f8308..10050e49 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/SoapMessageDispatcherTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/SoapMessageDispatcherTests.java @@ -47,21 +47,21 @@ import static org.easymock.EasyMock.isA; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class SoapMessageDispatcherTests { +class SoapMessageDispatcherTests { private SoapMessageDispatcher dispatcher; private SoapEndpointInterceptor interceptorMock; @BeforeEach - public void setUp() { + void setUp() { this.interceptorMock = createMock(SoapEndpointInterceptor.class); this.dispatcher = new SoapMessageDispatcher(); } @Test - public void testProcessMustUnderstandHeadersUnderstoodSoap11() throws Exception { + void testProcessMustUnderstandHeadersUnderstoodSoap11() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); SOAPMessage request = messageFactory.createMessage(); @@ -86,7 +86,7 @@ public class SoapMessageDispatcherTests { } @Test - public void testProcessMustUnderstandHeadersUnderstoodSoap12() throws Exception { + void testProcessMustUnderstandHeadersUnderstoodSoap12() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); SOAPMessage request = messageFactory.createMessage(); @@ -111,7 +111,7 @@ public class SoapMessageDispatcherTests { } @Test - public void testProcessMustUnderstandHeadersNotUnderstoodSoap11() throws Exception { + void testProcessMustUnderstandHeadersNotUnderstoodSoap11() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); SOAPMessage request = messageFactory.createMessage(); @@ -148,7 +148,7 @@ public class SoapMessageDispatcherTests { } @Test - public void testProcessMustUnderstandHeadersNotUnderstoodSoap12() throws Exception { + void testProcessMustUnderstandHeadersNotUnderstoodSoap12() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); SOAPMessage request = messageFactory.createMessage(); @@ -195,7 +195,7 @@ public class SoapMessageDispatcherTests { } @Test - public void testProcessMustUnderstandHeadersForActorSoap11() throws Exception { + void testProcessMustUnderstandHeadersForActorSoap11() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); SOAPMessage request = messageFactory.createMessage(); @@ -221,7 +221,7 @@ public class SoapMessageDispatcherTests { } @Test - public void testProcessMustUnderstandHeadersForRoleSoap12() throws Exception { + void testProcessMustUnderstandHeadersForRoleSoap12() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); SOAPMessage request = messageFactory.createMessage(); @@ -247,7 +247,7 @@ public class SoapMessageDispatcherTests { } @Test - public void testProcessNoHeader() throws Exception { + void testProcessNoHeader() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); SOAPMessage request = messageFactory.createMessage(); @@ -267,7 +267,7 @@ public class SoapMessageDispatcherTests { } @Test - public void testProcessMustUnderstandHeadersNoInterceptors() throws Exception { + void testProcessMustUnderstandHeadersNoInterceptors() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); SOAPMessage request = messageFactory.createMessage(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTests.java index a3b1f77b..b7a5747b 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTests.java @@ -46,14 +46,14 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @Deprecated -public class FaultCreatingValidatingMarshallingPayloadEndpointTests { +class FaultCreatingValidatingMarshallingPayloadEndpointTests { private MessageContext messageContext; private ResourceBundleMessageSource messageSource; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.messageSource = new ResourceBundleMessageSource(); this.messageSource.setBasename("org.springframework.ws.soap.server.endpoint.messages"); @@ -65,7 +65,7 @@ public class FaultCreatingValidatingMarshallingPayloadEndpointTests { } @Test - public void testValidationIncorrect() throws Exception { + void testValidationIncorrect() throws Exception { Person p = new Person("", -1); PersonMarshaller marshaller = new PersonMarshaller(p); @@ -120,7 +120,7 @@ public class FaultCreatingValidatingMarshallingPayloadEndpointTests { } @Test - public void testValidationCorrect() throws Exception { + void testValidationCorrect() throws Exception { Person p = new Person("John", 42); PersonMarshaller marshaller = new PersonMarshaller(p); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolverTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolverTests.java index 74535e7d..8d09f054 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolverTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolverTests.java @@ -34,7 +34,7 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class SimpleSoapExceptionResolverTests { +class SimpleSoapExceptionResolverTests { private SimpleSoapExceptionResolver exceptionResolver; @@ -47,7 +47,7 @@ public class SimpleSoapExceptionResolverTests { private WebServiceMessageFactory factoryMock; @BeforeEach - public void setUp() { + void setUp() { this.exceptionResolver = new SimpleSoapExceptionResolver(); this.factoryMock = createMock(WebServiceMessageFactory.class); @@ -57,7 +57,7 @@ public class SimpleSoapExceptionResolverTests { } @Test - public void testResolveExceptionInternal() { + void testResolveExceptionInternal() { Exception exception = new Exception("message"); expect(this.factoryMock.createWebServiceMessage()).andReturn(this.messageMock); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolverTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolverTests.java index e5e776db..9c73de55 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolverTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolverTests.java @@ -40,17 +40,17 @@ import org.springframework.ws.soap.soap12.Soap12Fault; import static org.assertj.core.api.Assertions.assertThat; -public class SoapFaultAnnotationExceptionResolverTests { +class SoapFaultAnnotationExceptionResolverTests { private SoapFaultAnnotationExceptionResolver resolver; @BeforeEach - public void setUp() { + void setUp() { this.resolver = new SoapFaultAnnotationExceptionResolver(); } @Test - public void testResolveExceptionClientSoap11() throws Exception { + void testResolveExceptionClientSoap11() throws Exception { MessageFactory saajFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); SoapMessageFactory factory = new SaajSoapMessageFactory(saajFactory); @@ -73,7 +73,7 @@ public class SoapFaultAnnotationExceptionResolverTests { } @Test - public void testResolveExceptionSenderSoap12() throws Exception { + void testResolveExceptionSenderSoap12() throws Exception { MessageFactory saajFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); SoapMessageFactory factory = new SaajSoapMessageFactory(saajFactory); @@ -96,7 +96,7 @@ public class SoapFaultAnnotationExceptionResolverTests { } @Test - public void testResolveExceptionServerSoap11() throws Exception { + void testResolveExceptionServerSoap11() throws Exception { MessageFactory saajFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); SoapMessageFactory factory = new SaajSoapMessageFactory(saajFactory); @@ -119,7 +119,7 @@ public class SoapFaultAnnotationExceptionResolverTests { } @Test - public void testResolveExceptionReceiverSoap12() throws Exception { + void testResolveExceptionReceiverSoap12() throws Exception { MessageFactory saajFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); SOAPMessage message = saajFactory.createMessage(); @@ -143,7 +143,7 @@ public class SoapFaultAnnotationExceptionResolverTests { } @Test - public void testResolveExceptionDefault() throws Exception { + void testResolveExceptionDefault() throws Exception { SoapFaultDefinition defaultFault = new SoapFaultDefinition(); defaultFault.setFaultCode(SoapFaultDefinition.CLIENT); @@ -170,7 +170,7 @@ public class SoapFaultAnnotationExceptionResolverTests { } @Test - public void testResolveExceptionCustom() throws Exception { + void testResolveExceptionCustom() throws Exception { MessageFactory saajFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); SoapMessageFactory factory = new SaajSoapMessageFactory(saajFactory); @@ -193,7 +193,7 @@ public class SoapFaultAnnotationExceptionResolverTests { } @Test - public void testResolveExceptionInheritance() throws Exception { + void testResolveExceptionInheritance() throws Exception { MessageFactory saajFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); SoapMessageFactory factory = new SaajSoapMessageFactory(saajFactory); @@ -216,7 +216,7 @@ public class SoapFaultAnnotationExceptionResolverTests { } @Test - public void testResolveExceptionExceptionMessage() throws Exception { + void testResolveExceptionExceptionMessage() throws Exception { MessageFactory saajFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); SoapMessageFactory factory = new SaajSoapMessageFactory(saajFactory); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditorTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditorTests.java index fc7f311d..55848a92 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditorTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditorTests.java @@ -25,17 +25,17 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -public class SoapFaultDefinitionEditorTests { +class SoapFaultDefinitionEditorTests { private SoapFaultDefinitionEditor editor; @BeforeEach - public void setUp() { + void setUp() { this.editor = new SoapFaultDefinitionEditor(); } @Test - public void testSetAsTextNoLocale() { + void testSetAsTextNoLocale() { this.editor.setAsText("Server, Server error"); SoapFaultDefinition definition = (SoapFaultDefinition) this.editor.getValue(); @@ -47,7 +47,7 @@ public class SoapFaultDefinitionEditorTests { } @Test - public void testSetAsTextLocale() { + void testSetAsTextLocale() { this.editor.setAsText("Server, Server error, nl"); SoapFaultDefinition definition = (SoapFaultDefinition) this.editor.getValue(); @@ -59,7 +59,7 @@ public class SoapFaultDefinitionEditorTests { } @Test - public void testSetAsTextSender() { + void testSetAsTextSender() { this.editor.setAsText("SENDER, Server error"); SoapFaultDefinition definition = (SoapFaultDefinition) this.editor.getValue(); @@ -70,7 +70,7 @@ public class SoapFaultDefinitionEditorTests { } @Test - public void testSetAsTextReceiver() { + void testSetAsTextReceiver() { this.editor.setAsText("RECEIVER, Server error"); SoapFaultDefinition definition = (SoapFaultDefinition) this.editor.getValue(); @@ -81,12 +81,12 @@ public class SoapFaultDefinitionEditorTests { } @Test - public void testSetAsTextIllegalArgument() { + void testSetAsTextIllegalArgument() { this.editor.setAsText("SOAP-ENV:Server"); } @Test - public void testSetAsTextEmpty() { + void testSetAsTextEmpty() { this.editor.setAsText(""); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolverTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolverTests.java index 3fac8f1c..b9646e90 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolverTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolverTests.java @@ -39,17 +39,17 @@ import org.springframework.ws.soap.soap12.Soap12Fault; import static org.assertj.core.api.Assertions.assertThat; -public class SoapFaultMappingExceptionResolverTests { +class SoapFaultMappingExceptionResolverTests { private SoapFaultMappingExceptionResolver resolver; @BeforeEach - public void setUp() { + void setUp() { this.resolver = new SoapFaultMappingExceptionResolver(); } @Test - public void testGetDepth() { + void testGetDepth() { assertThat(this.resolver.getDepth("java.lang.Exception", new Exception())).isEqualTo(0); assertThat(this.resolver.getDepth("java.lang.Exception", new IllegalArgumentException())).isEqualTo(2); @@ -57,7 +57,7 @@ public class SoapFaultMappingExceptionResolverTests { } @Test - public void testResolveExceptionClientSoap11() throws Exception { + void testResolveExceptionClientSoap11() throws Exception { Properties mappings = new Properties(); mappings.setProperty(Exception.class.getName(), "SERVER, Server error"); @@ -86,7 +86,7 @@ public class SoapFaultMappingExceptionResolverTests { } @Test - public void testResolveExceptionSenderSoap12() throws Exception { + void testResolveExceptionSenderSoap12() throws Exception { Properties mappings = new Properties(); mappings.setProperty(Exception.class.getName(), "RECEIVER, Receiver error, en"); @@ -115,7 +115,7 @@ public class SoapFaultMappingExceptionResolverTests { } @Test - public void testResolveExceptionServerSoap11() throws Exception { + void testResolveExceptionServerSoap11() throws Exception { Properties mappings = new Properties(); mappings.setProperty(Exception.class.getName(), "CLIENT, Client error"); @@ -144,7 +144,7 @@ public class SoapFaultMappingExceptionResolverTests { } @Test - public void testResolveExceptionReceiverSoap12() throws Exception { + void testResolveExceptionReceiverSoap12() throws Exception { Properties mappings = new Properties(); mappings.setProperty(Exception.class.getName(), "SENDER, Sender error"); @@ -173,7 +173,7 @@ public class SoapFaultMappingExceptionResolverTests { } @Test - public void testResolveExceptionDefault() throws Exception { + void testResolveExceptionDefault() throws Exception { Properties mappings = new Properties(); mappings.setProperty(SoapMessageException.class.getName(), "SERVER,Server error"); @@ -219,7 +219,7 @@ public class SoapFaultMappingExceptionResolverTests { } @Test - public void testResolveNoMessageException() throws Exception { + void testResolveNoMessageException() throws Exception { Properties mappings = new Properties(); mappings.setProperty(IOException.class.getName(), "SERVER"); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolverTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolverTests.java index ebd1ba0a..21073114 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolverTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolverTests.java @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException /** * @author Tareq Abedrabbo */ -public class SoapHeaderElementMethodArgumentResolverTests extends AbstractMethodArgumentResolverTests { +class SoapHeaderElementMethodArgumentResolverTests extends AbstractMethodArgumentResolverTests { private static final QName HEADER_QNAME = new QName(NAMESPACE_URI, "header"); @@ -57,7 +57,7 @@ public class SoapHeaderElementMethodArgumentResolverTests extends AbstractMethod private MethodParameter soapHeaderMismatchList; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.resolver = new SoapHeaderElementMethodArgumentResolver(); this.messageContext = createSaajMessageContext(); @@ -79,21 +79,21 @@ public class SoapHeaderElementMethodArgumentResolverTests extends AbstractMethod } @Test - public void supportsParameter() { + void supportsParameter() { assertThat(this.resolver.supportsParameter(this.soapHeaderElementParameter)).isTrue(); assertThat(this.resolver.supportsParameter(this.soapHeaderElementListParameter)).isTrue(); } @Test - public void failOnEmptyValue() { + void failOnEmptyValue() { assertThatIllegalArgumentException() .isThrownBy(() -> this.resolver.resolveArgument(this.messageContext, this.soapHeaderWithEmptyValue)); } @Test - public void resolveSoapHeaderElement() throws Exception { + void resolveSoapHeaderElement() throws Exception { Object result = this.resolver.resolveArgument(this.messageContext, this.soapHeaderElementParameter); @@ -107,7 +107,7 @@ public class SoapHeaderElementMethodArgumentResolverTests extends AbstractMethod @Test @SuppressWarnings("unchecked") - public void resolveSoapHeaderElementList() throws Exception { + void resolveSoapHeaderElementList() throws Exception { Object result = this.resolver.resolveArgument(this.messageContext, this.soapHeaderElementListParameter); @@ -127,7 +127,7 @@ public class SoapHeaderElementMethodArgumentResolverTests extends AbstractMethod } @Test - public void resolveSoapHeaderMismatch() throws Exception { + void resolveSoapHeaderMismatch() throws Exception { Object result = this.resolver.resolveArgument(this.messageContext, this.soapHeaderMismatch); @@ -135,7 +135,7 @@ public class SoapHeaderElementMethodArgumentResolverTests extends AbstractMethod } @Test - public void resolveSoapHeaderMismatchList() throws Exception { + void resolveSoapHeaderMismatchList() throws Exception { Object result = this.resolver.resolveArgument(this.messageContext, this.soapHeaderMismatchList); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapMethodArgumentResolverTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapMethodArgumentResolverTests.java index c51580ae..4735573c 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapMethodArgumentResolverTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapMethodArgumentResolverTests.java @@ -32,7 +32,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Arjen Poutsma */ -public class SoapMethodArgumentResolverTests extends AbstractMethodArgumentResolverTests { +class SoapMethodArgumentResolverTests extends AbstractMethodArgumentResolverTests { private SoapMethodArgumentResolver resolver; @@ -45,7 +45,7 @@ public class SoapMethodArgumentResolverTests extends AbstractMethodArgumentResol private MethodParameter soapHeaderParameter; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.resolver = new SoapMethodArgumentResolver(); this.soapMessageParameter = new MethodParameter(getClass().getMethod("soapMessage", SoapMessage.class), 0); @@ -55,7 +55,7 @@ public class SoapMethodArgumentResolverTests extends AbstractMethodArgumentResol } @Test - public void supportsParameter() { + void supportsParameter() { assertThat(this.resolver.supportsParameter(this.soapMessageParameter)).isTrue(); assertThat(this.resolver.supportsParameter(this.soapEnvelopeParameter)).isTrue(); @@ -64,7 +64,7 @@ public class SoapMethodArgumentResolverTests extends AbstractMethodArgumentResol } @Test - public void resolveSoapMessageSaaj() throws Exception { + void resolveSoapMessageSaaj() throws Exception { MessageContext messageContext = createSaajMessageContext(); Object result = this.resolver.resolveArgument(messageContext, this.soapMessageParameter); @@ -73,7 +73,7 @@ public class SoapMethodArgumentResolverTests extends AbstractMethodArgumentResol } @Test - public void resolveSoapEnvelopeSaaj() throws Exception { + void resolveSoapEnvelopeSaaj() throws Exception { MessageContext messageContext = createSaajMessageContext(); Object result = this.resolver.resolveArgument(messageContext, this.soapEnvelopeParameter); @@ -82,7 +82,7 @@ public class SoapMethodArgumentResolverTests extends AbstractMethodArgumentResol } @Test - public void resolveSoapBodySaaj() throws Exception { + void resolveSoapBodySaaj() throws Exception { MessageContext messageContext = createSaajMessageContext(); Object result = this.resolver.resolveArgument(messageContext, this.soapBodyParameter); @@ -91,7 +91,7 @@ public class SoapMethodArgumentResolverTests extends AbstractMethodArgumentResol } @Test - public void resolveSoapHeaderSaaj() throws Exception { + void resolveSoapHeaderSaaj() throws Exception { MessageContext messageContext = createSaajMessageContext(); Object result = this.resolver.resolveArgument(messageContext, this.soapHeaderParameter); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptorTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptorTests.java index 5b9ecea7..7c6f3a3e 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptorTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptorTests.java @@ -29,7 +29,7 @@ import org.springframework.ws.server.endpoint.interceptor.EndpointInterceptorAda import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -public class PayloadRootSmartSoapEndpointInterceptorTests { +class PayloadRootSmartSoapEndpointInterceptorTests { private EndpointInterceptor delegate; @@ -40,7 +40,7 @@ public class PayloadRootSmartSoapEndpointInterceptorTests { private MessageContext messageContext; @BeforeEach - public void setUp() { + void setUp() { this.delegate = new EndpointInterceptorAdapter(); @@ -53,14 +53,14 @@ public class PayloadRootSmartSoapEndpointInterceptorTests { } @Test - public void neitherNamespaceNorLocalPart() { + void neitherNamespaceNorLocalPart() { assertThatIllegalArgumentException() .isThrownBy(() -> new PayloadRootSmartSoapEndpointInterceptor(this.delegate, null, null)); } @Test - public void shouldInterceptFullMatch() { + void shouldInterceptFullMatch() { PayloadRootSmartSoapEndpointInterceptor interceptor = new PayloadRootSmartSoapEndpointInterceptor(this.delegate, this.namespaceUri, this.localPart); @@ -71,7 +71,7 @@ public class PayloadRootSmartSoapEndpointInterceptorTests { } @Test - public void shouldInterceptFullNonMatch() { + void shouldInterceptFullNonMatch() { PayloadRootSmartSoapEndpointInterceptor interceptor = new PayloadRootSmartSoapEndpointInterceptor(this.delegate, "http://springframework.org/other", this.localPart); @@ -82,7 +82,7 @@ public class PayloadRootSmartSoapEndpointInterceptorTests { } @Test - public void shouldInterceptNamespaceUriMatch() { + void shouldInterceptNamespaceUriMatch() { PayloadRootSmartSoapEndpointInterceptor interceptor = new PayloadRootSmartSoapEndpointInterceptor(this.delegate, this.namespaceUri, null); @@ -93,7 +93,7 @@ public class PayloadRootSmartSoapEndpointInterceptorTests { } @Test - public void shouldInterceptNamespaceUriNonMatch() { + void shouldInterceptNamespaceUriNonMatch() { PayloadRootSmartSoapEndpointInterceptor interceptor = new PayloadRootSmartSoapEndpointInterceptor(this.delegate, "http://springframework.org/other", null); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTests.java index cc5b05f8..6de52191 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTests.java @@ -49,7 +49,7 @@ import org.springframework.xml.xsd.SimpleXsdSchema; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -public class PayloadValidatingInterceptorTests { +class PayloadValidatingInterceptorTests { private PayloadValidatingInterceptor interceptor; @@ -76,7 +76,7 @@ public class PayloadValidatingInterceptorTests { private static final String SCHEMA2 = "schema2.xsd"; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.interceptor = new PayloadValidatingInterceptor(); this.interceptor.setSchema(new ClassPathResource(SCHEMA, getClass())); @@ -90,7 +90,7 @@ public class PayloadValidatingInterceptorTests { } @Test - public void testHandleInvalidRequestSoap11() throws Exception { + void testHandleInvalidRequestSoap11() throws Exception { SoapMessage invalidMessage = this.soap11Factory.createWebServiceMessage(); InputStream inputStream = getClass().getResourceAsStream(INVALID_MESSAGE); @@ -115,7 +115,7 @@ public class PayloadValidatingInterceptorTests { } @Test - public void testHandleInvalidRequestSoap12() throws Exception { + void testHandleInvalidRequestSoap12() throws Exception { SoapMessage invalidMessage = this.soap12Factory.createWebServiceMessage(); InputStream inputStream = getClass().getResourceAsStream(INVALID_MESSAGE); @@ -140,7 +140,7 @@ public class PayloadValidatingInterceptorTests { } @Test - public void testHandleInvalidRequestOverridenProperties() throws Exception { + void testHandleInvalidRequestOverridenProperties() throws Exception { String faultString = "fout"; Locale locale = new Locale("nl"); @@ -171,7 +171,7 @@ public class PayloadValidatingInterceptorTests { } @Test - public void testHandlerInvalidRequest() throws Exception { + void testHandlerInvalidRequest() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(); request.setPayload(new ClassPathResource(INVALID_MESSAGE, getClass())); @@ -182,7 +182,7 @@ public class PayloadValidatingInterceptorTests { } @Test - public void testHandleValidRequest() throws Exception { + void testHandleValidRequest() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(); request.setPayload(new ClassPathResource(VALID_MESSAGE, getClass())); @@ -194,7 +194,7 @@ public class PayloadValidatingInterceptorTests { } @Test - public void testHandleInvalidResponse() throws Exception { + void testHandleInvalidResponse() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(); this.context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); @@ -206,7 +206,7 @@ public class PayloadValidatingInterceptorTests { } @Test - public void testHandleValidResponse() throws Exception { + void testHandleValidResponse() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(); this.context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); MockWebServiceMessage response = (MockWebServiceMessage) this.context.getResponse(); @@ -217,7 +217,7 @@ public class PayloadValidatingInterceptorTests { } @Test - public void testNamespacesInType() throws Exception { + void testNamespacesInType() throws Exception { // Make sure we use Xerces for this testcase: the JAXP implementation used // internally by JDK 1.5 has a bug @@ -249,7 +249,7 @@ public class PayloadValidatingInterceptorTests { } @Test - public void testNonExistingSchema() { + void testNonExistingSchema() { assertThatIllegalArgumentException().isThrownBy(() -> { @@ -259,7 +259,7 @@ public class PayloadValidatingInterceptorTests { } @Test - public void testHandlerInvalidRequestMultipleSchemas() throws Exception { + void testHandlerInvalidRequestMultipleSchemas() throws Exception { this.interceptor.setSchemas(new ClassPathResource(PRODUCT_SCHEMA, getClass()), new ClassPathResource(SIZE_SCHEMA, getClass())); @@ -272,7 +272,7 @@ public class PayloadValidatingInterceptorTests { } @Test - public void testHandleValidRequestMultipleSchemas() throws Exception { + void testHandleValidRequestMultipleSchemas() throws Exception { this.interceptor.setSchemas(new ClassPathResource(PRODUCT_SCHEMA, getClass()), new ClassPathResource(SIZE_SCHEMA, getClass())); @@ -287,7 +287,7 @@ public class PayloadValidatingInterceptorTests { } @Test - public void testHandleInvalidResponseMultipleSchemas() throws Exception { + void testHandleInvalidResponseMultipleSchemas() throws Exception { this.interceptor.setSchemas(new ClassPathResource(PRODUCT_SCHEMA, getClass()), new ClassPathResource(SIZE_SCHEMA, getClass())); @@ -302,7 +302,7 @@ public class PayloadValidatingInterceptorTests { } @Test - public void testHandleValidResponseMultipleSchemas() throws Exception { + void testHandleValidResponseMultipleSchemas() throws Exception { this.interceptor.setSchemas(new ClassPathResource(PRODUCT_SCHEMA, getClass()), new ClassPathResource(SIZE_SCHEMA, getClass())); @@ -317,7 +317,7 @@ public class PayloadValidatingInterceptorTests { } @Test - public void testXsdSchema() throws Exception { + void testXsdSchema() throws Exception { PayloadValidatingInterceptor interceptor = new PayloadValidatingInterceptor(); SimpleXsdSchema schema = new SimpleXsdSchema(new ClassPathResource(SCHEMA, getClass())); @@ -336,7 +336,7 @@ public class PayloadValidatingInterceptorTests { } @Test - public void customErrorHandler() throws Exception { + void customErrorHandler() throws Exception { ValidationErrorHandler errorHandler = new ValidationErrorHandler() { public SAXParseException[] getErrors() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapActionSmartEndpointInterceptorTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapActionSmartEndpointInterceptorTests.java index d50c93d9..687b80f8 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapActionSmartEndpointInterceptorTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapActionSmartEndpointInterceptorTests.java @@ -29,7 +29,7 @@ import org.springframework.ws.soap.saaj.SaajSoapMessageFactory; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -public class SoapActionSmartEndpointInterceptorTests { +class SoapActionSmartEndpointInterceptorTests { private EndpointInterceptor delegate; @@ -38,7 +38,7 @@ public class SoapActionSmartEndpointInterceptorTests { private MessageContext messageContext; @BeforeEach - public void setUp() { + void setUp() { this.delegate = new EndpointInterceptorAdapter(); @@ -52,13 +52,13 @@ public class SoapActionSmartEndpointInterceptorTests { } @Test - public void neitherNamespaceNorLocalPart() { + void neitherNamespaceNorLocalPart() { assertThatIllegalArgumentException() .isThrownBy(() -> new SoapActionSmartEndpointInterceptor(this.delegate, null)); } @Test - public void shouldInterceptMatch() { + void shouldInterceptMatch() { SoapActionSmartEndpointInterceptor interceptor = new SoapActionSmartEndpointInterceptor(this.delegate, this.soapAction); @@ -69,7 +69,7 @@ public class SoapActionSmartEndpointInterceptorTests { } @Test - public void shouldInterceptNonMatch() { + void shouldInterceptNonMatch() { SoapActionSmartEndpointInterceptor interceptor = new SoapActionSmartEndpointInterceptor(this.delegate, "http://springframework.org/other"); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMappingTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMappingTests.java index cdd0a8d0..6deec9af 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMappingTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMappingTests.java @@ -32,14 +32,14 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class DelegatingSoapEndpointMappingTests { +class DelegatingSoapEndpointMappingTests { private DelegatingSoapEndpointMapping endpointMapping; private EndpointMapping mock; @BeforeEach - public void setUp() { + void setUp() { this.endpointMapping = new DelegatingSoapEndpointMapping(); this.mock = createMock(EndpointMapping.class); @@ -47,7 +47,7 @@ public class DelegatingSoapEndpointMappingTests { } @Test - public void testGetEndpointMapping() throws Exception { + void testGetEndpointMapping() throws Exception { String role = "http://www.springframework.org/spring-ws/role"; this.endpointMapping.setActorOrRole(role); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTests.java index 170881b9..bd831e63 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTests.java @@ -38,14 +38,14 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class SoapActionAnnotationMethodEndpointMappingTests { +class SoapActionAnnotationMethodEndpointMappingTests { private SoapActionAnnotationMethodEndpointMapping mapping; private StaticApplicationContext applicationContext; @BeforeEach - public void setUp() { + void setUp() { this.applicationContext = new StaticApplicationContext(); this.applicationContext.registerSingleton("mapping", SoapActionAnnotationMethodEndpointMapping.class); @@ -55,7 +55,7 @@ public class SoapActionAnnotationMethodEndpointMappingTests { } @Test - public void registrationSingle() throws Exception { + void registrationSingle() throws Exception { SoapMessage requestMock = createMock(SoapMessage.class); expect(requestMock.getSoapAction()).andReturn("http://springframework.org/spring-ws/SoapAction"); @@ -76,7 +76,7 @@ public class SoapActionAnnotationMethodEndpointMappingTests { } @Test - public void registrationMultiple() throws Exception { + void registrationMultiple() throws Exception { SoapMessage requestMock = createMock(SoapMessage.class); expect(requestMock.getSoapAction()).andReturn("http://springframework.org/spring-ws/SoapAction1"); @@ -102,7 +102,7 @@ public class SoapActionAnnotationMethodEndpointMappingTests { } @Test - public void registrationRepeatable() throws Exception { + void registrationRepeatable() throws Exception { SoapMessage requestMock = createMock(SoapMessage.class); expect(requestMock.getSoapAction()).andReturn("http://springframework.org/spring-ws/SoapAction3"); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMappingTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMappingTests.java index 53caa812..1032a856 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMappingTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMappingTests.java @@ -27,21 +27,21 @@ import org.springframework.ws.soap.saaj.SaajSoapMessageFactory; import static org.assertj.core.api.Assertions.assertThat; -public class SoapActionEndpointMappingTests { +class SoapActionEndpointMappingTests { private SoapActionEndpointMapping mapping; private MessageContext context; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.mapping = new SoapActionEndpointMapping(); this.context = new DefaultMessageContext(new SaajSoapMessageFactory(MessageFactory.newInstance())); } @Test - public void testGetLookupKeyForMessage() throws Exception { + void testGetLookupKeyForMessage() throws Exception { String soapAction = "http://springframework.org/spring-ws/SoapAction"; ((SoapMessage) this.context.getRequest()).setSoapAction(soapAction); @@ -50,7 +50,7 @@ public class SoapActionEndpointMappingTests { } @Test - public void testGetLookupKeyForMessageQuoted() throws Exception { + void testGetLookupKeyForMessageQuoted() throws Exception { String soapAction = "http://springframework.org/spring-ws/SoapAction"; ((SoapMessage) this.context.getRequest()).setSoapAction(soapAction); @@ -59,7 +59,7 @@ public class SoapActionEndpointMappingTests { } @Test - public void testValidateLookupKey() { + void testValidateLookupKey() { assertThat(this.mapping.validateLookupKey("SoapAction")).isTrue(); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11BodyTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11BodyTests.java index 143d2295..cab7201d 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11BodyTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11BodyTests.java @@ -36,17 +36,17 @@ import static org.assertj.core.api.Assertions.assertThat; public abstract class AbstractSoap11BodyTests extends AbstractSoapBodyTests { @Test - public void testGetType() { + void testGetType() { assertThat(this.soapBody).isInstanceOf(Soap11Body.class); } @Test - public void testGetName() { + void testGetName() { assertThat(this.soapBody.getName()).isEqualTo(SoapVersion.SOAP_11.getBodyName()); } @Test - public void testGetSource() throws Exception { + void testGetSource() throws Exception { StringResult result = new StringResult(); this.transformer.transform(this.soapBody.getSource(), result); @@ -58,7 +58,7 @@ public abstract class AbstractSoap11BodyTests extends AbstractSoapBodyTests { } @Test - public void testAddMustUnderstandFault() throws Exception { + void testAddMustUnderstandFault() throws Exception { SoapFault fault = this.soapBody.addMustUnderstandFault("SOAP Must Understand Error", null); @@ -70,7 +70,7 @@ public abstract class AbstractSoap11BodyTests extends AbstractSoapBodyTests { } @Test - public void testAddClientFault() throws Exception { + void testAddClientFault() throws Exception { SoapFault fault = this.soapBody.addClientOrSenderFault("faultString", null); @@ -81,7 +81,7 @@ public abstract class AbstractSoap11BodyTests extends AbstractSoapBodyTests { } @Test - public void testAddServerFault() throws Exception { + void testAddServerFault() throws Exception { SoapFault fault = this.soapBody.addServerOrReceiverFault("faultString", null); @@ -92,7 +92,7 @@ public abstract class AbstractSoap11BodyTests extends AbstractSoapBodyTests { } @Test - public void testAddFault() throws Exception { + void testAddFault() throws Exception { QName faultCode = new QName("http://www.springframework.org", "fault", "spring"); String faultString = "faultString"; @@ -116,7 +116,7 @@ public abstract class AbstractSoap11BodyTests extends AbstractSoapBodyTests { } @Test - public void testAddFaultNoPrefix() { + void testAddFaultNoPrefix() { QName faultCode = new QName("http://www.springframework.org", "fault"); String faultString = "faultString"; @@ -136,7 +136,7 @@ public abstract class AbstractSoap11BodyTests extends AbstractSoapBodyTests { } @Test - public void testAddFaultWithDetail() throws Exception { + void testAddFaultWithDetail() throws Exception { QName faultCode = new QName("http://www.springframework.org", "fault", "spring"); String faultString = "faultString"; @@ -161,7 +161,7 @@ public abstract class AbstractSoap11BodyTests extends AbstractSoapBodyTests { } @Test - public void testAddFaultWithDetailResult() throws Exception { + void testAddFaultWithDetailResult() throws Exception { SoapFault fault = ((Soap11Body) this.soapBody).addFault(new QName("namespace", "localPart", "prefix"), "Fault", null); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11EnvelopeTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11EnvelopeTests.java index 4fff2ba2..fe0abf98 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11EnvelopeTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11EnvelopeTests.java @@ -30,13 +30,13 @@ import static org.assertj.core.api.Assertions.assertThat; public abstract class AbstractSoap11EnvelopeTests extends AbstractSoapEnvelopeTests { @Test - public void testGetName() { + void testGetName() { assertThat(this.soapEnvelope.getName()) .isEqualTo(new QName(SoapVersion.SOAP_11.getEnvelopeNamespaceUri(), "Envelope")); } @Test - public void testGetContent() throws Exception { + void testGetContent() throws Exception { StringResult result = new StringResult(); this.transformer.transform(this.soapEnvelope.getSource(), result); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11HeaderTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11HeaderTests.java index 013a5b61..012c9422 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11HeaderTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11HeaderTests.java @@ -36,18 +36,18 @@ public abstract class AbstractSoap11HeaderTests extends AbstractSoapHeaderTests private static final String PREFIX = "spring"; @Test - public void testGetType() { + void testGetType() { assertThat(this.soapHeader).isInstanceOf(Soap11Header.class); } @Test - public void testGetName() { + void testGetName() { assertThat(this.soapHeader.getName()) .isEqualTo(new QName(SoapVersion.SOAP_11.getEnvelopeNamespaceUri(), "Header")); } @Test - public void testGetSource() throws Exception { + void testGetSource() throws Exception { StringResult result = new StringResult(); this.transformer.transform(this.soapHeader.getSource(), result); @@ -59,7 +59,7 @@ public abstract class AbstractSoap11HeaderTests extends AbstractSoapHeaderTests } @Test - public void testExamineHeaderElementsToProcessActors() { + void testExamineHeaderElementsToProcessActors() { QName qName = new QName(NAMESPACE, "localName1", PREFIX); SoapHeaderElement headerElement = this.soapHeader.addHeaderElement(qName); @@ -86,7 +86,7 @@ public abstract class AbstractSoap11HeaderTests extends AbstractSoapHeaderTests } @Test - public void testExamineHeaderElementsToProcessNoActors() { + void testExamineHeaderElementsToProcessNoActors() { QName qName = new QName(NAMESPACE, "localName1", PREFIX); SoapHeaderElement headerElement = this.soapHeader.addHeaderElement(qName); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageFactoryTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageFactoryTests.java index a6d68f57..3e88c7df 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageFactoryTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageFactoryTests.java @@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat; public abstract class AbstractSoap11MessageFactoryTests extends AbstractSoapMessageFactoryTests { @Test - public void testCreateEmptySoap11Message() { + void testCreateEmptySoap11Message() { WebServiceMessage message = this.messageFactory.createWebServiceMessage(); @@ -138,7 +138,7 @@ public abstract class AbstractSoap11MessageFactoryTests extends AbstractSoapMess } @Test - public void testCreateSoapMessageMtomWeirdStartInfo() throws Exception { + void testCreateSoapMessageMtomWeirdStartInfo() throws Exception { InputStream is = AbstractSoap11MessageFactoryTests.class.getResourceAsStream("soap11-mtom.bin"); Map headers = new HashMap<>(); @@ -163,7 +163,7 @@ public abstract class AbstractSoap11MessageFactoryTests extends AbstractSoapMess } @Test - public void testCreateSoapMessageUtf8ByteOrderMark() throws Exception { + void testCreateSoapMessageUtf8ByteOrderMark() throws Exception { InputStream is = AbstractSoap11MessageFactoryTests.class.getResourceAsStream("soap11-utf8-bom.xml"); Map headers = new HashMap<>(); @@ -176,7 +176,7 @@ public abstract class AbstractSoap11MessageFactoryTests extends AbstractSoapMess } @Test - public void testCreateSoapMessageUtf16BigEndianByteOrderMark() throws Exception { + void testCreateSoapMessageUtf16BigEndianByteOrderMark() throws Exception { InputStream is = AbstractSoap11MessageFactoryTests.class.getResourceAsStream("soap11-utf16-be-bom.xml"); Map headers = new HashMap<>(); @@ -189,7 +189,7 @@ public abstract class AbstractSoap11MessageFactoryTests extends AbstractSoapMess } @Test - public void testCreateSoapMessageUtf16LittleEndianByteOrderMark() throws Exception { + void testCreateSoapMessageUtf16LittleEndianByteOrderMark() throws Exception { InputStream is = AbstractSoap11MessageFactoryTests.class.getResourceAsStream("soap11-utf16-le-bom.xml"); Map headers = new HashMap<>(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12BodyTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12BodyTests.java index 441fcbd3..305120e7 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12BodyTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12BodyTests.java @@ -37,17 +37,17 @@ import static org.assertj.core.api.Assertions.assertThat; public abstract class AbstractSoap12BodyTests extends AbstractSoapBodyTests { @Test - public void testGetType() { + void testGetType() { assertThat(this.soapBody).isInstanceOf(Soap12Body.class); } @Test - public void testGetName() { + void testGetName() { assertThat(this.soapBody.getName()).isEqualTo(new QName(SoapVersion.SOAP_12.getEnvelopeNamespaceUri(), "Body")); } @Test - public void testGetSource() throws Exception { + void testGetSource() throws Exception { StringResult result = new StringResult(); this.transformer.transform(this.soapBody.getSource(), result); @@ -59,7 +59,7 @@ public abstract class AbstractSoap12BodyTests extends AbstractSoapBodyTests { } @Test - public void testAddMustUnderstandFault() throws Exception { + void testAddMustUnderstandFault() throws Exception { SoapFault fault = this.soapBody.addMustUnderstandFault("SOAP Must Understand Error", Locale.ENGLISH); @@ -80,7 +80,7 @@ public abstract class AbstractSoap12BodyTests extends AbstractSoapBodyTests { } @Test - public void testAddSenderFault() throws Exception { + void testAddSenderFault() throws Exception { SoapFault fault = this.soapBody.addClientOrSenderFault("faultString", Locale.ENGLISH); @@ -100,7 +100,7 @@ public abstract class AbstractSoap12BodyTests extends AbstractSoapBodyTests { } @Test - public void testAddReceiverFault() throws Exception { + void testAddReceiverFault() throws Exception { SoapFault fault = this.soapBody.addServerOrReceiverFault("faultString", Locale.ENGLISH); @@ -120,7 +120,7 @@ public abstract class AbstractSoap12BodyTests extends AbstractSoapBodyTests { } @Test - public void testAddFaultWithDetail() throws Exception { + void testAddFaultWithDetail() throws Exception { SoapFault fault = this.soapBody.addServerOrReceiverFault("faultString", Locale.ENGLISH); SoapFaultDetail detail = fault.addFaultDetail(); @@ -143,7 +143,7 @@ public abstract class AbstractSoap12BodyTests extends AbstractSoapBodyTests { } @Test - public void testAddFaultWithDetailResult() throws Exception { + void testAddFaultWithDetailResult() throws Exception { SoapFault fault = this.soapBody.addServerOrReceiverFault("faultString", Locale.ENGLISH); SoapFaultDetail detail = fault.addFaultDetail(); @@ -164,7 +164,7 @@ public abstract class AbstractSoap12BodyTests extends AbstractSoapBodyTests { } @Test - public void testAddFaultWithSubcode() throws Exception { + void testAddFaultWithSubcode() throws Exception { Soap12Fault fault = (Soap12Fault) this.soapBody.addServerOrReceiverFault("faultString", Locale.ENGLISH); QName subcode1 = new QName("http://www.springframework.org", "Subcode1", "spring-ws"); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12EnvelopeTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12EnvelopeTests.java index 2a74fa6f..cdd1aecd 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12EnvelopeTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12EnvelopeTests.java @@ -30,13 +30,13 @@ import static org.assertj.core.api.Assertions.assertThat; public abstract class AbstractSoap12EnvelopeTests extends AbstractSoapEnvelopeTests { @Test - public void testGetName() { + void testGetName() { assertThat(this.soapEnvelope.getName()) .isEqualTo(new QName(SoapVersion.SOAP_12.getEnvelopeNamespaceUri(), "Envelope")); } @Test - public void testGetSource() throws Exception { + void testGetSource() throws Exception { StringResult result = new StringResult(); this.transformer.transform(this.soapEnvelope.getSource(), result); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12HeaderTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12HeaderTests.java index c9697157..6dd0fc3b 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12HeaderTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12HeaderTests.java @@ -34,18 +34,18 @@ import static org.assertj.core.api.Assertions.assertThat; public abstract class AbstractSoap12HeaderTests extends AbstractSoapHeaderTests { @Test - public void testGetType() { + void testGetType() { assertThat(this.soapHeader).isInstanceOf(Soap12Header.class); } @Test - public void testGetName() { + void testGetName() { assertThat(this.soapHeader.getName()) .isEqualTo(new QName(SoapVersion.SOAP_12.getEnvelopeNamespaceUri(), "Header")); } @Test - public void testGetSource() throws Exception { + void testGetSource() throws Exception { StringResult result = new StringResult(); this.transformer.transform(this.soapHeader.getSource(), result); @@ -57,7 +57,7 @@ public abstract class AbstractSoap12HeaderTests extends AbstractSoapHeaderTests } @Test - public void testAddNotUnderstood() throws Exception { + void testAddNotUnderstood() throws Exception { Soap12Header soap12Header = (Soap12Header) this.soapHeader; QName headerName = new QName("http://www.springframework.org", "NotUnderstood", "spring-ws"); @@ -74,7 +74,7 @@ public abstract class AbstractSoap12HeaderTests extends AbstractSoapHeaderTests } @Test - public void testAddUpgrade() throws Exception { + void testAddUpgrade() throws Exception { String[] supportedUris = new String[] { "http://schemas.xmlsoap.org/soap/envelope/", "http://www.w3.org/2003/05/soap-envelope" }; @@ -96,7 +96,7 @@ public abstract class AbstractSoap12HeaderTests extends AbstractSoapHeaderTests } @Test - public void testExamineHeaderElementsToProcessActors() { + void testExamineHeaderElementsToProcessActors() { QName qName = new QName(NAMESPACE, "localName1", PREFIX); SoapHeaderElement headerElement = this.soapHeader.addHeaderElement(qName); @@ -123,7 +123,7 @@ public abstract class AbstractSoap12HeaderTests extends AbstractSoapHeaderTests } @Test - public void testExamineHeaderElementsToProcessNoActors() { + void testExamineHeaderElementsToProcessNoActors() { QName qName = new QName(NAMESPACE, "localName1", PREFIX); SoapHeaderElement headerElement = this.soapHeader.addHeaderElement(qName); @@ -150,7 +150,7 @@ public abstract class AbstractSoap12HeaderTests extends AbstractSoapHeaderTests } @Test - public void testExamineHeaderElementsToProcessUltimateDestination() { + void testExamineHeaderElementsToProcessUltimateDestination() { QName qName = new QName(NAMESPACE, "localName", PREFIX); SoapHeaderElement headerElement = this.soapHeader.addHeaderElement(qName); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/support/SoapUtilsTests.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/support/SoapUtilsTests.java index dbad5893..bbe3612c 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/support/SoapUtilsTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/support/SoapUtilsTests.java @@ -20,10 +20,10 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -public class SoapUtilsTests { +class SoapUtilsTests { @Test - public void testExtractActionFromContentType() { + void testExtractActionFromContentType() { String soapAction = "http://springframework.org/spring-ws/Action"; @@ -49,7 +49,7 @@ public class SoapUtilsTests { } @Test - public void testEscapeAction() { + void testEscapeAction() { String result = SoapUtils.escapeAction("action"); @@ -70,7 +70,7 @@ public class SoapUtilsTests { } @Test - public void testSetActionInContentType() { + void testSetActionInContentType() { String soapAction = "http://springframework.org/spring-ws/Action"; String contentType = "application/soap+xml"; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/support/DefaultStrategiesHelperTests.java b/spring-ws-core/src/test/java/org/springframework/ws/support/DefaultStrategiesHelperTests.java index 019a5457..dd15c6a7 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/support/DefaultStrategiesHelperTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/support/DefaultStrategiesHelperTests.java @@ -32,10 +32,10 @@ import org.springframework.core.io.Resource; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -public class DefaultStrategiesHelperTests { +class DefaultStrategiesHelperTests { @Test - public void testGetDefaultStrategies() { + void testGetDefaultStrategies() { Properties strategies = new Properties(); strategies.put(Strategy.class.getName(), @@ -61,7 +61,7 @@ public class DefaultStrategiesHelperTests { } @Test - public void testGetDefaultStrategy() { + void testGetDefaultStrategy() { Properties strategies = new Properties(); strategies.put(Strategy.class.getName(), StrategyImpl.class.getName()); @@ -79,7 +79,7 @@ public class DefaultStrategiesHelperTests { } @Test - public void testGetDefaultStrategyMoreThanOne() { + void testGetDefaultStrategyMoreThanOne() { Properties strategies = new Properties(); strategies.put(Strategy.class.getName(), @@ -95,7 +95,7 @@ public class DefaultStrategiesHelperTests { } @Test - public void testResourceConstructor() { + void testResourceConstructor() { Resource resource = new ClassPathResource("strategies.properties", getClass()); new DefaultStrategiesHelper(resource); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/support/MarshallingUtilsTests.java b/spring-ws-core/src/test/java/org/springframework/ws/support/MarshallingUtilsTests.java index cf9bb4ef..724e862a 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/support/MarshallingUtilsTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/support/MarshallingUtilsTests.java @@ -39,10 +39,10 @@ import static org.easymock.EasyMock.isA; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class MarshallingUtilsTests { +class MarshallingUtilsTests { @Test - public void testUnmarshal() throws Exception { + void testUnmarshal() throws Exception { Unmarshaller unmarshallerMock = createMock(Unmarshaller.class); WebServiceMessage messageMock = createMock(WebServiceMessage.class); @@ -62,7 +62,7 @@ public class MarshallingUtilsTests { } @Test - public void testUnmarshalMime() throws Exception { + void testUnmarshalMime() throws Exception { MimeUnmarshaller unmarshallerMock = createMock(MimeUnmarshaller.class); MimeMessage messageMock = createMock(MimeMessage.class); @@ -82,7 +82,7 @@ public class MarshallingUtilsTests { } @Test - public void testUnmarshalNoPayload() throws Exception { + void testUnmarshalNoPayload() throws Exception { Unmarshaller unmarshallerMock = createMock(Unmarshaller.class); MimeMessage messageMock = createMock(MimeMessage.class); @@ -99,7 +99,7 @@ public class MarshallingUtilsTests { } @Test - public void testMarshal() throws Exception { + void testMarshal() throws Exception { Marshaller marshallerMock = createMock(Marshaller.class); WebServiceMessage messageMock = createMock(WebServiceMessage.class); @@ -117,7 +117,7 @@ public class MarshallingUtilsTests { } @Test - public void testMarshalMime() throws Exception { + void testMarshalMime() throws Exception { MimeMarshaller marshallerMock = createMock(MimeMarshaller.class); MimeMessage messageMock = createMock(MimeMessage.class); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpSenderConnectionTests.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpSenderConnectionTests.java index 6e1b2aa4..77c7365b 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpSenderConnectionTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpSenderConnectionTests.java @@ -37,7 +37,7 @@ import static org.mockito.Mockito.when; /** * @author Andreas Veithen */ -public class AbstractHttpSenderConnectionTests { +class AbstractHttpSenderConnectionTests { /** * Tests that {@link AbstractHttpSenderConnection} doesn't consume the response stream @@ -72,12 +72,12 @@ public class AbstractHttpSenderConnectionTests { } @Test - public void testSupportsStreamingWithChunkingEnabled() throws Exception { + void testSupportsStreamingWithChunkingEnabled() throws Exception { testSupportsStreaming(true); } @Test - public void testSupportsStreamingWithChunkingDisabled() throws Exception { + void testSupportsStreamingWithChunkingDisabled() throws Exception { testSupportsStreaming(false); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTests.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTests.java index b25dd0be..fadaa659 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTests.java @@ -130,12 +130,12 @@ public abstract class AbstractHttpWebServiceMessageSenderIntegrationTests { @Override diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/CommonsHttpMessageSenderIntegrationTests.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/CommonsHttpMessageSenderIntegrationTests.java index a6f9999d..0d0241e5 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/CommonsHttpMessageSenderIntegrationTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/CommonsHttpMessageSenderIntegrationTests.java @@ -40,7 +40,7 @@ import org.springframework.ws.transport.WebServiceConnection; import org.springframework.ws.transport.support.FreePortScanner; @Deprecated -public class CommonsHttpMessageSenderIntegrationTests +class CommonsHttpMessageSenderIntegrationTests extends AbstractHttpWebServiceMessageSenderIntegrationTests { @Override @@ -49,7 +49,7 @@ public class CommonsHttpMessageSenderIntegrationTests } @Test - public void testMaxConnections() throws URIException { + void testMaxConnections() throws URIException { CommonsHttpMessageSender messageSender = new CommonsHttpMessageSender(); messageSender.setMaxTotalConnections(2); @@ -62,7 +62,7 @@ public class CommonsHttpMessageSenderIntegrationTests } @Test - public void testContextClose() throws Exception { + void testContextClose() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(); int port = FreePortScanner.getFreePort(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponentsMessageSenderIntegrationTests.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponentsMessageSenderIntegrationTests.java index 82243ef1..eea10e52 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponentsMessageSenderIntegrationTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponentsMessageSenderIntegrationTests.java @@ -46,7 +46,7 @@ import org.springframework.ws.transport.support.FreePortScanner; import static org.assertj.core.api.Assertions.assertThat; @SuppressWarnings("deprecation") -public class HttpComponentsMessageSenderIntegrationTests +class HttpComponentsMessageSenderIntegrationTests extends AbstractHttpWebServiceMessageSenderIntegrationTests { @Override @@ -55,7 +55,7 @@ public class HttpComponentsMessageSenderIntegrationTests } @Test - public void testMaxConnections() throws URISyntaxException { + void testMaxConnections() throws URISyntaxException { final String url1 = "https://www.example.com"; URI uri1 = new URI(url1); @@ -104,7 +104,7 @@ public class HttpComponentsMessageSenderIntegrationTests } @Test - public void testContextClose() throws Exception { + void testContextClose() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(); int port = FreePortScanner.getFreePort(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpServletConnectionTests.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpServletConnectionTests.java index 855c76af..51db10c1 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpServletConnectionTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpServletConnectionTests.java @@ -41,7 +41,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils; import static org.assertj.core.api.Assertions.assertThat; -public class HttpServletConnectionTests { +class HttpServletConnectionTests { private HttpServletConnection connection; @@ -63,7 +63,7 @@ public class HttpServletConnectionTests { private TransformerFactory transformerFactory; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.httpServletRequest = new MockHttpServletRequest(); this.httpServletResponse = new MockHttpServletResponse(); @@ -74,7 +74,7 @@ public class HttpServletConnectionTests { } @Test - public void receive() throws Exception { + void receive() throws Exception { byte[] bytes = SOAP_CONTENT.getBytes(StandardCharsets.UTF_8); this.httpServletRequest.addHeader("Content-Type", "text/xml"); @@ -100,7 +100,7 @@ public class HttpServletConnectionTests { } @Test - public void send() throws Exception { + void send() throws Exception { SaajSoapMessage message = this.messageFactory.createWebServiceMessage(); SOAPMessage saajMessage = message.getSaajMessage(); @@ -119,7 +119,7 @@ public class HttpServletConnectionTests { } @Test - public void faultCodes() throws IOException { + void faultCodes() throws IOException { this.connection.setFaultCode(SoapVersion.SOAP_11.getClientOrSenderFaultName()); assertThat(this.httpServletResponse.getStatus()).isEqualTo(500); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSenderIntegrationTests.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSenderIntegrationTests.java index e1f902c1..7d359ad7 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSenderIntegrationTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSenderIntegrationTests.java @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -public class HttpUrlConnectionMessageSenderIntegrationTests +class HttpUrlConnectionMessageSenderIntegrationTests extends AbstractHttpWebServiceMessageSenderIntegrationTests { @Override @@ -31,7 +31,7 @@ public class HttpUrlConnectionMessageSenderIntegrationTests } @Test - public void testSetTimeout() throws Exception { + void testSetTimeout() throws Exception { this.messageSender.setConnectionTimeout(Duration.ofSeconds(3)); this.messageSender.setReadTimeout(Duration.ofSeconds(5)); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/JdkHttpClientMessageSenderIntegrationTests.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/JdkHttpClientMessageSenderIntegrationTests.java index 931b2a47..30647d83 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/JdkHttpClientMessageSenderIntegrationTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/JdkHttpClientMessageSenderIntegrationTests.java @@ -16,7 +16,7 @@ package org.springframework.ws.transport.http; -public class JdkHttpClientMessageSenderIntegrationTests +class JdkHttpClientMessageSenderIntegrationTests extends AbstractHttpWebServiceMessageSenderIntegrationTests { @Override diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/LastModifiedHelperTests.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/LastModifiedHelperTests.java index 02a52471..4b61991d 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/LastModifiedHelperTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/LastModifiedHelperTests.java @@ -32,21 +32,21 @@ import org.springframework.xml.transform.ResourceSource; import static org.assertj.core.api.Assertions.assertThat; -public class LastModifiedHelperTests { +class LastModifiedHelperTests { private Resource resource; private long expected; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.resource = new ClassPathResource("single.xsd", getClass()); this.expected = this.resource.lastModified(); } @Test - public void testSaxSource() throws Exception { + void testSaxSource() throws Exception { long result = LastModifiedHelper.getLastModified(new ResourceSource(this.resource)); @@ -54,7 +54,7 @@ public class LastModifiedHelperTests { } @Test - public void testDomSource() throws Exception { + void testDomSource() throws Exception { DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); @@ -66,7 +66,7 @@ public class LastModifiedHelperTests { } @Test - public void testStreamSource() throws Exception { + void testStreamSource() throws Exception { long result = LastModifiedHelper.getLastModified(new StreamSource(this.resource.getFile())); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletIntegrationTests.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletIntegrationTests.java index 582c8358..bd9c3982 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletIntegrationTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletIntegrationTests.java @@ -43,7 +43,7 @@ import static org.xmlunit.assertj.XmlAssert.assertThat; /** * @author Arjen Poutsma */ -public class MessageDispatcherServletIntegrationTests { +class MessageDispatcherServletIntegrationTests { private static Server jettyServer; @@ -54,7 +54,7 @@ public class MessageDispatcherServletIntegrationTests { private SOAPConnectionFactory connectionFactory; @BeforeEach - public void startJetty() throws Exception { + void startJetty() throws Exception { int port = FreePortScanner.getFreePort(); url = "http://localhost:" + port; @@ -80,14 +80,14 @@ public class MessageDispatcherServletIntegrationTests { } @BeforeEach - public void setUpSaaj() throws SOAPException { + void setUpSaaj() throws SOAPException { this.messageFactory = MessageFactory.newInstance(); this.connectionFactory = SOAPConnectionFactory.newInstance(); } @AfterEach - public void stopJetty() throws Exception { + void stopJetty() throws Exception { if (jettyServer.isRunning()) { jettyServer.stop(); @@ -95,7 +95,7 @@ public class MessageDispatcherServletIntegrationTests { } @Test - public void echo() throws SOAPException { + void echo() throws SOAPException { SOAPMessage request = this.messageFactory.createMessage(); SOAPElement element = request.getSOAPBody() diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTests.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTests.java index 046772a1..c01cd7a4 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTests.java @@ -46,14 +46,14 @@ import org.springframework.xml.DocumentBuilderFactoryUtils; import static org.assertj.core.api.Assertions.assertThat; -public class MessageDispatcherServletTests { +class MessageDispatcherServletTests { private ServletConfig config; private MessageDispatcherServlet servlet; @BeforeEach - public void setUp() { + void setUp() { this.config = new MockServletConfig(new MockServletContext(), "spring-ws"); this.servlet = new MessageDispatcherServlet(); @@ -69,7 +69,7 @@ public class MessageDispatcherServletTests { } @Test - public void testDefaultStrategies() throws ServletException { + void testDefaultStrategies() throws ServletException { this.servlet.setContextClass(StaticWebApplicationContext.class); this.servlet.init(this.config); @@ -79,7 +79,7 @@ public class MessageDispatcherServletTests { } @Test - public void testDetectedStrategies() throws ServletException { + void testDetectedStrategies() throws ServletException { this.servlet.setContextClass(DetectWebApplicationContext.class); this.servlet.init(this.config); @@ -92,7 +92,7 @@ public class MessageDispatcherServletTests { } @Test - public void testDetectWsdlDefinitions() throws Exception { + void testDetectWsdlDefinitions() throws Exception { this.servlet.setContextClass(WsdlDefinitionWebApplicationContext.class); this.servlet.init(this.config); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapterTests.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapterTests.java index 9ce8285b..37b691a2 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapterTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapterTests.java @@ -41,7 +41,7 @@ import static org.easymock.EasyMock.isA; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class WebServiceMessageReceiverHandlerAdapterTests { +class WebServiceMessageReceiverHandlerAdapterTests { private static final String REQUEST = """ { }; @@ -37,14 +37,14 @@ public class CallbackHandlerChainTests { }; @Test - public void testSupported() throws Exception { + void testSupported() throws Exception { CallbackHandlerChain chain = new CallbackHandlerChain(new CallbackHandler[] { this.supported }); chain.handle(new Callback[] { this.callback }); } @Test - public void testUnsupportedSupported() throws Exception { + void testUnsupportedSupported() throws Exception { CallbackHandlerChain chain = new CallbackHandlerChain( new CallbackHandler[] { this.unsupported, this.supported }); @@ -52,7 +52,7 @@ public class CallbackHandlerChainTests { } @Test - public void testUnsupported() { + void testUnsupported() { assertThatExceptionOfType(UnsupportedCallbackException.class).isThrownBy(() -> { diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/support/KeyManagersFactoryBeanTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/support/KeyManagersFactoryBeanTests.java index b5cc20e5..81b00355 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/support/KeyManagersFactoryBeanTests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/support/KeyManagersFactoryBeanTests.java @@ -22,10 +22,10 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -public class KeyManagersFactoryBeanTests { +class KeyManagersFactoryBeanTests { @Test - public void defaults() throws Exception { + void defaults() throws Exception { KeyManagersFactoryBean factoryBean = new KeyManagersFactoryBean(); factoryBean.afterPropertiesSet(); @@ -36,7 +36,7 @@ public class KeyManagersFactoryBeanTests { } @Test - public void algorithm() throws Exception { + void algorithm() throws Exception { KeyManagersFactoryBean factoryBean = new KeyManagersFactoryBean(); factoryBean.setAlgorithm("PKIX"); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/support/TrustManagersFactoryBeanTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/support/TrustManagersFactoryBeanTests.java index 0ac909e3..3e73ce9f 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/support/TrustManagersFactoryBeanTests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/support/TrustManagersFactoryBeanTests.java @@ -22,10 +22,10 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -public class TrustManagersFactoryBeanTests { +class TrustManagersFactoryBeanTests { @Test - public void defaults() throws Exception { + void defaults() throws Exception { TrustManagersFactoryBean factoryBean = new TrustManagersFactoryBean(); factoryBean.afterPropertiesSet(); @@ -36,7 +36,7 @@ public class TrustManagersFactoryBeanTests { } @Test - public void algorithm() throws Exception { + void algorithm() throws Exception { TrustManagersFactoryBean factoryBean = new TrustManagersFactoryBean(); factoryBean.setAlgorithm("PKIX"); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jInterceptorTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jInterceptorTests.java index ab61a60b..6b64f991 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jInterceptorTests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jInterceptorTests.java @@ -16,6 +16,6 @@ package org.springframework.ws.soap.security.wss4j2; -public class SaajWss4jInterceptorTests extends Wss4jInterceptorTests { +class SaajWss4jInterceptorTests extends Wss4jInterceptorTests { } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorEncryptionTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorEncryptionTests.java index e0adb7a6..bb76980c 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorEncryptionTests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorEncryptionTests.java @@ -16,6 +16,6 @@ package org.springframework.ws.soap.security.wss4j2; -public class SaajWss4jMessageInterceptorEncryptionTests extends Wss4jMessageInterceptorEncryptionTests { +class SaajWss4jMessageInterceptorEncryptionTests extends Wss4jMessageInterceptorEncryptionTests { } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorHeaderTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorHeaderTests.java index 9af6b8e2..17f95810 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorHeaderTests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorHeaderTests.java @@ -16,6 +16,6 @@ package org.springframework.ws.soap.security.wss4j2; -public class SaajWss4jMessageInterceptorHeaderTests extends Wss4jMessageInterceptorHeaderTests { +class SaajWss4jMessageInterceptorHeaderTests extends Wss4jMessageInterceptorHeaderTests { } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSamlTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSamlTests.java index 8d777917..6332aff5 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSamlTests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSamlTests.java @@ -16,6 +16,6 @@ package org.springframework.ws.soap.security.wss4j2; -public class SaajWss4jMessageInterceptorSamlTests extends Wss4jMessageInterceptorSamlTests { +class SaajWss4jMessageInterceptorSamlTests extends Wss4jMessageInterceptorSamlTests { } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSignTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSignTests.java index bdcd1ccc..5e6ac889 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSignTests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSignTests.java @@ -39,12 +39,12 @@ import org.springframework.xml.transform.TransformerFactoryUtils; import static org.assertj.core.api.Assertions.assertThat; -public class SaajWss4jMessageInterceptorSignTests extends Wss4jMessageInterceptorSignTests { +class SaajWss4jMessageInterceptorSignTests extends Wss4jMessageInterceptorSignTests { private static final String PAYLOAD = "QQQ"; @Test - public void testSignAndValidate() throws Exception { + void testSignAndValidate() throws Exception { Transformer transformer = TransformerFactoryUtils.newInstance().newTransformer(); this.interceptor.setSecurementActions("Signature"); @@ -85,7 +85,7 @@ public class SaajWss4jMessageInterceptorSignTests extends Wss4jMessageIntercepto } @Test - public void testSignWithoutInclusivePrefixesAndValidate() throws Exception { + void testSignWithoutInclusivePrefixesAndValidate() throws Exception { Transformer transformer = TransformerFactoryUtils.newInstance().newTransformer(); this.interceptor.setSecurementActions("Signature"); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSoapActionTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSoapActionTests.java index 999c29dc..937e95e5 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSoapActionTests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSoapActionTests.java @@ -16,6 +16,6 @@ package org.springframework.ws.soap.security.wss4j2; -public class SaajWss4jMessageInterceptorSoapActionTests extends Wss4jMessageInterceptorSoapActionTests { +class SaajWss4jMessageInterceptorSoapActionTests extends Wss4jMessageInterceptorSoapActionTests { } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSpringSecurityCallbackHandlerTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSpringSecurityCallbackHandlerTests.java index ee65c205..a0228c0a 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSpringSecurityCallbackHandlerTests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSpringSecurityCallbackHandlerTests.java @@ -16,7 +16,7 @@ package org.springframework.ws.soap.security.wss4j2; -public class SaajWss4jMessageInterceptorSpringSecurityCallbackHandlerTests +class SaajWss4jMessageInterceptorSpringSecurityCallbackHandlerTests extends Wss4jMessageInterceptorSpringSecurityCallbackHandlerTests { } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorTimestampTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorTimestampTests.java index 8c468291..a6d6797b 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorTimestampTests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorTimestampTests.java @@ -16,6 +16,6 @@ package org.springframework.ws.soap.security.wss4j2; -public class SaajWss4jMessageInterceptorTimestampTests extends Wss4jMessageInterceptorTimestampTests { +class SaajWss4jMessageInterceptorTimestampTests extends Wss4jMessageInterceptorTimestampTests { } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorUsernameTokenSignatureTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorUsernameTokenSignatureTests.java index d22b2f66..6f87178e 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorUsernameTokenSignatureTests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorUsernameTokenSignatureTests.java @@ -16,7 +16,7 @@ package org.springframework.ws.soap.security.wss4j2; -public class SaajWss4jMessageInterceptorUsernameTokenSignatureTests +class SaajWss4jMessageInterceptorUsernameTokenSignatureTests extends Wss4jMessageInterceptorUsernameTokenSignatureTests { } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorUsernameTokenTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorUsernameTokenTests.java index 42ee11d5..21e19b92 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorUsernameTokenTests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorUsernameTokenTests.java @@ -16,6 +16,6 @@ package org.springframework.ws.soap.security.wss4j2; -public class SaajWss4jMessageInterceptorUsernameTokenTests extends Wss4jMessageInterceptorUsernameTokenTests { +class SaajWss4jMessageInterceptorUsernameTokenTests extends Wss4jMessageInterceptorUsernameTokenTests { } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorX509Tests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorX509Tests.java index e822c485..2cea442a 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorX509Tests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorX509Tests.java @@ -19,6 +19,6 @@ package org.springframework.ws.soap.security.wss4j2; /** * @author tareq */ -public class SaajWss4jMessageInterceptorX509Tests extends Wss4jMessageInterceptorX509Tests { +class SaajWss4jMessageInterceptorX509Tests extends Wss4jMessageInterceptorX509Tests { } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jSecurityInterceptorDefaultsTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jSecurityInterceptorDefaultsTests.java index e33fc0fe..1091d1b5 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jSecurityInterceptorDefaultsTests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jSecurityInterceptorDefaultsTests.java @@ -38,12 +38,12 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.springframework.test.util.AssertionErrors.assertEquals; -public class SaajWss4jSecurityInterceptorDefaultsTests extends Wss4jTests { +class SaajWss4jSecurityInterceptorDefaultsTests extends Wss4jTests { private static final String PAYLOAD = "QQQ"; @Test - public void testThatTheDefaultValueForAddInclusivePrefixesMatchesWss4JDefaultValue() { + void testThatTheDefaultValueForAddInclusivePrefixesMatchesWss4JDefaultValue() { Wss4jSecurityInterceptor subject = new Wss4jSecurityInterceptor(); RequestData requestData = new RequestData(); @@ -54,7 +54,7 @@ public class SaajWss4jSecurityInterceptorDefaultsTests extends Wss4jTests { } @Test - public void testThatInitializeValidationRequestDataSetsInclusivePrefixesUsingDefaults() + void testThatInitializeValidationRequestDataSetsInclusivePrefixesUsingDefaults() throws TransformerException, SOAPException { Wss4jSecurityInterceptor subject = new Wss4jSecurityInterceptor(); @@ -74,7 +74,7 @@ public class SaajWss4jSecurityInterceptorDefaultsTests extends Wss4jTests { } @Test - public void testThatInitializeValidationRequestDataSetsInclusivePrefixesUsingNotUsingInclusivePrefixes() + void testThatInitializeValidationRequestDataSetsInclusivePrefixesUsingNotUsingInclusivePrefixes() throws TransformerException, SOAPException { Wss4jSecurityInterceptor subject = new Wss4jSecurityInterceptor(); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jInterceptorTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jInterceptorTests.java index d127c7f1..81ca0ca4 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jInterceptorTests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jInterceptorTests.java @@ -32,7 +32,7 @@ import static org.assertj.core.api.Assertions.fail; public abstract class Wss4jInterceptorTests extends Wss4jTests { @Test - public void testHandleRequest() throws Exception { + void testHandleRequest() throws Exception { SoapMessage request = loadSoap11Message("empty-soap.xml"); final Object requestMessage = getMessage(request); @@ -63,7 +63,7 @@ public abstract class Wss4jInterceptorTests extends Wss4jTests { } @Test - public void testHandleResponse() throws Exception { + void testHandleResponse() throws Exception { SoapMessage securedResponse = loadSoap11Message("empty-soap.xml"); final Object securedResponseMessage = getMessage(securedResponse); @@ -93,7 +93,7 @@ public abstract class Wss4jInterceptorTests extends Wss4jTests { } @Test - public void testHandleCustomSecurityEngine() { + void testHandleCustomSecurityEngine() { WSSecurityEngine engine = new WSSecurityEngine(); Wss4jSecurityInterceptor interceptor = new Wss4jSecurityInterceptor(engine); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorEncryptionTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorEncryptionTests.java index bcb14d1f..a0bac4c2 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorEncryptionTests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorEncryptionTests.java @@ -61,7 +61,7 @@ public abstract class Wss4jMessageInterceptorEncryptionTests extends Wss4jTests } @Test - public void testDecryptRequest() throws Exception { + void testDecryptRequest() throws Exception { SoapMessage message = loadSoap11Message("encrypted-soap.xml"); MessageContext messageContext = new DefaultMessageContext(message, getSoap11MessageFactory()); @@ -75,7 +75,7 @@ public abstract class Wss4jMessageInterceptorEncryptionTests extends Wss4jTests } @Test - public void testEncryptResponse() throws Exception { + void testEncryptResponse() throws Exception { SoapMessage message = loadSoap11Message("empty-soap.xml"); MessageContext messageContext = getSoap11MessageContext(message); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorHeaderTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorHeaderTests.java index 770b32c7..acc3ddbe 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorHeaderTests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorHeaderTests.java @@ -71,7 +71,7 @@ public abstract class Wss4jMessageInterceptorHeaderTests extends Wss4jTests { } @Test - public void testValidateUsernameTokenPlainText() throws Exception { + void testValidateUsernameTokenPlainText() throws Exception { SoapMessage message = loadSoap11Message("usernameTokenPlainTextWithHeaders-soap.xml"); MessageContext messageContext = new DefaultMessageContext(message, getSoap11MessageFactory()); @@ -98,7 +98,7 @@ public abstract class Wss4jMessageInterceptorHeaderTests extends Wss4jTests { } @Test - public void testValidateUsernameTokenPlainTextButKeepSecurityHeader() throws Exception { + void testValidateUsernameTokenPlainTextButKeepSecurityHeader() throws Exception { SoapMessage message = loadSoap11Message("usernameTokenPlainTextWithHeaders-soap.xml"); MessageContext messageContext = new DefaultMessageContext(message, getSoap11MessageFactory()); @@ -126,7 +126,7 @@ public abstract class Wss4jMessageInterceptorHeaderTests extends Wss4jTests { } @Test - public void testEmptySecurityHeader() { + void testEmptySecurityHeader() { assertThatExceptionOfType(WsSecurityValidationException.class).isThrownBy(() -> { @@ -137,7 +137,7 @@ public abstract class Wss4jMessageInterceptorHeaderTests extends Wss4jTests { } @Test - public void testPreserveCustomHeaders() throws Exception { + void testPreserveCustomHeaders() throws Exception { this.interceptor.setSecurementActions("UsernameToken"); this.interceptor.setSecurementUsername("Bert"); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTests.java index dadf8ae9..d6c5da44 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTests.java @@ -66,7 +66,7 @@ public abstract class Wss4jMessageInterceptorSamlTests extends Wss4jTests { } @Test - public void testAddSAML() throws Exception { + void testAddSAML() throws Exception { this.interceptor.setSecurementPassword("123456"); this.interceptor.setSecurementUsername("rsaKey"); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSignTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSignTests.java index a7b27b00..8050b890 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSignTests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSignTests.java @@ -56,7 +56,7 @@ public abstract class Wss4jMessageInterceptorSignTests extends Wss4jTests { } @Test - public void testValidateCertificate() throws Exception { + void testValidateCertificate() throws Exception { SoapMessage message = loadSoap11Message("signed-soap.xml"); @@ -71,7 +71,7 @@ public abstract class Wss4jMessageInterceptorSignTests extends Wss4jTests { } @Test - public void testValidateCertificateWithSignatureConfirmation() throws Exception { + void testValidateCertificateWithSignatureConfirmation() throws Exception { SoapMessage message = loadSoap11Message("signed-soap.xml"); MessageContext messageContext = getSoap11MessageContext(message); @@ -88,7 +88,7 @@ public abstract class Wss4jMessageInterceptorSignTests extends Wss4jTests { } @Test - public void testSignResponse() throws Exception { + void testSignResponse() throws Exception { this.interceptor.setSecurementActions("Signature"); this.interceptor.setEnableSignatureConfirmation(false); @@ -107,7 +107,7 @@ public abstract class Wss4jMessageInterceptorSignTests extends Wss4jTests { } @Test - public void testSignResponseWithSignatureUser() throws Exception { + void testSignResponseWithSignatureUser() throws Exception { this.interceptor.setSecurementActions("Signature"); this.interceptor.setEnableSignatureConfirmation(false); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSoapActionTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSoapActionTests.java index 674ad656..81dd6e23 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSoapActionTests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSoapActionTests.java @@ -54,7 +54,7 @@ public abstract class Wss4jMessageInterceptorSoapActionTests extends Wss4jTests } @Test - public void testPreserveSoapActionOnValidation() throws Exception { + void testPreserveSoapActionOnValidation() throws Exception { SoapMessage message = loadSoap11Message("usernameTokenPlainText-soap.xml"); message.setSoapAction(SOAP_ACTION); @@ -66,7 +66,7 @@ public abstract class Wss4jMessageInterceptorSoapActionTests extends Wss4jTests } @Test - public void testPreserveSoap12ActionOnValidation() throws Exception { + void testPreserveSoap12ActionOnValidation() throws Exception { SoapMessage message = loadSoap12Message("usernameTokenPlainText-soap12.xml"); message.setSoapAction(SOAP_ACTION); WebServiceMessageFactory messageFactory = getSoap12MessageFactory(); @@ -78,7 +78,7 @@ public abstract class Wss4jMessageInterceptorSoapActionTests extends Wss4jTests } @Test - public void testPreserveSoapActionOnSecurement() throws Exception { + void testPreserveSoapActionOnSecurement() throws Exception { SoapMessage message = loadSoap11Message("empty-soap.xml"); message.setSoapAction(SOAP_ACTION); this.interceptor.setSecurementUsername("Bert"); @@ -91,7 +91,7 @@ public abstract class Wss4jMessageInterceptorSoapActionTests extends Wss4jTests } @Test - public void testPreserveSoap12ActionOnSecurement() throws Exception { + void testPreserveSoap12ActionOnSecurement() throws Exception { SoapMessage message = loadSoap12Message("empty-soap12.xml"); message.setSoapAction(SOAP_ACTION); this.interceptor.setSecurementUsername("Bert"); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTests.java index d9d48184..b385ff71 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTests.java @@ -57,7 +57,7 @@ public abstract class Wss4jMessageInterceptorSpringSecurityCallbackHandlerTests } @Test - public void testValidateUsernameTokenPlainText() throws Exception { + void testValidateUsernameTokenPlainText() throws Exception { EndpointInterceptor interceptor = prepareInterceptor("UsernameToken", true, false); SoapMessage message = loadSoap11Message("usernameTokenPlainText-soap.xml"); @@ -74,7 +74,7 @@ public abstract class Wss4jMessageInterceptorSpringSecurityCallbackHandlerTests } @Test - public void testValidateUsernameTokenDigest() throws Exception { + void testValidateUsernameTokenDigest() throws Exception { Wss4jSecurityInterceptor interceptor = new Wss4jSecurityInterceptor(); interceptor.setSecurementActions("UsernameToken"); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorTimestampTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorTimestampTests.java index b3e60657..47b50134 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorTimestampTests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorTimestampTests.java @@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public abstract class Wss4jMessageInterceptorTimestampTests extends Wss4jTests { @Test - public void testAddTimestamp() throws Exception { + void testAddTimestamp() throws Exception { Wss4jSecurityInterceptor interceptor = new Wss4jSecurityInterceptor(); interceptor.setSecurementActions("Timestamp"); @@ -48,7 +48,7 @@ public abstract class Wss4jMessageInterceptorTimestampTests extends Wss4jTests { } @Test - public void testValidateTimestamp() throws Exception { + void testValidateTimestamp() throws Exception { Wss4jSecurityInterceptor interceptor = new Wss4jSecurityInterceptor(); interceptor.setValidationActions("Timestamp"); @@ -63,7 +63,7 @@ public abstract class Wss4jMessageInterceptorTimestampTests extends Wss4jTests { } @Test - public void testValidateTimestampWithExpiredTtl() { + void testValidateTimestampWithExpiredTtl() { assertThatExceptionOfType(WsSecurityValidationException.class).isThrownBy(() -> { @@ -77,7 +77,7 @@ public abstract class Wss4jMessageInterceptorTimestampTests extends Wss4jTests { } @Test - public void testValidateTimestampWithExpiredTtlCustomTtl() { + void testValidateTimestampWithExpiredTtlCustomTtl() { assertThatExceptionOfType(WsSecurityValidationException.class).isThrownBy(() -> { @@ -93,7 +93,7 @@ public abstract class Wss4jMessageInterceptorTimestampTests extends Wss4jTests { } @Test - public void testSecureTimestampWithCustomTtl() throws Exception { + void testSecureTimestampWithCustomTtl() throws Exception { Wss4jSecurityInterceptor interceptor = new Wss4jSecurityInterceptor(); interceptor.setSecurementActions("Timestamp"); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenSignatureTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenSignatureTests.java index 61174fac..575c1ca1 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenSignatureTests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenSignatureTests.java @@ -25,7 +25,7 @@ import org.springframework.ws.soap.SoapMessage; public abstract class Wss4jMessageInterceptorUsernameTokenSignatureTests extends Wss4jTests { @Test - public void testAddUsernameTokenSignature() throws Exception { + void testAddUsernameTokenSignature() throws Exception { Wss4jSecurityInterceptor interceptor = new Wss4jSecurityInterceptor(); interceptor.setSecurementActions("UsernameToken"); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenTests.java index 13604ef7..b72279ba 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenTests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenTests.java @@ -39,7 +39,7 @@ public abstract class Wss4jMessageInterceptorUsernameTokenTests extends Wss4jTes } @Test - public void testValidateUsernameTokenPlainText() throws Exception { + void testValidateUsernameTokenPlainText() throws Exception { Wss4jSecurityInterceptor interceptor = prepareInterceptor("UsernameToken", true, false); SoapMessage message = loadSoap11Message("usernameTokenPlainText-soap.xml"); @@ -49,7 +49,7 @@ public abstract class Wss4jMessageInterceptorUsernameTokenTests extends Wss4jTes } @Test - public void testValidateUsernameTokenDigest() throws Exception { + void testValidateUsernameTokenDigest() throws Exception { Wss4jSecurityInterceptor interceptor = new Wss4jSecurityInterceptor(); interceptor.setSecurementActions("UsernameToken"); @@ -68,7 +68,7 @@ public abstract class Wss4jMessageInterceptorUsernameTokenTests extends Wss4jTes } @Test - public void testValidateUsernameTokenWithQualifiedType() throws Exception { + void testValidateUsernameTokenWithQualifiedType() throws Exception { Wss4jSecurityInterceptor interceptor = prepareInterceptor("UsernameToken", true, false); SoapMessage message = loadSoap11Message("usernameTokenPlainTextQualifiedType-soap.xml"); @@ -79,7 +79,7 @@ public abstract class Wss4jMessageInterceptorUsernameTokenTests extends Wss4jTes } @Test - public void testAddUsernameTokenPlainText() throws Exception { + void testAddUsernameTokenPlainText() throws Exception { Wss4jSecurityInterceptor interceptor = prepareInterceptor("UsernameToken", false, false); interceptor.setSecurementUsername("Bert"); interceptor.setSecurementPassword("Ernie"); @@ -93,7 +93,7 @@ public abstract class Wss4jMessageInterceptorUsernameTokenTests extends Wss4jTes } @Test - public void testAddUsernameTokenPlainTextContextCredentialsOverride() throws Exception { + void testAddUsernameTokenPlainTextContextCredentialsOverride() throws Exception { Wss4jSecurityInterceptor interceptor = prepareInterceptor("UsernameToken", false, false); interceptor.setSecurementUsername("Bert"); interceptor.setSecurementPassword("Ernie"); @@ -109,7 +109,7 @@ public abstract class Wss4jMessageInterceptorUsernameTokenTests extends Wss4jTes } @Test - public void testAddUsernameTokenDigest() throws Exception { + void testAddUsernameTokenDigest() throws Exception { Wss4jSecurityInterceptor interceptor = prepareInterceptor("UsernameToken", false, true); interceptor.setSecurementUsername("Bert"); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorX509Tests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorX509Tests.java index 9694bc36..b6999b89 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorX509Tests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorX509Tests.java @@ -48,7 +48,7 @@ public abstract class Wss4jMessageInterceptorX509Tests extends Wss4jTests { } @Test - public void testAddCertificate() throws Exception { + void testAddCertificate() throws Exception { this.interceptor.setSecurementPassword("123456"); this.interceptor.setSecurementUsername("rsaKey"); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandlerTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandlerTests.java index c2a3f216..b93abbe7 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandlerTests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandlerTests.java @@ -27,14 +27,14 @@ import org.springframework.ws.soap.security.support.KeyStoreFactoryBean; import static org.assertj.core.api.Assertions.assertThat; -public class KeyStoreCallbackHandlerTests { +class KeyStoreCallbackHandlerTests { private KeyStoreCallbackHandler callbackHandler; private WSPasswordCallback callback; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.callbackHandler = new KeyStoreCallbackHandler(); this.callback = new WSPasswordCallback("secretkey", WSPasswordCallback.SECRET_KEY); @@ -50,7 +50,7 @@ public class KeyStoreCallbackHandlerTests { } @Test - public void testHandleKeyName() throws Exception { + void testHandleKeyName() throws Exception { this.callbackHandler.handleInternal(this.callback); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/SpringSecurityPasswordValidationCallbackHandlerTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/SpringSecurityPasswordValidationCallbackHandlerTests.java index 9d299dc0..dd4dceb8 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/SpringSecurityPasswordValidationCallbackHandlerTests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/SpringSecurityPasswordValidationCallbackHandlerTests.java @@ -43,7 +43,7 @@ import static org.easymock.EasyMock.verify; /** * @author tareq */ -public class SpringSecurityPasswordValidationCallbackHandlerTests { +class SpringSecurityPasswordValidationCallbackHandlerTests { private SpringSecurityPasswordValidationCallbackHandler callbackHandler; @@ -56,7 +56,7 @@ public class SpringSecurityPasswordValidationCallbackHandlerTests { private UserDetails user; @BeforeEach - public void setUp() { + void setUp() { // add clearContext() at the beginning of each method in case {@code // SecurityContextHolder} isn't clean SecurityContextHolder.clearContext(); @@ -73,7 +73,7 @@ public class SpringSecurityPasswordValidationCallbackHandlerTests { } @Test - public void testHandleUsernameToken() throws Exception { + void testHandleUsernameToken() throws Exception { UserDetailsService userDetailsService = createMock(UserDetailsService.class); this.callbackHandler.setUserDetailsService(userDetailsService); @@ -90,7 +90,7 @@ public class SpringSecurityPasswordValidationCallbackHandlerTests { } @Test - public void testHandleUsernameTokenUserNotFound() throws Exception { + void testHandleUsernameTokenUserNotFound() throws Exception { UserDetailsService userDetailsService = createMock(UserDetailsService.class); this.callbackHandler.setUserDetailsService(userDetailsService); @@ -108,7 +108,7 @@ public class SpringSecurityPasswordValidationCallbackHandlerTests { } @Test - public void testHandleUsernameTokenPrincipal() throws Exception { + void testHandleUsernameTokenPrincipal() throws Exception { UserDetailsService userDetailsService = createMock(UserDetailsService.class); this.callbackHandler.setUserDetailsService(userDetailsService); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/support/CryptoFactoryBeanTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/support/CryptoFactoryBeanTests.java index 3d73c81c..9a111bc2 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/support/CryptoFactoryBeanTests.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/support/CryptoFactoryBeanTests.java @@ -26,17 +26,17 @@ import org.springframework.core.io.ClassPathResource; import static org.assertj.core.api.Assertions.assertThat; -public class CryptoFactoryBeanTests { +class CryptoFactoryBeanTests { private CryptoFactoryBean factoryBean; @BeforeEach - public void setUp() { + void setUp() { this.factoryBean = new CryptoFactoryBean(); } @Test - public void testSetConfiguration() throws Exception { + void testSetConfiguration() throws Exception { Properties configuration = new Properties(); configuration.setProperty("org.apache.ws.security.crypto.provider", @@ -55,7 +55,7 @@ public class CryptoFactoryBeanTests { } @Test - public void testProperties() throws Exception { + void testProperties() throws Exception { this.factoryBean.setKeyStoreType("jceks"); this.factoryBean.setKeyStorePassword("123456"); diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/http/WebServiceHttpHandlerIntegrationTests.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/http/WebServiceHttpHandlerIntegrationTests.java index 8798e7e9..e812cb2e 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/http/WebServiceHttpHandlerIntegrationTests.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/http/WebServiceHttpHandlerIntegrationTests.java @@ -43,13 +43,13 @@ import static org.assertj.core.api.Assertions.assertThat; @ExtendWith(SpringExtension.class) @ContextConfiguration("httpserver-applicationContext.xml") -public class WebServiceHttpHandlerIntegrationTests { +class WebServiceHttpHandlerIntegrationTests { @Autowired private int port; @Test - public void testInvalidMethod() { + void testInvalidMethod() { HttpGet httpRequest = new HttpGet(serviceUrl()); execute(httpRequest, response -> { assertThat(response.getCode()).isEqualTo(HttpTransportConstants.STATUS_METHOD_NOT_ALLOWED); @@ -59,7 +59,7 @@ public class WebServiceHttpHandlerIntegrationTests { } @Test - public void testNoResponse() throws IOException { + void testNoResponse() throws IOException { HttpPost httpRequest = new HttpPost(serviceUrl()); httpRequest.addHeader(TransportConstants.HEADER_SOAP_ACTION, "http://springframework.org/spring-ws/NoResponse"); Resource soapRequest = new ClassPathResource("soapRequest.xml", WebServiceHttpHandlerIntegrationTests.class); @@ -72,7 +72,7 @@ public class WebServiceHttpHandlerIntegrationTests { } @Test - public void testResponse() throws IOException { + void testResponse() throws IOException { HttpPost httpRequest = new HttpPost(serviceUrl()); httpRequest.addHeader(TransportConstants.HEADER_SOAP_ACTION, "http://springframework.org/spring-ws/Response"); Resource soapRequest = new ClassPathResource("soapRequest.xml", WebServiceHttpHandlerIntegrationTests.class); @@ -85,7 +85,7 @@ public class WebServiceHttpHandlerIntegrationTests { } @Test - public void testNoEndpoint() throws IOException { + void testNoEndpoint() throws IOException { HttpPost httpRequest = new HttpPost(serviceUrl()); httpRequest.addHeader(TransportConstants.HEADER_SOAP_ACTION, "http://springframework.org/spring-ws/NoEndpoint"); Resource soapRequest = new ClassPathResource("soapRequest.xml", WebServiceHttpHandlerIntegrationTests.class); @@ -98,7 +98,7 @@ public class WebServiceHttpHandlerIntegrationTests { } @Test - public void testFault() throws IOException { + void testFault() throws IOException { HttpPost httpRequest = new HttpPost(serviceUrl()); httpRequest.addHeader(TransportConstants.HEADER_SOAP_ACTION, "http://springframework.org/spring-ws/Fault"); Resource soapRequest = new ClassPathResource("soapRequest.xml", WebServiceHttpHandlerIntegrationTests.class); diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTests.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTests.java index f01494d4..7369a040 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTests.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTests.java @@ -30,13 +30,13 @@ import static org.xmlunit.assertj.XmlAssert.assertThat; @ExtendWith(SpringExtension.class) @ContextConfiguration("jms-applicationContext.xml") -public class JmsIntegrationTests { +class JmsIntegrationTests { @Autowired private WebServiceTemplate webServiceTemplate; @Test - public void testTemporaryQueue() { + void testTemporaryQueue() { String content = ""; StringResult result = new StringResult(); this.webServiceTemplate.sendSourceAndReceiveToResult(new StringSource(content), result); @@ -44,7 +44,7 @@ public class JmsIntegrationTests { } @Test - public void testPermanentQueue() { + void testPermanentQueue() { String url = "jms:RequestQueue?deliveryMode=NON_PERSISTENT;replyToName=ResponseQueue"; String content = ""; StringResult result = new StringResult(); diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsMessageSenderIntegrationTests.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsMessageSenderIntegrationTests.java index ae434f42..b4dfb2de 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsMessageSenderIntegrationTests.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsMessageSenderIntegrationTests.java @@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat; @ExtendWith(SpringExtension.class) @ContextConfiguration("jms-sender-applicationContext.xml") -public class JmsMessageSenderIntegrationTests { +class JmsMessageSenderIntegrationTests { @Autowired private JmsMessageSender messageSender; @@ -56,12 +56,12 @@ public class JmsMessageSenderIntegrationTests { private static final String SOAP_ACTION = "\"http://springframework.org/DoIt\""; @BeforeEach - public void createMessageFactory() throws Exception { + void createMessageFactory() throws Exception { this.messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); } @Test - public void testSendAndReceiveQueueBytesMessageTemporaryQueue() throws Exception { + void testSendAndReceiveQueueBytesMessageTemporaryQueue() throws Exception { URI uri = new URI("jms:SenderRequestQueue?deliveryMode=NON_PERSISTENT"); @@ -99,7 +99,7 @@ public class JmsMessageSenderIntegrationTests { } @Test - public void testSendAndReceiveQueueBytesMessagePermanentQueue() throws Exception { + void testSendAndReceiveQueueBytesMessagePermanentQueue() throws Exception { String responseQueueName = "SenderResponseQueue"; URI uri = new URI("jms:SenderRequestQueue?replyToName=" + responseQueueName + "&deliveryMode=NON_PERSISTENT"); @@ -139,7 +139,7 @@ public class JmsMessageSenderIntegrationTests { } @Test - public void testSendAndReceiveQueueTextMessage() throws Exception { + void testSendAndReceiveQueueTextMessage() throws Exception { URI uri = new URI("jms:SenderRequestQueue?deliveryMode=NON_PERSISTENT&messageType=TEXT_MESSAGE"); @@ -177,7 +177,7 @@ public class JmsMessageSenderIntegrationTests { } @Test - public void testSendNoResponse() throws Exception { + void testSendNoResponse() throws Exception { URI uri = new URI("jms:SenderRequestQueue?deliveryMode=NON_PERSISTENT"); @@ -200,7 +200,7 @@ public class JmsMessageSenderIntegrationTests { } @Test - public void testPostProcessor() throws Exception { + void testPostProcessor() throws Exception { MessagePostProcessor processor = message -> { diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/WebServiceMessageListenerIntegrationTests.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/WebServiceMessageListenerIntegrationTests.java index 96b03010..c5a9a088 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/WebServiceMessageListenerIntegrationTests.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/WebServiceMessageListenerIntegrationTests.java @@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat; @ExtendWith(SpringExtension.class) @ContextConfiguration("jms-receiver-applicationContext.xml") -public class WebServiceMessageListenerIntegrationTests { +class WebServiceMessageListenerIntegrationTests { private static final String CONTENT = """ \ @@ -58,7 +58,7 @@ public class WebServiceMessageListenerIntegrationTests { private Topic requestTopic; @Test - public void testReceiveQueueBytesMessage() { + void testReceiveQueueBytesMessage() { final byte[] b = CONTENT.getBytes(StandardCharsets.UTF_8); @@ -75,7 +75,7 @@ public class WebServiceMessageListenerIntegrationTests { } @Test - public void testReceiveQueueTextMessage() { + void testReceiveQueueTextMessage() { this.jmsTemplate.send(this.requestQueue, session -> { @@ -90,7 +90,7 @@ public class WebServiceMessageListenerIntegrationTests { } @Test - public void testReceiveTopic() throws Exception { + void testReceiveTopic() throws Exception { final byte[] b = CONTENT.getBytes(StandardCharsets.UTF_8); diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/support/JmsTransportUtilsTests.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/support/JmsTransportUtilsTests.java index 5d572238..dd7892e3 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/support/JmsTransportUtilsTests.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/support/JmsTransportUtilsTests.java @@ -26,10 +26,10 @@ import org.springframework.ws.transport.jms.JmsTransportConstants; import static org.assertj.core.api.Assertions.assertThat; -public class JmsTransportUtilsTests { +class JmsTransportUtilsTests { @Test - public void getDestinationName() throws Exception { + void getDestinationName() throws Exception { URI uri = new URI("jms:RequestQueue?replyToName=RESP_QUEUE"); String destinationName = JmsTransportUtils.getDestinationName(uri); @@ -43,7 +43,7 @@ public class JmsTransportUtilsTests { } @Test - public void getDeliveryMode() throws Exception { + void getDeliveryMode() throws Exception { URI uri = new URI("jms:RequestQueue?deliveryMode=NON_PERSISTENT"); int deliveryMode = JmsTransportUtils.getDeliveryMode(uri); @@ -62,7 +62,7 @@ public class JmsTransportUtilsTests { } @Test - public void getMessageType() throws Exception { + void getMessageType() throws Exception { URI uri = new URI("jms:RequestQueue?messageType=BYTESMESSAGE"); int messageType = JmsTransportUtils.getMessageType(uri); @@ -81,7 +81,7 @@ public class JmsTransportUtilsTests { } @Test - public void getTimeToLive() throws Exception { + void getTimeToLive() throws Exception { URI uri = new URI("jms:RequestQueue?timeToLive=100"); long timeToLive = JmsTransportUtils.getTimeToLive(uri); @@ -95,7 +95,7 @@ public class JmsTransportUtilsTests { } @Test - public void getPriority() throws Exception { + void getPriority() throws Exception { URI uri = new URI("jms:RequestQueue?priority=5"); int priority = JmsTransportUtils.getPriority(uri); @@ -109,7 +109,7 @@ public class JmsTransportUtilsTests { } @Test - public void getReplyToName() throws Exception { + void getReplyToName() throws Exception { URI uri = new URI("jms:RequestQueue?replyToName=RESP_QUEUE"); String replyToName = JmsTransportUtils.getReplyToName(uri); @@ -123,7 +123,7 @@ public class JmsTransportUtilsTests { } @Test - public void jndi() throws Exception { + void jndi() throws Exception { URI uri = new URI("jms:jms/REQUEST_QUEUE?replyToName=jms/REPLY_QUEUE"); String destination = JmsTransportUtils.getDestinationName(uri); diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTests.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTests.java index edd14c6e..ffb11256 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTests.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTests.java @@ -30,7 +30,7 @@ import org.springframework.xml.transform.StringSource; import static org.assertj.core.api.Assertions.assertThat; @SpringJUnitConfig(locations = "mail-applicationContext.xml") -public class MailIntegrationTests { +class MailIntegrationTests { @Autowired private GreenMailBean greenMailBean; @@ -39,7 +39,7 @@ public class MailIntegrationTests { private WebServiceTemplate webServiceTemplate; @Test - public void testMailTransport() { + void testMailTransport() { String content = """ diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailMessageSenderIntegrationTests.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailMessageSenderIntegrationTests.java index 049ecbfa..6430acf6 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailMessageSenderIntegrationTests.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailMessageSenderIntegrationTests.java @@ -38,7 +38,7 @@ import org.springframework.ws.transport.WebServiceConnection; import static org.assertj.core.api.Assertions.assertThat; -public class MailMessageSenderIntegrationTests { +class MailMessageSenderIntegrationTests { private MailMessageSender messageSender; @@ -49,7 +49,7 @@ public class MailMessageSenderIntegrationTests { private GreenMailBean greenMailBean; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.greenMailBean = new GreenMailBean(); this.greenMailBean.setAutostart(true); @@ -74,7 +74,7 @@ public class MailMessageSenderIntegrationTests { @Disabled @Test - public void testSendAndReceiveQueueNoResponse() throws Exception { + void testSendAndReceiveQueueNoResponse() throws Exception { URI mailTo = new URI("mailto:server@localhost?subject=SOAP%20Test"); diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/support/MailTransportUtilsTests.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/support/MailTransportUtilsTests.java index f618fecd..3c9c3bf2 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/support/MailTransportUtilsTests.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/support/MailTransportUtilsTests.java @@ -24,10 +24,10 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -public class MailTransportUtilsTests { +class MailTransportUtilsTests { @Test - public void testToPasswordProtectedString() { + void testToPasswordProtectedString() { URLName name = new URLName("imap://john:secret@imap.example.com/INBOX"); String result = MailTransportUtils.toPasswordProtectedString(name); @@ -36,7 +36,7 @@ public class MailTransportUtilsTests { } @Test - public void testGetTo() throws Exception { + void testGetTo() throws Exception { URI uri = new URI("mailto:infobot@example.com?subject=current-issue"); InternetAddress to = MailTransportUtils.getTo(uri); @@ -50,7 +50,7 @@ public class MailTransportUtilsTests { } @Test - public void testGetSubject() throws Exception { + void testGetSubject() throws Exception { URI uri = new URI("mailto:infobot@example.com?subject=current-issue"); String subject = MailTransportUtils.getSubject(uri); diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBeanTests.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBeanTests.java index e98e9b5c..ffe76b63 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBeanTests.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBeanTests.java @@ -24,22 +24,22 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException /** * @author Arjen Poutsma */ -public class XmppConnectionFactoryBeanTests { +class XmppConnectionFactoryBeanTests { private XmppConnectionFactoryBean factoryBean; @BeforeEach - public void createFactoryBean() { + void createFactoryBean() { this.factoryBean = new XmppConnectionFactoryBean(); } @Test - public void noHost() { + void noHost() { assertThatIllegalArgumentException().isThrownBy(() -> this.factoryBean.afterPropertiesSet()); } @Test - public void noUsername() { + void noUsername() { assertThatIllegalArgumentException().isThrownBy(() -> { @@ -49,7 +49,7 @@ public class XmppConnectionFactoryBeanTests { } @Test - public void wrongPort() { + void wrongPort() { assertThatIllegalArgumentException().isThrownBy(() -> this.factoryBean.setPort(-10)); } diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/client/ErrorResponseCreatorTests.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/ErrorResponseCreatorTests.java index 8b1d779a..5c7e3d3f 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/client/ErrorResponseCreatorTests.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/client/ErrorResponseCreatorTests.java @@ -22,10 +22,10 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -public class ErrorResponseCreatorTests { +class ErrorResponseCreatorTests { @Test - public void callback() throws IOException { + void callback() throws IOException { String errorMessage = "Error message"; ErrorResponseCreator callback = new ErrorResponseCreator(errorMessage); diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/client/ExceptionResponseCreatorTests.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/ExceptionResponseCreatorTests.java index 1fe74eb5..59c76994 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/client/ExceptionResponseCreatorTests.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/client/ExceptionResponseCreatorTests.java @@ -23,10 +23,10 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIOException; -public class ExceptionResponseCreatorTests { +class ExceptionResponseCreatorTests { @Test - public void ioException() { + void ioException() { assertThatIOException().isThrownBy(() -> { @@ -36,7 +36,7 @@ public class ExceptionResponseCreatorTests { } @Test - public void runtimeException() { + void runtimeException() { assertThatExceptionOfType(RuntimeException.class).isThrownBy(() -> { diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockSenderConnectionTests.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockSenderConnectionTests.java index 4b5cede7..622e57e8 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockSenderConnectionTests.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockSenderConnectionTests.java @@ -27,10 +27,10 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.springframework.ws.test.client.ResponseCreators.withError; import static org.springframework.ws.test.client.ResponseCreators.withPayload; -public class MockSenderConnectionTests { +class MockSenderConnectionTests { @Test - public void error() throws IOException { + void error() throws IOException { String testErrorMessage = "Test Error Message"; MockSenderConnection connection = new MockSenderConnection(); @@ -41,7 +41,7 @@ public class MockSenderConnectionTests { } @Test - public void normal() throws IOException { + void normal() throws IOException { MockSenderConnection connection = new MockSenderConnection(); connection.andRespond(withPayload(new StringSource(""))); @@ -51,7 +51,7 @@ public class MockSenderConnectionTests { } @Test - public void noRequestMatchers() { + void noRequestMatchers() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceMessageSenderTests.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceMessageSenderTests.java index 4445a0fe..0d8d1192 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceMessageSenderTests.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceMessageSenderTests.java @@ -23,24 +23,24 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -public class MockWebServiceMessageSenderTests { +class MockWebServiceMessageSenderTests { private MockWebServiceMessageSender sender; @BeforeEach - public void setUp() { + void setUp() { this.sender = new MockWebServiceMessageSender(); } @Test - public void noMoreExpectedConnections() { + void noMoreExpectedConnections() { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> this.sender.createConnection(URI.create("http://localhost"))); } @Test - public void verify() { + void verify() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { @@ -50,7 +50,7 @@ public class MockWebServiceMessageSenderTests { } @Test - public void verifyMoteThanOne() { + void verifyMoteThanOne() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTests.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTests.java index b5fee26e..4ca7c10f 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTests.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTests.java @@ -64,14 +64,14 @@ import static org.springframework.ws.test.client.ResponseCreators.withClientOrSe import static org.springframework.ws.test.client.ResponseCreators.withPayload; import static org.springframework.ws.test.client.ResponseCreators.withSoapEnvelope; -public class MockWebServiceServerTests { +class MockWebServiceServerTests { private WebServiceTemplate template; private MockWebServiceServer server; @BeforeEach - public void setUp() { + void setUp() { this.template = new WebServiceTemplate(); this.template.setDefaultUri("http://example.com"); @@ -80,7 +80,7 @@ public class MockWebServiceServerTests { } @Test - public void createServerWebServiceTemplate() { + void createServerWebServiceTemplate() { WebServiceTemplate template = new WebServiceTemplate(); @@ -90,7 +90,7 @@ public class MockWebServiceServerTests { } @Test - public void createServerGatewaySupport() { + void createServerGatewaySupport() { MyClient client = new MyClient(); @@ -100,7 +100,7 @@ public class MockWebServiceServerTests { } @Test - public void createServerApplicationContextWebServiceTemplate() { + void createServerApplicationContextWebServiceTemplate() { StaticApplicationContext applicationContext = new StaticApplicationContext(); applicationContext.registerSingleton("webServiceTemplate", WebServiceTemplate.class); @@ -112,7 +112,7 @@ public class MockWebServiceServerTests { } @Test - public void createServerApplicationContextWebServiceGatewaySupport() { + void createServerApplicationContextWebServiceGatewaySupport() { StaticApplicationContext applicationContext = new StaticApplicationContext(); applicationContext.registerSingleton("myClient", MyClient.class); @@ -123,7 +123,7 @@ public class MockWebServiceServerTests { } @Test - public void createServerApplicationContextEmpty() { + void createServerApplicationContextEmpty() { assertThatIllegalArgumentException().isThrownBy(() -> { @@ -136,7 +136,7 @@ public class MockWebServiceServerTests { } @Test - public void mocks() throws Exception { + void mocks() throws Exception { URI uri = URI.create("http://example.com"); @@ -161,7 +161,7 @@ public class MockWebServiceServerTests { } @Test - public void payloadMatch() { + void payloadMatch() { Source request = new StringSource(""); Source response = new StringSource(""); @@ -175,7 +175,7 @@ public class MockWebServiceServerTests { } @Test - public void payloadNonMatch() { + void payloadNonMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { @@ -190,7 +190,7 @@ public class MockWebServiceServerTests { } @Test - public void soapHeaderMatch() { + void soapHeaderMatch() { final QName soapHeaderName = new QName("http://example.com", "mySoapHeader"); @@ -205,7 +205,7 @@ public class MockWebServiceServerTests { } @Test - public void soapHeaderNonMatch() { + void soapHeaderNonMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { @@ -219,7 +219,7 @@ public class MockWebServiceServerTests { } @Test - public void connectionMatch() { + void connectionMatch() { String uri = "http://example.com"; this.server.expect(connectionTo(uri)); @@ -229,7 +229,7 @@ public class MockWebServiceServerTests { } @Test - public void connectionNonMatch() { + void connectionNonMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { @@ -243,7 +243,7 @@ public class MockWebServiceServerTests { } @Test - public void unexpectedConnection() { + void unexpectedConnection() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { @@ -258,7 +258,7 @@ public class MockWebServiceServerTests { } @Test - public void xsdMatch() throws Exception { + void xsdMatch() throws Exception { Resource schema = new ByteArrayResource( "" @@ -272,7 +272,7 @@ public class MockWebServiceServerTests { } @Test - public void xsdNonMatch() { + void xsdNonMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { @@ -289,7 +289,7 @@ public class MockWebServiceServerTests { } @Test - public void xpathExistsMatch() { + void xpathExistsMatch() { final Map ns = Collections.singletonMap("ns", "http://example.com"); @@ -300,7 +300,7 @@ public class MockWebServiceServerTests { } @Test - public void xpathExistsNonMatch() { + void xpathExistsNonMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { @@ -314,7 +314,7 @@ public class MockWebServiceServerTests { } @Test - public void anythingMatch() { + void anythingMatch() { Source request = new StringSource(""); Source response = new StringSource(""); @@ -330,7 +330,7 @@ public class MockWebServiceServerTests { } @Test - public void recordWhenReplay() { + void recordWhenReplay() { assertThatIllegalStateException().isThrownBy(() -> { @@ -350,7 +350,7 @@ public class MockWebServiceServerTests { } @Test - public void soapEnvelopeMatch() { + void soapEnvelopeMatch() { Jaxb2Marshaller marshaller = new Jaxb2Marshaller(); marshaller.setClassesToBeBound(EnvelopeMatcherRequest.class, EnvelopeMatcherResponse.class); @@ -387,7 +387,7 @@ public class MockWebServiceServerTests { } @Test - public void verifyFailure() { + void verifyFailure() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { @@ -397,12 +397,12 @@ public class MockWebServiceServerTests { } @Test - public void verifyOnly() { + void verifyOnly() { this.server.verify(); } @Test - public void fault() { + void fault() { assertThatExceptionOfType(SoapFaultClientException.class).isThrownBy(() -> { diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/client/ResponseCreatorsTests.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/ResponseCreatorsTests.java index 7fbe3d09..02361aa8 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/client/ResponseCreatorsTests.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/client/ResponseCreatorsTests.java @@ -41,21 +41,21 @@ import org.springframework.xml.transform.TransformerHelper; import static org.assertj.core.api.Assertions.assertThat; -public class ResponseCreatorsTests { +class ResponseCreatorsTests { private final TransformerHelper transformerHelper = new TransformerHelper(); private SaajSoapMessageFactory messageFactory; @BeforeEach - public void createMessageFactory() { + void createMessageFactory() { this.messageFactory = new SaajSoapMessageFactory(); this.messageFactory.afterPropertiesSet(); } @Test - public void withPayloadSource() throws Exception { + void withPayloadSource() throws Exception { String payload = ""; ResponseCreator responseCreator = ResponseCreators.withPayload(new StringSource(payload)); @@ -66,7 +66,7 @@ public class ResponseCreatorsTests { } @Test - public void withPayloadResource() throws Exception { + void withPayloadResource() throws Exception { String payload = ""; ResponseCreator responseCreator = ResponseCreators @@ -78,7 +78,7 @@ public class ResponseCreatorsTests { } @Test - public void withSoapEnvelopeSource() throws Exception { + void withSoapEnvelopeSource() throws Exception { StringBuilder xmlBuilder = new StringBuilder(); xmlBuilder.append(""); @@ -97,7 +97,7 @@ public class ResponseCreatorsTests { } @Test - public void withSoapEnvelopeResource() throws Exception { + void withSoapEnvelopeResource() throws Exception { StringBuilder xmlBuilder = new StringBuilder(); xmlBuilder.append(""); @@ -117,7 +117,7 @@ public class ResponseCreatorsTests { } @Test - public void withIOException() { + void withIOException() { IOException expected = new IOException("Foo"); ResponseCreator responseCreator = ResponseCreators.withException(expected); @@ -131,7 +131,7 @@ public class ResponseCreatorsTests { } @Test - public void withRuntimeException() throws Exception { + void withRuntimeException() throws Exception { RuntimeException expected = new RuntimeException("Foo"); ResponseCreator responseCreator = ResponseCreators.withException(expected); @@ -145,7 +145,7 @@ public class ResponseCreatorsTests { } @Test - public void withMustUnderstandFault() throws Exception { + void withMustUnderstandFault() throws Exception { String faultString = "Foo"; ResponseCreator responseCreator = ResponseCreators.withMustUnderstandFault(faultString, Locale.ENGLISH); @@ -154,7 +154,7 @@ public class ResponseCreatorsTests { } @Test - public void withClientOrSenderFault() throws Exception { + void withClientOrSenderFault() throws Exception { String faultString = "Foo"; ResponseCreator responseCreator = ResponseCreators.withClientOrSenderFault(faultString, Locale.ENGLISH); @@ -163,7 +163,7 @@ public class ResponseCreatorsTests { } @Test - public void withServerOrReceiverFault() throws Exception { + void withServerOrReceiverFault() throws Exception { String faultString = "Foo"; ResponseCreator responseCreator = ResponseCreators.withServerOrReceiverFault(faultString, Locale.ENGLISH); @@ -172,7 +172,7 @@ public class ResponseCreatorsTests { } @Test - public void withVersionMismatchFault() throws Exception { + void withVersionMismatchFault() throws Exception { String faultString = "Foo"; ResponseCreator responseCreator = ResponseCreators.withVersionMismatchFault(faultString, Locale.ENGLISH); diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/client/UriMatcherTests.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/UriMatcherTests.java index 87fbb286..beea2862 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/client/UriMatcherTests.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/client/UriMatcherTests.java @@ -27,12 +27,12 @@ import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; -public class UriMatcherTests { +class UriMatcherTests { private static final URI GOOD_URI = URI.create("http://localhost"); @Test - public void match() { + void match() { WebServiceMessage message = createMock(WebServiceMessage.class); @@ -45,7 +45,7 @@ public class UriMatcherTests { } @Test - public void nonMatch() { + void nonMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/client/WebServiceMessageMatcherAdapterTests.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/WebServiceMessageMatcherAdapterTests.java index f57d0fdf..ca2bd4a0 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/client/WebServiceMessageMatcherAdapterTests.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/client/WebServiceMessageMatcherAdapterTests.java @@ -31,7 +31,7 @@ import static org.easymock.EasyMock.verify; /** * @author Arjen Poutsma */ -public class WebServiceMessageMatcherAdapterTests { +class WebServiceMessageMatcherAdapterTests { private WebServiceMessage message; @@ -40,7 +40,7 @@ public class WebServiceMessageMatcherAdapterTests { private WebServiceMessageMatcherAdapter adapter; @BeforeEach - public void setUp() { + void setUp() { this.message = createMock(WebServiceMessage.class); this.adaptee = createMock(WebServiceMessageMatcher.class); @@ -48,7 +48,7 @@ public class WebServiceMessageMatcherAdapterTests { } @Test - public void match() throws IOException { + void match() throws IOException { this.adaptee.match(this.message); diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/client/integration/ClientIntegrationTests.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/integration/ClientIntegrationTests.java index 38a99b71..ab04196d 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/client/integration/ClientIntegrationTests.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/client/integration/ClientIntegrationTests.java @@ -40,7 +40,7 @@ import static org.springframework.ws.test.client.ResponseCreators.withPayload; */ @ExtendWith(SpringExtension.class) @ContextConfiguration("integration-test.xml") -public class ClientIntegrationTests { +class ClientIntegrationTests { @Autowired private CustomerClient client; @@ -48,12 +48,12 @@ public class ClientIntegrationTests { private MockWebServiceServer mockServer; @BeforeEach - public void createServer() { + void createServer() { this.mockServer = MockWebServiceServer.createServer(this.client); } @Test - public void basic() { + void basic() { Source expectedRequestPayload = new StringSource( "" diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/server/MockWebServiceClientTests.java b/spring-ws-test/src/test/java/org/springframework/ws/test/server/MockWebServiceClientTests.java index 40c9c6c5..f1942a7f 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/server/MockWebServiceClientTests.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/server/MockWebServiceClientTests.java @@ -24,10 +24,10 @@ import org.springframework.ws.soap.server.SoapMessageDispatcher; import static org.assertj.core.api.Assertions.assertThat; -public class MockWebServiceClientTests { +class MockWebServiceClientTests { @Test - public void createServerApplicationContext() { + void createServerApplicationContext() { StaticApplicationContext applicationContext = new StaticApplicationContext(); applicationContext.registerSingleton("messageDispatcher", SoapMessageDispatcher.class); @@ -40,7 +40,7 @@ public class MockWebServiceClientTests { } @Test - public void createServerApplicationContextDefaults() { + void createServerApplicationContextDefaults() { StaticApplicationContext applicationContext = new StaticApplicationContext(); applicationContext.refresh(); diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/server/WebServiceMessageMatcherAdapterTests.java b/spring-ws-test/src/test/java/org/springframework/ws/test/server/WebServiceMessageMatcherAdapterTests.java index f0d3a4fb..39c9888a 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/server/WebServiceMessageMatcherAdapterTests.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/server/WebServiceMessageMatcherAdapterTests.java @@ -31,7 +31,7 @@ import static org.easymock.EasyMock.verify; /** * @author Arjen Poutsma */ -public class WebServiceMessageMatcherAdapterTests { +class WebServiceMessageMatcherAdapterTests { private WebServiceMessage message; @@ -40,7 +40,7 @@ public class WebServiceMessageMatcherAdapterTests { private WebServiceMessageMatcherAdapter adapter; @BeforeEach - public void setUp() { + void setUp() { this.message = createMock(WebServiceMessage.class); this.adaptee = createMock(WebServiceMessageMatcher.class); @@ -48,7 +48,7 @@ public class WebServiceMessageMatcherAdapterTests { } @Test - public void match() throws IOException { + void match() throws IOException { this.adaptee.match(this.message); diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/server/integration/ServerIntegrationTests.java b/spring-ws-test/src/test/java/org/springframework/ws/test/server/integration/ServerIntegrationTests.java index e8faf852..73b21794 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/server/integration/ServerIntegrationTests.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/server/integration/ServerIntegrationTests.java @@ -37,7 +37,7 @@ import static org.springframework.ws.test.server.ResponseMatchers.payload; */ @ExtendWith(SpringExtension.class) @ContextConfiguration("integration-test.xml") -public class ServerIntegrationTests { +class ServerIntegrationTests { @Autowired private ApplicationContext applicationContext; @@ -45,12 +45,12 @@ public class ServerIntegrationTests { private MockWebServiceClient mockClient; @BeforeEach - public void createClient() { + void createClient() { this.mockClient = MockWebServiceClient.createClient(this.applicationContext); } @Test - public void basic() { + void basic() { Source requestPayload = new StringSource("" + "John Doe" + ""); diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/support/MockStrategiesHelperTests.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/MockStrategiesHelperTests.java index 12a59e94..241c2094 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/support/MockStrategiesHelperTests.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/support/MockStrategiesHelperTests.java @@ -24,10 +24,10 @@ import org.springframework.context.support.StaticApplicationContext; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -public class MockStrategiesHelperTests { +class MockStrategiesHelperTests { @Test - public void none() { + void none() { StaticApplicationContext applicationContext = new StaticApplicationContext(); @@ -37,7 +37,7 @@ public class MockStrategiesHelperTests { } @Test - public void one() { + void one() { StaticApplicationContext applicationContext = new StaticApplicationContext(); applicationContext.registerSingleton("myBean", MyBean.class); @@ -47,7 +47,7 @@ public class MockStrategiesHelperTests { } @Test - public void many() { + void many() { assertThatExceptionOfType(BeanInitializationException.class).isThrownBy(() -> { @@ -61,7 +61,7 @@ public class MockStrategiesHelperTests { } @Test - public void noneWithDefault() { + void noneWithDefault() { StaticApplicationContext applicationContext = new StaticApplicationContext(); diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcherTests.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcherTests.java index 3376262f..99e13428 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcherTests.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcherTests.java @@ -31,10 +31,10 @@ import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; @Deprecated -public class PayloadDiffMatcherTests { +class PayloadDiffMatcherTests { @Test - public void match() { + void match() { String xml = ""; WebServiceMessage message = createMock(WebServiceMessage.class); @@ -48,7 +48,7 @@ public class PayloadDiffMatcherTests { } @Test - public void nonMatch() { + void nonMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { @@ -64,7 +64,7 @@ public class PayloadDiffMatcherTests { } @Test - public void noPayload() { + void noPayload() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcherTests.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcherTests.java index c778e10b..8a7453bc 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcherTests.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcherTests.java @@ -32,7 +32,7 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class SchemaValidatingMatcherTests { +class SchemaValidatingMatcherTests { private Resource schema; @@ -43,7 +43,7 @@ public class SchemaValidatingMatcherTests { private WebServiceMessage message; @BeforeEach - public void setUp() { + void setUp() { this.message = createMock(WebServiceMessage.class); this.schema = new ClassPathResource("schemaValidatingMatcherTest.xsd", SchemaValidatingMatcherTests.class); @@ -52,7 +52,7 @@ public class SchemaValidatingMatcherTests { } @Test - public void singleSchemaMatch() throws IOException, AssertionError { + void singleSchemaMatch() throws IOException, AssertionError { expect(this.message.getPayloadSource()).andReturn(new StringSource( "0text")); @@ -67,7 +67,7 @@ public class SchemaValidatingMatcherTests { } @Test - public void singleSchemaNonMatch() throws AssertionError { + void singleSchemaNonMatch() throws AssertionError { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { @@ -87,7 +87,7 @@ public class SchemaValidatingMatcherTests { } @Test - public void multipleSchemaMatch() throws IOException, AssertionError { + void multipleSchemaMatch() throws IOException, AssertionError { expect(this.message.getPayloadSource()).andReturn(new StringSource( "0text")); @@ -102,7 +102,7 @@ public class SchemaValidatingMatcherTests { } @Test - public void multipleSchemaNotOk() throws AssertionError { + void multipleSchemaNotOk() throws AssertionError { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { @@ -122,7 +122,7 @@ public class SchemaValidatingMatcherTests { } @Test - public void multipleSchemaDifferentOrderNotOk() throws AssertionError { + void multipleSchemaDifferentOrderNotOk() throws AssertionError { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { @@ -142,7 +142,7 @@ public class SchemaValidatingMatcherTests { } @Test - public void xmlValidatorNotOk() throws AssertionError { + void xmlValidatorNotOk() throws AssertionError { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcherTests.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcherTests.java index d728a2af..11977e70 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcherTests.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcherTests.java @@ -32,10 +32,10 @@ import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; @Deprecated -public class SoapEnvelopeDiffMatcherTests { +class SoapEnvelopeDiffMatcherTests { @Test - public void match() throws Exception { + void match() throws Exception { StringBuilder xmlBuilder = new StringBuilder(); xmlBuilder.append(""); @@ -58,7 +58,7 @@ public class SoapEnvelopeDiffMatcherTests { } @Test - public void nonMatch() { + void nonMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcherTests.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcherTests.java index 95cb83c7..01084c6e 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcherTests.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcherTests.java @@ -30,21 +30,21 @@ import org.springframework.ws.soap.saaj.SaajSoapMessage; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.easymock.EasyMock.createMock; -public class SoapHeaderMatcherTests { +class SoapHeaderMatcherTests { private SoapHeaderMatcher matcher; private QName expectedHeaderName; @BeforeEach - public void setUp() { + void setUp() { this.expectedHeaderName = new QName("http://example.com", "header"); this.matcher = new SoapHeaderMatcher(this.expectedHeaderName); } @Test - public void match() throws Exception { + void match() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(); SOAPMessage saajMessage = messageFactory.createMessage(); @@ -55,7 +55,7 @@ public class SoapHeaderMatcherTests { } @Test - public void nonMatch() { + void nonMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { @@ -68,7 +68,7 @@ public class SoapHeaderMatcherTests { } @Test - public void nonSoap() { + void nonSoap() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelperTests.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelperTests.java index e919d297..4498f320 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelperTests.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelperTests.java @@ -32,10 +32,10 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class XPathExpectationsHelperTests { +class XPathExpectationsHelperTests { @Test - public void existsMatch() throws IOException, AssertionError { + void existsMatch() throws IOException, AssertionError { XPathExpectationsHelper helper = new XPathExpectationsHelper("//b"); WebServiceMessageMatcher matcher = helper.exists(); @@ -53,7 +53,7 @@ public class XPathExpectationsHelperTests { } @Test - public void existsNonMatch() throws AssertionError { + void existsNonMatch() throws AssertionError { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { @@ -72,7 +72,7 @@ public class XPathExpectationsHelperTests { } @Test - public void doesNotExistMatch() throws IOException, AssertionError { + void doesNotExistMatch() throws IOException, AssertionError { XPathExpectationsHelper helper = new XPathExpectationsHelper("//c"); WebServiceMessageMatcher matcher = helper.doesNotExist(); @@ -90,7 +90,7 @@ public class XPathExpectationsHelperTests { } @Test - public void doesNotExistNonMatch() throws AssertionError { + void doesNotExistNonMatch() throws AssertionError { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { @@ -109,7 +109,7 @@ public class XPathExpectationsHelperTests { } @Test - public void evaluatesToTrueMatch() throws IOException, AssertionError { + void evaluatesToTrueMatch() throws IOException, AssertionError { XPathExpectationsHelper helper = new XPathExpectationsHelper("//b=1"); WebServiceMessageMatcher matcher = helper.evaluatesTo(true); @@ -127,7 +127,7 @@ public class XPathExpectationsHelperTests { } @Test - public void evaluatesToTrueNonMatch() throws AssertionError { + void evaluatesToTrueNonMatch() throws AssertionError { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { @@ -146,7 +146,7 @@ public class XPathExpectationsHelperTests { } @Test - public void evaluatesToFalseMatch() throws IOException, AssertionError { + void evaluatesToFalseMatch() throws IOException, AssertionError { XPathExpectationsHelper helper = new XPathExpectationsHelper("//b!=1"); WebServiceMessageMatcher matcher = helper.evaluatesTo(false); @@ -164,7 +164,7 @@ public class XPathExpectationsHelperTests { } @Test - public void evaluatesToFalseNonMatch() throws AssertionError { + void evaluatesToFalseNonMatch() throws AssertionError { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { @@ -183,7 +183,7 @@ public class XPathExpectationsHelperTests { } @Test - public void evaluatesToIntegerMatch() throws IOException, AssertionError { + void evaluatesToIntegerMatch() throws IOException, AssertionError { XPathExpectationsHelper helper = new XPathExpectationsHelper("//b"); WebServiceMessageMatcher matcher = helper.evaluatesTo(1); @@ -201,7 +201,7 @@ public class XPathExpectationsHelperTests { } @Test - public void evaluatesToIntegerNonMatch() throws AssertionError { + void evaluatesToIntegerNonMatch() throws AssertionError { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { @@ -220,7 +220,7 @@ public class XPathExpectationsHelperTests { } @Test - public void existsWithNamespacesMatch() throws IOException, AssertionError { + void existsWithNamespacesMatch() throws IOException, AssertionError { Map ns = Collections.singletonMap("x", "http://example.org"); XPathExpectationsHelper helper = new XPathExpectationsHelper("//x:b", ns); @@ -240,7 +240,7 @@ public class XPathExpectationsHelperTests { } @Test - public void existsWithNamespacesNonMatch() throws AssertionError { + void existsWithNamespacesNonMatch() throws AssertionError { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcherTests.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcherTests.java index 2f4c36c0..a725abd4 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcherTests.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcherTests.java @@ -29,10 +29,10 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class PayloadDiffMatcherTests { +class PayloadDiffMatcherTests { @Test - public void match() { + void match() { var xml = ""; WebServiceMessage message = createMock(WebServiceMessage.class); @@ -47,7 +47,7 @@ public class PayloadDiffMatcherTests { } @Test - public void matchWithXmlIgnore() { + void matchWithXmlIgnore() { var xml = "%s"; WebServiceMessage message = createMock(WebServiceMessage.class); @@ -62,7 +62,7 @@ public class PayloadDiffMatcherTests { } @Test - public void matchIgnoringWhitespace() { + void matchIgnoringWhitespace() { var xml = "true"; var xmlWithAdditionalWhitespace = " true "; @@ -78,7 +78,7 @@ public class PayloadDiffMatcherTests { } @Test - public void nonMatch() { + void nonMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { @@ -95,7 +95,7 @@ public class PayloadDiffMatcherTests { } @Test - public void noPayload() { + void noPayload() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/SoapEnvelopeDiffMatcherTests.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/SoapEnvelopeDiffMatcherTests.java index e16c387a..4bc050f9 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/SoapEnvelopeDiffMatcherTests.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/SoapEnvelopeDiffMatcherTests.java @@ -34,10 +34,10 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class SoapEnvelopeDiffMatcherTests { +class SoapEnvelopeDiffMatcherTests { @Test - public void match() throws Exception { + void match() throws Exception { String xml = "" + "" + "
" @@ -56,7 +56,7 @@ public class SoapEnvelopeDiffMatcherTests { } @Test - public void nonMatch() { + void nonMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { @@ -82,7 +82,7 @@ public class SoapEnvelopeDiffMatcherTests { } @Test - public void matchWithXmlIgnore() throws TransformerException, IOException { + void matchWithXmlIgnore() throws TransformerException, IOException { String xml = """ diff --git a/spring-xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTests.java b/spring-xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTests.java index 7f91cd0a..d83816a9 100644 --- a/spring-xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTests.java +++ b/spring-xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTests.java @@ -33,7 +33,7 @@ import org.springframework.xml.sax.SaxUtils; import static org.xmlunit.assertj.XmlAssert.assertThat; -public class DomContentHandlerTests { +class DomContentHandlerTests { private static final String XML_1 = "" + "" + "" @@ -57,7 +57,7 @@ public class DomContentHandlerTests { private DocumentBuilder documentBuilder; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); @@ -67,7 +67,7 @@ public class DomContentHandlerTests { } @Test - public void testContentHandlerDocumentNamespacePrefixes() throws Exception { + void testContentHandlerDocumentNamespacePrefixes() throws Exception { this.xmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true); this.handler = new DomContentHandler(this.result); @@ -79,7 +79,7 @@ public class DomContentHandlerTests { } @Test - public void testContentHandlerDocumentNoNamespacePrefixes() throws Exception { + void testContentHandlerDocumentNoNamespacePrefixes() throws Exception { this.handler = new DomContentHandler(this.result); this.expected = this.documentBuilder.parse(new InputSource(new StringReader(XML_1))); @@ -90,7 +90,7 @@ public class DomContentHandlerTests { } @Test - public void testContentHandlerElement() throws Exception { + void testContentHandlerElement() throws Exception { Element rootElement = this.result.createElementNS("namespace", "root"); this.result.appendChild(rootElement); diff --git a/spring-xml/src/test/java/org/springframework/xml/namespace/QNameEditorTests.java b/spring-xml/src/test/java/org/springframework/xml/namespace/QNameEditorTests.java index acac8c99..cf834e7c 100644 --- a/spring-xml/src/test/java/org/springframework/xml/namespace/QNameEditorTests.java +++ b/spring-xml/src/test/java/org/springframework/xml/namespace/QNameEditorTests.java @@ -23,32 +23,32 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -public class QNameEditorTests { +class QNameEditorTests { private QNameEditor editor; @BeforeEach - public void setUp() { + void setUp() { this.editor = new QNameEditor(); } @Test - public void testNamespaceLocalPartPrefix() { + void testNamespaceLocalPartPrefix() { QName qname = new QName("namespace", "localpart", "prefix"); doTest(qname); } @Test - public void testNamespaceLocalPart() { + void testNamespaceLocalPart() { QName qname = new QName("namespace", "localpart"); doTest(qname); } @Test - public void testLocalPart() { + void testLocalPart() { QName qname = new QName("localpart"); doTest(qname); diff --git a/spring-xml/src/test/java/org/springframework/xml/namespace/QNameUtilsTests.java b/spring-xml/src/test/java/org/springframework/xml/namespace/QNameUtilsTests.java index 82c20ea9..06e8c045 100644 --- a/spring-xml/src/test/java/org/springframework/xml/namespace/QNameUtilsTests.java +++ b/spring-xml/src/test/java/org/springframework/xml/namespace/QNameUtilsTests.java @@ -28,17 +28,17 @@ import org.springframework.xml.DocumentBuilderFactoryUtils; import static org.assertj.core.api.Assertions.assertThat; -public class QNameUtilsTests { +class QNameUtilsTests { @Test - public void testValidQNames() { + void testValidQNames() { assertThat(QNameUtils.validateQName("{namespace}local")).isTrue(); assertThat(QNameUtils.validateQName("local")).isTrue(); } @Test - public void testInvalidQNames() { + void testInvalidQNames() { assertThat(QNameUtils.validateQName(null)).isFalse(); assertThat(QNameUtils.validateQName("")).isFalse(); @@ -47,7 +47,7 @@ public class QNameUtilsTests { } @Test - public void testGetQNameForNodeNoNamespace() throws Exception { + void testGetQNameForNodeNoNamespace() throws Exception { DocumentBuilderFactory factory = DocumentBuilderFactoryUtils.newInstance(); DocumentBuilder builder = factory.newDocumentBuilder(); @@ -62,7 +62,7 @@ public class QNameUtilsTests { } @Test - public void testGetQNameForNodeNoPrefix() throws Exception { + void testGetQNameForNodeNoPrefix() throws Exception { DocumentBuilderFactory factory = DocumentBuilderFactoryUtils.newInstance(); DocumentBuilder builder = factory.newDocumentBuilder(); @@ -77,7 +77,7 @@ public class QNameUtilsTests { } @Test - public void testGetQNameForNode() throws Exception { + void testGetQNameForNode() throws Exception { DocumentBuilderFactory factory = DocumentBuilderFactoryUtils.newInstance(); DocumentBuilder builder = factory.newDocumentBuilder(); @@ -92,7 +92,7 @@ public class QNameUtilsTests { } @Test - public void testToQualifiedNamePrefix() { + void testToQualifiedNamePrefix() { QName qName = new QName("namespace", "localName", "prefix"); String result = QNameUtils.toQualifiedName(qName); @@ -101,7 +101,7 @@ public class QNameUtilsTests { } @Test - public void testToQualifiedNameNoPrefix() { + void testToQualifiedNameNoPrefix() { QName qName = new QName("localName"); String result = QNameUtils.toQualifiedName(qName); @@ -110,7 +110,7 @@ public class QNameUtilsTests { } @Test - public void testToQNamePrefix() { + void testToQNamePrefix() { QName result = QNameUtils.toQName("namespace", "prefix:localName"); @@ -120,7 +120,7 @@ public class QNameUtilsTests { } @Test - public void testToQNameNoPrefix() { + void testToQNameNoPrefix() { QName result = QNameUtils.toQName("namespace", "localName"); diff --git a/spring-xml/src/test/java/org/springframework/xml/sax/SaxUtilsTests.java b/spring-xml/src/test/java/org/springframework/xml/sax/SaxUtilsTests.java index 04007dea..2be36f3b 100644 --- a/spring-xml/src/test/java/org/springframework/xml/sax/SaxUtilsTests.java +++ b/spring-xml/src/test/java/org/springframework/xml/sax/SaxUtilsTests.java @@ -23,10 +23,10 @@ import org.springframework.core.io.Resource; import static org.assertj.core.api.Assertions.assertThat; -public class SaxUtilsTests { +class SaxUtilsTests { @Test - public void testGetSystemId() { + void testGetSystemId() { Resource resource = new FileSystemResource("/path with spaces/file with spaces.txt"); String systemId = SaxUtils.getSystemId(resource); diff --git a/spring-xml/src/test/java/org/springframework/xml/transform/ResourceSourceTests.java b/spring-xml/src/test/java/org/springframework/xml/transform/ResourceSourceTests.java index 87525691..2e60a6e3 100644 --- a/spring-xml/src/test/java/org/springframework/xml/transform/ResourceSourceTests.java +++ b/spring-xml/src/test/java/org/springframework/xml/transform/ResourceSourceTests.java @@ -26,10 +26,10 @@ import org.springframework.core.io.ClassPathResource; import static org.assertj.core.api.Assertions.assertThat; -public class ResourceSourceTests { +class ResourceSourceTests { @Test - public void testStringSource() throws Exception { + void testStringSource() throws Exception { Transformer transformer = TransformerFactoryUtils.newInstance().newTransformer(); DOMResult result = new DOMResult(); diff --git a/spring-xml/src/test/java/org/springframework/xml/transform/StringResultTests.java b/spring-xml/src/test/java/org/springframework/xml/transform/StringResultTests.java index eae61afe..b4109916 100644 --- a/spring-xml/src/test/java/org/springframework/xml/transform/StringResultTests.java +++ b/spring-xml/src/test/java/org/springframework/xml/transform/StringResultTests.java @@ -27,10 +27,10 @@ import org.springframework.xml.DocumentBuilderFactoryUtils; import static org.xmlunit.assertj.XmlAssert.assertThat; -public class StringResultTests { +class StringResultTests { @Test - public void testStringResult() throws Exception { + void testStringResult() throws Exception { Document document = DocumentBuilderFactoryUtils.newInstance().newDocumentBuilder().newDocument(); Element element = document.createElementNS("namespace", "prefix:localName"); diff --git a/spring-xml/src/test/java/org/springframework/xml/transform/StringSourceTests.java b/spring-xml/src/test/java/org/springframework/xml/transform/StringSourceTests.java index 0891413e..0eed7193 100644 --- a/spring-xml/src/test/java/org/springframework/xml/transform/StringSourceTests.java +++ b/spring-xml/src/test/java/org/springframework/xml/transform/StringSourceTests.java @@ -25,10 +25,10 @@ import org.w3c.dom.Element; import static org.assertj.core.api.Assertions.assertThat; -public class StringSourceTests { +class StringSourceTests { @Test - public void testStringSource() throws TransformerException { + void testStringSource() throws TransformerException { Transformer transformer = TransformerFactoryUtils.newInstance().newTransformer(); String content = ""; diff --git a/spring-xml/src/test/java/org/springframework/xml/transform/TransformerHelperTests.java b/spring-xml/src/test/java/org/springframework/xml/transform/TransformerHelperTests.java index 7f1dc023..cd20b012 100644 --- a/spring-xml/src/test/java/org/springframework/xml/transform/TransformerHelperTests.java +++ b/spring-xml/src/test/java/org/springframework/xml/transform/TransformerHelperTests.java @@ -27,21 +27,21 @@ import org.junit.jupiter.api.Test; import static org.mockito.Mockito.mock; import static org.xmlunit.assertj.XmlAssert.assertThat; -public class TransformerHelperTests { +class TransformerHelperTests { private TransformerHelper helper; private Transformer transformer; @BeforeEach - public void setUp() { + void setUp() { this.helper = new TransformerHelper(); this.transformer = mock(Transformer.class); } @Test - public void defaultTransformerFactory() throws TransformerException { + void defaultTransformerFactory() throws TransformerException { String xml = "text"; Source source = new StringSource(xml); diff --git a/spring-xml/src/test/java/org/springframework/xml/transform/TraxUtilsTests.java b/spring-xml/src/test/java/org/springframework/xml/transform/TraxUtilsTests.java index af3dbecb..66fd6355 100644 --- a/spring-xml/src/test/java/org/springframework/xml/transform/TraxUtilsTests.java +++ b/spring-xml/src/test/java/org/springframework/xml/transform/TraxUtilsTests.java @@ -64,10 +64,10 @@ import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class TraxUtilsTests { +class TraxUtilsTests { @Test - public void testGetDocument() throws Exception { + void testGetDocument() throws Exception { DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); @@ -83,7 +83,7 @@ public class TraxUtilsTests { } @Test - public void testDoWithDomSource() throws Exception { + void testDoWithDomSource() throws Exception { DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); @@ -100,7 +100,7 @@ public class TraxUtilsTests { } @Test - public void testDoWithDomResult() throws Exception { + void testDoWithDomResult() throws Exception { DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); @@ -117,7 +117,7 @@ public class TraxUtilsTests { } @Test - public void testDoWithSaxSource() throws Exception { + void testDoWithSaxSource() throws Exception { XMLReader reader = SaxUtils.namespaceAwareXmlReader(); InputSource inputSource = new InputSource(); @@ -133,7 +133,7 @@ public class TraxUtilsTests { } @Test - public void testDoWithSaxResult() throws Exception { + void testDoWithSaxResult() throws Exception { ContentHandler contentHandler = new DefaultHandler(); LexicalHandler lexicalHandler = new DefaultHandler2(); @@ -151,7 +151,7 @@ public class TraxUtilsTests { } @Test - public void testDoWithStaxSourceEventReader() throws Exception { + void testDoWithStaxSourceEventReader() throws Exception { XMLInputFactory inputFactory = XMLInputFactoryUtils.newInstance(); XMLEventReader eventReader = inputFactory.createXMLEventReader(new StringReader("")); @@ -167,7 +167,7 @@ public class TraxUtilsTests { } @Test - public void testDoWithStaxResultEventWriter() throws Exception { + void testDoWithStaxResultEventWriter() throws Exception { XMLOutputFactory outputFactory = XMLOutputFactory.newInstance(); XMLEventWriter eventWriter = outputFactory.createXMLEventWriter(new StringWriter()); @@ -183,7 +183,7 @@ public class TraxUtilsTests { } @Test - public void testDoWithStaxSourceStreamReader() throws Exception { + void testDoWithStaxSourceStreamReader() throws Exception { XMLInputFactory inputFactory = XMLInputFactoryUtils.newInstance(); XMLStreamReader streamReader = inputFactory.createXMLStreamReader(new StringReader("")); @@ -199,7 +199,7 @@ public class TraxUtilsTests { } @Test - public void testDoWithStaxResultStreamWriter() throws Exception { + void testDoWithStaxResultStreamWriter() throws Exception { XMLOutputFactory outputFactory = XMLOutputFactory.newInstance(); XMLStreamWriter streamWriter = outputFactory.createXMLStreamWriter(new StringWriter()); @@ -215,7 +215,7 @@ public class TraxUtilsTests { } @Test - public void testDoWithStreamSourceInputStream() throws Exception { + void testDoWithStreamSourceInputStream() throws Exception { byte[] xml = "".getBytes(StandardCharsets.UTF_8); InputStream inputStream = new ByteArrayInputStream(xml); @@ -231,7 +231,7 @@ public class TraxUtilsTests { } @Test - public void testDoWithStreamResultOutputStream() throws Exception { + void testDoWithStreamResultOutputStream() throws Exception { OutputStream outputStream = new ByteArrayOutputStream(); @@ -246,7 +246,7 @@ public class TraxUtilsTests { } @Test - public void testDoWithStreamSourceReader() throws Exception { + void testDoWithStreamSourceReader() throws Exception { String xml = ""; Reader reader = new StringReader(xml); @@ -262,7 +262,7 @@ public class TraxUtilsTests { } @Test - public void testDoWithStreamResultWriter() throws Exception { + void testDoWithStreamResultWriter() throws Exception { Writer writer = new StringWriter(); @@ -277,7 +277,7 @@ public class TraxUtilsTests { } @Test - public void testDoWithSystemIdSource() throws Exception { + void testDoWithSystemIdSource() throws Exception { String systemId = "http://www.springframework.org/dtd/spring-beans.dtd"; @@ -292,7 +292,7 @@ public class TraxUtilsTests { } @Test - public void testDoWithSystemIdResult() throws Exception { + void testDoWithSystemIdResult() throws Exception { String systemId = "http://www.springframework.org/dtd/spring-beans.dtd"; @@ -307,7 +307,7 @@ public class TraxUtilsTests { } @Test - public void testDoWithInvalidSource() throws Exception { + void testDoWithInvalidSource() throws Exception { Source source = new Source() { @@ -323,7 +323,7 @@ public class TraxUtilsTests { } @Test - public void testDoWithInvalidResult() throws Exception { + void testDoWithInvalidResult() throws Exception { Result result = new Result() { public void setSystemId(String systemId) { diff --git a/spring-xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTests.java b/spring-xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTests.java index 5e0d181f..b12345f9 100644 --- a/spring-xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTests.java +++ b/spring-xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTests.java @@ -66,7 +66,7 @@ public abstract class AbstractValidatorFactoryTests { protected abstract XmlValidator createValidator(Resource[] schemaResources, String schemaLanguage) throws Exception; @Test - public void testHandleValidMessageStream() throws Exception { + void testHandleValidMessageStream() throws Exception { SAXParseException[] errors = this.validator.validate(new StreamSource(this.validInputStream)); @@ -74,7 +74,7 @@ public abstract class AbstractValidatorFactoryTests { } @Test - public void testValidateTwice() throws Exception { + void testValidateTwice() throws Exception { this.validator.validate(new StreamSource(this.validInputStream)); this.validInputStream = AbstractValidatorFactoryTests.class.getResourceAsStream("validDocument.xml"); @@ -82,7 +82,7 @@ public abstract class AbstractValidatorFactoryTests { } @Test - public void testHandleInvalidMessageStream() throws Exception { + void testHandleInvalidMessageStream() throws Exception { SAXParseException[] errors = this.validator.validate(new StreamSource(this.invalidInputStream)); @@ -90,7 +90,7 @@ public abstract class AbstractValidatorFactoryTests { } @Test - public void testHandleValidMessageSax() throws Exception { + void testHandleValidMessageSax() throws Exception { SAXParseException[] errors = this.validator.validate(new SAXSource(new InputSource(this.validInputStream))); @@ -98,7 +98,7 @@ public abstract class AbstractValidatorFactoryTests { } @Test - public void testHandleInvalidMessageSax() throws Exception { + void testHandleInvalidMessageSax() throws Exception { SAXParseException[] errors = this.validator.validate(new SAXSource(new InputSource(this.invalidInputStream))); @@ -106,7 +106,7 @@ public abstract class AbstractValidatorFactoryTests { } @Test - public void testHandleValidMessageDom() throws Exception { + void testHandleValidMessageDom() throws Exception { DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); @@ -117,7 +117,7 @@ public abstract class AbstractValidatorFactoryTests { } @Test - public void testHandleInvalidMessageDom() throws Exception { + void testHandleInvalidMessageDom() throws Exception { DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); @@ -128,7 +128,7 @@ public abstract class AbstractValidatorFactoryTests { } @Test - public void testMultipleSchemasValidMessage() throws Exception { + void testMultipleSchemasValidMessage() throws Exception { Resource[] schemaResources = new Resource[] { new ClassPathResource("multipleSchemas1.xsd", AbstractValidatorFactoryTests.class), @@ -150,7 +150,7 @@ public abstract class AbstractValidatorFactoryTests { } @Test - public void customErrorHandler() throws Exception { + void customErrorHandler() throws Exception { ValidationErrorHandler myHandler = new ValidationErrorHandler() { public SAXParseException[] getErrors() { diff --git a/spring-xml/src/test/java/org/springframework/xml/validation/Jaxp13ValidatorFactoryTests.java b/spring-xml/src/test/java/org/springframework/xml/validation/Jaxp13ValidatorFactoryTests.java index dad266bb..43bd727d 100644 --- a/spring-xml/src/test/java/org/springframework/xml/validation/Jaxp13ValidatorFactoryTests.java +++ b/spring-xml/src/test/java/org/springframework/xml/validation/Jaxp13ValidatorFactoryTests.java @@ -20,7 +20,7 @@ import java.io.IOException; import org.springframework.core.io.Resource; -public class Jaxp13ValidatorFactoryTests extends AbstractValidatorFactoryTests { +class Jaxp13ValidatorFactoryTests extends AbstractValidatorFactoryTests { @Override protected XmlValidator createValidator(Resource[] schemaResources, String schemaLanguage) throws IOException { diff --git a/spring-xml/src/test/java/org/springframework/xml/validation/Jaxp15ValidatorFactoryTests.java b/spring-xml/src/test/java/org/springframework/xml/validation/Jaxp15ValidatorFactoryTests.java index 9ce94151..d5d38ad2 100644 --- a/spring-xml/src/test/java/org/springframework/xml/validation/Jaxp15ValidatorFactoryTests.java +++ b/spring-xml/src/test/java/org/springframework/xml/validation/Jaxp15ValidatorFactoryTests.java @@ -20,7 +20,7 @@ import java.io.IOException; import org.springframework.core.io.Resource; -public class Jaxp15ValidatorFactoryTests extends AbstractValidatorFactoryTests { +class Jaxp15ValidatorFactoryTests extends AbstractValidatorFactoryTests { @Override protected XmlValidator createValidator(Resource[] schemaResources, String schemaLanguage) throws IOException { diff --git a/spring-xml/src/test/java/org/springframework/xml/validation/SchemaLoaderUtilsTests.java b/spring-xml/src/test/java/org/springframework/xml/validation/SchemaLoaderUtilsTests.java index 145e93b6..093e2702 100644 --- a/spring-xml/src/test/java/org/springframework/xml/validation/SchemaLoaderUtilsTests.java +++ b/spring-xml/src/test/java/org/springframework/xml/validation/SchemaLoaderUtilsTests.java @@ -27,10 +27,10 @@ import org.springframework.core.io.Resource; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -public class SchemaLoaderUtilsTests { +class SchemaLoaderUtilsTests { @Test - public void testLoadSchema() throws Exception { + void testLoadSchema() throws Exception { Resource resource = new ClassPathResource("schema.xsd", getClass()); Schema schema = SchemaLoaderUtils.loadSchema(resource, XMLConstants.W3C_XML_SCHEMA_NS_URI); @@ -40,7 +40,7 @@ public class SchemaLoaderUtilsTests { } @Test - public void testLoadNonExistantSchema() { + void testLoadNonExistantSchema() { assertThatIllegalArgumentException().isThrownBy(() -> { Resource nonExistent = new ClassPathResource("bla"); @@ -49,14 +49,14 @@ public class SchemaLoaderUtilsTests { } @Test - public void testLoadNullSchema() { + void testLoadNullSchema() { assertThatIllegalArgumentException() .isThrownBy(() -> SchemaLoaderUtils.loadSchema((Resource) null, XMLConstants.W3C_XML_SCHEMA_NS_URI)); } @Test - public void testLoadMultipleSchemas() throws Exception { + void testLoadMultipleSchemas() throws Exception { Resource envelope = new ClassPathResource("envelope.xsd", getClass()); Resource encoding = new ClassPathResource("encoding.xsd", getClass()); diff --git a/spring-xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTests.java b/spring-xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTests.java index 2d7f7a0e..302dd49b 100644 --- a/spring-xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTests.java +++ b/spring-xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTests.java @@ -31,10 +31,10 @@ import org.springframework.core.io.Resource; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -public class XmlValidatorFactoryTests { +class XmlValidatorFactoryTests { @Test - public void testCreateValidator() throws Exception { + void testCreateValidator() throws Exception { Resource resource = new ClassPathResource("schema.xsd", AbstractValidatorFactoryTests.class); XmlValidator validator = XmlValidatorFactory.createValidator(resource, XmlValidatorFactory.SCHEMA_W3C_XML); @@ -43,14 +43,14 @@ public class XmlValidatorFactoryTests { } @Test - public void testNonExistentResource() { + void testNonExistentResource() { assertThatIllegalArgumentException().isThrownBy(() -> XmlValidatorFactory .createValidator(new NonExistentResource(), XmlValidatorFactory.SCHEMA_W3C_XML)); } @Test - public void testInvalidSchemaLanguage() { + void testInvalidSchemaLanguage() { assertThatIllegalArgumentException().isThrownBy(() -> XmlValidatorFactory .createValidator(new ClassPathResource("schema.xsd", AbstractValidatorFactoryTests.class), "bla")); diff --git a/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTests.java b/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTests.java index 5f408132..ab20cd97 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTests.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTests.java @@ -72,7 +72,7 @@ public abstract class AbstractXPathExpressionFactoryTests { } @Test - public void testThatToStringReturnsOriginalXpathExpression() { + void testThatToStringReturnsOriginalXpathExpression() { XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:otherchild", this.namespaces); @@ -80,7 +80,7 @@ public abstract class AbstractXPathExpressionFactoryTests { } @Test - public void testEvaluateAsBooleanInvalidNamespaces() { + void testEvaluateAsBooleanInvalidNamespaces() { XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:otherchild", this.namespaces); boolean result = expression.evaluateAsBoolean(this.namespacesDocument); @@ -89,7 +89,7 @@ public abstract class AbstractXPathExpressionFactoryTests { } @Test - public void testEvaluateAsBooleanInvalidNoNamespaces() { + void testEvaluateAsBooleanInvalidNoNamespaces() { XPathExpression expression = createXPathExpression("/root/otherchild"); boolean result = expression.evaluateAsBoolean(this.noNamespacesDocument); @@ -98,7 +98,7 @@ public abstract class AbstractXPathExpressionFactoryTests { } @Test - public void testEvaluateAsBooleanNamespaces() { + void testEvaluateAsBooleanNamespaces() { XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:child/prefix2:boolean/text()", this.namespaces); @@ -108,7 +108,7 @@ public abstract class AbstractXPathExpressionFactoryTests { } @Test - public void testEvaluateAsBooleanNoNamespaces() { + void testEvaluateAsBooleanNoNamespaces() { XPathExpression expression = createXPathExpression("/root/child/boolean/text()"); boolean result = expression.evaluateAsBoolean(this.noNamespacesDocument); @@ -117,7 +117,7 @@ public abstract class AbstractXPathExpressionFactoryTests { } @Test - public void testEvaluateAsDoubleInvalidNamespaces() { + void testEvaluateAsDoubleInvalidNamespaces() { XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:otherchild", this.namespaces); double result = expression.evaluateAsNumber(this.noNamespacesDocument); @@ -126,7 +126,7 @@ public abstract class AbstractXPathExpressionFactoryTests { } @Test - public void testEvaluateAsDoubleInvalidNoNamespaces() { + void testEvaluateAsDoubleInvalidNoNamespaces() { XPathExpression expression = createXPathExpression("/root/otherchild"); double result = expression.evaluateAsNumber(this.noNamespacesDocument); @@ -135,7 +135,7 @@ public abstract class AbstractXPathExpressionFactoryTests { } @Test - public void testEvaluateAsDoubleNamespaces() { + void testEvaluateAsDoubleNamespaces() { XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:child/prefix2:number/text()", this.namespaces); @@ -145,7 +145,7 @@ public abstract class AbstractXPathExpressionFactoryTests { } @Test - public void testEvaluateAsDoubleNoNamespaces() { + void testEvaluateAsDoubleNoNamespaces() { XPathExpression expression = createXPathExpression("/root/child/number/text()"); double result = expression.evaluateAsNumber(this.noNamespacesDocument); @@ -154,7 +154,7 @@ public abstract class AbstractXPathExpressionFactoryTests { } @Test - public void testEvaluateAsNodeInvalidNamespaces() { + void testEvaluateAsNodeInvalidNamespaces() { XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:otherchild", this.namespaces); Node result = expression.evaluateAsNode(this.namespacesDocument); @@ -163,7 +163,7 @@ public abstract class AbstractXPathExpressionFactoryTests { } @Test - public void testEvaluateAsNodeInvalidNoNamespaces() { + void testEvaluateAsNodeInvalidNoNamespaces() { XPathExpression expression = createXPathExpression("/root/otherchild"); Node result = expression.evaluateAsNode(this.noNamespacesDocument); @@ -172,7 +172,7 @@ public abstract class AbstractXPathExpressionFactoryTests { } @Test - public void testEvaluateAsNodeNamespaces() { + void testEvaluateAsNodeNamespaces() { XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:child", this.namespaces); Node result = expression.evaluateAsNode(this.namespacesDocument); @@ -182,7 +182,7 @@ public abstract class AbstractXPathExpressionFactoryTests { } @Test - public void testEvaluateAsNodeNoNamespaces() { + void testEvaluateAsNodeNoNamespaces() { XPathExpression expression = createXPathExpression("/root/child"); Node result = expression.evaluateAsNode(this.noNamespacesDocument); @@ -192,7 +192,7 @@ public abstract class AbstractXPathExpressionFactoryTests { } @Test - public void testEvaluateAsNodeListNamespaces() { + void testEvaluateAsNodeListNamespaces() { XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:child/*", this.namespaces); List results = expression.evaluateAsNodeList(this.namespacesDocument); @@ -202,7 +202,7 @@ public abstract class AbstractXPathExpressionFactoryTests { } @Test - public void testEvaluateAsNodeListNoNamespaces() { + void testEvaluateAsNodeListNoNamespaces() { XPathExpression expression = createXPathExpression("/root/child/*"); List results = expression.evaluateAsNodeList(this.noNamespacesDocument); @@ -212,7 +212,7 @@ public abstract class AbstractXPathExpressionFactoryTests { } @Test - public void testEvaluateAsStringInvalidNamespaces() { + void testEvaluateAsStringInvalidNamespaces() { XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:otherchild", this.namespaces); String result = expression.evaluateAsString(this.namespacesDocument); @@ -221,7 +221,7 @@ public abstract class AbstractXPathExpressionFactoryTests { } @Test - public void testEvaluateAsStringInvalidNoNamespaces() { + void testEvaluateAsStringInvalidNoNamespaces() { XPathExpression expression = createXPathExpression("/root/otherchild"); String result = expression.evaluateAsString(this.noNamespacesDocument); @@ -230,7 +230,7 @@ public abstract class AbstractXPathExpressionFactoryTests { } @Test - public void testEvaluateAsStringNamespaces() { + void testEvaluateAsStringNamespaces() { XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:child/prefix2:text/text()", this.namespaces); @@ -240,7 +240,7 @@ public abstract class AbstractXPathExpressionFactoryTests { } @Test - public void testEvaluateAsStringNoNamespaces() { + void testEvaluateAsStringNoNamespaces() { XPathExpression expression = createXPathExpression("/root/child/text/text()"); String result = expression.evaluateAsString(this.noNamespacesDocument); @@ -249,7 +249,7 @@ public abstract class AbstractXPathExpressionFactoryTests { } @Test - public void testEvaluateAsObject() { + void testEvaluateAsObject() { XPathExpression expression = createXPathExpression("/root/child"); String result = expression.evaluateAsObject(this.noNamespacesDocument, new NodeMapper<>() { @@ -263,7 +263,7 @@ public abstract class AbstractXPathExpressionFactoryTests { } @Test - public void testEvaluate() throws Exception { + void testEvaluate() throws Exception { XPathExpression expression = createXPathExpression("/root/child/*"); List results = expression.evaluate(this.noNamespacesDocument, new NodeMapper<>() { @@ -277,7 +277,7 @@ public abstract class AbstractXPathExpressionFactoryTests { } @Test - public void testInvalidExpression() { + void testInvalidExpression() { assertThatExceptionOfType(XPathParseException.class).isThrownBy(() -> createXPathExpression("\\")); } diff --git a/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTests.java b/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTests.java index 0d0d0534..248c00d2 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTests.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTests.java @@ -67,7 +67,7 @@ public abstract class AbstractXPathTemplateTests { protected abstract XPathOperations createTemplate() throws Exception; @Test - public void testEvaluateAsBoolean() { + void testEvaluateAsBoolean() { boolean result = this.template.evaluateAsBoolean("/root/child/boolean", this.nonamespaces); @@ -75,7 +75,7 @@ public abstract class AbstractXPathTemplateTests { } @Test - public void testEvaluateAsBooleanNamespaces() { + void testEvaluateAsBooleanNamespaces() { boolean result = this.template.evaluateAsBoolean("/prefix1:root/prefix2:child/prefix2:boolean", this.namespaces); @@ -84,7 +84,7 @@ public abstract class AbstractXPathTemplateTests { } @Test - public void testEvaluateAsDouble() { + void testEvaluateAsDouble() { double result = this.template.evaluateAsDouble("/root/child/number", this.nonamespaces); @@ -92,7 +92,7 @@ public abstract class AbstractXPathTemplateTests { } @Test - public void testEvaluateAsDoubleNamespaces() { + void testEvaluateAsDoubleNamespaces() { double result = this.template.evaluateAsDouble("/prefix1:root/prefix2:child/prefix2:number", this.namespaces); @@ -100,7 +100,7 @@ public abstract class AbstractXPathTemplateTests { } @Test - public void testEvaluateAsNode() { + void testEvaluateAsNode() { Node result = this.template.evaluateAsNode("/root/child", this.nonamespaces); @@ -109,7 +109,7 @@ public abstract class AbstractXPathTemplateTests { } @Test - public void testEvaluateAsNodeNamespaces() { + void testEvaluateAsNodeNamespaces() { Node result = this.template.evaluateAsNode("/prefix1:root/prefix2:child", this.namespaces); @@ -118,7 +118,7 @@ public abstract class AbstractXPathTemplateTests { } @Test - public void testEvaluateAsNodes() { + void testEvaluateAsNodes() { List results = this.template.evaluateAsNodeList("/root/child/*", this.nonamespaces); @@ -127,7 +127,7 @@ public abstract class AbstractXPathTemplateTests { } @Test - public void testEvaluateAsNodesNamespaces() { + void testEvaluateAsNodesNamespaces() { List results = this.template.evaluateAsNodeList("/prefix1:root/prefix2:child/*", this.namespaces); @@ -136,7 +136,7 @@ public abstract class AbstractXPathTemplateTests { } @Test - public void testEvaluateAsStringNamespaces() throws IOException, SAXException { + void testEvaluateAsStringNamespaces() throws IOException, SAXException { String result = this.template.evaluateAsString("/prefix1:root/prefix2:child/prefix2:text", this.namespaces); @@ -144,7 +144,7 @@ public abstract class AbstractXPathTemplateTests { } @Test - public void testEvaluateAsString() throws IOException, SAXException { + void testEvaluateAsString() throws IOException, SAXException { String result = this.template.evaluateAsString("/root/child/text", this.nonamespaces); @@ -152,7 +152,7 @@ public abstract class AbstractXPathTemplateTests { } @Test - public void testEvaluateDomSource() throws IOException, SAXException, ParserConfigurationException { + void testEvaluateDomSource() throws IOException, SAXException, ParserConfigurationException { DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); @@ -166,7 +166,7 @@ public abstract class AbstractXPathTemplateTests { } @Test - public void testEvaluateSAXSource() throws Exception { + void testEvaluateSAXSource() throws Exception { InputStream in = AbstractXPathTemplateTests.class.getResourceAsStream("nonamespaces.xml"); SAXSource source = new SAXSource(new InputSource(in)); @@ -176,7 +176,7 @@ public abstract class AbstractXPathTemplateTests { } @Test - public void testEvaluateStaxSource() throws Exception { + void testEvaluateStaxSource() throws Exception { InputStream in = AbstractXPathTemplateTests.class.getResourceAsStream("nonamespaces.xml"); XMLStreamReader streamReader = XMLInputFactory.newFactory().createXMLStreamReader(in); @@ -187,7 +187,7 @@ public abstract class AbstractXPathTemplateTests { } @Test - public void testEvaluateStreamSourceInputStream() throws IOException, SAXException, ParserConfigurationException { + void testEvaluateStreamSourceInputStream() throws IOException, SAXException, ParserConfigurationException { InputStream in = AbstractXPathTemplateTests.class.getResourceAsStream("nonamespaces.xml"); StreamSource source = new StreamSource(in); @@ -197,7 +197,7 @@ public abstract class AbstractXPathTemplateTests { } @Test - public void testEvaluateStreamSourceSystemId() throws IOException, SAXException, ParserConfigurationException { + void testEvaluateStreamSourceSystemId() throws IOException, SAXException, ParserConfigurationException { URL url = AbstractXPathTemplateTests.class.getResource("nonamespaces.xml"); String result = this.template.evaluateAsString("/root/child/text", new StreamSource(url.toString())); @@ -206,13 +206,13 @@ public abstract class AbstractXPathTemplateTests { } @Test - public void testInvalidExpression() { + void testInvalidExpression() { assertThatExceptionOfType(XPathException.class) .isThrownBy(() -> this.template.evaluateAsBoolean("\\", this.namespaces)); } @Test - public void testEvaluateAsObject() throws Exception { + void testEvaluateAsObject() throws Exception { String result = this.template.evaluateAsObject("/root/child", this.nonamespaces, new NodeMapper<>() { public String mapNode(Node node, int nodeNum) throws DOMException { @@ -225,7 +225,7 @@ public abstract class AbstractXPathTemplateTests { } @Test - public void testEvaluate() throws Exception { + void testEvaluate() throws Exception { List results = this.template.evaluate("/root/child/*", this.nonamespaces, new NodeMapper<>() { public String mapNode(Node node, int nodeNum) throws DOMException { diff --git a/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathExpressionFactoryTests.java b/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathExpressionFactoryTests.java index ce47977c..c66188f0 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathExpressionFactoryTests.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathExpressionFactoryTests.java @@ -18,7 +18,7 @@ package org.springframework.xml.xpath; import java.util.Map; -public class JaxenXPathExpressionFactoryTests extends AbstractXPathExpressionFactoryTests { +class JaxenXPathExpressionFactoryTests extends AbstractXPathExpressionFactoryTests { @Override protected XPathExpression createXPathExpression(String expression) { diff --git a/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathTemplateTests.java b/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathTemplateTests.java index b3a0d33c..7847f070 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathTemplateTests.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathTemplateTests.java @@ -19,7 +19,7 @@ package org.springframework.xml.xpath; import java.util.HashMap; import java.util.Map; -public class JaxenXPathTemplateTests extends AbstractXPathTemplateTests { +class JaxenXPathTemplateTests extends AbstractXPathTemplateTests { @Override protected XPathOperations createTemplate() { diff --git a/spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactoryTests.java b/spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactoryTests.java index bfd3ddd1..01b31771 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactoryTests.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactoryTests.java @@ -18,7 +18,7 @@ package org.springframework.xml.xpath; import java.util.Map; -public class Jaxp13XPathExpressionFactoryTests extends AbstractXPathExpressionFactoryTests { +class Jaxp13XPathExpressionFactoryTests extends AbstractXPathExpressionFactoryTests { @Override protected XPathExpression createXPathExpression(String expression) { diff --git a/spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathTemplateTests.java b/spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathTemplateTests.java index e69785f5..9da76839 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathTemplateTests.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathTemplateTests.java @@ -19,7 +19,7 @@ package org.springframework.xml.xpath; import java.util.HashMap; import java.util.Map; -public class Jaxp13XPathTemplateTests extends AbstractXPathTemplateTests { +class Jaxp13XPathTemplateTests extends AbstractXPathTemplateTests { @Override protected XPathOperations createTemplate() { diff --git a/spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryBeanTests.java b/spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryBeanTests.java index 8c01d81b..60635535 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryBeanTests.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryBeanTests.java @@ -21,17 +21,17 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -public class XPathExpressionFactoryBeanTests { +class XPathExpressionFactoryBeanTests { private XPathExpressionFactoryBean factoryBean; @BeforeEach - public void setUp() { + void setUp() { this.factoryBean = new XPathExpressionFactoryBean(); } @Test - public void testFactoryBean() throws Exception { + void testFactoryBean() throws Exception { this.factoryBean.setExpression("/root"); this.factoryBean.afterPropertiesSet(); diff --git a/spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryTests.java b/spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryTests.java index 2c8784b5..bc19d059 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryTests.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryTests.java @@ -21,10 +21,10 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -public class XPathExpressionFactoryTests { +class XPathExpressionFactoryTests { @Test - public void testCreateXPathExpression() { + void testCreateXPathExpression() { XPathExpression expression = XPathExpressionFactory.createXPathExpression("/root"); @@ -32,7 +32,7 @@ public class XPathExpressionFactoryTests { } @Test - public void testCreateEmptyXPathExpression() { + void testCreateEmptyXPathExpression() { assertThatIllegalArgumentException().isThrownBy(() -> XPathExpressionFactory.createXPathExpression("")); } diff --git a/spring-xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTests.java b/spring-xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTests.java index f1c87025..940d1685 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTests.java +++ b/spring-xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTests.java @@ -53,7 +53,7 @@ public abstract class AbstractXsdSchemaTests { } @Test - public void testSingle() throws Exception { + void testSingle() throws Exception { Resource resource = new ClassPathResource("single.xsd", AbstractXsdSchemaTests.class); XsdSchema single = createSchema(resource); @@ -70,7 +70,7 @@ public abstract class AbstractXsdSchemaTests { } @Test - public void testIncludes() throws Exception { + void testIncludes() throws Exception { Resource resource = new ClassPathResource("including.xsd", AbstractXsdSchemaTests.class); XsdSchema including = createSchema(resource); @@ -87,7 +87,7 @@ public abstract class AbstractXsdSchemaTests { } @Test - public void testImports() throws Exception { + void testImports() throws Exception { Resource resource = new ClassPathResource("importing.xsd", AbstractXsdSchemaTests.class); XsdSchema importing = createSchema(resource); @@ -105,7 +105,7 @@ public abstract class AbstractXsdSchemaTests { } @Test - public void testXmlNamespace() throws Exception { + void testXmlNamespace() throws Exception { Resource resource = new ClassPathResource("xmlNamespace.xsd", AbstractXsdSchemaTests.class); XsdSchema importing = createSchema(resource); @@ -122,7 +122,7 @@ public abstract class AbstractXsdSchemaTests { } @Test - public void testCreateValidator() throws Exception { + void testCreateValidator() throws Exception { Resource resource = new ClassPathResource("single.xsd", AbstractXsdSchemaTests.class); XsdSchema single = createSchema(resource); diff --git a/spring-xml/src/test/java/org/springframework/xml/xsd/SimpleXsdSchemaTests.java b/spring-xml/src/test/java/org/springframework/xml/xsd/SimpleXsdSchemaTests.java index 9ee2d318..29213278 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xsd/SimpleXsdSchemaTests.java +++ b/spring-xml/src/test/java/org/springframework/xml/xsd/SimpleXsdSchemaTests.java @@ -22,7 +22,7 @@ import org.springframework.core.io.Resource; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -public class SimpleXsdSchemaTests extends AbstractXsdSchemaTests { +class SimpleXsdSchemaTests extends AbstractXsdSchemaTests { @Override protected XsdSchema createSchema(Resource resource) throws Exception { @@ -34,7 +34,7 @@ public class SimpleXsdSchemaTests extends AbstractXsdSchemaTests { } @Test - public void testBareXsdSchema() { + void testBareXsdSchema() { assertThatIllegalArgumentException().isThrownBy(() -> new SimpleXsdSchema().toString()); } diff --git a/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTests.java b/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTests.java index cbfa04ad..75b9d331 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTests.java +++ b/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTests.java @@ -39,7 +39,7 @@ import org.springframework.xml.xsd.XsdSchema; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -public class CommonsXsdSchemaCollectionTests { +class CommonsXsdSchemaCollectionTests { private CommonsXsdSchemaCollection collection; @@ -48,7 +48,7 @@ public class CommonsXsdSchemaCollectionTests { private DocumentBuilder documentBuilder; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { this.collection = new CommonsXsdSchemaCollection(); TransformerFactory transformerFactory = TransformerFactoryUtils.newInstance(); @@ -59,7 +59,7 @@ public class CommonsXsdSchemaCollectionTests { } @Test - public void testSingle() throws Exception { + void testSingle() throws Exception { Resource resource = new ClassPathResource("single.xsd", AbstractXsdSchemaTests.class); this.collection.setXsds(resource); @@ -69,7 +69,7 @@ public class CommonsXsdSchemaCollectionTests { } @Test - public void testInlineComplex() throws Exception { + void testInlineComplex() throws Exception { Resource a = new ClassPathResource("A.xsd", AbstractXsdSchemaTests.class); this.collection.setXsds(a); @@ -97,7 +97,7 @@ public class CommonsXsdSchemaCollectionTests { } @Test - public void testCircular() throws Exception { + void testCircular() throws Exception { Resource resource = new ClassPathResource("circular-1.xsd", AbstractXsdSchemaTests.class); this.collection.setXsds(resource); @@ -109,8 +109,7 @@ public class CommonsXsdSchemaCollectionTests { } @Test - - public void testXmlNamespace() throws Exception { + void testXmlNamespace() throws Exception { Resource resource = new ClassPathResource("xmlNamespace.xsd", AbstractXsdSchemaTests.class); this.collection.setXsds(resource); this.collection.setInline(true); @@ -121,7 +120,7 @@ public class CommonsXsdSchemaCollectionTests { } @Test - public void testCreateValidator() throws Exception { + void testCreateValidator() throws Exception { Resource a = new ClassPathResource("A.xsd", AbstractXsdSchemaTests.class); this.collection.setXsds(a); @@ -134,7 +133,7 @@ public class CommonsXsdSchemaCollectionTests { } @Test - public void testInvalidSchema() { + void testInvalidSchema() { Resource invalid = new ClassPathResource("invalid.xsd", AbstractXsdSchemaTests.class); this.collection.setXsds(invalid); @@ -144,7 +143,7 @@ public class CommonsXsdSchemaCollectionTests { } @Test - public void testIncludesAndImports() throws Exception { + void testIncludesAndImports() throws Exception { Resource hr = new ClassPathResource("hr.xsd", getClass()); this.collection.setXsds(hr); diff --git a/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaTests.java b/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaTests.java index fd872297..f6ff22ee 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaTests.java +++ b/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaTests.java @@ -32,7 +32,7 @@ import org.springframework.xml.xsd.XsdSchema; import static org.assertj.core.api.Assertions.assertThat; -public class CommonsXsdSchemaTests extends AbstractXsdSchemaTests { +class CommonsXsdSchemaTests extends AbstractXsdSchemaTests { @Override protected XsdSchema createSchema(Resource resource) throws Exception { @@ -44,7 +44,7 @@ public class CommonsXsdSchemaTests extends AbstractXsdSchemaTests { } @Test - public void testXmime() throws Exception { + void testXmime() throws Exception { Resource resource = new ClassPathResource("xmime.xsd", AbstractXsdSchemaTests.class); XsdSchema schema = createSchema(resource);