Harmonize visibility of test classes and methods

Closes gh-1550

Author: snicoll

Diff for: spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTests.java

@@ -31,7 +31,7 @@ public final void setUp() throws Exception {
 	}
 
 	@Test
-	public void testCreateEmptyMessage() {
+	protected void testCreateEmptyMessage() {
 
 		WebServiceMessage message = this.messageFactory.createWebServiceMessage();
 

Diff for: spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTests.java

@@ -87,7 +87,7 @@ public final void setUp() throws Exception {
 	}
 
 	@Test
-	public void testDomPayload() throws Exception {
+	void testDomPayload() throws Exception {
 
 		DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance();
 		documentBuilderFactory.setNamespaceAware(true);
@@ -105,7 +105,7 @@ public void testDomPayload() throws Exception {
 	}
 
 	@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 void testEventReaderPayload() throws Exception {
 	}
 
 	@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 void testReaderPayload() throws Exception {
 	}
 
 	@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 void testSaxPayload() throws Exception {
 	}
 
 	@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 void testStreamPayload() throws Exception {
 	}
 
 	@Test
-	public void testStreamReaderPayload() throws Exception {
+	void testStreamReaderPayload() throws Exception {
 
 		XMLInputFactory inputFactory = XMLInputFactoryUtils.newInstance();
 		XMLStreamReader streamReader = inputFactory.createXMLStreamReader(this.payload.getInputStream());

Diff for: 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,24 +116,24 @@ public static void startJetty() throws Exception {
 	}
 
 	@AfterAll
-	public static void stopJetty() throws Exception {
+	static void stopJetty() throws Exception {
 
 		if (jettyServer.isRunning()) {
 			jettyServer.stop();
 		}
 	}
 
 	@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 void sendSourceAndReceiveToResult() {
 	}
 
 	@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 void sendSourceAndReceiveToResultNoResponse() {
 	}
 
 	@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 boolean supports(Class<?> clazz) {
 	}
 
 	@Test
-	public void marshalSendAndReceiveNoResponse() throws TransformerConfigurationException {
+	void marshalSendAndReceiveNoResponse() throws TransformerConfigurationException {
 
 		final Transformer transformer = TransformerFactoryUtils.newInstance().newTransformer();
 		final Object requestObject = new Object();
@@ -245,15 +245,15 @@ public boolean supports(Class<?> clazz) {
 	}
 
 	@Test
-	public void notFound() {
+	void notFound() {
 
 		assertThatExceptionOfType(WebServiceTransportException.class)
 			.isThrownBy(() -> this.template.sendSourceAndReceiveToResult(baseUrl + "/errors/notfound",
 					new StringSource(this.messagePayload), new StringResult()));
 	}
 
 	@Test
-	public void fault() {
+	void fault() {
 
 		Result result = new StringResult();
 
@@ -262,7 +262,7 @@ public void fault() {
 	}
 
 	@Test
-	public void faultNonCompliant() {
+	void faultNonCompliant() {
 
 		Result result = new StringResult();
 		this.template.setCheckConnectionForFault(false);
@@ -274,7 +274,7 @@ public void faultNonCompliant() {
 	}
 
 	@Test
-	public void attachment() {
+	void attachment() {
 
 		this.template.sendSourceAndReceiveToResult(baseUrl + "/soap/attachment", new StringSource(this.messagePayload),
 				message -> {
@@ -311,7 +311,7 @@ private abstract static class AbstractSoapServlet extends HttpServlet {
 
 		private int sc = -1;
 
-		public void setSc(int sc) {
+		void setSc(int sc) {
 			this.sc = sc;
 		}
 

Diff for: spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTests.java

@@ -123,7 +123,7 @@ public static void stopJetty() throws Exception {
 	 * 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 void removeXmlDataContentHandler() throws SOAPException {
 	}
 
 	@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,15 +152,15 @@ public void sendSourceAndReceiveToResult() {
 	}
 
 	@Test
-	public void sendSourceAndReceiveToResultNoResponse() {
+	void sendSourceAndReceiveToResultNoResponse() {
 
 		boolean b = this.template.sendSourceAndReceiveToResult(baseUrl + "/soap/noResponse",
 				new StringSource(this.messagePayload), new StringResult());
 		assertThat(b).isFalse();
 	}
 
 	@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 boolean supports(Class<?> clazz) {
 	}
 
 	@Test
-	public void marshalSendAndReceiveNoResponse() throws TransformerConfigurationException {
+	void marshalSendAndReceiveNoResponse() throws TransformerConfigurationException {
 
 		final Transformer transformer = TransformerFactoryUtils.newInstance().newTransformer();
 		final Object requestObject = new Object();
@@ -250,15 +250,15 @@ public boolean supports(Class<?> clazz) {
 	}
 
 	@Test
-	public void notFound() {
+	void notFound() {
 
 		assertThatExceptionOfType(WebServiceTransportException.class)
 			.isThrownBy(() -> this.template.sendSourceAndReceiveToResult(baseUrl + "/errors/notfound",
 					new StringSource(this.messagePayload), new StringResult()));
 	}
 
 	@Test
-	public void receiverFault() {
+	void receiverFault() {
 
 		Result result = new StringResult();
 
@@ -268,7 +268,7 @@ public void receiverFault() {
 	}
 
 	@Test
-	public void senderFault() {
+	void senderFault() {
 
 		Result result = new StringResult();
 
@@ -278,7 +278,7 @@ public void senderFault() {
 	}
 
 	@Test
-	public void attachment() {
+	void attachment() {
 
 		this.template.sendSourceAndReceiveToResult(baseUrl + "/soap/attachment", new StringSource(this.messagePayload),
 				message -> {

Diff for: spring-ws-core/src/test/java/org/springframework/ws/client/core/DomPoxWebServiceTemplateIntegrationTests.java

@@ -52,14 +52,14 @@
 
 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,15 +84,15 @@ public static void startJetty() throws Exception {
 	}
 
 	@AfterAll
-	public static void stopJetty() throws Exception {
+	static void stopJetty() throws Exception {
 
 		if (jettyServer.isRunning()) {
 			jettyServer.stop();
 		}
 	}
 
 	@Test
-	public void domPox() {
+	void domPox() {
 
 		WebServiceTemplate template = new WebServiceTemplate(new DomPoxMessageFactory());
 		template.setMessageSender(new HttpComponentsMessageSender());

Diff for: spring-ws-core/src/test/java/org/springframework/ws/client/core/SaajSoap11WebServiceTemplateIntegrationTests.java

@@ -25,10 +25,10 @@
 /**
  * @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 for: spring-ws-core/src/test/java/org/springframework/ws/client/core/SaajSoap12WebServiceTemplateIntegrationTests.java

@@ -25,10 +25,10 @@
 /**
  * @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 for: spring-ws-core/src/test/java/org/springframework/ws/client/core/SimpleFaultMessageResolverTests.java

@@ -28,17 +28,17 @@
 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";