This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 1e3f132d74bf032be991995a587b7d107424ff05 Author: Colm O hEigeartaigh <[email protected]> AuthorDate: Thu Dec 27 15:54:40 2018 +0000 More work on removing extending assert --- .../src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java | 4 ++++ .../test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java | 5 +++++ .../test/java/org/apache/cxf/jaxws/EndpointImplTest.java | 7 +++++++ .../java/org/apache/cxf/jaxws/EndpointReferenceTest.java | 5 +++++ .../src/test/java/org/apache/cxf/jaxws/GreeterTest.java | 3 +++ .../src/test/java/org/apache/cxf/jaxws/HeaderTest.java | 3 +++ .../test/java/org/apache/cxf/jaxws/JaxWsClientTest.java | 14 +++++++++++--- .../org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java | 5 +++++ .../java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java | 2 ++ .../test/java/org/apache/cxf/jaxws/SOAPBindingTest.java | 5 +++++ .../org/apache/cxf/jaxws/SchemaFirstXmlConfigTest.java | 1 + .../test/java/org/apache/cxf/jaxws/ServiceImplTest.java | 7 +++++++ .../java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java | 3 +++ .../src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java | 2 ++ .../java/org/apache/cxf/jaxws/dispatch/DispatchOpTest.java | 3 +++ .../java/org/apache/cxf/jaxws/dispatch/DispatchTest.java | 5 +++++ .../apache/cxf/jaxws/header/HeaderClientServerTest.java | 3 +++ .../cxf/jaxws/header/ProviderHeaderClientServerTest.java | 3 +++ .../test/java/org/apache/cxf/jaxws/holder/HolderTest.java | 3 +++ .../cxf/jaxws/provider/ProviderServiceFactoryTest.java | 4 ++++ .../java/org/apache/cxf/jaxws/provider/ProviderTest.java | 2 ++ .../cxf/jaxws/service/AnnotationInterceptorTest.java | 3 +++ .../java/org/apache/cxf/jaxws/spi/ProviderImplTest.java | 4 +++- .../cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java | 5 +++++ .../cxf/rs/security/saml/sso/AuthnRequestBuilderTest.java | 5 ++++- .../cxf/rs/security/saml/sso/CombinedValidatorTest.java | 6 +++++- .../rs/security/saml/sso/SAMLResponseValidatorTest.java | 6 +++++- .../rs/security/saml/sso/SAMLSSOResponseValidatorTest.java | 5 ++++- .../security/saml/xacml2/RequestComponentBuilderTest.java | 2 +- .../saml/xacml2/SamlRequestComponentBuilderTest.java | 2 +- .../saml/xacml2/XACMLAuthorizingInterceptorTest.java | 2 +- .../rt/security/saml/xacml2/XACMLRequestBuilderTest.java | 2 +- .../apache/cxf/transport/https/CertConstraintsTest.java | 5 ++++- .../cxf/ws/security/tokenstore/EHCacheTokenStoreTest.java | 6 +++++- .../cxf/ws/security/tokenstore/MemoryTokenStoreTest.java | 7 ++++++- .../cxf/ws/security/wss4j/AbstractPolicySecurityTest.java | 7 +++++++ .../cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java | 3 ++- .../cxf/ws/security/wss4j/CustomPolicyAlgorithmsTest.java | 3 +++ .../security/wss4j/DOMToStaxEncryptionIdentifierTest.java | 1 + .../cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java | 3 +++ .../security/wss4j/DOMToStaxSignatureIdentifierTest.java | 1 + .../security/wss4j/DefaultCryptoCoverageCheckerTest.java | 3 +++ .../ws/security/wss4j/PluggablePolicyValidatorTest.java | 3 +++ .../cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java | 2 ++ .../org/apache/cxf/ws/security/wss4j/RoundTripTest.java | 2 ++ .../cxf/ws/security/wss4j/SecurityActionTokenTest.java | 3 +++ .../cxf/ws/security/wss4j/SignatureConfirmationTest.java | 3 +++ .../ws/security/wss4j/StaxCryptoCoverageCheckerTest.java | 2 ++ .../cxf/ws/security/wss4j/StaxRoundTripActionTest.java | 4 ++++ .../apache/cxf/ws/security/wss4j/StaxRoundTripTest.java | 3 +++ .../security/wss4j/StaxToDOMEncryptionIdentifierTest.java | 1 + .../cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java | 3 +++ .../security/wss4j/StaxToDOMSignatureIdentifierTest.java | 1 + .../ws/security/wss4j/UserNameTokenAuthorizationTest.java | 3 +++ .../apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java | 2 ++ .../org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java | 5 +++++ .../cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java | 2 ++ .../cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java | 2 ++ .../cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java | 2 ++ .../apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java | 6 ++++++ .../cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java | 2 ++ .../org/apache/cxf/xkms/cache/XKMSClientCacheTest.java | 7 ++++++- 62 files changed, 211 insertions(+), 17 deletions(-) diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java index 3d395b5..5697936 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java @@ -75,6 +75,10 @@ import org.apache.ws.commons.schema.constants.Constants; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public class CodeFirstTest extends AbstractJaxWsTest { diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java index 4d2275c..cf358d4 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java @@ -49,6 +49,11 @@ import org.apache.cxf.wsdl11.ServiceWSDLBuilder; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public class CodeFirstWSDLTest extends AbstractJaxWsTest { String address = "local://localhost:9000/Hello"; diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java index 4001665..4d0437c 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java @@ -45,6 +45,13 @@ import org.apache.hello_world_soap_http.HelloWrongAnnotation; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public class EndpointImplTest extends AbstractJaxWsTest { diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointReferenceTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointReferenceTest.java index cf197b1..f6cb8b3 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointReferenceTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointReferenceTest.java @@ -45,6 +45,11 @@ import org.apache.hello_world_soap_http.GreeterImpl; import org.junit.Before; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public class EndpointReferenceTest extends AbstractJaxWsTest { private final QName serviceName = new QName("http://apache.org/hello_world_soap_http";, "SOAPService"); diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/GreeterTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/GreeterTest.java index a6d644b..eb44100 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/GreeterTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/GreeterTest.java @@ -33,6 +33,9 @@ import org.apache.hello_world_soap_http.GreeterImpl; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class GreeterTest extends AbstractJaxWsTest { diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/HeaderTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/HeaderTest.java index 84100df..f02eb81 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/HeaderTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/HeaderTest.java @@ -38,6 +38,9 @@ import org.apache.header_test.types.TestHeader5ResponseBody; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class HeaderTest extends AbstractJaxWsTest { @Test diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java index 9b3be2d..735b1c4 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java @@ -66,6 +66,14 @@ import org.apache.hello_world_soap_http.GreeterImpl; import org.junit.Before; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public class JaxWsClientTest extends AbstractJaxWsTest { private final QName serviceName = new QName("http://apache.org/hello_world_soap_http";, @@ -133,7 +141,7 @@ public class JaxWsClientTest extends AbstractJaxWsTest { Map<String, Object> requestContext = ((BindingProvider)handler).getRequestContext(); requestContext.put(JaxWsClientProxy.THREAD_LOCAL_REQUEST_CONTEXT, Boolean.TRUE); - // future calls to getRequestContext() will use a thread local request context. + // future calls to getRequestContext() will use a thread local request context. // That allows the request context to be threadsafe. requestContext = ((BindingProvider)handler).getRequestContext(); @@ -173,7 +181,7 @@ public class JaxWsClientTest extends AbstractJaxWsTest { Map<String, Object> requestContext = disp.getRequestContext(); requestContext.put(JaxWsClientProxy.THREAD_LOCAL_REQUEST_CONTEXT, Boolean.TRUE); - // future calls to getRequestContext() will use a thread local request context. + // future calls to getRequestContext() will use a thread local request context. // That allows the request context to be threadsafe. requestContext = disp.getRequestContext(); @@ -200,7 +208,7 @@ public class JaxWsClientTest extends AbstractJaxWsTest { assertEquals("main thread does not see removal", "ho", requestContext.get(key)); } - + @Test public void testThreadLocalRequestContextIsIsolated() throws InterruptedException { URL url = getClass().getResource("/wsdl/hello_world.wsdl"); diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java index 208301b..4fd5ab9 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java @@ -45,6 +45,11 @@ import org.apache.hello_world_doc_lit.GreeterImplDoc; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + public class JaxWsServerFactoryBeanTest extends AbstractJaxWsTest { @Test diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java index 85c060b..e0dcd12 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java @@ -33,6 +33,8 @@ import org.apache.cxf.jaxws.service.AddNumbersImpl; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public class SEIWithJAXBAnnoTest extends AbstractJaxWsTest { String address = "local://localhost:9000/Hello"; diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SOAPBindingTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SOAPBindingTest.java index 978c332..2a033cf 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SOAPBindingTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SOAPBindingTest.java @@ -32,6 +32,11 @@ import org.apache.cxf.calculator.CalculatorPortType; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public class SOAPBindingTest extends AbstractJaxWsTest { private static final QName SERVICE_1 = diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SchemaFirstXmlConfigTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SchemaFirstXmlConfigTest.java index 37b2607..b79ea37 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SchemaFirstXmlConfigTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SchemaFirstXmlConfigTest.java @@ -27,6 +27,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.junit.Test; +import static org.junit.Assert.assertNotNull; public class SchemaFirstXmlConfigTest extends AbstractJaxWsTest { diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java index 461ee8a..5855f82 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java @@ -53,6 +53,13 @@ import org.apache.hello_world_soap_http.SOAPService; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public class ServiceImplTest extends AbstractJaxWsTest { private static final QName SERVICE_1 = diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java index 013fac2..6e8dff5 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java @@ -44,6 +44,9 @@ import org.apache.hello_world_soap_http.RPCLitGreeterImpl; import org.junit.Before; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class ServiceModelUtilsTest extends AbstractJaxWsTest { Message message; diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java index 4dae26c..b6e06fa 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java @@ -39,6 +39,8 @@ import org.apache.hello_world_soap_http.GreeterImpl; import org.junit.Before; import org.junit.Test; +import static org.junit.Assert.assertNotNull; + public class SoapFaultTest extends AbstractJaxWsTest { private Service service; diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchOpTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchOpTest.java index 0c4890f..50e9cca 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchOpTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchOpTest.java @@ -45,6 +45,9 @@ import org.apache.cxf.transport.Destination; import org.junit.Before; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class DispatchOpTest extends AbstractJaxWsTest { private final QName serviceName = new QName("http://cxf.apache.org/test/dispatch";, "DispatchTest"); diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java index 73606d9..5216db5 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java @@ -58,6 +58,11 @@ import org.apache.hello_world_soap_http.types.SayHiResponse; import org.junit.Before; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public class DispatchTest extends AbstractJaxWsTest { private final QName serviceName = new QName("http://apache.org/hello_world_soap_http";, "SOAPService"); diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/HeaderClientServerTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/HeaderClientServerTest.java index 9cd0505..f04f81c 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/HeaderClientServerTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/HeaderClientServerTest.java @@ -56,6 +56,9 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; public class HeaderClientServerTest extends AbstractJaxWsTest { private final QName serviceName = new QName("http://apache.org/header_test";, diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/ProviderHeaderClientServerTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/ProviderHeaderClientServerTest.java index c4120be..01cba44 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/ProviderHeaderClientServerTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/ProviderHeaderClientServerTest.java @@ -38,6 +38,9 @@ import org.apache.header_test.rpc.SOAPRPCHeaderService; import org.junit.Before; import org.junit.Test; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + public class ProviderHeaderClientServerTest extends AbstractJaxWsTest { @Before diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderTest.java index 8582de1..c3f57a8 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderTest.java @@ -35,6 +35,9 @@ import org.apache.cxf.transport.local.LocalTransportFactory; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class HolderTest extends AbstractJaxWsTest { private final String address = "local://localhost:9000/HolderService"; diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java index a07bf49..9fabe32 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java @@ -41,6 +41,10 @@ import org.apache.hello_world_soap_http.HWSoapMessageProvider; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + public class ProviderServiceFactoryTest extends AbstractJaxWsTest { @Test public void testFromWSDL() throws Exception { diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderTest.java index 46f7c5b..22e3bdc 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderTest.java @@ -26,6 +26,8 @@ import org.apache.cxf.transport.local.LocalTransportFactory; import org.junit.Test; +import static org.junit.Assert.assertNotNull; + public class ProviderTest extends AbstractJaxWsTest { @Test public void testInvocation() throws Exception { diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationInterceptorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationInterceptorTest.java index df9729f..69226df 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationInterceptorTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationInterceptorTest.java @@ -39,6 +39,9 @@ import org.apache.cxf.message.Message; import org.junit.Before; import org.junit.Test; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public class AnnotationInterceptorTest extends AbstractJaxWsTest { private ServerFactoryBean fb; diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spi/ProviderImplTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spi/ProviderImplTest.java index d4c1c36..a8edf32 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spi/ProviderImplTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spi/ProviderImplTest.java @@ -34,8 +34,10 @@ import org.apache.cxf.BusFactory; import org.junit.After; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; -public class ProviderImplTest extends org.junit.Assert { +public class ProviderImplTest { @org.junit.Test public void testCreateW3CEpr() throws Exception { diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java index 4d63a3a..0b3755c 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java @@ -59,6 +59,11 @@ import org.apache.ws.commons.schema.XmlSchemaElement; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + public class JaxWsServiceFactoryBeanTest extends AbstractJaxWsTest { @Test diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/AuthnRequestBuilderTest.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/AuthnRequestBuilderTest.java index 1ef17b3..8ead352 100644 --- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/AuthnRequestBuilderTest.java +++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/AuthnRequestBuilderTest.java @@ -41,10 +41,13 @@ import org.opensaml.saml.saml2.core.NameID; import org.opensaml.saml.saml2.core.NameIDPolicy; import org.opensaml.saml.saml2.core.RequestedAuthnContext; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * Some unit tests for the SamlpRequestComponentBuilder and AuthnRequestBuilder */ -public class AuthnRequestBuilderTest extends org.junit.Assert { +public class AuthnRequestBuilderTest { static { OpenSAMLUtil.initSamlEngine(); diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/CombinedValidatorTest.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/CombinedValidatorTest.java index 09c9cbc..64a21ab 100644 --- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/CombinedValidatorTest.java +++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/CombinedValidatorTest.java @@ -55,10 +55,14 @@ import org.opensaml.xmlsec.signature.KeyInfo; import org.opensaml.xmlsec.signature.Signature; import org.opensaml.xmlsec.signature.support.SignatureConstants; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + /** * Some unit tests for the SAMLProtocolResponseValidator and the SAMLSSOResponseValidator */ -public class CombinedValidatorTest extends org.junit.Assert { +public class CombinedValidatorTest { static { WSSConfig.init(); diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java index 5ed1f7b..2305a24 100644 --- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java +++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java @@ -56,10 +56,14 @@ import org.opensaml.xmlsec.signature.KeyInfo; import org.opensaml.xmlsec.signature.Signature; import org.opensaml.xmlsec.signature.support.SignatureConstants; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * Some unit tests for the SAMLProtocolResponseValidator. */ -public class SAMLResponseValidatorTest extends org.junit.Assert { +public class SAMLResponseValidatorTest { static { WSSConfig.init(); diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidatorTest.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidatorTest.java index b289c3f..180ecec 100644 --- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidatorTest.java +++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidatorTest.java @@ -55,10 +55,13 @@ import org.opensaml.xmlsec.signature.KeyInfo; import org.opensaml.xmlsec.signature.Signature; import org.opensaml.xmlsec.signature.support.SignatureConstants; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + /** * Some unit tests for the SAMLSSOResponseValidator. */ -public class SAMLSSOResponseValidatorTest extends org.junit.Assert { +public class SAMLSSOResponseValidatorTest { static { OpenSAMLUtil.initSamlEngine(); diff --git a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/RequestComponentBuilderTest.java b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/RequestComponentBuilderTest.java index abc87e9..1bf77e2 100644 --- a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/RequestComponentBuilderTest.java +++ b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/RequestComponentBuilderTest.java @@ -45,7 +45,7 @@ import org.opensaml.xacml.ctx.SubjectType; /** * Some unit tests to create a XACML Request using the RequestComponentBuilder. */ -public class RequestComponentBuilderTest extends org.junit.Assert { +public class RequestComponentBuilderTest { private DocumentBuilder docBuilder; static { diff --git a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/SamlRequestComponentBuilderTest.java b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/SamlRequestComponentBuilderTest.java index b4ac130..592ef8d 100644 --- a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/SamlRequestComponentBuilderTest.java +++ b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/SamlRequestComponentBuilderTest.java @@ -45,7 +45,7 @@ import org.opensaml.xacml.profile.saml.XACMLAuthzDecisionQueryType; /** * Some unit tests for creating a SAML XACML Request. */ -public class SamlRequestComponentBuilderTest extends org.junit.Assert { +public class SamlRequestComponentBuilderTest { private DocumentBuilder docBuilder; static { diff --git a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/XACMLAuthorizingInterceptorTest.java b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/XACMLAuthorizingInterceptorTest.java index 97aea6b..a6d61de 100644 --- a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/XACMLAuthorizingInterceptorTest.java +++ b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/XACMLAuthorizingInterceptorTest.java @@ -35,7 +35,7 @@ import org.apache.cxf.security.SecurityContext; /** * Some unit tests to test the AbstractXACMLAuthorizingInterceptor. */ -public class XACMLAuthorizingInterceptorTest extends org.junit.Assert { +public class XACMLAuthorizingInterceptorTest { static { org.apache.wss4j.common.saml.OpenSAMLUtil.initSamlEngine(); diff --git a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/XACMLRequestBuilderTest.java b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/XACMLRequestBuilderTest.java index 5030f7d..732a3bc 100644 --- a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/XACMLRequestBuilderTest.java +++ b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/XACMLRequestBuilderTest.java @@ -36,7 +36,7 @@ import org.opensaml.xacml.ctx.ResourceType; /** * Some unit tests to create a XACML Request via the XACMLRequestBuilder interface. */ -public class XACMLRequestBuilderTest extends org.junit.Assert { +public class XACMLRequestBuilderTest { static { org.apache.wss4j.common.saml.OpenSAMLUtil.initSamlEngine(); diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/https/CertConstraintsTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/https/CertConstraintsTest.java index 968be74..398255e 100644 --- a/rt/transports/http/src/test/java/org/apache/cxf/transport/https/CertConstraintsTest.java +++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/https/CertConstraintsTest.java @@ -32,7 +32,10 @@ import javax.xml.bind.Unmarshaller; import org.apache.cxf.configuration.security.CertificateConstraintsType; import org.apache.cxf.staxutils.StaxUtils; -public class CertConstraintsTest extends org.junit.Assert { +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +public class CertConstraintsTest { @org.junit.Test public void testCertConstraints() throws Exception { diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStoreTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStoreTest.java index 69b11a6..bc1efd4 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStoreTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStoreTest.java @@ -26,7 +26,11 @@ import org.apache.cxf.ws.security.SecurityConstants; import org.junit.BeforeClass; -public class EHCacheTokenStoreTest extends org.junit.Assert { +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +public class EHCacheTokenStoreTest { private static TokenStore store; diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/tokenstore/MemoryTokenStoreTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/tokenstore/MemoryTokenStoreTest.java index fc6d8c0..8337c93 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/tokenstore/MemoryTokenStoreTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/tokenstore/MemoryTokenStoreTest.java @@ -26,7 +26,12 @@ import org.apache.cxf.ws.security.SecurityConstants; import org.junit.BeforeClass; -public class MemoryTokenStoreTest extends org.junit.Assert { +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +public class MemoryTokenStoreTest { private static TokenStore store; diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java index 75258ba..0a6415b 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java @@ -78,6 +78,13 @@ import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.policy.SP12Constants; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public abstract class AbstractPolicySecurityTest extends AbstractSecurityTest { protected PolicyBuilder policyBuilder; diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java index 0cb8b11..9e0c6c8 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java @@ -45,7 +45,8 @@ import org.apache.wss4j.common.ConfigurationConstants; import org.junit.Test; - +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public class CryptoCoverageCheckerTest extends AbstractSecurityTest { diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomPolicyAlgorithmsTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomPolicyAlgorithmsTest.java index ef7eb63..4f4f0bb 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomPolicyAlgorithmsTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomPolicyAlgorithmsTest.java @@ -26,6 +26,9 @@ import org.apache.wss4j.policy.model.AsymmetricBinding; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class CustomPolicyAlgorithmsTest extends AbstractPolicySecurityTest { @Test diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java index 8f47a4c..0d35281 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java @@ -37,6 +37,7 @@ import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.junit.Test; +import static org.junit.Assert.assertEquals; /** * In these test-cases, the client is using DOM and the service is using StaX. The tests are diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java index b9cb8fd..b63d067 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java @@ -43,6 +43,9 @@ import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * In these test-cases, the client is using DOM and the service is using StaX. diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java index bb5cf78..54856a7 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java @@ -38,6 +38,7 @@ import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.junit.Test; +import static org.junit.Assert.assertEquals; /** * In these test-cases, the client is using DOM and the service is using StaX. The tests are diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DefaultCryptoCoverageCheckerTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DefaultCryptoCoverageCheckerTest.java index 0b856a0..0a87855 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DefaultCryptoCoverageCheckerTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DefaultCryptoCoverageCheckerTest.java @@ -36,6 +36,9 @@ import org.apache.wss4j.common.ConfigurationConstants; import org.junit.Test; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * Test the DefaultCryptoCoverageChecker, which extends the CryptoCoverageChecker to provide * an easier way to check to see if the SOAP (1.1 + 1.2) Body was signed and/or encrypted, if diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PluggablePolicyValidatorTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PluggablePolicyValidatorTest.java index fb74348..1f55398 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PluggablePolicyValidatorTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PluggablePolicyValidatorTest.java @@ -41,6 +41,9 @@ import org.apache.wss4j.policy.SP12Constants; import org.junit.Test; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + /** * A test for plugging in custom SecurityPolicy Validators */ diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java index 269396e..b99baae 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java @@ -28,6 +28,8 @@ import org.apache.wss4j.policy.SP12Constants; import org.junit.Test; +import static org.junit.Assert.fail; + public class PolicyBasedWss4JInOutTest extends AbstractPolicySecurityTest { @Test diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/RoundTripTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/RoundTripTest.java index 99686ac..d57a628 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/RoundTripTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/RoundTripTest.java @@ -34,6 +34,8 @@ import org.apache.wss4j.common.ConfigurationConstants; import org.junit.Before; import org.junit.Test; +import static org.junit.Assert.assertEquals; + public class RoundTripTest extends AbstractSecurityTest { private WSS4JInInterceptor wsIn; private WSS4JOutInterceptor wsOut; diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java index e4c3444..64706e4 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java @@ -42,6 +42,9 @@ import org.apache.wss4j.dom.handler.WSHandlerResult; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; /** * Some tests for configuring outbound security using SecurityActionTokens. diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java index 2059e78..de00bd1 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java @@ -41,6 +41,9 @@ import org.apache.wss4j.common.ConfigurationConstants; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * This a test of the Signature Confirmation functionality that is contained in the * WS-Security 1.1 specification. The requestor signs an outbound SOAP message and saves diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageCheckerTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageCheckerTest.java index 52cb31c..32d16f7 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageCheckerTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageCheckerTest.java @@ -41,6 +41,8 @@ import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; /** * A test for streaming WS-Security with the Crypto Coverage Checker installed diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripActionTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripActionTest.java index 69b98c1..c7491d7 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripActionTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripActionTest.java @@ -45,6 +45,10 @@ import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * Test StaX Security actions on the inbound side */ diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java index c6f7522..736fe1b 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java @@ -51,6 +51,9 @@ import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** */ diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java index 640f983..f4b82c6 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java @@ -42,6 +42,7 @@ import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.junit.Test; +import static org.junit.Assert.assertEquals; /** * In these test-cases, the client is using StaX and the service is using DOM. The tests are diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java index 0536242..caf22a7 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java @@ -47,6 +47,9 @@ import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * In these test-cases, the client is using StaX and the service is using DOM. diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java index f4e60bb..320da87 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java @@ -42,6 +42,7 @@ import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.junit.Test; +import static org.junit.Assert.assertEquals; /** * In these test-cases, the client is using StaX and the service is using DOM. The tests are diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java index a49456e..572628d 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java @@ -40,6 +40,9 @@ import org.apache.wss4j.common.WSS4JConstants; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + public class UserNameTokenAuthorizationTest extends AbstractSecurityTest { private SimpleSubjectCreatingInterceptor wsIn; private WSS4JOutInterceptor wsOut; diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java index 48df80c..821d9c8 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java @@ -43,6 +43,8 @@ import org.apache.wss4j.common.WSS4JConstants; import org.junit.Test; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * A number of tests for fault codes that are thrown from WSS4JInInterceptor. diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java index ca81e7e..9b9ee5e 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java @@ -62,6 +62,11 @@ import org.apache.wss4j.dom.handler.WSHandlerResult; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * Ensures that the signature round trip process works. diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java index 4f7d0e3..fef8ef2 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java @@ -39,6 +39,8 @@ import org.apache.wss4j.dom.handler.WSHandler; import org.junit.Test; +import static org.junit.Assert.assertEquals; + public class WSS4JOutInterceptorTest extends AbstractSecurityTest { @Test diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java index 8a3601a..c6c6388 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java @@ -45,6 +45,8 @@ import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; /** * In these test-cases, the client is using DOM and the service is using StaX. diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java index eb69724..c7207bf 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java @@ -35,6 +35,8 @@ import org.apache.wss4j.policy.SP12Constants; import org.junit.Test; +import static org.junit.Assert.fail; + /** * A test for using SAML Assertions via WS-SecurityPolicy expressions. */ diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java index 820ec9e..51a80d2 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java @@ -61,6 +61,12 @@ import org.apache.wss4j.dom.handler.WSHandlerResult; import org.junit.Test; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * Some tests for creating and processing (signed) SAML Assertions. */ diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java index f47c3de..7b92ba7 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java @@ -52,6 +52,8 @@ import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; /** * In these test-cases, the client is using StaX and the service is using DOM. diff --git a/services/xkms/xkms-client/src/test/java/org/apache/cxf/xkms/cache/XKMSClientCacheTest.java b/services/xkms/xkms-client/src/test/java/org/apache/cxf/xkms/cache/XKMSClientCacheTest.java index 9a02fb5..e5dcaba 100644 --- a/services/xkms/xkms-client/src/test/java/org/apache/cxf/xkms/cache/XKMSClientCacheTest.java +++ b/services/xkms/xkms-client/src/test/java/org/apache/cxf/xkms/cache/XKMSClientCacheTest.java @@ -25,10 +25,15 @@ import java.security.cert.X509Certificate; import org.apache.cxf.common.classloader.ClassLoaderUtils; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * A test for the XKMSClientCache */ -public class XKMSClientCacheTest extends org.junit.Assert { +public class XKMSClientCacheTest { private final XKMSClientCache cache; private final X509Certificate alice;
