Harmonize suffix of test classes

Closes gh-1528

spring-ws-security/src/test/java/org/springframework/ws/soap/security/SkipValidationWsSecurityInterceptorTests.java

@@ -36,7 +36,7 @@ import org.springframework.ws.soap.saaj.SaajSoapMessageFactory;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
-public class SkipValidationWsSecurityInterceptorTest {
+public class SkipValidationWsSecurityInterceptorTests {
 
 	private MessageFactory messageFactory;
 

spring-ws-security/src/test/java/org/springframework/ws/soap/security/callback/CallbackHandlerChainTests.java

@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-public class CallbackHandlerChainTest {
+public class CallbackHandlerChainTests {
 
 	private CallbackHandler supported = callbacks -> {
 	};

spring-ws-security/src/test/java/org/springframework/ws/soap/security/support/KeyManagersFactoryBeanTests.java

@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class KeyManagersFactoryBeanTest {
+public class KeyManagersFactoryBeanTests {
 
 	@Test
 	public void defaults() throws Exception {

spring-ws-security/src/test/java/org/springframework/ws/soap/security/support/TrustManagersFactoryBeanTests.java

@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TrustManagersFactoryBeanTest {
+public class TrustManagersFactoryBeanTests {
 
 	@Test
 	public void defaults() throws Exception {

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 SaajWss4jInterceptorTest extends Wss4jInterceptorTest {
+public class SaajWss4jInterceptorTests extends Wss4jInterceptorTests {
 
 }

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorEncryptionTests.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2005-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ws.soap.security.wss4j2;
+
+public class SaajWss4jMessageInterceptorEncryptionTests extends Wss4jMessageInterceptorEncryptionTests {
+
+}

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 SaajWss4jMessageInterceptorHeaderTest extends Wss4jMessageInterceptorHeaderTest {
+public class SaajWss4jMessageInterceptorHeaderTests extends Wss4jMessageInterceptorHeaderTests {
 
 }

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 SaajWss4jMessageInterceptorSamlTest extends Wss4jMessageInterceptorSamlTest {
+public class SaajWss4jMessageInterceptorSamlTests extends Wss4jMessageInterceptorSamlTests {
 
 }

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSignTests.java

@@ -39,7 +39,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SaajWss4jMessageInterceptorSignTest extends Wss4jMessageInterceptorSignTest {
+public class SaajWss4jMessageInterceptorSignTests extends Wss4jMessageInterceptorSignTests {
 
 	private static final String PAYLOAD = "<tru:StockSymbol xmlns:tru=\"http://fabrikam123.com/payloads\">QQQ</tru:StockSymbol>";
 

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSoapActionTest.java

@@ -1,21 +0,0 @@
-/*
- * Copyright 2005-2025 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.soap.security.wss4j2;
-
-public class SaajWss4jMessageInterceptorSoapActionTest extends Wss4jMessageInterceptorSoapActionTest {
-
-}

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSoapActionTests.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2005-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ws.soap.security.wss4j2;
+
+public class SaajWss4jMessageInterceptorSoapActionTests extends Wss4jMessageInterceptorSoapActionTests {
+
+}

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 SaajWss4jMessageInterceptorSpringSecurityCallbackHandlerTest
-		extends Wss4jMessageInterceptorSpringSecurityCallbackHandlerTest {
+public class SaajWss4jMessageInterceptorSpringSecurityCallbackHandlerTests
+		extends Wss4jMessageInterceptorSpringSecurityCallbackHandlerTests {
 
 }

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorTimestampTest.java

@@ -1,21 +0,0 @@
-/*
- * Copyright 2005-2025 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.soap.security.wss4j2;
-
-public class SaajWss4jMessageInterceptorTimestampTest extends Wss4jMessageInterceptorTimestampTest {
-
-}

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 SaajWss4jMessageInterceptorEncryptionTest extends Wss4jMessageInterceptorEncryptionTest {
+public class SaajWss4jMessageInterceptorTimestampTests extends Wss4jMessageInterceptorTimestampTests {
 
 }

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 SaajWss4jMessageInterceptorUsernameTokenSignatureTest
-		extends Wss4jMessageInterceptorUsernameTokenSignatureTest {
+public class SaajWss4jMessageInterceptorUsernameTokenSignatureTests
+		extends Wss4jMessageInterceptorUsernameTokenSignatureTests {
 
 }

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorUsernameTokenTest.java

@@ -1,21 +0,0 @@
-/*
- * Copyright 2005-2025 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.soap.security.wss4j2;
-
-public class SaajWss4jMessageInterceptorUsernameTokenTest extends Wss4jMessageInterceptorUsernameTokenTest {
-
-}

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorUsernameTokenTests.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2005-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ws.soap.security.wss4j2;
+
+public class SaajWss4jMessageInterceptorUsernameTokenTests extends Wss4jMessageInterceptorUsernameTokenTests {
+
+}

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 SaajWss4jMessageInterceptorX509Test extends Wss4jMessageInterceptorX509Test {
+public class SaajWss4jMessageInterceptorX509Tests extends Wss4jMessageInterceptorX509Tests {
 
 }

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jSecurityInterceptorDefaultsTests.java

@@ -38,7 +38,7 @@ 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 SaajWss4jSecurityInterceptorDefaultsTest extends Wss4jTest {
+public class SaajWss4jSecurityInterceptorDefaultsTests extends Wss4jTests {
 
 	private static final String PAYLOAD = "<tru:StockSymbol xmlns:tru=\"http://fabrikam123.com/payloads\">QQQ</tru:StockSymbol>";
 

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jInterceptorTests.java

@@ -29,7 +29,7 @@ import org.springframework.ws.soap.security.WsSecurityValidationException;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
-public abstract class Wss4jInterceptorTest extends Wss4jTest {
+public abstract class Wss4jInterceptorTests extends Wss4jTests {
 
 	@Test
 	public void testHandleRequest() throws Exception {

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorEncryptionTests.java

@@ -27,7 +27,7 @@ import org.springframework.ws.soap.SoapMessage;
 import org.springframework.ws.soap.security.wss4j2.callback.KeyStoreCallbackHandler;
 import org.springframework.ws.soap.security.wss4j2.support.CryptoFactoryBean;
 
-public abstract class Wss4jMessageInterceptorEncryptionTest extends Wss4jTest {
+public abstract class Wss4jMessageInterceptorEncryptionTests extends Wss4jTests {
 
 	protected Wss4jSecurityInterceptor interceptor;
 

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorHeaderTests.java

@@ -41,7 +41,7 @@ import static org.assertj.core.api.Assertions.fail;
  * @author Tareq Abedrabbo
  * @author Greg Turnquist
  */
-public abstract class Wss4jMessageInterceptorHeaderTest extends Wss4jTest {
+public abstract class Wss4jMessageInterceptorHeaderTests extends Wss4jTests {
 
 	private Wss4jSecurityInterceptor interceptor;
 

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTests.java

@@ -37,7 +37,7 @@ import org.springframework.ws.context.MessageContext;
 import org.springframework.ws.soap.SoapMessage;
 import org.springframework.ws.soap.security.wss4j2.support.CryptoFactoryBean;
 
-public abstract class Wss4jMessageInterceptorSamlTest extends Wss4jTest {
+public abstract class Wss4jMessageInterceptorSamlTests extends Wss4jTests {
 
 	protected Wss4jSecurityInterceptor interceptor;
 

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSignTests.java

@@ -29,7 +29,7 @@ import org.springframework.ws.soap.security.wss4j2.support.CryptoFactoryBean;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class Wss4jMessageInterceptorSignTest extends Wss4jTest {
+public abstract class Wss4jMessageInterceptorSignTests extends Wss4jTests {
 
 	protected Wss4jSecurityInterceptor interceptor;
 

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSoapActionTests.java

@@ -29,7 +29,7 @@ import org.springframework.ws.soap.security.wss4j2.callback.SimplePasswordValida
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class Wss4jMessageInterceptorSoapActionTest extends Wss4jTest {
+public abstract class Wss4jMessageInterceptorSoapActionTests extends Wss4jTests {
 
 	private static final String SOAP_ACTION = "\"http://test\"";
 

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTests.java

@@ -36,7 +36,7 @@ import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 
-public abstract class Wss4jMessageInterceptorSpringSecurityCallbackHandlerTest extends Wss4jTest {
+public abstract class Wss4jMessageInterceptorSpringSecurityCallbackHandlerTests extends Wss4jTests {
 
 	private Properties users = new Properties();
 

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorTimestampTests.java

@@ -30,7 +30,7 @@ import org.springframework.ws.soap.security.WsSecurityValidationException;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-public abstract class Wss4jMessageInterceptorTimestampTest extends Wss4jTest {
+public abstract class Wss4jMessageInterceptorTimestampTests extends Wss4jTests {
 
 	@Test
 	public void testAddTimestamp() throws Exception {

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenSignatureTests.java

@@ -22,7 +22,7 @@ import org.w3c.dom.Document;
 import org.springframework.ws.context.MessageContext;
 import org.springframework.ws.soap.SoapMessage;
 
-public abstract class Wss4jMessageInterceptorUsernameTokenSignatureTest extends Wss4jTest {
+public abstract class Wss4jMessageInterceptorUsernameTokenSignatureTests extends Wss4jTests {
 
 	@Test
 	public void testAddUsernameTokenSignature() throws Exception {

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenTests.java

@@ -29,7 +29,7 @@ import org.springframework.ws.soap.security.wss4j2.callback.SimplePasswordValida
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class Wss4jMessageInterceptorUsernameTokenTest extends Wss4jTest {
+public abstract class Wss4jMessageInterceptorUsernameTokenTests extends Wss4jTests {
 
 	private Properties users = new Properties();
 

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorX509Tests.java

@@ -25,7 +25,7 @@ import org.springframework.ws.context.MessageContext;
 import org.springframework.ws.soap.SoapMessage;
 import org.springframework.ws.soap.security.wss4j2.support.CryptoFactoryBean;
 
-public abstract class Wss4jMessageInterceptorX509Test extends Wss4jTest {
+public abstract class Wss4jMessageInterceptorX509Tests extends Wss4jTests {
 
 	protected Wss4jSecurityInterceptor interceptor;
 

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jTests.java

@@ -45,7 +45,7 @@ import org.springframework.xml.xpath.Jaxp13XPathTemplate;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class Wss4jTest {
+public abstract class Wss4jTests {
 
 	protected MessageFactory saajSoap11MessageFactory;
 

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandlerTests.java

@@ -27,7 +27,7 @@ import org.springframework.ws.soap.security.support.KeyStoreFactoryBean;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class KeyStoreCallbackHandlerTest {
+public class KeyStoreCallbackHandlerTests {
 
 	private KeyStoreCallbackHandler callbackHandler;
 

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 SpringSecurityPasswordValidationCallbackHandlerTest {
+public class SpringSecurityPasswordValidationCallbackHandlerTests {
 
 	private SpringSecurityPasswordValidationCallbackHandler callbackHandler;
 

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/support/CryptoFactoryBeanTests.java

@@ -26,7 +26,7 @@ import org.springframework.core.io.ClassPathResource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class CryptoFactoryBeanTest {
+public class CryptoFactoryBeanTests {
 
 	private CryptoFactoryBean factoryBean;