You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/12/29 20:08:46 UTC
[cxf] branch master updated (1a321e2 -> 33fc044)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 1a321e2 CXF-7889: ensure all samples from CXF kit can work with JDK11 OOTB. Updating jax_rs/tracing_opentracing_osgi README.txt
new 6228a70 Stop extending Assert in sts-core
new 1e3f132 More work on removing extending assert
new 5d164a2 Adding static junit imports
new 81cd495 Finished removing asserts
new 33fc044 Checkstyle fix
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../test/java/org/apache/cxf/BusFactoryTest.java | 7 ++++---
.../cxf/attachment/AttachmentDeserializerTest.java | 8 ++++++--
.../cxf/attachment/AttachmentSerializerTest.java | 8 +++++---
.../apache/cxf/attachment/AttachmentUtilTest.java | 7 ++++---
.../java/org/apache/cxf/bus/CXFBusImplTest.java | 9 +++++---
.../cxf/bus/extension/ExtensionManagerTest.java | 9 +++++---
.../apache/cxf/bus/extension/ExtensionTest.java | 10 +++++++--
.../extension/TextExtensionFragmentParserTest.java | 9 +++++---
.../managers/EndpointResolverRegistryImplTest.java | 11 +++++++---
.../cxf/bus/managers/ServerRegistryImpTest.java | 7 ++++---
.../ServiceContractResolverRegistryImplTest.java | 12 ++++++++---
.../apache/cxf/bus/osgi/OSGiBusListenerTest.java | 7 ++++---
.../cxf/bus/spring/BusApplicationContextTest.java | 8 +++++---
.../cxf/bus/spring/BusApplicationListenerTest.java | 3 +--
.../cxf/bus/spring/BusDefinitionParserTest.java | 8 +++++---
.../cxf/bus/spring/SpringBusFactoryTest.java | 11 +++++++---
.../buslifecycle/CXFBusLifeCycleManagerTest.java | 3 +--
.../common/annotation/AnnotationProcessorTest.java | 6 +++---
.../common/classloader/ClassLoaderUtilsTest.java | 7 ++++---
.../apache/cxf/common/i18n/BundleUtilsTest.java | 8 +++++---
.../org/apache/cxf/common/i18n/MessageTest.java | 9 +++++---
.../cxf/common/injection/ResourceInjectorTest.java | 9 +++++---
.../org/apache/cxf/common/jaxb/JAXBUtilsTest.java | 7 ++++---
.../apache/cxf/common/logging/LogUtilsTest.java | 8 +++++---
.../cxf/common/logging/RegexLoggingFilterTest.java | 7 ++++---
.../cxf/common/security/SimpleGroupTest.java | 9 +++++---
.../cxf/common/security/SimplePrincipalTest.java | 8 +++++---
.../org/apache/cxf/common/util/ASMHelperTest.java | 7 ++++---
.../apache/cxf/common/util/Base64UtilityTest.java | 10 ++++++---
.../apache/cxf/common/util/ClassHelperTest.java | 5 +++--
.../cxf/common/util/CollectionUtilsTest.java | 11 +++++++---
.../apache/cxf/common/util/PackageUtilsTest.java | 7 ++++---
.../cxf/common/util/PropertiesLoaderUtilsTest.java | 8 +++++---
.../apache/cxf/common/util/PropertyUtilsTest.java | 8 +++++---
.../apache/cxf/common/util/StringUtilsTest.java | 9 +++++---
.../apache/cxf/common/util/URIParserUtilsTest.java | 8 +++++---
.../org/apache/cxf/common/util/UrlUtilsTest.java | 9 +++++---
.../common/util/XmlSchemaPrimitiveUtilsTest.java | 7 ++++---
.../cxf/common/xmlschema/ImportRepairTest.java | 7 ++++---
.../configuration/spring/ConfigurerImplTest.java | 9 +++++---
.../SuspendedInvocationExceptionTest.java | 8 +++++---
.../cxf/databinding/AbstractDataBindingTest.java | 3 +--
.../source/XMLStreamDataReaderTest.java | 8 +++++---
.../org/apache/cxf/endpoint/EndpointImplTest.java | 8 +++++---
.../java/org/apache/cxf/helpers/FileUtilsTest.java | 7 ++++---
.../java/org/apache/cxf/helpers/IOUtilsTest.java | 9 +++++---
.../java/org/apache/cxf/helpers/NameSpaceTest.java | 10 ++++++---
.../org/apache/cxf/helpers/ServiceUtilsTest.java | 9 +++++---
.../cxf/interceptor/LoggingInInterceptorTest.java | 7 ++++---
.../cxf/interceptor/LoggingOutInterceptorTest.java | 10 ++++++---
.../interceptor/OutgoingChainInterceptorTest.java | 3 +--
.../interceptor/ServiceInvokerInterceptorTest.java | 9 +++++---
.../security/DefaultSecurityContextTest.java | 10 ++++++---
.../security/NamePasswordCallbackHandlerTest.java | 8 +++++---
.../RolePrefixSecurityContextImplTest.java | 10 ++++++---
.../security/SecureAnnotationsInterceptorTest.java | 3 +--
.../security/SimpleAuthorizingInterceptorTest.java | 3 +--
.../cxf/internal/CXFAPINamespaceHandlerTest.java | 7 ++++---
.../org/apache/cxf/io/CachedOutputStreamTest.java | 6 +++++-
.../org/apache/cxf/io/CachedStreamTestBase.java | 10 ++++++---
.../cxf/phase/PhaseInterceptorChainTest.java | 10 ++++++---
.../cxf/resource/ClassLoaderResolverTest.java | 9 +++++---
.../cxf/resource/DefaultResourceManagerTest.java | 10 ++++++---
.../org/apache/cxf/resource/URIResolverTest.java | 9 ++++++--
.../cxf/service/model/BindingFaultInfoTest.java | 9 +++++---
.../cxf/service/model/BindingMessageInfoTest.java | 9 +++++---
.../service/model/BindingOperationInfoTest.java | 10 ++++++---
.../apache/cxf/service/model/FaultInfoTest.java | 7 ++++---
.../cxf/service/model/InterfaceInfoTest.java | 8 +++++---
.../apache/cxf/service/model/MessageInfoTest.java | 7 ++++---
.../cxf/service/model/MessagePartInfoTest.java | 10 ++++++---
.../cxf/service/model/OperationInfoTest.java | 12 ++++++++---
.../DepthRestrictingStreamReaderTest.java | 7 ++++---
.../cxf/staxutils/DepthXMLStreamReaderTest.java | 8 +++++---
.../cxf/staxutils/FragmentStreamReaderTest.java | 8 +++++---
.../cxf/staxutils/PartialXMLStreamReaderTest.java | 7 ++++---
.../PropertiesExpandingStreamReaderTest.java | 7 ++++---
.../apache/cxf/staxutils/StaxStreamFilterTest.java | 7 ++++---
.../cxf/staxutils/W3CDOMStreamReaderTest.java | 6 ++++--
.../transform/DelegatingNamespaceContextTest.java | 11 +++++++---
.../staxutils/transform/InTransformReaderTest.java | 8 +++++---
.../transform/OutTransformWriterTest.java | 9 +++++---
.../cxf/transport/ChainInitiationObserverTest.java | 7 ++++---
.../apache/cxf/transport/HttpUriMapperTest.java | 7 ++++---
.../common/gzip/GZIPAcceptEncodingTest.java | 7 ++++---
.../java/org/apache/cxf/version/VersionTest.java | 8 +++++---
.../cxf/workqueue/AutomaticWorkQueueTest.java | 10 ++++++---
.../core/classloader/FireWallClassLoaderTest.java | 9 +++++---
.../core/classloader/PlugInClassLoaderTest.java | 11 +++++++---
.../cxf/jca/core/logging/LoggerHelperTest.java | 10 ++++++---
.../cxf/jca/core/resourceadapter/HandlerTest.java | 8 +++++---
.../ManagedConnectionFactoryImplTest.java | 11 +++++++---
.../resourceadapter/ManagedConnectionImplTest.java | 9 +++++---
.../ResourceAdapterInternalExceptionTest.java | 9 +++++---
.../jca/core/resourceadapter/ResourceBeanTest.java | 3 +--
.../core/resourceadapter/UriHandlerInitTest.java | 8 +++++---
...AssociatedManagedConnectionFactoryImplTest.java | 6 +++++-
.../cxf/jca/cxf/CXFConnectionRequestInfoTest.java | 7 ++++---
.../cxf/jca/cxf/ConnectionFactoryImplTest.java | 10 ++++++---
.../org/apache/cxf/jca/cxf/JCABusFactoryTest.java | 6 +++++-
.../jca/cxf/ManagedConnectionFactoryImplTest.java | 9 ++++++--
.../cxf/jca/cxf/ManagedConnectionImplTest.java | 6 +++++-
.../cxf/jca/cxf/ManagedConnectionTestBase.java | 3 +--
.../cxf/jca/cxf/ResourceAdapterImplTest.java | 11 +++++++---
.../handlers/AbstractInvocationHandlerTest.java | 5 ++++-
.../cxf/jca/cxf/handlers/HandlerTestBase.java | 7 ++++---
.../cxf/handlers/InvocationHandlerFactoryTest.java | 8 +++++++-
.../handlers/InvokingInvocationHandlerTest.java | 4 +++-
.../ObjectMethodInvocationHandlerTest.java | 4 +++-
.../cxf/handlers/ProxyInvocationHandlerTest.java | 3 ++-
.../apache/cxf/jca/jarloader/JarLoaderTest.java | 8 +++++---
.../apache/cxf/jca/servant/EJBEndpointTest.java | 7 ++++---
.../cxf/jca/servant/EJBServantConfigTest.java | 8 +++++---
.../binding/coloc/ColocMessageObserverTest.java | 8 +++++---
.../cxf/binding/coloc/ColocOutInterceptorTest.java | 10 ++++++---
.../apache/cxf/binding/coloc/ColocUtilTest.java | 9 +++++---
.../blueprint/ColocBPNamespaceHandlerTest.java | 7 ++++---
.../cxf/binding/corba/CorbaBindingFactoryTest.java | 9 +++++---
.../apache/cxf/binding/corba/CorbaBindingTest.java | 5 +++--
.../apache/cxf/binding/corba/CorbaConduitTest.java | 8 +++++---
.../cxf/binding/corba/CorbaDestinationTest.java | 5 +++--
.../apache/cxf/binding/corba/CorbaMessageTest.java | 8 +++++---
.../cxf/binding/corba/CorbaServerConduitTest.java | 9 +++++---
.../apache/cxf/binding/corba/CorbaTypeMapTest.java | 5 +++--
.../binding/corba/runtime/CorbaDSIServantTest.java | 5 +----
.../corba/runtime/CorbaObjectReaderTest.java | 9 +++++---
.../corba/runtime/CorbaObjectWriterTest.java | 8 +++++---
.../corba/runtime/CorbaStreamReaderTest.java | 7 ++++---
.../corba/runtime/CorbaStreamWriterTest.java | 7 ++++---
.../binding/corba/runtime/CorbaStreamableTest.java | 9 +++++---
.../binding/corba/types/CorbaAnyHandlerTest.java | 9 +++++---
.../binding/corba/types/CorbaArrayHandlerTest.java | 8 +++++---
.../binding/corba/types/CorbaEnumHandlerTest.java | 8 +++++---
.../binding/corba/types/CorbaFixedHandlerTest.java | 8 +++++---
.../binding/corba/types/CorbaHandlerUtilsTest.java | 8 +++++---
.../corba/types/CorbaObjectHandlerTest.java | 9 +++++---
.../corba/types/CorbaPrimitiveHandlerTest.java | 8 +++++---
.../corba/types/CorbaSequenceHandlerTest.java | 8 +++++---
.../corba/types/CorbaStructHandlerTest.java | 8 +++++---
.../cxf/binding/corba/utils/ContextUtilsTest.java | 6 +++---
.../cxf/binding/corba/utils/CorbaUtilsTest.java | 9 +++++---
.../soap/MustUnderstandInterceptorTest.java | 6 +++++-
.../cxf/binding/soap/RPCInInterceptorTest.java | 5 ++++-
.../cxf/binding/soap/RPCOutInterceptorTest.java | 5 ++++-
.../binding/soap/ReadHeaderInterceptorTest.java | 8 +++++++-
.../cxf/binding/soap/ServiceModelUtilTest.java | 8 +++++---
.../binding/soap/SoapActionInterceptorTest.java | 9 +++++---
.../cxf/binding/soap/SoapBindingFactoryTest.java | 9 +++++---
.../apache/cxf/binding/soap/SoapBindingTest.java | 9 +++++---
.../cxf/binding/soap/SoapOutInterceptorTest.java | 5 ++++-
.../java/org/apache/cxf/binding/soap/TestBase.java | 7 ++++---
.../soap/blueprint/SoapBindingBPHandlerTest.java | 7 ++++---
.../interceptor/ReadHeadersInterceptorTest.java | 9 +++++---
.../interceptor/SoapActionInInterceptorTest.java | 8 +++++---
.../soap/interceptor/SoapFaultSerializerTest.java | 9 +++++---
.../SoapPreProtocolOutInterceptorTest.java | 9 +++++---
.../soap/jms/interceptor/SoapFaultFactoryTest.java | 9 +++++---
.../cxf/binding/soap/saaj/ParseBodyTest.java | 7 ++++---
.../binding/soap/saaj/SAAJInInterceptorTest.java | 5 ++++-
.../cxf/binding/xml/XMLBindingFactoryTest.java | 7 ++++---
.../cxf/binding/xml/interceptor/TestBase.java | 7 ++++---
.../xml/interceptor/XMLFaultInterceptorsTest.java | 5 ++++-
.../interceptor/XMLFaultOutInterceptorTest.java | 4 +++-
.../interceptor/XMLMessageInInterceptorTest.java | 5 ++++-
.../interceptor/XMLMessageOutInterceptorTest.java | 4 +++-
.../cxf/aegis/client/ClientServiceConfigTest.java | 4 +++-
.../apache/cxf/aegis/exception/ExceptionTest.java | 4 +++-
.../inheritance/ExceptionInheritanceTest.java | 5 ++++-
.../inheritance/intf/InterfaceInheritanceTest.java | 6 +++++-
.../cxf/aegis/integration/DOMMappingTest.java | 2 ++
.../aegis/integration/SchemaValidationTest.java | 6 +++++-
.../apache/cxf/aegis/integration/WrappedTest.java | 4 +++-
.../cxf/aegis/namespaces/ExplicitPrefixTest.java | 5 ++++-
.../aegis/namespaces/NamespaceConfusionTest.java | 5 ++++-
.../cxf/aegis/override/OverrideTypeTest.java | 6 +++++-
.../java/org/apache/cxf/aegis/proxy/ProxyTest.java | 4 +++-
.../cxf/aegis/standalone/SchemaAddinsTest.java | 6 ++++--
.../apache/cxf/aegis/type/array/FlatArrayTest.java | 6 +++++-
.../org/apache/cxf/aegis/type/basic/BeanTest.java | 8 +++++++-
.../cxf/aegis/type/basic/DateTimezoneTest.java | 5 ++++-
.../cxf/aegis/type/basic/DynamicProxyTest.java | 8 +++++++-
.../aegis/type/encoded/AbstractEncodedTest.java | 6 +++++-
.../cxf/aegis/type/encoded/ArrayTypeInfoTest.java | 24 ++++++++++++++--------
.../cxf/aegis/type/encoded/SoapArrayTypeTest.java | 4 ++++
.../cxf/aegis/type/encoded/StructTypeTest.java | 7 ++++++-
.../cxf/aegis/type/java5/AnnotatedTypeTest.java | 7 ++++++-
.../org/apache/cxf/aegis/type/java5/ClassTest.java | 4 +++-
.../cxf/aegis/type/java5/CollectionTest.java | 7 ++++++-
.../type/java5/CollectionTestsWithService.java | 6 +++++-
.../cxf/aegis/type/java5/ConfigurationTest.java | 6 +++++-
.../cxf/aegis/type/java5/DualOutServiceTest.java | 4 +++-
.../apache/cxf/aegis/type/java5/EnumTypeTest.java | 6 +++++-
.../apache/cxf/aegis/type/java5/JaxbTypeTest.java | 7 ++++++-
.../org/apache/cxf/aegis/type/java5/MapTest.java | 6 +++++-
.../cxf/aegis/type/java5/OperationNSTest.java | 4 +++-
.../apache/cxf/aegis/type/java5/XFireTypeTest.java | 5 +++++
.../aegis/type/java5/XFireXmlParamTypeTest.java | 3 +++
.../cxf/aegis/type/java5/XmlParamTypeTest.java | 5 ++++-
.../cxf/aegis/type/java5/map/StudentTest.java | 5 ++++-
.../org/apache/cxf/aegis/type/map/MapsTest.java | 8 +++++++-
.../type/streams/XMLStreamReaderMappingTest.java | 5 ++++-
.../org/apache/cxf/aegis/xml/stax/ReaderTest.java | 6 +++++-
.../apache/cxf/aegis/xmlconfig/NillableTest.java | 4 +++-
.../org/apache/cxf/doclitbare/DocLitBareTest.java | 5 ++++-
.../org/apache/cxf/jaxb/BareInInterceptorTest.java | 8 +++++---
.../apache/cxf/jaxb/BareOutInterceptorTest.java | 5 ++++-
.../jaxb/DataBindingMarshallerPropertiesTest.java | 4 +++-
.../cxf/jaxb/DocLiteralInInterceptorTest.java | 8 +++++---
.../org/apache/cxf/jaxb/JAXBDataBindingTest.java | 11 +++++++---
.../apache/cxf/jaxb/JAXBEncoderDecoderTest.java | 11 +++++++---
.../java/org/apache/cxf/jaxb/JAXBUtilsTest.java | 9 +++++---
.../org/apache/cxf/jaxb/JAXBWrapperHelperTest.java | 9 +++++---
.../test/java/org/apache/cxf/jaxb/TestBase.java | 3 +--
.../test/java/org/apache/cxf/jaxb/UtilsTest.java | 7 ++++---
.../cxf/jaxb/io/XMLStreamDataReaderTest.java | 11 +++++++---
.../cxf/jaxb/io/XMLStreamDataWriterTest.java | 11 +++++++---
.../ClusteringBPNamespaceHandlerTest.java | 7 ++++---
.../cxf/jaxrs/JAXRSServerFactoryBeanTest.java | 9 +++++---
.../cxf/jaxrs/JAXRSServiceFactoryBeanTest.java | 12 ++++++++---
.../cxf/jaxrs/SelectMethodCandidatesTest.java | 9 +++++---
.../blueprint/JAXRSBPNamespaceHandlerTest.java | 7 ++++---
.../cxf/jaxrs/ext/MessageContextImplTest.java | 10 ++++++---
.../org/apache/cxf/jaxrs/ext/form/FormTest.java | 7 ++++---
.../cxf/jaxrs/ext/multipart/AttachmentTest.java | 7 ++++---
.../ext/multipart/ContentDispositionTest.java | 7 ++++---
.../cxf/jaxrs/ext/multipart/MultipartBodyTest.java | 8 +++++---
.../apache/cxf/jaxrs/ext/xml/XMLSourceTest.java | 12 ++++++++---
.../cxf/jaxrs/impl/AsyncResponseImplTest.java | 8 +++++---
.../jaxrs/impl/CacheControlHeaderProviderTest.java | 8 +++++---
.../cxf/jaxrs/impl/ConfigurationImplTest.java | 10 ++++++---
.../cxf/jaxrs/impl/CookieHeaderProviderTest.java | 8 +++++---
.../cxf/jaxrs/impl/DateHeaderProviderTest.java | 7 ++++---
.../jaxrs/impl/EntityTagHeaderProviderTest.java | 8 +++++---
.../apache/cxf/jaxrs/impl/HttpHeadersImplTest.java | 10 ++++++---
.../apache/cxf/jaxrs/impl/LinkBuilderImplTest.java | 10 ++++++---
.../cxf/jaxrs/impl/LinkHeaderProviderTest.java | 7 ++++---
.../jaxrs/impl/MediaTypeHeaderProviderTest.java | 8 +++++---
.../org/apache/cxf/jaxrs/impl/MetadataMapTest.java | 11 +++++++---
.../jaxrs/impl/NewCookieHeaderProviderTest.java | 9 +++++---
.../apache/cxf/jaxrs/impl/PathSegmentImplTest.java | 7 ++++---
.../org/apache/cxf/jaxrs/impl/RequestImplTest.java | 10 ++++++---
.../cxf/jaxrs/impl/RequestPreprocessorTest.java | 7 ++++---
.../cxf/jaxrs/impl/ResponseBuilderImplTest.java | 11 +++++++---
.../apache/cxf/jaxrs/impl/ResponseImplTest.java | 11 ++++++++--
.../cxf/jaxrs/impl/RuntimeDelegateImplTest.java | 7 ++++---
.../cxf/jaxrs/impl/SecurityContextImplTest.java | 7 ++++---
.../apache/cxf/jaxrs/impl/UriBuilderImplTest.java | 8 +++++---
.../org/apache/cxf/jaxrs/impl/UriInfoImplTest.java | 7 ++++---
.../cxf/jaxrs/impl/VariantListBuilderImplTest.java | 8 +++++---
.../lifecycle/PerRequestResourceProviderTest.java | 8 +++++---
.../cxf/jaxrs/model/ClassResourceInfoTest.java | 12 ++++++++---
.../cxf/jaxrs/model/OperationResourceInfoTest.java | 7 ++++---
.../apache/cxf/jaxrs/model/URITemplateTest.java | 10 ++++++---
.../cxf/jaxrs/model/doc/JavaDocProviderTest.java | 8 +++++---
.../cxf/jaxrs/provider/BinaryDataProviderTest.java | 8 +++++---
.../cxf/jaxrs/provider/DataSourceProviderTest.java | 7 ++++---
.../jaxrs/provider/FormEncodingProviderTest.java | 9 +++++---
.../jaxrs/provider/JAXBElementProviderTest.java | 12 ++++++++---
.../jaxrs/provider/PrimitiveTextProviderTest.java | 9 +++++---
.../cxf/jaxrs/provider/ProviderFactoryTest.java | 13 +++++++++---
.../provider/RequestDispatcherProviderTest.java | 8 +++++---
.../cxf/jaxrs/provider/SourceProviderTest.java | 9 +++++---
.../cxf/jaxrs/provider/XPathProviderTest.java | 10 ++++++---
.../cxf/jaxrs/provider/XSLTJaxbProviderTest.java | 8 +++++---
.../security/JAASAuthenticationFilterTest.java | 8 +++++---
.../jaxrs/spring/JAXRSServerFactoryBeanTest.java | 9 +++++---
.../jaxrs/spring/SpringResourceFactoryTest.java | 9 +++++---
.../cxf/jaxrs/utils/AnnotationTestUtilsTest.java | 9 +++++---
.../apache/cxf/jaxrs/utils/ExceptionUtilsTest.java | 7 ++++---
.../org/apache/cxf/jaxrs/utils/FormUtilsTest.java | 7 ++++---
.../org/apache/cxf/jaxrs/utils/HttpUtilsTest.java | 9 +++++---
.../apache/cxf/jaxrs/utils/InjectionUtilsTest.java | 10 ++++++---
.../org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 13 +++++++++---
.../apache/cxf/jaxrs/utils/ResourceUtilsTest.java | 10 ++++++---
.../java/org/apache/cxf/jaxws/CodeFirstTest.java | 4 ++++
.../org/apache/cxf/jaxws/CodeFirstWSDLTest.java | 5 +++++
.../apache/cxf/jaxws/ConfiguredEndpointTest.java | 9 +++++---
.../org/apache/cxf/jaxws/EndpointImplTest.java | 7 +++++++
.../apache/cxf/jaxws/EndpointReferenceTest.java | 5 +++++
.../java/org/apache/cxf/jaxws/GreeterTest.java | 3 +++
.../test/java/org/apache/cxf/jaxws/HeaderTest.java | 3 +++
.../apache/cxf/jaxws/JAXWSMethodInvokerTest.java | 12 +++++++++--
.../java/org/apache/cxf/jaxws/JaxWsClientTest.java | 14 ++++++++++---
.../cxf/jaxws/JaxWsServerFactoryBeanTest.java | 5 +++++
.../org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java | 2 ++
.../java/org/apache/cxf/jaxws/SOAPBindingTest.java | 5 +++++
.../apache/cxf/jaxws/SchemaFirstXmlConfigTest.java | 1 +
.../java/org/apache/cxf/jaxws/ServiceImplTest.java | 7 +++++++
.../apache/cxf/jaxws/ServiceModelUtilsTest.java | 3 +++
.../java/org/apache/cxf/jaxws/SoapFaultTest.java | 2 ++
.../cxf/jaxws/WrapperClassGeneratorTest.java | 7 ++++---
.../blueprint/JAXWSBPNamespaceHandlerTest.java | 7 ++++---
.../jaxws/context/WebServiceContextImplTest.java | 9 +++++---
.../cxf/jaxws/context/WrappedAttachmentsTest.java | 9 +++++---
.../jaxws/context/WrappedMessageContextTest.java | 10 ++++++---
.../apache/cxf/jaxws/dispatch/DispatchOpTest.java | 3 +++
.../apache/cxf/jaxws/dispatch/DispatchTest.java | 5 +++++
.../AbstractProtocolHandlerInterceptorTest.java | 6 +++---
.../handler/AnnotationHandlerChainBuilderTest.java | 8 +++++---
.../cxf/jaxws/handler/HandlerChainBuilderTest.java | 12 ++++++++---
.../cxf/jaxws/handler/HandlerChainInvokerTest.java | 11 +++++++---
.../handler/InitParamResourceResolverTest.java | 7 ++++---
.../handler/LogicalHandlerInterceptorTest.java | 6 +++---
.../cxf/jaxws/handler/LogicalMessageImplTest.java | 8 +++++---
.../handler/soap/SOAPHandlerInterceptorTest.java | 8 +++++---
.../cxf/jaxws/header/HeaderClientServerTest.java | 3 +++
.../header/ProviderHeaderClientServerTest.java | 3 +++
.../org/apache/cxf/jaxws/holder/HolderTest.java | 3 +++
.../jaxws/provider/ProviderServiceFactoryTest.java | 4 ++++
.../apache/cxf/jaxws/provider/ProviderTest.java | 2 ++
.../jaxws/service/AnnotationInterceptorTest.java | 3 +++
.../org/apache/cxf/jaxws/spi/ProviderImplTest.java | 4 +++-
.../apache/cxf/jaxws/spring/SpringBeansTest.java | 13 +++++++++---
.../support/ContextPropertiesMappingTest.java | 10 ++++++---
.../jaxws/support/JaxWsImplementorInfoTest.java | 9 +++++---
.../support/JaxWsServiceConfigurationTest.java | 10 ++++++---
.../jaxws/support/JaxWsServiceFactoryBeanTest.java | 5 +++++
.../apache/cxf/jaxws/ws/PolicyAnnotationTest.java | 9 +++++---
.../http_jaxws_spi/HttpHandlerImplTest.java | 3 +--
.../JAXWSHttpSpiDestinationTest.java | 8 +++++---
.../JAXWSHttpSpiTransportFactoryTest.java | 8 +++++---
.../cxf/js/rhino/AbstractDOMProviderTest.java | 8 +++++---
.../apache/cxf/js/rhino/ProviderFactoryTest.java | 9 +++++---
.../org/apache/cxf/js/rhino/ServerAppTest.java | 10 ++++++---
.../blueprint/SimpleBPNamespaceHandlerTest.java | 7 ++++---
.../frontend/soap/SoapBindingSelectionTest.java | 6 +++++-
.../spring/AbstractSimpleFrontendSpringTest.java | 3 +--
.../cxf/frontend/spring/ClientServerTest.java | 6 +++++-
.../cxf/frontend/spring/SpringBeansTest.java | 7 ++++++-
.../cxf/service/factory/ClientFactoryBeanTest.java | 6 +++++-
.../factory/ReflectionServiceFactoryTest.java | 7 ++++++-
.../apache/cxf/service/factory/RountripTest.java | 4 +++-
.../cxf/service/factory/ServerFactoryTest.java | 5 ++++-
.../java/org/apache/cxf/javascript/AegisTest.java | 7 ++++++-
.../java/org/apache/cxf/javascript/AnyTest.java | 7 ++++++-
.../cxf/javascript/BasicNameManagerTest.java | 7 ++++---
.../cxf/javascript/DocLitBareClientTest.java | 6 +++++-
.../cxf/javascript/DocLitWrappedClientTest.java | 8 +++++++-
.../apache/cxf/javascript/GreeterClientTest.java | 6 +++++-
.../apache/cxf/javascript/JavascriptRhinoTest.java | 4 +++-
.../apache/cxf/javascript/JsHttpRequestTest.java | 6 +++++-
.../java/org/apache/cxf/javascript/MtoMTest.java | 7 ++++++-
.../apache/cxf/javascript/QueryHandlerTest.java | 6 +++++-
.../org/apache/cxf/javascript/RPCClientTest.java | 6 +++++-
.../apache/cxf/javascript/types/AttributeTest.java | 5 ++++-
.../cxf/javascript/types/SerializationTest.java | 7 ++++++-
.../cxf/management/InstrumentationManagerTest.java | 11 +++++++---
.../management/counters/CounterRepositoryTest.java | 8 +++++---
.../AbstractMessageResponseTestBase.java | 4 +---
.../ResponseTimeMessageInInterceptorTest.java | 4 +++-
.../cxf/management/jmx/BusRegistrationTest.java | 9 +++++---
.../jmx/JMXManagedComponentManagerTest.java | 8 +++++---
.../cxf/management/jmx/MBServerConnectorTest.java | 7 ++++---
.../jmx/export/ModelMBeanAssemblerTest.java | 6 +++---
.../management/utils/ManagementConsoleTest.java | 8 +++++---
.../jaxrs/client/JAXRSClientFactoryBeanTest.java | 8 ++++++--
.../org/apache/cxf/jaxrs/client/WebClientTest.java | 10 ++++++---
.../blueprint/JAXRSBPNamespaceHandlerTest.java | 7 ++++---
.../cxf/jaxrs/client/cache/ClientCacheTest.java | 8 +++++---
.../apache/cxf/jaxrs/client/cache/ClientTest.java | 8 +++++---
.../cxf/jaxrs/client/spec/ClientImplTest.java | 9 +++++---
.../jaxrs/client/spec/ClientRequestFilterTest.java | 7 ++++---
.../client/spec/InvocationBuilderImplTest.java | 9 +++++---
.../client/spring/JAXRSClientFactoryBeanTest.java | 8 +++++---
.../cxf/jaxrs/swagger/Swagger2FeatureTest.java | 8 +++++---
.../SwaggerToOpenApiConversionUtilsTest.java | 11 +++++++---
.../jaxrs/swagger/parse/SwaggerParseUtilsTest.java | 9 +++++---
.../model/wadl/ServerProviderFactoryTest.java | 9 +++++---
.../jaxrs/model/wadl/WadlGeneratorJsonTest.java | 8 +++++---
.../cxf/jaxrs/model/wadl/WadlGeneratorTest.java | 11 +++++++---
.../json/basic/JsonMapObjectReaderWriterTest.java | 8 +++++---
.../cxf/jaxrs/provider/ProviderFactoryAllTest.java | 8 +++++---
.../provider/aegis/AegisElementProviderTest.java | 8 +++++---
.../jaxrs/provider/atom/AtomEntryProviderTest.java | 9 +++++---
.../jaxrs/provider/atom/AtomFeedProviderTest.java | 9 +++++---
.../jaxrs/provider/atom/AtomPojoProviderTest.java | 10 ++++++---
.../jaxrs/provider/dom4j/DOM4JProviderTest.java | 9 +++++---
.../cxf/jaxrs/provider/json/JSONProviderTest.java | 11 +++++++---
.../jaxrs/provider/jsonp/JsonpInterceptorTest.java | 7 ++++---
.../cxf/jaxrs/ext/search/BeanspectorTest.java | 8 +++++---
.../search/SearchContextImplCustomParserTest.java | 8 +++++---
.../jaxrs/ext/search/SearchContextImplTest.java | 11 +++++++---
.../cxf/jaxrs/ext/search/SearchUtilsTest.java | 7 ++++---
.../client/FiqlSearchConditionBuilderTest.java | 7 ++++---
.../jaxrs/ext/search/fiql/FiqlCollectionsTest.java | 7 ++++---
.../cxf/jaxrs/ext/search/fiql/FiqlParserTest.java | 9 +++++---
.../jaxrs/ext/search/hbase/HBaseVisitorTest.java | 7 ++++---
.../jpa/AbstractJPATypedQueryVisitorTest.java | 8 +++++---
.../ext/search/jpa/JPALanguageVisitorTest.java | 7 ++++---
.../search/jpa/JPATypedQueryVisitorFiqlTest.java | 5 ++++-
.../search/jpa/JPATypedQueryVisitorODataTest.java | 5 ++++-
.../ext/search/ldap/LdapQueryVisitorTest.java | 7 ++++---
.../jaxrs/ext/search/odata/ODataParserTest.java | 8 +++++---
.../ext/search/sql/SQLHierarchicalQueryTest.java | 7 ++++---
.../ext/search/sql/SQLPrinterVisitorTest.java | 7 ++++---
.../ext/search/tika/TikaContentExtractorTest.java | 10 ++++++---
.../tika/TikaLuceneContentExtractorTest.java | 8 +++++---
.../client/CxfTypeSafeClientBuilderTest.java | 10 ++++++---
.../cxf/microprofile/client/ValidatorTest.java | 9 +++++---
.../microprofile/client/cdi/RestClientCdiTest.java | 8 +++++---
.../jose/cookbook/JwkJoseCookBookTest.java | 5 +++--
.../jose/jwe/JweCompactReaderWriterTest.java | 7 ++++---
.../rs/security/jose/jwe/JweJsonConsumerTest.java | 7 ++++---
.../rs/security/jose/jwe/JweJsonProducerTest.java | 6 +++---
.../security/jose/jwe/JwePbeHmacAesWrapTest.java | 6 +++---
.../cxf/rs/security/jose/jwk/JsonWebKeyTest.java | 8 +++++---
.../cxf/rs/security/jose/jwk/JwkUtilsTest.java | 10 ++++++---
.../rs/security/jose/jws/JwsCompactHeaderTest.java | 7 ++++---
.../jose/jws/JwsCompactReaderWriterTest.java | 8 +++++---
.../rs/security/jose/jws/JwsJsonConsumerTest.java | 9 +++++---
.../rs/security/jose/jws/JwsJsonProducerTest.java | 7 ++++---
.../cxf/rs/security/jose/jws/JwsUtilsTest.java | 12 ++++++++---
.../cxf/rs/security/jose/jwt/JwtUtilsTest.java | 6 +++---
.../rs/security/oauth/utils/OAuthUtilsTest.java | 8 +++++---
.../rs/security/oauth2/common/UserSubjectTest.java | 6 ++++--
.../oauth2/grants/TokenGrantHandlerTest.java | 9 +++++---
.../grants/code/JCacheCodeDataProviderTest.java | 8 +++++---
.../grants/code/JPACMTOAuthDataProviderTest.java | 4 +++-
.../grants/code/JPACodeDataProviderTest.java | 9 +++++---
.../oauth2/grants/jwt/JwtUserSubjectTest.java | 7 ++++---
.../provider/AbstractOAuthDataProviderTest.java | 10 +++++++--
.../oauth2/provider/JPAOAuthDataProviderTest.java | 4 +++-
.../oauth2/provider/OAuthJSONProviderTest.java | 9 +++++---
.../tokens/hawk/HawkAccessTokenValidatorTest.java | 7 ++++---
.../oauth2/tokens/hawk/NonceVerifierImplTest.java | 6 ++++--
.../oauth2/utils/AuthorizationUtilsTest.java | 10 ++++++---
.../rs/security/oauth2/utils/OAuthUtilsTest.java | 8 +++++---
.../oauth2/utils/crypto/CryptoUtilsTest.java | 9 +++++---
.../security/oidc/idp/JPAOidcUserSubjectTest.java | 8 +++++---
.../cxf/rs/security/oidc/utils/OidcUtilsTest.java | 8 +++++---
.../security/saml/sso/AuthnRequestBuilderTest.java | 5 ++++-
.../security/saml/sso/CombinedValidatorTest.java | 6 +++++-
.../cxf/rs/security/saml/sso/EHCacheUtilTest.java | 8 +++++---
.../saml/sso/SAMLResponseValidatorTest.java | 6 +++++-
.../saml/sso/SAMLSSOResponseValidatorTest.java | 5 ++++-
.../security/saml/DeflateEncoderDecoderTest.java | 8 +++++---
.../rt/security/saml/claims/SAMLClaimsTest.java | 8 +++++---
.../saml/xacml2/RequestComponentBuilderTest.java | 6 ++++--
.../xacml2/SamlRequestComponentBuilderTest.java | 6 ++++--
.../xacml2/XACMLAuthorizingInterceptorTest.java | 6 ++++--
.../saml/xacml2/XACMLRequestBuilderTest.java | 9 ++++++--
.../apache/cxf/rt/security/claims/ClaimTest.java | 9 +++++---
.../ClaimsAuthorizingInterceptorTest.java | 7 ++++---
.../http_jetty/JettyHTTPDestinationTest.java | 13 +++++++++---
.../JettyHTTPServerEngineFactoryTest.java | 9 +++++---
.../http_jetty/JettyHTTPServerEngineTest.java | 10 ++++++---
.../HTTPJettyTransportNamespaceHandlerTest.java | 7 ++++---
.../http_jetty/spring/ApplicationContextTest.java | 11 +++++++---
.../netty/client/NettyHttpConduitFactoryTest.java | 8 +++++---
.../netty/server/NettyHttpDestinationTest.java | 13 +++++++++---
.../server/NettyHttpServerEngineFactoryTest.java | 7 ++++---
.../netty/server/NettyHttpServerEngineTest.java | 9 +++++---
.../server/spring/ApplicationContextTest.java | 7 +++++--
.../http_undertow/UndertowHTTPDestinationTest.java | 13 +++++++++---
.../UndertowHTTPServerEngineFactoryTest.java | 9 +++++---
.../UndertowHTTPServerEngineTest.java | 9 +++++---
.../HTTPUndertowTransportNamespaceHandlerTest.java | 7 ++++---
.../spring/ApplicationContextTest.java | 10 ++++++---
.../http/DestinationRegistryImplTest.java | 10 ++++++---
.../apache/cxf/transport/http/HTTPConduitTest.java | 10 ++++++---
.../http/HTTPConduitURLConnectionTest.java | 9 +++++---
.../transport/http/HTTPConduitURLEasyMockTest.java | 11 +++++++---
.../transport/http/HTTPTransportFactoryTest.java | 8 +++++---
.../org/apache/cxf/transport/http/HeadersTest.java | 10 ++++++---
.../cxf/transport/http/PatternBuilderTest.java | 8 +++++---
.../http/blueprint/HttpBPHandlerTest.java | 7 ++++---
.../http/policy/ClientPolicyCalculatorTest.java | 8 +++++---
.../policy/HTTPClientAssertionBuilderTest.java | 8 +++++---
.../policy/HTTPServerAssertionBuilderTest.java | 8 +++++---
.../cxf/transport/http/policy/PolicyUtilsTest.java | 7 ++++---
.../http/policy/ServerPolicyCalculatorTest.java | 8 +++++---
.../http/spring/HttpConduitConfigurationTest.java | 9 +++++---
.../cxf/transport/https/CertConstraintsTest.java | 5 ++++-
.../transport/servlet/ServletControllerTest.java | 8 +++++---
.../cxf/transport/jms/AbstractJMSTester.java | 9 +++++---
.../apache/cxf/transport/jms/JMSConduitTest.java | 6 +++++-
.../cxf/transport/jms/JMSDestinationTest.java | 8 +++++++-
.../cxf/transport/jms/JMSMessageUtilTest.java | 8 +++++---
.../cxf/transport/jms/RequestResponseTest.java | 4 +++-
.../continuations/JMSContinuationProviderTest.java | 9 +++++---
.../jms/continuations/JMSContinuationTest.java | 9 ++++++--
.../cxf/transport/jms/uri/JMSEndpointTest.java | 11 +++++++---
.../apache/cxf/transport/jms/util/JMSUtilTest.java | 8 +++++---
.../cxf/transport/local/LocalDestinationTest.java | 9 +++++---
.../transport/local/LocalTransportFactoryTest.java | 9 +++++---
.../websocket/WebSocketTransportFactoryTest.java | 7 ++++---
.../transport/websocket/WebSocketUtilsTest.java | 8 +++++---
.../websocket/ahc/AhcWebSocketConduitTest.java | 9 +++++---
.../AtmosphereWebSocketJettyDestinationTest.java | 7 ++++---
.../AtmosphereWebSocketServletDestinationTest.java | 9 +++++---
.../atmosphere/DefaultProtocolInterceptorTest.java | 7 ++++---
.../jetty/JettyWebSocketDestinationTest.java | 8 +++++---
.../ws/addressing/AddressingConstantsImplTest.java | 7 ++++---
.../ws/addressing/blueprint/WsBPHandlerTest.java | 7 ++++---
.../cxf/ws/addressing/impl/ContextUtilsTest.java | 9 +++++---
.../cxf/ws/addressing/impl/MAPAggregatorTest.java | 8 +++++---
.../addressing/soap/DecoupledFaultHandlerTest.java | 11 +++++++---
.../cxf/ws/addressing/soap/MAPCodecTest.java | 11 +++++++---
.../test/java/org/apache/cxf/ws/mex/MEXTest.java | 7 ++++---
.../policy/AssertionBuilderRegistryImplTest.java | 9 +++++---
.../apache/cxf/ws/policy/AssertionInfoMapTest.java | 10 ++++++---
.../cxf/ws/policy/EffectivePolicyImplTest.java | 10 ++++++---
.../cxf/ws/policy/EndpointPolicyImplTest.java | 11 +++++++---
.../IgnorablePolicyInterceptorProviderTest.java | 10 ++++++---
.../org/apache/cxf/ws/policy/NormalizeTest.java | 8 +++++---
.../apache/cxf/ws/policy/PolicyBuilderTest.java | 9 +++++---
.../cxf/ws/policy/PolicyDataEngineImplTest.java | 7 ++++---
.../org/apache/cxf/ws/policy/PolicyEngineTest.java | 11 +++++++---
.../apache/cxf/ws/policy/PolicyExtensionsTest.java | 11 +++++++---
.../PolicyInterceptorProviderRegistryImplTest.java | 9 +++++---
.../cxf/ws/policy/PolicyInterceptorsTest.java | 7 ++++---
.../cxf/ws/policy/PolicyRegistryImplTest.java | 8 +++++---
.../PolicyVerificationInFaultInterceptorTest.java | 3 +--
.../PolicyVerificationInInterceptorTest.java | 3 +--
.../PolicyVerificationOutInterceptorTest.java | 3 +--
.../DomainExpressionBuilderRegistryTest.java | 9 +++++---
.../EndpointReferenceDomainExpressionTest.java | 9 +++++---
.../external/ExternalAttachmentProviderTest.java | 11 +++++++---
.../attachment/external/PolicyAttachmentTest.java | 9 +++++---
.../reference/ReferenceResolverTest.java | 8 +++++---
.../wsdl11/Wsdl11AttachmentPolicyProviderTest.java | 11 +++++++---
.../ws/policy/blueprint/PolicyBPHandlerTest.java | 7 ++++---
.../builder/jaxb/JaxbAssertionBuilderTest.java | 10 ++++++---
.../ws/policy/builder/jaxb/JaxbAssertionTest.java | 10 ++++++---
.../selector/FirstAlternativeSelectorTest.java | 8 +++++---
.../MinimalMaximalAlternativeSelectorTest.java | 8 +++++---
.../cxf/ws/policy/spring/PolicyBeansTest.java | 8 +++++---
.../org/apache/cxf/ws/rm/AbstractEndpointTest.java | 5 +++--
.../cxf/ws/rm/AbstractRMInterceptorTest.java | 11 +++++++---
.../org/apache/cxf/ws/rm/AbstractSequenceTest.java | 7 ++++---
.../apache/cxf/ws/rm/DestinationSequenceTest.java | 12 ++++++++---
.../java/org/apache/cxf/ws/rm/DestinationTest.java | 8 ++++++--
.../org/apache/cxf/ws/rm/ManagedRMManagerTest.java | 12 ++++++++---
.../apache/cxf/ws/rm/ProtocolVariationTest.java | 8 +++++---
.../test/java/org/apache/cxf/ws/rm/ProxyTest.java | 10 ++++++---
.../org/apache/cxf/ws/rm/RMContextUtilsTest.java | 9 +++++---
.../java/org/apache/cxf/ws/rm/RMEndpointTest.java | 9 ++++++--
.../org/apache/cxf/ws/rm/RMInInterceptorTest.java | 8 ++++++--
.../cxf/ws/rm/RMManagerConfigurationTest.java | 10 ++++++---
.../java/org/apache/cxf/ws/rm/RMManagerTest.java | 13 +++++++++---
.../org/apache/cxf/ws/rm/RMOutInterceptorTest.java | 8 +++++---
.../java/org/apache/cxf/ws/rm/RMUtilsTest.java | 7 ++++---
.../java/org/apache/cxf/ws/rm/ServantTest.java | 10 ++++++---
.../org/apache/cxf/ws/rm/SourceSequenceTest.java | 11 +++++++---
.../cxf/ws/rm/blueprint/RMBPHandlerTest.java | 7 ++++---
.../ws/rm/persistence/PersistenceUtilsTest.java | 9 +++++---
.../cxf/ws/rm/persistence/RMMessageTest.java | 8 +++++---
.../jdbc/RMTxStoreConfigurationTest.java | 11 +++++++---
.../cxf/ws/rm/persistence/jdbc/RMTxStoreTest.java | 3 +++
.../ws/rm/persistence/jdbc/RMTxStoreTestBase.java | 10 +++++++--
.../persistence/jdbc/RMTxStoreTwoSchemasTest.java | 6 ++++--
.../rm/persistence/jdbc/RMTxStoreUpgradeTest.java | 7 ++++---
.../apache/cxf/ws/rm/policy/PolicyUtilsTest.java | 11 +++++++---
.../cxf/ws/rm/soap/RMSoapInInterceptorTest.java | 10 ++++++---
.../cxf/ws/rm/soap/RMSoapOutInterceptorTest.java | 7 ++++---
.../ws/rm/soap/RetransmissionQueueImplTest.java | 12 ++++++++---
.../cxf/ws/rm/soap/SoapFaultFactoryTest.java | 7 +++++--
.../cxf/ws/security/cache/EHCacheUtilsTest.java | 8 +++++---
.../apache/cxf/ws/security/sts/STSClientTest.java | 9 +++++---
.../security/tokenstore/EHCacheTokenStoreTest.java | 6 +++++-
.../security/tokenstore/MemoryTokenStoreTest.java | 7 ++++++-
.../trust/AuthPolicyValidatingInterceptorTest.java | 9 +++++---
.../security/wss4j/AbstractPolicySecurityTest.java | 7 +++++++
.../security/wss4j/CryptoCoverageCheckerTest.java | 3 ++-
.../security/wss4j/CustomPolicyAlgorithmsTest.java | 3 +++
.../wss4j/DOMToStaxEncryptionIdentifierTest.java | 1 +
.../ws/security/wss4j/DOMToStaxRoundTripTest.java | 3 +++
.../wss4j/DOMToStaxSignatureIdentifierTest.java | 1 +
.../wss4j/DefaultCryptoCoverageCheckerTest.java | 3 +++
.../wss4j/PluggablePolicyValidatorTest.java | 3 +++
.../security/wss4j/PolicyBasedWss4JInOutTest.java | 2 ++
.../cxf/ws/security/wss4j/RoundTripTest.java | 2 ++
.../ws/security/wss4j/SecurityActionTokenTest.java | 3 +++
.../security/wss4j/SignatureConfirmationTest.java | 3 +++
.../wss4j/StaxCryptoCoverageCheckerTest.java | 2 ++
.../ws/security/wss4j/StaxRoundTripActionTest.java | 4 ++++
.../cxf/ws/security/wss4j/StaxRoundTripTest.java | 3 +++
.../wss4j/StaxToDOMEncryptionIdentifierTest.java | 1 +
.../ws/security/wss4j/StaxToDOMRoundTripTest.java | 3 +++
.../wss4j/StaxToDOMSignatureIdentifierTest.java | 1 +
.../wss4j/UserNameTokenAuthorizationTest.java | 3 +++
.../cxf/ws/security/wss4j/WSS4JFaultCodeTest.java | 2 ++
.../cxf/ws/security/wss4j/WSS4JInOutTest.java | 5 +++++
.../ws/security/wss4j/WSS4JOutInterceptorTest.java | 2 ++
.../ws/security/wss4j/saml/DOMToStaxSamlTest.java | 2 ++
.../security/wss4j/saml/PolicyBasedSamlTest.java | 2 ++
.../cxf/ws/security/wss4j/saml/SamlTokenTest.java | 6 ++++++
.../ws/security/wss4j/saml/StaxToDOMSamlTest.java | 2 ++
.../apache/cxf/wsdl/JAXBExtensionHelperTest.java | 9 +++++---
.../interceptors/DocLiteralInInterceptorTest.java | 7 ++++---
.../factory/ReflectionServiceFactorBeanTest.java | 7 ++++---
.../java/org/apache/cxf/wsdl11/NSManagerTest.java | 5 +++--
.../apache/cxf/wsdl11/ServiceWSDLBuilderTest.java | 10 ++++++---
.../org/apache/cxf/wsdl11/WSDLManagerImplTest.java | 9 +++++---
.../apache/cxf/wsdl11/WSDLServiceBuilderTest.java | 12 ++++++++---
.../cxf/sts/cache/EhCacheIdentityCacheTest.java | 5 ++++-
.../cxf/sts/cache/HazelCastTokenStoreTest.java | 6 +++++-
.../cxf/sts/cache/MemoryIdentityCacheTest.java | 5 ++++-
.../sts/claims/mapper/JexlClaimsMapperTest.java | 7 ++++++-
.../sts/claims/mapper/JexlIssueSamlClaimsTest.java | 7 ++++++-
.../cxf/sts/operation/CancelSCTUnitTest.java | 5 ++++-
.../cxf/sts/operation/IssueEncryptedUnitTest.java | 5 ++++-
.../cxf/sts/operation/IssueJWTClaimsUnitTest.java | 6 +++++-
.../sts/operation/IssueJWTOnbehalfofUnitTest.java | 6 +++++-
.../cxf/sts/operation/IssueJWTRealmUnitTest.java | 6 +++++-
.../apache/cxf/sts/operation/IssueJWTUnitTest.java | 5 ++++-
.../cxf/sts/operation/IssueOnbehalfofUnitTest.java | 7 ++++++-
.../apache/cxf/sts/operation/IssueSCTUnitTest.java | 6 +++++-
.../cxf/sts/operation/IssueSamlClaimsUnitTest.java | 7 ++++++-
.../cxf/sts/operation/IssueSamlRealmUnitTest.java | 7 ++++++-
.../cxf/sts/operation/IssueSamlUnitTest.java | 8 +++++++-
.../apache/cxf/sts/operation/IssueUnitTest.java | 6 +++++-
.../cxf/sts/operation/RenewSamlUnitTest.java | 5 ++++-
.../operation/ValidateJWTTransformationTest.java | 5 ++++-
.../cxf/sts/operation/ValidateJWTUnitTest.java | 5 ++++-
.../cxf/sts/operation/ValidateSCTUnitTest.java | 7 ++++++-
.../cxf/sts/operation/ValidateSamlUnitTest.java | 5 ++++-
.../ValidateTokenTransformationUnitTest.java | 5 ++++-
.../apache/cxf/sts/operation/ValidateUnitTest.java | 6 +++++-
.../operation/ValidateUsernameTokenUnitTest.java | 5 ++++-
.../sts/operation/ValidateX509TokenUnitTest.java | 5 ++++-
.../cxf/sts/request/RequestParserUnitTest.java | 5 ++++-
.../cxf/sts/token/canceller/SCTCancellerTest.java | 6 +++++-
.../cxf/sts/token/provider/JWTClaimsTest.java | 6 +++++-
.../sts/token/provider/JWTProviderActAsTest.java | 5 ++++-
.../token/provider/JWTProviderLifetimeTest.java | 6 +++++-
.../token/provider/JWTProviderOnBehalfOfTest.java | 5 ++++-
.../token/provider/JWTTokenProviderRealmTest.java | 6 +++++-
.../sts/token/provider/JWTTokenProviderTest.java | 6 +++++-
.../cxf/sts/token/provider/SAMLClaimsTest.java | 8 +++++++-
.../sts/token/provider/SAMLProviderActAsTest.java | 6 +++++-
.../sts/token/provider/SAMLProviderCustomTest.java | 6 +++++-
.../token/provider/SAMLProviderKeyTypeTest.java | 8 +++++++-
.../token/provider/SAMLProviderLifetimeTest.java | 7 +++++--
.../token/provider/SAMLProviderOnBehalfOfTest.java | 6 +++++-
.../sts/token/provider/SAMLProviderRealmTest.java | 6 +++++-
.../cxf/sts/token/provider/SCTProviderTest.java | 7 ++++++-
.../cxf/sts/token/realm/RealmSupportTest.java | 2 +-
.../renewer/SAMLTokenRenewerLifetimeTest.java | 6 +++++-
.../sts/token/renewer/SAMLTokenRenewerPOPTest.java | 6 +++++-
.../token/renewer/SAMLTokenRenewerRealmTest.java | 5 ++++-
.../sts/token/renewer/SAMLTokenRenewerTest.java | 7 ++++++-
.../validator/JWTTokenValidatorRealmTest.java | 6 +++++-
.../sts/token/validator/JWTTokenValidatorTest.java | 5 ++++-
.../SAMLTokenValidatorCachedRealmTest.java | 5 ++++-
.../validator/SAMLTokenValidatorRealmTest.java | 6 +++++-
.../token/validator/SAMLTokenValidatorTest.java | 5 ++++-
.../cxf/sts/token/validator/SCTValidatorTest.java | 5 ++++-
.../validator/UsernameTokenValidatorTest.java | 4 +++-
.../token/validator/X509TokenValidatorTest.java | 5 ++++-
.../java/org/apache/cxf/wsn/WsnBrokerTest.java | 9 ++++----
.../apache/cxf/xkms/cache/XKMSClientCacheTest.java | 7 ++++++-
.../cxf/systest/grizzly/EndpointAPITest.java | 9 +++++---
.../cxf/systest/handlers/SoapFaultHandlerTest.java | 4 +++-
...SpringConfiguredAutoRewriteSoapAddressTest.java | 4 +++-
.../handlers/SpringConfiguredHandlerTest.java | 4 +++-
...ringConfiguredNoAutoRewriteSoapAddressTest.java | 4 +++-
.../cxf/systest/jaxws/JaxWsClientThreadTest.java | 4 +++-
.../apache/cxf/systest/jaxws/OASISCatalogTest.java | 9 ++++++--
.../beanpostprocessor/BeanPostProcessorTest.java | 4 +++-
.../CustomizedfBeanPostProcessorTest.java | 4 +++-
.../JavaFirstSchemaValidationTest.java | 8 +++++---
.../microprofile/rest/client/AsyncMethodTest.java | 6 +++---
.../cxf/systest/http/PublishedEndpointUrlTest.java | 8 +++++---
.../systest/http_jetty/EngineLifecycleTest.java | 10 ++++++---
.../cxf/systest/servlet/AbstractServletTest.java | 3 +++
.../apache/cxf/systest/servlet/CXFFilterTest.java | 5 ++++-
.../apache/cxf/systest/servlet/CXFServletTest.java | 7 ++++++-
.../systest/servlet/ErrorContextSerletTest.java | 5 ++++-
.../servlet/ExternalServicesServletTest.java | 6 +++++-
.../cxf/systest/servlet/JaxRsServletTest.java | 4 +++-
.../cxf/systest/servlet/JsFrontEndServletTest.java | 5 ++++-
.../servlet/SpringAutoPublishServletTest.java | 6 +++++-
.../cxf/systest/servlet/SpringServletTest.java | 7 ++++++-
.../cxf/cxf1226/MissingQualification1226Test.java | 4 +++-
.../java/org/apache/cxf/cxf1332/Cxf1332Test.java | 4 +++-
.../cxf/systest/bus/BusExtensionLoadingTest.java | 7 ++++---
.../apache/cxf/systest/bus/BusShutdownTest.java | 7 ++++---
.../cxf/systest/bus/SpringBusFactoryTest.java | 7 ++++---
.../cxf/systest/coloc/AbstractColocTest.java | 7 ++++---
.../coloc/AbstractHeaderServiceDocLitTest.java | 5 ++++-
.../coloc/AbstractHeaderServiceRpcLitTest.java | 8 +++++++-
.../systest/coloc/AbstractWrappedDocLitTest.java | 6 +++++-
.../apache/cxf/systest/corba/BaseGreeterImpl.java | 7 ++++---
.../cxf/systest/lifecycle/LifeCycleTest.java | 11 +++++++---
.../cxf/systest/management/ManagedBusTest.java | 10 ++++++---
.../cxf/systest/simple/SimpleFrontendTest.java | 7 ++++---
.../apache/cxf/systest/soap/SoapActionTest.java | 8 +++++---
.../systest/type_test/AbstractTypeTestClient2.java | 1 +
.../systest/type_test/AbstractTypeTestClient3.java | 1 +
.../systest/type_test/AbstractTypeTestClient5.java | 1 +
.../cxf/systest/ws/rm/WSRMPolicyResolveTest.java | 2 ++
.../apache/cxf/systest/ws/util/MessageFlow.java | 12 ++++++++---
.../ws/addressing/spring/WSAFeatureTest.java | 4 +++-
.../ws/addressing/spring/WSAFeatureXmlTest.java | 5 ++++-
.../apache/cxf/systest/ws/util/MessageFlow.java | 12 ++++++++---
.../java/org/apache/cxf/test/AbstractCXFTest.java | 3 +--
.../cxf/testutil/recorders/MessageRecorder.java | 4 ++--
.../java/org/apache/cxf/test/XPathAssertTest.java | 5 +++--
.../header_test/rpc/TestRPCHeaderTest.java | 5 +++--
.../apache/cxf/tools/common/ProcessorTestBase.java | 6 ++++--
.../org/apache/cxf/tools/common/ToolTestBase.java | 3 +--
.../cxf/tools/common/ProcessorEnvironmentTest.java | 10 ++++++---
.../apache/cxf/tools/common/ToolContextTest.java | 8 +++++---
.../apache/cxf/tools/common/WSDLVersionTest.java | 7 ++++---
.../common/dom/ExtendedDocumentBuilderTest.java | 8 +++++---
.../cxf/tools/common/model/JAnnotationTest.java | 8 +++++---
.../cxf/tools/common/model/JavaClassTest.java | 7 ++++---
.../cxf/tools/common/model/JavaInterfaceTest.java | 7 ++++---
.../cxf/tools/common/model/JavaParameterTest.java | 7 ++++---
.../cxf/tools/common/model/JavaTypeTest.java | 7 ++++---
.../common/toolspec/AbstractToolContainerTest.java | 9 +++++---
.../tools/common/toolspec/ToolExceptionTest.java | 9 +++++---
.../cxf/tools/common/toolspec/ToolSpecTest.java | 10 ++++++---
.../cxf/tools/common/toolspec/ToolSupportTest.java | 3 +--
.../toolspec/parser/CommandLineParserTest.java | 10 ++++++---
.../util/BuiltInTypesJavaMappingUtilTest.java | 7 ++++---
.../apache/cxf/tools/util/FileWriterUtilTest.java | 7 ++++---
.../org/apache/cxf/tools/util/NameUtilTest.java | 8 +++++---
.../org/apache/cxf/tools/util/StAXUtilTest.java | 4 +++-
.../apache/cxf/tools/util/URIParserUtilTest.java | 9 +++++---
.../org/apache/cxf/tools/corba/IDLToWSDLTest.java | 7 ++++++-
.../org/apache/cxf/tools/corba/WSDLToIDLTest.java | 8 +++++++-
.../cxf/tools/corba/common/ToolTestBase.java | 3 +--
.../idlpreprocessor/IdlPreprocessorReaderTest.java | 9 +++++---
.../corba/processors/IDLToWSDLGenerationTest.java | 4 +++-
.../corba/processors/WSDLToCorbaBindingTest.java | 12 ++++++++---
.../processors/WSDLToCorbaBindingTypeTest.java | 9 +++++---
.../corba/processors/WSDLToIDLGenerationTest.java | 7 ++++---
.../java2js/processor/JavaToJSProcessorTest.java | 4 +++-
.../org/apache/cxf/tools/java2ws/AegisTest.java | 6 +++++-
.../org/apache/cxf/tools/java2ws/JavaToWSTest.java | 7 ++++++-
.../cxf/tools/java2wsdl/JavaToWSFlagTest.java | 5 ++++-
.../generator/WSDLGeneratorFactoryTest.java | 8 +++++---
.../wsdl11/DateTypeCustomGeneratorTest.java | 4 ++++
.../generator/wsdl11/FaultBeanGeneratorTest.java | 5 ++++-
.../generator/wsdl11/WrapperBeanGeneratorTest.java | 5 ++++-
.../wsdl11/annotator/WrapperBeanAnnotatorTest.java | 7 ++++---
.../annotator/WrapperBeanFieldAnnotatorTest.java | 7 ++++---
.../java2wsdl/processor/FrontendFactoryTest.java | 7 ++++---
.../java2wsdl/processor/JavaToProcessorTest.java | 9 +++++++-
.../internal/ServiceBuilderFactoryTest.java | 8 +++++---
.../processor/internal/jaxws/FaultBeanTest.java | 8 +++++---
.../jaxws/JaxwsServiceBuilderNoAnnoTest.java | 4 +++-
.../internal/jaxws/JaxwsServiceBuilderRPCTest.java | 5 ++++-
.../internal/jaxws/JaxwsServiceBuilderTest.java | 6 +++++-
.../internal/jaxws/RequestWrapperTest.java | 10 ++++++---
.../internal/jaxws/ResponseWrapperTest.java | 8 +++++---
.../processor/internal/jaxws/WrapperTest.java | 11 +++++++---
.../processor/internal/jaxws/WrapperUtilTest.java | 9 +++++---
.../cxf/tools/validator/WSDLValidationTest.java | 4 +++-
.../cxf/tools/validator/internal/Stax2DOMTest.java | 6 ++++--
.../validator/internal/WSDL11ValidatorTest.java | 8 +++++---
.../validator/internal/WSDLRefValidatorTest.java | 10 ++++++---
.../tools/validator/internal/model/XNodeTest.java | 7 ++++---
.../cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java | 8 +++++++-
.../cxf/tools/wadlto/jaxrs/ValidateWadlTest.java | 5 ++++-
.../cxf/tools/wadlto/jaxrs/WADLToJavaTest.java | 6 +++++-
.../cxf/tools/wsdlto/WSDLToJavaContainerTest.java | 9 +++++---
.../tools/wsdlto/core/AbstractGeneratorTest.java | 4 +++-
.../wsdlto/core/WSDLDefinitionBuilderTest.java | 8 +++++---
.../wsdlto/javascript/WSDLToJavaScriptTest.java | 5 ++++-
.../tools/wsdlto/frontend/jaxws/CatalogTest.java | 7 +++++--
.../wsdlto/frontend/jaxws/JAXWSProfileTest.java | 9 +++++---
.../customization/CustomizationParserTest.java | 5 +++++
.../processor/internal/ParameterProcessorTest.java | 7 ++++---
.../processor/internal/PortTypeProcessorTest.java | 3 +--
.../processor/internal/ProcessorUtilTest.java | 7 ++++---
.../internal/annotator/WebMethodAnnotatorTest.java | 8 +++++---
.../internal/annotator/WebParamAnnotatorTest.java | 7 ++++---
.../annotator/XmlSeeAlsoAnnotatorTest.java | 8 +++++---
.../internal/mapper/InterfaceMapperTest.java | 8 +++++---
.../internal/mapper/MethodMapperTest.java | 10 ++++++---
.../jaxws/wsdl11/JAXWSDefinitionBuilderTest.java | 8 +++++---
.../misc/processor/WSDLToServiceProcessorTest.java | 7 ++++++-
.../misc/processor/WSDLToSoapProcessorTest.java | 7 ++++++-
.../misc/processor/WSDLToXMLProcessorTest.java | 5 ++++-
.../misc/processor/XSDToWSDLProcessorTest.java | 4 +++-
.../apache/cxf/tools/wsdlto/WSDLToJavaTest.java | 10 ++++++---
.../cxf/tools/wsdlto/core/PluginLoaderTest.java | 8 +++++---
.../tools/wsdlto/jaxb/JAXBCodeGenOptionTest.java | 5 ++++-
.../apache/cxf/tools/wsdlto/jaxws/CatalogTest.java | 2 ++
.../cxf/tools/wsdlto/jaxws/CodeGenBugTest.java | 9 +++++++-
.../cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java | 8 +++++++-
.../apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java | 8 +++++++-
.../cxf/tools/wsdlto/jaxws/JAXWSBindingTest.java | 3 +++
.../cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java | 6 +++++-
.../jaxws/wsdl11/JAXWSDefinitionBuilderTest.java | 9 +++++---
.../cxf/tools/wsdlto/validator/ValidatorTest.java | 5 ++++-
789 files changed, 3964 insertions(+), 1740 deletions(-)
[cxf] 05/05: Checkstyle fix
Posted by co...@apache.org.
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 33fc044f2c006de4724cbe9410330e0ab7bddd03
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Sat Dec 29 19:11:21 2018 +0000
Checkstyle fix
---
core/src/test/java/org/apache/cxf/BusFactoryTest.java | 1 -
.../java/org/apache/cxf/attachment/AttachmentSerializerTest.java | 1 -
.../test/java/org/apache/cxf/attachment/AttachmentUtilTest.java | 1 -
core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java | 1 -
.../java/org/apache/cxf/bus/extension/ExtensionManagerTest.java | 1 -
.../apache/cxf/bus/extension/TextExtensionFragmentParserTest.java | 1 -
.../apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java | 1 -
.../java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java | 1 -
.../cxf/bus/managers/ServiceContractResolverRegistryImplTest.java | 1 -
.../src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java | 1 -
.../java/org/apache/cxf/bus/spring/BusApplicationContextTest.java | 1 -
.../java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java | 1 -
.../java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java | 1 -
.../test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java | 1 -
.../org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java | 1 -
.../org/apache/cxf/common/annotation/AnnotationProcessorTest.java | 1 -
.../org/apache/cxf/common/classloader/ClassLoaderUtilsTest.java | 1 -
core/src/test/java/org/apache/cxf/common/i18n/BundleUtilsTest.java | 1 -
core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java | 1 -
.../java/org/apache/cxf/common/injection/ResourceInjectorTest.java | 1 -
core/src/test/java/org/apache/cxf/common/jaxb/JAXBUtilsTest.java | 1 -
core/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java | 1 -
.../java/org/apache/cxf/common/logging/RegexLoggingFilterTest.java | 1 -
.../test/java/org/apache/cxf/common/security/SimpleGroupTest.java | 1 -
.../java/org/apache/cxf/common/security/SimplePrincipalTest.java | 1 -
core/src/test/java/org/apache/cxf/common/util/ASMHelperTest.java | 1 -
.../test/java/org/apache/cxf/common/util/Base64UtilityTest.java | 1 -
core/src/test/java/org/apache/cxf/common/util/ClassHelperTest.java | 1 -
.../test/java/org/apache/cxf/common/util/CollectionUtilsTest.java | 1 -
.../src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java | 1 -
.../java/org/apache/cxf/common/util/PropertiesLoaderUtilsTest.java | 1 -
.../test/java/org/apache/cxf/common/util/PropertyUtilsTest.java | 1 -
core/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java | 1 -
.../test/java/org/apache/cxf/common/util/URIParserUtilsTest.java | 1 -
core/src/test/java/org/apache/cxf/common/util/UrlUtilsTest.java | 1 -
.../org/apache/cxf/common/util/XmlSchemaPrimitiveUtilsTest.java | 1 -
.../java/org/apache/cxf/common/xmlschema/ImportRepairTest.java | 1 -
.../org/apache/cxf/configuration/spring/ConfigurerImplTest.java | 1 -
.../apache/cxf/continuations/SuspendedInvocationExceptionTest.java | 1 -
.../java/org/apache/cxf/databinding/AbstractDataBindingTest.java | 1 -
.../org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java | 1 -
core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java | 1 -
core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java | 1 -
core/src/test/java/org/apache/cxf/helpers/IOUtilsTest.java | 1 -
core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java | 1 -
core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java | 1 -
.../java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java | 1 -
.../java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java | 1 -
.../org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java | 1 -
.../org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java | 1 -
.../cxf/interceptor/security/DefaultSecurityContextTest.java | 1 -
.../cxf/interceptor/security/NamePasswordCallbackHandlerTest.java | 1 -
.../interceptor/security/RolePrefixSecurityContextImplTest.java | 1 -
.../cxf/interceptor/security/SecureAnnotationsInterceptorTest.java | 1 -
.../cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java | 1 -
.../java/org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java | 1 -
core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java | 1 -
.../test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java | 1 -
.../test/java/org/apache/cxf/resource/ClassLoaderResolverTest.java | 1 -
.../java/org/apache/cxf/resource/DefaultResourceManagerTest.java | 1 -
core/src/test/java/org/apache/cxf/resource/URIResolverTest.java | 3 +--
.../java/org/apache/cxf/service/model/BindingFaultInfoTest.java | 1 -
.../java/org/apache/cxf/service/model/BindingMessageInfoTest.java | 1 -
.../org/apache/cxf/service/model/BindingOperationInfoTest.java | 1 -
core/src/test/java/org/apache/cxf/service/model/FaultInfoTest.java | 1 -
.../test/java/org/apache/cxf/service/model/InterfaceInfoTest.java | 1 -
.../test/java/org/apache/cxf/service/model/MessageInfoTest.java | 1 -
.../java/org/apache/cxf/service/model/MessagePartInfoTest.java | 1 -
.../test/java/org/apache/cxf/service/model/OperationInfoTest.java | 1 -
.../org/apache/cxf/staxutils/DepthRestrictingStreamReaderTest.java | 1 -
.../java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java | 1 -
.../java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java | 1 -
.../java/org/apache/cxf/staxutils/PartialXMLStreamReaderTest.java | 1 -
.../apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java | 1 -
.../test/java/org/apache/cxf/staxutils/StaxStreamFilterTest.java | 1 -
.../test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java | 1 -
.../cxf/staxutils/transform/DelegatingNamespaceContextTest.java | 1 -
.../org/apache/cxf/staxutils/transform/InTransformReaderTest.java | 1 -
.../org/apache/cxf/staxutils/transform/OutTransformWriterTest.java | 1 -
.../java/org/apache/cxf/transport/ChainInitiationObserverTest.java | 1 -
core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java | 1 -
.../apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java | 1 -
core/src/test/java/org/apache/cxf/version/VersionTest.java | 1 -
.../test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java | 1 -
.../apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java | 1 -
.../org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java | 1 -
.../java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java | 1 -
.../java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java | 1 -
.../jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java | 1 -
.../cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java | 1 -
.../core/resourceadapter/ResourceAdapterInternalExceptionTest.java | 1 -
.../org/apache/cxf/jca/core/resourceadapter/ResourceBeanTest.java | 1 -
.../apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java | 1 -
.../java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java | 1 -
.../java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java | 1 -
.../org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java | 4 +---
.../java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java | 1 -
.../test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java | 1 -
.../test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java | 1 -
.../src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java | 1 -
.../src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java | 1 -
.../test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java | 1 -
.../org/apache/cxf/binding/coloc/ColocMessageObserverTest.java | 1 -
.../java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java | 1 -
.../src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java | 1 -
.../cxf/binding/coloc/blueprint/ColocBPNamespaceHandlerTest.java | 1 -
.../java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java | 1 -
.../test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java | 4 +---
.../test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java | 1 -
.../java/org/apache/cxf/binding/corba/CorbaDestinationTest.java | 4 +---
.../test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java | 1 -
.../java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java | 1 -
.../test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java | 1 -
.../org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java | 5 -----
.../apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java | 1 -
.../apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java | 1 -
.../apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java | 1 -
.../apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java | 1 -
.../org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java | 1 -
.../org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java | 1 -
.../org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java | 1 -
.../org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java | 1 -
.../org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java | 1 -
.../org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java | 1 -
.../org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java | 1 -
.../apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java | 1 -
.../apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java | 1 -
.../org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java | 1 -
.../java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java | 1 -
.../java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java | 1 -
.../java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java | 1 -
.../org/apache/cxf/binding/soap/SoapActionInterceptorTest.java | 1 -
.../java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java | 1 -
.../src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java | 1 -
.../soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java | 1 -
.../cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java | 1 -
.../cxf/binding/soap/interceptor/ReadHeadersInterceptorTest.java | 1 -
.../cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java | 1 -
.../cxf/binding/soap/interceptor/SoapFaultSerializerTest.java | 1 -
.../soap/interceptor/SoapPreProtocolOutInterceptorTest.java | 1 -
.../cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java | 1 -
.../test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java | 1 -
.../java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java | 1 -
.../test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java | 1 -
.../src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java | 1 -
.../test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java | 1 -
.../src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java | 1 -
.../src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java | 1 -
.../jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java | 1 -
.../src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java | 1 -
.../jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java | 1 -
.../jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java | 1 -
.../test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java | 1 -
.../test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java | 1 -
.../cxf/clustering/blueprint/ClusteringBPNamespaceHandlerTest.java | 1 -
.../test/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java | 1 -
.../java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBeanTest.java | 1 -
.../test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java | 1 -
.../apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandlerTest.java | 1 -
.../test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java | 1 -
.../src/test/java/org/apache/cxf/jaxrs/ext/form/FormTest.java | 1 -
.../java/org/apache/cxf/jaxrs/ext/multipart/AttachmentTest.java | 1 -
.../org/apache/cxf/jaxrs/ext/multipart/ContentDispositionTest.java | 1 -
.../java/org/apache/cxf/jaxrs/ext/multipart/MultipartBodyTest.java | 1 -
.../src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java | 1 -
.../test/java/org/apache/cxf/jaxrs/impl/AsyncResponseImplTest.java | 1 -
.../org/apache/cxf/jaxrs/impl/CacheControlHeaderProviderTest.java | 1 -
.../test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java | 1 -
.../java/org/apache/cxf/jaxrs/impl/CookieHeaderProviderTest.java | 1 -
.../java/org/apache/cxf/jaxrs/impl/DateHeaderProviderTest.java | 1 -
.../org/apache/cxf/jaxrs/impl/EntityTagHeaderProviderTest.java | 1 -
.../test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java | 1 -
.../test/java/org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java | 1 -
.../java/org/apache/cxf/jaxrs/impl/LinkHeaderProviderTest.java | 1 -
.../org/apache/cxf/jaxrs/impl/MediaTypeHeaderProviderTest.java | 1 -
.../src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java | 1 -
.../org/apache/cxf/jaxrs/impl/NewCookieHeaderProviderTest.java | 1 -
.../test/java/org/apache/cxf/jaxrs/impl/PathSegmentImplTest.java | 1 -
.../src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java | 1 -
.../java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java | 1 -
.../java/org/apache/cxf/jaxrs/impl/ResponseBuilderImplTest.java | 1 -
.../java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImplTest.java | 1 -
.../java/org/apache/cxf/jaxrs/impl/SecurityContextImplTest.java | 1 -
.../test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java | 1 -
.../src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java | 1 -
.../java/org/apache/cxf/jaxrs/impl/VariantListBuilderImplTest.java | 1 -
.../apache/cxf/jaxrs/lifecycle/PerRequestResourceProviderTest.java | 1 -
.../java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java | 1 -
.../java/org/apache/cxf/jaxrs/model/OperationResourceInfoTest.java | 1 -
.../src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java | 1 -
.../java/org/apache/cxf/jaxrs/model/doc/JavaDocProviderTest.java | 1 -
.../java/org/apache/cxf/jaxrs/provider/BinaryDataProviderTest.java | 1 -
.../java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java | 1 -
.../org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java | 1 -
.../org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java | 1 -
.../org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java | 1 -
.../java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java | 1 -
.../apache/cxf/jaxrs/provider/RequestDispatcherProviderTest.java | 1 -
.../java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java | 1 -
.../test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java | 1 -
.../java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java | 1 -
.../apache/cxf/jaxrs/security/JAASAuthenticationFilterTest.java | 1 -
.../org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java | 1 -
.../org/apache/cxf/jaxrs/spring/SpringResourceFactoryTest.java | 1 -
.../java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java | 1 -
.../test/java/org/apache/cxf/jaxrs/utils/ExceptionUtilsTest.java | 1 -
.../src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java | 1 -
.../src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java | 1 -
.../test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java | 1 -
.../src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 1 -
.../test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java | 1 -
.../src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java | 1 -
.../test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java | 1 -
.../apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandlerTest.java | 1 -
.../org/apache/cxf/jaxws/context/WebServiceContextImplTest.java | 1 -
.../java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java | 1 -
.../org/apache/cxf/jaxws/context/WrappedMessageContextTest.java | 1 -
.../cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java | 1 -
.../cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java | 1 -
.../java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java | 1 -
.../java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java | 1 -
.../apache/cxf/jaxws/handler/InitParamResourceResolverTest.java | 1 -
.../apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java | 1 -
.../java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java | 1 -
.../apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java | 1 -
.../src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java | 1 -
.../org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java | 1 -
.../org/apache/cxf/jaxws/support/JaxWsImplementorInfoTest.java | 1 -
.../apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java | 1 -
.../org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java | 3 +--
.../test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java | 1 -
.../apache/cxf/transport/http_jaxws_spi/HttpHandlerImplTest.java | 1 -
.../cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java | 1 -
.../transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java | 1 -
.../test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java | 1 -
.../src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java | 1 -
.../js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java | 1 -
.../cxf/frontend/blueprint/SimpleBPNamespaceHandlerTest.java | 1 -
.../cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java | 1 -
.../test/java/org/apache/cxf/javascript/BasicNameManagerTest.java | 1 -
.../java/org/apache/cxf/management/InstrumentationManagerTest.java | 1 -
.../org/apache/cxf/management/counters/CounterRepositoryTest.java | 1 -
.../management/interceptor/AbstractMessageResponseTestBase.java | 2 --
.../java/org/apache/cxf/management/jmx/BusRegistrationTest.java | 1 -
.../apache/cxf/management/jmx/JMXManagedComponentManagerTest.java | 1 -
.../java/org/apache/cxf/management/jmx/MBServerConnectorTest.java | 1 -
.../apache/cxf/management/jmx/export/ModelMBeanAssemblerTest.java | 7 ++-----
.../org/apache/cxf/management/utils/ManagementConsoleTest.java | 1 -
.../org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java | 1 -
.../src/test/java/org/apache/cxf/jaxrs/client/WebClientTest.java | 1 -
.../cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandlerTest.java | 1 -
.../java/org/apache/cxf/jaxrs/client/cache/ClientCacheTest.java | 1 -
.../test/java/org/apache/cxf/jaxrs/client/cache/ClientTest.java | 1 -
.../test/java/org/apache/cxf/jaxrs/client/spec/ClientImplTest.java | 1 -
.../org/apache/cxf/jaxrs/client/spec/ClientRequestFilterTest.java | 1 -
.../apache/cxf/jaxrs/client/spec/InvocationBuilderImplTest.java | 1 -
.../apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java | 1 -
.../java/org/apache/cxf/jaxrs/swagger/Swagger2FeatureTest.java | 1 -
.../jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtilsTest.java | 1 -
.../org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtilsTest.java | 1 -
.../org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java | 1 -
.../org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java | 1 -
.../java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java | 1 -
.../apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java | 1 -
.../java/org/apache/cxf/jaxrs/provider/ProviderFactoryAllTest.java | 1 -
.../apache/cxf/jaxrs/provider/aegis/AegisElementProviderTest.java | 1 -
.../org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java | 1 -
.../org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java | 1 -
.../org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java | 1 -
.../org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java | 1 -
.../java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java | 1 -
.../org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java | 1 -
.../test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java | 1 -
.../cxf/jaxrs/ext/search/SearchContextImplCustomParserTest.java | 1 -
.../org/apache/cxf/jaxrs/ext/search/SearchContextImplTest.java | 1 -
.../test/java/org/apache/cxf/jaxrs/ext/search/SearchUtilsTest.java | 1 -
.../jaxrs/ext/search/client/FiqlSearchConditionBuilderTest.java | 1 -
.../org/apache/cxf/jaxrs/ext/search/fiql/FiqlCollectionsTest.java | 1 -
.../java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java | 1 -
.../org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java | 1 -
.../cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java | 1 -
.../apache/cxf/jaxrs/ext/search/jpa/JPALanguageVisitorTest.java | 1 -
.../org/apache/cxf/jaxrs/ext/search/ldap/LdapQueryVisitorTest.java | 1 -
.../org/apache/cxf/jaxrs/ext/search/odata/ODataParserTest.java | 1 -
.../apache/cxf/jaxrs/ext/search/sql/SQLHierarchicalQueryTest.java | 1 -
.../org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java | 1 -
.../apache/cxf/jaxrs/ext/search/tika/TikaContentExtractorTest.java | 1 -
.../cxf/jaxrs/ext/search/tika/TikaLuceneContentExtractorTest.java | 1 -
.../java/org/apache/cxf/microprofile/client/ValidatorTest.java | 1 -
.../org/apache/cxf/microprofile/client/cdi/RestClientCdiTest.java | 1 -
.../apache/cxf/rs/security/jose/cookbook/JwkJoseCookBookTest.java | 1 -
.../cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java | 1 -
.../org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java | 1 -
.../org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java | 1 -
.../org/apache/cxf/rs/security/jose/jwe/JwePbeHmacAesWrapTest.java | 1 -
.../java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeyTest.java | 1 -
.../java/org/apache/cxf/rs/security/jose/jwk/JwkUtilsTest.java | 1 -
.../org/apache/cxf/rs/security/jose/jws/JwsCompactHeaderTest.java | 1 -
.../cxf/rs/security/jose/jws/JwsCompactReaderWriterTest.java | 1 -
.../org/apache/cxf/rs/security/jose/jws/JwsJsonConsumerTest.java | 1 -
.../org/apache/cxf/rs/security/jose/jws/JwsJsonProducerTest.java | 1 -
.../java/org/apache/cxf/rs/security/jose/jws/JwsUtilsTest.java | 1 -
.../java/org/apache/cxf/rs/security/jose/jwt/JwtUtilsTest.java | 1 -
.../org/apache/cxf/rs/security/oauth/utils/OAuthUtilsTest.java | 1 -
.../org/apache/cxf/rs/security/oauth2/common/UserSubjectTest.java | 1 -
.../cxf/rs/security/oauth2/grants/TokenGrantHandlerTest.java | 1 -
.../rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java | 1 -
.../rs/security/oauth2/grants/code/JPACodeDataProviderTest.java | 1 -
.../cxf/rs/security/oauth2/grants/jwt/JwtUserSubjectTest.java | 1 -
.../cxf/rs/security/oauth2/provider/OAuthJSONProviderTest.java | 1 -
.../security/oauth2/tokens/hawk/HawkAccessTokenValidatorTest.java | 1 -
.../cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImplTest.java | 1 -
.../cxf/rs/security/oauth2/utils/AuthorizationUtilsTest.java | 1 -
.../org/apache/cxf/rs/security/oauth2/utils/OAuthUtilsTest.java | 1 -
.../cxf/rs/security/oauth2/utils/crypto/CryptoUtilsTest.java | 1 -
.../apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java | 1 -
.../java/org/apache/cxf/rs/security/oidc/utils/OidcUtilsTest.java | 1 -
.../java/org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java | 1 -
.../org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java | 1 -
.../org/apache/cxf/rt/security/saml/claims/SAMLClaimsTest.java | 1 -
.../src/test/java/org/apache/cxf/rt/security/claims/ClaimTest.java | 1 -
.../claims/interceptor/ClaimsAuthorizingInterceptorTest.java | 1 -
.../apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java | 1 -
.../cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java | 6 ++----
.../apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java | 1 -
.../blueprint/HTTPJettyTransportNamespaceHandlerTest.java | 1 -
.../cxf/transport/http_jetty/spring/ApplicationContextTest.java | 1 -
.../transport/http/netty/client/NettyHttpConduitFactoryTest.java | 1 -
.../cxf/transport/http/netty/server/NettyHttpDestinationTest.java | 1 -
.../http/netty/server/NettyHttpServerEngineFactoryTest.java | 6 ++----
.../cxf/transport/http/netty/server/NettyHttpServerEngineTest.java | 1 -
.../transport/http/netty/server/spring/ApplicationContextTest.java | 4 +---
.../cxf/transport/http_undertow/UndertowHTTPDestinationTest.java | 1 -
.../http_undertow/UndertowHTTPServerEngineFactoryTest.java | 6 ++----
.../cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java | 1 -
.../blueprint/HTTPUndertowTransportNamespaceHandlerTest.java | 1 -
.../cxf/transport/http_undertow/spring/ApplicationContextTest.java | 1 -
.../org/apache/cxf/transport/http/DestinationRegistryImplTest.java | 1 -
.../test/java/org/apache/cxf/transport/http/HTTPConduitTest.java | 1 -
.../apache/cxf/transport/http/HTTPConduitURLConnectionTest.java | 1 -
.../org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java | 1 -
.../org/apache/cxf/transport/http/HTTPTransportFactoryTest.java | 1 -
.../src/test/java/org/apache/cxf/transport/http/HeadersTest.java | 1 -
.../java/org/apache/cxf/transport/http/PatternBuilderTest.java | 1 -
.../org/apache/cxf/transport/http/blueprint/HttpBPHandlerTest.java | 1 -
.../cxf/transport/http/policy/ClientPolicyCalculatorTest.java | 1 -
.../cxf/transport/http/policy/HTTPClientAssertionBuilderTest.java | 1 -
.../cxf/transport/http/policy/HTTPServerAssertionBuilderTest.java | 1 -
.../java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java | 1 -
.../cxf/transport/http/policy/ServerPolicyCalculatorTest.java | 1 -
.../cxf/transport/http/spring/HttpConduitConfigurationTest.java | 1 -
.../org/apache/cxf/transport/servlet/ServletControllerTest.java | 1 -
.../test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java | 1 -
.../test/java/org/apache/cxf/transport/jms/JMSMessageUtilTest.java | 1 -
.../transport/jms/continuations/JMSContinuationProviderTest.java | 1 -
.../java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java | 1 -
.../test/java/org/apache/cxf/transport/jms/util/JMSUtilTest.java | 1 -
.../java/org/apache/cxf/transport/local/LocalDestinationTest.java | 1 -
.../org/apache/cxf/transport/local/LocalTransportFactoryTest.java | 1 -
.../cxf/transport/websocket/WebSocketTransportFactoryTest.java | 1 -
.../org/apache/cxf/transport/websocket/WebSocketUtilsTest.java | 1 -
.../cxf/transport/websocket/ahc/AhcWebSocketConduitTest.java | 1 -
.../atmosphere/AtmosphereWebSocketJettyDestinationTest.java | 1 -
.../atmosphere/AtmosphereWebSocketServletDestinationTest.java | 1 -
.../websocket/atmosphere/DefaultProtocolInterceptorTest.java | 1 -
.../transport/websocket/jetty/JettyWebSocketDestinationTest.java | 1 -
.../org/apache/cxf/ws/addressing/AddressingConstantsImplTest.java | 1 -
.../org/apache/cxf/ws/addressing/blueprint/WsBPHandlerTest.java | 1 -
.../java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java | 1 -
.../java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java | 1 -
.../apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java | 1 -
.../test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java | 1 -
rt/ws/mex/src/test/java/org/apache/cxf/ws/mex/MEXTest.java | 1 -
.../org/apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java | 1 -
.../test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java | 1 -
.../java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java | 1 -
.../test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java | 1 -
.../cxf/ws/policy/IgnorablePolicyInterceptorProviderTest.java | 1 -
.../src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java | 1 -
.../src/test/java/org/apache/cxf/ws/policy/PolicyBuilderTest.java | 1 -
.../java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java | 1 -
.../src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java | 1 -
.../test/java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java | 1 -
.../cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java | 1 -
.../test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java | 1 -
.../test/java/org/apache/cxf/ws/policy/PolicyRegistryImplTest.java | 1 -
.../cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java | 1 -
.../apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java | 1 -
.../apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java | 1 -
.../attachment/external/DomainExpressionBuilderRegistryTest.java | 1 -
.../attachment/external/EndpointReferenceDomainExpressionTest.java | 1 -
.../policy/attachment/external/ExternalAttachmentProviderTest.java | 1 -
.../cxf/ws/policy/attachment/external/PolicyAttachmentTest.java | 1 -
.../cxf/ws/policy/attachment/reference/ReferenceResolverTest.java | 1 -
.../attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java | 1 -
.../org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java | 1 -
.../cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java | 1 -
.../org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java | 1 -
.../cxf/ws/policy/selector/FirstAlternativeSelectorTest.java | 1 -
.../ws/policy/selector/MinimalMaximalAlternativeSelectorTest.java | 1 -
.../test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java | 1 -
.../src/test/java/org/apache/cxf/ws/rm/AbstractEndpointTest.java | 1 -
.../test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java | 1 -
.../src/test/java/org/apache/cxf/ws/rm/AbstractSequenceTest.java | 1 -
.../test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java | 4 +---
rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java | 1 -
.../src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java | 1 -
.../src/test/java/org/apache/cxf/ws/rm/ProtocolVariationTest.java | 1 -
rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java | 1 -
.../rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java | 1 -
rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java | 1 -
.../rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java | 1 -
.../test/java/org/apache/cxf/ws/rm/RMManagerConfigurationTest.java | 1 -
rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java | 1 -
.../src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java | 1 -
rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java | 1 -
rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java | 1 -
.../rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java | 1 -
.../test/java/org/apache/cxf/ws/rm/blueprint/RMBPHandlerTest.java | 1 -
.../org/apache/cxf/ws/rm/persistence/PersistenceUtilsTest.java | 1 -
.../test/java/org/apache/cxf/ws/rm/persistence/RMMessageTest.java | 1 -
.../cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java | 1 -
.../org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java | 1 -
.../apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTwoSchemasTest.java | 1 -
.../apache/cxf/ws/rm/persistence/jdbc/RMTxStoreUpgradeTest.java | 1 -
.../src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java | 1 -
.../java/org/apache/cxf/ws/rm/soap/RMSoapInInterceptorTest.java | 1 -
.../java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java | 1 -
.../org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java | 1 -
.../test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java | 1 -
.../java/org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java | 1 -
.../test/java/org/apache/cxf/ws/security/sts/STSClientTest.java | 1 -
.../cxf/ws/security/trust/AuthPolicyValidatingInterceptorTest.java | 1 -
.../src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java | 1 -
.../apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java | 1 -
.../cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java | 1 -
rt/wsdl/src/test/java/org/apache/cxf/wsdl11/NSManagerTest.java | 1 -
.../test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java | 1 -
.../src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java | 1 -
.../test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java | 1 -
.../test/java/org/apache/cxf/systest/grizzly/EndpointAPITest.java | 1 -
.../jaxws/schemavalidation/JavaFirstSchemaValidationTest.java | 1 -
.../cxf/systest/microprofile/rest/client/AsyncMethodTest.java | 1 -
.../java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java | 1 -
.../org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java | 1 -
.../java/org/apache/cxf/systest/servlet/AbstractServletTest.java | 3 +--
.../java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java | 1 -
.../src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java | 1 -
.../test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java | 1 -
.../test/java/org/apache/cxf/systest/coloc/AbstractColocTest.java | 1 -
.../test/java/org/apache/cxf/systest/corba/BaseGreeterImpl.java | 1 -
.../test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java | 1 -
.../java/org/apache/cxf/systest/management/ManagedBusTest.java | 1 -
.../java/org/apache/cxf/systest/simple/SimpleFrontendTest.java | 1 -
.../src/test/java/org/apache/cxf/systest/soap/SoapActionTest.java | 1 -
.../org/apache/cxf/systest/type_test/AbstractTypeTestClient2.java | 4 ++--
.../org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java | 4 ++--
.../org/apache/cxf/systest/type_test/AbstractTypeTestClient4.java | 3 +--
.../org/apache/cxf/systest/type_test/AbstractTypeTestClient5.java | 4 ++--
.../src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java | 1 -
.../src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java | 1 -
.../src/main/java/org/apache/cxf/tools/common/ToolTestBase.java | 1 -
.../java/org/apache/cxf/tools/common/ProcessorEnvironmentTest.java | 1 -
.../src/test/java/org/apache/cxf/tools/common/ToolContextTest.java | 1 -
.../src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java | 1 -
.../apache/cxf/tools/common/dom/ExtendedDocumentBuilderTest.java | 1 -
.../java/org/apache/cxf/tools/common/model/JAnnotationTest.java | 1 -
.../test/java/org/apache/cxf/tools/common/model/JavaClassTest.java | 1 -
.../java/org/apache/cxf/tools/common/model/JavaInterfaceTest.java | 1 -
.../java/org/apache/cxf/tools/common/model/JavaParameterTest.java | 1 -
.../test/java/org/apache/cxf/tools/common/model/JavaTypeTest.java | 1 -
.../cxf/tools/common/toolspec/AbstractToolContainerTest.java | 1 -
.../org/apache/cxf/tools/common/toolspec/ToolExceptionTest.java | 1 -
.../java/org/apache/cxf/tools/common/toolspec/ToolSpecTest.java | 1 -
.../java/org/apache/cxf/tools/common/toolspec/ToolSupportTest.java | 1 -
.../cxf/tools/common/toolspec/parser/CommandLineParserTest.java | 1 -
.../org/apache/cxf/tools/util/BuiltInTypesJavaMappingUtilTest.java | 1 -
.../test/java/org/apache/cxf/tools/util/FileWriterUtilTest.java | 1 -
.../src/test/java/org/apache/cxf/tools/util/NameUtilTest.java | 1 -
.../src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java | 1 -
.../test/java/org/apache/cxf/tools/corba/common/ToolTestBase.java | 1 -
.../cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java | 1 -
.../apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java | 1 -
.../cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java | 1 -
.../apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java | 1 -
.../cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java | 1 -
.../generator/wsdl11/annotator/WrapperBeanAnnotatorTest.java | 1 -
.../generator/wsdl11/annotator/WrapperBeanFieldAnnotatorTest.java | 1 -
.../apache/cxf/tools/java2wsdl/processor/FrontendFactoryTest.java | 1 -
.../java2wsdl/processor/internal/ServiceBuilderFactoryTest.java | 1 -
.../tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java | 1 -
.../java2wsdl/processor/internal/jaxws/RequestWrapperTest.java | 1 -
.../java2wsdl/processor/internal/jaxws/ResponseWrapperTest.java | 1 -
.../cxf/tools/java2wsdl/processor/internal/jaxws/WrapperTest.java | 1 -
.../tools/java2wsdl/processor/internal/jaxws/WrapperUtilTest.java | 1 -
.../apache/cxf/tools/validator/internal/WSDL11ValidatorTest.java | 1 -
.../apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java | 1 -
.../org/apache/cxf/tools/validator/internal/model/XNodeTest.java | 1 -
.../java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java | 1 -
.../apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilderTest.java | 1 -
.../org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java | 1 -
.../apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java | 1 -
.../frontend/jaxws/processor/internal/ParameterProcessorTest.java | 1 -
.../frontend/jaxws/processor/internal/PortTypeProcessorTest.java | 1 -
.../frontend/jaxws/processor/internal/ProcessorUtilTest.java | 1 -
.../jaxws/processor/internal/annotator/WebMethodAnnotatorTest.java | 1 -
.../jaxws/processor/internal/annotator/WebParamAnnotatorTest.java | 1 -
.../processor/internal/annotator/XmlSeeAlsoAnnotatorTest.java | 1 -
.../jaxws/processor/internal/mapper/InterfaceMapperTest.java | 1 -
.../frontend/jaxws/processor/internal/mapper/MethodMapperTest.java | 1 -
.../wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java | 1 -
.../src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaTest.java | 1 -
.../java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java | 1 -
.../cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java | 1 -
514 files changed, 23 insertions(+), 549 deletions(-)
diff --git a/core/src/test/java/org/apache/cxf/BusFactoryTest.java b/core/src/test/java/org/apache/cxf/BusFactoryTest.java
index 5ef364c..ea8132b 100644
--- a/core/src/test/java/org/apache/cxf/BusFactoryTest.java
+++ b/core/src/test/java/org/apache/cxf/BusFactoryTest.java
@@ -20,7 +20,6 @@
package org.apache.cxf;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
diff --git a/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java b/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
index 697070d..6d202d7 100644
--- a/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
+++ b/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
@@ -39,7 +39,6 @@ import org.apache.cxf.message.Attachment;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/attachment/AttachmentUtilTest.java b/core/src/test/java/org/apache/cxf/attachment/AttachmentUtilTest.java
index 7b4f92f..2d53be9 100644
--- a/core/src/test/java/org/apache/cxf/attachment/AttachmentUtilTest.java
+++ b/core/src/test/java/org/apache/cxf/attachment/AttachmentUtilTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.attachment;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java b/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
index 4e8fdd0..7fc62bc 100644
--- a/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
@@ -36,7 +36,6 @@ import org.apache.cxf.transport.DestinationFactoryManager;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java
index b217db1..97067a1 100644
--- a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java
@@ -27,7 +27,6 @@ import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.resource.ResourceResolver;
import org.apache.cxf.resource.SinglePropertyResolver;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/bus/extension/TextExtensionFragmentParserTest.java b/core/src/test/java/org/apache/cxf/bus/extension/TextExtensionFragmentParserTest.java
index b89db23..8d555d1 100644
--- a/core/src/test/java/org/apache/cxf/bus/extension/TextExtensionFragmentParserTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/extension/TextExtensionFragmentParserTest.java
@@ -23,7 +23,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.List;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java b/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java
index 0b4a733..1e17bf2 100644
--- a/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java
@@ -27,7 +27,6 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java b/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java
index 2839b8d..66a3bd3 100644
--- a/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java
@@ -22,7 +22,6 @@ package org.apache.cxf.bus.managers;
import org.apache.cxf.endpoint.DummyServer;
import org.apache.cxf.endpoint.Server;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java b/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java
index a2211fc..8646451 100644
--- a/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java
@@ -29,7 +29,6 @@ import org.apache.cxf.endpoint.ServiceContractResolver;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java b/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java
index 22c7e38..e0ae15a 100644
--- a/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java
@@ -36,7 +36,6 @@ import org.osgi.framework.ServiceReference;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java b/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java
index 6c9591d..52813af 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java
@@ -20,7 +20,6 @@
package org.apache.cxf.bus.spring;
import org.springframework.beans.BeansException;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java b/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java
index cfab4bd..afc50c33 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java
@@ -25,7 +25,6 @@ import org.springframework.context.support.AbstractRefreshableApplicationContext
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java b/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
index f1d9800..da94198 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
@@ -34,7 +34,6 @@ import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.message.Message;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java b/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
index 0624042..5d27611 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
@@ -51,7 +51,6 @@ import org.apache.cxf.workqueue.WorkQueueManager;
import org.easymock.EasyMock;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java b/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java
index 86dfeb8..da36403 100644
--- a/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java
+++ b/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java
@@ -23,7 +23,6 @@ import org.apache.cxf.bus.managers.CXFBusLifeCycleManager;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Test;
public class CXFBusLifeCycleManagerTest {
diff --git a/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java b/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
index 88cf302..bec3355 100644
--- a/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
+++ b/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
@@ -33,7 +33,6 @@ import javax.jws.WebService;
import javax.xml.ws.WebServiceContext;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/common/classloader/ClassLoaderUtilsTest.java b/core/src/test/java/org/apache/cxf/common/classloader/ClassLoaderUtilsTest.java
index b3ee5f4..e43ed70 100644
--- a/core/src/test/java/org/apache/cxf/common/classloader/ClassLoaderUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/classloader/ClassLoaderUtilsTest.java
@@ -23,7 +23,6 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/common/i18n/BundleUtilsTest.java b/core/src/test/java/org/apache/cxf/common/i18n/BundleUtilsTest.java
index 0dc51a6..e1b1f65 100644
--- a/core/src/test/java/org/apache/cxf/common/i18n/BundleUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/i18n/BundleUtilsTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.common.i18n;
import java.util.ResourceBundle;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java b/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java
index 2fe040f..70a7331 100644
--- a/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java
+++ b/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java
@@ -28,7 +28,6 @@ import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java b/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
index af9b609..48085f1 100644
--- a/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
+++ b/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
@@ -39,7 +39,6 @@ import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.resource.ResourceResolver;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/common/jaxb/JAXBUtilsTest.java b/core/src/test/java/org/apache/cxf/common/jaxb/JAXBUtilsTest.java
index 71b40c5..44e6d5e 100644
--- a/core/src/test/java/org/apache/cxf/common/jaxb/JAXBUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/jaxb/JAXBUtilsTest.java
@@ -27,7 +27,6 @@ import com.sun.xml.bind.marshaller.MinimumEscapeHandler;
import com.sun.xml.bind.v2.runtime.JAXBContextImpl;
import com.sun.xml.bind.v2.runtime.MarshallerImpl;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java b/core/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java
index 7dec5c1..51e1dbd 100644
--- a/core/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java
@@ -28,7 +28,6 @@ import org.apache.cxf.common.i18n.BundleUtils;
import org.easymock.EasyMock;
import org.easymock.IArgumentMatcher;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/common/logging/RegexLoggingFilterTest.java b/core/src/test/java/org/apache/cxf/common/logging/RegexLoggingFilterTest.java
index f15a60e..330d301 100644
--- a/core/src/test/java/org/apache/cxf/common/logging/RegexLoggingFilterTest.java
+++ b/core/src/test/java/org/apache/cxf/common/logging/RegexLoggingFilterTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.common.logging;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/common/security/SimpleGroupTest.java b/core/src/test/java/org/apache/cxf/common/security/SimpleGroupTest.java
index 61576d2..4c2399a 100644
--- a/core/src/test/java/org/apache/cxf/common/security/SimpleGroupTest.java
+++ b/core/src/test/java/org/apache/cxf/common/security/SimpleGroupTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.common.security;
import java.security.Principal;
import java.util.Enumeration;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/common/security/SimplePrincipalTest.java b/core/src/test/java/org/apache/cxf/common/security/SimplePrincipalTest.java
index 9311fb7..9e033db 100644
--- a/core/src/test/java/org/apache/cxf/common/security/SimplePrincipalTest.java
+++ b/core/src/test/java/org/apache/cxf/common/security/SimplePrincipalTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.common.security;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/common/util/ASMHelperTest.java b/core/src/test/java/org/apache/cxf/common/util/ASMHelperTest.java
index 95597a1..a565ff1 100644
--- a/core/src/test/java/org/apache/cxf/common/util/ASMHelperTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/ASMHelperTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.common.util;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java b/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
index 8cbc04f..933e0dc 100644
--- a/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
@@ -25,7 +25,6 @@ import java.nio.charset.StandardCharsets;
import org.apache.cxf.helpers.IOUtils;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertArrayEquals;
diff --git a/core/src/test/java/org/apache/cxf/common/util/ClassHelperTest.java b/core/src/test/java/org/apache/cxf/common/util/ClassHelperTest.java
index af10a34..8877481 100644
--- a/core/src/test/java/org/apache/cxf/common/util/ClassHelperTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/ClassHelperTest.java
@@ -29,7 +29,6 @@ import org.springframework.aop.framework.ProxyFactory;
import org.easymock.EasyMock;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java
index fd6f6eb..cb7b173 100644
--- a/core/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java
@@ -23,7 +23,6 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Dictionary;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
index 2d54560..57188c7 100644
--- a/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
@@ -29,7 +29,6 @@ import java.util.Collections;
import org.apache.cxf.validation.BeanValidationProvider;
import org.apache.cxf.validation.ValidationConfiguration;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/common/util/PropertiesLoaderUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/PropertiesLoaderUtilsTest.java
index a16b899..54542ae 100644
--- a/core/src/test/java/org/apache/cxf/common/util/PropertiesLoaderUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/PropertiesLoaderUtilsTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.common.util;
import java.util.*;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/common/util/PropertyUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/PropertyUtilsTest.java
index c2c4fb5..8c2bfa2 100644
--- a/core/src/test/java/org/apache/cxf/common/util/PropertyUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/PropertyUtilsTest.java
@@ -22,7 +22,6 @@ package org.apache.cxf.common.util;
import java.util.HashMap;
import java.util.Map;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
diff --git a/core/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java
index f155d27..5c4e452 100644
--- a/core/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.common.util;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/common/util/URIParserUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/URIParserUtilsTest.java
index 77ad7d1..73a1744 100644
--- a/core/src/test/java/org/apache/cxf/common/util/URIParserUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/URIParserUtilsTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.common.util;
import java.net.URISyntaxException;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/common/util/UrlUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/UrlUtilsTest.java
index 6fc0a91..a91a4ef 100644
--- a/core/src/test/java/org/apache/cxf/common/util/UrlUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/UrlUtilsTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.common.util;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtilsTest.java
index 2361ccc..ece7af6 100644
--- a/core/src/test/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtilsTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.common.util;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java b/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java
index e5fc74d..3cf7661 100644
--- a/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java
+++ b/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java
@@ -57,7 +57,6 @@ import org.apache.ws.commons.schema.XmlSchemaSimpleType;
import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
import org.apache.ws.commons.schema.utils.NamespaceMap;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.fail;
diff --git a/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java b/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
index 9b2a34b..21c57af 100644
--- a/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
+++ b/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
@@ -34,7 +34,6 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java b/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java
index 28b590f..52b1f07 100644
--- a/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java
+++ b/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.continuations;
import org.apache.cxf.common.i18n.UncheckedException;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNull;
diff --git a/core/src/test/java/org/apache/cxf/databinding/AbstractDataBindingTest.java b/core/src/test/java/org/apache/cxf/databinding/AbstractDataBindingTest.java
index 5194cdc..a7e3c39 100644
--- a/core/src/test/java/org/apache/cxf/databinding/AbstractDataBindingTest.java
+++ b/core/src/test/java/org/apache/cxf/databinding/AbstractDataBindingTest.java
@@ -22,7 +22,6 @@ package org.apache.cxf.databinding;
import java.util.HashMap;
import java.util.Map;
-import org.junit.Assert;
import org.junit.Test;
/**
diff --git a/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java b/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
index d0427d2..b35956f 100755
--- a/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
@@ -30,7 +30,6 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.staxutils.StaxUtils;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
diff --git a/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java b/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java
index 6250231..5167ec7 100755
--- a/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java
+++ b/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java
@@ -25,7 +25,6 @@ import org.apache.cxf.service.Service;
import org.apache.cxf.service.ServiceImpl;
import org.apache.cxf.service.model.EndpointInfo;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
diff --git a/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java b/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java
index ea2eac1..5452eeb 100644
--- a/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java
@@ -20,7 +20,6 @@ package org.apache.cxf.helpers;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
diff --git a/core/src/test/java/org/apache/cxf/helpers/IOUtilsTest.java b/core/src/test/java/org/apache/cxf/helpers/IOUtilsTest.java
index 53f8b88..ccd965d 100644
--- a/core/src/test/java/org/apache/cxf/helpers/IOUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/IOUtilsTest.java
@@ -24,7 +24,6 @@ import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.PushbackInputStream;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java b/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java
index 70df082..6f7a722 100644
--- a/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.helpers;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java b/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
index d5a4487..70bd298 100644
--- a/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
@@ -26,7 +26,6 @@ import org.apache.cxf.message.Message;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java
index c03d684..81b6df3 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java
@@ -32,7 +32,6 @@ import org.easymock.EasyMock;
import org.easymock.IAnswer;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java
index 5a8d14e..8fdf531 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java
@@ -39,7 +39,6 @@ import org.apache.cxf.service.model.EndpointInfo;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
index 1eac10e..9f8e2bf 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
@@ -41,7 +41,6 @@ import org.apache.cxf.service.model.OperationInfo;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java
index 5de9f9c..bf08195 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java
@@ -34,7 +34,6 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/DefaultSecurityContextTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/DefaultSecurityContextTest.java
index ad55e1b..3a80cfc 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/security/DefaultSecurityContextTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/DefaultSecurityContextTest.java
@@ -29,7 +29,6 @@ import org.apache.cxf.common.security.SimpleGroup;
import org.apache.cxf.common.security.SimplePrincipal;
import org.apache.cxf.security.LoginSecurityContext;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
index 1e3b3ba..ab21a15 100755
--- a/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
@@ -23,7 +23,6 @@ import javax.security.auth.callback.Callback;
import javax.security.auth.callback.NameCallback;
import javax.security.auth.callback.PasswordCallback;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImplTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImplTest.java
index 0f5a989..9e94d5c 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImplTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImplTest.java
@@ -27,7 +27,6 @@ import javax.security.auth.Subject;
import org.apache.cxf.common.security.SimplePrincipal;
import org.apache.cxf.security.LoginSecurityContext;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
index ab822c0..2c5a16e 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
@@ -36,7 +36,6 @@ import org.apache.cxf.service.invoker.MethodDispatcher;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
index 94e7195..fdf1399 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
@@ -33,7 +33,6 @@ import org.apache.cxf.service.invoker.MethodDispatcher;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java b/core/src/test/java/org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java
index a85f293..ee594cc 100644
--- a/core/src/test/java/org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java
+++ b/core/src/test/java/org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.internal;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
index afca2b6..0fc7d85 100755
--- a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
+++ b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
@@ -36,7 +36,6 @@ import org.apache.cxf.helpers.IOUtils;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java b/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
index fcb2cce..e5acb3b 100644
--- a/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
+++ b/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
@@ -38,7 +38,6 @@ import org.apache.cxf.message.Message;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/resource/ClassLoaderResolverTest.java b/core/src/test/java/org/apache/cxf/resource/ClassLoaderResolverTest.java
index c81683c..7f91f03 100644
--- a/core/src/test/java/org/apache/cxf/resource/ClassLoaderResolverTest.java
+++ b/core/src/test/java/org/apache/cxf/resource/ClassLoaderResolverTest.java
@@ -29,7 +29,6 @@ import java.net.URL;
import java.net.URLClassLoader;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/resource/DefaultResourceManagerTest.java b/core/src/test/java/org/apache/cxf/resource/DefaultResourceManagerTest.java
index ac06d66..04ea91e 100644
--- a/core/src/test/java/org/apache/cxf/resource/DefaultResourceManagerTest.java
+++ b/core/src/test/java/org/apache/cxf/resource/DefaultResourceManagerTest.java
@@ -25,7 +25,6 @@ import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java b/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java
index 94c9e2f..13f4ee8 100644
--- a/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java
+++ b/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java
@@ -24,7 +24,6 @@ import java.net.URL;
import org.apache.cxf.helpers.IOUtils;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -243,4 +242,4 @@ public class URIResolverTest {
return super.findResource(name);
}
}
-}
\ No newline at end of file
+}
diff --git a/core/src/test/java/org/apache/cxf/service/model/BindingFaultInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/BindingFaultInfoTest.java
index 2de2920..5088274 100644
--- a/core/src/test/java/org/apache/cxf/service/model/BindingFaultInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/BindingFaultInfoTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.service.model;
import javax.xml.namespace.QName;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/service/model/BindingMessageInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/BindingMessageInfoTest.java
index 7409c0c..33c8826 100644
--- a/core/src/test/java/org/apache/cxf/service/model/BindingMessageInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/BindingMessageInfoTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.service.model;
import javax.xml.namespace.QName;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/service/model/BindingOperationInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/BindingOperationInfoTest.java
index bd5fa47..1adbafe 100644
--- a/core/src/test/java/org/apache/cxf/service/model/BindingOperationInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/BindingOperationInfoTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.service.model;
import javax.xml.namespace.QName;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/service/model/FaultInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/FaultInfoTest.java
index e08fc35..3a34f66 100644
--- a/core/src/test/java/org/apache/cxf/service/model/FaultInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/FaultInfoTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.service.model;
import javax.xml.namespace.QName;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/service/model/InterfaceInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/InterfaceInfoTest.java
index fb6623a..f3ad1fe 100644
--- a/core/src/test/java/org/apache/cxf/service/model/InterfaceInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/InterfaceInfoTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.service.model;
import javax.xml.namespace.QName;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java
index a662f09..d8dac82 100644
--- a/core/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.service.model;
import javax.xml.namespace.QName;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/service/model/MessagePartInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/MessagePartInfoTest.java
index db689b9..b11e2e9 100644
--- a/core/src/test/java/org/apache/cxf/service/model/MessagePartInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/MessagePartInfoTest.java
@@ -22,7 +22,6 @@ package org.apache.cxf.service.model;
import javax.xml.namespace.QName;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/service/model/OperationInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/OperationInfoTest.java
index a81fa9e..3055791 100644
--- a/core/src/test/java/org/apache/cxf/service/model/OperationInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/OperationInfoTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.service.model;
import javax.xml.namespace.QName;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/staxutils/DepthRestrictingStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/DepthRestrictingStreamReaderTest.java
index 0562557..d9333d4 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/DepthRestrictingStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/DepthRestrictingStreamReaderTest.java
@@ -23,7 +23,6 @@ import java.io.ByteArrayOutputStream;
import javax.xml.stream.XMLStreamReader;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
diff --git a/core/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java
index 12174e4..f5871d9 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java
@@ -22,7 +22,6 @@ package org.apache.cxf.staxutils;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java
index 04bd40c..ca1ff7c 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java
@@ -24,7 +24,6 @@ import java.io.StringReader;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/staxutils/PartialXMLStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/PartialXMLStreamReaderTest.java
index 3e7efe6..e8494e0 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/PartialXMLStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/PartialXMLStreamReaderTest.java
@@ -27,7 +27,6 @@ import javax.xml.stream.XMLStreamWriter;
import org.w3c.dom.Document;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java
index e6aec72..123b8a2 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java
@@ -30,7 +30,6 @@ import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/staxutils/StaxStreamFilterTest.java b/core/src/test/java/org/apache/cxf/staxutils/StaxStreamFilterTest.java
index 51125b6..c1c694d 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/StaxStreamFilterTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/StaxStreamFilterTest.java
@@ -25,7 +25,6 @@ import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java
index 3382b05..b2612fd 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java
@@ -34,7 +34,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContextTest.java b/core/src/test/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContextTest.java
index cd594f4..ac6f216 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContextTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContextTest.java
@@ -25,7 +25,6 @@ import java.util.Set;
import javax.xml.namespace.NamespaceContext;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
index 0fbaa65..cf99e6f 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
@@ -33,7 +33,6 @@ import javax.xml.stream.XMLStreamReader;
import org.apache.cxf.staxutils.PartialXMLStreamReader;
import org.apache.cxf.staxutils.StaxUtils;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java b/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
index 5c377f2..13769f0 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
@@ -43,7 +43,6 @@ import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.staxutils.W3CDOMStreamWriter;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java b/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java
index 5bf03b4..278600c 100644
--- a/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java
+++ b/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java
@@ -29,7 +29,6 @@ import org.apache.cxf.phase.PhaseInterceptorChain;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java b/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java
index d99d64b..33af956 100644
--- a/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java
+++ b/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.transport;
import java.net.URL;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java b/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
index 39af3d9..2e007a5 100644
--- a/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
+++ b/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
@@ -36,7 +36,6 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/version/VersionTest.java b/core/src/test/java/org/apache/cxf/version/VersionTest.java
index 27b780f..1adbf0b 100644
--- a/core/src/test/java/org/apache/cxf/version/VersionTest.java
+++ b/core/src/test/java/org/apache/cxf/version/VersionTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.version;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
diff --git a/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java b/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
index defd9df..9844e72 100644
--- a/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
+++ b/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
@@ -26,7 +26,6 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java
index 1c80067..bc64185 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java
@@ -26,7 +26,6 @@ import java.io.OutputStream;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
index 658017f..100505f 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
@@ -28,7 +28,6 @@ import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.IOUtils;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java
index d6281d9..464d2b0 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java
@@ -26,7 +26,6 @@ import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java
index c676923..611e4ed 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java
@@ -22,7 +22,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
index b29f0cf..46f27e3 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
@@ -33,7 +33,6 @@ import javax.security.auth.Subject;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
index 757ba52..2ff6fac 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
@@ -28,7 +28,6 @@ import javax.security.auth.Subject;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java
index 2339e2d..3bef1fa 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java
@@ -24,7 +24,6 @@ import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceBeanTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceBeanTest.java
index 11bc79e..be12b3d 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceBeanTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceBeanTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.jca.core.resourceadapter;
-import org.junit.Assert;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java
index db7a09e..bc1e2e5 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java
@@ -20,7 +20,6 @@ package org.apache.cxf.jca.core.resourceadapter;
import java.util.Properties;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java
index 8faaf90..b296559 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java
@@ -22,7 +22,6 @@ import java.net.URL;
import javax.xml.namespace.QName;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
index afd99ff..955cb77 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
@@ -31,7 +31,6 @@ import javax.resource.spi.ManagedConnectionFactory;
import javax.xml.namespace.QName;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
index 2c48fcf..16baf6f 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
@@ -38,13 +38,11 @@ import org.apache.cxf.connector.CXFConnectionFactory;
import org.apache.hello_world_soap_http.Greeter;
import org.easymock.EasyMock;
-import org.junit.Assert;
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;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -329,4 +327,4 @@ class ManagedConnectionFactoryImplTester extends ManagedConnectionFactoryImpl {
initCalledCount++;
}
-}
\ No newline at end of file
+}
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
index ff39a23..ce28f0d 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
@@ -32,7 +32,6 @@ import org.apache.cxf.BusFactory;
import org.apache.hello_world_soap_http.Greeter;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Before;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
index f004268..ab98fab 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
@@ -35,7 +35,6 @@ import org.apache.cxf.Bus;
import org.apache.cxf.jca.core.resourceadapter.ResourceBean;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
index ed327b9..fc2a773 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
@@ -27,7 +27,6 @@ import org.apache.cxf.jca.cxf.ManagedConnectionFactoryImpl;
import org.apache.cxf.jca.cxf.ManagedConnectionImpl;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java
index b2ff052..cf501d5 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java
@@ -24,7 +24,6 @@ import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java
index 0e59707..0b8cfc8 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.jca.servant;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java
index 873d5bc..91fe0b3 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.jca.servant;
import javax.xml.namespace.QName;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
index 3748b0b..f846abf 100644
--- a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
+++ b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
@@ -42,7 +42,6 @@ import org.apache.cxf.service.model.EndpointInfo;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
index 64f17f6..6bf3637 100644
--- a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
+++ b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
@@ -54,7 +54,6 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java
index bce9d80..80b5832 100644
--- a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java
+++ b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java
@@ -49,7 +49,6 @@ import org.apache.headers.rpc_lit.PingMeFault;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandlerTest.java b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandlerTest.java
index 2d3ccdb..68bd82e 100644
--- a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandlerTest.java
+++ b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandlerTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.binding.coloc.blueprint;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
index 1d86305..e53f287 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
@@ -43,7 +43,6 @@ import org.apache.cxf.wsdl11.WSDLServiceFactory;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
index e7768f8..9a2e2d5 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
@@ -28,11 +28,9 @@ import org.apache.cxf.message.MessageImpl;
import org.omg.CORBA.ORB;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -88,4 +86,4 @@ public class CorbaBindingTest {
assertEquals(1, fault.size());*/
}
-}
\ No newline at end of file
+}
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
index fc187cc..d4bdf1e 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
@@ -58,7 +58,6 @@ import org.omg.CORBA.TypeCode;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java
index 4be9547..80be106 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java
@@ -25,11 +25,9 @@ import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
public class CorbaDestinationTest {
@@ -94,4 +92,4 @@ public class CorbaDestinationTest {
destination.shutdown();
}*/
-}
\ No newline at end of file
+}
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java
index 9e8f2ac..5c65971 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java
@@ -31,7 +31,6 @@ import org.omg.CORBA.TypeCode;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
index 0da3718..e89f7a6 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
@@ -48,7 +48,6 @@ import org.omg.CORBA.TypeCode;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java
index c190844..97cbf3e 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java
@@ -22,7 +22,6 @@ import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.wsdl.CorbaType;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java
index c22f122..2cf99d6 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java
@@ -36,14 +36,9 @@ import org.omg.CORBA.ORB;
import org.omg.CORBA.ServerRequest;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-
public class CorbaDSIServantTest {
protected static ORB orb;
protected static Bus bus;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
index d0b9781..a3d7603 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
@@ -52,7 +52,6 @@ import org.omg.CORBA.portable.InputStream;
import org.omg.CORBA.portable.OutputStream;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
index 25ec429..204b3bc 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
@@ -45,7 +45,6 @@ import org.omg.CORBA.portable.InputStream;
import org.omg.CORBA.portable.OutputStream;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
index 0cf5cfc..ad8fa14 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
@@ -23,7 +23,6 @@ import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.types.CorbaTypeEventProducer;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java
index 7574086..d7d3d48 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java
@@ -22,7 +22,6 @@ import javax.xml.stream.XMLStreamException;
import org.apache.cxf.binding.corba.types.AbstractCorbaTypeListener;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
index b873545..9e377c9 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
@@ -30,7 +30,6 @@ import org.omg.CORBA.portable.InputStream;
import org.omg.CORBA.portable.OutputStream;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
index 06a89d4..5598328 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
@@ -29,7 +29,6 @@ import org.omg.CORBA.TCKind;
import org.omg.CORBA.TypeCode;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
index 020a561..3fe6097 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
@@ -27,7 +27,6 @@ import org.omg.CORBA.TCKind;
import org.omg.CORBA.TypeCode;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
index 62367e1..199208c 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
@@ -27,7 +27,6 @@ import org.omg.CORBA.ORB;
import org.omg.CORBA.TypeCode;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java
index ed70760..dc6275d 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java
@@ -27,7 +27,6 @@ import org.omg.CORBA.ORB;
import org.omg.CORBA.TypeCode;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java
index 920a490..79575ab 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java
@@ -38,7 +38,6 @@ import org.omg.CORBA.ORB;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
index 2773346..bd28609 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
@@ -27,7 +27,6 @@ import org.omg.CORBA.TCKind;
import org.omg.CORBA.TypeCode;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
index e360070..fdeb4b1 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
@@ -25,7 +25,6 @@ import org.omg.CORBA.ORB;
import org.omg.CORBA.TCKind;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
index e697e9d..769aadd 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
@@ -27,7 +27,6 @@ import org.omg.CORBA.TCKind;
import org.omg.CORBA.TypeCode;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java
index 1ab67c2..d7b9e2c 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java
@@ -31,7 +31,6 @@ import org.omg.CORBA.TCKind;
import org.omg.CORBA.TypeCode;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java
index f406425..5fdd505 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java
@@ -25,7 +25,6 @@ import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java
index 5b1e68e..9ce6065 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java
@@ -31,7 +31,6 @@ import org.omg.CORBA.TCKind;
import org.omg.CORBA.TypeCode;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
index 46c5efc..495b4d8 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
@@ -43,7 +43,6 @@ import org.apache.cxf.wsdl11.WSDLServiceBuilder;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
index 820f694..79c609e 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
@@ -35,7 +35,6 @@ import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.InterfaceInfo;
import org.apache.cxf.service.model.ServiceInfo;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
index e32615a..ebf4cd4 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
@@ -47,7 +47,6 @@ import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.cxf.wsdl11.WSDLServiceBuilder;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
index f9e0dfa..052d12a 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
@@ -23,7 +23,6 @@ package org.apache.cxf.binding.soap;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
index c19a5df..e847964 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
@@ -48,7 +48,6 @@ import org.apache.cxf.wsdl11.WSDLServiceBuilder;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import static org.junit.Assert.assertNotNull;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java
index 6befb26..24efefa 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.binding.soap.blueprint;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptorTest.java
index 9e64cc3..e4b097f 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptorTest.java
@@ -29,7 +29,6 @@ import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.staxutils.StaxUtils;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
index 2f00a09..a7f6fd2 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
@@ -33,7 +33,6 @@ import org.apache.cxf.message.Message;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
index 8c7085b..1e6ca11 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
@@ -51,7 +51,6 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.staxutils.StaxUtils;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
index 4ca2507..a790eb8 100755
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
@@ -40,7 +40,6 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
index 263ef5d..3986ba6 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
@@ -28,7 +28,6 @@ import org.apache.cxf.binding.soap.SoapFault;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
index d2ac3e8..460a81a 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
@@ -42,7 +42,6 @@ import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.staxutils.StaxUtils;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
index 96188f1..3cd41ae 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
@@ -25,7 +25,6 @@ import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.message.Message;
import org.apache.cxf.service.model.BindingInfo;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
index 765ee64..a6255f4 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
@@ -56,7 +56,6 @@ import org.apache.cxf.wsdl11.WSDLServiceFactory;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import static org.junit.Assert.assertNotNull;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
index e96b1c5..62f9ea8 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
@@ -56,7 +56,6 @@ import org.apache.hello_world_soap_http.types.GreetMe;
import org.apache.hello_world_soap_http.types.GreetMeResponse;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
index 4bdc083..57c0669 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
@@ -55,7 +55,6 @@ import org.apache.hello_world_soap_http.types.GreetMe;
import org.apache.hello_world_soap_http.types.GreetMeResponse;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
index 2171c7b..62541d9b 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
@@ -72,7 +72,6 @@ import org.apache.hello_world_soap_http.types.GreetMeOneWay;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
index 204afe0..8f6c681 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
@@ -67,7 +67,6 @@ import org.apache.hello_world_soap_http.types.GreetMe;
import org.apache.hello_world_soap_http.types.GreetMeResponse;
import org.apache.hello_world_soap_http.types.StringStruct;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
index 85a68b9..819ae32 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
@@ -31,7 +31,6 @@ import org.apache.cxf.common.jaxb.JAXBUtils;
import org.apache.cxf.common.util.ReflectionUtil;
import org.apache.hello_world_soap_http.types.GreetMe;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
index 1180307..6320c0e 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
@@ -30,7 +30,6 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.cxf.databinding.WrapperHelper;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
index 318c8fc..473ffcf 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
@@ -55,7 +55,6 @@ import org.apache.hello_world_soap_http.types.GreetMeResponse;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import static org.easymock.EasyMock.createNiceControl;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java
index b710a40..eb5b794 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java
@@ -22,7 +22,6 @@ import java.lang.reflect.Method;
import javax.xml.bind.annotation.XmlAccessType;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.fail;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
index fa2de23..f0430dc 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
@@ -39,7 +39,6 @@ import org.apache.hello_world_soap_http.types.GreetMe;
import org.apache.hello_world_soap_http.types.GreetMeResponse;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java
index b79e09b..09f7b31 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java
@@ -45,7 +45,6 @@ import org.apache.hello_world_soap_http.types.GreetMe;
import org.apache.hello_world_soap_http.types.GreetMeResponse;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/features/clustering/src/test/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandlerTest.java b/rt/features/clustering/src/test/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandlerTest.java
index 54025b9..7a72992 100644
--- a/rt/features/clustering/src/test/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandlerTest.java
+++ b/rt/features/clustering/src/test/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandlerTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.clustering.blueprint;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java
index 048e261..18ea4b0 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java
@@ -29,7 +29,6 @@ import org.apache.cxf.jaxrs.provider.ServerProviderFactory;
import org.apache.cxf.jaxrs.resources.BookStore;
import org.apache.cxf.message.MessageImpl;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBeanTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBeanTest.java
index a8e8b7a..f84f9d1 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBeanTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBeanTest.java
@@ -29,7 +29,6 @@ import org.apache.cxf.jaxrs.model.MethodDispatcher;
import org.apache.cxf.jaxrs.model.OperationResourceInfo;
import org.apache.cxf.jaxrs.model.URITemplate;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
index eb286b8..d80089d 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
@@ -58,7 +58,6 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandlerTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandlerTest.java
index ce0a9b1..dbe926f 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandlerTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandlerTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.jaxrs.blueprint;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java
index 4b03bf3..8683a18 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java
@@ -49,7 +49,6 @@ import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.transport.http.AbstractHTTPDestination;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/form/FormTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/form/FormTest.java
index 3049f77..c77ecd0 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/form/FormTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/form/FormTest.java
@@ -22,7 +22,6 @@ import javax.ws.rs.core.Form;
import org.apache.cxf.jaxrs.utils.FormUtils;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentTest.java
index df47318..ae99d96 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentTest.java
@@ -24,7 +24,6 @@ import javax.mail.util.ByteArrayDataSource;
import org.apache.cxf.jaxrs.impl.MetadataMap;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/ContentDispositionTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/ContentDispositionTest.java
index 3b8d543..045958c 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/ContentDispositionTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/ContentDispositionTest.java
@@ -20,7 +20,6 @@
package org.apache.cxf.jaxrs.ext.multipart;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBodyTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBodyTest.java
index b16a3f9..9062678 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBodyTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBodyTest.java
@@ -27,7 +27,6 @@ import javax.mail.util.ByteArrayDataSource;
import org.apache.cxf.jaxrs.impl.MetadataMap;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java
index 30ca101..eea34d5 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java
@@ -36,7 +36,6 @@ import org.w3c.dom.Node;
import org.apache.ws.commons.schema.constants.Constants;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/AsyncResponseImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/AsyncResponseImplTest.java
index 4b4ae79..979dde4 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/AsyncResponseImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/AsyncResponseImplTest.java
@@ -33,7 +33,6 @@ import org.apache.cxf.transport.http.Servlet3ContinuationProvider;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProviderTest.java
index 3e555ea..862c74f 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProviderTest.java
@@ -28,7 +28,6 @@ import javax.ws.rs.core.CacheControl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java
index 33b24ef..600a4cd 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java
@@ -49,7 +49,6 @@ import javax.ws.rs.ext.MessageBodyReader;
import org.apache.cxf.common.logging.LogUtils;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CookieHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CookieHeaderProviderTest.java
index 4538940..b440014 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CookieHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CookieHeaderProviderTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.jaxrs.impl;
import javax.ws.rs.core.Cookie;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/DateHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/DateHeaderProviderTest.java
index 013b95d..2ba6ce1 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/DateHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/DateHeaderProviderTest.java
@@ -25,7 +25,6 @@ import javax.ws.rs.ServiceUnavailableException;
import org.apache.cxf.jaxrs.utils.HttpUtils;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProviderTest.java
index 66e1688..c829015 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProviderTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.jaxrs.impl;
import javax.ws.rs.core.EntityTag;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
index b162c80..c090305 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
@@ -39,7 +39,6 @@ import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java
index 1ce55f1..bbcf544 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java
@@ -27,7 +27,6 @@ import javax.ws.rs.Path;
import javax.ws.rs.core.Link;
import javax.ws.rs.core.MediaType;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkHeaderProviderTest.java
index c463c8d..118c5bb 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkHeaderProviderTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.jaxrs.impl;
import javax.ws.rs.core.Link;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProviderTest.java
index 64e6ad4..3493e8c 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProviderTest.java
@@ -25,7 +25,6 @@ import java.util.Map;
import javax.ws.rs.core.MediaType;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java
index ca42227..ff58c32 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java
@@ -29,7 +29,6 @@ import java.util.Map;
import javax.ws.rs.core.MultivaluedMap;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProviderTest.java
index f9f2950..37fd341 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProviderTest.java
@@ -25,7 +25,6 @@ import javax.ws.rs.core.NewCookie;
import org.apache.cxf.jaxrs.utils.HttpUtils;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/PathSegmentImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/PathSegmentImplTest.java
index e76e36d..a9257a9 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/PathSegmentImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/PathSegmentImplTest.java
@@ -22,7 +22,6 @@ package org.apache.cxf.jaxrs.impl;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.PathSegment;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java
index 681b3c9..0acb679 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java
@@ -38,7 +38,6 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java
index b70dddf..401b832 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java
@@ -36,7 +36,6 @@ import org.apache.cxf.transport.servlet.ServletDestination;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImplTest.java
index a75bc30..9177cfe 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImplTest.java
@@ -41,7 +41,6 @@ import javax.ws.rs.core.Variant;
import org.apache.cxf.jaxrs.utils.HttpUtils;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertArrayEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImplTest.java
index 0c7d1e0..5be6b58 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImplTest.java
@@ -28,7 +28,6 @@ import javax.ws.rs.core.UriBuilder;
import javax.ws.rs.core.Variant.VariantListBuilder;
import javax.ws.rs.ext.RuntimeDelegate;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertSame;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/SecurityContextImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/SecurityContextImplTest.java
index ff1631d..8c4590d 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/SecurityContextImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/SecurityContextImplTest.java
@@ -26,7 +26,6 @@ import java.util.TreeMap;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java
index 5551a3b..afcc78d 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java
@@ -37,7 +37,6 @@ import org.apache.cxf.jaxrs.resources.BookStore;
import org.apache.cxf.jaxrs.resources.UriBuilderWrongAnnotations;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java
index 816c8e5..f8a3f46 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java
@@ -46,7 +46,6 @@ import org.apache.cxf.transport.servlet.ServletDestination;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImplTest.java
index 3a1b45b..527265d 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImplTest.java
@@ -25,7 +25,6 @@ import java.util.Locale;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Variant;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/lifecycle/PerRequestResourceProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/lifecycle/PerRequestResourceProviderTest.java
index 9675246..a4995e4 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/lifecycle/PerRequestResourceProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/lifecycle/PerRequestResourceProviderTest.java
@@ -30,7 +30,6 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java
index 00384a7..95b0125 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java
@@ -47,7 +47,6 @@ import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.utils.ResourceUtils;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/OperationResourceInfoTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/OperationResourceInfoTest.java
index f7aa337..a1ee0c5 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/OperationResourceInfoTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/OperationResourceInfoTest.java
@@ -33,7 +33,6 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java
index 4fbb06a..a09898e 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java
@@ -28,7 +28,6 @@ import javax.ws.rs.core.MultivaluedMap;
import org.apache.cxf.jaxrs.impl.MetadataMap;
import org.apache.cxf.jaxrs.model.URITemplate.CurlyBraceTokenizer;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/doc/JavaDocProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/doc/JavaDocProviderTest.java
index ed0aaf0..d7c9e04 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/doc/JavaDocProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/doc/JavaDocProviderTest.java
@@ -23,7 +23,6 @@ import org.apache.cxf.jaxrs.model.OperationResourceInfo;
import org.apache.cxf.jaxrs.model.wadl.petstore.PetStore;
import org.apache.cxf.jaxrs.utils.ResourceUtils;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/BinaryDataProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/BinaryDataProviderTest.java
index 535428c..af9167d 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/BinaryDataProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/BinaryDataProviderTest.java
@@ -38,7 +38,6 @@ import javax.ws.rs.ext.MessageBodyWriter;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.jaxrs.impl.MetadataMap;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
index 0cb88ea..3f65da1 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
@@ -31,7 +31,6 @@ import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.jaxrs.ext.multipart.InputStreamDataSource;
import org.apache.cxf.jaxrs.impl.MetadataMap;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
index e73af66..86d900d 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
@@ -36,7 +36,6 @@ import javax.ws.rs.core.MultivaluedMap;
import org.apache.cxf.jaxrs.impl.MetadataMap;
import org.apache.cxf.jaxrs.utils.HttpUtils;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
index cf49905..9995ee5 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
@@ -97,7 +97,6 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
index ba41b74..8e88100 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
@@ -33,7 +33,6 @@ import javax.ws.rs.ext.MessageBodyWriter;
import org.apache.cxf.jaxrs.impl.MetadataMap;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
index 58b0c94..c3457b9 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
@@ -78,7 +78,6 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProviderTest.java
index e0d6377..8a98f8b 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProviderTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.jaxrs.provider;
import java.util.Collections;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java
index c8f2cad..f927627 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java
@@ -49,7 +49,6 @@ import org.apache.cxf.staxutils.StaxSource;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.staxutils.transform.InTransformReader;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java
index a3fa356..622229e 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java
@@ -25,7 +25,6 @@ import java.util.Map;
import org.apache.cxf.jaxrs.resources.Book;
import org.apache.cxf.jaxrs.resources.BookStore;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java
index a3a26ef..26f73d1 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java
@@ -47,7 +47,6 @@ import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.staxutils.StaxUtils;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilterTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilterTest.java
index c50e0a0..bc16cd8 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilterTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilterTest.java
@@ -25,7 +25,6 @@ import javax.ws.rs.core.Response;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java
index f059859..4a4f44e 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java
@@ -34,7 +34,6 @@ import org.apache.cxf.jaxrs.resources.SuperBook;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/SpringResourceFactoryTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/SpringResourceFactoryTest.java
index be58b2f..be7567e 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/SpringResourceFactoryTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/SpringResourceFactoryTest.java
@@ -31,7 +31,6 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java
index 57c3046..7b8b2bb 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java
@@ -30,7 +30,6 @@ import javax.ws.rs.core.UriInfo;
import org.apache.cxf.jaxrs.Customer;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ExceptionUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ExceptionUtilsTest.java
index b6f5f30..9a88a9c 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ExceptionUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ExceptionUtilsTest.java
@@ -29,7 +29,6 @@ import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java
index 3c87da2..d712cbf 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java
@@ -31,7 +31,6 @@ import org.apache.cxf.jaxrs.impl.MetadataMap;
import org.apache.cxf.message.Message;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
index ce6ec20..ec978ee 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
@@ -35,7 +35,6 @@ import org.apache.cxf.transport.Destination;
import org.apache.cxf.transport.http.AbstractHTTPDestination;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
index a870a99..d5eb7a7 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
@@ -54,7 +54,6 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
index bc0e674..c99d7f7 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
@@ -108,7 +108,6 @@ import org.apache.cxf.transport.http.AbstractHTTPDestination;
import org.easymock.EasyMock;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java
index 6fabc05..189fb7a 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java
@@ -49,7 +49,6 @@ import org.apache.cxf.jaxrs.resources.Book;
import org.apache.cxf.jaxrs.resources.BookInterface;
import org.apache.cxf.jaxrs.resources.Chapter;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
index 6318258..87f3410 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
@@ -47,7 +47,6 @@ import org.apache.hello_world_soap_http.GreeterImpl;
import org.apache.hello_world_soap_http.SOAPService;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java
index d4035c4..8a2539e 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java
@@ -38,7 +38,6 @@ import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.junit.After;
-import org.junit.Assert;
import static org.junit.Assert.assertTrue;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandlerTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandlerTest.java
index 9a543d9..583120f 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandlerTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandlerTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.jaxws.blueprint;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
index c6d0091..06ba3e0 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
@@ -32,7 +32,6 @@ import javax.xml.ws.handler.MessageContext.Scope;
import org.apache.cxf.message.MessageImpl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNull;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java
index f2a9ba2..748edbc 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java
@@ -28,7 +28,6 @@ import javax.mail.util.ByteArrayDataSource;
import org.apache.cxf.attachment.AttachmentImpl;
import org.apache.cxf.message.Attachment;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedMessageContextTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedMessageContextTest.java
index 49eb78f..92118c2 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedMessageContextTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedMessageContextTest.java
@@ -34,7 +34,6 @@ import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.message.Attachment;
import org.apache.cxf.message.Message;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java
index 5b3f75a..54e441e 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java
@@ -32,7 +32,6 @@ import org.apache.cxf.message.Message;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java
index e166295..99b32a5 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java
@@ -29,7 +29,6 @@ import javax.xml.ws.handler.LogicalHandler;
import javax.xml.ws.handler.LogicalMessageContext;
import javax.xml.ws.handler.MessageContext;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java
index a96d6de..2e36e28 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java
@@ -37,7 +37,6 @@ import org.apache.cxf.jaxws.handler.types.PortComponentHandlerType;
import org.apache.cxf.jaxws.handler.types.XsdStringType;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
index acbf297..7760243 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
@@ -51,7 +51,6 @@ import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/InitParamResourceResolverTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/InitParamResourceResolverTest.java
index 7216786..db08aab 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/InitParamResourceResolverTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/InitParamResourceResolverTest.java
@@ -22,7 +22,6 @@ package org.apache.cxf.jaxws.handler;
import java.util.HashMap;
import java.util.Map;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
index c5d82b1..74849dc 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
@@ -42,7 +42,6 @@ import org.apache.handlers.types.AddNumbersResponse;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java
index ad6b378..c640710 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java
@@ -34,7 +34,6 @@ import org.apache.cxf.message.MessageImpl;
import org.apache.handlers.types.AddNumbers;
import org.apache.handlers.types.ObjectFactory;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
index f9c97d3..c9316f9 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
@@ -74,7 +74,6 @@ import org.apache.cxf.staxutils.StaxUtils;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
index 5aa719f..95412db 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
@@ -58,7 +58,6 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java
index 4ba94d5..5fadc64 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java
@@ -40,7 +40,6 @@ import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfoTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfoTest.java
index 931c88c..2f4714a 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfoTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfoTest.java
@@ -24,7 +24,6 @@ import javax.xml.ws.WebServiceProvider;
import org.apache.cxf.calculator.CalculatorImpl;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java
index 050bc1e..f43d957 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java
@@ -42,7 +42,6 @@ import org.apache.cxf.wsdl11.WSDLServiceBuilder;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
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 35abef4..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
@@ -63,7 +63,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
public class JaxWsServiceFactoryBeanTest extends AbstractJaxWsTest {
@@ -310,4 +309,4 @@ public class JaxWsServiceFactoryBeanTest extends AbstractJaxWsTest {
}
}
-}
\ No newline at end of file
+}
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java
index 92ccbd5..d516a4e 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java
@@ -48,7 +48,6 @@ import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
import org.apache.neethi.Constants;
-import org.junit.Assert;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/HttpHandlerImplTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/HttpHandlerImplTest.java
index 43e3dca..2c8c6b8 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/HttpHandlerImplTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/HttpHandlerImplTest.java
@@ -26,7 +26,6 @@ import javax.xml.ws.spi.http.HttpHandler;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java
index f142b0d..01ea811 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java
@@ -36,7 +36,6 @@ import org.apache.cxf.transport.http.DestinationRegistryImpl;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java
index 3075554..e305cc7 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java
@@ -28,7 +28,6 @@ import org.apache.cxf.transport.Destination;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java
index 1a80afb..f710ae7 100644
--- a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java
+++ b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java
@@ -23,7 +23,6 @@ package org.apache.cxf.js.rhino;
import org.mozilla.javascript.Scriptable;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java
index dcf1865..e72bfae 100644
--- a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java
+++ b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java
@@ -27,7 +27,6 @@ import org.mozilla.javascript.EvaluatorException;
import org.mozilla.javascript.Scriptable;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java
index 31d98dc..aaa1263 100644
--- a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java
+++ b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java
@@ -25,7 +25,6 @@ import java.io.PrintStream;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandlerTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandlerTest.java
index 968f005..f7a7478 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandlerTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandlerTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.frontend.blueprint;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java
index 6840eda..22e2e8e 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java
@@ -22,7 +22,6 @@ import org.apache.cxf.BusFactory;
import org.springframework.context.support.AbstractApplicationContext;
import org.junit.After;
-import org.junit.Assert;
public class AbstractSimpleFrontendSpringTest {
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/BasicNameManagerTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/BasicNameManagerTest.java
index 5ba4b1a..af204f1 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/BasicNameManagerTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/BasicNameManagerTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.javascript;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java b/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
index 0261afc..2112e05 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
@@ -32,7 +32,6 @@ import org.apache.cxf.management.jmx.InstrumentationManagerImpl;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java b/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java
index 3131c5d..97494f1 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java
@@ -29,7 +29,6 @@ import org.apache.cxf.management.InstrumentationManager;
import org.apache.cxf.message.Message;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java b/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
index 47ab303..3023d2f 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
@@ -35,11 +35,9 @@ import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.OperationInfo;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Before;
-
public class AbstractMessageResponseTestBase {
protected static final QName SERVICE_NAME = new QName("http://org.apache.cxf", "hello");
protected static final QName OPERATION_NAME = new QName("http://org.apache.cxf", "world");
diff --git a/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java b/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java
index 1bc5991..c1c038f 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java
@@ -31,7 +31,6 @@ import org.apache.cxf.management.InstrumentationManager;
import org.apache.cxf.management.ManagementConstants;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java b/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java
index d6a10f9..d516da3 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java
@@ -31,7 +31,6 @@ import org.apache.cxf.management.jmx.export.AnnotationTestInstrumentation;
import org.apache.cxf.testutil.common.TestUtil;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorTest.java b/rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorTest.java
index 9075449..63d3fa1 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorTest.java
@@ -26,7 +26,6 @@ import javax.management.MBeanServerFactory;
import org.apache.cxf.testutil.common.TestUtil;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
diff --git a/rt/management/src/test/java/org/apache/cxf/management/jmx/export/ModelMBeanAssemblerTest.java b/rt/management/src/test/java/org/apache/cxf/management/jmx/export/ModelMBeanAssemblerTest.java
index 125023c..9ad3736 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/jmx/export/ModelMBeanAssemblerTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/jmx/export/ModelMBeanAssemblerTest.java
@@ -36,16 +36,13 @@ import javax.management.modelmbean.RequiredModelMBean;
import org.apache.cxf.management.jmx.export.runtime.ModelMBeanAssembler;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-
-
-public class ModelMBeanAssemblerTest extends Assert {
+public class ModelMBeanAssemblerTest {
protected static final String AGE_ATTRIBUTE = "Age";
@@ -219,4 +216,4 @@ public class ModelMBeanAssemblerTest extends Assert {
-}
\ No newline at end of file
+}
diff --git a/rt/management/src/test/java/org/apache/cxf/management/utils/ManagementConsoleTest.java b/rt/management/src/test/java/org/apache/cxf/management/utils/ManagementConsoleTest.java
index b5d4167..3cb3b9b 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/utils/ManagementConsoleTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/utils/ManagementConsoleTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.management.utils;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
index 8614677..a9b4d9b 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
@@ -45,7 +45,6 @@ import org.apache.cxf.phase.Phase;
import org.apache.cxf.transport.Conduit;
import org.apache.cxf.transport.http.HTTPConduit;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/WebClientTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/WebClientTest.java
index 31ec37b..a97706e 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/WebClientTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/WebClientTest.java
@@ -30,7 +30,6 @@ import javax.ws.rs.ext.ParamConverterProvider;
import org.apache.cxf.jaxrs.resources.BookInterface;
import org.apache.cxf.jaxrs.resources.BookStore;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandlerTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandlerTest.java
index 3561952..9ea4f8f 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandlerTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandlerTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.jaxrs.client.blueprint;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientCacheTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientCacheTest.java
index ef5c57b..6fe9f71 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientCacheTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientCacheTest.java
@@ -42,7 +42,6 @@ import org.apache.cxf.transport.local.LocalConduit;
import org.apache.cxf.transport.local.LocalTransportFactory;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientTest.java
index cef9b56..dbd6fbc 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientTest.java
@@ -25,7 +25,6 @@ import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.WebTarget;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientImplTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientImplTest.java
index 7882685..3aa3cdb 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientImplTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientImplTest.java
@@ -47,7 +47,6 @@ import org.apache.cxf.jaxrs.client.spec.ClientImpl.WebTargetImpl;
import org.apache.cxf.jaxrs.impl.ConfigurableImpl;
import org.apache.cxf.message.Message;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientRequestFilterTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientRequestFilterTest.java
index b85ff6d..11a3328 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientRequestFilterTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientRequestFilterTest.java
@@ -26,7 +26,6 @@ import javax.ws.rs.client.ClientRequestContext;
import javax.ws.rs.client.ClientRequestFilter;
import javax.ws.rs.core.Response;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/InvocationBuilderImplTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/InvocationBuilderImplTest.java
index 1828a0e..fb9e337 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/InvocationBuilderImplTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/InvocationBuilderImplTest.java
@@ -29,7 +29,6 @@ import javax.ws.rs.core.MultivaluedHashMap;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java
index c936333..e514ce1 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java
@@ -25,7 +25,6 @@ import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/Swagger2FeatureTest.java b/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/Swagger2FeatureTest.java
index 306b9c1..b21858e 100644
--- a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/Swagger2FeatureTest.java
+++ b/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/Swagger2FeatureTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.jaxrs.swagger;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtilsTest.java b/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtilsTest.java
index 86aabeb..9c60369 100644
--- a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtilsTest.java
+++ b/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtilsTest.java
@@ -24,7 +24,6 @@ import java.util.Map;
import org.apache.cxf.jaxrs.json.basic.JsonMapObject;
import org.apache.cxf.jaxrs.json.basic.JsonMapObjectReaderWriter;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtilsTest.java b/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtilsTest.java
index e046ae8..71bf469 100644
--- a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtilsTest.java
+++ b/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtilsTest.java
@@ -27,7 +27,6 @@ import org.apache.cxf.jaxrs.model.UserApplication;
import org.apache.cxf.jaxrs.model.UserOperation;
import org.apache.cxf.jaxrs.model.UserResource;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java
index 8654d26..d90d6cd 100644
--- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java
+++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java
@@ -30,7 +30,6 @@ import javax.ws.rs.container.PreMatching;
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
import org.apache.cxf.jaxrs.provider.ServerProviderFactory;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java
index fbbbb75..2ea3e37 100644
--- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java
+++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java
@@ -50,7 +50,6 @@ import org.apache.cxf.transport.servlet.ServletDestination;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
index 6be69cf..8c313fc 100644
--- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
+++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
@@ -61,7 +61,6 @@ import org.apache.ws.commons.schema.constants.Constants;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java b/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java
index 8902d09..4157cd7 100644
--- a/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java
+++ b/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java
@@ -26,7 +26,6 @@ import java.util.Map;
import org.apache.cxf.helpers.CastUtils;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryAllTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryAllTest.java
index 7fd9133..0e83ae7 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryAllTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryAllTest.java
@@ -29,7 +29,6 @@ import org.apache.cxf.jaxrs.resources.Book;
import org.apache.cxf.jaxrs.resources.TagVO;
import org.apache.cxf.message.MessageImpl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProviderTest.java
index befd4ff..403a40b 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProviderTest.java
@@ -38,7 +38,6 @@ import org.apache.cxf.jaxrs.impl.MetadataMap;
import org.apache.cxf.jaxrs.resources.AegisTestBean;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java
index ceda71e..251c114 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java
@@ -31,7 +31,6 @@ import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
import org.apache.abdera.parser.stax.FOMEntry;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java
index dd382e4..6a3845e 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java
@@ -30,7 +30,6 @@ import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
import org.apache.abdera.parser.stax.FOMFeed;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java
index 944e019..ce28783 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java
@@ -36,7 +36,6 @@ import org.apache.cxf.jaxrs.impl.MetadataMap;
import org.apache.cxf.jaxrs.provider.JAXBElementProvider;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
index d95c83c..b58598f 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
@@ -42,7 +42,6 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
index 403c1ec..99f3d65 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
@@ -79,7 +79,6 @@ import org.apache.cxf.staxutils.DelegatingXMLStreamWriter;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.staxutils.transform.TransformUtils;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java
index 4361028..034e9b4 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java
@@ -28,7 +28,6 @@ import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java
index da817ad..978fba4 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.jaxrs.ext.search;
import java.util.Date;
import java.util.Set;
-import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplCustomParserTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplCustomParserTest.java
index eac06f0..506e3fb 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplCustomParserTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplCustomParserTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.jaxrs.ext.search;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplTest.java
index 1a06d42..32f73b2 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplTest.java
@@ -26,7 +26,6 @@ import org.apache.cxf.jaxrs.ext.search.fiql.FiqlParser;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchUtilsTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchUtilsTest.java
index 24c296f..5f3c518 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchUtilsTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchUtilsTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.jaxrs.ext.search;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilderTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilderTest.java
index 1b78536..53d9d72 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilderTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilderTest.java
@@ -33,7 +33,6 @@ import org.apache.cxf.jaxrs.ext.search.ConditionType;
import org.apache.cxf.jaxrs.ext.search.SearchUtils;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlCollectionsTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlCollectionsTest.java
index e08b988..26ccf89 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlCollectionsTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlCollectionsTest.java
@@ -23,7 +23,6 @@ import java.util.Set;
import org.apache.cxf.jaxrs.ext.search.SearchCondition;
import org.apache.cxf.jaxrs.ext.search.SearchParseException;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java
index ada5911..0650b7a 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java
@@ -35,7 +35,6 @@ import org.apache.cxf.jaxrs.ext.search.SearchCondition;
import org.apache.cxf.jaxrs.ext.search.SearchParseException;
import org.apache.cxf.jaxrs.ext.search.SearchUtils;
-import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java
index 92dc4ec..fbef25c 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java
@@ -33,7 +33,6 @@ import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.filter.Filter;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java
index b1fa721..6192df4 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java
@@ -41,7 +41,6 @@ import org.apache.cxf.jaxrs.ext.search.SearchUtils;
import org.apache.cxf.jaxrs.ext.search.jpa.BookReview.Review;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import static org.junit.Assert.assertTrue;
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPALanguageVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPALanguageVisitorTest.java
index 691e881..84c58ec 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPALanguageVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPALanguageVisitorTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.jaxrs.ext.search.jpa;
import org.apache.cxf.jaxrs.ext.search.SearchCondition;
import org.apache.cxf.jaxrs.ext.search.fiql.FiqlParser;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/ldap/LdapQueryVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/ldap/LdapQueryVisitorTest.java
index 55ce6ef..dc3481f 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/ldap/LdapQueryVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/ldap/LdapQueryVisitorTest.java
@@ -24,7 +24,6 @@ import org.apache.cxf.jaxrs.ext.search.SearchCondition;
import org.apache.cxf.jaxrs.ext.search.SearchParseException;
import org.apache.cxf.jaxrs.ext.search.fiql.FiqlParser;
-import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParserTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParserTest.java
index 92db1ac..a2bb3ff 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParserTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParserTest.java
@@ -23,7 +23,6 @@ import java.util.Collections;
import org.apache.cxf.jaxrs.ext.search.SearchCondition;
import org.apache.cxf.jaxrs.ext.search.SearchParseException;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLHierarchicalQueryTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLHierarchicalQueryTest.java
index b5dfa25..737140e 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLHierarchicalQueryTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLHierarchicalQueryTest.java
@@ -23,7 +23,6 @@ import org.apache.cxf.jaxrs.ext.search.SearchCondition;
import org.apache.cxf.jaxrs.ext.search.SearchParseException;
import org.apache.cxf.jaxrs.ext.search.fiql.FiqlParser;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java
index f4f7ad3..e3927dd 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java
@@ -27,7 +27,6 @@ import org.apache.cxf.jaxrs.ext.search.SearchParseException;
import org.apache.cxf.jaxrs.ext.search.fiql.FiqlParser;
import org.apache.cxf.jaxrs.ext.search.visitor.SBThreadLocalVisitorState;
-import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractorTest.java
index 70df918..3ed4116 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractorTest.java
@@ -26,7 +26,6 @@ import org.apache.cxf.jaxrs.ext.search.SearchConditionParser;
import org.apache.cxf.jaxrs.ext.search.fiql.FiqlParser;
import org.apache.tika.parser.pdf.PDFParser;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaLuceneContentExtractorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaLuceneContentExtractorTest.java
index b9fadd7..9a1a5a0 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaLuceneContentExtractorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaLuceneContentExtractorTest.java
@@ -42,7 +42,6 @@ import org.apache.lucene.util.Version;
import org.apache.tika.parser.pdf.PDFParser;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/ValidatorTest.java b/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/ValidatorTest.java
index f5af28f..9432399 100644
--- a/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/ValidatorTest.java
+++ b/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/ValidatorTest.java
@@ -32,7 +32,6 @@ import javax.ws.rs.core.Response;
import org.eclipse.microprofile.rest.client.RestClientBuilder;
import org.eclipse.microprofile.rest.client.RestClientDefinitionException;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/cdi/RestClientCdiTest.java b/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/cdi/RestClientCdiTest.java
index e576462..e2126d4 100644
--- a/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/cdi/RestClientCdiTest.java
+++ b/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/cdi/RestClientCdiTest.java
@@ -37,7 +37,6 @@ import org.eclipse.microprofile.rest.client.tck.interfaces.InterfaceWithoutProvi
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwkJoseCookBookTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwkJoseCookBookTest.java
index cb714f0..83dc754 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwkJoseCookBookTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwkJoseCookBookTest.java
@@ -30,7 +30,6 @@ import org.apache.cxf.rs.security.jose.jwk.JwkUtils;
import org.apache.cxf.rs.security.jose.jwk.KeyType;
import org.apache.cxf.rs.security.jose.jwk.PublicKeyUse;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java
index 7699b33..9365486 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java
@@ -39,7 +39,6 @@ import org.apache.cxf.rt.security.crypto.CryptoUtils;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
index 93bb172..0d31c21 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
@@ -35,7 +35,6 @@ import org.apache.cxf.rt.security.crypto.CryptoUtils;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java
index a40ecbe..6d438e2 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java
@@ -34,7 +34,6 @@ import org.apache.cxf.rt.security.crypto.CryptoUtils;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JwePbeHmacAesWrapTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JwePbeHmacAesWrapTest.java
index 3e75e5b..d4233ad 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JwePbeHmacAesWrapTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JwePbeHmacAesWrapTest.java
@@ -26,7 +26,6 @@ import org.apache.cxf.rs.security.jose.jwa.KeyAlgorithm;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeyTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeyTest.java
index 20edd6f..97c1c8f 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeyTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeyTest.java
@@ -31,7 +31,6 @@ import org.apache.cxf.rs.security.jose.jwa.KeyAlgorithm;
import org.apache.cxf.rs.security.jose.jwe.JweCompactConsumer;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JwkUtilsTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JwkUtilsTest.java
index 5bdb2ad..06bff16 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JwkUtilsTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JwkUtilsTest.java
@@ -28,7 +28,6 @@ import org.apache.cxf.rs.security.jose.common.KeyManagementUtils;
import org.apache.cxf.rs.security.jose.jwa.KeyAlgorithm;
import org.apache.cxf.rt.security.crypto.CryptoUtils;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactHeaderTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactHeaderTest.java
index fee458d..76d0c48 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactHeaderTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactHeaderTest.java
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.cxf.rs.security.jose.jwa.SignatureAlgorithm;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactReaderWriterTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactReaderWriterTest.java
index d0d08cb..ace90cb 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactReaderWriterTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactReaderWriterTest.java
@@ -41,7 +41,6 @@ import org.apache.cxf.rs.security.jose.jwt.JwtToken;
import org.apache.cxf.rt.security.crypto.CryptoUtils;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonConsumerTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonConsumerTest.java
index 6810b73..3a23a99 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonConsumerTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonConsumerTest.java
@@ -28,7 +28,6 @@ import org.apache.cxf.rs.security.jose.jwk.JsonWebKey;
import org.apache.cxf.rs.security.jose.jwk.JsonWebKeys;
import org.apache.cxf.rs.security.jose.jwk.JwkUtils;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonProducerTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonProducerTest.java
index 1ced7ca..a106bb7 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonProducerTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonProducerTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.rs.security.jose.jws;
import org.apache.cxf.rs.security.jose.jwa.SignatureAlgorithm;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsUtilsTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsUtilsTest.java
index 88e890b..c28fe43 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsUtilsTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsUtilsTest.java
@@ -34,7 +34,6 @@ import org.apache.cxf.rs.security.jose.jwk.JsonWebKey;
import org.apache.cxf.rs.security.jose.jwk.JsonWebKeys;
import org.apache.cxf.rs.security.jose.jwk.KeyType;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwt/JwtUtilsTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwt/JwtUtilsTest.java
index ea7c2aa..e53a470 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwt/JwtUtilsTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwt/JwtUtilsTest.java
@@ -24,7 +24,6 @@ import java.time.ZonedDateTime;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.junit.Assert;
import static org.junit.Assert.fail;
diff --git a/rt/rs/security/oauth-parent/oauth/src/test/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtilsTest.java b/rt/rs/security/oauth-parent/oauth/src/test/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtilsTest.java
index 913ec6d..f13b80a 100644
--- a/rt/rs/security/oauth-parent/oauth/src/test/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtilsTest.java
+++ b/rt/rs/security/oauth-parent/oauth/src/test/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtilsTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.rs.security.oauth.utils;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/common/UserSubjectTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/common/UserSubjectTest.java
index bcddc4b..48cbb92 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/common/UserSubjectTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/common/UserSubjectTest.java
@@ -20,7 +20,6 @@ package org.apache.cxf.rs.security.oauth2.common;
import java.util.Collections;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/TokenGrantHandlerTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/TokenGrantHandlerTest.java
index 2fc7e09..029f079 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/TokenGrantHandlerTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/TokenGrantHandlerTest.java
@@ -31,7 +31,6 @@ import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
import org.apache.cxf.rs.security.oauth2.tokens.bearer.BearerAccessToken;
import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java
index feb55ef..c573ea7 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java
@@ -25,7 +25,6 @@ import org.apache.cxf.rs.security.oauth2.common.Client;
import org.apache.cxf.rs.security.oauth2.common.UserSubject;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
index e84b1f2..38523ee 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
@@ -30,7 +30,6 @@ import org.apache.cxf.rs.security.oauth2.common.Client;
import org.apache.cxf.rs.security.oauth2.common.UserSubject;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/JwtUserSubjectTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/JwtUserSubjectTest.java
index 1a4d7ca..400124b 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/JwtUserSubjectTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/JwtUserSubjectTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.rs.security.oauth2.grants.jwt;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProviderTest.java
index 5824c55..30b23f8 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProviderTest.java
@@ -32,7 +32,6 @@ import org.apache.cxf.rs.security.oauth2.common.ClientAccessToken;
import org.apache.cxf.rs.security.oauth2.common.TokenIntrospection;
import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorTest.java
index afef034..3e6a5ea 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorTest.java
@@ -31,7 +31,6 @@ import org.apache.cxf.rs.security.oauth2.provider.OAuthDataProvider;
import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImplTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImplTest.java
index a3e7333..befce77 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImplTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImplTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.rs.security.oauth2.tokens.hawk;
import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/AuthorizationUtilsTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/AuthorizationUtilsTest.java
index 0528bc8..0c20869 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/AuthorizationUtilsTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/AuthorizationUtilsTest.java
@@ -26,7 +26,6 @@ import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtilsTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtilsTest.java
index f1a19d5..03a79d5 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtilsTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtilsTest.java
@@ -20,7 +20,6 @@ package org.apache.cxf.rs.security.oauth2.utils;
import java.util.List;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/crypto/CryptoUtilsTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/crypto/CryptoUtilsTest.java
index bc62bc2..a4378d5 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/crypto/CryptoUtilsTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/crypto/CryptoUtilsTest.java
@@ -46,7 +46,6 @@ import org.apache.cxf.rt.security.crypto.CryptoUtils;
import org.apache.cxf.rt.security.crypto.KeyProperties;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
index f40ea46..f987896 100644
--- a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
+++ b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
@@ -30,7 +30,6 @@ import org.apache.cxf.rs.security.oauth2.provider.JPAOAuthDataProvider;
import org.apache.cxf.rs.security.oidc.common.IdToken;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/utils/OidcUtilsTest.java b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/utils/OidcUtilsTest.java
index a8c642c..84f9085 100644
--- a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/utils/OidcUtilsTest.java
+++ b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/utils/OidcUtilsTest.java
@@ -22,7 +22,6 @@ import java.util.List;
import org.apache.cxf.rs.security.oidc.common.AbstractUserInfo;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java
index 13bcaa1..d61320d 100644
--- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java
+++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java
@@ -24,7 +24,6 @@ import net.sf.ehcache.Status;
import net.sf.ehcache.config.Configuration;
import net.sf.ehcache.config.ConfigurationFactory;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java b/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java
index 1b3ea19..9c5f7e4 100644
--- a/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java
+++ b/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java
@@ -27,7 +27,6 @@ import java.util.zip.InflaterInputStream;
import org.apache.cxf.common.util.Base64Utility;
import org.apache.cxf.helpers.IOUtils;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/claims/SAMLClaimsTest.java b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/claims/SAMLClaimsTest.java
index 9a4b2d2..cfd48b2 100644
--- a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/claims/SAMLClaimsTest.java
+++ b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/claims/SAMLClaimsTest.java
@@ -37,7 +37,6 @@ import org.apache.wss4j.common.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.saml.bean.AttributeBean;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
-import org.junit.Assert;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/rt/security/src/test/java/org/apache/cxf/rt/security/claims/ClaimTest.java b/rt/security/src/test/java/org/apache/cxf/rt/security/claims/ClaimTest.java
index baaf648..121b7e7 100644
--- a/rt/security/src/test/java/org/apache/cxf/rt/security/claims/ClaimTest.java
+++ b/rt/security/src/test/java/org/apache/cxf/rt/security/claims/ClaimTest.java
@@ -20,7 +20,6 @@ package org.apache.cxf.rt.security.claims;
import java.net.URI;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/security/src/test/java/org/apache/cxf/rt/security/claims/interceptor/ClaimsAuthorizingInterceptorTest.java b/rt/security/src/test/java/org/apache/cxf/rt/security/claims/interceptor/ClaimsAuthorizingInterceptorTest.java
index 9eb732e..97a3cc8 100644
--- a/rt/security/src/test/java/org/apache/cxf/rt/security/claims/interceptor/ClaimsAuthorizingInterceptorTest.java
+++ b/rt/security/src/test/java/org/apache/cxf/rt/security/claims/interceptor/ClaimsAuthorizingInterceptorTest.java
@@ -47,7 +47,6 @@ import org.apache.cxf.security.claims.authorization.Claim;
import org.apache.cxf.security.claims.authorization.ClaimMode;
import org.apache.cxf.security.claims.authorization.Claims;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
index 452cdcf..7782584 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
@@ -76,7 +76,6 @@ import org.eclipse.jetty.server.Response;
import org.easymock.EasyMock;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java
index 15f457e..302b4bb 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java
@@ -34,7 +34,6 @@ import org.eclipse.jetty.server.HttpConnectionFactory;
import org.junit.After;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -45,8 +44,7 @@ import static org.junit.Assert.fail;
-public class JettyHTTPServerEngineFactoryTest
- {
+public class JettyHTTPServerEngineFactoryTest {
Bus bus;
@BeforeClass
@@ -181,4 +179,4 @@ public class JettyHTTPServerEngineFactoryTest
assertNotNull("EngineFactory is not configured.", factory);
}
-}
\ No newline at end of file
+}
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
index e4630ba..363d4ae 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
@@ -56,7 +56,6 @@ import org.eclipse.jetty.util.thread.ThreadPool;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandlerTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandlerTest.java
index 2796070..2d3924e 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandlerTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandlerTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.transport.http_jetty.blueprint;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java
index 233d03e..86a61ea 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java
@@ -40,7 +40,6 @@ import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngine;
import org.springframework.beans.factory.xml.XmlBeanDefinitionStoreException;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactoryTest.java b/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactoryTest.java
index 00a75d1..2572270 100644
--- a/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactoryTest.java
+++ b/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactoryTest.java
@@ -30,7 +30,6 @@ import io.netty.channel.EventLoopGroup;
import org.junit.After;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
index 6d5d321..7de6544 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
@@ -75,7 +75,6 @@ import org.apache.cxf.ws.addressing.JAXWSAConstants;
import org.easymock.EasyMock;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactoryTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactoryTest.java
index 70aab9f..9a76f42 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactoryTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactoryTest.java
@@ -27,7 +27,6 @@ import org.apache.cxf.transport.http.HTTPTransportFactory;
import org.junit.After;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -36,8 +35,7 @@ import static org.junit.Assert.assertTrue;
-public class NettyHttpServerEngineFactoryTest
- {
+public class NettyHttpServerEngineFactoryTest {
Bus bus;
@BeforeClass
@@ -85,4 +83,4 @@ public class NettyHttpServerEngineFactoryTest
-}
\ No newline at end of file
+}
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java
index e2149a8..eedebcf 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java
@@ -36,7 +36,6 @@ import org.apache.cxf.testutil.common.TestUtil;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/spring/ApplicationContextTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/spring/ApplicationContextTest.java
index 0e391dc..15190bc 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/spring/ApplicationContextTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/spring/ApplicationContextTest.java
@@ -40,12 +40,10 @@ import org.apache.cxf.transport.http.netty.server.NettyHttpServerEngine;
import org.springframework.beans.factory.xml.XmlBeanDefinitionStoreException;
import org.junit.After;
-import org.junit.Assert;
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;
@@ -178,4 +176,4 @@ public class ApplicationContextTest {
}
-}
\ No newline at end of file
+}
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
index 087638c..dbbadce 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
@@ -77,7 +77,6 @@ import io.undertow.util.HttpString;
import org.easymock.EasyMock;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactoryTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactoryTest.java
index d550b99..8eb56b9 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactoryTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactoryTest.java
@@ -30,7 +30,6 @@ import org.apache.cxf.transport.http.HTTPTransportFactory;
import org.junit.After;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -41,8 +40,7 @@ import static org.junit.Assert.fail;
-public class UndertowHTTPServerEngineFactoryTest
- {
+public class UndertowHTTPServerEngineFactoryTest {
Bus bus;
@BeforeClass
@@ -147,4 +145,4 @@ public class UndertowHTTPServerEngineFactoryTest
assertNotNull("EngineFactory is not configured.", factory);
}
-}
\ No newline at end of file
+}
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java
index 202c1c9..25de7dd 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java
@@ -44,7 +44,6 @@ import org.apache.cxf.testutil.common.TestUtil;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/blueprint/HTTPUndertowTransportNamespaceHandlerTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/blueprint/HTTPUndertowTransportNamespaceHandlerTest.java
index a06ceaf..b6bbcce 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/blueprint/HTTPUndertowTransportNamespaceHandlerTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/blueprint/HTTPUndertowTransportNamespaceHandlerTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.transport.http_undertow.blueprint;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/ApplicationContextTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/ApplicationContextTest.java
index 511dca1..c87b1e8 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/ApplicationContextTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/ApplicationContextTest.java
@@ -40,7 +40,6 @@ import org.apache.cxf.transport.http_undertow.UndertowHTTPServerEngine;
import org.springframework.beans.factory.xml.XmlBeanDefinitionStoreException;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java
index 2da879d..10e9267 100755
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java
@@ -29,7 +29,6 @@ import org.apache.cxf.transport.MessageObserver;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
index e49d3dc..cce33b0 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
@@ -48,7 +48,6 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
index 0c18eac..4556037 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
@@ -35,7 +35,6 @@ import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.service.model.EndpointInfo;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
index 950b0c8..1adcff5 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
@@ -53,7 +53,6 @@ import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPTransportFactoryTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPTransportFactoryTest.java
index 0de0a07..2399525 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPTransportFactoryTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPTransportFactoryTest.java
@@ -24,7 +24,6 @@ import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.service.model.EndpointInfo;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java
index 2de70b6..7facde2 100755
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java
@@ -37,7 +37,6 @@ import org.apache.cxf.message.MessageImpl;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/PatternBuilderTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/PatternBuilderTest.java
index 0dd4cce..4334014 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/PatternBuilderTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/PatternBuilderTest.java
@@ -20,7 +20,6 @@ package org.apache.cxf.transport.http;
import java.util.regex.Pattern;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/blueprint/HttpBPHandlerTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/blueprint/HttpBPHandlerTest.java
index a89129b..eda68cf 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/blueprint/HttpBPHandlerTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/blueprint/HttpBPHandlerTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.transport.http.blueprint;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java
index 4dd279f..114c8ff 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java
@@ -23,7 +23,6 @@ import java.util.concurrent.ThreadLocalRandom;
import org.apache.cxf.transport.http.policy.impl.ClientPolicyCalculator;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPClientAssertionBuilderTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPClientAssertionBuilderTest.java
index 7c6a1eb..d0affb9 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPClientAssertionBuilderTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPClientAssertionBuilderTest.java
@@ -24,7 +24,6 @@ import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
import org.apache.cxf.ws.policy.builder.jaxb.JaxbAssertion;
import org.apache.neethi.Assertion;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPServerAssertionBuilderTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPServerAssertionBuilderTest.java
index 76af7be..3e05fe5 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPServerAssertionBuilderTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPServerAssertionBuilderTest.java
@@ -24,7 +24,6 @@ import org.apache.cxf.transports.http.configuration.HTTPServerPolicy;
import org.apache.cxf.ws.policy.builder.jaxb.JaxbAssertion;
import org.apache.neethi.Assertion;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
index d1048bf..2c10023 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
@@ -39,7 +39,6 @@ import org.apache.cxf.ws.policy.builder.jaxb.JaxbAssertion;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ServerPolicyCalculatorTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ServerPolicyCalculatorTest.java
index d28a3a1..74a99d3 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ServerPolicyCalculatorTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ServerPolicyCalculatorTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.transport.http.policy;
import org.apache.cxf.transport.http.policy.impl.ServerPolicyCalculator;
import org.apache.cxf.transports.http.configuration.HTTPServerPolicy;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/HttpConduitConfigurationTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/HttpConduitConfigurationTest.java
index 58fa92a..e6a14b9 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/HttpConduitConfigurationTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/HttpConduitConfigurationTest.java
@@ -41,7 +41,6 @@ import org.apache.cxf.transport.http.HTTPTransportFactory;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
import org.junit.After;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java
index 1dec03a..a957f89 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java
@@ -32,7 +32,6 @@ import org.apache.cxf.transport.http.AbstractHTTPDestination;
import org.apache.cxf.transport.http.DestinationRegistry;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
index 5c7283f..9340ef9 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
@@ -48,7 +48,6 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.wsdl11.WSDLServiceFactory;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import static org.junit.Assert.assertFalse;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSMessageUtilTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSMessageUtilTest.java
index 4f2cf1f..d8bf2e4 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSMessageUtilTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSMessageUtilTest.java
@@ -22,7 +22,6 @@ package org.apache.cxf.transport.jms;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java
index 684e785..800d9fa 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java
@@ -29,7 +29,6 @@ import org.apache.cxf.message.MessageImpl;
import org.easymock.EasyMock;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNull;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java
index 60ba97e..3bd2463 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java
@@ -24,7 +24,6 @@ import java.util.Map;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.jms.uri.JMSEndpoint.DeliveryModeType;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/JMSUtilTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/JMSUtilTest.java
index d4f6e8f..777ddd8 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/JMSUtilTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/JMSUtilTest.java
@@ -34,7 +34,6 @@ import org.apache.cxf.transport.jms.JMSConfiguration;
import org.apache.cxf.transport.jms.JMSConstants;
import org.apache.cxf.transport.jms.JMSFactory;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalDestinationTest.java b/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalDestinationTest.java
index ce7c48a..40fbb83 100644
--- a/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalDestinationTest.java
+++ b/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalDestinationTest.java
@@ -28,7 +28,6 @@ import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.Conduit;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java b/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java
index 55e46b1..8e01788 100644
--- a/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java
+++ b/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java
@@ -35,7 +35,6 @@ import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.Conduit;
import org.apache.cxf.transport.MessageObserver;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketTransportFactoryTest.java b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketTransportFactoryTest.java
index b026b8c..d2e40e1 100644
--- a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketTransportFactoryTest.java
+++ b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketTransportFactoryTest.java
@@ -24,7 +24,6 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.Destination;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketUtilsTest.java b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketUtilsTest.java
index 89fecf2..7896991 100644
--- a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketUtilsTest.java
+++ b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketUtilsTest.java
@@ -22,7 +22,6 @@ package org.apache.cxf.transport.websocket;
import java.util.Map;
import java.util.TreeMap;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduitTest.java b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduitTest.java
index a9336b0..bc2d8dc 100644
--- a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduitTest.java
+++ b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduitTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.transport.websocket.ahc;
import org.apache.cxf.transport.websocket.WebSocketConstants;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestinationTest.java b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestinationTest.java
index 64f5ca3..9311616 100644
--- a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestinationTest.java
+++ b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestinationTest.java
@@ -31,7 +31,6 @@ import org.apache.cxf.transport.http.DestinationRegistry;
import org.apache.cxf.transport.http.HTTPTransportFactory;
import org.atmosphere.cpr.AtmosphereInterceptor;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestinationTest.java b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestinationTest.java
index febd007..2bc8870 100644
--- a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestinationTest.java
+++ b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestinationTest.java
@@ -32,7 +32,6 @@ import org.apache.cxf.transport.http.DestinationRegistry;
import org.apache.cxf.transport.http.HTTPTransportFactory;
import org.atmosphere.cpr.AtmosphereInterceptor;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptorTest.java b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptorTest.java
index c2744f8..0aea9d5 100644
--- a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptorTest.java
+++ b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptorTest.java
@@ -32,7 +32,6 @@ import org.atmosphere.cpr.AtmosphereResponse;
import org.atmosphere.cpr.AtmosphereResponseImpl;
import org.atmosphere.cpr.FrameworkConfig;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
index d0f4bfc..711d7d7 100644
--- a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
+++ b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
@@ -34,7 +34,6 @@ import org.apache.cxf.transport.websocket.jetty9.Jetty9WebSocketDestination;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingConstantsImplTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingConstantsImplTest.java
index bc3bb54..310832b 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingConstantsImplTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingConstantsImplTest.java
@@ -22,7 +22,6 @@ package org.apache.cxf.ws.addressing;
import javax.xml.namespace.QName;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandlerTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandlerTest.java
index 202fb92..73eab68 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandlerTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandlerTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.ws.addressing.blueprint;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java
index 04eaa10..8f12745 100755
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java
@@ -44,7 +44,6 @@ import org.apache.cxf.ws.addressing.Names;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
index 52e3206..c00d9fb 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
@@ -77,7 +77,6 @@ import org.apache.cxf.ws.addressing.WSAContextUtils;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java
index 1806f24..a8539e0 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java
@@ -32,7 +32,6 @@ import org.apache.cxf.ws.addressing.ContextUtils;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.easymock.EasyMock;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
index ef6191a..efd88b7 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
@@ -56,7 +56,6 @@ import org.apache.cxf.ws.addressing.v200408.Relationship;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/mex/src/test/java/org/apache/cxf/ws/mex/MEXTest.java b/rt/ws/mex/src/test/java/org/apache/cxf/ws/mex/MEXTest.java
index 2c11da1..356161a 100644
--- a/rt/ws/mex/src/test/java/org/apache/cxf/ws/mex/MEXTest.java
+++ b/rt/ws/mex/src/test/java/org/apache/cxf/ws/mex/MEXTest.java
@@ -30,7 +30,6 @@ import org.apache.cxf.transport.local.LocalTransportFactory;
import org.apache.cxf.ws.mex.model._2004_09.Metadata;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java
index a034637..2800261 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java
@@ -30,7 +30,6 @@ import org.apache.neethi.builders.PrimitiveAssertion;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java
index bb16a1a..2a9f09b 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java
@@ -36,7 +36,6 @@ import org.apache.neethi.builders.PolicyContainingPrimitiveAssertion;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
index 9f05cc3..14c3c34 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
@@ -42,7 +42,6 @@ import org.apache.neethi.Policy;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
index c0d83df..5d6dd81 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
@@ -45,7 +45,6 @@ import org.apache.neethi.PolicyOperator;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/IgnorablePolicyInterceptorProviderTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/IgnorablePolicyInterceptorProviderTest.java
index bbdb3da..20d9201 100755
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/IgnorablePolicyInterceptorProviderTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/IgnorablePolicyInterceptorProviderTest.java
@@ -36,7 +36,6 @@ import org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertion;
import org.apache.neethi.Assertion;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java
index e49f8af..0a94978 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java
@@ -32,7 +32,6 @@ import org.apache.neethi.util.PolicyComparator;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyBuilderTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyBuilderTest.java
index fc2bc1a..3bc2acd 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyBuilderTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyBuilderTest.java
@@ -31,7 +31,6 @@ import org.apache.neethi.Policy;
import org.apache.neethi.PolicyComponent;
import org.apache.neethi.PolicyReference;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java
index 6940810..19ae064 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java
@@ -31,7 +31,6 @@ import org.apache.cxf.ws.policy.builder.jaxb.JaxbAssertion;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
index 9077e60..bd8ccd9 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
@@ -54,7 +54,6 @@ import org.apache.neethi.PolicyRegistry;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java
index ad47c3e..2332774 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java
@@ -41,7 +41,6 @@ import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.builders.AssertionBuilder;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java
index 47e5eb6..a3c6907 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java
@@ -30,7 +30,6 @@ import org.apache.cxf.message.Message;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
index f1d476d..9195512 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
@@ -45,7 +45,6 @@ import org.apache.neethi.Policy;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyRegistryImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyRegistryImplTest.java
index 365fea6..9934c31 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyRegistryImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyRegistryImplTest.java
@@ -23,7 +23,6 @@ import org.apache.neethi.Policy;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNull;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java
index 089a259..e0cbcfb 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java
@@ -32,7 +32,6 @@ import org.apache.neethi.Policy;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java
index be87028..2ddac05 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java
@@ -31,7 +31,6 @@ import org.apache.neethi.Policy;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java
index b6fa205..8534148 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java
@@ -25,7 +25,6 @@ import org.apache.cxf.message.Message;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistryTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistryTest.java
index ad36e25..78f6964 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistryTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistryTest.java
@@ -30,7 +30,6 @@ import org.apache.cxf.ws.policy.PolicyException;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java
index 469085b..bbc5cab 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java
@@ -29,7 +29,6 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java
index efba9c8..551494e 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java
@@ -45,7 +45,6 @@ import org.springframework.core.io.UrlResource;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachmentTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachmentTest.java
index b71443f..300d6d6 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachmentTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachmentTest.java
@@ -32,7 +32,6 @@ import org.apache.neethi.Policy;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java
index 402e8bb..c130203 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java
@@ -36,7 +36,6 @@ import org.apache.neethi.Policy;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java
index 43749d7..aa0c0e9 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java
@@ -54,7 +54,6 @@ import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java
index a04eff2..b8dc841 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.ws.policy.blueprint;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java
index ab16660..4f0d464 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java
@@ -31,7 +31,6 @@ import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.test.assertions.foo.FooType;
import org.apache.neethi.Assertion;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java
index e56b085..ca95adb 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java
@@ -35,7 +35,6 @@ import org.apache.neethi.PolicyComponent;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/FirstAlternativeSelectorTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/FirstAlternativeSelectorTest.java
index e1d59da..f074b2d 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/FirstAlternativeSelectorTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/FirstAlternativeSelectorTest.java
@@ -36,7 +36,6 @@ import org.apache.neethi.Policy;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/MinimalMaximalAlternativeSelectorTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/MinimalMaximalAlternativeSelectorTest.java
index dcbae33..ff2cd70 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/MinimalMaximalAlternativeSelectorTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/MinimalMaximalAlternativeSelectorTest.java
@@ -36,7 +36,6 @@ import org.apache.neethi.Policy;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java
index d4be0d4..1711484 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java
@@ -28,7 +28,6 @@ import org.apache.cxf.ws.policy.PolicyProvider;
import org.apache.cxf.ws.policy.attachment.external.ExternalAttachmentProvider;
import org.apache.cxf.ws.policy.selector.MaximalAlternativeSelector;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractEndpointTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractEndpointTest.java
index b6ffef0..b4399d9 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractEndpointTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractEndpointTest.java
@@ -25,7 +25,6 @@ import org.apache.cxf.ws.rm.v200702.Identifier;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java
index 574a0de..3affdff 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java
@@ -36,7 +36,6 @@ import org.apache.cxf.ws.policy.PolicyAssertion;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractSequenceTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractSequenceTest.java
index 73feb17..973758f 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractSequenceTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractSequenceTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.ws.rm;
import org.apache.cxf.ws.rm.v200702.Identifier;
import org.apache.cxf.ws.rm.v200702.ObjectFactory;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
index 0158636..877ecf3 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
@@ -42,7 +42,6 @@ import org.apache.cxf.ws.rm.v200702.SequenceType;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -52,7 +51,6 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
public class DestinationSequenceTest {
@@ -764,4 +762,4 @@ public class DestinationSequenceTest {
}
return message;
}
-}
\ No newline at end of file
+}
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java
index d6fbd97..9394042 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java
@@ -32,7 +32,6 @@ import org.apache.cxf.ws.rm.v200702.SequenceType;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java
index e3f61b9..a9aa5df 100755
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java
@@ -54,7 +54,6 @@ import org.apache.cxf.wsdl.WSDLConstants;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProtocolVariationTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProtocolVariationTest.java
index dd3a73f..112c0ec 100755
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProtocolVariationTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProtocolVariationTest.java
@@ -22,7 +22,6 @@ package org.apache.cxf.ws.rm;
import org.apache.cxf.ws.addressing.Names;
import org.apache.cxf.ws.addressing.VersionTransformer.Names200408;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
index 6ce0826..046149d 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
@@ -56,7 +56,6 @@ import org.apache.cxf.ws.rm.v200702.OfferType;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java
index 840d5ff..7f2edf0 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java
@@ -27,7 +27,6 @@ import org.apache.cxf.ws.addressing.JAXWSAConstants;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java
index 085514d..55fd7e2 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java
@@ -51,7 +51,6 @@ import org.apache.cxf.ws.rm.v200702.Identifier;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
index ba86e35..01a8bac 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
@@ -49,7 +49,6 @@ import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerConfigurationTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerConfigurationTest.java
index b50c814..c9e5258 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerConfigurationTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerConfigurationTest.java
@@ -30,7 +30,6 @@ import org.apache.cxf.ws.rm.persistence.RMStore;
import org.apache.cxf.ws.rm.v200702.Identifier;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
index 3cc3e6a..45792f7 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
@@ -67,7 +67,6 @@ import org.apache.cxf.ws.rm.v200702.Identifier;
import org.easymock.Capture;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
index 23a97fc..c1ca498 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
@@ -35,7 +35,6 @@ import org.apache.cxf.ws.rm.v200702.Identifier;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java
index fa4bcb6..cb7ccf1 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java
@@ -30,7 +30,6 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
index 46601a5..cb5f769 100755
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
@@ -49,7 +49,6 @@ import org.apache.cxf.ws.rm.v200702.TerminateSequenceResponseType;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java
index f9faf21..039127d 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java
@@ -34,7 +34,6 @@ import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/blueprint/RMBPHandlerTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/blueprint/RMBPHandlerTest.java
index d059e6a..1e68dd3 100755
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/blueprint/RMBPHandlerTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/blueprint/RMBPHandlerTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.ws.rm.blueprint;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/PersistenceUtilsTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/PersistenceUtilsTest.java
index 27d81bd..3a5e966 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/PersistenceUtilsTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/PersistenceUtilsTest.java
@@ -38,7 +38,6 @@ import org.apache.cxf.ws.rm.RMMessageConstants;
import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement;
import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement.AcknowledgementRange;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/RMMessageTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/RMMessageTest.java
index 13dffd7..6f1a53e 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/RMMessageTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/RMMessageTest.java
@@ -22,7 +22,6 @@ package org.apache.cxf.ws.rm.persistence;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.io.CachedOutputStream;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertArrayEquals;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
index 476c41e..33151fb 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
@@ -25,7 +25,6 @@ import org.apache.cxf.Bus;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.ws.rm.RMManager;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java
index 98fde43..9f8684d 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java
@@ -44,7 +44,6 @@ import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTwoSchemasTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTwoSchemasTest.java
index aec24a5..d5a8111 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTwoSchemasTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTwoSchemasTest.java
@@ -28,7 +28,6 @@ import org.apache.cxf.ws.rm.v200702.Identifier;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreUpgradeTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreUpgradeTest.java
index 16ee676..f8c22c0 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreUpgradeTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreUpgradeTest.java
@@ -30,7 +30,6 @@ import java.util.HashSet;
import java.util.Set;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java
index e80d61f..c8e7939 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java
@@ -36,7 +36,6 @@ import org.apache.cxf.ws.rmp.v200502.RMAssertion.InactivityTimeout;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInInterceptorTest.java
index 30f7137..2beb0cc 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInInterceptorTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInInterceptorTest.java
@@ -43,7 +43,6 @@ import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement;
import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement.AcknowledgementRange;
import org.apache.cxf.ws.rm.v200702.SequenceType;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java
index 0d27d81..e738403 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java
@@ -53,7 +53,6 @@ import org.apache.cxf.ws.rm.v200702.ObjectFactory;
import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement;
import org.apache.cxf.ws.rm.v200702.SequenceType;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
index 8cdb216..b65459a 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
@@ -44,7 +44,6 @@ import org.apache.cxf.ws.rm.v200702.SequenceType;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java
index 1f890f6..9c3dd08 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java
@@ -40,7 +40,6 @@ import org.apache.cxf.ws.rm.v200702.SequenceFaultType;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java
index 31d3f31..54f3566 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java
@@ -27,7 +27,6 @@ import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.wss4j.common.cache.EHCacheManagerHolder;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java
index ec1d5e2..00d8e51 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java
@@ -50,7 +50,6 @@ import org.apache.cxf.ws.security.trust.STSClient;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl11.WSDLServiceFactory;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/trust/AuthPolicyValidatingInterceptorTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/trust/AuthPolicyValidatingInterceptorTest.java
index a9acfa5..391ef9b 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/trust/AuthPolicyValidatingInterceptorTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/trust/AuthPolicyValidatingInterceptorTest.java
@@ -25,7 +25,6 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.dom.message.token.UsernameToken;
import org.apache.wss4j.dom.validate.Credential;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java
index e5a1370..fd569d0 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java
@@ -41,7 +41,6 @@ import org.apache.cxf.abc.test.AnotherPolicyType;
import org.apache.cxf.abc.test.NewServiceType;
import org.apache.cxf.abc.test.TestPolicyType;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java
index 01bf05e..b91c0d0 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java
@@ -54,7 +54,6 @@ import org.apache.cxf.staxutils.StaxUtils;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java
index 06e718d..bc0988d 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java
@@ -30,7 +30,6 @@ import org.apache.cxf.wsdl.WSDLManager;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/NSManagerTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/NSManagerTest.java
index 56f41ee..b4c5300 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/NSManagerTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/NSManagerTest.java
@@ -22,7 +22,6 @@ package org.apache.cxf.wsdl11;
import org.apache.cxf.ws.addressing.JAXWSAConstants;
import org.apache.cxf.wsdl.WSDLConstants;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
index c72bc21..bfd5720 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
@@ -65,7 +65,6 @@ import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java
index 9fc1ba1..d9a5746 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java
@@ -35,7 +35,6 @@ import javax.xml.stream.XMLStreamReader;
import org.apache.cxf.staxutils.PropertiesExpandingStreamReader;
import org.apache.cxf.staxutils.XMLStreamReaderWrapper;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
index 49d4664..eae69ca 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
@@ -69,7 +69,6 @@ import org.apache.ws.commons.schema.XmlSchemaElement;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointAPITest.java b/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointAPITest.java
index f604512..b445339 100644
--- a/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointAPITest.java
+++ b/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointAPITest.java
@@ -36,7 +36,6 @@ import org.apache.cxf.testutil.common.TestUtil;
import org.jvnet.jax_ws_commons.transport.grizzly_httpspi.GrizzlyHttpContextFactory;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/schemavalidation/JavaFirstSchemaValidationTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/schemavalidation/JavaFirstSchemaValidationTest.java
index 13a42e6..a5d1c11 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/schemavalidation/JavaFirstSchemaValidationTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/schemavalidation/JavaFirstSchemaValidationTest.java
@@ -44,7 +44,6 @@ import org.apache.cxf.transport.http.HTTPConduit;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/systests/microprofile/client/async/src/test/java/org/apache/cxf/systest/microprofile/rest/client/AsyncMethodTest.java b/systests/microprofile/client/async/src/test/java/org/apache/cxf/systest/microprofile/rest/client/AsyncMethodTest.java
index 4ffd4a0..3ddb396 100644
--- a/systests/microprofile/client/async/src/test/java/org/apache/cxf/systest/microprofile/rest/client/AsyncMethodTest.java
+++ b/systests/microprofile/client/async/src/test/java/org/apache/cxf/systest/microprofile/rest/client/AsyncMethodTest.java
@@ -43,7 +43,6 @@ import org.eclipse.microprofile.rest.client.tck.providers.TestParamConverterProv
import org.eclipse.microprofile.rest.client.tck.providers.TestReaderInterceptor;
import org.eclipse.microprofile.rest.client.tck.providers.TestWriterInterceptor;
-import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java
index 5ada08a..7a28015 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java
@@ -39,7 +39,6 @@ import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.testutil.common.TestUtil;
import org.apache.hello_world_soap_http.Greeter;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
index e17b40f..bcaad70 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
@@ -46,7 +46,6 @@ import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/AbstractServletTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/AbstractServletTest.java
index 1b0410a..c0a0a9c 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/AbstractServletTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/AbstractServletTest.java
@@ -37,7 +37,6 @@ import org.junit.After;
import org.junit.Before;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
public abstract class AbstractServletTest extends AbstractCXFTest {
@@ -105,4 +104,4 @@ public abstract class AbstractServletTest extends AbstractCXFTest {
*/
}
}
-}
\ No newline at end of file
+}
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
index 0982f01..05e0009 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
@@ -35,7 +35,6 @@ import org.apache.cxf.endpoint.ServerRegistry;
import org.apache.cxf.headers.HeaderManager;
import org.apache.cxf.wsdl.WSDLManager;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java
index 8b16ff2..e557021 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java
@@ -39,7 +39,6 @@ import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.GreeterImpl;
import org.apache.hello_world_soap_http.SOAPService;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java
index ec66ae0..7d61148 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java
@@ -34,7 +34,6 @@ import org.apache.cxf.workqueue.WorkQueueManager;
import org.apache.cxf.wsdl.WSDLManager;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/AbstractColocTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/AbstractColocTest.java
index 4822e6d..09c5afd 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/AbstractColocTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/AbstractColocTest.java
@@ -34,7 +34,6 @@ import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.testutil.common.TestUtil;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import static org.junit.Assert.assertNotNull;
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterImpl.java
index f05d765..540749c 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterImpl.java
@@ -26,7 +26,6 @@ import org.apache.cxf.hello_world_corba.PingMeFault;
import org.apache.cxf.hello_world_corba.types.FaultDetail;
import org.apache.cxf.interceptor.Fault;
-import org.junit.Assert;
import static org.junit.Assert.assertEquals;
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java
index 7882c31..7952c83 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java
@@ -45,7 +45,6 @@ import org.apache.cxf.ws.addressing.WSAddressingFeature;
import org.apache.hello_world_soap_http.Greeter;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java
index 6623871..909027c 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java
@@ -38,7 +38,6 @@ import org.apache.cxf.workqueue.WorkQueueManager;
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.GreeterImpl;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/simple/SimpleFrontendTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/simple/SimpleFrontendTest.java
index e1c0b8b..2ca8993 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/simple/SimpleFrontendTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/simple/SimpleFrontendTest.java
@@ -31,7 +31,6 @@ import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/SoapActionTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/SoapActionTest.java
index f1642c7..4746b6f 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/SoapActionTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/SoapActionTest.java
@@ -32,7 +32,6 @@ import org.apache.hello_world_soap_action.Greeter;
import org.apache.hello_world_soap_action.WrappedGreeter;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient2.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient2.java
index a7d378a..f6e6bda 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient2.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient2.java
@@ -82,10 +82,10 @@ import org.apache.type_test.types3.StructWithSubstitutionGroupNil;
import org.junit.Assert;
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;
-import static org.junit.Assert.assertEquals;
public abstract class AbstractTypeTestClient2 extends AbstractTypeTestClient {
@@ -2206,4 +2206,4 @@ public abstract class AbstractTypeTestClient2 extends AbstractTypeTestClient {
}
}
-}
\ No newline at end of file
+}
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java
index 32156e7..af81e12 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java
@@ -78,10 +78,10 @@ import org.apache.type_test.types3.OccuringStruct2;
import org.junit.Assert;
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;
-import static org.junit.Assert.assertEquals;
public abstract class AbstractTypeTestClient3 extends AbstractTypeTestClient2 {
@@ -2290,4 +2290,4 @@ public abstract class AbstractTypeTestClient3 extends AbstractTypeTestClient2 {
Assert.assertEquals("testUnionWithAnonEnum(): Incorrect return value", x, ret);
}
-}
\ No newline at end of file
+}
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient4.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient4.java
index 1c83aca..a209c2a 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient4.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient4.java
@@ -73,7 +73,6 @@ import org.junit.Test;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.junit.Assert.assertEquals;
public abstract class AbstractTypeTestClient4 extends AbstractTypeTestClient3 {
@@ -2187,4 +2186,4 @@ public abstract class AbstractTypeTestClient4 extends AbstractTypeTestClient3 {
assertTrue(z.value.getClass().getName(), z.value instanceof DerivedEmptyBaseEmptyAll);
assertTrue(ret.getClass().getName(), ret instanceof DerivedEmptyBaseEmptyAll);
}
-}
\ No newline at end of file
+}
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient5.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient5.java
index dceba54..cedb18a 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient5.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient5.java
@@ -41,9 +41,9 @@ import org.apache.type_test.types2.StructWithAnyStrict;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.junit.Assert.assertEquals;
public abstract class AbstractTypeTestClient5 extends AbstractTypeTestClient4 {
@@ -741,4 +741,4 @@ public abstract class AbstractTypeTestClient5 extends AbstractTypeTestClient4 {
}
}
-}
\ No newline at end of file
+}
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
index e42d57a..63c6432 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
@@ -33,7 +33,6 @@ import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.ws.addressing.Names;
import org.apache.cxf.ws.rm.RMConstants;
-import org.junit.Assert;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
index e42d57a..63c6432 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
@@ -33,7 +33,6 @@ import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.ws.addressing.Names;
import org.apache.cxf.ws.rm.RMConstants;
-import org.junit.Assert;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java
index ae005b0..3d21150 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java
@@ -26,7 +26,6 @@ import java.io.PrintStream;
import org.apache.cxf.helpers.FileUtils;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
public abstract class ToolTestBase {
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/ProcessorEnvironmentTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/ProcessorEnvironmentTest.java
index 9a0d2b0..f6e3dc7 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/ProcessorEnvironmentTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/ProcessorEnvironmentTest.java
@@ -22,7 +22,6 @@ package org.apache.cxf.tools.common;
import java.util.HashMap;
import java.util.Map;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/ToolContextTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/ToolContextTest.java
index 648f3c7..beeb234 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/ToolContextTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/ToolContextTest.java
@@ -23,7 +23,6 @@ import java.util.HashMap;
import javax.xml.namespace.QName;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java
index bc66577..281bf60 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.tools.common;
import org.apache.cxf.wsdl.WSDLConstants;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/dom/ExtendedDocumentBuilderTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/dom/ExtendedDocumentBuilderTest.java
index 29cc7b6..db0c027 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/dom/ExtendedDocumentBuilderTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/dom/ExtendedDocumentBuilderTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.tools.common.dom;
import org.w3c.dom.Document;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JAnnotationTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JAnnotationTest.java
index 82c77ff..aa0dc77 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JAnnotationTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JAnnotationTest.java
@@ -29,7 +29,6 @@ import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.ws.Action;
import javax.xml.ws.FaultAction;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaClassTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaClassTest.java
index 7e69323..ae44f6b 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaClassTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaClassTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.tools.common.model;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaInterfaceTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaInterfaceTest.java
index 9ef5509..3f3dd04 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaInterfaceTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaInterfaceTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.tools.common.model;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaParameterTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaParameterTest.java
index 8d24dd4..ebe4a23 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaParameterTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaParameterTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.tools.common.model;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaTypeTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaTypeTest.java
index b972e79..c872c2c 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaTypeTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaTypeTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.tools.common.model;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/AbstractToolContainerTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/AbstractToolContainerTest.java
index c572dac..cce4cd6 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/AbstractToolContainerTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/AbstractToolContainerTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.tools.common.toolspec;
import org.apache.cxf.tools.common.ToolException;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolExceptionTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolExceptionTest.java
index 62dfb71..8cba2fb 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolExceptionTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolExceptionTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.tools.common.toolspec;
import org.apache.cxf.tools.common.ToolException;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSpecTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSpecTest.java
index 8dd971f..45734be 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSpecTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSpecTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.tools.common.toolspec;
import org.apache.cxf.tools.common.ToolException;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSupportTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSupportTest.java
index 1b180fa..35f313c 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSupportTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSupportTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.tools.common.toolspec;
import org.apache.cxf.tools.common.ToolException;
-import org.junit.Assert;
import org.junit.Test;
public class ToolSupportTest {
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
index 515f208..ec9d4de 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
@@ -25,7 +25,6 @@ import java.util.StringTokenizer;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.tools.common.toolspec.ToolSpec;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/util/BuiltInTypesJavaMappingUtilTest.java b/tools/common/src/test/java/org/apache/cxf/tools/util/BuiltInTypesJavaMappingUtilTest.java
index dc8eb1a..42c8499 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/util/BuiltInTypesJavaMappingUtilTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/util/BuiltInTypesJavaMappingUtilTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.tools.util;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/util/FileWriterUtilTest.java b/tools/common/src/test/java/org/apache/cxf/tools/util/FileWriterUtilTest.java
index 4623ace..a262565 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/util/FileWriterUtilTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/util/FileWriterUtilTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.tools.util;
import java.io.File;
import java.io.IOException;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/util/NameUtilTest.java b/tools/common/src/test/java/org/apache/cxf/tools/util/NameUtilTest.java
index dfad463..4fc4d4f 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/util/NameUtilTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/util/NameUtilTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.tools.util;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java b/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java
index 4d3bc74..0baa496 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java
@@ -24,7 +24,6 @@ import java.nio.charset.StandardCharsets;
import org.apache.cxf.common.util.URIParserUtil;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/ToolTestBase.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/ToolTestBase.java
index 9e9ba94..a05df41 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/ToolTestBase.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/ToolTestBase.java
@@ -24,7 +24,6 @@ import java.io.PrintStream;
import java.net.URL;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
public abstract class ToolTestBase {
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java
index 82a501b..2958ed9 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java
@@ -29,7 +29,6 @@ import java.net.URL;
import java.util.HashMap;
import java.util.regex.Pattern;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java
index 0ad4cc0..a9caeab 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java
@@ -58,7 +58,6 @@ import org.apache.cxf.tools.corba.processors.wsdl.WSDLToCorbaBinding;
import org.apache.cxf.tools.corba.processors.wsdl.WSDLToIDLAction;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
index c1e7e8c..7aec8b4 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
@@ -52,7 +52,6 @@ import org.apache.cxf.tools.corba.common.WSDLCorbaFactory;
import org.apache.cxf.tools.corba.processors.wsdl.WSDLToCorbaBinding;
import org.apache.cxf.tools.corba.processors.wsdl.WSDLToIDLAction;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
index d68a68a..49e4815 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
@@ -32,7 +32,6 @@ import java.net.URI;
import org.apache.cxf.tools.corba.processors.wsdl.WSDLToIDLAction;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java
index c68375e..a64eede 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java
@@ -22,7 +22,6 @@ package org.apache.cxf.tools.java2wsdl.generator;
import org.apache.cxf.tools.java2wsdl.generator.wsdl11.WSDL11Generator;
import org.apache.cxf.wsdl.WSDLConstants;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotatorTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotatorTest.java
index 3752223..58762f5 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotatorTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotatorTest.java
@@ -27,7 +27,6 @@ import javax.xml.namespace.QName;
import org.apache.cxf.tools.common.model.JAnnotation;
import org.apache.cxf.tools.java2wsdl.generator.wsdl11.model.WrapperBeanClass;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanFieldAnnotatorTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanFieldAnnotatorTest.java
index 38c22f0..f3f120c 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanFieldAnnotatorTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanFieldAnnotatorTest.java
@@ -26,7 +26,6 @@ import org.apache.cxf.tools.common.model.JAnnotation;
import org.apache.cxf.tools.common.model.JavaClass;
import org.apache.cxf.tools.common.model.JavaField;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactoryTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactoryTest.java
index 9f54879..a377862 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactoryTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactoryTest.java
@@ -23,7 +23,6 @@ package org.apache.cxf.tools.java2wsdl.processor;
import org.apache.cxf.tools.fortest.classnoanno.docbare.Stock;
import org.apache.cxf.tools.fortest.simple.Hello;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactoryTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactoryTest.java
index 0e296f0..0a1357f 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactoryTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactoryTest.java
@@ -27,7 +27,6 @@ import org.apache.cxf.simple.SimpleServiceBuilder;
import org.apache.cxf.tools.fortest.classnoanno.docbare.Stock;
import org.apache.cxf.tools.fortest.simple.Hello;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java
index 11f3107..0fdb830 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java
@@ -25,7 +25,6 @@ import javax.xml.namespace.QName;
import org.apache.cxf.tools.common.model.JavaField;
import org.apache.cxf.tools.java2wsdl.generator.wsdl11.model.WrapperBeanClass;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java
index 52bd6b5..b7177f4 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java
@@ -32,7 +32,6 @@ import org.apache.cxf.tools.common.model.JavaMethod;
import org.apache.cxf.tools.fortest.withannotation.doc.GreeterArray;
import org.apache.cxf.tools.fortest.xmllist.AddNumbersPortType;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapperTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapperTest.java
index b8acb26..ed836e1 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapperTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapperTest.java
@@ -28,7 +28,6 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.tools.common.model.JavaField;
import org.apache.cxf.tools.fortest.withannotation.doc.GreeterArray;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperTest.java
index 8d415a9..a17471c 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperTest.java
@@ -25,7 +25,6 @@ import javax.xml.namespace.QName;
import org.apache.cxf.tools.common.model.JavaClass;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperUtilTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperUtilTest.java
index 8d075cd..0df57f5 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperUtilTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperUtilTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.tools.java2wsdl.processor.internal.jaxws;
import java.lang.reflect.Method;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDL11ValidatorTest.java b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDL11ValidatorTest.java
index ded5296..d175c44 100644
--- a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDL11ValidatorTest.java
+++ b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDL11ValidatorTest.java
@@ -22,7 +22,6 @@ package org.apache.cxf.tools.validator.internal;
import org.apache.cxf.tools.common.ToolConstants;
import org.apache.cxf.tools.common.ToolContext;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
diff --git a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java
index f1fe486..71da2f2 100644
--- a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java
+++ b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java
@@ -30,7 +30,6 @@ import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.tools.validator.internal.model.XNode;
import org.apache.cxf.wsdl.WSDLManager;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/model/XNodeTest.java b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/model/XNodeTest.java
index 8ec9bad..613e13e 100644
--- a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/model/XNodeTest.java
+++ b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/model/XNodeTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.tools.validator.internal.model;
import org.apache.cxf.wsdl.WSDLConstants;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java b/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java
index d27bedc..a41f0cd 100644
--- a/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java
+++ b/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java
@@ -26,7 +26,6 @@ import org.apache.cxf.tools.common.ToolConstants;
import org.apache.cxf.tools.common.ToolContext;
import org.apache.cxf.tools.common.ToolException;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilderTest.java b/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilderTest.java
index 00bcb82..273ea5c 100644
--- a/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilderTest.java
+++ b/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilderTest.java
@@ -32,7 +32,6 @@ import javax.xml.namespace.QName;
import org.apache.cxf.BusFactory;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java
index 3a3847b..e00eeee 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java
@@ -26,7 +26,6 @@ import org.xml.sax.InputSource;
import org.apache.cxf.catalog.OASISCatalogManager;
import org.apache.cxf.resource.ExtendedURIResolver;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java
index 21b3f4f..a9d1006 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java
@@ -35,7 +35,6 @@ import org.apache.cxf.tools.wsdlto.frontend.jaxws.generators.ImplGenerator;
import org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.WSDLToJavaProcessor;
import org.apache.cxf.tools.wsdlto.frontend.jaxws.wsdl11.JAXWSDefinitionBuilder;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessorTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessorTest.java
index 34ad03d..2fb55ba 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessorTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessorTest.java
@@ -24,7 +24,6 @@ import org.apache.cxf.tools.common.model.JavaMethod;
import org.apache.cxf.tools.common.model.JavaParameter;
import org.apache.cxf.tools.common.model.JavaType;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessorTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessorTest.java
index 8c917db..105d879 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessorTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessorTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal;
-import org.junit.Assert;
import org.junit.Test;
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtilTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtilTest.java
index 0f8f084..2e6bf1d 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtilTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtilTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebMethodAnnotatorTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebMethodAnnotatorTest.java
index 1f3969f..fc1c1f2 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebMethodAnnotatorTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebMethodAnnotatorTest.java
@@ -26,7 +26,6 @@ import org.apache.cxf.tools.common.model.JAnnotation;
import org.apache.cxf.tools.common.model.JAnnotationElement;
import org.apache.cxf.tools.common.model.JavaMethod;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotatorTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotatorTest.java
index e75a497..a98d58e 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotatorTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotatorTest.java
@@ -29,7 +29,6 @@ import org.apache.cxf.tools.common.model.JAnnotationElement;
import org.apache.cxf.tools.common.model.JavaMethod;
import org.apache.cxf.tools.common.model.JavaParameter;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlSeeAlsoAnnotatorTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlSeeAlsoAnnotatorTest.java
index 2dbf5f5..7111d6e 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlSeeAlsoAnnotatorTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlSeeAlsoAnnotatorTest.java
@@ -25,7 +25,6 @@ import org.apache.cxf.tools.common.model.JavaInterface;
import org.apache.cxf.tools.util.ClassCollector;
import org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal.annotator.types.ObjectFactory;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/InterfaceMapperTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/InterfaceMapperTest.java
index fcbbfcb..fb19abc 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/InterfaceMapperTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/InterfaceMapperTest.java
@@ -27,7 +27,6 @@ import org.apache.cxf.tools.common.ToolConstants;
import org.apache.cxf.tools.common.ToolContext;
import org.apache.cxf.tools.common.model.JavaInterface;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/MethodMapperTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/MethodMapperTest.java
index 968f2df..4171cb1 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/MethodMapperTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/MethodMapperTest.java
@@ -26,7 +26,6 @@ import org.apache.cxf.service.model.MessageInfo;
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.tools.common.model.JavaMethod;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
index 1302103..f6114aa 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
@@ -34,7 +34,6 @@ import org.apache.cxf.tools.common.ToolConstants;
import org.apache.cxf.tools.common.ToolContext;
import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.JAXWSBinding;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaTest.java b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaTest.java
index 7f52e4e..9405a6f 100644
--- a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaTest.java
+++ b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.tools.wsdlto;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java
index 5119a76..6778140 100644
--- a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java
+++ b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java
@@ -27,7 +27,6 @@ import org.apache.cxf.tools.plugin.FrontEnd;
import org.apache.cxf.tools.plugin.Generator;
import org.apache.cxf.tools.plugin.Plugin;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
index 5674405..0b42b91 100644
--- a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
+++ b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
@@ -36,7 +36,6 @@ import org.apache.cxf.tools.wsdlto.frontend.jaxws.wsdl11.JAXWSDefinitionBuilder;
import org.apache.cxf.wsdl.JAXBExtensibilityElement;
import org.apache.cxf.wsdl.http.AddressType;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
[cxf] 01/05: Stop extending Assert in sts-core
Posted by co...@apache.org.
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 6228a705ec8e101667a786ecd039dd309f6ab474
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Dec 26 11:34:39 2018 +0000
Stop extending Assert in sts-core
---
.../java/org/apache/cxf/sts/cache/EhCacheIdentityCacheTest.java | 5 ++++-
.../java/org/apache/cxf/sts/cache/HazelCastTokenStoreTest.java | 6 +++++-
.../java/org/apache/cxf/sts/cache/MemoryIdentityCacheTest.java | 5 ++++-
.../org/apache/cxf/sts/claims/mapper/JexlClaimsMapperTest.java | 7 ++++++-
.../apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java | 7 ++++++-
.../java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java | 5 ++++-
.../org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java | 5 ++++-
.../org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java | 6 +++++-
.../org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java | 6 +++++-
.../java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java | 6 +++++-
.../test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java | 5 ++++-
.../org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java | 7 ++++++-
.../test/java/org/apache/cxf/sts/operation/IssueSCTUnitTest.java | 6 +++++-
.../org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java | 7 ++++++-
.../org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java | 7 ++++++-
.../java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java | 8 +++++++-
.../test/java/org/apache/cxf/sts/operation/IssueUnitTest.java | 6 +++++-
.../java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java | 5 ++++-
.../apache/cxf/sts/operation/ValidateJWTTransformationTest.java | 5 ++++-
.../java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java | 5 ++++-
.../java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java | 7 ++++++-
.../java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java | 5 ++++-
.../cxf/sts/operation/ValidateTokenTransformationUnitTest.java | 5 ++++-
.../test/java/org/apache/cxf/sts/operation/ValidateUnitTest.java | 6 +++++-
.../apache/cxf/sts/operation/ValidateUsernameTokenUnitTest.java | 5 ++++-
.../org/apache/cxf/sts/operation/ValidateX509TokenUnitTest.java | 5 ++++-
.../java/org/apache/cxf/sts/request/RequestParserUnitTest.java | 5 ++++-
.../org/apache/cxf/sts/token/canceller/SCTCancellerTest.java | 6 +++++-
.../java/org/apache/cxf/sts/token/provider/JWTClaimsTest.java | 6 +++++-
.../org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java | 5 ++++-
.../apache/cxf/sts/token/provider/JWTProviderLifetimeTest.java | 6 +++++-
.../apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java | 5 ++++-
.../apache/cxf/sts/token/provider/JWTTokenProviderRealmTest.java | 6 +++++-
.../org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java | 6 +++++-
.../java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java | 8 +++++++-
.../org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java | 6 +++++-
.../apache/cxf/sts/token/provider/SAMLProviderCustomTest.java | 6 +++++-
.../apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java | 8 +++++++-
.../apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java | 7 +++++--
.../cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java | 6 +++++-
.../org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java | 6 +++++-
.../java/org/apache/cxf/sts/token/provider/SCTProviderTest.java | 7 ++++++-
.../java/org/apache/cxf/sts/token/realm/RealmSupportTest.java | 2 +-
.../cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java | 6 +++++-
.../apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java | 6 +++++-
.../apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java | 5 ++++-
.../org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java | 7 ++++++-
.../cxf/sts/token/validator/JWTTokenValidatorRealmTest.java | 6 +++++-
.../apache/cxf/sts/token/validator/JWTTokenValidatorTest.java | 5 ++++-
.../sts/token/validator/SAMLTokenValidatorCachedRealmTest.java | 5 ++++-
.../cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java | 6 +++++-
.../apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java | 5 ++++-
.../org/apache/cxf/sts/token/validator/SCTValidatorTest.java | 5 ++++-
.../cxf/sts/token/validator/UsernameTokenValidatorTest.java | 4 +++-
.../apache/cxf/sts/token/validator/X509TokenValidatorTest.java | 5 ++++-
.../wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java | 9 +++++----
testutils/src/main/java/org/apache/cxf/test/AbstractCXFTest.java | 3 +--
.../java/org/apache/cxf/testutil/recorders/MessageRecorder.java | 4 ++--
testutils/src/test/java/org/apache/cxf/test/XPathAssertTest.java | 5 +++--
.../apache/cxf/testutils/header_test/rpc/TestRPCHeaderTest.java | 5 +++--
60 files changed, 276 insertions(+), 68 deletions(-)
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/EhCacheIdentityCacheTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/EhCacheIdentityCacheTest.java
index fa9bd4d..4ef4071 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/EhCacheIdentityCacheTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/EhCacheIdentityCacheTest.java
@@ -26,7 +26,10 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.junit.BeforeClass;
-public class EhCacheIdentityCacheTest extends org.junit.Assert {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class EhCacheIdentityCacheTest {
@BeforeClass
public static void init() throws Exception {
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/HazelCastTokenStoreTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/HazelCastTokenStoreTest.java
index 687f9fc..5914faf 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/HazelCastTokenStoreTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/HazelCastTokenStoreTest.java
@@ -26,7 +26,11 @@ import org.apache.cxf.ws.security.tokenstore.TokenStore;
import org.junit.BeforeClass;
-public class HazelCastTokenStoreTest extends org.junit.Assert {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+public class HazelCastTokenStoreTest {
private static TokenStore store;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/MemoryIdentityCacheTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/MemoryIdentityCacheTest.java
index cd5eec3..ddbde7c 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/MemoryIdentityCacheTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/MemoryIdentityCacheTest.java
@@ -24,7 +24,10 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.junit.BeforeClass;
-public class MemoryIdentityCacheTest extends org.junit.Assert {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class MemoryIdentityCacheTest {
@BeforeClass
public static void init() throws Exception {
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapperTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapperTest.java
index 6ee7eeb..4f6ffa3 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapperTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapperTest.java
@@ -35,8 +35,13 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
@RunWith(Parameterized.class)
-public class JexlClaimsMapperTest extends org.junit.Assert {
+public class JexlClaimsMapperTest {
JexlClaimsMapper jcm;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java
index 522c7fb..b40f5ed 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java
@@ -83,10 +83,15 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
import org.apache.wss4j.common.util.DOM2Writer;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Some unit tests for the issue operation to issue SAML tokens with Claims information.
*/
-public class JexlIssueSamlClaimsTest extends org.junit.Assert {
+public class JexlIssueSamlClaimsTest {
public static final QName REQUESTED_SECURITY_TOKEN = QNameConstants.WS_TRUST_FACTORY
.createRequestedSecurityToken(null).getName();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java
index a8e0133..f7be7ec 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java
@@ -56,10 +56,13 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Some unit tests for the cancel operation to cancel SecurityContextTokens.
*/
-public class CancelSCTUnitTest extends org.junit.Assert {
+public class CancelSCTUnitTest {
public static final QName REQUESTED_SECURITY_TOKEN =
QNameConstants.WS_TRUST_FACTORY.createRequestedSecurityToken(null).getName();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java
index a2ed021..02b5432 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java
@@ -49,10 +49,13 @@ import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.dom.WSConstants;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Some unit tests for issuing encrypted tokens.
*/
-public class IssueEncryptedUnitTest extends org.junit.Assert {
+public class IssueEncryptedUnitTest {
private static boolean unrestrictedPoliciesInstalled;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java
index 49a1383..b0cd472 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java
@@ -89,10 +89,14 @@ import org.apache.wss4j.common.util.DOM2Writer;
import org.junit.Assert;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Some unit tests for the issue operation to issue JWT tokens with Claims information.
*/
-public class IssueJWTClaimsUnitTest extends org.junit.Assert {
+public class IssueJWTClaimsUnitTest {
public static final QName REQUESTED_SECURITY_TOKEN =
QNameConstants.WS_TRUST_FACTORY.createRequestedSecurityToken(null).getName();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java
index 31746dc..424ece9 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java
@@ -80,10 +80,14 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.junit.Assert;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Issue JWT tokens on behalf of other tokens.
*/
-public class IssueJWTOnbehalfofUnitTest extends org.junit.Assert {
+public class IssueJWTOnbehalfofUnitTest {
public static final QName REQUESTED_SECURITY_TOKEN =
QNameConstants.WS_TRUST_FACTORY.createRequestedSecurityToken(null).getName();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java
index e46aac7..6696460 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java
@@ -64,10 +64,14 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.junit.Assert;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Some unit tests for the issue operation to issue JWT tokens in a specific realm.
*/
-public class IssueJWTRealmUnitTest extends org.junit.Assert {
+public class IssueJWTRealmUnitTest {
public static final QName REQUESTED_SECURITY_TOKEN =
QNameConstants.WS_TRUST_FACTORY.createRequestedSecurityToken(null).getName();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java
index 87fda2d..3d5795e 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java
@@ -62,10 +62,13 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.junit.Assert;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Some unit tests for the issue operation to issue JWT Tokens.
*/
-public class IssueJWTUnitTest extends org.junit.Assert {
+public class IssueJWTUnitTest {
public static final QName REQUESTED_SECURITY_TOKEN =
QNameConstants.WS_TRUST_FACTORY.createRequestedSecurityToken(null).getName();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java
index b1e6efb..81967b6 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java
@@ -88,10 +88,15 @@ import org.apache.wss4j.common.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
import org.apache.wss4j.common.util.DOM2Writer;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Some unit tests for the issue operation.
*/
-public class IssueOnbehalfofUnitTest extends org.junit.Assert {
+public class IssueOnbehalfofUnitTest {
public static final QName REQUESTED_SECURITY_TOKEN =
QNameConstants.WS_TRUST_FACTORY.createRequestedSecurityToken(null).getName();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSCTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSCTUnitTest.java
index 893ae73..317fbcb 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSCTUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSCTUnitTest.java
@@ -58,10 +58,14 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.common.util.DOM2Writer;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Some unit tests for the issue operation to issue SecurityContextTokens.
*/
-public class IssueSCTUnitTest extends org.junit.Assert {
+public class IssueSCTUnitTest {
public static final QName REQUESTED_SECURITY_TOKEN =
QNameConstants.WS_TRUST_FACTORY.createRequestedSecurityToken(null).getName();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java
index e804f73..e166a1d 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java
@@ -87,10 +87,15 @@ import org.apache.wss4j.common.saml.builder.SAML1Constants;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
import org.apache.wss4j.common.util.DOM2Writer;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+
/**
* Some unit tests for the issue operation to issue SAML tokens with Claims information.
*/
-public class IssueSamlClaimsUnitTest extends org.junit.Assert {
+public class IssueSamlClaimsUnitTest {
public static final QName REQUESTED_SECURITY_TOKEN =
QNameConstants.WS_TRUST_FACTORY.createRequestedSecurityToken(null).getName();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java
index 1a06497..282ef2d 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java
@@ -58,10 +58,15 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.common.util.DOM2Writer;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Some unit tests for the issue operation to issue SAML tokens in a specific realm.
*/
-public class IssueSamlRealmUnitTest extends org.junit.Assert {
+public class IssueSamlRealmUnitTest {
public static final QName REQUESTED_SECURITY_TOKEN =
QNameConstants.WS_TRUST_FACTORY.createRequestedSecurityToken(null).getName();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java
index 4958258..432b36d 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java
@@ -79,10 +79,16 @@ import org.apache.wss4j.dom.message.WSSecEncryptedKey;
import org.apache.wss4j.dom.saml.WSSSAMLKeyInfoProcessor;
import org.apache.wss4j.dom.util.WSSecurityUtil;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Some unit tests for the issue operation to issue SAML tokens.
*/
-public class IssueSamlUnitTest extends org.junit.Assert {
+public class IssueSamlUnitTest {
public static final QName REQUESTED_SECURITY_TOKEN =
QNameConstants.WS_TRUST_FACTORY.createRequestedSecurityToken(null).getName();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueUnitTest.java
index 15141ff..42af1c5 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueUnitTest.java
@@ -49,10 +49,14 @@ import org.apache.cxf.ws.security.sts.provider.model.utility.AttributedDateTime;
import org.apache.wss4j.common.WSS4JConstants;
import org.apache.wss4j.common.util.DateUtil;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Some unit tests for the issue operation.
*/
-public class IssueUnitTest extends org.junit.Assert {
+public class IssueUnitTest {
/**
* Test to successfully issue a (dummy) token.
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java
index 5fa925d..7cfb6e1 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java
@@ -71,10 +71,13 @@ import org.apache.wss4j.common.util.DateUtil;
import org.junit.BeforeClass;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Some unit tests for the renew operation to renew SAML tokens.
*/
-public class RenewSamlUnitTest extends org.junit.Assert {
+public class RenewSamlUnitTest {
public static final QName REQUESTED_SECURITY_TOKEN =
QNameConstants.WS_TRUST_FACTORY.createRequestedSecurityToken(null).getName();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java
index 6651c39..9159f0c 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java
@@ -82,10 +82,13 @@ import org.apache.wss4j.common.util.DOM2Writer;
import org.junit.Assert;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* This tests validating a JWT Token + transforming into a SAML token, and vice versa.
*/
-public class ValidateJWTTransformationTest extends org.junit.Assert {
+public class ValidateJWTTransformationTest {
public static final QName REQUESTED_SECURITY_TOKEN =
QNameConstants.WS_TRUST_FACTORY.createRequestedSecurityToken(null).getName();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java
index c8116e5..28bf8e2 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java
@@ -56,10 +56,13 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Some unit tests for the validate operation to validate JWT Tokens.
*/
-public class ValidateJWTUnitTest extends org.junit.Assert {
+public class ValidateJWTUnitTest {
public static final QName REQUESTED_SECURITY_TOKEN =
QNameConstants.WS_TRUST_FACTORY.createRequestedSecurityToken(null).getName();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java
index b8ceed6..8792d24 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java
@@ -57,10 +57,15 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Some unit tests for the validate operation to validate SecurityContextTokens.
*/
-public class ValidateSCTUnitTest extends org.junit.Assert {
+public class ValidateSCTUnitTest {
public static final QName REQUESTED_SECURITY_TOKEN =
QNameConstants.WS_TRUST_FACTORY.createRequestedSecurityToken(null).getName();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java
index d4638b4..5f5ed10 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java
@@ -57,10 +57,13 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Some unit tests for the validate operation to validate SAML tokens.
*/
-public class ValidateSamlUnitTest extends org.junit.Assert {
+public class ValidateSamlUnitTest {
public static final QName REQUESTED_SECURITY_TOKEN =
QNameConstants.WS_TRUST_FACTORY.createRequestedSecurityToken(null).getName();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java
index c375fe7..660c835 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java
@@ -85,10 +85,13 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
import org.apache.wss4j.common.util.DOM2Writer;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* In this test, a token (UsernameToken or SAMLToken) is validated and transformed into a SAML Assertion.
*/
-public class ValidateTokenTransformationUnitTest extends org.junit.Assert {
+public class ValidateTokenTransformationUnitTest {
public static final QName REQUESTED_SECURITY_TOKEN =
QNameConstants.WS_TRUST_FACTORY.createRequestedSecurityToken(null).getName();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUnitTest.java
index 97a6762..4fb7d56 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUnitTest.java
@@ -40,10 +40,14 @@ import org.apache.cxf.ws.security.sts.provider.model.StatusType;
import org.apache.cxf.ws.security.sts.provider.model.ValidateTargetType;
import org.apache.cxf.ws.security.sts.provider.model.secext.BinarySecurityTokenType;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Some unit tests for the validate operation.
*/
-public class ValidateUnitTest extends org.junit.Assert {
+public class ValidateUnitTest {
private static final QName QNAME_WST_STATUS =
QNameConstants.WS_TRUST_FACTORY.createStatus(null).getName();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUsernameTokenUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUsernameTokenUnitTest.java
index 0e8dee1..cce8ea6 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUsernameTokenUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUsernameTokenUnitTest.java
@@ -48,10 +48,13 @@ import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
/**
* Some unit tests for the validate operation to validate UsernameTokens.
*/
-public class ValidateUsernameTokenUnitTest extends org.junit.Assert {
+public class ValidateUsernameTokenUnitTest {
public static final QName REQUESTED_SECURITY_TOKEN =
QNameConstants.WS_TRUST_FACTORY.createRequestedSecurityToken(null).getName();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateX509TokenUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateX509TokenUnitTest.java
index efe2b8e..04da827 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateX509TokenUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateX509TokenUnitTest.java
@@ -49,10 +49,13 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.crypto.CryptoType;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
/**
* Some unit tests for the validate operation to validate X.509 tokens.
*/
-public class ValidateX509TokenUnitTest extends org.junit.Assert {
+public class ValidateX509TokenUnitTest {
public static final QName REQUESTED_SECURITY_TOKEN =
QNameConstants.WS_TRUST_FACTORY.createRequestedSecurityToken(null).getName();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/request/RequestParserUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/request/RequestParserUnitTest.java
index e95fced..5117c34 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/request/RequestParserUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/request/RequestParserUnitTest.java
@@ -48,7 +48,10 @@ import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
-public class RequestParserUnitTest extends org.junit.Assert {
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class RequestParserUnitTest {
private static final String SECURITY_HEADER =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?><wsse:Security "
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/canceller/SCTCancellerTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/canceller/SCTCancellerTest.java
index ee6cad5..39d53f3 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/canceller/SCTCancellerTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/canceller/SCTCancellerTest.java
@@ -46,10 +46,14 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.dom.message.token.SecurityContextToken;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Some unit tests for cancelling a SecurityContextToken via the SCTCanceller.
*/
-public class SCTCancellerTest extends org.junit.Assert {
+public class SCTCancellerTest {
private static TokenStore tokenStore = new DefaultInMemoryTokenStore();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTClaimsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTClaimsTest.java
index 87b33c0..4a0683f 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTClaimsTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTClaimsTest.java
@@ -47,10 +47,14 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* A unit test for creating JWT Tokens with various claims populated by a ClaimsHandler.
*/
-public class JWTClaimsTest extends org.junit.Assert {
+public class JWTClaimsTest {
public static final URI CLAIM_STATIC_COMPANY =
URI.create("http://apache.org/claims/test/company");
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java
index 05b9dde..0e95d86 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java
@@ -49,10 +49,13 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.junit.Assert;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Some unit tests for creating JWT Tokens with an ActAs element.
*/
-public class JWTProviderActAsTest extends org.junit.Assert {
+public class JWTProviderActAsTest {
/**
* Create a JWT Token with ActAs from a UsernameToken
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderLifetimeTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderLifetimeTest.java
index 39dbaad..7e297bd 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderLifetimeTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderLifetimeTest.java
@@ -43,11 +43,15 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.common.util.DateUtil;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* Some unit tests for creating JWT Tokens with lifetime
*/
-public class JWTProviderLifetimeTest extends org.junit.Assert {
+public class JWTProviderLifetimeTest {
/**
* Issue JWT token with a valid requested lifetime
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java
index 6fd30bd..6c4b23e 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java
@@ -49,10 +49,13 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.junit.Assert;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Some unit tests for creating JWT Tokens with an OnBehalfOf element.
*/
-public class JWTProviderOnBehalfOfTest extends org.junit.Assert {
+public class JWTProviderOnBehalfOfTest {
/**
* Create a JWT Token with OnBehalfOf from a UsernameToken
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderRealmTest.java
index 47934a8..d1b8f67 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderRealmTest.java
@@ -39,10 +39,14 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Some unit tests for creating JWT Tokens via the JWTTokenProvider in different realms
*/
-public class JWTTokenProviderRealmTest extends org.junit.Assert {
+public class JWTTokenProviderRealmTest {
@org.junit.Test
public void testRealms() throws Exception {
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java
index 70b966e..a543b0d 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java
@@ -55,10 +55,14 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.junit.Assert;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Some unit tests for creating JWTTokens.
*/
-public class JWTTokenProviderTest extends org.junit.Assert {
+public class JWTTokenProviderTest {
private static boolean unrestrictedPoliciesInstalled;
private static TokenStore tokenStore = new DefaultInMemoryTokenStore();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java
index 706fa2d..85573c9 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java
@@ -55,10 +55,16 @@ import org.apache.wss4j.common.util.DOM2Writer;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.saml.saml2.core.Attribute;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* A unit test for creating a SAML Tokens with various Attributes populated by a ClaimsHandler.
*/
-public class SAMLClaimsTest extends org.junit.Assert {
+public class SAMLClaimsTest {
public static final String CLAIM_STATIC_COMPANY =
"http://apache.org/claims/test/company";
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java
index a591e93..cc0865c 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java
@@ -58,10 +58,14 @@ import org.opensaml.core.xml.XMLObject;
import org.junit.Assert;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Some unit tests for creating SAML Tokens with an ActAs element.
*/
-public class SAMLProviderActAsTest extends org.junit.Assert {
+public class SAMLProviderActAsTest {
/**
* Create a default Saml1 Bearer Assertion with ActAs from a UsernameToken
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java
index c78e302..238fa98 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java
@@ -42,10 +42,14 @@ import org.apache.wss4j.common.saml.builder.SAML1Constants;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
import org.apache.wss4j.common.util.DOM2Writer;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Some unit tests for creating custom SAML Tokens.
*/
-public class SAMLProviderCustomTest extends org.junit.Assert {
+public class SAMLProviderCustomTest {
/**
* Create a custom Saml1 Attribute Assertion.
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java
index 4007b52..8d8ea5b 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java
@@ -51,10 +51,16 @@ import org.apache.wss4j.common.saml.builder.SAML2Constants;
import org.apache.wss4j.common.util.DOM2Writer;
import org.apache.wss4j.dom.util.WSSecurityUtil;
+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 unit tests for creating SAML Tokens with various KeyType parameters via the SAMLTokenProvider.
*/
-public class SAMLProviderKeyTypeTest extends org.junit.Assert {
+public class SAMLProviderKeyTypeTest {
/**
* Create a default Saml1 Bearer Assertion.
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java
index ea99d2d..51743f6 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java
@@ -43,12 +43,15 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.common.util.DOM2Writer;
import org.apache.wss4j.common.util.DateUtil;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* Some unit tests for creating SAML Tokens with lifetime
*/
-public class SAMLProviderLifetimeTest extends org.junit.Assert {
+public class SAMLProviderLifetimeTest {
/**
* Issue SAML 2 token with a valid requested lifetime
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java
index df97698..1e1911b 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java
@@ -47,10 +47,14 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.common.util.DOM2Writer;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Some unit tests for creating SAML Tokens with an OnBehalfOf element.
*/
-public class SAMLProviderOnBehalfOfTest extends org.junit.Assert {
+public class SAMLProviderOnBehalfOfTest {
/**
* Create a default Saml1 Bearer Assertion with OnBehalfOf from a UsernameToken
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java
index f33011a..74d5010 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java
@@ -40,10 +40,14 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.common.util.DOM2Writer;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Some unit tests for creating SAML Tokens via the SAMLTokenProvider in different realms
*/
-public class SAMLProviderRealmTest extends org.junit.Assert {
+public class SAMLProviderRealmTest {
/**
* Test that a SAML 1.1 Bearer Assertion is created in specific realms.
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SCTProviderTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SCTProviderTest.java
index dbd497a..134f6f6 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SCTProviderTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SCTProviderTest.java
@@ -40,10 +40,15 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.common.util.DOM2Writer;
import org.apache.wss4j.dom.message.token.SecurityContextToken;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Some unit tests for creating SecurityContextTokens.
*/
-public class SCTProviderTest extends org.junit.Assert {
+public class SCTProviderTest {
private static TokenStore tokenStore = new DefaultInMemoryTokenStore();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/realm/RealmSupportTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/realm/RealmSupportTest.java
index fe514a9..3c5f7fe 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/realm/RealmSupportTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/realm/RealmSupportTest.java
@@ -36,7 +36,7 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.junit.Assert;
-public class RealmSupportTest extends org.junit.Assert {
+public class RealmSupportTest {
@org.junit.Test
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java
index 03ec5c6..0cde131 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java
@@ -55,11 +55,15 @@ import org.apache.wss4j.common.util.DateUtil;
import org.junit.BeforeClass;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* Some unit tests for renewing SAML Tokens with lifetime
*/
-public class SAMLTokenRenewerLifetimeTest extends org.junit.Assert {
+public class SAMLTokenRenewerLifetimeTest {
private static TokenStore tokenStore;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java
index 1a25ce4..eafd86f 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java
@@ -68,11 +68,15 @@ import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.junit.BeforeClass;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Some unit tests for renewing a SAML token via the SAMLTokenRenewer with proof of possession enabled
* (message level, not TLS).
*/
-public class SAMLTokenRenewerPOPTest extends org.junit.Assert {
+public class SAMLTokenRenewerPOPTest {
private static TokenStore tokenStore;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
index 203173d..d12ec1d 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
@@ -64,10 +64,13 @@ import org.apache.wss4j.common.util.DateUtil;
import org.junit.BeforeClass;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Some unit tests for renewing a SAML token in different realms.
*/
-public class SAMLTokenRenewerRealmTest extends org.junit.Assert {
+public class SAMLTokenRenewerRealmTest {
private static TokenStore tokenStore;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
index ad3c360..7079ada 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
@@ -60,10 +60,15 @@ import org.apache.wss4j.common.util.DateUtil;
import org.junit.BeforeClass;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Some unit tests for renewing a SAML token via the SAMLTokenRenewer.
*/
-public class SAMLTokenRenewerTest extends org.junit.Assert {
+public class SAMLTokenRenewerTest {
private static TokenStore tokenStore;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java
index 67fec74..d95e2da 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java
@@ -53,10 +53,14 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Some unit tests for validating JWTTokens in different realms
*/
-public class JWTTokenValidatorRealmTest extends org.junit.Assert {
+public class JWTTokenValidatorRealmTest {
private static TokenStore tokenStore = new DefaultInMemoryTokenStore();
@org.junit.Test
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorTest.java
index 0d4967a..12909fc 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorTest.java
@@ -59,10 +59,13 @@ import org.apache.wss4j.common.ext.WSPasswordCallback;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Some unit tests for validating JWTTokens.
*/
-public class JWTTokenValidatorTest extends org.junit.Assert {
+public class JWTTokenValidatorTest {
private static TokenStore tokenStore = new DefaultInMemoryTokenStore();
@org.junit.Test
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java
index 2b822f5..6813ec0 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java
@@ -54,11 +54,14 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.junit.BeforeClass;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
/**
* Some unit tests for validating a SAML token with a realm against the cached tokens realm.
*/
-public class SAMLTokenValidatorCachedRealmTest extends org.junit.Assert {
+public class SAMLTokenValidatorCachedRealmTest {
private static TokenStore tokenStore;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java
index d8e6ecb..9440223 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java
@@ -50,10 +50,14 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Some unit tests for validating a SAML token in different realms via the SAMLTokenValidator.
*/
-public class SAMLTokenValidatorRealmTest extends org.junit.Assert {
+public class SAMLTokenValidatorRealmTest {
/**
* Test a SAML 1.1 Assertion created in realm "A".
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
index 2459a10..c9dc623 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
@@ -71,11 +71,14 @@ import org.apache.wss4j.common.util.DateUtil;
import org.junit.BeforeClass;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
/**
* Some unit tests for validating a SAML token via the SAMLTokenValidator.
*/
-public class SAMLTokenValidatorTest extends org.junit.Assert {
+public class SAMLTokenValidatorTest {
private static TokenStore tokenStore;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SCTValidatorTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SCTValidatorTest.java
index d31b63a..f7aff79 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SCTValidatorTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SCTValidatorTest.java
@@ -46,11 +46,14 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.dom.message.token.SecurityContextToken;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
/**
* Some unit tests for validating a SecurityContextToken via the SCTValidator.
*/
-public class SCTValidatorTest extends org.junit.Assert {
+public class SCTValidatorTest {
private static TokenStore tokenStore = new DefaultInMemoryTokenStore();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/UsernameTokenValidatorTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/UsernameTokenValidatorTest.java
index 34f614a..fc5d913 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/UsernameTokenValidatorTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/UsernameTokenValidatorTest.java
@@ -48,11 +48,13 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.dom.message.token.UsernameToken;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
/**
* Some unit tests for validating a UsernameToken via the UsernameTokenValidator.
*/
-public class UsernameTokenValidatorTest extends org.junit.Assert {
+public class UsernameTokenValidatorTest {
/**
* Test a valid UsernameToken with password text
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/X509TokenValidatorTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/X509TokenValidatorTest.java
index 56eca62..014f073 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/X509TokenValidatorTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/X509TokenValidatorTest.java
@@ -43,11 +43,14 @@ import org.apache.wss4j.common.crypto.CryptoType;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
/**
* Some unit tests for validating an X.509 Token via the X509TokenValidator.
*/
-public class X509TokenValidatorTest extends org.junit.Assert {
+public class X509TokenValidatorTest {
/**
* Test a valid certificate
diff --git a/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java b/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java
index 15054a7..257bd5d 100644
--- a/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java
+++ b/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java
@@ -51,13 +51,14 @@ import org.oasis_open.docs.wsn.b_2.NotificationMessageHolderType;
import org.oasis_open.docs.wsn.b_2.TopicExpressionType;
import org.junit.After;
-import org.junit.Assert;
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;
-
-public abstract class WsnBrokerTest extends Assert {
+public abstract class WsnBrokerTest {
private boolean useExternal;
@@ -83,7 +84,7 @@ public abstract class WsnBrokerTest extends Assert {
.setContextClassLoader(new FakeClassLoader(impl));
WSNHelper.getInstance().setClassLoader(false);
-
+
port2 = getFreePort();
if (!useExternal) {
diff --git a/testutils/src/main/java/org/apache/cxf/test/AbstractCXFTest.java b/testutils/src/main/java/org/apache/cxf/test/AbstractCXFTest.java
index 787936a..78ae3cd 100644
--- a/testutils/src/main/java/org/apache/cxf/test/AbstractCXFTest.java
+++ b/testutils/src/main/java/org/apache/cxf/test/AbstractCXFTest.java
@@ -39,7 +39,6 @@ import org.apache.cxf.endpoint.Server;
import org.apache.cxf.helpers.MapNamespaceContext;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
@@ -47,7 +46,7 @@ import org.junit.Before;
* A basic test case meant for helping users unit test their services.
* @see TestUtilities
*/
-public abstract class AbstractCXFTest extends Assert {
+public abstract class AbstractCXFTest {
protected TestUtilities testUtilities;
protected Bus bus;
diff --git a/testutils/src/main/java/org/apache/cxf/testutil/recorders/MessageRecorder.java b/testutils/src/main/java/org/apache/cxf/testutil/recorders/MessageRecorder.java
index f1ce34b..a30e643 100644
--- a/testutils/src/main/java/org/apache/cxf/testutil/recorders/MessageRecorder.java
+++ b/testutils/src/main/java/org/apache/cxf/testutil/recorders/MessageRecorder.java
@@ -21,9 +21,9 @@ package org.apache.cxf.testutil.recorders;
import java.util.List;
-import org.junit.Assert;
+import static org.junit.Assert.assertEquals;
-public class MessageRecorder extends Assert {
+public class MessageRecorder {
private OutMessageRecorder outRecorder;
private InMessageRecorder inRecorder;
diff --git a/testutils/src/test/java/org/apache/cxf/test/XPathAssertTest.java b/testutils/src/test/java/org/apache/cxf/test/XPathAssertTest.java
index d87b163..95067e3 100644
--- a/testutils/src/test/java/org/apache/cxf/test/XPathAssertTest.java
+++ b/testutils/src/test/java/org/apache/cxf/test/XPathAssertTest.java
@@ -26,10 +26,11 @@ import org.w3c.dom.Document;
import org.apache.cxf.staxutils.StaxUtils;
-import org.junit.Assert;
import org.junit.Test;
-public class XPathAssertTest extends Assert {
+import static org.junit.Assert.fail;
+
+public class XPathAssertTest {
@Test
public void testAssert() throws Exception {
diff --git a/testutils/src/test/java/org/apache/cxf/testutils/header_test/rpc/TestRPCHeaderTest.java b/testutils/src/test/java/org/apache/cxf/testutils/header_test/rpc/TestRPCHeaderTest.java
index 3ca4418..e4c77ce 100644
--- a/testutils/src/test/java/org/apache/cxf/testutils/header_test/rpc/TestRPCHeaderTest.java
+++ b/testutils/src/test/java/org/apache/cxf/testutils/header_test/rpc/TestRPCHeaderTest.java
@@ -25,11 +25,12 @@ import javax.jws.WebParam;
import org.apache.header_test.rpc.TestRPCHeader;
-import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
-public class TestRPCHeaderTest extends Assert {
+public class TestRPCHeaderTest {
Class<TestRPCHeader> cls = TestRPCHeader.class;
@Test
[cxf] 03/05: Adding static junit imports
Posted by co...@apache.org.
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 5d164a22c1934f6c499d12146c6ab9d59b13e6ee
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Dec 28 16:32:11 2018 +0000
Adding static junit imports
---
core/src/test/java/org/apache/cxf/BusFactoryTest.java | 4 +++-
.../org/apache/cxf/attachment/AttachmentDeserializerTest.java | 6 +++++-
.../org/apache/cxf/attachment/AttachmentSerializerTest.java | 5 ++++-
.../java/org/apache/cxf/attachment/AttachmentUtilTest.java | 4 +++-
core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java | 6 +++++-
.../org/apache/cxf/bus/extension/ExtensionManagerTest.java | 6 +++++-
.../test/java/org/apache/cxf/bus/extension/ExtensionTest.java | 8 +++++++-
.../cxf/bus/extension/TextExtensionFragmentParserTest.java | 6 +++++-
.../cxf/bus/managers/EndpointResolverRegistryImplTest.java | 8 +++++++-
.../org/apache/cxf/bus/managers/ServerRegistryImpTest.java | 4 +++-
.../bus/managers/ServiceContractResolverRegistryImplTest.java | 9 ++++++++-
.../test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java | 4 +++-
.../org/apache/cxf/bus/spring/BusApplicationContextTest.java | 5 ++++-
.../org/apache/cxf/bus/spring/BusDefinitionParserTest.java | 5 ++++-
.../java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java | 8 +++++++-
.../apache/cxf/common/annotation/AnnotationProcessorTest.java | 3 ++-
.../apache/cxf/common/classloader/ClassLoaderUtilsTest.java | 4 +++-
.../test/java/org/apache/cxf/common/i18n/BundleUtilsTest.java | 5 ++++-
core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java | 6 +++++-
.../org/apache/cxf/common/injection/ResourceInjectorTest.java | 6 +++++-
.../test/java/org/apache/cxf/common/jaxb/JAXBUtilsTest.java | 4 +++-
.../test/java/org/apache/cxf/common/logging/LogUtilsTest.java | 5 ++++-
.../org/apache/cxf/common/logging/RegexLoggingFilterTest.java | 4 +++-
.../java/org/apache/cxf/common/security/SimpleGroupTest.java | 6 +++++-
.../org/apache/cxf/common/security/SimplePrincipalTest.java | 5 ++++-
.../test/java/org/apache/cxf/common/util/ASMHelperTest.java | 4 +++-
.../java/org/apache/cxf/common/util/Base64UtilityTest.java | 7 ++++++-
.../test/java/org/apache/cxf/common/util/ClassHelperTest.java | 2 ++
.../java/org/apache/cxf/common/util/CollectionUtilsTest.java | 8 +++++++-
.../test/java/org/apache/cxf/common/util/PackageUtilsTest.java | 4 +++-
.../org/apache/cxf/common/util/PropertiesLoaderUtilsTest.java | 5 ++++-
.../java/org/apache/cxf/common/util/PropertyUtilsTest.java | 5 ++++-
.../test/java/org/apache/cxf/common/util/StringUtilsTest.java | 6 +++++-
.../java/org/apache/cxf/common/util/URIParserUtilsTest.java | 5 ++++-
.../src/test/java/org/apache/cxf/common/util/UrlUtilsTest.java | 6 +++++-
.../apache/cxf/common/util/XmlSchemaPrimitiveUtilsTest.java | 4 +++-
.../java/org/apache/cxf/common/xmlschema/ImportRepairTest.java | 4 +++-
.../apache/cxf/configuration/spring/ConfigurerImplTest.java | 6 +++++-
.../cxf/continuations/SuspendedInvocationExceptionTest.java | 5 ++++-
.../apache/cxf/databinding/source/XMLStreamDataReaderTest.java | 5 ++++-
.../test/java/org/apache/cxf/endpoint/EndpointImplTest.java | 5 ++++-
core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java | 4 +++-
core/src/test/java/org/apache/cxf/helpers/IOUtilsTest.java | 6 +++++-
core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java | 7 ++++++-
.../src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java | 6 +++++-
.../org/apache/cxf/interceptor/LoggingInInterceptorTest.java | 4 +++-
.../org/apache/cxf/interceptor/LoggingOutInterceptorTest.java | 7 ++++++-
.../apache/cxf/interceptor/ServiceInvokerInterceptorTest.java | 6 +++++-
.../cxf/interceptor/security/DefaultSecurityContextTest.java | 7 ++++++-
.../interceptor/security/NamePasswordCallbackHandlerTest.java | 5 ++++-
.../security/RolePrefixSecurityContextImplTest.java | 7 ++++++-
.../org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java | 4 +++-
.../test/java/org/apache/cxf/io/CachedOutputStreamTest.java | 6 +++++-
core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java | 7 ++++++-
.../java/org/apache/cxf/phase/PhaseInterceptorChainTest.java | 7 ++++++-
.../java/org/apache/cxf/resource/ClassLoaderResolverTest.java | 6 +++++-
.../org/apache/cxf/resource/DefaultResourceManagerTest.java | 7 ++++++-
.../src/test/java/org/apache/cxf/resource/URIResolverTest.java | 8 +++++++-
.../org/apache/cxf/service/model/BindingFaultInfoTest.java | 6 +++++-
.../org/apache/cxf/service/model/BindingMessageInfoTest.java | 6 +++++-
.../org/apache/cxf/service/model/BindingOperationInfoTest.java | 7 ++++++-
.../test/java/org/apache/cxf/service/model/FaultInfoTest.java | 4 +++-
.../java/org/apache/cxf/service/model/InterfaceInfoTest.java | 5 ++++-
.../java/org/apache/cxf/service/model/MessageInfoTest.java | 4 +++-
.../java/org/apache/cxf/service/model/MessagePartInfoTest.java | 7 ++++++-
.../java/org/apache/cxf/service/model/OperationInfoTest.java | 9 ++++++++-
.../apache/cxf/staxutils/DepthRestrictingStreamReaderTest.java | 4 +++-
.../org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java | 5 ++++-
.../org/apache/cxf/staxutils/FragmentStreamReaderTest.java | 5 ++++-
.../org/apache/cxf/staxutils/PartialXMLStreamReaderTest.java | 4 +++-
.../cxf/staxutils/PropertiesExpandingStreamReaderTest.java | 4 +++-
.../java/org/apache/cxf/staxutils/StaxStreamFilterTest.java | 4 +++-
.../java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java | 3 +++
.../staxutils/transform/DelegatingNamespaceContextTest.java | 8 +++++++-
.../apache/cxf/staxutils/transform/InTransformReaderTest.java | 5 ++++-
.../apache/cxf/staxutils/transform/OutTransformWriterTest.java | 6 +++++-
.../org/apache/cxf/transport/ChainInitiationObserverTest.java | 4 +++-
.../test/java/org/apache/cxf/transport/HttpUriMapperTest.java | 4 +++-
.../cxf/transport/common/gzip/GZIPAcceptEncodingTest.java | 4 +++-
core/src/test/java/org/apache/cxf/version/VersionTest.java | 5 ++++-
.../java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java | 7 ++++++-
.../cxf/jca/core/classloader/FireWallClassLoaderTest.java | 6 +++++-
.../apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java | 8 +++++++-
.../java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java | 7 ++++++-
.../org/apache/cxf/jca/core/resourceadapter/HandlerTest.java | 5 ++++-
.../core/resourceadapter/ManagedConnectionFactoryImplTest.java | 8 +++++++-
.../jca/core/resourceadapter/ManagedConnectionImplTest.java | 6 +++++-
.../resourceadapter/ResourceAdapterInternalExceptionTest.java | 6 +++++-
.../cxf/jca/core/resourceadapter/UriHandlerInitTest.java | 5 ++++-
.../jca/cxf/AssociatedManagedConnectionFactoryImplTest.java | 6 +++++-
.../org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java | 4 +++-
.../java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java | 7 ++++++-
.../test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java | 6 +++++-
.../apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java | 9 ++++++++-
.../java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java | 6 +++++-
.../java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java | 8 +++++++-
.../cxf/jca/cxf/handlers/AbstractInvocationHandlerTest.java | 5 ++++-
.../java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java | 4 +++-
.../cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java | 8 +++++++-
.../cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java | 4 +++-
.../jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java | 4 +++-
.../cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java | 3 ++-
.../test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java | 5 ++++-
.../test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java | 4 +++-
.../java/org/apache/cxf/jca/servant/EJBServantConfigTest.java | 5 ++++-
.../org/apache/cxf/binding/coloc/ColocMessageObserverTest.java | 5 ++++-
.../org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java | 7 ++++++-
.../test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java | 6 +++++-
.../binding/coloc/blueprint/ColocBPNamespaceHandlerTest.java | 4 +++-
.../org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java | 6 +++++-
.../java/org/apache/cxf/binding/corba/CorbaBindingTest.java | 5 ++++-
.../java/org/apache/cxf/binding/corba/CorbaConduitTest.java | 5 ++++-
.../org/apache/cxf/binding/corba/CorbaDestinationTest.java | 5 ++++-
.../java/org/apache/cxf/binding/corba/CorbaMessageTest.java | 5 ++++-
.../org/apache/cxf/binding/corba/CorbaServerConduitTest.java | 6 +++++-
.../java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java | 2 ++
.../apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java | 4 +++-
.../cxf/binding/corba/runtime/CorbaObjectReaderTest.java | 6 +++++-
.../cxf/binding/corba/runtime/CorbaObjectWriterTest.java | 5 ++++-
.../cxf/binding/corba/runtime/CorbaStreamReaderTest.java | 4 +++-
.../cxf/binding/corba/runtime/CorbaStreamWriterTest.java | 4 +++-
.../apache/cxf/binding/corba/runtime/CorbaStreamableTest.java | 6 +++++-
.../apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java | 6 +++++-
.../apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java | 5 ++++-
.../apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java | 5 ++++-
.../apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java | 5 ++++-
.../apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java | 5 ++++-
.../apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java | 6 +++++-
.../cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java | 5 ++++-
.../cxf/binding/corba/types/CorbaSequenceHandlerTest.java | 5 ++++-
.../apache/cxf/binding/corba/types/CorbaStructHandlerTest.java | 5 ++++-
.../org/apache/cxf/binding/corba/utils/ContextUtilsTest.java | 3 ++-
.../org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java | 6 +++++-
.../apache/cxf/binding/soap/MustUnderstandInterceptorTest.java | 6 +++++-
.../java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java | 5 ++++-
.../org/apache/cxf/binding/soap/RPCOutInterceptorTest.java | 5 ++++-
.../org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java | 8 +++++++-
.../java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java | 5 ++++-
.../org/apache/cxf/binding/soap/SoapActionInterceptorTest.java | 6 +++++-
.../org/apache/cxf/binding/soap/SoapBindingFactoryTest.java | 6 +++++-
.../test/java/org/apache/cxf/binding/soap/SoapBindingTest.java | 6 +++++-
.../org/apache/cxf/binding/soap/SoapOutInterceptorTest.java | 5 ++++-
.../src/test/java/org/apache/cxf/binding/soap/TestBase.java | 4 +++-
.../cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java | 4 +++-
.../binding/soap/interceptor/ReadHeadersInterceptorTest.java | 6 +++++-
.../binding/soap/interceptor/SoapActionInInterceptorTest.java | 5 ++++-
.../cxf/binding/soap/interceptor/SoapFaultSerializerTest.java | 6 +++++-
.../soap/interceptor/SoapPreProtocolOutInterceptorTest.java | 6 +++++-
.../cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java | 6 +++++-
.../java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java | 4 +++-
.../apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java | 5 ++++-
.../java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java | 4 +++-
.../java/org/apache/cxf/binding/xml/interceptor/TestBase.java | 4 +++-
.../cxf/binding/xml/interceptor/XMLFaultInterceptorsTest.java | 5 ++++-
.../binding/xml/interceptor/XMLFaultOutInterceptorTest.java | 4 +++-
.../binding/xml/interceptor/XMLMessageInInterceptorTest.java | 5 ++++-
.../binding/xml/interceptor/XMLMessageOutInterceptorTest.java | 4 +++-
.../org/apache/cxf/aegis/client/ClientServiceConfigTest.java | 4 +++-
.../java/org/apache/cxf/aegis/exception/ExceptionTest.java | 4 +++-
.../apache/cxf/aegis/inheritance/ExceptionInheritanceTest.java | 5 ++++-
.../cxf/aegis/inheritance/intf/InterfaceInheritanceTest.java | 6 +++++-
.../java/org/apache/cxf/aegis/integration/DOMMappingTest.java | 5 ++++-
.../org/apache/cxf/aegis/integration/SchemaValidationTest.java | 6 +++++-
.../java/org/apache/cxf/aegis/integration/WrappedTest.java | 4 +++-
.../org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java | 5 ++++-
.../apache/cxf/aegis/namespaces/NamespaceConfusionTest.java | 5 ++++-
.../java/org/apache/cxf/aegis/override/OverrideTypeTest.java | 6 +++++-
.../src/test/java/org/apache/cxf/aegis/proxy/ProxyTest.java | 4 +++-
.../java/org/apache/cxf/aegis/standalone/SchemaAddinsTest.java | 5 ++++-
.../java/org/apache/cxf/aegis/type/array/FlatArrayTest.java | 6 +++++-
.../test/java/org/apache/cxf/aegis/type/basic/BeanTest.java | 8 +++++++-
.../java/org/apache/cxf/aegis/type/basic/DateTimezoneTest.java | 5 ++++-
.../java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java | 8 +++++++-
.../org/apache/cxf/aegis/type/encoded/AbstractEncodedTest.java | 6 +++++-
.../org/apache/cxf/aegis/type/encoded/ArrayTypeInfoTest.java | 5 +++++
.../org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java | 4 ++++
.../java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java | 7 ++++++-
.../org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java | 7 ++++++-
.../test/java/org/apache/cxf/aegis/type/java5/ClassTest.java | 4 +++-
.../java/org/apache/cxf/aegis/type/java5/CollectionTest.java | 7 ++++++-
.../cxf/aegis/type/java5/CollectionTestsWithService.java | 6 +++++-
.../org/apache/cxf/aegis/type/java5/ConfigurationTest.java | 6 +++++-
.../org/apache/cxf/aegis/type/java5/DualOutServiceTest.java | 4 +++-
.../java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java | 6 +++++-
.../java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java | 7 ++++++-
.../src/test/java/org/apache/cxf/aegis/type/java5/MapTest.java | 6 +++++-
.../java/org/apache/cxf/aegis/type/java5/OperationNSTest.java | 4 +++-
.../java/org/apache/cxf/aegis/type/java5/XFireTypeTest.java | 5 +++++
.../org/apache/cxf/aegis/type/java5/XFireXmlParamTypeTest.java | 3 +++
.../java/org/apache/cxf/aegis/type/java5/XmlParamTypeTest.java | 5 ++++-
.../java/org/apache/cxf/aegis/type/java5/map/StudentTest.java | 5 ++++-
.../src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java | 8 +++++++-
.../cxf/aegis/type/streams/XMLStreamReaderMappingTest.java | 5 ++++-
.../test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java | 6 +++++-
.../test/java/org/apache/cxf/aegis/xmlconfig/NillableTest.java | 4 +++-
.../test/java/org/apache/cxf/doclitbare/DocLitBareTest.java | 5 ++++-
.../test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java | 5 ++++-
.../test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java | 5 ++++-
.../apache/cxf/jaxb/DataBindingMarshallerPropertiesTest.java | 4 +++-
.../java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java | 5 ++++-
.../src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java | 8 +++++++-
.../test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java | 8 +++++++-
.../jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java | 6 +++++-
.../test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java | 6 +++++-
.../jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java | 4 +++-
.../java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java | 8 +++++++-
.../java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java | 8 +++++++-
.../clustering/blueprint/ClusteringBPNamespaceHandlerTest.java | 4 +++-
.../java/org/apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java | 6 +++++-
.../java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBeanTest.java | 9 ++++++++-
.../java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java | 6 +++++-
.../cxf/jaxrs/blueprint/JAXRSBPNamespaceHandlerTest.java | 4 +++-
.../java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java | 7 ++++++-
.../src/test/java/org/apache/cxf/jaxrs/ext/form/FormTest.java | 4 +++-
.../org/apache/cxf/jaxrs/ext/multipart/AttachmentTest.java | 4 +++-
.../apache/cxf/jaxrs/ext/multipart/ContentDispositionTest.java | 4 +++-
.../org/apache/cxf/jaxrs/ext/multipart/MultipartBodyTest.java | 5 ++++-
.../test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java | 9 ++++++++-
.../java/org/apache/cxf/jaxrs/impl/AsyncResponseImplTest.java | 5 ++++-
.../apache/cxf/jaxrs/impl/CacheControlHeaderProviderTest.java | 5 ++++-
.../java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java | 7 ++++++-
.../org/apache/cxf/jaxrs/impl/CookieHeaderProviderTest.java | 5 ++++-
.../java/org/apache/cxf/jaxrs/impl/DateHeaderProviderTest.java | 4 +++-
.../org/apache/cxf/jaxrs/impl/EntityTagHeaderProviderTest.java | 5 ++++-
.../java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java | 7 ++++++-
.../java/org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java | 7 ++++++-
.../java/org/apache/cxf/jaxrs/impl/LinkHeaderProviderTest.java | 4 +++-
.../org/apache/cxf/jaxrs/impl/MediaTypeHeaderProviderTest.java | 5 ++++-
.../test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java | 8 +++++++-
.../org/apache/cxf/jaxrs/impl/NewCookieHeaderProviderTest.java | 6 +++++-
.../java/org/apache/cxf/jaxrs/impl/PathSegmentImplTest.java | 4 +++-
.../test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java | 7 ++++++-
.../org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java | 4 +++-
.../org/apache/cxf/jaxrs/impl/ResponseBuilderImplTest.java | 8 +++++++-
.../test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java | 9 ++++++++-
.../org/apache/cxf/jaxrs/impl/RuntimeDelegateImplTest.java | 4 +++-
.../org/apache/cxf/jaxrs/impl/SecurityContextImplTest.java | 4 +++-
.../java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java | 5 ++++-
.../test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java | 4 +++-
.../org/apache/cxf/jaxrs/impl/VariantListBuilderImplTest.java | 5 ++++-
.../cxf/jaxrs/lifecycle/PerRequestResourceProviderTest.java | 5 ++++-
.../java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java | 9 ++++++++-
.../org/apache/cxf/jaxrs/model/OperationResourceInfoTest.java | 4 +++-
.../test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java | 7 ++++++-
.../org/apache/cxf/jaxrs/model/doc/JavaDocProviderTest.java | 5 ++++-
.../org/apache/cxf/jaxrs/provider/BinaryDataProviderTest.java | 5 ++++-
.../org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java | 4 +++-
.../apache/cxf/jaxrs/provider/FormEncodingProviderTest.java | 6 +++++-
.../org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java | 9 ++++++++-
.../apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java | 6 +++++-
.../org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java | 10 +++++++++-
.../cxf/jaxrs/provider/RequestDispatcherProviderTest.java | 5 ++++-
.../java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java | 6 +++++-
.../java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java | 7 ++++++-
.../org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java | 5 ++++-
.../cxf/jaxrs/security/JAASAuthenticationFilterTest.java | 5 ++++-
.../apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java | 6 +++++-
.../org/apache/cxf/jaxrs/spring/SpringResourceFactoryTest.java | 6 +++++-
.../org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java | 6 +++++-
.../java/org/apache/cxf/jaxrs/utils/ExceptionUtilsTest.java | 4 +++-
.../test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java | 4 +++-
.../test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java | 6 +++++-
.../java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java | 7 ++++++-
.../test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 10 +++++++++-
.../java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java | 7 ++++++-
.../test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java | 6 +++++-
.../test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java | 10 +++++++++-
.../java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java | 4 +++-
.../cxf/jaxws/blueprint/JAXWSBPNamespaceHandlerTest.java | 4 +++-
.../apache/cxf/jaxws/context/WebServiceContextImplTest.java | 6 +++++-
.../org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java | 6 +++++-
.../apache/cxf/jaxws/context/WrappedMessageContextTest.java | 7 ++++++-
.../jaxws/handler/AbstractProtocolHandlerInterceptorTest.java | 3 ++-
.../cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java | 5 ++++-
.../org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java | 9 ++++++++-
.../org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java | 8 +++++++-
.../cxf/jaxws/handler/InitParamResourceResolverTest.java | 4 +++-
.../cxf/jaxws/handler/LogicalHandlerInterceptorTest.java | 3 ++-
.../org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java | 5 ++++-
.../cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java | 5 ++++-
.../test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java | 10 +++++++++-
.../apache/cxf/jaxws/support/ContextPropertiesMappingTest.java | 7 ++++++-
.../org/apache/cxf/jaxws/support/JaxWsImplementorInfoTest.java | 6 +++++-
.../cxf/jaxws/support/JaxWsServiceConfigurationTest.java | 7 ++++++-
.../apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java | 3 ++-
.../java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java | 6 +++++-
.../transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java | 5 ++++-
.../http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java | 5 ++++-
.../java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java | 5 ++++-
.../test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java | 6 +++++-
.../src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java | 7 ++++++-
.../cxf/frontend/blueprint/SimpleBPNamespaceHandlerTest.java | 4 +++-
.../org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java | 6 +++++-
.../java/org/apache/cxf/frontend/spring/ClientServerTest.java | 6 +++++-
.../java/org/apache/cxf/frontend/spring/SpringBeansTest.java | 7 ++++++-
.../org/apache/cxf/service/factory/ClientFactoryBeanTest.java | 6 +++++-
.../cxf/service/factory/ReflectionServiceFactoryTest.java | 7 ++++++-
.../test/java/org/apache/cxf/service/factory/RountripTest.java | 4 +++-
.../java/org/apache/cxf/service/factory/ServerFactoryTest.java | 5 ++++-
.../src/test/java/org/apache/cxf/javascript/AegisTest.java | 7 ++++++-
.../src/test/java/org/apache/cxf/javascript/AnyTest.java | 7 ++++++-
.../java/org/apache/cxf/javascript/BasicNameManagerTest.java | 4 +++-
.../java/org/apache/cxf/javascript/DocLitBareClientTest.java | 6 +++++-
.../org/apache/cxf/javascript/DocLitWrappedClientTest.java | 8 +++++++-
.../test/java/org/apache/cxf/javascript/GreeterClientTest.java | 6 +++++-
.../java/org/apache/cxf/javascript/JavascriptRhinoTest.java | 4 +++-
.../test/java/org/apache/cxf/javascript/JsHttpRequestTest.java | 6 +++++-
.../src/test/java/org/apache/cxf/javascript/MtoMTest.java | 7 ++++++-
.../test/java/org/apache/cxf/javascript/QueryHandlerTest.java | 6 +++++-
.../src/test/java/org/apache/cxf/javascript/RPCClientTest.java | 6 +++++-
.../java/org/apache/cxf/javascript/types/AttributeTest.java | 5 ++++-
.../org/apache/cxf/javascript/types/SerializationTest.java | 7 ++++++-
.../org/apache/cxf/management/InstrumentationManagerTest.java | 8 +++++++-
.../apache/cxf/management/counters/CounterRepositoryTest.java | 5 ++++-
.../interceptor/ResponseTimeMessageInInterceptorTest.java | 4 +++-
.../org/apache/cxf/management/jmx/BusRegistrationTest.java | 6 +++++-
.../cxf/management/jmx/JMXManagedComponentManagerTest.java | 5 ++++-
.../org/apache/cxf/management/jmx/MBServerConnectorTest.java | 4 +++-
.../cxf/management/jmx/export/ModelMBeanAssemblerTest.java | 5 ++++-
.../org/apache/cxf/management/utils/ManagementConsoleTest.java | 5 ++++-
.../apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java | 5 +++++
.../test/java/org/apache/cxf/jaxrs/client/WebClientTest.java | 7 ++++++-
.../jaxrs/client/blueprint/JAXRSBPNamespaceHandlerTest.java | 4 +++-
.../org/apache/cxf/jaxrs/client/cache/ClientCacheTest.java | 5 ++++-
.../java/org/apache/cxf/jaxrs/client/cache/ClientTest.java | 5 ++++-
.../java/org/apache/cxf/jaxrs/client/spec/ClientImplTest.java | 6 +++++-
.../apache/cxf/jaxrs/client/spec/ClientRequestFilterTest.java | 4 +++-
.../cxf/jaxrs/client/spec/InvocationBuilderImplTest.java | 6 +++++-
.../cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java | 5 ++++-
.../java/org/apache/cxf/jaxrs/swagger/Swagger2FeatureTest.java | 5 ++++-
.../swagger/openapi/SwaggerToOpenApiConversionUtilsTest.java | 8 +++++++-
.../apache/cxf/jaxrs/swagger/parse/SwaggerParseUtilsTest.java | 6 +++++-
.../apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java | 6 +++++-
.../org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java | 5 ++++-
.../org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java | 8 +++++++-
.../cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java | 5 ++++-
.../org/apache/cxf/jaxrs/provider/ProviderFactoryAllTest.java | 5 ++++-
.../cxf/jaxrs/provider/aegis/AegisElementProviderTest.java | 5 ++++-
.../apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java | 6 +++++-
.../apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java | 6 +++++-
.../apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java | 7 ++++++-
.../org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java | 6 +++++-
.../org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java | 8 +++++++-
.../apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java | 4 +++-
.../java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java | 5 ++++-
.../jaxrs/ext/search/SearchContextImplCustomParserTest.java | 5 ++++-
.../org/apache/cxf/jaxrs/ext/search/SearchContextImplTest.java | 8 +++++++-
.../java/org/apache/cxf/jaxrs/ext/search/SearchUtilsTest.java | 4 +++-
.../ext/search/client/FiqlSearchConditionBuilderTest.java | 4 +++-
.../apache/cxf/jaxrs/ext/search/fiql/FiqlCollectionsTest.java | 4 +++-
.../org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java | 6 +++++-
.../apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java | 4 +++-
.../jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java | 5 ++++-
.../cxf/jaxrs/ext/search/jpa/JPALanguageVisitorTest.java | 4 +++-
.../cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorFiqlTest.java | 5 ++++-
.../jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java | 5 ++++-
.../apache/cxf/jaxrs/ext/search/ldap/LdapQueryVisitorTest.java | 4 +++-
.../org/apache/cxf/jaxrs/ext/search/odata/ODataParserTest.java | 5 ++++-
.../cxf/jaxrs/ext/search/sql/SQLHierarchicalQueryTest.java | 4 +++-
.../apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java | 4 +++-
.../cxf/jaxrs/ext/search/tika/TikaContentExtractorTest.java | 7 ++++++-
.../jaxrs/ext/search/tika/TikaLuceneContentExtractorTest.java | 5 ++++-
.../cxf/microprofile/client/CxfTypeSafeClientBuilderTest.java | 6 +++++-
.../java/org/apache/cxf/microprofile/client/ValidatorTest.java | 6 +++++-
.../apache/cxf/microprofile/client/cdi/RestClientCdiTest.java | 5 ++++-
.../cxf/rs/security/jose/cookbook/JwkJoseCookBookTest.java | 2 ++
.../cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java | 4 +++-
.../apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java | 4 +++-
.../apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java | 3 ++-
.../apache/cxf/rs/security/jose/jwe/JwePbeHmacAesWrapTest.java | 3 ++-
.../org/apache/cxf/rs/security/jose/jwk/JsonWebKeyTest.java | 5 ++++-
.../java/org/apache/cxf/rs/security/jose/jwk/JwkUtilsTest.java | 7 ++++++-
.../apache/cxf/rs/security/jose/jws/JwsCompactHeaderTest.java | 4 +++-
.../cxf/rs/security/jose/jws/JwsCompactReaderWriterTest.java | 5 ++++-
.../apache/cxf/rs/security/jose/jws/JwsJsonConsumerTest.java | 6 +++++-
.../apache/cxf/rs/security/jose/jws/JwsJsonProducerTest.java | 4 +++-
.../java/org/apache/cxf/rs/security/jose/jws/JwsUtilsTest.java | 9 ++++++++-
.../java/org/apache/cxf/rs/security/jose/jwt/JwtUtilsTest.java | 3 ++-
.../org/apache/cxf/rs/security/oauth/utils/OAuthUtilsTest.java | 5 ++++-
.../apache/cxf/rs/security/oauth2/common/UserSubjectTest.java | 3 +++
.../cxf/rs/security/oauth2/grants/TokenGrantHandlerTest.java | 6 +++++-
.../oauth2/grants/code/JCacheCodeDataProviderTest.java | 5 ++++-
.../oauth2/grants/code/JPACMTOAuthDataProviderTest.java | 4 +++-
.../security/oauth2/grants/code/JPACodeDataProviderTest.java | 6 +++++-
.../cxf/rs/security/oauth2/grants/jwt/JwtUserSubjectTest.java | 4 +++-
.../oauth2/provider/AbstractOAuthDataProviderTest.java | 8 +++++++-
.../rs/security/oauth2/provider/JPAOAuthDataProviderTest.java | 4 +++-
.../cxf/rs/security/oauth2/provider/OAuthJSONProviderTest.java | 6 +++++-
.../oauth2/tokens/hawk/HawkAccessTokenValidatorTest.java | 4 +++-
.../rs/security/oauth2/tokens/hawk/NonceVerifierImplTest.java | 3 +++
.../cxf/rs/security/oauth2/utils/AuthorizationUtilsTest.java | 7 ++++++-
.../apache/cxf/rs/security/oauth2/utils/OAuthUtilsTest.java | 5 ++++-
.../cxf/rs/security/oauth2/utils/crypto/CryptoUtilsTest.java | 6 +++++-
.../cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java | 5 ++++-
.../org/apache/cxf/rs/security/oidc/utils/OidcUtilsTest.java | 5 ++++-
.../org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java | 5 ++++-
.../apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java | 5 ++++-
.../org/apache/cxf/rt/security/saml/claims/SAMLClaimsTest.java | 5 ++++-
.../rt/security/saml/xacml2/RequestComponentBuilderTest.java | 4 +++-
.../security/saml/xacml2/SamlRequestComponentBuilderTest.java | 4 +++-
.../security/saml/xacml2/XACMLAuthorizingInterceptorTest.java | 4 +++-
.../cxf/rt/security/saml/xacml2/XACMLRequestBuilderTest.java | 7 ++++++-
.../test/java/org/apache/cxf/rt/security/claims/ClaimTest.java | 6 +++++-
.../claims/interceptor/ClaimsAuthorizingInterceptorTest.java | 4 +++-
.../cxf/transport/http_jetty/JettyHTTPDestinationTest.java | 10 +++++++++-
.../transport/http_jetty/JettyHTTPServerEngineFactoryTest.java | 7 ++++++-
.../cxf/transport/http_jetty/JettyHTTPServerEngineTest.java | 7 ++++++-
.../blueprint/HTTPJettyTransportNamespaceHandlerTest.java | 4 +++-
.../transport/http_jetty/spring/ApplicationContextTest.java | 8 +++++++-
.../http/netty/client/NettyHttpConduitFactoryTest.java | 5 ++++-
.../transport/http/netty/server/NettyHttpDestinationTest.java | 10 +++++++++-
.../http/netty/server/NettyHttpServerEngineFactoryTest.java | 5 ++++-
.../transport/http/netty/server/NettyHttpServerEngineTest.java | 6 +++++-
.../http/netty/server/spring/ApplicationContextTest.java | 7 ++++++-
.../transport/http_undertow/UndertowHTTPDestinationTest.java | 10 +++++++++-
.../http_undertow/UndertowHTTPServerEngineFactoryTest.java | 7 ++++++-
.../transport/http_undertow/UndertowHTTPServerEngineTest.java | 6 +++++-
.../blueprint/HTTPUndertowTransportNamespaceHandlerTest.java | 4 +++-
.../transport/http_undertow/spring/ApplicationContextTest.java | 7 ++++++-
.../apache/cxf/transport/http/DestinationRegistryImplTest.java | 7 ++++++-
.../java/org/apache/cxf/transport/http/HTTPConduitTest.java | 7 ++++++-
.../cxf/transport/http/HTTPConduitURLConnectionTest.java | 6 +++++-
.../apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java | 8 +++++++-
.../apache/cxf/transport/http/HTTPTransportFactoryTest.java | 5 ++++-
.../test/java/org/apache/cxf/transport/http/HeadersTest.java | 7 ++++++-
.../java/org/apache/cxf/transport/http/PatternBuilderTest.java | 5 ++++-
.../apache/cxf/transport/http/blueprint/HttpBPHandlerTest.java | 4 +++-
.../cxf/transport/http/policy/ClientPolicyCalculatorTest.java | 5 ++++-
.../transport/http/policy/HTTPClientAssertionBuilderTest.java | 5 ++++-
.../transport/http/policy/HTTPServerAssertionBuilderTest.java | 5 ++++-
.../org/apache/cxf/transport/http/policy/PolicyUtilsTest.java | 4 +++-
.../cxf/transport/http/policy/ServerPolicyCalculatorTest.java | 5 ++++-
.../transport/http/spring/HttpConduitConfigurationTest.java | 6 +++++-
.../apache/cxf/transport/servlet/ServletControllerTest.java | 5 ++++-
.../java/org/apache/cxf/transport/jms/AbstractJMSTester.java | 6 +++++-
.../test/java/org/apache/cxf/transport/jms/JMSConduitTest.java | 6 +++++-
.../java/org/apache/cxf/transport/jms/JMSDestinationTest.java | 8 +++++++-
.../java/org/apache/cxf/transport/jms/JMSMessageUtilTest.java | 5 ++++-
.../java/org/apache/cxf/transport/jms/RequestResponseTest.java | 4 +++-
.../jms/continuations/JMSContinuationProviderTest.java | 6 +++++-
.../cxf/transport/jms/continuations/JMSContinuationTest.java | 7 ++++++-
.../java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java | 8 +++++++-
.../java/org/apache/cxf/transport/jms/util/JMSUtilTest.java | 5 ++++-
.../org/apache/cxf/transport/local/LocalDestinationTest.java | 6 +++++-
.../apache/cxf/transport/local/LocalTransportFactoryTest.java | 6 +++++-
.../cxf/transport/websocket/WebSocketTransportFactoryTest.java | 4 +++-
.../org/apache/cxf/transport/websocket/WebSocketUtilsTest.java | 5 ++++-
.../cxf/transport/websocket/ahc/AhcWebSocketConduitTest.java | 6 +++++-
.../atmosphere/AtmosphereWebSocketJettyDestinationTest.java | 4 +++-
.../atmosphere/AtmosphereWebSocketServletDestinationTest.java | 6 +++++-
.../websocket/atmosphere/DefaultProtocolInterceptorTest.java | 4 +++-
.../websocket/jetty/JettyWebSocketDestinationTest.java | 5 ++++-
.../apache/cxf/ws/addressing/AddressingConstantsImplTest.java | 4 +++-
.../apache/cxf/ws/addressing/blueprint/WsBPHandlerTest.java | 4 +++-
.../org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java | 6 +++++-
.../org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java | 5 ++++-
.../cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java | 8 +++++++-
.../java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java | 8 +++++++-
rt/ws/mex/src/test/java/org/apache/cxf/ws/mex/MEXTest.java | 4 +++-
.../apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java | 6 +++++-
.../java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java | 7 ++++++-
.../java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java | 7 ++++++-
.../java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java | 8 +++++++-
.../cxf/ws/policy/IgnorablePolicyInterceptorProviderTest.java | 7 ++++++-
.../src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java | 5 ++++-
.../test/java/org/apache/cxf/ws/policy/PolicyBuilderTest.java | 6 +++++-
.../org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java | 4 +++-
.../test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java | 8 +++++++-
.../java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java | 8 +++++++-
.../ws/policy/PolicyInterceptorProviderRegistryImplTest.java | 6 +++++-
.../java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java | 4 +++-
.../java/org/apache/cxf/ws/policy/PolicyRegistryImplTest.java | 5 ++++-
.../external/DomainExpressionBuilderRegistryTest.java | 6 +++++-
.../external/EndpointReferenceDomainExpressionTest.java | 6 +++++-
.../attachment/external/ExternalAttachmentProviderTest.java | 8 +++++++-
.../ws/policy/attachment/external/PolicyAttachmentTest.java | 6 +++++-
.../ws/policy/attachment/reference/ReferenceResolverTest.java | 5 ++++-
.../attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java | 8 +++++++-
.../apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java | 4 +++-
.../cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java | 7 ++++++-
.../apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java | 7 ++++++-
.../cxf/ws/policy/selector/FirstAlternativeSelectorTest.java | 5 ++++-
.../policy/selector/MinimalMaximalAlternativeSelectorTest.java | 5 ++++-
.../java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java | 5 ++++-
.../test/java/org/apache/cxf/ws/rm/AbstractEndpointTest.java | 2 ++
.../java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java | 8 +++++++-
.../test/java/org/apache/cxf/ws/rm/AbstractSequenceTest.java | 4 +++-
.../java/org/apache/cxf/ws/rm/DestinationSequenceTest.java | 8 ++++++++
.../rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java | 5 +++++
.../test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java | 9 ++++++++-
.../test/java/org/apache/cxf/ws/rm/ProtocolVariationTest.java | 5 ++++-
rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java | 7 ++++++-
.../src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java | 6 +++++-
.../rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java | 6 ++++++
.../test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java | 5 +++++
.../java/org/apache/cxf/ws/rm/RMManagerConfigurationTest.java | 7 ++++++-
rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java | 10 +++++++++-
.../test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java | 5 ++++-
rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java | 4 +++-
rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java | 7 ++++++-
.../src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java | 8 +++++++-
.../java/org/apache/cxf/ws/rm/blueprint/RMBPHandlerTest.java | 4 +++-
.../org/apache/cxf/ws/rm/persistence/PersistenceUtilsTest.java | 6 +++++-
.../java/org/apache/cxf/ws/rm/persistence/RMMessageTest.java | 5 ++++-
.../cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java | 8 +++++++-
.../org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTest.java | 3 +++
.../apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java | 7 +++++++
.../cxf/ws/rm/persistence/jdbc/RMTxStoreTwoSchemasTest.java | 3 +++
.../cxf/ws/rm/persistence/jdbc/RMTxStoreUpgradeTest.java | 4 +++-
.../test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java | 8 +++++++-
.../org/apache/cxf/ws/rm/soap/RMSoapInInterceptorTest.java | 7 ++++++-
.../org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java | 4 +++-
.../org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java | 9 ++++++++-
.../java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java | 4 ++++
.../org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java | 5 ++++-
.../java/org/apache/cxf/ws/security/sts/STSClientTest.java | 6 +++++-
.../ws/security/trust/AuthPolicyValidatingInterceptorTest.java | 6 +++++-
.../test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java | 6 +++++-
.../cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java | 4 +++-
.../wsdl/service/factory/ReflectionServiceFactorBeanTest.java | 4 +++-
rt/wsdl/src/test/java/org/apache/cxf/wsdl11/NSManagerTest.java | 2 ++
.../java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java | 7 ++++++-
.../test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java | 6 +++++-
.../java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java | 9 ++++++++-
.../java/org/apache/cxf/systest/grizzly/EndpointAPITest.java | 6 +++++-
.../org/apache/cxf/systest/handlers/SoapFaultHandlerTest.java | 4 +++-
.../handlers/SpringConfiguredAutoRewriteSoapAddressTest.java | 4 +++-
.../cxf/systest/handlers/SpringConfiguredHandlerTest.java | 4 +++-
.../handlers/SpringConfiguredNoAutoRewriteSoapAddressTest.java | 4 +++-
.../org/apache/cxf/systest/jaxws/JaxWsClientThreadTest.java | 4 +++-
.../java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java | 7 ++++++-
.../systest/jaxws/beanpostprocessor/BeanPostProcessorTest.java | 4 +++-
.../beanpostprocessor/CustomizedfBeanPostProcessorTest.java | 4 +++-
.../jaxws/schemavalidation/JavaFirstSchemaValidationTest.java | 5 ++++-
.../cxf/systest/microprofile/rest/client/AsyncMethodTest.java | 3 ++-
.../org/apache/cxf/systest/http/PublishedEndpointUrlTest.java | 5 ++++-
.../org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java | 7 ++++++-
.../org/apache/cxf/systest/servlet/AbstractServletTest.java | 6 +++++-
.../java/org/apache/cxf/systest/servlet/CXFFilterTest.java | 5 ++++-
.../java/org/apache/cxf/systest/servlet/CXFServletTest.java | 7 ++++++-
.../org/apache/cxf/systest/servlet/ErrorContextSerletTest.java | 5 ++++-
.../cxf/systest/servlet/ExternalServicesServletTest.java | 6 +++++-
.../java/org/apache/cxf/systest/servlet/JaxRsServletTest.java | 4 +++-
.../org/apache/cxf/systest/servlet/JsFrontEndServletTest.java | 5 ++++-
.../cxf/systest/servlet/SpringAutoPublishServletTest.java | 6 +++++-
.../java/org/apache/cxf/systest/servlet/SpringServletTest.java | 7 ++++++-
.../org/apache/cxf/cxf1226/MissingQualification1226Test.java | 4 +++-
.../src/test/java/org/apache/cxf/cxf1332/Cxf1332Test.java | 4 +++-
.../org/apache/cxf/systest/bus/BusExtensionLoadingTest.java | 4 +++-
.../test/java/org/apache/cxf/systest/bus/BusShutdownTest.java | 4 +++-
.../java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java | 4 +++-
.../java/org/apache/cxf/systest/coloc/AbstractColocTest.java | 4 +++-
.../cxf/systest/coloc/AbstractHeaderServiceDocLitTest.java | 5 ++++-
.../cxf/systest/coloc/AbstractHeaderServiceRpcLitTest.java | 8 +++++++-
.../apache/cxf/systest/coloc/AbstractWrappedDocLitTest.java | 6 +++++-
.../java/org/apache/cxf/systest/corba/BaseGreeterImpl.java | 4 +++-
.../java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java | 8 +++++++-
.../java/org/apache/cxf/systest/management/ManagedBusTest.java | 7 ++++++-
.../java/org/apache/cxf/systest/simple/SimpleFrontendTest.java | 4 +++-
.../test/java/org/apache/cxf/systest/soap/SoapActionTest.java | 5 ++++-
.../apache/cxf/systest/type_test/AbstractTypeTestClient2.java | 3 ++-
.../apache/cxf/systest/type_test/AbstractTypeTestClient3.java | 3 ++-
.../apache/cxf/systest/type_test/AbstractTypeTestClient4.java | 3 ++-
.../apache/cxf/systest/type_test/AbstractTypeTestClient5.java | 3 ++-
.../org/apache/cxf/systest/ws/rm/WSRMPolicyResolveTest.java | 2 ++
.../test/java/org/apache/cxf/systest/ws/util/MessageFlow.java | 9 ++++++++-
.../cxf/systest/ws/addressing/spring/WSAFeatureTest.java | 4 +++-
.../cxf/systest/ws/addressing/spring/WSAFeatureXmlTest.java | 5 ++++-
.../test/java/org/apache/cxf/systest/ws/util/MessageFlow.java | 9 ++++++++-
.../org/apache/cxf/tools/common/ProcessorEnvironmentTest.java | 7 ++++++-
.../test/java/org/apache/cxf/tools/common/ToolContextTest.java | 5 ++++-
.../test/java/org/apache/cxf/tools/common/WSDLVersionTest.java | 4 +++-
.../cxf/tools/common/dom/ExtendedDocumentBuilderTest.java | 5 ++++-
.../org/apache/cxf/tools/common/model/JAnnotationTest.java | 5 ++++-
.../java/org/apache/cxf/tools/common/model/JavaClassTest.java | 4 +++-
.../org/apache/cxf/tools/common/model/JavaInterfaceTest.java | 4 +++-
.../org/apache/cxf/tools/common/model/JavaParameterTest.java | 4 +++-
.../java/org/apache/cxf/tools/common/model/JavaTypeTest.java | 4 +++-
.../cxf/tools/common/toolspec/AbstractToolContainerTest.java | 6 +++++-
.../apache/cxf/tools/common/toolspec/ToolExceptionTest.java | 6 +++++-
.../org/apache/cxf/tools/common/toolspec/ToolSpecTest.java | 7 ++++++-
.../tools/common/toolspec/parser/CommandLineParserTest.java | 7 ++++++-
.../apache/cxf/tools/util/BuiltInTypesJavaMappingUtilTest.java | 4 +++-
.../java/org/apache/cxf/tools/util/FileWriterUtilTest.java | 4 +++-
.../src/test/java/org/apache/cxf/tools/util/NameUtilTest.java | 5 ++++-
.../src/test/java/org/apache/cxf/tools/util/StAXUtilTest.java | 4 +++-
.../test/java/org/apache/cxf/tools/util/URIParserUtilTest.java | 6 +++++-
.../test/java/org/apache/cxf/tools/corba/IDLToWSDLTest.java | 7 ++++++-
.../test/java/org/apache/cxf/tools/corba/WSDLToIDLTest.java | 8 +++++++-
.../tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java | 6 +++++-
.../cxf/tools/corba/processors/IDLToWSDLGenerationTest.java | 4 +++-
.../cxf/tools/corba/processors/WSDLToCorbaBindingTest.java | 9 ++++++++-
.../cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java | 6 +++++-
.../cxf/tools/corba/processors/WSDLToIDLGenerationTest.java | 4 +++-
.../cxf/tools/java2js/processor/JavaToJSProcessorTest.java | 4 +++-
.../src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java | 6 +++++-
.../test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java | 7 ++++++-
.../java/org/apache/cxf/tools/java2wsdl/JavaToWSFlagTest.java | 5 ++++-
.../tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java | 5 ++++-
.../generator/wsdl11/DateTypeCustomGeneratorTest.java | 4 ++++
.../java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java | 5 ++++-
.../java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java | 5 ++++-
.../generator/wsdl11/annotator/WrapperBeanAnnotatorTest.java | 4 +++-
.../wsdl11/annotator/WrapperBeanFieldAnnotatorTest.java | 4 +++-
.../cxf/tools/java2wsdl/processor/FrontendFactoryTest.java | 4 +++-
.../cxf/tools/java2wsdl/processor/JavaToProcessorTest.java | 9 ++++++++-
.../processor/internal/ServiceBuilderFactoryTest.java | 5 ++++-
.../java2wsdl/processor/internal/jaxws/FaultBeanTest.java | 5 ++++-
.../internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java | 4 +++-
.../processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java | 5 ++++-
.../processor/internal/jaxws/JaxwsServiceBuilderTest.java | 6 +++++-
.../java2wsdl/processor/internal/jaxws/RequestWrapperTest.java | 7 ++++++-
.../processor/internal/jaxws/ResponseWrapperTest.java | 5 ++++-
.../tools/java2wsdl/processor/internal/jaxws/WrapperTest.java | 8 +++++++-
.../java2wsdl/processor/internal/jaxws/WrapperUtilTest.java | 6 +++++-
.../org/apache/cxf/tools/validator/WSDLValidationTest.java | 4 +++-
.../org/apache/cxf/tools/validator/internal/Stax2DOMTest.java | 4 +++-
.../cxf/tools/validator/internal/WSDL11ValidatorTest.java | 5 ++++-
.../cxf/tools/validator/internal/WSDLRefValidatorTest.java | 7 ++++++-
.../apache/cxf/tools/validator/internal/model/XNodeTest.java | 4 +++-
.../org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java | 8 +++++++-
.../org/apache/cxf/tools/wadlto/jaxrs/ValidateWadlTest.java | 5 ++++-
.../java/org/apache/cxf/tools/wadlto/jaxrs/WADLToJavaTest.java | 6 +++++-
.../org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java | 6 +++++-
.../apache/cxf/tools/wsdlto/core/AbstractGeneratorTest.java | 4 +++-
.../cxf/tools/wsdlto/core/WSDLDefinitionBuilderTest.java | 5 ++++-
.../cxf/tools/wsdlto/javascript/WSDLToJavaScriptTest.java | 5 ++++-
.../apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java | 4 ++++
.../cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java | 6 +++++-
.../frontend/jaxws/customization/CustomizationParserTest.java | 5 +++++
.../jaxws/processor/internal/ParameterProcessorTest.java | 4 +++-
.../frontend/jaxws/processor/internal/ProcessorUtilTest.java | 4 +++-
.../processor/internal/annotator/WebMethodAnnotatorTest.java | 5 ++++-
.../processor/internal/annotator/WebParamAnnotatorTest.java | 4 +++-
.../processor/internal/annotator/XmlSeeAlsoAnnotatorTest.java | 5 ++++-
.../jaxws/processor/internal/mapper/InterfaceMapperTest.java | 5 ++++-
.../jaxws/processor/internal/mapper/MethodMapperTest.java | 7 ++++++-
.../frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java | 5 ++++-
.../cxf/tools/misc/processor/WSDLToServiceProcessorTest.java | 7 ++++++-
.../cxf/tools/misc/processor/WSDLToSoapProcessorTest.java | 7 ++++++-
.../cxf/tools/misc/processor/WSDLToXMLProcessorTest.java | 5 ++++-
.../cxf/tools/misc/processor/XSDToWSDLProcessorTest.java | 4 +++-
.../test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaTest.java | 7 ++++++-
.../org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java | 5 ++++-
.../apache/cxf/tools/wsdlto/jaxb/JAXBCodeGenOptionTest.java | 5 ++++-
.../java/org/apache/cxf/tools/wsdlto/jaxws/CatalogTest.java | 2 ++
.../java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java | 9 ++++++++-
.../org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java | 8 +++++++-
.../java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java | 8 +++++++-
.../org/apache/cxf/tools/wsdlto/jaxws/JAXWSBindingTest.java | 3 +++
.../org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java | 6 +++++-
.../tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java | 6 +++++-
.../org/apache/cxf/tools/wsdlto/validator/ValidatorTest.java | 5 ++++-
653 files changed, 2973 insertions(+), 626 deletions(-)
diff --git a/core/src/test/java/org/apache/cxf/BusFactoryTest.java b/core/src/test/java/org/apache/cxf/BusFactoryTest.java
index 53ad06d..f4da912 100644
--- a/core/src/test/java/org/apache/cxf/BusFactoryTest.java
+++ b/core/src/test/java/org/apache/cxf/BusFactoryTest.java
@@ -23,6 +23,8 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
public class BusFactoryTest extends Assert {
@@ -46,4 +48,4 @@ public class BusFactoryTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java b/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
index 83e997a..a350fd0 100644
--- a/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
+++ b/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
@@ -50,6 +50,11 @@ import org.junit.Assert;
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.assertTrue;
+
public class AttachmentDeserializerTest extends Assert {
private MessageImpl msg;
@@ -677,4 +682,3 @@ public class AttachmentDeserializerTest extends Assert {
ins.close();
}
}
-
diff --git a/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java b/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
index 66a2ec0..83b2152 100644
--- a/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
+++ b/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
@@ -42,6 +42,9 @@ import org.apache.cxf.message.MessageImpl;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class AttachmentSerializerTest extends Assert {
@Test
@@ -240,4 +243,4 @@ public class AttachmentSerializerTest extends Assert {
private static String escapeQuotes(String s) {
return s.indexOf('"') != 0 ? s.replace("\"", "\\\"") : s;
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/attachment/AttachmentUtilTest.java b/core/src/test/java/org/apache/cxf/attachment/AttachmentUtilTest.java
index d0601ff..b2b1b80 100644
--- a/core/src/test/java/org/apache/cxf/attachment/AttachmentUtilTest.java
+++ b/core/src/test/java/org/apache/cxf/attachment/AttachmentUtilTest.java
@@ -21,6 +21,8 @@ package org.apache.cxf.attachment;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class AttachmentUtilTest extends Assert {
@Test
@@ -114,4 +116,4 @@ public class AttachmentUtilTest extends Assert {
assertEquals("a=b.txt",
AttachmentUtil.getContentDispositionFileName("filename=\"a=b.txt\""));
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java b/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
index 63892a1..31ce70a 100644
--- a/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
@@ -39,6 +39,10 @@ import org.easymock.IMocksControl;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+
public class CXFBusImplTest extends Assert {
@Test
@@ -124,4 +128,4 @@ public class CXFBusImplTest extends Assert {
bus.shutdown(true);
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java
index bf9660f..82b475d 100644
--- a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java
@@ -31,6 +31,10 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+
public class ExtensionManagerTest extends Assert {
private static final String EXTENSIONMANAGER_TEST_RESOURECE_NAME = "extensionManagerTest";
@@ -77,4 +81,4 @@ public class ExtensionManagerTest extends Assert {
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java
index 6d0d5c9..4a1540d 100644
--- a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java
@@ -22,6 +22,12 @@ package org.apache.cxf.bus.extension;
import org.junit.Assert;
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;
+import static org.junit.Assert.fail;
+
public class ExtensionTest extends Assert {
@Test
@@ -102,4 +108,4 @@ public class ExtensionTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/bus/extension/TextExtensionFragmentParserTest.java b/core/src/test/java/org/apache/cxf/bus/extension/TextExtensionFragmentParserTest.java
index 86371df..e05e972 100644
--- a/core/src/test/java/org/apache/cxf/bus/extension/TextExtensionFragmentParserTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/extension/TextExtensionFragmentParserTest.java
@@ -26,6 +26,10 @@ import java.util.List;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
public class TextExtensionFragmentParserTest extends Assert {
@Test
@@ -46,4 +50,4 @@ public class TextExtensionFragmentParserTest extends Assert {
assertNull("Interface should be null", e.getInterfaceName());
assertEquals("Unexpected number of namespace elements.", 0, e.getNamespaces().size());
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java b/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java
index 4e2525e..b03a92b 100644
--- a/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java
@@ -31,6 +31,12 @@ import org.junit.Assert;
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.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
public class EndpointResolverRegistryImplTest extends Assert {
private EndpointResolverRegistryImpl registry;
@@ -258,4 +264,4 @@ public class EndpointResolverRegistryImplTest extends Assert {
control.verify();
assertNull("unexpected minted EPR", minted);
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java b/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java
index ab85e24..7cd0ee4 100644
--- a/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java
@@ -25,6 +25,8 @@ import org.apache.cxf.endpoint.Server;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class ServerRegistryImpTest extends Assert {
@Test
@@ -41,4 +43,4 @@ public class ServerRegistryImpTest extends Assert {
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java b/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java
index 8ba8325..c1c9337 100644
--- a/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java
@@ -33,6 +33,13 @@ import org.junit.Assert;
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.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
public class ServiceContractResolverRegistryImplTest extends Assert {
private ServiceContractResolverRegistryImpl registry;
private ServiceContractResolver resolver1;
@@ -143,4 +150,4 @@ public class ServiceContractResolverRegistryImplTest extends Assert {
assertNull("unexpected physical EPR", resolved);
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java b/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java
index 71c520a..bf9b415 100644
--- a/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java
@@ -40,6 +40,8 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
/**
@@ -211,4 +213,4 @@ public class OSGiBusListenerTest extends Assert {
}
return c;
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java b/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java
index c8bfd91..a237217 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java
@@ -23,6 +23,9 @@ import org.springframework.beans.BeansException;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
public class BusApplicationContextTest extends Assert {
@@ -45,4 +48,4 @@ public class BusApplicationContextTest extends Assert {
assertEquals("Unexpected number of resources", 2, ctx.getConfigResources().length);
ctx.close();
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java b/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
index 102dbfd..2012f7b 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
@@ -37,6 +37,9 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public class BusDefinitionParserTest extends Assert {
@@ -165,4 +168,4 @@ public class BusDefinitionParserTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java b/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
index e32b6fa..3898e57 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
@@ -54,6 +54,12 @@ import org.junit.After;
import org.junit.Assert;
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.assertSame;
+import static org.junit.Assert.assertTrue;
+
public class SpringBusFactoryTest extends Assert {
@After
@@ -277,4 +283,4 @@ public class SpringBusFactoryTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java b/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
index 926dd01..e22edf7 100644
--- a/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
+++ b/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
@@ -37,6 +37,8 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.fail;
+
public class AnnotationProcessorTest extends Assert {
@@ -145,4 +147,3 @@ public class AnnotationProcessorTest extends Assert {
EasyMock.verify(v);
}
}
-
diff --git a/core/src/test/java/org/apache/cxf/common/classloader/ClassLoaderUtilsTest.java b/core/src/test/java/org/apache/cxf/common/classloader/ClassLoaderUtilsTest.java
index 8e1fa18..d3da661 100644
--- a/core/src/test/java/org/apache/cxf/common/classloader/ClassLoaderUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/classloader/ClassLoaderUtilsTest.java
@@ -26,6 +26,8 @@ import java.net.URLClassLoader;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class ClassLoaderUtilsTest extends Assert {
private static void setTCCL(ClassLoader loader) {
@@ -76,4 +78,4 @@ public class ClassLoaderUtilsTest extends Assert {
setTCCL(previousTCCL);
}
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/common/i18n/BundleUtilsTest.java b/core/src/test/java/org/apache/cxf/common/i18n/BundleUtilsTest.java
index 1c4019f..28e5633 100644
--- a/core/src/test/java/org/apache/cxf/common/i18n/BundleUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/i18n/BundleUtilsTest.java
@@ -24,6 +24,9 @@ import java.util.ResourceBundle;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
public class BundleUtilsTest extends Assert {
@Test
@@ -49,4 +52,4 @@ public class BundleUtilsTest extends Assert {
"localized message",
nonDefaultBundle.getString("I18N_MSG"));
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java b/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java
index 4dd0127..a4ac2cbb 100644
--- a/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java
+++ b/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java
@@ -31,6 +31,10 @@ import org.apache.cxf.common.logging.LogUtils;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
public class MessageTest extends Assert {
private static final Logger LOG = LogUtils.getL7dLogger(MessageTest.class);
@@ -74,4 +78,4 @@ public class MessageTest extends Assert {
assertEquals("subbed in 4 & 3", ex2.getMessage());
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java b/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
index e16e622..d107043 100644
--- a/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
+++ b/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
@@ -42,6 +42,10 @@ import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public class ResourceInjectorTest extends Assert {
private static final String RESOURCE_ONE = "resource one";
private static final String RESOURCE_TWO = "resource two";
@@ -385,4 +389,4 @@ class ResourcesContainerTarget implements Target {
public final CharSequence getResource3() {
return resource3;
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/common/jaxb/JAXBUtilsTest.java b/core/src/test/java/org/apache/cxf/common/jaxb/JAXBUtilsTest.java
index ad8a621..ead83f1 100644
--- a/core/src/test/java/org/apache/cxf/common/jaxb/JAXBUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/jaxb/JAXBUtilsTest.java
@@ -30,6 +30,8 @@ import com.sun.xml.bind.v2.runtime.MarshallerImpl;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class JAXBUtilsTest extends Assert {
@Test
@@ -47,4 +49,4 @@ public class JAXBUtilsTest extends Assert {
JAXBUtils.setEscapeHandler(m, mockHandler);
assertEquals(mockHandler, m.getProperty("com.sun.xml.bind.characterEscapeHandler"));
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java b/core/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java
index b900065..15ecebb 100644
--- a/core/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java
@@ -31,6 +31,9 @@ import org.easymock.IArgumentMatcher;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
public class LogUtilsTest extends Assert {
@@ -199,4 +202,4 @@ public class LogUtilsTest extends Assert {
buffer.append("log records did not match");
}
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/common/logging/RegexLoggingFilterTest.java b/core/src/test/java/org/apache/cxf/common/logging/RegexLoggingFilterTest.java
index f883e13..a1de8cd 100644
--- a/core/src/test/java/org/apache/cxf/common/logging/RegexLoggingFilterTest.java
+++ b/core/src/test/java/org/apache/cxf/common/logging/RegexLoggingFilterTest.java
@@ -21,6 +21,8 @@ package org.apache.cxf.common.logging;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class RegexLoggingFilterTest extends Assert {
@Test
@@ -33,4 +35,4 @@ public class RegexLoggingFilterTest extends Assert {
assertEquals(wantFilter, "jms:queue:soapRequestQueue?username=admin&password=*****");
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/common/security/SimpleGroupTest.java b/core/src/test/java/org/apache/cxf/common/security/SimpleGroupTest.java
index 07cc26a..69bc4b8 100644
--- a/core/src/test/java/org/apache/cxf/common/security/SimpleGroupTest.java
+++ b/core/src/test/java/org/apache/cxf/common/security/SimpleGroupTest.java
@@ -24,6 +24,10 @@ import java.util.Enumeration;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class SimpleGroupTest extends Assert {
@Test
@@ -53,4 +57,4 @@ public class SimpleGroupTest extends Assert {
group.removeMember(new SimpleGroup("group", "friend"));
assertFalse(group.members().hasMoreElements());
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/common/security/SimplePrincipalTest.java b/core/src/test/java/org/apache/cxf/common/security/SimplePrincipalTest.java
index 27bb7cb..38348c0 100644
--- a/core/src/test/java/org/apache/cxf/common/security/SimplePrincipalTest.java
+++ b/core/src/test/java/org/apache/cxf/common/security/SimplePrincipalTest.java
@@ -22,6 +22,9 @@ package org.apache.cxf.common.security;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
public class SimplePrincipalTest extends Assert {
@Test(expected = IllegalArgumentException.class)
@@ -38,4 +41,4 @@ public class SimplePrincipalTest extends Assert {
public void testNotEquals() {
assertFalse(new SimplePrincipal("barry").equals(new SimplePrincipal("john")));
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/common/util/ASMHelperTest.java b/core/src/test/java/org/apache/cxf/common/util/ASMHelperTest.java
index e386815..4d246c4 100644
--- a/core/src/test/java/org/apache/cxf/common/util/ASMHelperTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/ASMHelperTest.java
@@ -24,6 +24,8 @@ import java.lang.reflect.Type;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class ASMHelperTest extends Assert {
@Test
public void testEnumParamType() throws Exception {
@@ -53,4 +55,4 @@ public class ASMHelperTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java b/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
index 8fc8107..fff8a29 100644
--- a/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
@@ -28,6 +28,11 @@ import org.apache.cxf.helpers.IOUtils;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
public class Base64UtilityTest extends Assert {
@Test
@@ -173,4 +178,4 @@ public class Base64UtilityTest extends Assert {
assertEquals("foobar", new String(Base64Utility.decode("Zm9vYmFy")));
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/common/util/ClassHelperTest.java b/core/src/test/java/org/apache/cxf/common/util/ClassHelperTest.java
index dc3e184..7d58b1b 100644
--- a/core/src/test/java/org/apache/cxf/common/util/ClassHelperTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/ClassHelperTest.java
@@ -33,6 +33,8 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertSame;
+
public class ClassHelperTest extends Assert {
diff --git a/core/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java
index e290f1c..c79d79c 100644
--- a/core/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java
@@ -26,6 +26,12 @@ import java.util.Dictionary;
import org.junit.Assert;
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;
+
public class CollectionUtilsTest extends Assert {
@Test
@@ -74,4 +80,4 @@ public class CollectionUtilsTest extends Assert {
assertNotNull(d.keys());
assertEquals(1, d.size());
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
index c5978e6..ab6b3f9 100644
--- a/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
@@ -32,6 +32,8 @@ import org.apache.cxf.validation.ValidationConfiguration;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class PackageUtilsTest extends Assert {
@Test
public void testGetClassPackageName() throws Exception {
@@ -114,4 +116,4 @@ public class PackageUtilsTest extends Assert {
org.apache.cxf.configuration.spring.JAXBBeanFactory.class));
assertEquals("org.apache.cxf", packageName);
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/common/util/PropertiesLoaderUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/PropertiesLoaderUtilsTest.java
index 6f356df..248ee56 100644
--- a/core/src/test/java/org/apache/cxf/common/util/PropertiesLoaderUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/PropertiesLoaderUtilsTest.java
@@ -25,6 +25,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
public class PropertiesLoaderUtilsTest extends Assert {
Properties properties;
@@ -49,4 +52,4 @@ public class PropertiesLoaderUtilsTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/common/util/PropertyUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/PropertyUtilsTest.java
index c080ec9..08c33a5 100644
--- a/core/src/test/java/org/apache/cxf/common/util/PropertyUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/PropertyUtilsTest.java
@@ -25,6 +25,9 @@ import java.util.Map;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class PropertyUtilsTest extends Assert {
private static final String TEST_KEY = "my.key";
@@ -95,4 +98,4 @@ public class PropertyUtilsTest extends Assert {
assertFalse(PropertyUtils.isFalse(""));
assertFalse(PropertyUtils.isFalse("other"));
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java
index d3d740b..81765a6 100644
--- a/core/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java
@@ -22,6 +22,10 @@ package org.apache.cxf.common.util;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class StringUtilsTest extends Assert {
@Test
@@ -53,4 +57,4 @@ public class StringUtilsTest extends Assert {
assertEquals("http://localhost:9090",
StringUtils.addDefaultPortIfMissing("http://localhost", "9090"));
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/common/util/URIParserUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/URIParserUtilsTest.java
index adf3f23..08af072 100644
--- a/core/src/test/java/org/apache/cxf/common/util/URIParserUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/URIParserUtilsTest.java
@@ -24,6 +24,9 @@ import java.net.URISyntaxException;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
public class URIParserUtilsTest extends Assert {
@@ -51,4 +54,4 @@ public class URIParserUtilsTest extends Assert {
"jar:file:/home/a.jar!/wsdl/others/hello_world_schema2.xsd"));
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/common/util/UrlUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/UrlUtilsTest.java
index 4fd1537..28c5f98 100644
--- a/core/src/test/java/org/apache/cxf/common/util/UrlUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/UrlUtilsTest.java
@@ -22,6 +22,10 @@ package org.apache.cxf.common.util;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class UrlUtilsTest extends Assert {
@@ -88,4 +92,4 @@ public class UrlUtilsTest extends Assert {
public void testPathDecode() {
assertEquals("+++", UrlUtils.pathDecode("+%2B+"));
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtilsTest.java
index a3ea8ab..599f847 100644
--- a/core/src/test/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtilsTest.java
@@ -21,6 +21,8 @@ package org.apache.cxf.common.util;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class XmlSchemaPrimitiveUtilsTest extends Assert {
@Test
@@ -35,4 +37,4 @@ public class XmlSchemaPrimitiveUtilsTest extends Assert {
assertEquals("xsd:int", XmlSchemaPrimitiveUtils.getSchemaRepresentation(int.class, "xsd"));
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java b/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java
index 56c0381..dfe1014 100644
--- a/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java
+++ b/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java
@@ -60,6 +60,8 @@ import org.apache.ws.commons.schema.utils.NamespaceMap;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.fail;
+
/**
*
*/
@@ -315,4 +317,4 @@ public class ImportRepairTest extends Assert {
baseType1.setParticle(new XmlSchemaSequence());
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java b/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
index 0bbe4e4..703733b 100644
--- a/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
+++ b/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
@@ -37,6 +37,10 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
@@ -409,4 +413,4 @@ public class ConfigurerImplTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java b/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java
index 19e15df..e87d91f 100644
--- a/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java
+++ b/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java
@@ -24,6 +24,9 @@ import org.apache.cxf.common.i18n.UncheckedException;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+
public class SuspendedInvocationExceptionTest extends Assert {
@@ -47,4 +50,4 @@ public class SuspendedInvocationExceptionTest extends Assert {
assertNull(ex.getRuntimeException());
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java b/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
index 6210a06..fcba099 100755
--- a/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
@@ -33,6 +33,9 @@ import org.apache.cxf.staxutils.StaxUtils;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
/**
*
*/
@@ -78,4 +81,4 @@ public class XMLStreamDataReaderTest extends Assert {
return closed;
}
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java b/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java
index af60791..b4f6605 100755
--- a/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java
+++ b/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java
@@ -28,6 +28,9 @@ import org.apache.cxf.service.model.EndpointInfo;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
/**
*
*/
@@ -62,4 +65,4 @@ public class EndpointImplTest extends Assert {
assertTrue("hashcode must remain equal", hashcode == ep.hashCode());
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java b/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java
index d0bc572..900a287 100644
--- a/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java
@@ -23,6 +23,8 @@ package org.apache.cxf.helpers;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
public class FileUtilsTest extends Assert {
@@ -39,4 +41,4 @@ public class FileUtilsTest extends Assert {
System.setProperty("java.io.tmpdir", originaltmpdir);
}
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/helpers/IOUtilsTest.java b/core/src/test/java/org/apache/cxf/helpers/IOUtilsTest.java
index 36ba44d4..4608367 100644
--- a/core/src/test/java/org/apache/cxf/helpers/IOUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/IOUtilsTest.java
@@ -27,6 +27,10 @@ import java.io.PushbackInputStream;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class IOUtilsTest extends Assert {
@@ -54,4 +58,4 @@ public class IOUtilsTest extends Assert {
assertFalse(IOUtils.isEmpty(is));
assertEquals(data, IOUtils.toString(is));
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java b/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java
index e1803cf..1fd0b8d 100644
--- a/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java
@@ -22,6 +22,11 @@ package org.apache.cxf.helpers;
import org.junit.Assert;
import org.junit.Test;
+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 NameSpaceTest extends Assert {
private static final String MY_URL1 = "http://test.apache.org/testurl1";
@@ -65,4 +70,4 @@ public class NameSpaceTest extends Assert {
assertTrue(nsDecl3.equals(nsDecl1));
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java b/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
index c143dd1..dad0e56 100644
--- a/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
@@ -30,6 +30,10 @@ import org.junit.Assert;
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.assertTrue;
+
public class ServiceUtilsTest extends Assert {
private IMocksControl control;
private Message msg;
@@ -172,4 +176,4 @@ public class ServiceUtilsTest extends Assert {
control.replay();
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java
index d2e981c..e6da27e 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java
@@ -36,6 +36,8 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
@SuppressWarnings("deprecation")
public class LoggingInInterceptorTest extends Assert {
static String encoding = "UTF-8";
@@ -133,4 +135,4 @@ public class LoggingInInterceptorTest extends Assert {
this.truncated = truncatedStatus;
}
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java
index 916a4e7..8ab5b8f 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java
@@ -43,6 +43,11 @@ import org.junit.Assert;
import org.junit.Before;
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;
+
@SuppressWarnings("deprecation")
public class LoggingOutInterceptorTest extends Assert {
@@ -241,4 +246,4 @@ public class LoggingOutInterceptorTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java
index ab28a58..7b1765f 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java
@@ -37,6 +37,10 @@ import org.easymock.IMocksControl;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public class ServiceInvokerInterceptorTest extends Assert {
@Test
@@ -97,4 +101,4 @@ public class ServiceInvokerInterceptorTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/DefaultSecurityContextTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/DefaultSecurityContextTest.java
index c91e35b..cd184d2 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/security/DefaultSecurityContextTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/DefaultSecurityContextTest.java
@@ -32,6 +32,11 @@ import org.apache.cxf.security.LoginSecurityContext;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
public class DefaultSecurityContextTest extends Assert {
@Test
@@ -114,4 +119,4 @@ public class DefaultSecurityContextTest extends Assert {
assertFalse(context.isUserInRole("Barry"));
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
index a971b35..1d3f042 100755
--- a/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
@@ -26,6 +26,9 @@ import javax.security.auth.callback.PasswordCallback;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
/**
*
*/
@@ -108,4 +111,4 @@ public class NamePasswordCallbackHandlerTest extends Assert {
this.obj = o;
}
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImplTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImplTest.java
index d7c35a4..4416439 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImplTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImplTest.java
@@ -30,6 +30,11 @@ import org.apache.cxf.security.LoginSecurityContext;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
public class RolePrefixSecurityContextImplTest extends Assert {
@Test
@@ -97,4 +102,4 @@ public class RolePrefixSecurityContextImplTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java b/core/src/test/java/org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java
index 54c525a..ddbde8a 100644
--- a/core/src/test/java/org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java
+++ b/core/src/test/java/org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java
@@ -22,6 +22,8 @@ package org.apache.cxf.internal;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+
/**
*
*/
@@ -39,4 +41,4 @@ public class CXFAPINamespaceHandlerTest extends Assert {
assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/blueprint/core"));
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/io/CachedOutputStreamTest.java b/core/src/test/java/org/apache/cxf/io/CachedOutputStreamTest.java
index 5238086..b830c41 100644
--- a/core/src/test/java/org/apache/cxf/io/CachedOutputStreamTest.java
+++ b/core/src/test/java/org/apache/cxf/io/CachedOutputStreamTest.java
@@ -30,6 +30,11 @@ import org.apache.cxf.message.MessageImpl;
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;
+
public class CachedOutputStreamTest extends CachedStreamTestBase {
@Override
@@ -124,4 +129,3 @@ public class CachedOutputStreamTest extends CachedStreamTestBase {
}
}
-
diff --git a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
index 94d49f6..da4c36f 100755
--- a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
+++ b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
@@ -39,6 +39,12 @@ import org.easymock.IMocksControl;
import org.junit.Assert;
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;
+
public abstract class CachedStreamTestBase extends Assert {
// use two typical ciphers for testing
private static final String[] CIPHER_LIST = {"RC4", "AES/CTR/NoPadding"};
@@ -296,4 +302,3 @@ public abstract class CachedStreamTestBase extends Assert {
}
}
-
diff --git a/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java b/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
index 4a3dec1..73c46b1 100644
--- a/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
+++ b/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
@@ -42,6 +42,11 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class PhaseInterceptorChainTest extends Assert {
private IMocksControl control;
@@ -536,4 +541,4 @@ public class PhaseInterceptorChainTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/resource/ClassLoaderResolverTest.java b/core/src/test/java/org/apache/cxf/resource/ClassLoaderResolverTest.java
index aaef891..2cc7635 100644
--- a/core/src/test/java/org/apache/cxf/resource/ClassLoaderResolverTest.java
+++ b/core/src/test/java/org/apache/cxf/resource/ClassLoaderResolverTest.java
@@ -33,6 +33,10 @@ import org.junit.Assert;
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 ClassLoaderResolverTest extends Assert {
private static final String RESOURCE_DATA = "this is the resource data";
@@ -82,4 +86,4 @@ public class ClassLoaderResolverTest extends Assert {
reader.close();
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/resource/DefaultResourceManagerTest.java b/core/src/test/java/org/apache/cxf/resource/DefaultResourceManagerTest.java
index 9e5034d..1f8c36f 100644
--- a/core/src/test/java/org/apache/cxf/resource/DefaultResourceManagerTest.java
+++ b/core/src/test/java/org/apache/cxf/resource/DefaultResourceManagerTest.java
@@ -29,6 +29,11 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class DefaultResourceManagerTest extends Assert {
private DefaultResourceManager manager;
@@ -175,4 +180,4 @@ public class DefaultResourceManagerTest extends Assert {
return null;
}
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java b/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java
index c77a59c..3fa4512 100644
--- a/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java
+++ b/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java
@@ -27,6 +27,12 @@ import org.apache.cxf.helpers.IOUtils;
import org.junit.Assert;
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;
+
public class URIResolverTest extends Assert {
private URIResolver uriResolver;
@@ -237,4 +243,4 @@ public class URIResolverTest extends Assert {
return super.findResource(name);
}
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/service/model/BindingFaultInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/BindingFaultInfoTest.java
index ae60554..db03fc1 100644
--- a/core/src/test/java/org/apache/cxf/service/model/BindingFaultInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/BindingFaultInfoTest.java
@@ -25,6 +25,10 @@ import org.junit.Assert;
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 BindingFaultInfoTest extends Assert {
private BindingFaultInfo bindingFaultInfo;
@@ -45,4 +49,4 @@ public class BindingFaultInfoTest extends Assert {
assertEquals(bindingFaultInfo.getFaultInfo().getName().getNamespaceURI(),
"http://apache.org/hello_world_soap_http");
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/service/model/BindingMessageInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/BindingMessageInfoTest.java
index 968cb50..8d5f17d 100644
--- a/core/src/test/java/org/apache/cxf/service/model/BindingMessageInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/BindingMessageInfoTest.java
@@ -25,6 +25,10 @@ import org.junit.Assert;
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 BindingMessageInfoTest extends Assert {
private BindingMessageInfo bindingMessageInfo;
@@ -45,4 +49,4 @@ public class BindingMessageInfoTest extends Assert {
"http://apache.org/hello_world_soap_http");
assertNull(bindingMessageInfo.getBindingOperation());
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/service/model/BindingOperationInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/BindingOperationInfoTest.java
index aef5312..50819a2 100644
--- a/core/src/test/java/org/apache/cxf/service/model/BindingOperationInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/BindingOperationInfoTest.java
@@ -25,6 +25,11 @@ import org.junit.Assert;
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;
+import static org.junit.Assert.assertTrue;
+
public class BindingOperationInfoTest extends Assert {
private static final String TEST_NS = "urn:test:ns";
private BindingOperationInfo bindingOperationInfo;
@@ -94,4 +99,4 @@ public class BindingOperationInfoTest extends Assert {
assertEquals(faultMessage.getFaultInfo().getName().getNamespaceURI(),
"http://apache.org/hello_world_soap_http");
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/service/model/FaultInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/FaultInfoTest.java
index 7dca73a..41af8aa 100644
--- a/core/src/test/java/org/apache/cxf/service/model/FaultInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/FaultInfoTest.java
@@ -25,6 +25,8 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class FaultInfoTest extends Assert {
private FaultInfo faultInfo;
@@ -45,4 +47,4 @@ public class FaultInfoTest extends Assert {
faultInfo.setFaultName(new QName("urn:test:ns", "fault"));
assertEquals(faultInfo.getFaultName(), new QName("urn:test:ns", "fault"));
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/service/model/InterfaceInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/InterfaceInfoTest.java
index e839e9e..aa34d84 100644
--- a/core/src/test/java/org/apache/cxf/service/model/InterfaceInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/InterfaceInfoTest.java
@@ -25,6 +25,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
public class InterfaceInfoTest extends Assert {
private InterfaceInfo interfaceInfo;
@@ -79,4 +82,4 @@ public class InterfaceInfoTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java
index 1e41f5d..3cebccb 100644
--- a/core/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java
@@ -25,6 +25,8 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class MessageInfoTest extends Assert {
private MessageInfo messageInfo;
@@ -67,4 +69,4 @@ public class MessageInfoTest extends Assert {
assertEquals(messageInfo.getMessageParts().size(), 2);
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/service/model/MessagePartInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/MessagePartInfoTest.java
index bc76049..7646056 100644
--- a/core/src/test/java/org/apache/cxf/service/model/MessagePartInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/MessagePartInfoTest.java
@@ -26,6 +26,11 @@ import org.junit.Assert;
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.assertNull;
+import static org.junit.Assert.assertTrue;
+
public class MessagePartInfoTest extends Assert {
@@ -77,4 +82,4 @@ public class MessagePartInfoTest extends Assert {
assertEquals(messagePartInfo.getTypeQName().getNamespaceURI(),
"http://apache.org/hello_world_soap_http/types");
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/service/model/OperationInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/OperationInfoTest.java
index a3561bd..d9c7bde 100644
--- a/core/src/test/java/org/apache/cxf/service/model/OperationInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/OperationInfoTest.java
@@ -25,6 +25,13 @@ import org.junit.Assert;
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.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class OperationInfoTest extends Assert {
private OperationInfo operationInfo;
@@ -120,4 +127,4 @@ public class OperationInfoTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/staxutils/DepthRestrictingStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/DepthRestrictingStreamReaderTest.java
index 7d78232..974484b 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/DepthRestrictingStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/DepthRestrictingStreamReaderTest.java
@@ -26,6 +26,8 @@ import javax.xml.stream.XMLStreamReader;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
public class DepthRestrictingStreamReaderTest extends Assert {
@Test
@@ -115,4 +117,4 @@ public class DepthRestrictingStreamReaderTest extends Assert {
2);
StaxUtils.copy(dr, new ByteArrayOutputStream());
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java
index 9300ea2..e577306 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java
@@ -25,6 +25,9 @@ import javax.xml.stream.XMLStreamReader;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class DepthXMLStreamReaderTest extends Assert {
@Test
@@ -58,4 +61,4 @@ public class DepthXMLStreamReaderTest extends Assert {
dr.close();
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java
index f1de75e..517331d 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java
@@ -27,6 +27,9 @@ import javax.xml.stream.XMLStreamReader;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class FragmentStreamReaderTest extends Assert {
@Test
@@ -96,4 +99,4 @@ public class FragmentStreamReaderTest extends Assert {
assertEquals(x, reader.next());
}
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/staxutils/PartialXMLStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/PartialXMLStreamReaderTest.java
index b376eb4..586d55e 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/PartialXMLStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/PartialXMLStreamReaderTest.java
@@ -30,6 +30,9 @@ import org.w3c.dom.Document;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public class PartialXMLStreamReaderTest extends Assert {
@Test
@@ -85,4 +88,3 @@ public class PartialXMLStreamReaderTest extends Assert {
}
}
-
diff --git a/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java
index 2478415..d729ab9 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java
@@ -33,6 +33,8 @@ import org.apache.cxf.helpers.DOMUtils;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class PropertiesExpandingStreamReaderTest extends Assert {
@Test
@@ -55,4 +57,4 @@ public class PropertiesExpandingStreamReaderTest extends Assert {
private InputStream getTestStream(String resource) {
return getClass().getResourceAsStream(resource);
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/staxutils/StaxStreamFilterTest.java b/core/src/test/java/org/apache/cxf/staxutils/StaxStreamFilterTest.java
index 47b83fc..1e0718e 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/StaxStreamFilterTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/StaxStreamFilterTest.java
@@ -28,6 +28,8 @@ import javax.xml.stream.XMLStreamReader;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class StaxStreamFilterTest extends Assert {
public static final QName SOAP_ENV =
new QName("http://schemas.xmlsoap.org/soap/envelope/", "Envelope");
@@ -86,4 +88,4 @@ public class StaxStreamFilterTest extends Assert {
private InputStream getTestStream(String file) {
return getClass().getResourceAsStream(file);
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java
index 41af065..7710c79 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java
@@ -37,6 +37,9 @@ import org.w3c.dom.Element;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class W3CDOMStreamReaderTest extends Assert {
diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContextTest.java b/core/src/test/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContextTest.java
index dd477fb..e31c35b 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContextTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContextTest.java
@@ -28,6 +28,12 @@ import javax.xml.namespace.NamespaceContext;
import org.junit.Assert;
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;
+import static org.junit.Assert.fail;
+
public class DelegatingNamespaceContextTest extends Assert {
@Test
@@ -145,4 +151,4 @@ public class DelegatingNamespaceContextTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
index 13f051e..9656c4e 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
@@ -36,6 +36,9 @@ import org.apache.cxf.staxutils.StaxUtils;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class InTransformReaderTest extends Assert {
@Test
@@ -460,4 +463,4 @@ public class InTransformReaderTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java b/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
index 4788c5a..9fc14ff 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
@@ -46,6 +46,10 @@ import org.apache.cxf.staxutils.W3CDOMStreamWriter;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class OutTransformWriterTest extends Assert {
@@ -543,4 +547,4 @@ public class OutTransformWriterTest extends Assert {
transformElements, null, null, null, null);
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java b/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java
index f86560c..cb234ce 100644
--- a/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java
+++ b/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java
@@ -33,6 +33,8 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
public class ChainInitiationObserverTest extends Assert {
private IMocksControl control;
@@ -90,4 +92,4 @@ public class ChainInitiationObserverTest extends Assert {
return invoked;
}
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java b/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java
index 1352d76..d7c5cd8 100644
--- a/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java
+++ b/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java
@@ -24,6 +24,8 @@ import java.net.URL;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class HttpUriMapperTest extends Assert {
@Test
@@ -53,4 +55,4 @@ public class HttpUriMapperTest extends Assert {
path = url.getPath();
assertEquals("/SoapPort", HttpUriMapper.getResourceBase(path));
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java b/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
index 4b8ce35..1d3b682 100644
--- a/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
+++ b/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
@@ -42,6 +42,8 @@ import org.junit.Test;
import static org.apache.cxf.transport.common.gzip.GZIPOutInterceptor.UseGzip.FORCE;
import static org.apache.cxf.transport.common.gzip.GZIPOutInterceptor.UseGzip.YES;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
/**
* Test for the parsing of Accept-Encoding by the GZIPOutInterceptor. For
@@ -136,4 +138,4 @@ public class GZIPAcceptEncodingTest extends Assert {
.singletonList(enc));
inMessage.put(Message.PROTOCOL_HEADERS, protocolHeaders);
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/version/VersionTest.java b/core/src/test/java/org/apache/cxf/version/VersionTest.java
index 24bd99a..c65ff35 100644
--- a/core/src/test/java/org/apache/cxf/version/VersionTest.java
+++ b/core/src/test/java/org/apache/cxf/version/VersionTest.java
@@ -22,6 +22,9 @@ package org.apache.cxf.version;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class VersionTest extends Assert {
@Test
@@ -37,4 +40,4 @@ public class VersionTest extends Assert {
String currentVersion = Version.getCurrentVersion();
assertTrue(completeVersion.contains(currentVersion));
}
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java b/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
index 988678c..8217b91 100644
--- a/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
+++ b/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
@@ -29,6 +29,11 @@ import org.junit.After;
import org.junit.Assert;
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 AutomaticWorkQueueTest extends Assert {
public static final int UNBOUNDED_MAX_QUEUE_SIZE = -1;
@@ -548,4 +553,4 @@ public class AutomaticWorkQueueTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java
index 7b5b017..aefbe13 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java
@@ -29,6 +29,10 @@ import java.lang.reflect.Method;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class FireWallClassLoaderTest extends Assert {
@@ -98,4 +102,4 @@ public class FireWallClassLoaderTest extends Assert {
+ " should cause a SecurityException.");
}
-}
+}
\ No newline at end of file
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
index 42221cc..b5c3e82 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
@@ -32,6 +32,12 @@ import org.junit.Assert;
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;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class PlugInClassLoaderTest extends Assert {
@@ -178,4 +184,4 @@ public class PlugInClassLoaderTest extends Assert {
assertNull("url must be null. ", url);
}
-}
+}
\ No newline at end of file
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java
index 4bbf52d..40b11e8 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java
@@ -30,6 +30,11 @@ import org.junit.Assert;
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;
+import static org.junit.Assert.assertTrue;
+
public class LoggerHelperTest extends Assert {
public static final String TEST_LOGGER_NAME = "test.logger";
@@ -106,4 +111,4 @@ public class LoggerHelperTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java
index 29bd120..c19c810 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java
@@ -26,6 +26,10 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class HandlerTest extends Assert {
Handler h;
@@ -63,4 +67,3 @@ public class HandlerTest extends Assert {
}
-
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
index 4a7ff71..436e42f 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
@@ -36,6 +36,12 @@ import org.easymock.EasyMock;
import org.junit.Assert;
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;
+import static org.junit.Assert.fail;
+
public class ManagedConnectionFactoryImplTest extends Assert {
DummyManagedConnectionFactoryImpl mcf = new DummyManagedConnectionFactoryImpl();
@@ -200,4 +206,4 @@ class DummyManagedConnectionFactoryImpl extends AbstractManagedConnectionFactory
public javax.resource.spi.ResourceAdapter getResourceAdapter() {
return null;
}
-}
+}
\ No newline at end of file
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
index c2f443a..61a667b 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
@@ -32,6 +32,10 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class ManagedConnectionImplTest extends Assert {
private DummyManagedConnectionImpl mc;
@@ -176,4 +180,4 @@ public class ManagedConnectionImplTest extends Assert {
EasyMock.replay(listener);
mc.sendEvent(event);
}
-}
+}
\ No newline at end of file
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java
index 93245a0..3d89936 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java
@@ -28,6 +28,10 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
public class ResourceAdapterInternalExceptionTest extends Assert {
private static final Logger EXCEPTION_LOGGER =
@@ -149,4 +153,4 @@ public class ResourceAdapterInternalExceptionTest extends Assert {
assertEquals("get same exception", cause, re.getLinkedException());
}
-}
+}
\ No newline at end of file
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java
index ab7b7ee..2fb99c8 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java
@@ -23,6 +23,9 @@ import java.util.Properties;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class UriHandlerInitTest extends Assert {
private static final String PROP_NAME = "java.protocol.handler.pkgs";
@@ -50,4 +53,4 @@ public class UriHandlerInitTest extends Assert {
}
}
}
-}
+}
\ No newline at end of file
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java
index e1f884c..574ca17 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java
@@ -28,6 +28,10 @@ import org.apache.cxf.Bus;
import org.easymock.EasyMock;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class AssociatedManagedConnectionFactoryImplTest extends ManagedConnectionFactoryImplTest {
@@ -143,4 +147,4 @@ class TestableAssociatedManagedConnectionFactoryImpl extends AssociatedManagedCo
private static final long serialVersionUID = -1077391534536084071L;
-}
+}
\ No newline at end of file
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java
index 29f62ed..9977dc4 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java
@@ -25,6 +25,8 @@ import javax.xml.namespace.QName;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
public class CXFConnectionRequestInfoTest extends Assert {
@@ -90,4 +92,4 @@ public class CXFConnectionRequestInfoTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
index 5ecd26f..8836bf5 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
@@ -35,6 +35,11 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class ConnectionFactoryImplTest extends Assert {
ManagedConnectionFactory mockConnectionFactory;
@@ -196,4 +201,4 @@ public class ConnectionFactoryImplTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java
index a7b2436..f3a4766 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java
@@ -33,6 +33,10 @@ import org.easymock.EasyMock;
import org.junit.Ignore;
import org.junit.Test;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class JCABusFactoryTest extends AbstractCXFTest {
@@ -96,4 +100,4 @@ class DummyClassLoader extends ClassLoader {
DummyClassLoader() {
super();
}
-}
+}
\ No newline at end of file
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
index ba630ca..56f456e 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
@@ -42,6 +42,13 @@ import org.junit.Assert;
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;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class ManagedConnectionFactoryImplTest extends Assert {
@@ -322,4 +329,4 @@ class ManagedConnectionFactoryImplTester extends ManagedConnectionFactoryImpl {
initCalledCount++;
}
-}
+}
\ No newline at end of file
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
index 828f8b2..8688d32 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
@@ -39,6 +39,10 @@ import org.easymock.EasyMock;
import org.junit.Ignore;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class ManagedConnectionImplTest extends ManagedConnectionTestBase {
protected URL wsdl;
@@ -212,4 +216,4 @@ public class ManagedConnectionImplTest extends ManagedConnectionTestBase {
assertEquals("Checking the EISProductName", "WS-based-EIS", data.getEISProductName());
}
-}
+}
\ No newline at end of file
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
index 67e2d82..55f7deb 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
@@ -38,6 +38,12 @@ import org.easymock.EasyMock;
import org.junit.Assert;
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;
+import static org.junit.Assert.fail;
+
public class ResourceAdapterImplTest extends Assert {
@@ -160,4 +166,4 @@ public class ResourceAdapterImplTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/AbstractInvocationHandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/AbstractInvocationHandlerTest.java
index 67c6827..5a94f6f 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/AbstractInvocationHandlerTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/AbstractInvocationHandlerTest.java
@@ -24,6 +24,9 @@ import org.apache.cxf.jca.cxf.CXFManagedConnectionFactory;
import org.junit.Test;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
public abstract class AbstractInvocationHandlerTest
extends HandlerTestBase {
@@ -82,4 +85,4 @@ public abstract class AbstractInvocationHandlerTest
}
-}
+}
\ No newline at end of file
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
index 90627e6..fffffc4 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
@@ -31,6 +31,8 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.fail;
+
public class HandlerTestBase extends Assert {
protected Bus mockBus = EasyMock.createMock(Bus.class);
protected CXFManagedConnection mockManagedConnection =
@@ -75,4 +77,4 @@ public class HandlerTestBase extends Assert {
// do nothing here ,just for avoid the junit test warning
}
-}
+}
\ No newline at end of file
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java
index baba8e0..73d3512 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java
@@ -32,6 +32,12 @@ import org.apache.cxf.jca.cxf.CXFInvocationHandlerData;
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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class InvocationHandlerFactoryTest extends HandlerTestBase {
private CXFInvocationHandler handler;
@@ -118,4 +124,4 @@ public class InvocationHandlerFactoryTest extends HandlerTestBase {
}
-}
+}
\ No newline at end of file
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java
index b6efceb..506debe 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java
@@ -27,6 +27,8 @@ import org.apache.cxf.jca.cxf.CXFInvocationHandlerData;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
public class InvokingInvocationHandlerTest
extends AbstractInvocationHandlerTest {
@@ -84,4 +86,4 @@ public class InvokingInvocationHandlerTest
}
-}
+}
\ No newline at end of file
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java
index 2a5125c..7e225ca 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java
@@ -27,6 +27,9 @@ import org.apache.cxf.jca.cxf.CXFInvocationHandlerData;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class ObjectMethodInvocationHandlerTest extends AbstractInvocationHandlerTest {
@@ -136,4 +139,3 @@ public class ObjectMethodInvocationHandlerTest extends AbstractInvocationHandler
}
-
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java
index fb532d4..894114f 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java
@@ -26,6 +26,8 @@ import org.apache.cxf.jca.cxf.CXFInvocationHandlerData;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertSame;
+
public class ProxyInvocationHandlerTest extends AbstractInvocationHandlerTest {
@@ -69,4 +71,3 @@ public class ProxyInvocationHandlerTest extends AbstractInvocationHandlerTest {
-
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java
index 50d1e51..0b10e4b 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java
@@ -28,6 +28,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public class JarLoaderTest extends Assert {
@@ -61,4 +64,4 @@ public class JarLoaderTest extends Assert {
assertNotNull("class must be included in map "
+ map.get("com/sun/connector/blackbox/JdbcDataSource.class"));
}
-}
+}
\ No newline at end of file
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java
index 8bc1a50..551b0e8 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java
@@ -23,6 +23,8 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
@@ -57,4 +59,4 @@ public class EJBEndpointTest extends Assert {
assertEquals(9999, port);
}
-}
+}
\ No newline at end of file
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java
index 74bf5f9..50f3e1e 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java
@@ -24,6 +24,9 @@ import javax.xml.namespace.QName;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
public class EJBServantConfigTest extends Assert {
@@ -95,4 +98,4 @@ public class EJBServantConfigTest extends Assert {
assertEquals("org.apache.hello_world_soap_http.Greeter", endpoint.getServiceClassName());
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
index ef2199e..4075a8a 100644
--- a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
+++ b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
@@ -46,6 +46,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
public class ColocMessageObserverTest extends Assert {
private IMocksControl control = EasyMock.createNiceControl();
private ColocMessageObserver observer;
@@ -153,4 +156,4 @@ public class ColocMessageObserverTest extends Assert {
return new ArrayList<Interceptor<? extends Message>>();
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
index d2db38d..decfa9c 100644
--- a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
+++ b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
@@ -58,6 +58,11 @@ import org.junit.Assert;
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.assertNotSame;
+import static org.junit.Assert.fail;
+
public class ColocOutInterceptorTest extends Assert {
private static final String COLOCATED = Message.class.getName() + ".COLOCATED";
private IMocksControl control = EasyMock.createNiceControl();
@@ -571,4 +576,4 @@ public class ColocOutInterceptorTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java
index 2d812fb..14c98bf 100644
--- a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java
+++ b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java
@@ -53,6 +53,10 @@ import org.junit.Assert;
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.assertNotSame;
+
public class ColocUtilTest extends Assert {
private IMocksControl control = EasyMock.createNiceControl();
private Bus bus;
@@ -234,4 +238,4 @@ public class ColocUtilTest extends Assert {
assertEquals("Should find a match", true, match);
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandlerTest.java b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandlerTest.java
index 7ca9b7d..bf8804f 100644
--- a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandlerTest.java
+++ b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandlerTest.java
@@ -22,6 +22,8 @@ package org.apache.cxf.binding.coloc.blueprint;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+
/**
*
*/
@@ -33,4 +35,4 @@ public class ColocBPNamespaceHandlerTest extends Assert {
assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/binding/coloc"));
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
index 2e6a36e..aec3790 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
@@ -47,6 +47,10 @@ import org.junit.Assert;
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;
+
public class CorbaBindingFactoryTest extends Assert {
@@ -156,4 +160,4 @@ public class CorbaBindingFactoryTest extends Assert {
factory.setBus(bus);
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
index 48a865b..c7422b2 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
@@ -32,6 +32,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
public class CorbaBindingTest extends Assert {
@@ -85,4 +88,4 @@ public class CorbaBindingTest extends Assert {
assertEquals(1, fault.size());*/
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
index c488b05..872bf6b 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
@@ -62,6 +62,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
public class CorbaConduitTest extends Assert {
@@ -419,4 +422,4 @@ public class CorbaConduitTest extends Assert {
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java
index f1bf815..f8d02a0 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java
@@ -29,6 +29,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
public class CorbaDestinationTest extends Assert {
protected static TestUtils testUtils;
@@ -91,4 +94,4 @@ public class CorbaDestinationTest extends Assert {
destination.shutdown();
}*/
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java
index 8e87b8f..08f65fd 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java
@@ -35,6 +35,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public class CorbaMessageTest extends Assert {
private static ORB orb;
@@ -142,4 +145,4 @@ public class CorbaMessageTest extends Assert {
assertNotNull(msgEx);
assertTrue(msgEx.getMessage().equals(ex.getMessage()));*/
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
index 6bdc81d..3b0d518 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
@@ -52,6 +52,10 @@ import org.junit.Assert;
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;
+
public class CorbaServerConduitTest extends Assert {
protected EndpointInfo endpointInfo;
protected EndpointReferenceType target;
@@ -332,4 +336,4 @@ public class CorbaServerConduitTest extends Assert {
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java
index e122197..21846f1 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java
@@ -25,6 +25,8 @@ import org.apache.cxf.binding.corba.wsdl.CorbaType;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class CorbaTypeMapTest extends Assert {
@Test
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java
index 58c94f3..00fc8c3 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java
@@ -40,6 +40,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
public class CorbaDSIServantTest extends Assert {
protected static ORB orb;
@@ -140,4 +143,3 @@ public class CorbaDSIServantTest extends Assert {
}
-
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
index 9171156..d5408b9 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
@@ -56,6 +56,10 @@ import org.junit.Assert;
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;
+
public class CorbaObjectReaderTest extends Assert {
private static ORB orb;
@@ -545,4 +549,4 @@ public class CorbaObjectReaderTest extends Assert {
reader.readObjectReference(obj);
assertTrue(obj.getReference()._is_equivalent(objRef));
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
index f8504d7..df4d534 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
@@ -49,6 +49,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public class CorbaObjectWriterTest extends Assert {
@@ -474,4 +477,4 @@ public class CorbaObjectWriterTest extends Assert {
org.omg.CORBA.Object resultObj = iStream.read_Object();
assertTrue(resultObj._is_equivalent(obj.getReference()));
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
index eecadb6..ab0830e 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
@@ -27,6 +27,8 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class CorbaStreamReaderTest extends Assert {
private CorbaStreamReader reader;
@@ -75,4 +77,4 @@ public class CorbaStreamReaderTest extends Assert {
"abcdef",
new String(reader.getTextCharacters()));
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java
index cd772f9..eb303fa 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java
@@ -25,6 +25,8 @@ import org.apache.cxf.binding.corba.types.AbstractCorbaTypeListener;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class CorbaStreamWriterTest extends Assert {
@Test
@@ -43,4 +45,4 @@ public class CorbaStreamWriterTest extends Assert {
assertEquals("abcd", pointer[0]);
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
index 4d54538..a5c8aef 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
@@ -34,6 +34,10 @@ import org.junit.Assert;
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;
+
public class CorbaStreamableTest extends Assert {
@@ -141,4 +145,4 @@ public class CorbaStreamableTest extends Assert {
String value = iStream.read_wstring();
assertEquals("TestWString", value);
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
index 84055b5..3aebe6f 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
@@ -33,6 +33,10 @@ import org.junit.Assert;
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;
+
public class CorbaAnyHandlerTest extends Assert {
@@ -84,4 +88,4 @@ public class CorbaAnyHandlerTest extends Assert {
CorbaTypeMap resultTM = anyHandler.getTypeMap();
assertTrue(resultTM.getTargetNamespace().equals(CorbaConstants.NU_WSDL_CORBA));
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
index 4a5e3eb..6278b0f 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
@@ -31,6 +31,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public class CorbaArrayHandlerTest extends Assert {
private ORB orb;
@@ -108,4 +111,4 @@ public class CorbaArrayHandlerTest extends Assert {
assertNotNull(elResult);
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
index 5a2d2ec..acd15f2 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
@@ -31,6 +31,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public class CorbaEnumHandlerTest extends Assert {
private ORB orb;
@@ -86,4 +89,4 @@ public class CorbaEnumHandlerTest extends Assert {
assertTrue(obj.getIndex() == 1);
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java
index 69f77b3..c06f492 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java
@@ -31,6 +31,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public class CorbaFixedHandlerTest extends Assert {
private ORB orb;
@@ -78,4 +81,4 @@ public class CorbaFixedHandlerTest extends Assert {
assertTrue(fixedType.getDigits() == obj.getDigits());
assertTrue(fixedType.getScale() == obj.getScale());
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java
index 88647ea..8d71e47 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java
@@ -42,6 +42,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public class CorbaHandlerUtilsTest extends Assert {
@@ -196,4 +199,4 @@ public class CorbaHandlerUtilsTest extends Assert {
result = CorbaHandlerUtils.initializeObjectHandler(orb, objName, objIdlType, typeMap, service);
assertTrue(result instanceof CorbaUnionHandler);
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
index 10f9753..9e5b9bb 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
@@ -31,6 +31,10 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
public class CorbaObjectHandlerTest extends Assert {
private ORB orb;
@@ -86,4 +90,4 @@ public class CorbaObjectHandlerTest extends Assert {
Object objDef = obj.getType();
assertNull(objDef);
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
index 16603a9..5ca41a7 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
@@ -29,6 +29,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public class CorbaPrimitiveHandlerTest extends Assert {
private ORB orb;
@@ -364,4 +367,4 @@ public class CorbaPrimitiveHandlerTest extends Assert {
String stringResult = (String)resultObj;
assertTrue(stringResult.equals(val));
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
index 9af999e..25aecec 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
@@ -31,6 +31,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public class CorbaSequenceHandlerTest extends Assert {
private ORB orb;
@@ -110,4 +113,4 @@ public class CorbaSequenceHandlerTest extends Assert {
assertNotNull(elResult);
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java
index 632b0a1..9f06e91 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java
@@ -35,6 +35,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
// Since the exception handler is essentially the same as the struct handler (just included in case
// structs and exceptions diverge at a later date), this test should cover both.
public class CorbaStructHandlerTest extends Assert {
@@ -120,4 +123,4 @@ public class CorbaStructHandlerTest extends Assert {
assertNotNull(member1Result);
assertTrue(member1Result.getName().equals(objMember1.getName()));
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java
index 67e95d7..42c9cf9 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java
@@ -28,6 +28,8 @@ import org.apache.cxf.message.MessageImpl;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
/**
* Holder for utility methods relating to contexts.
*/
@@ -52,4 +54,3 @@ public final class ContextUtilsTest extends Assert {
}
}
-
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java
index e7ea390..c34772c 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java
@@ -35,6 +35,10 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class CorbaUtilsTest extends Assert {
private static ORB orb;
@@ -215,4 +219,4 @@ public class CorbaUtilsTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java
index 249c6ed..7da589c 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java
@@ -46,6 +46,10 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class MustUnderstandInterceptorTest extends TestBase {
private static final QName RESERVATION = new QName("http://travelcompany.example.org/reservation",
@@ -205,4 +209,4 @@ public class MustUnderstandInterceptorTest extends TestBase {
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java
index 0687f39..1d960f4 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java
@@ -39,6 +39,9 @@ import org.easymock.IMocksControl;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class RPCInInterceptorTest extends TestBase {
private static final String TNS = "http://apache.org/hello_world_rpclit";
@@ -116,4 +119,4 @@ public class RPCInInterceptorTest extends TestBase {
assertEquals(45, s.getElem3());
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java
index 28b5ea5..028181e 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java
@@ -46,6 +46,9 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
public class RPCOutInterceptorTest extends TestBase {
private static final String TNS = "http://apache.org/hello_world_rpclit";
@@ -156,4 +159,4 @@ public class RPCOutInterceptorTest extends TestBase {
assertEquals("elem1", reader.getText());
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
index 3264c57..a7debc9 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
@@ -49,6 +49,12 @@ import org.apache.cxf.staxutils.StaxUtils;
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.assertTrue;
+import static org.junit.Assert.fail;
+
public class ReadHeaderInterceptorTest extends TestBase {
private ReadHeadersInterceptor rhi;
@@ -223,4 +229,4 @@ public class ReadHeaderInterceptorTest extends TestBase {
soapMessage.setContent(InputStream.class, bads.getInputStream());
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
index 2a8a04e..4d2dbd4 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
@@ -48,6 +48,9 @@ import org.junit.Before;
import org.junit.Test;
import static org.easymock.EasyMock.expect;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
public class ServiceModelUtilTest extends Assert {
private static final String WSDL_PATH = "test-soap-header.wsdl";
@@ -127,4 +130,4 @@ public class ServiceModelUtilTest extends Assert {
schemaInfo = ServiceModelUtil.getSchema(serviceInfo, messagePartInfo);
assertEquals(schemaInfo.getNamespaceURI(), "http://mycompany.example.com/employees");
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
index c97b262..d95dd87 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
@@ -38,6 +38,10 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public class SoapActionInterceptorTest extends Assert {
@@ -91,4 +95,4 @@ public class SoapActionInterceptorTest extends Assert {
return b.buildOperation(new QName("fooOp"), null, null);
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
index dc487ac..a9a00bb 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
@@ -54,6 +54,10 @@ import org.junit.Test;
import static org.easymock.EasyMock.createNiceControl;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
+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 SoapBindingFactoryTest extends Assert {
IMocksControl control;
@@ -231,4 +235,4 @@ public class SoapBindingFactoryTest extends Assert {
return WSDLFactory.newInstance().newWSDLReader().readWSDL(null,
new InputSource(resource.openStream()));
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
index f1e88c9..568fbdc 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
@@ -26,6 +26,10 @@ import org.apache.cxf.message.MessageImpl;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public class SoapBindingTest extends Assert {
@Test
@@ -48,4 +52,4 @@ public class SoapBindingTest extends Assert {
assertEquals("application/soap+xml", soapMessage.get(Message.CONTENT_TYPE));
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java
index 6eba973..2c305ca 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java
@@ -39,6 +39,9 @@ import org.apache.cxf.staxutils.StaxUtils;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
public class SoapOutInterceptorTest extends TestBase {
private ReadHeadersInterceptor rhi;
private SoapOutInterceptor soi;
@@ -131,4 +134,4 @@ public class SoapOutInterceptorTest extends TestBase {
soapMessage.setContent(InputStream.class, getClass().getResourceAsStream(payloadFileName));
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
index a4be07e..9688162 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
@@ -51,6 +51,8 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
+import static org.junit.Assert.assertNotNull;
+
public class TestBase extends Assert {
protected PhaseInterceptorChain chain;
@@ -141,4 +143,4 @@ public class TestBase extends Assert {
serviceInfo.setProperty(WSDLServiceBuilder.WSDL_SERVICE, null);
return serviceInfo;
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java
index d5c6d94..8c82fef 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java
@@ -22,6 +22,8 @@ package org.apache.cxf.binding.soap.blueprint;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+
/**
*
*/
@@ -32,4 +34,4 @@ public class SoapBindingBPHandlerTest extends Assert {
assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/blueprint/bindings/soap"));
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptorTest.java
index 4544a79..67c455a 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptorTest.java
@@ -33,6 +33,10 @@ import org.junit.Assert;
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;
+
/**
*
*/
@@ -80,4 +84,4 @@ public class ReadHeadersInterceptorTest extends Assert {
return message;
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
index d786d56..de75608 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
@@ -37,6 +37,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
/**
*
*/
@@ -187,4 +190,4 @@ public class SoapActionInInterceptorTest extends Assert {
EasyMock.expect(message.get(AttachmentDeserializer.ATTACHMENT_PART_HEADERS)).andReturn(partHeaders).anyTimes();
return message;
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
index d420ec7..a2f5de7 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
@@ -54,6 +54,10 @@ import org.apache.cxf.staxutils.StaxUtils;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
public class SoapFaultSerializerTest extends Assert {
private void assertValid(String xpathExpression, Document doc) {
Map<String, String> namespaces = new HashMap<>();
@@ -384,4 +388,4 @@ public class SoapFaultSerializerTest extends Assert {
assertEquals(Soap11.getInstance().getReceiver(), fault2.getFaultCode());
assertEquals("some text containing a xml tag <xml-tag>", fault2.getMessage());
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
index 9a2ac9f..72d92a9 100755
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
@@ -44,6 +44,10 @@ import org.junit.Assert;
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;
+
/**
*
*/
@@ -108,4 +112,4 @@ public class SoapPreProtocolOutInterceptorTest extends Assert {
private interface SEI {
String op();
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
index 6575ced..9ba1367 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
@@ -32,6 +32,10 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+
/**
*
*/
@@ -91,4 +95,4 @@ public class SoapFaultFactoryTest extends Assert {
assertNull(fault.getCause());
control.verify();
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
index 102feee..1568cd7 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
@@ -45,6 +45,8 @@ import org.apache.cxf.staxutils.StaxUtils;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class ParseBodyTest extends Assert {
static final String[] DATA = {
"<SOAP-ENV:Body xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\">\n"
@@ -152,4 +154,4 @@ public class ParseBodyTest extends Assert {
byteArrayWriter.flush();
return outputStream.toByteArray();
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java
index 285247a..1b28453 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java
@@ -48,6 +48,9 @@ import org.apache.cxf.interceptor.StaxInInterceptor;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
public class SAAJInInterceptorTest extends TestBase {
@@ -181,4 +184,4 @@ public class SAAJInInterceptorTest extends TestBase {
soapMessage.setContent(InputStream.class, bads.getInputStream());
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
index 313de85..b1d8373 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
@@ -28,6 +28,8 @@ import org.apache.cxf.service.model.BindingInfo;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
public class XMLBindingFactoryTest extends Assert {
@Test
@@ -45,4 +47,4 @@ public class XMLBindingFactoryTest extends Assert {
assertTrue("No in attachment interceptor found", found);
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
index 7cdbab1..fea782c 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
@@ -59,6 +59,8 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
+import static org.junit.Assert.assertNotNull;
+
public class TestBase extends Assert {
protected PhaseInterceptorChain chain;
@@ -168,4 +170,4 @@ public class TestBase extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultInterceptorsTest.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultInterceptorsTest.java
index 923413e..dc791db 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultInterceptorsTest.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultInterceptorsTest.java
@@ -38,6 +38,9 @@ import org.apache.hello_world_xml_http.bare.types.MyComplexStructType;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public class XMLFaultInterceptorsTest extends TestBase {
@Test
@@ -87,4 +90,4 @@ public class XMLFaultInterceptorsTest extends TestBase {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptorTest.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptorTest.java
index aaa5f26..1ae80aa 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptorTest.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptorTest.java
@@ -41,6 +41,8 @@ import org.apache.hello_world_doc_lit.types.FaultDetail;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class XMLFaultOutInterceptorTest extends TestBase {
XMLFaultOutInterceptor out = new XMLFaultOutInterceptor();
@@ -94,4 +96,4 @@ public class XMLFaultOutInterceptorTest extends TestBase {
InputStream in = new ByteArrayInputStream(o.toByteArray());
return StaxUtils.createXMLStreamReader(in);
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java
index 11e0941..9d69218 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java
@@ -34,6 +34,9 @@ import org.apache.hello_world_xml_http.wrapped.types.GreetMe;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
public class XMLMessageInInterceptorTest extends TestBase {
XMLMessageInInterceptor in = new XMLMessageInInterceptor("phase1");
@@ -106,4 +109,4 @@ public class XMLMessageInInterceptorTest extends TestBase {
xmlMessage.setContent(InputStream.class, inputStream);
xmlMessage.setContent(XMLStreamReader.class, StaxUtils.createXMLStreamReader(inputStream));
}
-}
+}
\ No newline at end of file
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java
index a64bd19..a2c8979 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java
@@ -41,6 +41,8 @@ import org.apache.hello_world_xml_http.wrapped.types.GreetMe;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class XMLMessageOutInterceptorTest extends TestBase {
static String bareNs = "http://apache.org/hello_world_xml_http/bare";
@@ -194,4 +196,4 @@ public class XMLMessageOutInterceptorTest extends TestBase {
InputStream in = new ByteArrayInputStream(o.toByteArray());
return StaxUtils.createXMLStreamReader(in);
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ClientServiceConfigTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ClientServiceConfigTest.java
index 825b50c..ef1298e 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ClientServiceConfigTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ClientServiceConfigTest.java
@@ -35,6 +35,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class ClientServiceConfigTest extends AbstractAegisTest {
EndpointImpl impl;
@@ -90,4 +92,4 @@ public class ClientServiceConfigTest extends AbstractAegisTest {
assertEquals("reflection", boing);
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionTest.java
index e449925..f3a11b8 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionTest.java
@@ -32,6 +32,8 @@ import org.apache.cxf.service.invoker.BeanInvoker;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.fail;
+
public class ExceptionTest extends AbstractAegisTest {
@Before
public void setUp() throws Exception {
@@ -134,4 +136,4 @@ public class ExceptionTest extends AbstractAegisTest {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ExceptionInheritanceTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ExceptionInheritanceTest.java
index 244a3f9..0074b32 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ExceptionInheritanceTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ExceptionInheritanceTest.java
@@ -38,6 +38,9 @@ import org.apache.cxf.service.invoker.BeanInvoker;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class ExceptionInheritanceTest extends AbstractAegisTest {
private WS1 client;
private Map<String, Object> props;
@@ -94,4 +97,4 @@ public class ExceptionInheritanceTest extends AbstractAegisTest {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/intf/InterfaceInheritanceTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/intf/InterfaceInheritanceTest.java
index aeee74c..a7c6999 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/intf/InterfaceInheritanceTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/intf/InterfaceInheritanceTest.java
@@ -29,6 +29,10 @@ import org.apache.cxf.service.invoker.BeanInvoker;
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;
+
/**
* This test ensures that we're handling inheritance of interfaces correctly.
* Since we can't do multiple parent inheritance in XML schema, which interfaces
@@ -74,4 +78,4 @@ public class InterfaceInheritanceTest extends AbstractAegisTest {
assertValid("//xsd:complexType[@name='IParent']", wsdl);
assertInvalid("//xsd:complexType[@name='IChild'][@abstract='true']", wsdl);
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/DOMMappingTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/DOMMappingTest.java
index 62273fa..58ca056 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/DOMMappingTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/DOMMappingTest.java
@@ -38,6 +38,9 @@ import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
/**
* Test mapping DOM.
* Commented out code for the case of an embedded Node object,
@@ -93,4 +96,4 @@ public class DOMMappingTest extends AbstractAegisTest {
assertEquals("Is a root vegetable.", text);
*/
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/SchemaValidationTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/SchemaValidationTest.java
index c4f1f4b..8bd4283 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/SchemaValidationTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/SchemaValidationTest.java
@@ -36,6 +36,10 @@ import org.apache.cxf.staxutils.StaxUtils;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
*
*/
@@ -72,4 +76,4 @@ public class SchemaValidationTest extends AbstractAegisTest {
String m = out.toString();
return m.contains("Fault");
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java
index 024711e..1eb45c4 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java
@@ -31,6 +31,8 @@ import org.apache.cxf.aegis.services.BeanService;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class WrappedTest extends AbstractAegisTest {
private ArrayService arrayService;
@@ -137,4 +139,4 @@ public class WrappedTest extends AbstractAegisTest {
assertEquals("after items", arrayService.getAfterValue());
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java
index 488e75c..449aff2 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java
@@ -40,6 +40,9 @@ import org.apache.cxf.service.Service;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
/**
* Test of the ability of the user to control prefixes by specifying them in a
* map.
@@ -173,4 +176,4 @@ public class ExplicitPrefixTest extends AbstractAegisTest {
serviceAndMapping.getServer().destroy();
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/NamespaceConfusionTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/NamespaceConfusionTest.java
index 5c40d29..2b2158d 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/NamespaceConfusionTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/NamespaceConfusionTest.java
@@ -41,6 +41,9 @@ import org.apache.cxf.service.Service;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
/**
* Regression test for CXF-959. This is a point test for consistent
@@ -122,4 +125,4 @@ public class NamespaceConfusionTest extends AbstractAegisTest {
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/override/OverrideTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/override/OverrideTypeTest.java
index eb3e4a7..cea0488 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/override/OverrideTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/override/OverrideTypeTest.java
@@ -33,6 +33,10 @@ import org.apache.cxf.databinding.DataReader;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
*
*/
@@ -58,4 +62,4 @@ public class OverrideTypeTest extends AbstractAegisTest {
assertEquals("long", e.getDivision());
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/proxy/ProxyTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/proxy/ProxyTest.java
index 50ddff0..c93bb1e 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/proxy/ProxyTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/proxy/ProxyTest.java
@@ -28,6 +28,8 @@ import org.apache.cxf.service.invoker.BeanInvoker;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
public class ProxyTest extends AbstractAegisTest {
@Before
public void setUp() throws Exception {
@@ -61,4 +63,4 @@ public class ProxyTest extends AbstractAegisTest {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/SchemaAddinsTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/SchemaAddinsTest.java
index 80e6c89..57b42c5 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/SchemaAddinsTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/SchemaAddinsTest.java
@@ -30,6 +30,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+
public class SchemaAddinsTest extends Assert {
private TestUtilities testUtilities;
@@ -63,4 +66,4 @@ public class SchemaAddinsTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayTest.java
index 12aea2b..8ef80ad 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayTest.java
@@ -31,6 +31,10 @@ import org.apache.cxf.frontend.ServerFactoryBean;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class FlatArrayTest extends AbstractAegisTest {
private static final int[] INT_ARRAY = new int[] {4, 6, 12};
@@ -122,4 +126,4 @@ public class FlatArrayTest extends AbstractAegisTest {
assertEquals(Integer.valueOf(3), bwfc.getValues().get(2));
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java
index f0eddcb..73e80a1 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java
@@ -53,6 +53,12 @@ import org.apache.ws.commons.schema.constants.Constants;
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;
+
public class BeanTest extends AbstractAegisTest {
TypeMapping mapping;
private AegisContext context;
@@ -777,4 +783,4 @@ public class BeanTest extends AbstractAegisTest {
public enum EnumBean {
VALUE1, VALUE2;
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DateTimezoneTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DateTimezoneTest.java
index 07162d6..5fe1d11 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DateTimezoneTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DateTimezoneTest.java
@@ -32,6 +32,9 @@ import org.apache.ws.commons.schema.constants.Constants;
import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class DateTimezoneTest extends AbstractAegisTest {
@@ -117,4 +120,4 @@ public class DateTimezoneTest extends AbstractAegisTest {
this.date = date;
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java
index 07159f2..766641b 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java
@@ -27,6 +27,12 @@ import org.apache.cxf.aegis.xml.stax.ElementReader;
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;
+import static org.junit.Assert.fail;
+
public class DynamicProxyTest extends AbstractAegisTest {
TypeMapping mapping;
@@ -197,4 +203,4 @@ public class DynamicProxyTest extends AbstractAegisTest {
public interface IMyInterface2 {
IMyInterface getMyInterface();
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/AbstractEncodedTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/AbstractEncodedTest.java
index 19d1e42..8db03a6 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/AbstractEncodedTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/AbstractEncodedTest.java
@@ -44,6 +44,10 @@ import org.apache.ws.commons.schema.constants.Constants;
import org.junit.Before;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
public abstract class AbstractEncodedTest extends AbstractAegisTest {
protected DefaultTypeMapping mapping;
protected TrailingBlocks trailingBlocks;
@@ -200,4 +204,4 @@ public abstract class AbstractEncodedTest extends AbstractAegisTest {
assertEquals("NV", billing.getState());
assertEquals("89102", billing.getZip());
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfoTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfoTest.java
index abd6492..9ec715f 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfoTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfoTest.java
@@ -31,6 +31,11 @@ import org.apache.ws.commons.schema.constants.Constants;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class ArrayTypeInfoTest extends AbstractAegisTest {
private TypeMapping mapping;
private StructType addressType;
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java
index 1893c33..53a66aa 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java
@@ -30,6 +30,10 @@ import org.apache.cxf.aegis.xml.stax.ElementReader;
import org.junit.Test;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
public class SoapArrayTypeTest extends AbstractEncodedTest {
private static final String[][][] ARRAY_2_3_4 = new String[][][] {
new String[][]{
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java
index bd9601f..a7b72aa 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java
@@ -35,6 +35,11 @@ import org.apache.cxf.helpers.DOMUtils;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+
public class StructTypeTest extends AbstractEncodedTest {
private StructType addressType;
private StructType purchaseOrderType;
@@ -226,4 +231,4 @@ public class StructTypeTest extends AbstractEncodedTest {
assertNotSame("", childName + " href is null \n", hrefAttribute);
return hrefAttribute;
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java
index 65563b5..7ac751c 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java
@@ -39,6 +39,11 @@ import org.apache.ws.commons.schema.constants.Constants;
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.assertTrue;
+import static org.junit.Assert.fail;
+
public class AnnotatedTypeTest extends AbstractAegisTest {
private TypeMapping tm;
private Service service;
@@ -189,4 +194,4 @@ public class AnnotatedTypeTest extends AbstractAegisTest {
public void setString(String string) {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ClassTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ClassTest.java
index f49a475..ef29a32 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ClassTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ClassTest.java
@@ -44,6 +44,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+
public class ClassTest extends AbstractAegisTest {
Server server;
@@ -131,4 +133,4 @@ public class ClassTest extends AbstractAegisTest {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
index 0a3dfa4..3d35d42 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
@@ -42,6 +42,11 @@ import org.apache.ws.commons.schema.constants.Constants;
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.assertTrue;
+
public class CollectionTest extends AbstractAegisTest {
@@ -231,4 +236,4 @@ public class CollectionTest extends AbstractAegisTest {
AegisType valueType = mapType.getValueType();
assertFalse(valueType.getSchemaType().getLocalPart().contains("any"));
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTestsWithService.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTestsWithService.java
index 0b4f601..1b4c42d 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTestsWithService.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTestsWithService.java
@@ -36,6 +36,10 @@ import org.apache.cxf.frontend.ClientProxyFactoryBean;
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;
+
/**
*
*/
@@ -129,4 +133,4 @@ public class CollectionTestsWithService extends AbstractAegisTest {
assertEquals(2, r.size());
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ConfigurationTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ConfigurationTest.java
index bee8e27..a70314e 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ConfigurationTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ConfigurationTest.java
@@ -32,6 +32,10 @@ import org.apache.cxf.aegis.type.basic.BeanTypeInfo;
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.assertTrue;
+
public class ConfigurationTest extends AbstractAegisTest {
DefaultTypeMapping tm;
@@ -113,4 +117,4 @@ public class ConfigurationTest extends AbstractAegisTest {
assertFalse(info.isExtensibleAttributes());
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java
index 6c95545..9858bff 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java
@@ -28,6 +28,8 @@ import org.apache.ws.commons.schema.constants.Constants;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+
public class DualOutServiceTest extends AbstractAegisTest {
@Test
public void testWSDL() throws Exception {
@@ -52,4 +54,4 @@ public class DualOutServiceTest extends AbstractAegisTest {
+ "[@name='return1'][@type='xsd:string']",
wsdl);
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java
index 83a4b87..c619659 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java
@@ -38,6 +38,10 @@ import org.apache.ws.commons.schema.constants.Constants;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
public class EnumTypeTest extends AbstractAegisTest {
private DefaultTypeMapping tm;
@@ -210,4 +214,4 @@ public class EnumTypeTest extends AbstractAegisTest {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java
index d7a1258..144cff8 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java
@@ -39,6 +39,11 @@ import org.apache.ws.commons.schema.constants.Constants;
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.assertTrue;
+import static org.junit.Assert.fail;
+
public class JaxbTypeTest extends AbstractAegisTest {
private TypeMapping tm;
private Service service;
@@ -213,4 +218,4 @@ public class JaxbTypeTest extends AbstractAegisTest {
public void setString(String string) {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/MapTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/MapTest.java
index ecc467f..66e20b4 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/MapTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/MapTest.java
@@ -39,6 +39,10 @@ import org.apache.cxf.aegis.type.java5.dto.MapDTOService;
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;
+
public class MapTest extends AbstractAegisTest {
private DefaultTypeMapping tm;
private Java5TypeCreator creator;
@@ -172,4 +176,4 @@ public class MapTest extends AbstractAegisTest {
return null;
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java
index c85c4ac..54ce660 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java
@@ -40,6 +40,8 @@ import org.apache.ws.commons.schema.constants.Constants;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
public class OperationNSTest extends AbstractAegisTest {
@@ -112,4 +114,4 @@ public class OperationNSTest extends AbstractAegisTest {
return null;
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireTypeTest.java
index 043fa31..681db70 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireTypeTest.java
@@ -39,6 +39,11 @@ import org.apache.ws.commons.schema.constants.Constants;
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.assertTrue;
+import static org.junit.Assert.fail;
+
public class XFireTypeTest extends AbstractAegisTest {
private TypeMapping tm;
private Service service;
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireXmlParamTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireXmlParamTypeTest.java
index c35bae6..5c39b09 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireXmlParamTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireXmlParamTypeTest.java
@@ -32,6 +32,9 @@ import org.apache.cxf.aegis.type.DefaultTypeMapping;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class XFireXmlParamTypeTest extends AbstractAegisTest {
private DefaultTypeMapping tm;
private Java5TypeCreator creator;
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XmlParamTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XmlParamTypeTest.java
index e8ff54a..0243bd8 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XmlParamTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XmlParamTypeTest.java
@@ -33,6 +33,9 @@ import org.apache.cxf.aegis.type.TypeCreationOptions;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class XmlParamTypeTest extends AbstractAegisTest {
private DefaultTypeMapping tm;
private Java5TypeCreator creator;
@@ -81,4 +84,4 @@ public class XmlParamTypeTest extends AbstractAegisTest {
return null;
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentTest.java
index 3330df1..5df66a4 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentTest.java
@@ -32,6 +32,9 @@ import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
public class StudentTest extends AbstractAegisTest {
@Test
@@ -124,4 +127,4 @@ public class StudentTest extends AbstractAegisTest {
assertEquals("Student1", one.getName());
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
index 7952240..dea5485 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
@@ -40,6 +40,12 @@ import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
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.assertNull;
+import static org.junit.Assert.assertTrue;
+
/**
*
*/
@@ -117,4 +123,4 @@ public class MapsTest extends AbstractAegisTest {
assertFalse(obj2.getTheMap().get("sunny"));
assertFalse(obj2.getTheMap().get("cloudy"));
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/streams/XMLStreamReaderMappingTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/streams/XMLStreamReaderMappingTest.java
index 0501569..02833eb 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/streams/XMLStreamReaderMappingTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/streams/XMLStreamReaderMappingTest.java
@@ -36,6 +36,9 @@ import org.apache.ws.commons.schema.constants.Constants;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class XMLStreamReaderMappingTest extends AbstractAegisTest {
protected DefaultTypeMapping mapping;
private AegisContext context;
@@ -81,4 +84,4 @@ public class XMLStreamReaderMappingTest extends AbstractAegisTest {
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java
index 5a31283..d608b74 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java
@@ -30,6 +30,10 @@ import org.apache.cxf.test.AbstractCXFTest;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class ReaderTest extends AbstractCXFTest {
@Test
public void testLiteralReader() throws Exception {
@@ -99,4 +103,4 @@ public class ReaderTest extends AbstractCXFTest {
assertEquals("child", child.getLocalName());
assertTrue(child.hasMoreElementReaders());
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/NillableTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/NillableTest.java
index 1e3bc7f..266d9e6 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/NillableTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/NillableTest.java
@@ -30,6 +30,8 @@ import org.apache.cxf.aegis.services.NillableService;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
public class NillableTest extends AbstractAegisTest {
private Document arrayWsdlDoc;
@@ -63,4 +65,4 @@ public class NillableTest extends AbstractAegisTest {
assertTrue(nillableValue == null || "".equals(nillableValue) || "false".equals(nillableValue));
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/DocLitBareTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/DocLitBareTest.java
index 81d1c58..f8208b3 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/DocLitBareTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/DocLitBareTest.java
@@ -27,6 +27,9 @@ import org.apache.cxf.transport.local.LocalTransportFactory;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
/**
* Test motivated by CXF-1504
*/
@@ -55,4 +58,4 @@ public class DocLitBareTest extends AbstractCXFTest {
assertEquals(52, tr.getAge());
assertEquals("Mr. Tom", tr.getName());
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
index e0798ef..2c3edd7 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
@@ -62,6 +62,9 @@ import org.junit.Test;
import static org.easymock.EasyMock.createNiceControl;
import static org.easymock.EasyMock.expect;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
public class BareInInterceptorTest extends Assert {
@@ -257,4 +260,4 @@ public class BareInInterceptorTest extends Assert {
return StaxUtils.createXMLStreamWriter(os);
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java
index 0f7e001..40966c8 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java
@@ -43,6 +43,9 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
public class BareOutInterceptorTest extends TestBase {
@@ -124,4 +127,4 @@ public class BareOutInterceptorTest extends TestBase {
assertEquals(new QName("http://apache.org/hello_world_soap_http/types", "requestType"),
reader.getName());
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DataBindingMarshallerPropertiesTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DataBindingMarshallerPropertiesTest.java
index d49d074..6746808 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DataBindingMarshallerPropertiesTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DataBindingMarshallerPropertiesTest.java
@@ -24,6 +24,8 @@ import java.util.Map;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
public class DataBindingMarshallerPropertiesTest extends TestBase {
@Test
public void testInitializeUnmarshallerProperties() throws Exception {
@@ -36,4 +38,4 @@ public class DataBindingMarshallerPropertiesTest extends TestBase {
assertTrue("somevalue".equals(db.getUnmarshallerProperties().get("someproperty")));
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
index 7acc1e1..2898c6c 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
@@ -61,6 +61,9 @@ import org.junit.Test;
import static org.easymock.EasyMock.createNiceControl;
import static org.easymock.EasyMock.expect;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
public class DocLiteralInInterceptorTest extends Assert {
PhaseInterceptorChain chain;
@@ -230,4 +233,4 @@ public class DocLiteralInInterceptorTest extends Assert {
public XMLStreamWriter getXMLStreamWriter(OutputStream os) {
return StaxUtils.createXMLStreamWriter(os);
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
index 1f83fc7..0d83f7b 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
@@ -76,6 +76,12 @@ import org.junit.Assert;
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;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class JAXBDataBindingTest extends Assert {
private static final Logger LOG = LogUtils.getLogger(JAXBDataBindingTest.class);
@@ -398,4 +404,4 @@ public class JAXBDataBindingTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
index 346a4c8..a3a15f7 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
@@ -71,6 +71,13 @@ import org.junit.Assert;
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.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* JAXBEncoderDecoderTest
*/
@@ -636,4 +643,3 @@ public class JAXBEncoderDecoderTest extends Assert {
}
-
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
index 4b7cd14..53d7a8e 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
@@ -34,6 +34,10 @@ import org.apache.hello_world_soap_http.types.GreetMe;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
public class JAXBUtilsTest extends Assert {
@@ -189,4 +193,4 @@ public class JAXBUtilsTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
index ae8ad92..021a3db 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
@@ -33,6 +33,11 @@ import org.apache.cxf.databinding.WrapperHelper;
import org.junit.Assert;
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 JAXBWrapperHelperTest extends Assert {
@@ -168,4 +173,3 @@ public class JAXBWrapperHelperTest extends Assert {
}
}
}
-
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java
index 0965d7e..61ba87f 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java
@@ -25,6 +25,8 @@ import javax.xml.bind.annotation.XmlAccessType;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.fail;
+
public class UtilsTest extends Assert {
@Test
@@ -84,4 +86,4 @@ public class UtilsTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
index 336f583..a2bd3f8 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
@@ -43,6 +43,12 @@ import org.junit.Assert;
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.assertTrue;
+import static org.junit.Assert.fail;
+
public class XMLStreamDataReaderTest extends Assert {
private XMLInputFactory factory;
@@ -210,4 +216,4 @@ public class XMLStreamDataReaderTest extends Assert {
private InputStream getTestStream(String resource) {
return getClass().getResourceAsStream(resource);
}
-}
+}
\ No newline at end of file
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java
index 4fbd2bc..b0cece2 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java
@@ -49,6 +49,12 @@ import org.junit.Assert;
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.assertTrue;
+import static org.junit.Assert.fail;
+
public class XMLStreamDataWriterTest extends Assert {
private ByteArrayOutputStream baos;
private XMLStreamWriter streamWriter;
@@ -364,4 +370,4 @@ public class XMLStreamDataWriterTest extends Assert {
JAXBContext ctx = JAXBContext.newInstance(clz);
return new JAXBDataBinding(ctx);
}
-}
+}
\ No newline at end of file
diff --git a/rt/features/clustering/src/test/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandlerTest.java b/rt/features/clustering/src/test/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandlerTest.java
index 004b802..31b1c8d 100644
--- a/rt/features/clustering/src/test/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandlerTest.java
+++ b/rt/features/clustering/src/test/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandlerTest.java
@@ -22,6 +22,8 @@ package org.apache.cxf.clustering.blueprint;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+
/**
*
*/
@@ -33,4 +35,4 @@ public class ClusteringBPNamespaceHandlerTest extends Assert {
assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/clustering"));
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java
index 73e51c3..7e8b6d6 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java
@@ -32,6 +32,10 @@ import org.apache.cxf.message.MessageImpl;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+
public class JAXRSServerFactoryBeanTest extends Assert {
@Test
@@ -80,4 +84,4 @@ public class JAXRSServerFactoryBeanTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBeanTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBeanTest.java
index f94be08..a732eb1 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBeanTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBeanTest.java
@@ -33,6 +33,13 @@ import org.junit.Assert;
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.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class JAXRSServiceFactoryBeanTest extends Assert {
@Before
@@ -168,4 +175,4 @@ public class JAXRSServiceFactoryBeanTest extends Assert {
}
return false;
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
index b671632..62a7752 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
@@ -61,6 +61,10 @@ import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+
public class SelectMethodCandidatesTest extends Assert {
@Test
@@ -1080,4 +1084,4 @@ public class SelectMethodCandidatesTest extends Assert {
return null;
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandlerTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandlerTest.java
index 482f513..483e7d4 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandlerTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandlerTest.java
@@ -22,6 +22,8 @@ package org.apache.cxf.jaxrs.blueprint;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+
/**
*
*/
@@ -33,4 +35,4 @@ public class JAXRSBPNamespaceHandlerTest extends Assert {
assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/blueprint/jaxrs"));
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java
index 6a3e19f..4b30816 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java
@@ -52,6 +52,11 @@ import org.easymock.EasyMock;
import org.junit.Assert;
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.assertSame;
+
public class MessageContextImplTest extends Assert {
@Test
@@ -225,4 +230,4 @@ public class MessageContextImplTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/form/FormTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/form/FormTest.java
index 2f05c8a..620f248 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/form/FormTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/form/FormTest.java
@@ -25,6 +25,8 @@ import org.apache.cxf.jaxrs.utils.FormUtils;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class FormTest extends Assert {
@Test
@@ -33,4 +35,4 @@ public class FormTest extends Assert {
assertEquals("a=b&c=d", FormUtils.formToString(form));
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentTest.java
index 7877612..14b3d44 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentTest.java
@@ -27,6 +27,8 @@ import org.apache.cxf.jaxrs.impl.MetadataMap;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class AttachmentTest extends Assert {
@@ -43,4 +45,4 @@ public class AttachmentTest extends Assert {
new DataHandler(new ByteArrayDataSource(new byte[]{1}, "application/octet-stream")),
map);
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/ContentDispositionTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/ContentDispositionTest.java
index af57cb6..60d3e95 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/ContentDispositionTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/ContentDispositionTest.java
@@ -23,6 +23,8 @@ package org.apache.cxf.jaxrs.ext.multipart;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class ContentDispositionTest extends Assert {
@Test
@@ -54,4 +56,4 @@ public class ContentDispositionTest extends Assert {
assertEquals("21:08:08 14:00:00", cd.getParameter("creation-date"));
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBodyTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBodyTest.java
index 6516285..d70b67f 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBodyTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBodyTest.java
@@ -30,6 +30,9 @@ import org.apache.cxf.jaxrs.impl.MetadataMap;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
public class MultipartBodyTest extends Assert {
@Test
@@ -59,4 +62,4 @@ public class MultipartBodyTest extends Assert {
new DataHandler(new ByteArrayDataSource(new byte[]{1}, "application/octet-stream")),
new MetadataMap<String, String>());
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java
index d20b4b3..7c24c5d 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java
@@ -39,6 +39,13 @@ import org.apache.ws.commons.schema.constants.Constants;
import org.junit.Assert;
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;
+
public class XMLSourceTest extends Assert {
@@ -294,4 +301,4 @@ public class XMLSourceTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/AsyncResponseImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/AsyncResponseImplTest.java
index f1706f2..adb269f 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/AsyncResponseImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/AsyncResponseImplTest.java
@@ -37,6 +37,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class AsyncResponseImplTest extends Assert {
private IMocksControl control;
@@ -159,4 +162,4 @@ public class AsyncResponseImplTest extends Assert {
assertEquals("AsynchResponse.isSuspended() returned a different response after canceling a second time",
isSuspended, impl.isSuspended());
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProviderTest.java
index 1c03141..bfe3ec3 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProviderTest.java
@@ -31,6 +31,9 @@ import org.apache.cxf.message.MessageImpl;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class CacheControlHeaderProviderTest extends Assert {
@Test(expected = IllegalArgumentException.class)
@@ -179,4 +182,4 @@ public class CacheControlHeaderProviderTest extends Assert {
assertTrue(value.indexOf("ext3=\"value 3\"") != -1);
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java
index 06c246a..2985dd5 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java
@@ -52,6 +52,11 @@ import org.apache.cxf.common.logging.LogUtils;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class ConfigurationImplTest extends Assert {
@Test
@@ -377,4 +382,4 @@ public class ConfigurationImplTest extends Assert {
}
fail("did not log expected message");
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CookieHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CookieHeaderProviderTest.java
index 082adec..ee06bb9 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CookieHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CookieHeaderProviderTest.java
@@ -24,6 +24,9 @@ import javax.ws.rs.core.Cookie;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class CookieHeaderProviderTest extends Assert {
@@ -83,4 +86,4 @@ public class CookieHeaderProviderTest extends Assert {
Cookie.valueOf(null);
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/DateHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/DateHeaderProviderTest.java
index 1b12ef7..7383d19 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/DateHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/DateHeaderProviderTest.java
@@ -28,6 +28,8 @@ import org.apache.cxf.jaxrs.utils.HttpUtils;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class DateHeaderProviderTest extends Assert {
@Test
@@ -40,4 +42,4 @@ public class DateHeaderProviderTest extends Assert {
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProviderTest.java
index 29f543e..b636f2a 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProviderTest.java
@@ -24,6 +24,9 @@ import javax.ws.rs.core.EntityTag;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class EntityTagHeaderProviderTest extends Assert {
@@ -54,4 +57,4 @@ public class EntityTagHeaderProviderTest extends Assert {
public void testNullValue() throws Exception {
EntityTag.valueOf(null);
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
index f6a6b9d..456af44 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
@@ -42,6 +42,11 @@ import org.apache.cxf.message.MessageImpl;
import org.junit.Assert;
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 HttpHeadersImplTest extends Assert {
@Test
@@ -466,4 +471,4 @@ public class HttpHeadersImplTest extends Assert {
return m;
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java
index 331dec2..dab2e28 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java
@@ -30,6 +30,11 @@ import javax.ws.rs.core.MediaType;
import org.junit.Assert;
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 LinkBuilderImplTest extends Assert {
@@ -131,4 +136,4 @@ public class LinkBuilderImplTest extends Assert {
return MediaType.APPLICATION_JSON;
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkHeaderProviderTest.java
index f6bb11b..d843753 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkHeaderProviderTest.java
@@ -24,6 +24,8 @@ import javax.ws.rs.core.Link;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class LinkHeaderProviderTest extends Assert {
@Test
@@ -59,4 +61,4 @@ public class LinkHeaderProviderTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProviderTest.java
index f68e8ac..d7585c5 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProviderTest.java
@@ -28,6 +28,9 @@ import javax.ws.rs.core.MediaType;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
public class MediaTypeHeaderProviderTest extends Assert {
@Test(expected = IllegalArgumentException.class)
@@ -210,4 +213,4 @@ public class MediaTypeHeaderProviderTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java
index 9934063..3b025e2 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java
@@ -32,6 +32,12 @@ import javax.ws.rs.core.MultivaluedMap;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
public class MetadataMapTest extends Assert {
@@ -366,4 +372,4 @@ public class MetadataMapTest extends Assert {
assertFalse(m2.equalsIgnoreValueOrder(m3));
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProviderTest.java
index c0a32bb..29edcac 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProviderTest.java
@@ -28,6 +28,10 @@ import org.apache.cxf.jaxrs.utils.HttpUtils;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public class NewCookieHeaderProviderTest extends Assert {
@Test(expected = IllegalArgumentException.class)
@@ -143,4 +147,4 @@ public class NewCookieHeaderProviderTest extends Assert {
+ "Path=/path;Secure;Version=1", c.toString());
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/PathSegmentImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/PathSegmentImplTest.java
index 9f6a046..44bf6b3 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/PathSegmentImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/PathSegmentImplTest.java
@@ -25,6 +25,8 @@ import javax.ws.rs.core.PathSegment;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class PathSegmentImplTest extends Assert {
@Test
@@ -55,4 +57,4 @@ public class PathSegmentImplTest extends Assert {
assertEquals(1, params.get("a").size());
assertEquals("1 2", params.get("a").get(0));
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java
index efaa89f..9e35bae 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java
@@ -42,6 +42,11 @@ import org.junit.Assert;
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;
+import static org.junit.Assert.assertSame;
+
public class RequestImplTest extends Assert {
private Message m;
@@ -333,4 +338,4 @@ public class RequestImplTest extends Assert {
assertNull("Dates must not be checked if tags do not match", rb);
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java
index 01e7932..110f2b5 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java
@@ -40,6 +40,8 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class RequestPreprocessorTest extends Assert {
@@ -125,4 +127,4 @@ public class RequestPreprocessorTest extends Assert {
return m;
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImplTest.java
index 1d4ac18..bc42000 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImplTest.java
@@ -44,6 +44,12 @@ import org.apache.cxf.jaxrs.utils.HttpUtils;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
public class ResponseBuilderImplTest extends Assert {
@@ -438,4 +444,4 @@ public class ResponseBuilderImplTest extends Assert {
200, null, m);
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
index 450d74c..1eb9fcc 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
@@ -64,6 +64,13 @@ import org.easymock.EasyMock;
import org.junit.Assert;
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.assertSame;
+import static org.junit.Assert.assertTrue;
+
@SuppressWarnings("resource") // Responses built in this test don't need to be closed
public class ResponseImplTest extends Assert {
@@ -526,4 +533,4 @@ public class ResponseImplTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImplTest.java
index 6ee595a..76e3e3e 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImplTest.java
@@ -31,6 +31,8 @@ import javax.ws.rs.ext.RuntimeDelegate;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertSame;
+
public class RuntimeDelegateImplTest extends Assert {
@Test
@@ -72,4 +74,4 @@ public class RuntimeDelegateImplTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/SecurityContextImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/SecurityContextImplTest.java
index 6f1e9cb..9c728ec 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/SecurityContextImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/SecurityContextImplTest.java
@@ -29,6 +29,8 @@ import org.apache.cxf.message.MessageImpl;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class SecurityContextImplTest extends Assert {
@Test
@@ -43,4 +45,4 @@ public class SecurityContextImplTest extends Assert {
String scheme = new SecurityContextImpl(m).getAuthenticationScheme();
assertEquals("Digest", scheme);
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java
index 6e4fe3e..3ebe6ea 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java
@@ -40,6 +40,9 @@ import org.apache.cxf.jaxrs.utils.JAXRSUtils;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
public class UriBuilderImplTest extends Assert {
@Test
@@ -1662,4 +1665,4 @@ public class UriBuilderImplTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java
index 0dd0a04..0ce2d37 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java
@@ -50,6 +50,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class UriInfoImplTest extends Assert {
private IMocksControl control;
@@ -586,4 +589,3 @@ public class UriInfoImplTest extends Assert {
}
}
-
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImplTest.java
index 572d39e..49d402c 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImplTest.java
@@ -28,6 +28,9 @@ import javax.ws.rs.core.Variant;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class VariantListBuilderImplTest extends Assert {
@Test
@@ -157,4 +160,4 @@ public class VariantListBuilderImplTest extends Assert {
return false;
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/lifecycle/PerRequestResourceProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/lifecycle/PerRequestResourceProviderTest.java
index 27ae60f..ab72088 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/lifecycle/PerRequestResourceProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/lifecycle/PerRequestResourceProviderTest.java
@@ -33,6 +33,10 @@ import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public class PerRequestResourceProviderTest extends Assert {
@Test
@@ -73,4 +77,3 @@ public class PerRequestResourceProviderTest extends Assert {
}
-
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java
index cc73a20..75184da 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java
@@ -50,6 +50,13 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
public class ClassResourceInfoTest extends Assert {
@Path("/bar")
@@ -271,4 +278,4 @@ public class ClassResourceInfoTest extends Assert {
return classes;
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/OperationResourceInfoTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/OperationResourceInfoTest.java
index 0d2fe95..70b9f92 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/OperationResourceInfoTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/OperationResourceInfoTest.java
@@ -36,6 +36,8 @@ import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class OperationResourceInfoTest extends Assert {
@Produces("text/xml")
@@ -149,4 +151,4 @@ public class OperationResourceInfoTest extends Assert {
e.put(Endpoint.class, endpoint);
return m;
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java
index 719dee4..5ba6642 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java
@@ -32,6 +32,11 @@ import org.junit.Assert;
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.assertNull;
+import static org.junit.Assert.assertTrue;
+
public class URITemplateTest extends Assert {
@Before
@@ -753,4 +758,4 @@ public class URITemplateTest extends Assert {
-Integer.signum(URITemplate.compareTemplates(t2, t1)));
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/doc/JavaDocProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/doc/JavaDocProviderTest.java
index 918ff2f..a4a4ef6 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/doc/JavaDocProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/doc/JavaDocProviderTest.java
@@ -26,6 +26,9 @@ import org.apache.cxf.jaxrs.utils.ResourceUtils;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class JavaDocProviderTest extends Assert {
@Test
@@ -104,4 +107,4 @@ public class JavaDocProviderTest extends Assert {
assertEquals("the query2", p.getMethodParameterDoc(ori, 2));
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/BinaryDataProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/BinaryDataProviderTest.java
index 35ecb68..4b228de 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/BinaryDataProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/BinaryDataProviderTest.java
@@ -41,6 +41,9 @@ import org.apache.cxf.jaxrs.impl.MetadataMap;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class BinaryDataProviderTest extends Assert {
@Test
@@ -139,4 +142,4 @@ public class BinaryDataProviderTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
index 17316da..da74286 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
@@ -34,6 +34,8 @@ import org.apache.cxf.jaxrs.impl.MetadataMap;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class DataSourceProviderTest extends Assert {
@Test
@@ -102,4 +104,4 @@ public class DataSourceProviderTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
index 7177493..7b10077 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
@@ -39,6 +39,10 @@ import org.apache.cxf.jaxrs.utils.HttpUtils;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class FormEncodingProviderTest extends Assert {
@@ -318,4 +322,4 @@ public class FormEncodingProviderTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
index 73464f5..af8c77f 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
@@ -100,6 +100,13 @@ import org.easymock.EasyMock;
import org.junit.Assert;
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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class JAXBElementProviderTest extends Assert {
@Test
@@ -1675,4 +1682,4 @@ public class JAXBElementProviderTest extends Assert {
e.put(Endpoint.class, endpoint);
return m;
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
index bc10a77..c8c03d7 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
@@ -36,6 +36,10 @@ import org.apache.cxf.jaxrs.impl.MetadataMap;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class PrimitiveTextProviderTest extends Assert {
@Test
@@ -245,4 +249,4 @@ public class PrimitiveTextProviderTest extends Assert {
assertEquals(value, valueRead);
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
index db53a30..a411519 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
@@ -82,6 +82,14 @@ import org.junit.Assert;
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.assertSame;
+import static org.junit.Assert.assertTrue;
+
public class ProviderFactoryTest extends Assert {
@@ -1442,4 +1450,4 @@ public class ProviderFactoryTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProviderTest.java
index db5f8b5..eb62eac 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProviderTest.java
@@ -24,6 +24,9 @@ import java.util.Collections;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class RequestDispatcherProviderTest extends Assert {
@Test
@@ -50,4 +53,4 @@ public class RequestDispatcherProviderTest extends Assert {
ONE,
TWO
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java
index 7b936c6..1deda4d 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java
@@ -52,6 +52,10 @@ import org.apache.cxf.staxutils.transform.InTransformReader;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
public class SourceProviderTest extends Assert {
@@ -173,4 +177,4 @@ public class SourceProviderTest extends Assert {
return new MessageContextImpl(m);
};
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java
index 73c4e14..6e871f7 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java
@@ -28,6 +28,11 @@ import org.apache.cxf.jaxrs.resources.BookStore;
import org.junit.Assert;
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 XPathProviderTest extends Assert {
@Test
@@ -70,4 +75,4 @@ public class XPathProviderTest extends Assert {
assertEquals("The Book", book.getName());
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java
index 8446426..4ff4380 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java
@@ -50,6 +50,9 @@ import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class XSLTJaxbProviderTest extends Assert {
private static final String TEMPLATE_LOCATION = "classpath:/org/apache/cxf/jaxrs/provider/template.xsl";
@@ -286,4 +289,4 @@ public class XSLTJaxbProviderTest extends Assert {
return new Book();
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilterTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilterTest.java
index b7b2db7..63846e3 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilterTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilterTest.java
@@ -28,6 +28,9 @@ import org.apache.cxf.message.MessageImpl;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
public class JAASAuthenticationFilterTest extends Assert {
@Test
@@ -46,4 +49,4 @@ public class JAASAuthenticationFilterTest extends Assert {
//Test that the header conforms to RFC2617
assertEquals("Basic realm=\"foo\"", result);
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java
index c9e78b5..ef73027 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java
@@ -37,6 +37,10 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+
public class JAXRSServerFactoryBeanTest extends Assert {
@@ -94,4 +98,4 @@ public class JAXRSServerFactoryBeanTest extends Assert {
assertSame(c1, c2);
provider.clearContexts();
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/SpringResourceFactoryTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/SpringResourceFactoryTest.java
index 6912aa6..f7c4337 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/SpringResourceFactoryTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/SpringResourceFactoryTest.java
@@ -34,6 +34,10 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+
public class SpringResourceFactoryTest extends Assert {
@@ -79,4 +83,4 @@ public class SpringResourceFactoryTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java
index 1edb783..3e7c7d8 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java
@@ -33,6 +33,10 @@ import org.apache.cxf.jaxrs.Customer;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+
public class AnnotationTestUtilsTest extends Assert {
@Test
@@ -77,4 +81,4 @@ public class AnnotationTestUtilsTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ExceptionUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ExceptionUtilsTest.java
index 124569f..4ed7419 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ExceptionUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ExceptionUtilsTest.java
@@ -32,6 +32,8 @@ import org.apache.cxf.message.MessageImpl;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class ExceptionUtilsTest extends Assert {
@@ -68,4 +70,4 @@ public class ExceptionUtilsTest extends Assert {
e.put("org.apache.cxf.jaxrs.provider.ServerProviderFactory", ServerProviderFactory.getInstance());
return m;
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java
index 00dfeda..4e06bbd 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java
@@ -34,6 +34,8 @@ import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class FormUtilsTest extends Assert {
private static final String HTTP_PARAM1 = "httpParam1";
@@ -106,4 +108,4 @@ public class FormUtilsTest extends Assert {
EasyMock.expect(mockRequest.getParameterValues(HTTP_PARAM2)).andReturn(new String[] {HTTP_PARAM_VALUE2})
.anyTimes();
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
index bcac80d..e3af69f 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
@@ -38,6 +38,10 @@ import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class HttpUtilsTest extends Assert {
@Test
@@ -276,4 +280,4 @@ public class HttpUtilsTest extends Assert {
String address = HttpUtils.getBaseAddress(m);
assertEquals(expected, address);
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
index d372b42..be546b4 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
@@ -57,6 +57,11 @@ import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
+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 InjectionUtilsTest extends Assert {
@@ -384,4 +389,4 @@ public class InjectionUtilsTest extends Assert {
this.birthDate = birthDate;
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
index fba0b39..830d23f 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
@@ -112,6 +112,14 @@ import org.junit.Assert;
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.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class JAXRSUtilsTest extends Assert {
@Before
@@ -2196,4 +2204,4 @@ public class JAXRSUtilsTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java
index ff74417..50f6aa9 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java
@@ -52,6 +52,11 @@ import org.apache.cxf.jaxrs.resources.Chapter;
import org.junit.Assert;
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 ResourceUtilsTest extends Assert {
@Test
@@ -339,4 +344,4 @@ public class ResourceUtilsTest extends Assert {
private static class CustomApplication extends BaseApplication {
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
index 9e4c9f0..81083a2 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
@@ -50,6 +50,10 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
public class ConfiguredEndpointTest extends Assert {
private static final QName SERVICE_NAME =
new QName("http://apache.org/hello_world_soap_http", "SOAPService");
@@ -337,4 +341,4 @@ public class ConfiguredEndpointTest extends Assert {
public void handleMessage(Message message) throws Fault {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
index 674c1fd..4a27ca4 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
@@ -58,6 +58,14 @@ import org.easymock.EasyMock;
import org.junit.Assert;
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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class JAXWSMethodInvokerTest extends Assert {
private static final QName TEST_HEADER_NAME = new QName("testHeader");
Factory factory = EasyMock.createMock(Factory.class);
@@ -292,4 +300,4 @@ public class JAXWSMethodInvokerTest extends Assert {
return inMessage;
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java
index d59b230..7fc83009 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java
@@ -40,6 +40,8 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.junit.After;
import org.junit.Assert;
+import static org.junit.Assert.assertTrue;
+
public class WrapperClassGeneratorTest extends Assert {
@After
@@ -119,4 +121,4 @@ public class WrapperClassGeneratorTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandlerTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandlerTest.java
index 19899db..83a75d3 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandlerTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandlerTest.java
@@ -22,6 +22,8 @@ package org.apache.cxf.jaxws.blueprint;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+
/**
*
*/
@@ -33,4 +35,4 @@ public class JAXWSBPNamespaceHandlerTest extends Assert {
assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/blueprint/jaxws"));
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
index 82daac9..e6eb853 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
@@ -35,6 +35,10 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
public class WebServiceContextImplTest extends Assert {
@@ -92,4 +96,4 @@ public class WebServiceContextImplTest extends Assert {
context.put(MessageContext.HTTP_REQUEST_HEADERS, headers);
context.setScope(MessageContext.HTTP_REQUEST_HEADERS, Scope.APPLICATION);
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java
index f9402a6..bc49678 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java
@@ -31,6 +31,10 @@ import org.apache.cxf.message.Attachment;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
/**
*
*/
@@ -81,4 +85,4 @@ public class WrappedAttachmentsTest extends Assert {
assertTrue(attachments.isEmpty());
assertTrue(content.isEmpty());
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedMessageContextTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedMessageContextTest.java
index 1cc9e2f..0e579e9 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedMessageContextTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedMessageContextTest.java
@@ -37,6 +37,11 @@ import org.apache.cxf.message.Message;
import org.junit.Assert;
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;
+
/**
*
*/
@@ -96,4 +101,4 @@ public class WrappedMessageContextTest extends Assert {
assertTrue(context.containsKey(MessageContext.HTTP_REQUEST_HEADERS));
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java
index f8d043b..25bf7d8 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java
@@ -40,6 +40,7 @@ import static org.easymock.EasyMock.createNiceControl;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.isA;
+import static org.junit.Assert.assertEquals;
public class AbstractProtocolHandlerInterceptorTest extends Assert {
@@ -115,4 +116,4 @@ public class AbstractProtocolHandlerInterceptorTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java
index bb72637..59f4fb9 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java
@@ -33,6 +33,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
public class AnnotationHandlerChainBuilderTest extends Assert {
@@ -140,4 +143,4 @@ public class AnnotationHandlerChainBuilderTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java
index 1d3a728..4fad9eb 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java
@@ -40,6 +40,13 @@ import org.easymock.EasyMock;
import org.junit.Assert;
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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
@SuppressWarnings("rawtypes")
public class HandlerChainBuilderTest extends Assert {
@@ -242,4 +249,4 @@ public class HandlerChainBuilderTest extends Assert {
return false;
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
index edeeaba..6ed724b 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
@@ -55,6 +55,12 @@ import org.junit.Assert;
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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class HandlerChainInvokerTest extends Assert {
private static final int HANDLER_COUNT = 4;
@@ -1145,4 +1151,4 @@ public class HandlerChainInvokerTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/InitParamResourceResolverTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/InitParamResourceResolverTest.java
index b345cdc..6ecb04d 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/InitParamResourceResolverTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/InitParamResourceResolverTest.java
@@ -26,6 +26,8 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class InitParamResourceResolverTest extends Assert {
@@ -121,4 +123,4 @@ public class InitParamResourceResolverTest extends Assert {
assertEquals("incorrect string value returned", expectedValue, ret);
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
index 2bab7ae..c07c658 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
@@ -50,6 +50,7 @@ import static org.easymock.EasyMock.createNiceControl;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.isA;
+import static org.junit.Assert.assertEquals;
public class LogicalHandlerInterceptorTest extends Assert {
@@ -157,4 +158,4 @@ public class LogicalHandlerInterceptorTest extends Assert {
li.handleMessage(outMessage);
control1.verify();
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java
index 4812e77..d2b8cc1 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java
@@ -38,6 +38,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class LogicalMessageImplTest extends Assert {
AddNumbers req;
List<Object> args;
@@ -73,4 +76,4 @@ public class LogicalMessageImplTest extends Assert {
assertEquals(req.getArg0(), resp.getArg0());
assertEquals(req.getArg1(), resp.getArg1());
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
index a7727e9..20c8a26 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
@@ -81,6 +81,9 @@ import org.junit.Test;
import static org.easymock.EasyMock.createNiceControl;
import static org.easymock.EasyMock.expect;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
public class SOAPHandlerInterceptorTest extends Assert {
@@ -568,4 +571,4 @@ public class SOAPHandlerInterceptorTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
index 1f0d2c2..00a185a 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
@@ -61,6 +61,15 @@ import org.junit.After;
import org.junit.Assert;
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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class SpringBeansTest extends Assert {
@@ -476,4 +485,3 @@ public class SpringBeansTest extends Assert {
assertNotNull(pc.getContext());
}
}
-
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java
index 5f4991e..4ce8022 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java
@@ -44,6 +44,11 @@ import org.junit.Assert;
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;
+import static org.junit.Assert.assertTrue;
+
public class ContextPropertiesMappingTest extends Assert {
private static final String ADDRESS = "test address";
private static final String REQUEST_METHOD = "GET";
@@ -127,4 +132,4 @@ public class ContextPropertiesMappingTest extends Assert {
assertTrue("part2 attachment is missing", dataHandlers.containsKey("part2"));
assertTrue("part2 handler is missing", dataHandlers.get("part2") == handler2);
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfoTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfoTest.java
index eddbe7c..0c613fd 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfoTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfoTest.java
@@ -27,6 +27,10 @@ import org.apache.cxf.calculator.CalculatorImpl;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class JaxWsImplementorInfoTest extends Assert {
@Test
@@ -43,4 +47,4 @@ public class JaxWsImplementorInfoTest extends Assert {
ifAnnotationLoadedByOtherClassLoader(CalculatorImpl.class, WebServiceProvider.class));
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java
index adc262d..9dff387 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java
@@ -46,6 +46,11 @@ import org.junit.Assert;
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.assertNull;
+import static org.junit.Assert.assertTrue;
+
public class JaxWsServiceConfigurationTest extends Assert {
@@ -209,4 +214,4 @@ public class JaxWsServiceConfigurationTest extends Assert {
public interface HelloBare {
String sayHi();
}
-}
+}
\ No newline at end of file
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 0b3755c..35abef4 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
@@ -63,6 +63,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
public class JaxWsServiceFactoryBeanTest extends AbstractJaxWsTest {
@@ -309,4 +310,4 @@ public class JaxWsServiceFactoryBeanTest extends AbstractJaxWsTest {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java
index c290929..2739ee6 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java
@@ -50,6 +50,10 @@ import org.apache.neethi.Constants;
import org.junit.Assert;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
*
@@ -347,4 +351,4 @@ public class PolicyAnnotationTest extends Assert {
return i;
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java
index bae3ced..5e4e983 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java
@@ -42,6 +42,9 @@ import org.junit.Test;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.isA;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
public class JAXWSHttpSpiDestinationTest extends Assert {
@@ -122,4 +125,4 @@ public class JAXWSHttpSpiDestinationTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java
index 0c8a070..6abefb7 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java
@@ -32,6 +32,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
public class JAXWSHttpSpiTransportFactoryTest extends Assert {
private IMocksControl control;
@@ -80,4 +83,4 @@ public class JAXWSHttpSpiTransportFactoryTest extends Assert {
control.verify();
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java
index bef70cc..96a6d3e 100644
--- a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java
+++ b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java
@@ -27,6 +27,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
public class AbstractDOMProviderTest extends Assert {
@@ -200,4 +203,4 @@ public class AbstractDOMProviderTest extends Assert {
}
EasyMock.verify(scriptMock);
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java
index fd539d4..3ebdda5 100644
--- a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java
+++ b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java
@@ -31,6 +31,10 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class ProviderFactoryTest extends Assert {
@@ -162,4 +166,4 @@ public class ProviderFactoryTest extends Assert {
}
EasyMock.verify(dpMock);
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java
index 51fd0fb..f77997f 100644
--- a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java
+++ b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java
@@ -29,6 +29,11 @@ import org.junit.Assert;
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 ServerAppTest extends Assert {
private String epAddr = "http://cxf.apache.org/";
@@ -234,4 +239,4 @@ public class ServerAppTest extends Assert {
EasyMock.verify(phMock);
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandlerTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandlerTest.java
index c1ebd37..e4861a1 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandlerTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandlerTest.java
@@ -22,6 +22,8 @@ package org.apache.cxf.frontend.blueprint;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+
/**
*
*/
@@ -33,4 +35,4 @@ public class SimpleBPNamespaceHandlerTest extends Assert {
assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/blueprint/simple"));
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java
index 84158cd..4a2fcdf 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java
@@ -39,6 +39,10 @@ import org.apache.cxf.transport.local.LocalTransportFactory;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class SoapBindingSelectionTest extends AbstractSimpleFrontendTest {
boolean service1Invoked;
@@ -114,4 +118,4 @@ public class SoapBindingSelectionTest extends AbstractSimpleFrontendTest {
return nd.getNamespaceURI();
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/ClientServerTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/ClientServerTest.java
index 87d6fc7..56c95f9 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/ClientServerTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/ClientServerTest.java
@@ -32,6 +32,10 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
@@ -86,4 +90,4 @@ public class ClientServerTest extends AbstractSimpleFrontendSpringTest {
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java
index adc8ff0..81d60d4 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java
@@ -43,6 +43,11 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
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 SpringBeansTest extends AbstractSimpleFrontendSpringTest {
@@ -156,4 +161,4 @@ public class SpringBeansTest extends AbstractSimpleFrontendSpringTest {
assertEquals("Get the wrong username", ap.getUserName(), "testUser");
assertEquals("Get the wrong password", ap.getPassword(), "password");
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java
index bf4f930..6e40532 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java
@@ -38,6 +38,10 @@ import org.apache.hello_world_soap_http.types.GreetMeOneWay;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public class ClientFactoryBeanTest extends AbstractSimpleFrontendTest {
@Test
@@ -97,4 +101,4 @@ public class ClientFactoryBeanTest extends AbstractSimpleFrontendTest {
assertEquals(extraClass[0], GreetMe.class);
assertEquals(extraClass[1], GreetMeOneWay.class);
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java
index 290feba..9e5b141 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java
@@ -47,6 +47,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.assertTrue;
+import static org.junit.Assert.fail;
+
public class ReflectionServiceFactoryTest extends AbstractSimpleFrontendTest {
private ReflectionServiceFactoryBean serviceFactory;
@@ -223,4 +228,4 @@ public class ReflectionServiceFactoryTest extends AbstractSimpleFrontendTest {
assertNotNull(element);
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/RountripTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/RountripTest.java
index 1e902f9..1b69b5a 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/RountripTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/RountripTest.java
@@ -28,6 +28,8 @@ import org.apache.hello_world_doc_lit.GreeterImplDoc;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class RountripTest extends AbstractSimpleFrontendTest {
@Test
@@ -70,4 +72,4 @@ public class RountripTest extends AbstractSimpleFrontendTest {
svrBean.create();
}
-}
+}
\ No newline at end of file
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java
index b91109c..92c92a0 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java
@@ -41,6 +41,9 @@ import org.apache.hello_world_soap_http.types.GreetMeOneWay;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class ServerFactoryTest extends AbstractSimpleFrontendTest {
@Test
@@ -137,4 +140,4 @@ public class ServerFactoryTest extends AbstractSimpleFrontendTest {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/AegisTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/AegisTest.java
index 0ab9bf2..5032492 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/AegisTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/AegisTest.java
@@ -36,6 +36,11 @@ import org.springframework.context.support.GenericApplicationContext;
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;
+import static org.junit.Assert.assertTrue;
+
/*
* We end up here with a part with isElement == true, a non-array element,
@@ -149,4 +154,4 @@ public class AegisTest extends JavascriptRhinoTest {
});
}
-}
+}
\ No newline at end of file
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/AnyTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/AnyTest.java
index 741fbf4..7c6fa1b 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/AnyTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/AnyTest.java
@@ -35,6 +35,11 @@ import uri.cxf_apache_org.jstest.types.any.alts.Alternative1;
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;
+import static org.junit.Assert.assertTrue;
+
/*
* We end up here with a part with isElement == true, a non-array element,
* but a complex type for an array of the element.
@@ -180,4 +185,4 @@ public class AnyTest extends JavascriptRhinoTest {
-}
+}
\ No newline at end of file
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/BasicNameManagerTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/BasicNameManagerTest.java
index b16f974..35f8808 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/BasicNameManagerTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/BasicNameManagerTest.java
@@ -22,6 +22,8 @@ package org.apache.cxf.javascript;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
/**
* Simple tests of the name manager.
*/
@@ -36,4 +38,4 @@ public class BasicNameManagerTest extends Assert {
assertEquals("george_bill_fred", jsp);
}
-}
+}
\ No newline at end of file
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/DocLitBareClientTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/DocLitBareClientTest.java
index 96e740f..af5c52c 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/DocLitBareClientTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/DocLitBareClientTest.java
@@ -36,6 +36,10 @@ import org.springframework.context.support.GenericApplicationContext;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
/*
* We end up here with a part with isElement == true, a non-array element,
* but a complex type for an array of the element.
@@ -307,4 +311,4 @@ public class DocLitBareClientTest extends JavascriptRhinoTest {
testUtilities.rhinoCallMethod(rv, "setStringItem", beanTwoItem.stringItem);
return rv;
}
-}
+}
\ No newline at end of file
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java
index 0e3e754..437f282 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java
@@ -37,6 +37,12 @@ import org.springframework.context.support.GenericApplicationContext;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertArrayEquals;
+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 DocLitWrappedClientTest extends JavascriptRhinoTest {
private static final Logger LOG = LogUtils.getL7dLogger(DocLitWrappedClientTest.class);
@@ -354,4 +360,4 @@ public class DocLitWrappedClientTest extends JavascriptRhinoTest {
return rv;
}
-}
+}
\ No newline at end of file
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java
index 0587496..25e06b9 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java
@@ -33,6 +33,10 @@ import org.springframework.context.support.GenericApplicationContext;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Test the same schema used in the samples.
*/
@@ -126,4 +130,4 @@ public class GreeterClientTest extends JavascriptRhinoTest {
@Override
protected void additionalSpringConfiguration(GenericApplicationContext context) throws Exception {
}
-}
+}
\ No newline at end of file
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JavascriptRhinoTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JavascriptRhinoTest.java
index 1cb0b80..c60c19c 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JavascriptRhinoTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JavascriptRhinoTest.java
@@ -29,6 +29,8 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.test.AbstractCXFSpringTest;
+import static org.junit.Assert.assertEquals;
+
public abstract class JavascriptRhinoTest extends AbstractCXFSpringTest {
protected JavascriptTestUtilities testUtilities;
protected JaxWsProxyFactoryBean clientProxyFactory;
@@ -68,4 +70,4 @@ public abstract class JavascriptRhinoTest extends AbstractCXFSpringTest {
return endpoint.getEndpointInfo().getAddress();
}
-}
+}
\ No newline at end of file
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java
index 703764f..f31e2c0 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java
@@ -42,6 +42,10 @@ import org.springframework.context.support.GenericApplicationContext;
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;
+
/**
* This test is ignored by default as it is continually failing on Jenkins.
*/
@@ -134,4 +138,4 @@ public class JsHttpRequestTest extends AbstractCXFSpringTest {
URL furl = staticFile.toURI().toURL();
return furl.toString();
}
-}
+}
\ No newline at end of file
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/MtoMTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/MtoMTest.java
index e7cc2a1..114d000 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/MtoMTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/MtoMTest.java
@@ -34,6 +34,11 @@ import org.springframework.context.support.GenericApplicationContext;
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;
+import static org.junit.Assert.assertTrue;
+
/*
* We end up here with a part with isElement == true, a non-array element,
* but a complex type for an array of the element.
@@ -125,4 +130,4 @@ public class MtoMTest extends JavascriptRhinoTest {
}
});
}
-}
+}
\ No newline at end of file
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java
index 874a4cb..2dd03d8 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java
@@ -38,6 +38,10 @@ import org.springframework.context.support.GenericApplicationContext;
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.assertNotSame;
+
/**
*
*/
@@ -125,4 +129,4 @@ public class QueryHandlerTest extends AbstractCXFSpringTest {
assertFalse(jsString.contains("function CxfApacheOrgUtil"));
}
-}
+}
\ No newline at end of file
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/RPCClientTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/RPCClientTest.java
index 7bc4fcd..f3036e7 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/RPCClientTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/RPCClientTest.java
@@ -35,6 +35,10 @@ import org.springframework.context.support.GenericApplicationContext;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
/*
* We end up here with a part with isElement == true, a non-array element,
* but a complex type for an array of the element.
@@ -141,4 +145,4 @@ public class RPCClientTest extends JavascriptRhinoTest {
testUtilities.rhinoCallMethod(rv, "setStringItem", beanTwoItem.stringItem);
return rv;
}
-}
+}
\ No newline at end of file
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/types/AttributeTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/types/AttributeTest.java
index a2ace7e..5924c70 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/types/AttributeTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/types/AttributeTest.java
@@ -46,6 +46,9 @@ import org.springframework.context.support.GenericApplicationContext;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
public class AttributeTest extends AbstractCXFSpringTest {
private JavascriptTestUtilities testUtilities;
private XMLOutputFactory xmlOutputFactory;
@@ -121,4 +124,4 @@ public class AttributeTest extends AbstractCXFSpringTest {
@Override
protected void additionalSpringConfiguration(GenericApplicationContext context) throws Exception {
}
-}
+}
\ No newline at end of file
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/types/SerializationTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/types/SerializationTest.java
index 0ba8092..aeb0581 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/types/SerializationTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/types/SerializationTest.java
@@ -53,6 +53,11 @@ import org.springframework.context.support.GenericApplicationContext;
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 SerializationTest extends AbstractCXFSpringTest {
private JavascriptTestUtilities testUtilities;
private XMLInputFactory xmlInputFactory;
@@ -211,4 +216,4 @@ public class SerializationTest extends AbstractCXFSpringTest {
@Override
protected void additionalSpringConfiguration(GenericApplicationContext context) throws Exception {
}
-}
+}
\ No newline at end of file
diff --git a/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java b/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
index e454f79..15f8042 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
@@ -36,6 +36,12 @@ import org.junit.Assert;
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.assertNull;
+import static org.junit.Assert.assertTrue;
+
public class InstrumentationManagerTest extends Assert {
InstrumentationManager im;
@@ -181,4 +187,4 @@ public class InstrumentationManagerTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java b/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java
index 9c9953f..428fc06 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java
@@ -33,6 +33,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class CounterRepositoryTest extends Assert {
private Bus bus;
private CounterRepository cr;
@@ -172,4 +175,4 @@ public class CounterRepositoryTest extends Assert {
assertEquals(1, outlist.size());
}
-}
+}
\ No newline at end of file
diff --git a/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptorTest.java b/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptorTest.java
index dae1e0b..0a2b795 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptorTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptorTest.java
@@ -27,6 +27,8 @@ import org.apache.cxf.message.MessageImpl;
import org.easymock.EasyMock;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
public class ResponseTimeMessageInInterceptorTest extends AbstractMessageResponseTestBase {
private ResponseTimeMessageInInterceptor rtmii = new ResponseTimeMessageInInterceptor();
@@ -175,4 +177,4 @@ public class ResponseTimeMessageInInterceptorTest extends AbstractMessageRespons
assertTrue("the message should be client", rtmii.isClient(message3));
}
-}
+}
\ No newline at end of file
diff --git a/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java b/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java
index c1e2cfe..ffbcff8 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java
@@ -35,6 +35,10 @@ import org.junit.Assert;
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;
+
/**
*
@@ -139,4 +143,4 @@ public class BusRegistrationTest extends Assert {
buffer.append(ManagementConstants.INSTANCE_ID_PROP + "=" + bus.hashCode());
return new ObjectName(buffer.toString());
}
-}
+}
\ No newline at end of file
diff --git a/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java b/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java
index d48637a..45ce61c 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java
@@ -35,6 +35,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
public class JMXManagedComponentManagerTest extends Assert {
private static final String PORT = TestUtil.getPortNumber(JMXManagedComponentManagerTest.class);
private static final String NAME_ATTRIBUTE = "Name";
@@ -181,4 +184,4 @@ public class JMXManagedComponentManagerTest extends Assert {
this.manager.register(hw, oName);
return oName;
}
-}
+}
\ No newline at end of file
diff --git a/rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorTest.java b/rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorTest.java
index 861a3b0..cb98d63 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorTest.java
@@ -29,6 +29,8 @@ import org.apache.cxf.testutil.common.TestUtil;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+
public class MBServerConnectorTest extends Assert {
@@ -54,4 +56,4 @@ public class MBServerConnectorTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/management/src/test/java/org/apache/cxf/management/jmx/export/ModelMBeanAssemblerTest.java b/rt/management/src/test/java/org/apache/cxf/management/jmx/export/ModelMBeanAssemblerTest.java
index e9aa88e..125023c 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/jmx/export/ModelMBeanAssemblerTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/jmx/export/ModelMBeanAssemblerTest.java
@@ -40,6 +40,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
public class ModelMBeanAssemblerTest extends Assert {
@@ -216,4 +219,4 @@ public class ModelMBeanAssemblerTest extends Assert {
-}
+}
\ No newline at end of file
diff --git a/rt/management/src/test/java/org/apache/cxf/management/utils/ManagementConsoleTest.java b/rt/management/src/test/java/org/apache/cxf/management/utils/ManagementConsoleTest.java
index adeee1a..8e49bd0 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/utils/ManagementConsoleTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/utils/ManagementConsoleTest.java
@@ -22,6 +22,9 @@ package org.apache.cxf.management.utils;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
public class ManagementConsoleTest extends Assert {
private ManagementConsole mc = new ManagementConsole();
@@ -54,4 +57,4 @@ public class ManagementConsoleTest extends Assert {
-}
+}
\ No newline at end of file
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
index 3578ec9..3b2006f 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
@@ -48,6 +48,11 @@ import org.apache.cxf.transport.http.HTTPConduit;
import org.junit.Assert;
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;
+
public class JAXRSClientFactoryBeanTest extends Assert {
@Test
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/WebClientTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/WebClientTest.java
index 0eaceb4..50dbff9 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/WebClientTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/WebClientTest.java
@@ -33,6 +33,11 @@ import org.apache.cxf.jaxrs.resources.BookStore;
import org.junit.Assert;
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 WebClientTest extends Assert {
@@ -345,4 +350,4 @@ public class WebClientTest extends Assert {
private static class ComplexObject {
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandlerTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandlerTest.java
index e30be3c..5a593e0 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandlerTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandlerTest.java
@@ -22,6 +22,8 @@ package org.apache.cxf.jaxrs.client.blueprint;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+
/**
*
*/
@@ -33,4 +35,4 @@ public class JAXRSBPNamespaceHandlerTest extends Assert {
assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/blueprint/jaxrs-client"));
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientCacheTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientCacheTest.java
index 5dfd735..7f0296d 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientCacheTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientCacheTest.java
@@ -46,6 +46,9 @@ import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
public class ClientCacheTest extends Assert {
public static final String ADDRESS = "local://transport";
private static Server server;
@@ -248,4 +251,4 @@ public class ClientCacheTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientTest.java
index 3959ce9..64e553e 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientTest.java
@@ -28,6 +28,9 @@ import javax.ws.rs.client.WebTarget;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class ClientTest extends Assert {
public static final String ADDRESS = "local://transport";
@@ -43,4 +46,4 @@ public class ClientTest extends Assert {
assertTrue(e.getMessage().contains("client is closed"));
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientImplTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientImplTest.java
index 1f502e4..5488be0 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientImplTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientImplTest.java
@@ -50,6 +50,10 @@ import org.apache.cxf.message.Message;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class ClientImplTest extends Assert {
private static final String MY_INTERCEPTOR_NAME = "MyInterceptor";
@@ -237,4 +241,4 @@ public class ClientImplTest extends Assert {
.join();
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientRequestFilterTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientRequestFilterTest.java
index 1886614..1433535 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientRequestFilterTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientRequestFilterTest.java
@@ -29,6 +29,8 @@ import javax.ws.rs.core.Response;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class ClientRequestFilterTest extends Assert {
public static class NonStringObject {
@@ -77,4 +79,4 @@ public class ClientRequestFilterTest extends Assert {
assertEquals(200, response.getStatus());
assertEquals("hello rabbit", response.readEntity(String.class));
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/InvocationBuilderImplTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/InvocationBuilderImplTest.java
index a28ab2c..ea3fad9 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/InvocationBuilderImplTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/InvocationBuilderImplTest.java
@@ -32,6 +32,10 @@ import javax.ws.rs.core.Response;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class InvocationBuilderImplTest extends Assert {
public static class TestFilter implements ClientRequestFilter {
@@ -71,4 +75,4 @@ public class InvocationBuilderImplTest extends Assert {
response = builder.get();
assertEquals("", response.readEntity(String.class));
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java
index c32f135..1e51126 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java
@@ -28,6 +28,9 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
public class JAXRSClientFactoryBeanTest extends Assert {
@@ -68,4 +71,4 @@ public class JAXRSClientFactoryBeanTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/Swagger2FeatureTest.java b/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/Swagger2FeatureTest.java
index c87b041..9c073ca 100644
--- a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/Swagger2FeatureTest.java
+++ b/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/Swagger2FeatureTest.java
@@ -22,6 +22,9 @@ package org.apache.cxf.jaxrs.swagger;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
/**
*
*/
@@ -50,4 +53,4 @@ public class Swagger2FeatureTest extends Assert {
f.setBasePath(null);
f.setHost(null);
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtilsTest.java b/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtilsTest.java
index 73b352e..9f6d171 100644
--- a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtilsTest.java
+++ b/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtilsTest.java
@@ -27,6 +27,12 @@ import org.apache.cxf.jaxrs.json.basic.JsonMapObjectReaderWriter;
import org.junit.Assert;
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;
+
public class SwaggerToOpenApiConversionUtilsTest extends Assert {
@Test
@@ -772,4 +778,4 @@ public class SwaggerToOpenApiConversionUtilsTest extends Assert {
assertNull(method.getProperty("consumes"));
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtilsTest.java b/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtilsTest.java
index 16eff2e..c543f57 100644
--- a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtilsTest.java
+++ b/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtilsTest.java
@@ -30,6 +30,10 @@ import org.apache.cxf.jaxrs.model.UserResource;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
public class SwaggerParseUtilsTest extends Assert {
@Test
@@ -487,4 +491,4 @@ public class SwaggerParseUtilsTest extends Assert {
assertEquals(String.class, param2.getJavaType());
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java
index ec17018..26f4512 100644
--- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java
+++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java
@@ -34,6 +34,10 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
public class ServerProviderFactoryTest extends Assert {
@@ -98,4 +102,4 @@ public class ServerProviderFactoryTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java
index 0eb86de..7288681 100644
--- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java
+++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java
@@ -54,6 +54,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class WadlGeneratorJsonTest extends Assert {
private IMocksControl control;
@@ -134,4 +137,4 @@ public class WadlGeneratorJsonTest extends Assert {
control.replay();
return m;
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
index 4fe4454..5c1a637 100644
--- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
+++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
@@ -65,6 +65,12 @@ import org.junit.Assert;
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.assertNull;
+import static org.junit.Assert.assertTrue;
+
public class WadlGeneratorTest extends Assert {
private IMocksControl control;
@@ -1091,4 +1097,4 @@ public class WadlGeneratorTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java b/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java
index 1684f44..01f29b0 100644
--- a/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java
+++ b/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java
@@ -29,6 +29,9 @@ import org.apache.cxf.helpers.CastUtils;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
public class JsonMapObjectReaderWriterTest extends Assert {
@Test
@@ -138,4 +141,4 @@ public class JsonMapObjectReaderWriterTest extends Assert {
assertEquals(expectedKid, kid);
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryAllTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryAllTest.java
index 302a900..bd0e2bf 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryAllTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryAllTest.java
@@ -33,6 +33,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
public class ProviderFactoryAllTest extends Assert {
@Before
@@ -102,4 +105,4 @@ public class ProviderFactoryAllTest extends Assert {
"application/json");
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProviderTest.java
index fbaa9dd..ff1401c 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProviderTest.java
@@ -42,6 +42,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class AegisElementProviderTest extends Assert {
private Properties properties;
@@ -177,4 +180,4 @@ public class AegisElementProviderTest extends Assert {
Map<AegisTestBean, AegisSuperBean> mapFunction();
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java
index 516ece7..dcaf853 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java
@@ -35,6 +35,10 @@ import org.junit.Assert;
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.assertTrue;
+
public class AtomEntryProviderTest extends Assert {
private AtomEntryProvider afd;
@@ -97,4 +101,4 @@ public class AtomEntryProviderTest extends Assert {
&& "application/atom+xml;type=entry".equals(values[1]));
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java
index 834e835..b9aedda 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java
@@ -34,6 +34,10 @@ import org.junit.Assert;
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.assertTrue;
+
public class AtomFeedProviderTest extends Assert {
private AtomFeedProvider afd;
@@ -92,4 +96,4 @@ public class AtomFeedProviderTest extends Assert {
&& "application/atom+xml;type=feed".equals(values[1]));
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java
index 5ed1875..ab5e596 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java
@@ -40,6 +40,11 @@ import org.junit.Assert;
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;
+import static org.junit.Assert.assertTrue;
+
public class AtomPojoProviderTest extends Assert {
@@ -401,4 +406,4 @@ public class AtomPojoProviderTest extends Assert {
books = list;
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
index efbb2db..092d610 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
@@ -45,6 +45,10 @@ import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class DOM4JProviderTest extends Assert {
@@ -259,4 +263,4 @@ public class DOM4JProviderTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
index 361256e..57987c9 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
@@ -82,6 +82,12 @@ import org.apache.cxf.staxutils.transform.TransformUtils;
import org.junit.Assert;
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;
+import static org.junit.Assert.fail;
+
public class JSONProviderTest extends Assert {
@Test
@@ -2030,4 +2036,4 @@ public class JSONProviderTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java
index 2595671..9c237f0 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java
@@ -32,6 +32,8 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class JsonpInterceptorTest extends Assert {
public static final String JSON = "{}";
@@ -117,4 +119,4 @@ public class JsonpInterceptorTest extends Assert {
assertEquals("", bos.toString());
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java
index 80172af..1ced424 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java
@@ -25,6 +25,9 @@ import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class BeanspectorTest extends Assert {
@Test
@@ -75,4 +78,4 @@ public class BeanspectorTest extends Assert {
return this;
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplCustomParserTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplCustomParserTest.java
index a0e6f2a..152871a 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplCustomParserTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplCustomParserTest.java
@@ -24,6 +24,9 @@ import org.apache.cxf.message.MessageImpl;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class SearchContextImplCustomParserTest extends Assert {
@Test
@@ -66,4 +69,4 @@ public class SearchContextImplCustomParserTest extends Assert {
return color;
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplTest.java
index 9df486d..8d74d9c 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplTest.java
@@ -29,6 +29,12 @@ import org.apache.cxf.message.MessageImpl;
import org.junit.Assert;
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;
+
public class SearchContextImplTest extends Assert {
@Test
@@ -312,4 +318,4 @@ public class SearchContextImplTest extends Assert {
this.street = street;
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchUtilsTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchUtilsTest.java
index 903cd64..3680db3 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchUtilsTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchUtilsTest.java
@@ -21,6 +21,8 @@ package org.apache.cxf.jaxrs.ext.search;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class SearchUtilsTest extends Assert {
@Test
@@ -52,4 +54,4 @@ public class SearchUtilsTest extends Assert {
public void testSqlWildcardString5() {
assertEquals("%", SearchUtils.toSqlWildcardString("*", false));
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilderTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilderTest.java
index 1ceca1b..b1a32ab 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilderTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilderTest.java
@@ -37,6 +37,8 @@ import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class FiqlSearchConditionBuilderTest extends Assert {
private static FiqlSearchConditionBuilder b = new FiqlSearchConditionBuilder();
private static TimeZone tz;
@@ -346,4 +348,4 @@ public class FiqlSearchConditionBuilderTest extends Assert {
assertEquals("(foo==123.4,foo==137.8,n==n1);bar==baz", ret);
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlCollectionsTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlCollectionsTest.java
index ea1a4b7..6da65cd 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlCollectionsTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlCollectionsTest.java
@@ -26,6 +26,8 @@ import org.apache.cxf.jaxrs.ext.search.SearchParseException;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+
public class FiqlCollectionsTest extends Assert {
@Test
public void testWithCollectionAfterFirstLevelOnCollection() throws SearchParseException {
@@ -94,4 +96,4 @@ public class FiqlCollectionsTest extends Assert {
this.description = description;
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java
index b41a5dd..f55374a 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java
@@ -39,6 +39,10 @@ import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class FiqlParserTest extends Assert {
private FiqlParser<Condition> parser = new FiqlParser<>(Condition.class);
@@ -401,4 +405,4 @@ public class FiqlParserTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java
index b3ada35..2c3cc9c 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java
@@ -38,6 +38,8 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class HBaseVisitorTest extends Assert {
public static final byte[] BOOK_FAMILY = "book".getBytes();
public static final byte[] NAME_QUALIFIER = "name".getBytes();
@@ -84,4 +86,4 @@ public class HBaseVisitorTest extends Assert {
table.close();
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java
index c3d7a4e..ff26659 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java
@@ -44,6 +44,9 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public abstract class AbstractJPATypedQueryVisitorTest extends Assert {
private EntityManagerFactory emFactory;
@@ -299,4 +302,4 @@ public abstract class AbstractJPATypedQueryVisitorTest extends Assert {
this.title = title;
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPALanguageVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPALanguageVisitorTest.java
index b9f69fc..45cf08e 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPALanguageVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPALanguageVisitorTest.java
@@ -24,6 +24,8 @@ import org.apache.cxf.jaxrs.ext.search.fiql.FiqlParser;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class JPALanguageVisitorTest extends Assert {
@Test
@@ -35,4 +37,4 @@ public class JPALanguageVisitorTest extends Assert {
assertEquals("SELECT t FROM Book t WHERE t.id < '10'", jpa.getQuery());
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorFiqlTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorFiqlTest.java
index 41a920f..fe2922d 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorFiqlTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorFiqlTest.java
@@ -31,6 +31,9 @@ import org.apache.cxf.jaxrs.ext.search.fiql.FiqlParser;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class JPATypedQueryVisitorFiqlTest extends AbstractJPATypedQueryVisitorTest {
@Test
@@ -363,4 +366,4 @@ public class JPATypedQueryVisitorFiqlTest extends AbstractJPATypedQueryVisitorTe
public SearchConditionParser<Book> getParser() {
return new FiqlParser<Book>(Book.class);
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java
index 5debd6f..81b1d41 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java
@@ -31,6 +31,9 @@ import org.apache.cxf.jaxrs.ext.search.odata.ODataParser;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class JPATypedQueryVisitorODataTest extends AbstractJPATypedQueryVisitorTest {
@Test
public void testOrQuery() throws Exception {
@@ -326,4 +329,4 @@ public class JPATypedQueryVisitorODataTest extends AbstractJPATypedQueryVisitorT
protected SearchConditionParser<Book> getParser() {
return new ODataParser<Book>(Book.class);
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/ldap/LdapQueryVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/ldap/LdapQueryVisitorTest.java
index c6a8f3a..7b51447 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/ldap/LdapQueryVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/ldap/LdapQueryVisitorTest.java
@@ -28,6 +28,8 @@ import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class LdapQueryVisitorTest extends Assert {
private FiqlParser<Condition> parser = new FiqlParser<>(Condition.class);
@@ -130,4 +132,4 @@ public class LdapQueryVisitorTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParserTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParserTest.java
index c54e4c8..ecdab26 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParserTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParserTest.java
@@ -27,6 +27,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class ODataParserTest extends Assert {
private ODataParser<Person> parser;
@@ -194,4 +197,4 @@ public class ODataParserTest extends Assert {
assertTrue(filter.isMet(new Person("Tom", "Bombadil").withSsn(553232222L)));
assertFalse(filter.isMet(new Person("Tom", "Bombadil").withHourlyRate(748232221L)));
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLHierarchicalQueryTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLHierarchicalQueryTest.java
index 30f0ec0..c417aff 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLHierarchicalQueryTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLHierarchicalQueryTest.java
@@ -25,6 +25,8 @@ import org.apache.cxf.jaxrs.ext.search.fiql.FiqlParser;
import org.junit.Assert;
import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
//userName eq "admin@amarkevich.talend.com" and entitlements sw "TDP_"
public class SQLHierarchicalQueryTest extends Assert {
@@ -71,4 +73,4 @@ public class SQLHierarchicalQueryTest extends Assert {
SQLPrinterVisitor<SearchBean> visitor = new SQLPrinterVisitor<>("printers");
filter.accept(visitor.visitor());
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java
index 18e0d9f..b980c50 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java
@@ -31,6 +31,8 @@ import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
public class SQLPrinterVisitorTest extends Assert {
private FiqlParser<Condition> parser = new FiqlParser<>(Condition.class);
@@ -206,4 +208,4 @@ public class SQLPrinterVisitorTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractorTest.java
index 42a7f8d..38c58a2 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractorTest.java
@@ -30,6 +30,11 @@ import org.junit.Assert;
import org.junit.Before;
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;
+
public class TikaContentExtractorTest extends Assert {
private TikaContentExtractor extractor;
private SearchConditionParser< SearchBean > parser;
@@ -80,4 +85,4 @@ public class TikaContentExtractorTest extends Assert {
public void testExtractionFromNullInputStreamFails() {
assertNull("Document should be null, it is encrypted", extractor.extract((InputStream)null));
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaLuceneContentExtractorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaLuceneContentExtractorTest.java
index 64b4ab2..95b73cc 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaLuceneContentExtractorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaLuceneContentExtractorTest.java
@@ -46,6 +46,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
public class TikaLuceneContentExtractorTest extends Assert {
private TikaLuceneContentExtractor extractor;
private Directory directory;
@@ -242,4 +245,4 @@ public class TikaLuceneContentExtractorTest extends Assert {
writer.close();
directory.close();
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/CxfTypeSafeClientBuilderTest.java b/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/CxfTypeSafeClientBuilderTest.java
index 54be86e..0edb79a 100644
--- a/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/CxfTypeSafeClientBuilderTest.java
+++ b/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/CxfTypeSafeClientBuilderTest.java
@@ -50,6 +50,10 @@ import org.eclipse.microprofile.rest.client.tck.providers.TestWriterInterceptor;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class CxfTypeSafeClientBuilderTest extends Assert {
@Test
@@ -187,4 +191,4 @@ public class CxfTypeSafeClientBuilderTest extends Assert {
fail(failureMessage);
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/ValidatorTest.java b/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/ValidatorTest.java
index 96cfc90..f4a3102 100644
--- a/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/ValidatorTest.java
+++ b/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/ValidatorTest.java
@@ -35,6 +35,10 @@ import org.eclipse.microprofile.rest.client.RestClientDefinitionException;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class ValidatorTest extends Assert {
public abstract static class NotAnInterface {
@@ -142,4 +146,4 @@ public class ValidatorTest extends Assert {
}
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/cdi/RestClientCdiTest.java b/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/cdi/RestClientCdiTest.java
index e59e67f..ea0e984 100644
--- a/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/cdi/RestClientCdiTest.java
+++ b/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/cdi/RestClientCdiTest.java
@@ -40,6 +40,9 @@ import org.easymock.IMocksControl;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class RestClientCdiTest extends Assert {
@Test
@@ -76,4 +79,4 @@ public class RestClientCdiTest extends Assert {
assertEquals(10, (int) priorities.get(HighPriorityClientReqFilter.class));
assertEquals(Priorities.USER, (int) priorities.get(InvokedMethodClientRequestFilter.class));
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwkJoseCookBookTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwkJoseCookBookTest.java
index b9cb8bf..c7cc3bc 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwkJoseCookBookTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwkJoseCookBookTest.java
@@ -33,6 +33,8 @@ import org.apache.cxf.rs.security.jose.jwk.PublicKeyUse;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class JwkJoseCookBookTest extends Assert {
private static final String EC_X_COORDINATE_VALUE = "AHKZLLOsCOzz5cY97ewNUajB957y-C-U88c3v13nmGZx6sYl_oJXu9"
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java
index 8c47e6d..7a3ca07 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java
@@ -43,6 +43,9 @@ import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
public class JweCompactReaderWriterTest extends Assert {
// A1 example
static final byte[] CONTENT_ENCRYPTION_KEY_A1 = {
@@ -319,4 +322,3 @@ public class JweCompactReaderWriterTest extends Assert {
return key;
}
}
-
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
index e877ce4..2b4a005 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
@@ -39,6 +39,9 @@ import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
public class JweJsonConsumerTest extends Assert {
static final String SINGLE_RECIPIENT_ALL_HEADERS_AAD_MODIFIED_OUTPUT =
@@ -237,4 +240,3 @@ public class JweJsonConsumerTest extends Assert {
}
}
-
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java
index a5850a6..e2e251a 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java
@@ -38,6 +38,8 @@ import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class JweJsonProducerTest extends Assert {
static final byte[] WRAPPER_BYTES1 = {91, 96, 105, 38, 99, 108, 110, 8, -93, 50, -15, 62, 0, -115, 73, -39};
static final byte[] WRAPPER_BYTES2 = {-39, 96, 105, 38, 99, 108, 110, 8, -93, 50, -15, 62, 0, -115, 73, 91};
@@ -308,4 +310,3 @@ public class JweJsonProducerTest extends Assert {
assertEquals(MULTIPLE_RECIPIENTS_OUTPUT, jweJson);
}
}
-
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JwePbeHmacAesWrapTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JwePbeHmacAesWrapTest.java
index 44fcfd3..26b0901 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JwePbeHmacAesWrapTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JwePbeHmacAesWrapTest.java
@@ -30,6 +30,8 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class JwePbeHmacAesWrapTest extends Assert {
@Before
public void registerBouncyCastleIfNeeded() throws Exception {
@@ -75,4 +77,3 @@ public class JwePbeHmacAesWrapTest extends Assert {
}
}
-
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeyTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeyTest.java
index 10e8e20..2f96c65 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeyTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeyTest.java
@@ -34,6 +34,9 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
public class JsonWebKeyTest extends Assert {
private static final String RSA_MODULUS_VALUE = "0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx4cbbfAAt"
+ "VT86zwu1RK7aPFFxuhDR1L6tSoc_BJECPebWKRXjBZCiFV4n3oknjhMstn64tZ_2W-5JsGY4Hc5n9yBXArwl93lqt7_RN5w6Cf"
@@ -228,4 +231,4 @@ public class JsonWebKeyTest extends Assert {
public JsonWebKey readKey(String key) throws Exception {
return JwkUtils.readJwkKey(key);
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JwkUtilsTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JwkUtilsTest.java
index a29d0b0..73dcf98 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JwkUtilsTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JwkUtilsTest.java
@@ -31,6 +31,11 @@ import org.apache.cxf.rt.security.crypto.CryptoUtils;
import org.junit.Assert;
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.fail;
+
public class JwkUtilsTest extends Assert {
private static final String RSA_KEY = "{"
+ "\"kty\": \"RSA\","
@@ -186,4 +191,4 @@ public class JwkUtilsTest extends Assert {
assertEquals("rz4Ohmpxg-UOWIWqWKHlOe0bHSjNUFlHW5vwG_M7qYg", thumbprint);
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactHeaderTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactHeaderTest.java
index b2e4055..16997f0 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactHeaderTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactHeaderTest.java
@@ -26,6 +26,9 @@ import org.apache.cxf.rs.security.jose.jwa.SignatureAlgorithm;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class JwsCompactHeaderTest extends Assert {
/**
@@ -200,4 +203,3 @@ public class JwsCompactHeaderTest extends Assert {
assertFalse(consumer.validateCriticalHeaders());
}
}
-
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactReaderWriterTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactReaderWriterTest.java
index 6d24873..8ccdc77 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactReaderWriterTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactReaderWriterTest.java
@@ -44,6 +44,9 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class JwsCompactReaderWriterTest extends Assert {
public static final String TOKEN_WITH_DETACHED_UNENCODED_PAYLOAD =
@@ -316,4 +319,4 @@ public class JwsCompactReaderWriterTest extends Assert {
jsonWriter.setFormat(true);
return jsonWriter;
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonConsumerTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonConsumerTest.java
index c77ce8b..1b0121a 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonConsumerTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonConsumerTest.java
@@ -31,6 +31,10 @@ import org.apache.cxf.rs.security.jose.jwk.JwkUtils;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public class JwsJsonConsumerTest extends Assert {
private static final String DUAL_SIGNED_DOCUMENT =
"{\"payload\":\n"
@@ -112,4 +116,4 @@ public class JwsJsonConsumerTest extends Assert {
InputStream is = JwsJsonConsumerTest.class.getResourceAsStream(fileName);
return JwkUtils.readJwkSet(is);
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonProducerTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonProducerTest.java
index c6911ab..8a805ae 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonProducerTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonProducerTest.java
@@ -22,6 +22,8 @@ import org.apache.cxf.rs.security.jose.jwa.SignatureAlgorithm;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class JwsJsonProducerTest extends Assert {
public static final String ENCODED_MAC_KEY_1 = "AyM1SysPpbyDfgZld3umj1qzKObwVMkoqQ-EstJQLr_T-1qS0gZH75"
@@ -123,4 +125,4 @@ public class JwsJsonProducerTest extends Assert {
producer.getJwsJsonSignedDocument());
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsUtilsTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsUtilsTest.java
index 9ff387f..2d5d97a 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsUtilsTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsUtilsTest.java
@@ -37,6 +37,13 @@ import org.apache.cxf.rs.security.jose.jwk.KeyType;
import org.junit.Assert;
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 JwsUtilsTest extends Assert {
@Test
@@ -130,4 +137,4 @@ public class JwsUtilsTest extends Assert {
e.setInMessage(m);
return m;
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwt/JwtUtilsTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwt/JwtUtilsTest.java
index 455b5b6..2f5db9c 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwt/JwtUtilsTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwt/JwtUtilsTest.java
@@ -26,6 +26,8 @@ import org.apache.cxf.message.MessageImpl;
import org.junit.Assert;
+import static org.junit.Assert.fail;
+
/**
* Some tests for JwtUtils
*/
@@ -174,4 +176,3 @@ public class JwtUtilsTest extends Assert {
}
}
-
diff --git a/rt/rs/security/oauth-parent/oauth/src/test/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtilsTest.java b/rt/rs/security/oauth-parent/oauth/src/test/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtilsTest.java
index 462f192..9705c5d 100644
--- a/rt/rs/security/oauth-parent/oauth/src/test/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtilsTest.java
+++ b/rt/rs/security/oauth-parent/oauth/src/test/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtilsTest.java
@@ -21,6 +21,9 @@ package org.apache.cxf.rs.security.oauth.utils;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class OAuthUtilsTest extends Assert {
@Test
@@ -33,4 +36,4 @@ public class OAuthUtilsTest extends Assert {
assertTrue(OAuthUtils.checkRequestURI("/a/b/c", "/a*"));
assertTrue(OAuthUtils.checkRequestURI("/a/1/c", "/a/{id}/c"));
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/common/UserSubjectTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/common/UserSubjectTest.java
index 52d77c0..d66c16b2 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/common/UserSubjectTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/common/UserSubjectTest.java
@@ -23,6 +23,9 @@ import java.util.Collections;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
public class UserSubjectTest extends Assert {
@Test
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/TokenGrantHandlerTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/TokenGrantHandlerTest.java
index ac2f85d..1986e57 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/TokenGrantHandlerTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/TokenGrantHandlerTest.java
@@ -34,6 +34,10 @@ import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class TokenGrantHandlerTest extends Assert {
@@ -111,4 +115,4 @@ public class TokenGrantHandlerTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java
index f2d5558..99c2690 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java
@@ -30,6 +30,9 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
public class JCacheCodeDataProviderTest extends Assert {
private JCacheCodeDataProvider provider;
@@ -103,4 +106,4 @@ public class JCacheCodeDataProviderTest extends Assert {
provider.close();
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTOAuthDataProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTOAuthDataProviderTest.java
index c29d227..7b752c0 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTOAuthDataProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTOAuthDataProviderTest.java
@@ -40,6 +40,9 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
/**
@@ -121,4 +124,3 @@ public class JPACMTOAuthDataProviderTest extends JPAOAuthDataProviderTest {
assertEquals(4, atl.size());
}
}
-
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
index 8b59119..4d7aea2 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
@@ -34,6 +34,10 @@ import org.junit.Assert;
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.fail;
+
public class JPACodeDataProviderTest extends Assert {
private EntityManagerFactory emFactory;
private Connection connection;
@@ -158,4 +162,4 @@ public class JPACodeDataProviderTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/JwtUserSubjectTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/JwtUserSubjectTest.java
index 29bfd25..a7fef49 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/JwtUserSubjectTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/JwtUserSubjectTest.java
@@ -21,6 +21,8 @@ package org.apache.cxf.rs.security.oauth2.grants.jwt;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+
public class JwtUserSubjectTest extends Assert {
@Test
@@ -29,4 +31,4 @@ public class JwtUserSubjectTest extends Assert {
assertNotNull(new JwtUserSubject("user", null));
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProviderTest.java
index 7c4ef05..71ac33a 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProviderTest.java
@@ -44,6 +44,12 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
abstract class AbstractOAuthDataProviderTest extends Assert {
private static KeyPair keyPair;
private AbstractOAuthDataProvider provider;
@@ -366,4 +372,4 @@ abstract class AbstractOAuthDataProviderTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
index 2087987..5b8826e 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
@@ -24,6 +24,8 @@ import javax.persistence.Persistence;
import org.junit.After;
import org.junit.Before;
+import static org.junit.Assert.fail;
+
public class JPAOAuthDataProviderTest extends AbstractOAuthDataProviderTest {
protected EntityManagerFactory emFactory;
@@ -63,4 +65,4 @@ public class JPAOAuthDataProviderTest extends AbstractOAuthDataProviderTest {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProviderTest.java
index c14cbc1..806a970 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProviderTest.java
@@ -35,6 +35,10 @@ import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class OAuthJSONProviderTest extends Assert {
@Test
@@ -216,4 +220,4 @@ public class OAuthJSONProviderTest extends Assert {
macToken.getParameters().get(OAuthConstants.HAWK_TOKEN_ALGORITHM));
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorTest.java
index 1b35e87..af52fc7 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorTest.java
@@ -35,6 +35,8 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+
public class HawkAccessTokenValidatorTest extends Assert {
private HawkAccessTokenValidator validator = new HawkAccessTokenValidator();
@@ -91,4 +93,4 @@ public class HawkAccessTokenValidatorTest extends Assert {
return ui;
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImplTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImplTest.java
index 10be48e..04d9966 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImplTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImplTest.java
@@ -25,6 +25,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
public class NonceVerifierImplTest extends Assert {
private NonceVerifierImpl nonceVerifier;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/AuthorizationUtilsTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/AuthorizationUtilsTest.java
index e746693..10d1a90 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/AuthorizationUtilsTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/AuthorizationUtilsTest.java
@@ -29,6 +29,11 @@ import javax.ws.rs.core.Response;
import org.junit.Assert;
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.fail;
+
public class AuthorizationUtilsTest extends Assert {
@Test
@@ -90,4 +95,4 @@ public class AuthorizationUtilsTest extends Assert {
assertEquals("Basic", value.toString());
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtilsTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtilsTest.java
index a61cdc7..e584b27 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtilsTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtilsTest.java
@@ -23,6 +23,9 @@ import java.util.List;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class OAuthUtilsTest extends Assert {
@Test
@@ -51,4 +54,4 @@ public class OAuthUtilsTest extends Assert {
List<String> registeredScopes = OAuthUtils.parseScope("a b");
assertFalse(OAuthUtils.validateScopes(requestScopes, registeredScopes, true));
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/crypto/CryptoUtilsTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/crypto/CryptoUtilsTest.java
index 38499f7..71bd5a0 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/crypto/CryptoUtilsTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/crypto/CryptoUtilsTest.java
@@ -50,6 +50,10 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
public class CryptoUtilsTest extends Assert {
private CodeGrantEncryptingDataProvider p;
@@ -275,4 +279,4 @@ public class CryptoUtilsTest extends Assert {
// ks.load(is, new char[]{'p', 'a', 's', 's', 'w', 'o', 'r', 'd'});
// return ks;
// }
-}
+}
\ No newline at end of file
diff --git a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
index 1525cce..240133f 100644
--- a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
+++ b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
@@ -34,6 +34,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
public class JPAOidcUserSubjectTest extends Assert {
private EntityManagerFactory emFactory;
private JPAOAuthDataProvider provider;
@@ -127,4 +130,4 @@ public class JPAOidcUserSubjectTest extends Assert {
}
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/utils/OidcUtilsTest.java b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/utils/OidcUtilsTest.java
index 7fe746b..79341d8 100644
--- a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/utils/OidcUtilsTest.java
+++ b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/utils/OidcUtilsTest.java
@@ -25,6 +25,9 @@ import org.apache.cxf.rs.security.oidc.common.AbstractUserInfo;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
public class OidcUtilsTest extends Assert {
@Test
@@ -49,4 +52,4 @@ public class OidcUtilsTest extends Assert {
assertEquals(15, claims.size());
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java
index d3d3bfe..3a5be80 100644
--- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java
+++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java
@@ -27,6 +27,9 @@ import net.sf.ehcache.config.ConfigurationFactory;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
/**
*
*/
@@ -54,4 +57,4 @@ public class EHCacheUtilTest extends Assert {
assertEquals(Status.STATUS_SHUTDOWN, manager2.getStatus());
}
-}
+}
\ No newline at end of file
diff --git a/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java b/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java
index a6abbea..5fa1dc9 100644
--- a/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java
+++ b/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java
@@ -30,6 +30,9 @@ import org.apache.cxf.helpers.IOUtils;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
public class DeflateEncoderDecoderTest extends Assert {
@@ -82,4 +85,4 @@ public class DeflateEncoderDecoderTest extends Assert {
assertEquals(streamInflatedToken, token);
assertEquals(cxfInflatedToken, token);
}
-}
+}
\ No newline at end of file
diff --git a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/claims/SAMLClaimsTest.java b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/claims/SAMLClaimsTest.java
index cfd90f7..b0154c5 100644
--- a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/claims/SAMLClaimsTest.java
+++ b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/claims/SAMLClaimsTest.java
@@ -39,6 +39,9 @@ import org.apache.wss4j.common.saml.builder.SAML2Constants;
import org.junit.Assert;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class SAMLClaimsTest extends Assert {
@org.junit.Test
@@ -211,4 +214,4 @@ public class SAMLClaimsTest extends Assert {
assertEquals("employee", p.getName());
}
-}
+}
\ No newline at end of file
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 1bf77e2..a05119c 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
@@ -41,6 +41,8 @@ import org.opensaml.xacml.ctx.RequestType;
import org.opensaml.xacml.ctx.ResourceType;
import org.opensaml.xacml.ctx.SubjectType;
+import static org.junit.Assert.assertNotNull;
+
/**
* Some unit tests to create a XACML Request using the RequestComponentBuilder.
@@ -220,4 +222,4 @@ public class RequestComponentBuilderTest {
assertNotNull(policyElement);
}
-}
+}
\ No newline at end of file
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 592ef8d..8a8b4bd 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
@@ -41,6 +41,8 @@ import org.opensaml.xacml.ctx.SubjectType;
import org.opensaml.xacml.profile.saml.SAMLProfileConstants;
import org.opensaml.xacml.profile.saml.XACMLAuthzDecisionQueryType;
+import static org.junit.Assert.assertNotNull;
+
/**
* Some unit tests for creating a SAML XACML Request.
@@ -151,4 +153,4 @@ public class SamlRequestComponentBuilderTest {
}
-}
+}
\ No newline at end of file
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 a6d61de..6b42083 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
@@ -31,6 +31,8 @@ import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.security.LoginSecurityContext;
import org.apache.cxf.security.SecurityContext;
+import static org.junit.Assert.fail;
+
/**
* Some unit tests to test the AbstractXACMLAuthorizingInterceptor.
@@ -121,4 +123,4 @@ public class XACMLAuthorizingInterceptorTest {
};
}
-}
+}
\ No newline at end of file
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 732a3bc..0287404 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
@@ -32,6 +32,11 @@ import org.opensaml.xacml.ctx.AttributeType;
import org.opensaml.xacml.ctx.RequestType;
import org.opensaml.xacml.ctx.ResourceType;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Some unit tests to create a XACML Request via the XACMLRequestBuilder interface.
@@ -305,4 +310,4 @@ public class XACMLRequestBuilderTest {
assertEquals(attributeValue, resourceURI);
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/security/src/test/java/org/apache/cxf/rt/security/claims/ClaimTest.java b/rt/security/src/test/java/org/apache/cxf/rt/security/claims/ClaimTest.java
index 14a0782..000a099 100644
--- a/rt/security/src/test/java/org/apache/cxf/rt/security/claims/ClaimTest.java
+++ b/rt/security/src/test/java/org/apache/cxf/rt/security/claims/ClaimTest.java
@@ -23,6 +23,10 @@ import java.net.URI;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.fail;
+
public class ClaimTest extends Assert {
@Test
@@ -111,4 +115,4 @@ public class ClaimTest extends Assert {
assertEquals(claim.getValues(), clone.getValues());
}
-}
+}
\ No newline at end of file
diff --git a/rt/security/src/test/java/org/apache/cxf/rt/security/claims/interceptor/ClaimsAuthorizingInterceptorTest.java b/rt/security/src/test/java/org/apache/cxf/rt/security/claims/interceptor/ClaimsAuthorizingInterceptorTest.java
index c2ae08c..010332d 100644
--- a/rt/security/src/test/java/org/apache/cxf/rt/security/claims/interceptor/ClaimsAuthorizingInterceptorTest.java
+++ b/rt/security/src/test/java/org/apache/cxf/rt/security/claims/interceptor/ClaimsAuthorizingInterceptorTest.java
@@ -51,6 +51,8 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.fail;
+
public class ClaimsAuthorizingInterceptorTest extends Assert {
@@ -412,4 +414,4 @@ public class ClaimsAuthorizingInterceptorTest extends Assert {
}
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
index 0eac3ab..2224284 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
@@ -79,6 +79,14 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class JettyHTTPDestinationTest extends Assert {
protected static final String AUTH_HEADER = "Authorization";
protected static final String USER = "copernicus";
@@ -907,4 +915,4 @@ public class JettyHTTPDestinationTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java
index c2b5a14..6fc3f14 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java
@@ -38,6 +38,11 @@ import org.junit.Assert;
import org.junit.BeforeClass;
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 JettyHTTPServerEngineFactoryTest
@@ -176,4 +181,4 @@ public class JettyHTTPServerEngineFactoryTest
assertNotNull("EngineFactory is not configured.", factory);
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
index 22f06cc..92b16a7 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
@@ -60,6 +60,11 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class JettyHTTPServerEngineTest extends Assert {
private static final int PORT1
= Integer.valueOf(TestUtil.getPortNumber(JettyHTTPServerEngineTest.class, 1));
@@ -465,4 +470,4 @@ public class JettyHTTPServerEngineTest extends Assert {
return buffer.toString();
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandlerTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandlerTest.java
index b032777..22e0c60 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandlerTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandlerTest.java
@@ -22,6 +22,8 @@ package org.apache.cxf.transport.http_jetty.blueprint;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+
/**
*
*/
@@ -33,4 +35,4 @@ public class HTTPJettyTransportNamespaceHandlerTest extends Assert {
assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/transports/http-jetty/configuration"));
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java
index 3a19840..44edd4c 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java
@@ -44,6 +44,12 @@ import org.junit.Assert;
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.assertTrue;
+import static org.junit.Assert.fail;
+
public class ApplicationContextTest extends Assert {
@@ -183,4 +189,4 @@ public class ApplicationContextTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactoryTest.java b/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactoryTest.java
index c566f1a..7502b3f 100644
--- a/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactoryTest.java
+++ b/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactoryTest.java
@@ -34,6 +34,9 @@ import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
@@ -104,4 +107,4 @@ public class NettyHttpConduitFactoryTest extends Assert {
assertTrue("The eventLoopGroup should be shutdown.", eventLoopGroup.isShutdown());
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
index 6f30eca..f721efe 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
@@ -78,6 +78,14 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class NettyHttpDestinationTest extends Assert {
protected static final String AUTH_HEADER = "Authorization";
protected static final String USER = "copernicus";
@@ -900,4 +908,4 @@ public class NettyHttpDestinationTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactoryTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactoryTest.java
index be5c9cd..3b0fe72 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactoryTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactoryTest.java
@@ -31,6 +31,9 @@ import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public class NettyHttpServerEngineFactoryTest
@@ -82,4 +85,4 @@ public class NettyHttpServerEngineFactoryTest
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java
index ef254e0..4b209c7 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java
@@ -40,6 +40,10 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class NettyHttpServerEngineTest extends Assert {
private static final int PORT1
@@ -171,4 +175,4 @@ public class NettyHttpServerEngineTest extends Assert {
return buffer.toString();
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/spring/ApplicationContextTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/spring/ApplicationContextTest.java
index c5ea154..ef535f7 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/spring/ApplicationContextTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/spring/ApplicationContextTest.java
@@ -44,6 +44,11 @@ import org.junit.Assert;
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 ApplicationContextTest extends Assert {
@@ -173,4 +178,4 @@ public class ApplicationContextTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
index 5139373..da578d5 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
@@ -80,6 +80,14 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class UndertowHTTPDestinationTest extends Assert {
protected static final String AUTH_HEADER = "Authorization";
@@ -889,4 +897,4 @@ public class UndertowHTTPDestinationTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactoryTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactoryTest.java
index 9221077..95f4404 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactoryTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactoryTest.java
@@ -34,6 +34,11 @@ import org.junit.Assert;
import org.junit.BeforeClass;
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 UndertowHTTPServerEngineFactoryTest
@@ -142,4 +147,4 @@ public class UndertowHTTPServerEngineFactoryTest
assertNotNull("EngineFactory is not configured.", factory);
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java
index feeea9d..c884306 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java
@@ -48,6 +48,10 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class UndertowHTTPServerEngineTest extends Assert {
private static final int PORT1
@@ -264,4 +268,4 @@ public class UndertowHTTPServerEngineTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/blueprint/HTTPUndertowTransportNamespaceHandlerTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/blueprint/HTTPUndertowTransportNamespaceHandlerTest.java
index 5e63ade..39bfa05 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/blueprint/HTTPUndertowTransportNamespaceHandlerTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/blueprint/HTTPUndertowTransportNamespaceHandlerTest.java
@@ -22,6 +22,8 @@ package org.apache.cxf.transport.http_undertow.blueprint;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+
/**
*
*/
@@ -33,4 +35,4 @@ public class HTTPUndertowTransportNamespaceHandlerTest extends Assert {
assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/transports/http-undertow/configuration"));
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/ApplicationContextTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/ApplicationContextTest.java
index 68fbdda..8d1fb33 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/ApplicationContextTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/ApplicationContextTest.java
@@ -44,6 +44,11 @@ import org.junit.Assert;
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 ApplicationContextTest extends Assert {
@@ -179,4 +184,4 @@ public class ApplicationContextTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java
index 279715f..326e1fb 100755
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java
@@ -33,6 +33,11 @@ import org.junit.Assert;
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;
+import static org.junit.Assert.assertTrue;
+
/**
*
*/
@@ -135,4 +140,4 @@ public class DestinationRegistryImplTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
index 12ddbfd..d27166c 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
@@ -52,6 +52,11 @@ import org.junit.Assert;
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 HTTPConduitTest extends Assert {
@@ -281,4 +286,4 @@ public class HTTPConduitTest extends Assert {
throw ex;
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
index a6a9fa2..9fe115a 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
@@ -39,6 +39,10 @@ import org.junit.Assert;
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;
+
/**
* This class "tests" the HTTPConduit that uses java.net.HttpURLConnection
* and java.net.HttpsURLConnection for its implementation. Should the
@@ -151,4 +155,4 @@ public class HTTPConduitURLConnectionTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
index 9d9edb4..9396953 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
@@ -58,6 +58,12 @@ import org.junit.Before;
import org.junit.BeforeClass;
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.assertSame;
+import static org.junit.Assert.assertTrue;
+
/**
*/
public class HTTPConduitURLEasyMockTest extends Assert {
@@ -643,4 +649,4 @@ public class HTTPConduitURLEasyMockTest extends Assert {
}
return code;
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPTransportFactoryTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPTransportFactoryTest.java
index 28f1aec..55b7fec 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPTransportFactoryTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPTransportFactoryTest.java
@@ -27,6 +27,9 @@ import org.apache.cxf.service.model.EndpointInfo;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class HTTPTransportFactoryTest extends Assert {
@Test
public void testGetDestination() {
@@ -45,4 +48,4 @@ public class HTTPTransportFactoryTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java
index 9a5af52..bdf889d 100755
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java
@@ -40,6 +40,11 @@ import org.easymock.IMocksControl;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
*
*/
@@ -223,4 +228,4 @@ public class HeadersTest extends Assert {
locale = new Locale("es", "");
assertEquals("es", Headers.toHttpLanguage(locale));
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/PatternBuilderTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/PatternBuilderTest.java
index b769ca0..1a6f2f0 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/PatternBuilderTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/PatternBuilderTest.java
@@ -23,6 +23,9 @@ import java.util.regex.Pattern;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
/**
* A {@code PatternBuilderTest} is ...
*/
@@ -71,4 +74,4 @@ public class PatternBuilderTest extends Assert {
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/blueprint/HttpBPHandlerTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/blueprint/HttpBPHandlerTest.java
index e3325cf..f8eb0e8 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/blueprint/HttpBPHandlerTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/blueprint/HttpBPHandlerTest.java
@@ -22,6 +22,8 @@ package org.apache.cxf.transport.http.blueprint;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+
/**
*
*/
@@ -33,4 +35,4 @@ public class HttpBPHandlerTest extends Assert {
assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/transports/http/configuration"));
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java
index 348eddf..9b2143f 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java
@@ -26,6 +26,9 @@ import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class ClientPolicyCalculatorTest extends Assert {
@Test
public void testCompatibleClientPolicies() {
@@ -128,4 +131,4 @@ public class ClientPolicyCalculatorTest extends Assert {
assertEquals(20000, p.getConnectionTimeout());
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPClientAssertionBuilderTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPClientAssertionBuilderTest.java
index a51dedb..98e0946 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPClientAssertionBuilderTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPClientAssertionBuilderTest.java
@@ -27,6 +27,9 @@ import org.apache.neethi.Assertion;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
/**
*
*/
@@ -61,4 +64,4 @@ public class HTTPClientAssertionBuilderTest extends Assert {
pa.setDecoupledEndpoint("http://localhost:9999/decoupled_endpoint");
assertTrue(!a.equal(b));
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPServerAssertionBuilderTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPServerAssertionBuilderTest.java
index 34fcd74..b115b93 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPServerAssertionBuilderTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPServerAssertionBuilderTest.java
@@ -27,6 +27,9 @@ import org.apache.neethi.Assertion;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
/**
*
*/
@@ -62,4 +65,4 @@ public class HTTPServerAssertionBuilderTest extends Assert {
assertTrue(!a.equal(b));
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
index 5284270..6aad2d9 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
@@ -43,6 +43,8 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
/**
*
*/
@@ -199,4 +201,4 @@ public class PolicyUtilsTest extends Assert {
assertTrue(outbound ? icmai.isAsserted() : !icmai.isAsserted());
control.verify();
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ServerPolicyCalculatorTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ServerPolicyCalculatorTest.java
index fe534c9..7f264ac 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ServerPolicyCalculatorTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ServerPolicyCalculatorTest.java
@@ -24,6 +24,9 @@ import org.apache.cxf.transports.http.configuration.HTTPServerPolicy;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class ServerPolicyCalculatorTest extends Assert {
@Test
public void testCompatibleServerPolicies() {
@@ -80,4 +83,4 @@ public class ServerPolicyCalculatorTest extends Assert {
p1.setSuppressClientSendErrors(true);
assertTrue(!spc.equals(p1, p2));
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/HttpConduitConfigurationTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/HttpConduitConfigurationTest.java
index a480ab6..7a6782c 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/HttpConduitConfigurationTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/HttpConduitConfigurationTest.java
@@ -45,6 +45,10 @@ import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
*
*/
@@ -146,4 +150,4 @@ public class HttpConduitConfigurationTest extends Assert {
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java
index a0c502c..30b237b 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java
@@ -36,6 +36,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class ServletControllerTest extends Assert {
private HttpServletRequest req;
@@ -186,4 +189,4 @@ public class ServletControllerTest extends Assert {
return invokeDestinationCalled;
}
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
index d69dfcd..9fed3c3 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
@@ -51,6 +51,10 @@ import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public abstract class AbstractJMSTester extends Assert {
protected static final String WSDL = "/jms_test.wsdl";
protected static final String SERVICE_NS = "http://cxf.apache.org/hello_world_jms";
@@ -234,4 +238,4 @@ public abstract class AbstractJMSTester extends Assert {
+ " seconds", destMessage);
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java
index 2ae3640..6a6ee45 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java
@@ -28,6 +28,10 @@ import org.apache.cxf.service.model.EndpointInfo;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class JMSConduitTest extends AbstractJMSTester {
@Test
@@ -83,4 +87,4 @@ public class JMSConduitTest extends AbstractJMSTester {
-}
+}
\ No newline at end of file
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
index 8622473..f216f6b 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
@@ -48,6 +48,12 @@ import org.apache.cxf.transport.jms.util.ResourceCloser;
import org.junit.Ignore;
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;
+
public class JMSDestinationTest extends AbstractJMSTester {
@Test
@@ -486,4 +492,4 @@ public class JMSDestinationTest extends AbstractJMSTester {
}
-}
+}
\ No newline at end of file
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSMessageUtilTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSMessageUtilTest.java
index fc0c2bb..5a3232f 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSMessageUtilTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSMessageUtilTest.java
@@ -25,6 +25,9 @@ import java.nio.charset.StandardCharsets;
import org.junit.Assert;
import org.junit.Test;
... 4549 lines suppressed ...
[cxf] 04/05: Finished removing asserts
Posted by co...@apache.org.
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 81cd495c14feb9c40dddd525385711ebe0df0fda
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Sat Dec 29 12:22:56 2018 +0000
Finished removing asserts
---
core/src/test/java/org/apache/cxf/BusFactoryTest.java | 2 +-
.../cxf/attachment/AttachmentDeserializerTest.java | 2 +-
.../cxf/attachment/AttachmentSerializerTest.java | 2 +-
.../org/apache/cxf/attachment/AttachmentUtilTest.java | 2 +-
.../test/java/org/apache/cxf/bus/CXFBusImplTest.java | 2 +-
.../cxf/bus/extension/ExtensionManagerTest.java | 2 +-
.../org/apache/cxf/bus/extension/ExtensionTest.java | 2 +-
.../extension/TextExtensionFragmentParserTest.java | 2 +-
.../managers/EndpointResolverRegistryImplTest.java | 2 +-
.../cxf/bus/managers/ServerRegistryImpTest.java | 2 +-
.../ServiceContractResolverRegistryImplTest.java | 2 +-
.../org/apache/cxf/bus/osgi/OSGiBusListenerTest.java | 2 +-
.../cxf/bus/spring/BusApplicationContextTest.java | 2 +-
.../cxf/bus/spring/BusApplicationListenerTest.java | 2 +-
.../cxf/bus/spring/BusDefinitionParserTest.java | 2 +-
.../apache/cxf/bus/spring/SpringBusFactoryTest.java | 2 +-
.../cxf/buslifecycle/CXFBusLifeCycleManagerTest.java | 2 +-
.../common/annotation/AnnotationProcessorTest.java | 2 +-
.../cxf/common/classloader/ClassLoaderUtilsTest.java | 2 +-
.../org/apache/cxf/common/i18n/BundleUtilsTest.java | 2 +-
.../java/org/apache/cxf/common/i18n/MessageTest.java | 2 +-
.../cxf/common/injection/ResourceInjectorTest.java | 2 +-
.../org/apache/cxf/common/jaxb/JAXBUtilsTest.java | 2 +-
.../org/apache/cxf/common/logging/LogUtilsTest.java | 2 +-
.../cxf/common/logging/RegexLoggingFilterTest.java | 2 +-
.../apache/cxf/common/security/SimpleGroupTest.java | 2 +-
.../cxf/common/security/SimplePrincipalTest.java | 2 +-
.../org/apache/cxf/common/util/ASMHelperTest.java | 2 +-
.../org/apache/cxf/common/util/Base64UtilityTest.java | 2 +-
.../org/apache/cxf/common/util/ClassHelperTest.java | 2 +-
.../apache/cxf/common/util/CollectionUtilsTest.java | 2 +-
.../org/apache/cxf/common/util/PackageUtilsTest.java | 2 +-
.../cxf/common/util/PropertiesLoaderUtilsTest.java | 2 +-
.../org/apache/cxf/common/util/PropertyUtilsTest.java | 2 +-
.../org/apache/cxf/common/util/StringUtilsTest.java | 2 +-
.../apache/cxf/common/util/URIParserUtilsTest.java | 2 +-
.../java/org/apache/cxf/common/util/UrlUtilsTest.java | 2 +-
.../cxf/common/util/XmlSchemaPrimitiveUtilsTest.java | 2 +-
.../apache/cxf/common/xmlschema/ImportRepairTest.java | 2 +-
.../cxf/configuration/spring/ConfigurerImplTest.java | 2 +-
.../SuspendedInvocationExceptionTest.java | 2 +-
.../cxf/databinding/AbstractDataBindingTest.java | 2 +-
.../databinding/source/XMLStreamDataReaderTest.java | 2 +-
.../org/apache/cxf/endpoint/EndpointImplTest.java | 2 +-
.../java/org/apache/cxf/helpers/FileUtilsTest.java | 2 +-
.../test/java/org/apache/cxf/helpers/IOUtilsTest.java | 2 +-
.../java/org/apache/cxf/helpers/NameSpaceTest.java | 2 +-
.../java/org/apache/cxf/helpers/ServiceUtilsTest.java | 2 +-
.../cxf/interceptor/LoggingInInterceptorTest.java | 2 +-
.../cxf/interceptor/LoggingOutInterceptorTest.java | 2 +-
.../cxf/interceptor/OutgoingChainInterceptorTest.java | 2 +-
.../interceptor/ServiceInvokerInterceptorTest.java | 2 +-
.../security/DefaultSecurityContextTest.java | 2 +-
.../security/NamePasswordCallbackHandlerTest.java | 2 +-
.../security/RolePrefixSecurityContextImplTest.java | 2 +-
.../security/SecureAnnotationsInterceptorTest.java | 2 +-
.../security/SimpleAuthorizingInterceptorTest.java | 2 +-
.../cxf/internal/CXFAPINamespaceHandlerTest.java | 2 +-
.../java/org/apache/cxf/io/CachedStreamTestBase.java | 2 +-
.../apache/cxf/phase/PhaseInterceptorChainTest.java | 2 +-
.../apache/cxf/resource/ClassLoaderResolverTest.java | 2 +-
.../cxf/resource/DefaultResourceManagerTest.java | 2 +-
.../java/org/apache/cxf/resource/URIResolverTest.java | 2 +-
.../cxf/service/model/BindingFaultInfoTest.java | 2 +-
.../cxf/service/model/BindingMessageInfoTest.java | 2 +-
.../cxf/service/model/BindingOperationInfoTest.java | 2 +-
.../org/apache/cxf/service/model/FaultInfoTest.java | 2 +-
.../apache/cxf/service/model/InterfaceInfoTest.java | 2 +-
.../org/apache/cxf/service/model/MessageInfoTest.java | 2 +-
.../apache/cxf/service/model/MessagePartInfoTest.java | 2 +-
.../apache/cxf/service/model/OperationInfoTest.java | 2 +-
.../staxutils/DepthRestrictingStreamReaderTest.java | 2 +-
.../cxf/staxutils/DepthXMLStreamReaderTest.java | 2 +-
.../cxf/staxutils/FragmentStreamReaderTest.java | 2 +-
.../cxf/staxutils/PartialXMLStreamReaderTest.java | 2 +-
.../PropertiesExpandingStreamReaderTest.java | 2 +-
.../apache/cxf/staxutils/StaxStreamFilterTest.java | 2 +-
.../apache/cxf/staxutils/W3CDOMStreamReaderTest.java | 2 +-
.../transform/DelegatingNamespaceContextTest.java | 2 +-
.../staxutils/transform/InTransformReaderTest.java | 2 +-
.../staxutils/transform/OutTransformWriterTest.java | 2 +-
.../cxf/transport/ChainInitiationObserverTest.java | 2 +-
.../org/apache/cxf/transport/HttpUriMapperTest.java | 2 +-
.../transport/common/gzip/GZIPAcceptEncodingTest.java | 2 +-
.../test/java/org/apache/cxf/version/VersionTest.java | 2 +-
.../apache/cxf/workqueue/AutomaticWorkQueueTest.java | 2 +-
.../jca/core/classloader/FireWallClassLoaderTest.java | 2 +-
.../jca/core/classloader/PlugInClassLoaderTest.java | 2 +-
.../apache/cxf/jca/core/logging/LoggerHelperTest.java | 2 +-
.../cxf/jca/core/resourceadapter/HandlerTest.java | 2 +-
.../ManagedConnectionFactoryImplTest.java | 2 +-
.../resourceadapter/ManagedConnectionImplTest.java | 2 +-
.../ResourceAdapterInternalExceptionTest.java | 2 +-
.../jca/core/resourceadapter/ResourceBeanTest.java | 2 +-
.../jca/core/resourceadapter/UriHandlerInitTest.java | 2 +-
.../cxf/jca/cxf/CXFConnectionRequestInfoTest.java | 2 +-
.../apache/cxf/jca/cxf/ConnectionFactoryImplTest.java | 2 +-
.../cxf/jca/cxf/ManagedConnectionFactoryImplTest.java | 2 +-
.../apache/cxf/jca/cxf/ManagedConnectionTestBase.java | 2 +-
.../apache/cxf/jca/cxf/ResourceAdapterImplTest.java | 2 +-
.../apache/cxf/jca/cxf/handlers/HandlerTestBase.java | 2 +-
.../org/apache/cxf/jca/jarloader/JarLoaderTest.java | 2 +-
.../org/apache/cxf/jca/servant/EJBEndpointTest.java | 2 +-
.../apache/cxf/jca/servant/EJBServantConfigTest.java | 2 +-
.../cxf/binding/coloc/ColocMessageObserverTest.java | 2 +-
.../cxf/binding/coloc/ColocOutInterceptorTest.java | 2 +-
.../org/apache/cxf/binding/coloc/ColocUtilTest.java | 2 +-
.../coloc/blueprint/ColocBPNamespaceHandlerTest.java | 2 +-
.../cxf/binding/corba/CorbaBindingFactoryTest.java | 2 +-
.../apache/cxf/binding/corba/CorbaBindingTest.java | 2 +-
.../apache/cxf/binding/corba/CorbaConduitTest.java | 2 +-
.../cxf/binding/corba/CorbaDestinationTest.java | 2 +-
.../apache/cxf/binding/corba/CorbaMessageTest.java | 2 +-
.../cxf/binding/corba/CorbaServerConduitTest.java | 2 +-
.../apache/cxf/binding/corba/CorbaTypeMapTest.java | 2 +-
.../binding/corba/runtime/CorbaDSIServantTest.java | 2 +-
.../binding/corba/runtime/CorbaObjectReaderTest.java | 2 +-
.../binding/corba/runtime/CorbaObjectWriterTest.java | 2 +-
.../binding/corba/runtime/CorbaStreamReaderTest.java | 2 +-
.../binding/corba/runtime/CorbaStreamWriterTest.java | 2 +-
.../binding/corba/runtime/CorbaStreamableTest.java | 2 +-
.../cxf/binding/corba/types/CorbaAnyHandlerTest.java | 2 +-
.../binding/corba/types/CorbaArrayHandlerTest.java | 2 +-
.../cxf/binding/corba/types/CorbaEnumHandlerTest.java | 2 +-
.../binding/corba/types/CorbaFixedHandlerTest.java | 2 +-
.../binding/corba/types/CorbaHandlerUtilsTest.java | 2 +-
.../binding/corba/types/CorbaObjectHandlerTest.java | 2 +-
.../corba/types/CorbaPrimitiveHandlerTest.java | 2 +-
.../binding/corba/types/CorbaSequenceHandlerTest.java | 2 +-
.../binding/corba/types/CorbaStructHandlerTest.java | 2 +-
.../cxf/binding/corba/utils/ContextUtilsTest.java | 2 +-
.../cxf/binding/corba/utils/CorbaUtilsTest.java | 2 +-
.../apache/cxf/binding/soap/ServiceModelUtilTest.java | 2 +-
.../cxf/binding/soap/SoapActionInterceptorTest.java | 2 +-
.../cxf/binding/soap/SoapBindingFactoryTest.java | 2 +-
.../org/apache/cxf/binding/soap/SoapBindingTest.java | 2 +-
.../java/org/apache/cxf/binding/soap/TestBase.java | 2 +-
.../soap/blueprint/SoapBindingBPHandlerTest.java | 2 +-
.../soap/interceptor/ReadHeadersInterceptorTest.java | 2 +-
.../soap/interceptor/SoapActionInInterceptorTest.java | 2 +-
.../soap/interceptor/SoapFaultSerializerTest.java | 2 +-
.../SoapPreProtocolOutInterceptorTest.java | 2 +-
.../soap/jms/interceptor/SoapFaultFactoryTest.java | 2 +-
.../apache/cxf/binding/soap/saaj/ParseBodyTest.java | 2 +-
.../apache/cxf/binding/xml/XMLBindingFactoryTest.java | 2 +-
.../apache/cxf/binding/xml/interceptor/TestBase.java | 2 +-
.../apache/cxf/aegis/integration/DOMMappingTest.java | 3 +--
.../apache/cxf/aegis/standalone/SchemaAddinsTest.java | 5 ++---
.../cxf/aegis/type/encoded/ArrayTypeInfoTest.java | 19 ++++++++++---------
.../org/apache/cxf/jaxb/BareInInterceptorTest.java | 2 +-
.../apache/cxf/jaxb/DocLiteralInInterceptorTest.java | 2 +-
.../java/org/apache/cxf/jaxb/JAXBDataBindingTest.java | 2 +-
.../org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java | 2 +-
.../test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java | 2 +-
.../org/apache/cxf/jaxb/JAXBWrapperHelperTest.java | 2 +-
.../src/test/java/org/apache/cxf/jaxb/TestBase.java | 2 +-
.../src/test/java/org/apache/cxf/jaxb/UtilsTest.java | 2 +-
.../apache/cxf/jaxb/io/XMLStreamDataReaderTest.java | 2 +-
.../apache/cxf/jaxb/io/XMLStreamDataWriterTest.java | 2 +-
.../blueprint/ClusteringBPNamespaceHandlerTest.java | 2 +-
.../apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java | 2 +-
.../apache/cxf/jaxrs/JAXRSServiceFactoryBeanTest.java | 2 +-
.../apache/cxf/jaxrs/SelectMethodCandidatesTest.java | 2 +-
.../jaxrs/blueprint/JAXRSBPNamespaceHandlerTest.java | 2 +-
.../apache/cxf/jaxrs/ext/MessageContextImplTest.java | 2 +-
.../java/org/apache/cxf/jaxrs/ext/form/FormTest.java | 2 +-
.../cxf/jaxrs/ext/multipart/AttachmentTest.java | 2 +-
.../jaxrs/ext/multipart/ContentDispositionTest.java | 2 +-
.../cxf/jaxrs/ext/multipart/MultipartBodyTest.java | 2 +-
.../org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java | 2 +-
.../apache/cxf/jaxrs/impl/AsyncResponseImplTest.java | 2 +-
.../jaxrs/impl/CacheControlHeaderProviderTest.java | 2 +-
.../apache/cxf/jaxrs/impl/ConfigurationImplTest.java | 2 +-
.../cxf/jaxrs/impl/CookieHeaderProviderTest.java | 2 +-
.../apache/cxf/jaxrs/impl/DateHeaderProviderTest.java | 2 +-
.../cxf/jaxrs/impl/EntityTagHeaderProviderTest.java | 2 +-
.../apache/cxf/jaxrs/impl/HttpHeadersImplTest.java | 2 +-
.../apache/cxf/jaxrs/impl/LinkBuilderImplTest.java | 2 +-
.../apache/cxf/jaxrs/impl/LinkHeaderProviderTest.java | 2 +-
.../cxf/jaxrs/impl/MediaTypeHeaderProviderTest.java | 2 +-
.../org/apache/cxf/jaxrs/impl/MetadataMapTest.java | 2 +-
.../cxf/jaxrs/impl/NewCookieHeaderProviderTest.java | 2 +-
.../apache/cxf/jaxrs/impl/PathSegmentImplTest.java | 2 +-
.../org/apache/cxf/jaxrs/impl/RequestImplTest.java | 2 +-
.../cxf/jaxrs/impl/RequestPreprocessorTest.java | 2 +-
.../cxf/jaxrs/impl/ResponseBuilderImplTest.java | 2 +-
.../org/apache/cxf/jaxrs/impl/ResponseImplTest.java | 2 +-
.../cxf/jaxrs/impl/RuntimeDelegateImplTest.java | 2 +-
.../cxf/jaxrs/impl/SecurityContextImplTest.java | 2 +-
.../org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java | 2 +-
.../org/apache/cxf/jaxrs/impl/UriInfoImplTest.java | 2 +-
.../cxf/jaxrs/impl/VariantListBuilderImplTest.java | 2 +-
.../lifecycle/PerRequestResourceProviderTest.java | 2 +-
.../apache/cxf/jaxrs/model/ClassResourceInfoTest.java | 2 +-
.../cxf/jaxrs/model/OperationResourceInfoTest.java | 2 +-
.../org/apache/cxf/jaxrs/model/URITemplateTest.java | 2 +-
.../cxf/jaxrs/model/doc/JavaDocProviderTest.java | 2 +-
.../cxf/jaxrs/provider/BinaryDataProviderTest.java | 2 +-
.../cxf/jaxrs/provider/DataSourceProviderTest.java | 2 +-
.../cxf/jaxrs/provider/FormEncodingProviderTest.java | 2 +-
.../cxf/jaxrs/provider/JAXBElementProviderTest.java | 2 +-
.../cxf/jaxrs/provider/PrimitiveTextProviderTest.java | 2 +-
.../cxf/jaxrs/provider/ProviderFactoryTest.java | 2 +-
.../jaxrs/provider/RequestDispatcherProviderTest.java | 2 +-
.../apache/cxf/jaxrs/provider/SourceProviderTest.java | 2 +-
.../apache/cxf/jaxrs/provider/XPathProviderTest.java | 2 +-
.../cxf/jaxrs/provider/XSLTJaxbProviderTest.java | 2 +-
.../jaxrs/security/JAASAuthenticationFilterTest.java | 2 +-
.../cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java | 2 +-
.../cxf/jaxrs/spring/SpringResourceFactoryTest.java | 2 +-
.../cxf/jaxrs/utils/AnnotationTestUtilsTest.java | 2 +-
.../apache/cxf/jaxrs/utils/ExceptionUtilsTest.java | 2 +-
.../org/apache/cxf/jaxrs/utils/FormUtilsTest.java | 2 +-
.../org/apache/cxf/jaxrs/utils/HttpUtilsTest.java | 2 +-
.../apache/cxf/jaxrs/utils/InjectionUtilsTest.java | 2 +-
.../org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 2 +-
.../org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java | 2 +-
.../org/apache/cxf/jaxws/ConfiguredEndpointTest.java | 2 +-
.../org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java | 2 +-
.../apache/cxf/jaxws/WrapperClassGeneratorTest.java | 2 +-
.../jaxws/blueprint/JAXWSBPNamespaceHandlerTest.java | 2 +-
.../cxf/jaxws/context/WebServiceContextImplTest.java | 2 +-
.../cxf/jaxws/context/WrappedAttachmentsTest.java | 2 +-
.../cxf/jaxws/context/WrappedMessageContextTest.java | 2 +-
.../AbstractProtocolHandlerInterceptorTest.java | 2 +-
.../handler/AnnotationHandlerChainBuilderTest.java | 2 +-
.../cxf/jaxws/handler/HandlerChainBuilderTest.java | 2 +-
.../cxf/jaxws/handler/HandlerChainInvokerTest.java | 2 +-
.../jaxws/handler/InitParamResourceResolverTest.java | 2 +-
.../jaxws/handler/LogicalHandlerInterceptorTest.java | 2 +-
.../cxf/jaxws/handler/LogicalMessageImplTest.java | 2 +-
.../handler/soap/SOAPHandlerInterceptorTest.java | 2 +-
.../org/apache/cxf/jaxws/spring/SpringBeansTest.java | 2 +-
.../jaxws/support/ContextPropertiesMappingTest.java | 2 +-
.../cxf/jaxws/support/JaxWsImplementorInfoTest.java | 2 +-
.../jaxws/support/JaxWsServiceConfigurationTest.java | 2 +-
.../org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java | 2 +-
.../transport/http_jaxws_spi/HttpHandlerImplTest.java | 2 +-
.../http_jaxws_spi/JAXWSHttpSpiDestinationTest.java | 2 +-
.../JAXWSHttpSpiTransportFactoryTest.java | 2 +-
.../apache/cxf/js/rhino/AbstractDOMProviderTest.java | 2 +-
.../org/apache/cxf/js/rhino/ProviderFactoryTest.java | 2 +-
.../java/org/apache/cxf/js/rhino/ServerAppTest.java | 2 +-
.../blueprint/SimpleBPNamespaceHandlerTest.java | 2 +-
.../spring/AbstractSimpleFrontendSpringTest.java | 2 +-
.../apache/cxf/javascript/BasicNameManagerTest.java | 2 +-
.../cxf/management/InstrumentationManagerTest.java | 2 +-
.../management/counters/CounterRepositoryTest.java | 2 +-
.../interceptor/AbstractMessageResponseTestBase.java | 2 +-
.../cxf/management/jmx/BusRegistrationTest.java | 2 +-
.../jmx/JMXManagedComponentManagerTest.java | 2 +-
.../cxf/management/jmx/MBServerConnectorTest.java | 2 +-
.../cxf/management/utils/ManagementConsoleTest.java | 2 +-
.../cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java | 2 +-
.../org/apache/cxf/jaxrs/client/WebClientTest.java | 2 +-
.../client/blueprint/JAXRSBPNamespaceHandlerTest.java | 2 +-
.../cxf/jaxrs/client/cache/ClientCacheTest.java | 2 +-
.../org/apache/cxf/jaxrs/client/cache/ClientTest.java | 2 +-
.../apache/cxf/jaxrs/client/spec/ClientImplTest.java | 2 +-
.../jaxrs/client/spec/ClientRequestFilterTest.java | 2 +-
.../jaxrs/client/spec/InvocationBuilderImplTest.java | 2 +-
.../client/spring/JAXRSClientFactoryBeanTest.java | 2 +-
.../apache/cxf/jaxrs/swagger/Swagger2FeatureTest.java | 2 +-
.../openapi/SwaggerToOpenApiConversionUtilsTest.java | 2 +-
.../jaxrs/swagger/parse/SwaggerParseUtilsTest.java | 2 +-
.../jaxrs/model/wadl/ServerProviderFactoryTest.java | 2 +-
.../cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java | 2 +-
.../cxf/jaxrs/model/wadl/WadlGeneratorTest.java | 2 +-
.../json/basic/JsonMapObjectReaderWriterTest.java | 2 +-
.../cxf/jaxrs/provider/ProviderFactoryAllTest.java | 2 +-
.../provider/aegis/AegisElementProviderTest.java | 2 +-
.../jaxrs/provider/atom/AtomEntryProviderTest.java | 2 +-
.../cxf/jaxrs/provider/atom/AtomFeedProviderTest.java | 2 +-
.../cxf/jaxrs/provider/atom/AtomPojoProviderTest.java | 2 +-
.../cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java | 2 +-
.../cxf/jaxrs/provider/json/JSONProviderTest.java | 2 +-
.../jaxrs/provider/jsonp/JsonpInterceptorTest.java | 2 +-
.../apache/cxf/jaxrs/ext/search/BeanspectorTest.java | 2 +-
.../ext/search/SearchContextImplCustomParserTest.java | 2 +-
.../cxf/jaxrs/ext/search/SearchContextImplTest.java | 2 +-
.../apache/cxf/jaxrs/ext/search/SearchUtilsTest.java | 2 +-
.../search/client/FiqlSearchConditionBuilderTest.java | 2 +-
.../jaxrs/ext/search/fiql/FiqlCollectionsTest.java | 2 +-
.../cxf/jaxrs/ext/search/fiql/FiqlParserTest.java | 2 +-
.../cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java | 2 +-
.../search/jpa/AbstractJPATypedQueryVisitorTest.java | 2 +-
.../jaxrs/ext/search/jpa/JPALanguageVisitorTest.java | 2 +-
.../jaxrs/ext/search/ldap/LdapQueryVisitorTest.java | 2 +-
.../cxf/jaxrs/ext/search/odata/ODataParserTest.java | 2 +-
.../ext/search/sql/SQLHierarchicalQueryTest.java | 2 +-
.../jaxrs/ext/search/sql/SQLPrinterVisitorTest.java | 2 +-
.../ext/search/tika/TikaContentExtractorTest.java | 2 +-
.../search/tika/TikaLuceneContentExtractorTest.java | 2 +-
.../client/CxfTypeSafeClientBuilderTest.java | 8 ++++----
.../apache/cxf/microprofile/client/ValidatorTest.java | 2 +-
.../microprofile/client/cdi/RestClientCdiTest.java | 2 +-
.../security/jose/cookbook/JwkJoseCookBookTest.java | 2 +-
.../security/jose/jwe/JweCompactReaderWriterTest.java | 2 +-
.../cxf/rs/security/jose/jwe/JweJsonConsumerTest.java | 2 +-
.../cxf/rs/security/jose/jwe/JweJsonProducerTest.java | 2 +-
.../rs/security/jose/jwe/JwePbeHmacAesWrapTest.java | 2 +-
.../cxf/rs/security/jose/jwk/JsonWebKeyTest.java | 2 +-
.../apache/cxf/rs/security/jose/jwk/JwkUtilsTest.java | 2 +-
.../rs/security/jose/jws/JwsCompactHeaderTest.java | 2 +-
.../security/jose/jws/JwsCompactReaderWriterTest.java | 2 +-
.../cxf/rs/security/jose/jws/JwsJsonConsumerTest.java | 2 +-
.../cxf/rs/security/jose/jws/JwsJsonProducerTest.java | 2 +-
.../apache/cxf/rs/security/jose/jws/JwsUtilsTest.java | 2 +-
.../apache/cxf/rs/security/jose/jwt/JwtUtilsTest.java | 2 +-
.../cxf/rs/security/oauth/utils/OAuthUtilsTest.java | 2 +-
.../rs/security/oauth2/common/UserSubjectTest.java | 2 +-
.../security/oauth2/grants/TokenGrantHandlerTest.java | 2 +-
.../grants/code/JCacheCodeDataProviderTest.java | 2 +-
.../oauth2/grants/code/JPACodeDataProviderTest.java | 2 +-
.../oauth2/grants/jwt/JwtUserSubjectTest.java | 2 +-
.../provider/AbstractOAuthDataProviderTest.java | 2 +-
.../oauth2/provider/OAuthJSONProviderTest.java | 2 +-
.../tokens/hawk/HawkAccessTokenValidatorTest.java | 2 +-
.../oauth2/tokens/hawk/NonceVerifierImplTest.java | 2 +-
.../security/oauth2/utils/AuthorizationUtilsTest.java | 2 +-
.../cxf/rs/security/oauth2/utils/OAuthUtilsTest.java | 2 +-
.../security/oauth2/utils/crypto/CryptoUtilsTest.java | 2 +-
.../rs/security/oidc/idp/JPAOidcUserSubjectTest.java | 2 +-
.../cxf/rs/security/oidc/utils/OidcUtilsTest.java | 2 +-
.../cxf/rs/security/saml/sso/EHCacheUtilTest.java | 2 +-
.../rs/security/saml/DeflateEncoderDecoderTest.java | 2 +-
.../cxf/rt/security/saml/claims/SAMLClaimsTest.java | 2 +-
.../org/apache/cxf/rt/security/claims/ClaimTest.java | 2 +-
.../interceptor/ClaimsAuthorizingInterceptorTest.java | 2 +-
.../http_jetty/JettyHTTPDestinationTest.java | 2 +-
.../http_jetty/JettyHTTPServerEngineFactoryTest.java | 2 +-
.../http_jetty/JettyHTTPServerEngineTest.java | 2 +-
.../HTTPJettyTransportNamespaceHandlerTest.java | 2 +-
.../http_jetty/spring/ApplicationContextTest.java | 2 +-
.../netty/client/NettyHttpConduitFactoryTest.java | 2 +-
.../http/netty/server/NettyHttpDestinationTest.java | 2 +-
.../server/NettyHttpServerEngineFactoryTest.java | 2 +-
.../http/netty/server/NettyHttpServerEngineTest.java | 2 +-
.../netty/server/spring/ApplicationContextTest.java | 2 +-
.../http_undertow/UndertowHTTPDestinationTest.java | 2 +-
.../UndertowHTTPServerEngineFactoryTest.java | 2 +-
.../http_undertow/UndertowHTTPServerEngineTest.java | 2 +-
.../HTTPUndertowTransportNamespaceHandlerTest.java | 2 +-
.../http_undertow/spring/ApplicationContextTest.java | 2 +-
.../transport/http/DestinationRegistryImplTest.java | 2 +-
.../apache/cxf/transport/http/HTTPConduitTest.java | 2 +-
.../transport/http/HTTPConduitURLConnectionTest.java | 2 +-
.../transport/http/HTTPConduitURLEasyMockTest.java | 2 +-
.../cxf/transport/http/HTTPTransportFactoryTest.java | 2 +-
.../org/apache/cxf/transport/http/HeadersTest.java | 2 +-
.../apache/cxf/transport/http/PatternBuilderTest.java | 2 +-
.../transport/http/blueprint/HttpBPHandlerTest.java | 2 +-
.../http/policy/ClientPolicyCalculatorTest.java | 2 +-
.../http/policy/HTTPClientAssertionBuilderTest.java | 2 +-
.../http/policy/HTTPServerAssertionBuilderTest.java | 2 +-
.../cxf/transport/http/policy/PolicyUtilsTest.java | 2 +-
.../http/policy/ServerPolicyCalculatorTest.java | 2 +-
.../http/spring/HttpConduitConfigurationTest.java | 2 +-
.../cxf/transport/servlet/ServletControllerTest.java | 2 +-
.../apache/cxf/transport/jms/AbstractJMSTester.java | 2 +-
.../apache/cxf/transport/jms/JMSMessageUtilTest.java | 2 +-
.../continuations/JMSContinuationProviderTest.java | 2 +-
.../jms/continuations/JMSContinuationTest.java | 2 +-
.../apache/cxf/transport/jms/uri/JMSEndpointTest.java | 2 +-
.../apache/cxf/transport/jms/util/JMSUtilTest.java | 2 +-
.../cxf/transport/local/LocalDestinationTest.java | 2 +-
.../transport/local/LocalTransportFactoryTest.java | 2 +-
.../websocket/WebSocketTransportFactoryTest.java | 2 +-
.../cxf/transport/websocket/WebSocketUtilsTest.java | 2 +-
.../websocket/ahc/AhcWebSocketConduitTest.java | 2 +-
.../AtmosphereWebSocketJettyDestinationTest.java | 2 +-
.../AtmosphereWebSocketServletDestinationTest.java | 2 +-
.../atmosphere/DefaultProtocolInterceptorTest.java | 2 +-
.../jetty/JettyWebSocketDestinationTest.java | 2 +-
.../ws/addressing/AddressingConstantsImplTest.java | 2 +-
.../cxf/ws/addressing/blueprint/WsBPHandlerTest.java | 2 +-
.../cxf/ws/addressing/impl/ContextUtilsTest.java | 2 +-
.../cxf/ws/addressing/impl/MAPAggregatorTest.java | 2 +-
.../ws/addressing/soap/DecoupledFaultHandlerTest.java | 2 +-
.../apache/cxf/ws/addressing/soap/MAPCodecTest.java | 2 +-
.../src/test/java/org/apache/cxf/ws/mex/MEXTest.java | 2 +-
.../ws/policy/AssertionBuilderRegistryImplTest.java | 2 +-
.../apache/cxf/ws/policy/AssertionInfoMapTest.java | 2 +-
.../apache/cxf/ws/policy/EffectivePolicyImplTest.java | 2 +-
.../apache/cxf/ws/policy/EndpointPolicyImplTest.java | 2 +-
.../IgnorablePolicyInterceptorProviderTest.java | 2 +-
.../java/org/apache/cxf/ws/policy/NormalizeTest.java | 2 +-
.../org/apache/cxf/ws/policy/PolicyBuilderTest.java | 2 +-
.../cxf/ws/policy/PolicyDataEngineImplTest.java | 2 +-
.../org/apache/cxf/ws/policy/PolicyEngineTest.java | 2 +-
.../apache/cxf/ws/policy/PolicyExtensionsTest.java | 2 +-
.../PolicyInterceptorProviderRegistryImplTest.java | 2 +-
.../apache/cxf/ws/policy/PolicyInterceptorsTest.java | 2 +-
.../apache/cxf/ws/policy/PolicyRegistryImplTest.java | 2 +-
.../PolicyVerificationInFaultInterceptorTest.java | 2 +-
.../policy/PolicyVerificationInInterceptorTest.java | 2 +-
.../policy/PolicyVerificationOutInterceptorTest.java | 2 +-
.../external/DomainExpressionBuilderRegistryTest.java | 2 +-
.../EndpointReferenceDomainExpressionTest.java | 2 +-
.../external/ExternalAttachmentProviderTest.java | 2 +-
.../attachment/external/PolicyAttachmentTest.java | 2 +-
.../attachment/reference/ReferenceResolverTest.java | 2 +-
.../wsdl11/Wsdl11AttachmentPolicyProviderTest.java | 2 +-
.../cxf/ws/policy/blueprint/PolicyBPHandlerTest.java | 2 +-
.../policy/builder/jaxb/JaxbAssertionBuilderTest.java | 2 +-
.../cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java | 2 +-
.../policy/selector/FirstAlternativeSelectorTest.java | 2 +-
.../MinimalMaximalAlternativeSelectorTest.java | 2 +-
.../apache/cxf/ws/policy/spring/PolicyBeansTest.java | 2 +-
.../org/apache/cxf/ws/rm/AbstractEndpointTest.java | 2 +-
.../apache/cxf/ws/rm/AbstractRMInterceptorTest.java | 2 +-
.../org/apache/cxf/ws/rm/AbstractSequenceTest.java | 2 +-
.../org/apache/cxf/ws/rm/DestinationSequenceTest.java | 2 +-
.../java/org/apache/cxf/ws/rm/DestinationTest.java | 2 +-
.../org/apache/cxf/ws/rm/ManagedRMManagerTest.java | 2 +-
.../org/apache/cxf/ws/rm/ProtocolVariationTest.java | 2 +-
.../src/test/java/org/apache/cxf/ws/rm/ProxyTest.java | 2 +-
.../java/org/apache/cxf/ws/rm/RMContextUtilsTest.java | 2 +-
.../java/org/apache/cxf/ws/rm/RMEndpointTest.java | 2 +-
.../org/apache/cxf/ws/rm/RMInInterceptorTest.java | 2 +-
.../apache/cxf/ws/rm/RMManagerConfigurationTest.java | 2 +-
.../test/java/org/apache/cxf/ws/rm/RMManagerTest.java | 2 +-
.../org/apache/cxf/ws/rm/RMOutInterceptorTest.java | 2 +-
.../test/java/org/apache/cxf/ws/rm/RMUtilsTest.java | 2 +-
.../test/java/org/apache/cxf/ws/rm/ServantTest.java | 2 +-
.../java/org/apache/cxf/ws/rm/SourceSequenceTest.java | 2 +-
.../apache/cxf/ws/rm/blueprint/RMBPHandlerTest.java | 2 +-
.../cxf/ws/rm/persistence/PersistenceUtilsTest.java | 2 +-
.../apache/cxf/ws/rm/persistence/RMMessageTest.java | 2 +-
.../persistence/jdbc/RMTxStoreConfigurationTest.java | 2 +-
.../cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java | 2 +-
.../rm/persistence/jdbc/RMTxStoreTwoSchemasTest.java | 2 +-
.../ws/rm/persistence/jdbc/RMTxStoreUpgradeTest.java | 2 +-
.../org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java | 2 +-
.../cxf/ws/rm/soap/RMSoapInInterceptorTest.java | 2 +-
.../cxf/ws/rm/soap/RMSoapOutInterceptorTest.java | 2 +-
.../cxf/ws/rm/soap/RetransmissionQueueImplTest.java | 2 +-
.../apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java | 2 +-
.../cxf/ws/security/cache/EHCacheUtilsTest.java | 2 +-
.../org/apache/cxf/ws/security/sts/STSClientTest.java | 2 +-
.../trust/AuthPolicyValidatingInterceptorTest.java | 2 +-
.../org/apache/cxf/wsdl/JAXBExtensionHelperTest.java | 2 +-
.../interceptors/DocLiteralInInterceptorTest.java | 2 +-
.../factory/ReflectionServiceFactorBeanTest.java | 2 +-
.../java/org/apache/cxf/wsdl11/NSManagerTest.java | 2 +-
.../org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java | 2 +-
.../org/apache/cxf/wsdl11/WSDLManagerImplTest.java | 2 +-
.../org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java | 2 +-
.../apache/cxf/systest/grizzly/EndpointAPITest.java | 2 +-
.../apache/cxf/systest/jaxws/OASISCatalogTest.java | 2 +-
.../JavaFirstSchemaValidationTest.java | 2 +-
.../microprofile/rest/client/AsyncMethodTest.java | 2 +-
.../cxf/systest/http/PublishedEndpointUrlTest.java | 2 +-
.../cxf/systest/http_jetty/EngineLifecycleTest.java | 2 +-
.../cxf/systest/bus/BusExtensionLoadingTest.java | 2 +-
.../org/apache/cxf/systest/bus/BusShutdownTest.java | 2 +-
.../apache/cxf/systest/bus/SpringBusFactoryTest.java | 2 +-
.../apache/cxf/systest/coloc/AbstractColocTest.java | 2 +-
.../org/apache/cxf/systest/corba/BaseGreeterImpl.java | 2 +-
.../apache/cxf/systest/lifecycle/LifeCycleTest.java | 2 +-
.../apache/cxf/systest/management/ManagedBusTest.java | 2 +-
.../apache/cxf/systest/simple/SimpleFrontendTest.java | 2 +-
.../org/apache/cxf/systest/soap/SoapActionTest.java | 2 +-
.../org/apache/cxf/systest/ws/util/MessageFlow.java | 2 +-
.../org/apache/cxf/systest/ws/util/MessageFlow.java | 2 +-
.../apache/cxf/tools/common/ProcessorTestBase.java | 6 ++++--
.../org/apache/cxf/tools/common/ToolTestBase.java | 2 +-
.../cxf/tools/common/ProcessorEnvironmentTest.java | 2 +-
.../org/apache/cxf/tools/common/ToolContextTest.java | 2 +-
.../org/apache/cxf/tools/common/WSDLVersionTest.java | 2 +-
.../tools/common/dom/ExtendedDocumentBuilderTest.java | 2 +-
.../cxf/tools/common/model/JAnnotationTest.java | 2 +-
.../apache/cxf/tools/common/model/JavaClassTest.java | 2 +-
.../cxf/tools/common/model/JavaInterfaceTest.java | 2 +-
.../cxf/tools/common/model/JavaParameterTest.java | 2 +-
.../apache/cxf/tools/common/model/JavaTypeTest.java | 2 +-
.../common/toolspec/AbstractToolContainerTest.java | 2 +-
.../cxf/tools/common/toolspec/ToolExceptionTest.java | 2 +-
.../cxf/tools/common/toolspec/ToolSpecTest.java | 2 +-
.../cxf/tools/common/toolspec/ToolSupportTest.java | 2 +-
.../common/toolspec/parser/CommandLineParserTest.java | 2 +-
.../tools/util/BuiltInTypesJavaMappingUtilTest.java | 2 +-
.../org/apache/cxf/tools/util/FileWriterUtilTest.java | 2 +-
.../java/org/apache/cxf/tools/util/NameUtilTest.java | 2 +-
.../org/apache/cxf/tools/util/URIParserUtilTest.java | 2 +-
.../apache/cxf/tools/corba/common/ToolTestBase.java | 2 +-
.../idlpreprocessor/IdlPreprocessorReaderTest.java | 2 +-
.../corba/processors/WSDLToCorbaBindingTest.java | 2 +-
.../corba/processors/WSDLToCorbaBindingTypeTest.java | 2 +-
.../corba/processors/WSDLToIDLGenerationTest.java | 2 +-
.../java2wsdl/generator/WSDLGeneratorFactoryTest.java | 2 +-
.../wsdl11/annotator/WrapperBeanAnnotatorTest.java | 2 +-
.../annotator/WrapperBeanFieldAnnotatorTest.java | 2 +-
.../java2wsdl/processor/FrontendFactoryTest.java | 2 +-
.../processor/internal/ServiceBuilderFactoryTest.java | 2 +-
.../processor/internal/jaxws/FaultBeanTest.java | 2 +-
.../processor/internal/jaxws/RequestWrapperTest.java | 2 +-
.../processor/internal/jaxws/ResponseWrapperTest.java | 2 +-
.../processor/internal/jaxws/WrapperTest.java | 2 +-
.../processor/internal/jaxws/WrapperUtilTest.java | 2 +-
.../cxf/tools/validator/internal/Stax2DOMTest.java | 2 +-
.../tools/validator/internal/WSDL11ValidatorTest.java | 2 +-
.../validator/internal/WSDLRefValidatorTest.java | 2 +-
.../cxf/tools/validator/internal/model/XNodeTest.java | 2 +-
.../cxf/tools/wsdlto/WSDLToJavaContainerTest.java | 2 +-
.../tools/wsdlto/core/WSDLDefinitionBuilderTest.java | 2 +-
.../cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java | 2 +-
.../tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java | 2 +-
.../processor/internal/ParameterProcessorTest.java | 2 +-
.../processor/internal/PortTypeProcessorTest.java | 2 +-
.../jaxws/processor/internal/ProcessorUtilTest.java | 2 +-
.../internal/annotator/WebMethodAnnotatorTest.java | 2 +-
.../internal/annotator/WebParamAnnotatorTest.java | 2 +-
.../internal/annotator/XmlSeeAlsoAnnotatorTest.java | 2 +-
.../internal/mapper/InterfaceMapperTest.java | 2 +-
.../processor/internal/mapper/MethodMapperTest.java | 2 +-
.../jaxws/wsdl11/JAXWSDefinitionBuilderTest.java | 2 +-
.../org/apache/cxf/tools/wsdlto/WSDLToJavaTest.java | 2 +-
.../cxf/tools/wsdlto/core/PluginLoaderTest.java | 2 +-
.../jaxws/wsdl11/JAXWSDefinitionBuilderTest.java | 2 +-
520 files changed, 536 insertions(+), 535 deletions(-)
diff --git a/core/src/test/java/org/apache/cxf/BusFactoryTest.java b/core/src/test/java/org/apache/cxf/BusFactoryTest.java
index f4da912..5ef364c 100644
--- a/core/src/test/java/org/apache/cxf/BusFactoryTest.java
+++ b/core/src/test/java/org/apache/cxf/BusFactoryTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertTrue;
-public class BusFactoryTest extends Assert {
+public class BusFactoryTest {
@After
public void tearDown() {
diff --git a/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java b/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
index a350fd0..cfa7ee0 100644
--- a/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
+++ b/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
@@ -55,7 +55,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class AttachmentDeserializerTest extends Assert {
+public class AttachmentDeserializerTest {
private MessageImpl msg;
diff --git a/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java b/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
index 83b2152..697070d 100644
--- a/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
+++ b/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
@@ -45,7 +45,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class AttachmentSerializerTest extends Assert {
+public class AttachmentSerializerTest {
@Test
public void testMessageWriteXopOn1() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/attachment/AttachmentUtilTest.java b/core/src/test/java/org/apache/cxf/attachment/AttachmentUtilTest.java
index b2b1b80..7b4f92f 100644
--- a/core/src/test/java/org/apache/cxf/attachment/AttachmentUtilTest.java
+++ b/core/src/test/java/org/apache/cxf/attachment/AttachmentUtilTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class AttachmentUtilTest extends Assert {
+public class AttachmentUtilTest {
@Test
public void testContendDispositionFileNameNoQuotes() {
diff --git a/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java b/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
index 31ce70a..4e8fdd0 100644
--- a/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
-public class CXFBusImplTest extends Assert {
+public class CXFBusImplTest {
@Test
public void testThreadBus() throws BusException {
diff --git a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java
index 82b475d..b217db1 100644
--- a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
-public class ExtensionManagerTest extends Assert {
+public class ExtensionManagerTest {
private static final String EXTENSIONMANAGER_TEST_RESOURECE_NAME = "extensionManagerTest";
private ExtensionManagerImpl manager;
diff --git a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java
index 4a1540d..5604c41 100644
--- a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class ExtensionTest extends Assert {
+public class ExtensionTest {
@Test
public void testMutators() {
diff --git a/core/src/test/java/org/apache/cxf/bus/extension/TextExtensionFragmentParserTest.java b/core/src/test/java/org/apache/cxf/bus/extension/TextExtensionFragmentParserTest.java
index e05e972..b89db23 100644
--- a/core/src/test/java/org/apache/cxf/bus/extension/TextExtensionFragmentParserTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/extension/TextExtensionFragmentParserTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class TextExtensionFragmentParserTest extends Assert {
+public class TextExtensionFragmentParserTest {
@Test
public void testGetExtensions() throws IOException {
diff --git a/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java b/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java
index b03a92b..0b4a733 100644
--- a/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-public class EndpointResolverRegistryImplTest extends Assert {
+public class EndpointResolverRegistryImplTest {
private EndpointResolverRegistryImpl registry;
private EndpointResolver resolver1;
diff --git a/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java b/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java
index 7cd0ee4..2839b8d 100644
--- a/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class ServerRegistryImpTest extends Assert {
+public class ServerRegistryImpTest {
@Test
public void testServerRegistryPreShutdown() {
diff --git a/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java b/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java
index c1c9337..a2211fc 100644
--- a/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-public class ServiceContractResolverRegistryImplTest extends Assert {
+public class ServiceContractResolverRegistryImplTest {
private ServiceContractResolverRegistryImpl registry;
private ServiceContractResolver resolver1;
private ServiceContractResolver resolver2;
diff --git a/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java b/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java
index bf9b415..22c7e38 100644
--- a/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java
@@ -47,7 +47,7 @@ import static org.junit.Assert.assertEquals;
/**
*
*/
-public class OSGiBusListenerTest extends Assert {
+public class OSGiBusListenerTest {
private static final String[] SERVICE_BUNDLE_NAMES = new String[]{"me.temp.foo.test", "me.temp.bar.sample"};
private static final String EXCLUDES = "me\\.temp\\.bar\\..*";
private static final String RESTRICTED = "me\\.my\\.app\\..*";
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java b/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java
index a237217..6c9591d 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-public class BusApplicationContextTest extends Assert {
+public class BusApplicationContextTest {
@Test
public void testGetResources() {
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java b/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java
index e35e8f3..cfab4bd 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
-public class BusApplicationListenerTest extends Assert {
+public class BusApplicationListenerTest {
@Test
public void testParentApplicationEvent() {
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java b/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
index 2012f7b..f1d9800 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertTrue;
-public class BusDefinitionParserTest extends Assert {
+public class BusDefinitionParserTest {
@Test
public void testFeatures() {
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java b/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
index 3898e57..0624042 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
@@ -60,7 +60,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-public class SpringBusFactoryTest extends Assert {
+public class SpringBusFactoryTest {
@After
public void tearDown() {
diff --git a/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java b/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java
index 08ac8d3..86dfeb8 100644
--- a/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java
+++ b/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java
@@ -26,7 +26,7 @@ import org.easymock.IMocksControl;
import org.junit.Assert;
import org.junit.Test;
-public class CXFBusLifeCycleManagerTest extends Assert {
+public class CXFBusLifeCycleManagerTest {
@Test
public void testListenerNotRegistered() {
diff --git a/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java b/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
index e22edf7..88cf302 100644
--- a/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
+++ b/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
@@ -40,7 +40,7 @@ import org.junit.Test;
import static org.junit.Assert.fail;
-public class AnnotationProcessorTest extends Assert {
+public class AnnotationProcessorTest {
AnnotatedGreeterImpl greeterImpl = new AnnotatedGreeterImpl();
AnnotationProcessor processor = new AnnotationProcessor(greeterImpl);
diff --git a/core/src/test/java/org/apache/cxf/common/classloader/ClassLoaderUtilsTest.java b/core/src/test/java/org/apache/cxf/common/classloader/ClassLoaderUtilsTest.java
index d3da661..b3ee5f4 100644
--- a/core/src/test/java/org/apache/cxf/common/classloader/ClassLoaderUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/classloader/ClassLoaderUtilsTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class ClassLoaderUtilsTest extends Assert {
+public class ClassLoaderUtilsTest {
private static void setTCCL(ClassLoader loader) {
Thread.currentThread().setContextClassLoader(loader);
diff --git a/core/src/test/java/org/apache/cxf/common/i18n/BundleUtilsTest.java b/core/src/test/java/org/apache/cxf/common/i18n/BundleUtilsTest.java
index 28e5633..0dc51a6 100644
--- a/core/src/test/java/org/apache/cxf/common/i18n/BundleUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/i18n/BundleUtilsTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class BundleUtilsTest extends Assert {
+public class BundleUtilsTest {
@Test
public void testGetBundleName() throws Exception {
assertEquals("unexpected resource bundle name",
diff --git a/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java b/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java
index a4ac2cbb..2fe040f 100644
--- a/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java
+++ b/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-public class MessageTest extends Assert {
+public class MessageTest {
private static final Logger LOG = LogUtils.getL7dLogger(MessageTest.class);
@Test
diff --git a/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java b/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
index d107043..af9b609 100644
--- a/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
+++ b/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class ResourceInjectorTest extends Assert {
+public class ResourceInjectorTest {
private static final String RESOURCE_ONE = "resource one";
private static final String RESOURCE_TWO = "resource two";
private static final String RESOURCE_THREE = "resource three";
diff --git a/core/src/test/java/org/apache/cxf/common/jaxb/JAXBUtilsTest.java b/core/src/test/java/org/apache/cxf/common/jaxb/JAXBUtilsTest.java
index ead83f1..71b40c5 100644
--- a/core/src/test/java/org/apache/cxf/common/jaxb/JAXBUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/jaxb/JAXBUtilsTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class JAXBUtilsTest extends Assert {
+public class JAXBUtilsTest {
@Test
public void testCanSetEscapeHandlerWithStandardJaxbImpl() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java b/core/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java
index 15ecebb..7dec5c1 100644
--- a/core/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertNotNull;
-public class LogUtilsTest extends Assert {
+public class LogUtilsTest {
@Test
public void testGetL7dLog() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/common/logging/RegexLoggingFilterTest.java b/core/src/test/java/org/apache/cxf/common/logging/RegexLoggingFilterTest.java
index a1de8cd..f15a60e 100644
--- a/core/src/test/java/org/apache/cxf/common/logging/RegexLoggingFilterTest.java
+++ b/core/src/test/java/org/apache/cxf/common/logging/RegexLoggingFilterTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class RegexLoggingFilterTest extends Assert {
+public class RegexLoggingFilterTest {
@Test
public void testFilter() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/common/security/SimpleGroupTest.java b/core/src/test/java/org/apache/cxf/common/security/SimpleGroupTest.java
index 69bc4b8..61576d2 100644
--- a/core/src/test/java/org/apache/cxf/common/security/SimpleGroupTest.java
+++ b/core/src/test/java/org/apache/cxf/common/security/SimpleGroupTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class SimpleGroupTest extends Assert {
+public class SimpleGroupTest {
@Test
public void testName() {
diff --git a/core/src/test/java/org/apache/cxf/common/security/SimplePrincipalTest.java b/core/src/test/java/org/apache/cxf/common/security/SimplePrincipalTest.java
index 38348c0..9311fb7 100644
--- a/core/src/test/java/org/apache/cxf/common/security/SimplePrincipalTest.java
+++ b/core/src/test/java/org/apache/cxf/common/security/SimplePrincipalTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-public class SimplePrincipalTest extends Assert {
+public class SimplePrincipalTest {
@Test(expected = IllegalArgumentException.class)
public void testNullName() {
diff --git a/core/src/test/java/org/apache/cxf/common/util/ASMHelperTest.java b/core/src/test/java/org/apache/cxf/common/util/ASMHelperTest.java
index 4d246c4..95597a1 100644
--- a/core/src/test/java/org/apache/cxf/common/util/ASMHelperTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/ASMHelperTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class ASMHelperTest extends Assert {
+public class ASMHelperTest {
@Test
public void testEnumParamType() throws Exception {
Method method = EnumTest.class.getMethod("test", new Class[] {
diff --git a/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java b/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
index fff8a29..8cbc04f 100644
--- a/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-public class Base64UtilityTest extends Assert {
+public class Base64UtilityTest {
@Test
public void testEncodeMultipleChunks() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/common/util/ClassHelperTest.java b/core/src/test/java/org/apache/cxf/common/util/ClassHelperTest.java
index 7d58b1b..af10a34 100644
--- a/core/src/test/java/org/apache/cxf/common/util/ClassHelperTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/ClassHelperTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertSame;
-public class ClassHelperTest extends Assert {
+public class ClassHelperTest {
private Object proxiedObject;
diff --git a/core/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java
index c79d79c..fd6f6eb 100644
--- a/core/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class CollectionUtilsTest extends Assert {
+public class CollectionUtilsTest {
@Test
public void testDiff() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
index ab6b3f9..2d54560 100644
--- a/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class PackageUtilsTest extends Assert {
+public class PackageUtilsTest {
@Test
public void testGetClassPackageName() throws Exception {
String packageName = PackageUtils.getPackageName(this.getClass());
diff --git a/core/src/test/java/org/apache/cxf/common/util/PropertiesLoaderUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/PropertiesLoaderUtilsTest.java
index 248ee56..a16b899 100644
--- a/core/src/test/java/org/apache/cxf/common/util/PropertiesLoaderUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/PropertiesLoaderUtilsTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class PropertiesLoaderUtilsTest extends Assert {
+public class PropertiesLoaderUtilsTest {
Properties properties;
String soapBindingFactory = "org.apache.cxf.bindings.soap.SOAPBindingFactory";
diff --git a/core/src/test/java/org/apache/cxf/common/util/PropertyUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/PropertyUtilsTest.java
index 08c33a5..c2c4fb5 100644
--- a/core/src/test/java/org/apache/cxf/common/util/PropertyUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/PropertyUtilsTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class PropertyUtilsTest extends Assert {
+public class PropertyUtilsTest {
private static final String TEST_KEY = "my.key";
@Test
diff --git a/core/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java
index 81765a6..f155d27 100644
--- a/core/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class StringUtilsTest extends Assert {
+public class StringUtilsTest {
@Test
public void testDiff() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/common/util/URIParserUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/URIParserUtilsTest.java
index 08af072..77ad7d1 100644
--- a/core/src/test/java/org/apache/cxf/common/util/URIParserUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/URIParserUtilsTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
-public class URIParserUtilsTest extends Assert {
+public class URIParserUtilsTest {
@Test
public void testRelativize() throws URISyntaxException {
diff --git a/core/src/test/java/org/apache/cxf/common/util/UrlUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/UrlUtilsTest.java
index 28c5f98..6fc0a91 100644
--- a/core/src/test/java/org/apache/cxf/common/util/UrlUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/UrlUtilsTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class UrlUtilsTest extends Assert {
+public class UrlUtilsTest {
@Test
public void testUrlDecode() {
diff --git a/core/src/test/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtilsTest.java
index 599f847..2361ccc 100644
--- a/core/src/test/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtilsTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class XmlSchemaPrimitiveUtilsTest extends Assert {
+public class XmlSchemaPrimitiveUtilsTest {
@Test
public void testDefaultRepresentation() {
diff --git a/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java b/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java
index dfe1014..e5fc74d 100644
--- a/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java
+++ b/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java
@@ -65,7 +65,7 @@ import static org.junit.Assert.fail;
/**
*
*/
-public class ImportRepairTest extends Assert {
+public class ImportRepairTest {
static boolean dumpSchemas;
diff --git a/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java b/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
index 703733b..9b2a34b 100644
--- a/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
+++ b/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.assertTrue;
-public class ConfigurerImplTest extends Assert {
+public class ConfigurerImplTest {
static {
Class<?> cls;
diff --git a/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java b/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java
index e87d91f..28b590f 100644
--- a/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java
+++ b/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
-public class SuspendedInvocationExceptionTest extends Assert {
+public class SuspendedInvocationExceptionTest {
@Test
public void testValidRuntimeException() {
diff --git a/core/src/test/java/org/apache/cxf/databinding/AbstractDataBindingTest.java b/core/src/test/java/org/apache/cxf/databinding/AbstractDataBindingTest.java
index 1a651b7..5194cdc 100644
--- a/core/src/test/java/org/apache/cxf/databinding/AbstractDataBindingTest.java
+++ b/core/src/test/java/org/apache/cxf/databinding/AbstractDataBindingTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
/**
*
*/
-public class AbstractDataBindingTest extends Assert {
+public class AbstractDataBindingTest {
@Test(expected = IllegalArgumentException.class)
public void testNamespaceMapCheckDuplicates() {
Map<String, String> testMap = new HashMap<>();
diff --git a/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java b/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
index fcba099..d0427d2 100755
--- a/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertTrue;
/**
*
*/
-public class XMLStreamDataReaderTest extends Assert {
+public class XMLStreamDataReaderTest {
private static final byte[] DUMMY_DATA = "<ns:dummy xmlns:ns='http://www.apache.org/cxf'/>".getBytes();
@Test
diff --git a/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java b/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java
index b4f6605..6250231 100755
--- a/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java
+++ b/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertTrue;
/**
*
*/
-public class EndpointImplTest extends Assert {
+public class EndpointImplTest {
@Test
public void testEqualsAndHashCode() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java b/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java
index 900a287..ea2eac1 100644
--- a/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
import static org.junit.Assert.assertTrue;
-public class FileUtilsTest extends Assert {
+public class FileUtilsTest {
@Test
diff --git a/core/src/test/java/org/apache/cxf/helpers/IOUtilsTest.java b/core/src/test/java/org/apache/cxf/helpers/IOUtilsTest.java
index 4608367..53f8b88 100644
--- a/core/src/test/java/org/apache/cxf/helpers/IOUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/IOUtilsTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class IOUtilsTest extends Assert {
+public class IOUtilsTest {
@Test
diff --git a/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java b/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java
index 1fd0b8d..70df082 100644
--- a/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class NameSpaceTest extends Assert {
+public class NameSpaceTest {
private static final String MY_URL1 = "http://test.apache.org/testurl1";
private static final String MY_URL2 = "http://test.apache.org/testurl2";
diff --git a/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java b/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
index dad0e56..d5a4487 100644
--- a/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class ServiceUtilsTest extends Assert {
+public class ServiceUtilsTest {
private IMocksControl control;
private Message msg;
diff --git a/core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java
index e6da27e..c03d684 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
@SuppressWarnings("deprecation")
-public class LoggingInInterceptorTest extends Assert {
+public class LoggingInInterceptorTest {
static String encoding = "UTF-8";
static String contentType = "text/xml";
diff --git a/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java
index 8ab5b8f..5a8d14e 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java
@@ -49,7 +49,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
@SuppressWarnings("deprecation")
-public class LoggingOutInterceptorTest extends Assert {
+public class LoggingOutInterceptorTest {
protected IMocksControl control;
diff --git a/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
index 846418f..1eac10e 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
@@ -45,7 +45,7 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-public class OutgoingChainInterceptorTest extends Assert {
+public class OutgoingChainInterceptorTest {
private IMocksControl control;
private Bus bus;
diff --git a/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java
index 7b1765f..5de9f9c 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class ServiceInvokerInterceptorTest extends Assert {
+public class ServiceInvokerInterceptorTest {
@Test
public void testInterceptor() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/DefaultSecurityContextTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/DefaultSecurityContextTest.java
index cd184d2..ad55e1b 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/security/DefaultSecurityContextTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/DefaultSecurityContextTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-public class DefaultSecurityContextTest extends Assert {
+public class DefaultSecurityContextTest {
@Test
public void testUserNotInRole() {
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
index 1d3f042..1e3b3ba 100755
--- a/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertTrue;
/**
*
*/
-public class NamePasswordCallbackHandlerTest extends Assert {
+public class NamePasswordCallbackHandlerTest {
@Test
public void testHandleCallback() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImplTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImplTest.java
index 4416439..0f5a989 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImplTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImplTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-public class RolePrefixSecurityContextImplTest extends Assert {
+public class RolePrefixSecurityContextImplTest {
@Test
public void testUserNotInRole() {
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
index 90dd52f..ab822c0 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
@@ -41,7 +41,7 @@ import org.junit.Before;
import org.junit.Test;
-public class SecureAnnotationsInterceptorTest extends Assert {
+public class SecureAnnotationsInterceptorTest {
private Method method;
private Message message = new MessageImpl();
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
index 563d7a2..94e7195 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
@@ -37,7 +37,7 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-public class SimpleAuthorizingInterceptorTest extends Assert {
+public class SimpleAuthorizingInterceptorTest {
protected Message message = new MessageImpl();
private Method method;
diff --git a/core/src/test/java/org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java b/core/src/test/java/org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java
index ddbde8a..a85f293 100644
--- a/core/src/test/java/org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java
+++ b/core/src/test/java/org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
/**
*
*/
-public class CXFAPINamespaceHandlerTest extends Assert {
+public class CXFAPINamespaceHandlerTest {
@Test
public void testGetSchemaLocation() {
CXFAPINamespaceHandler handler = new CXFAPINamespaceHandler();
diff --git a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
index da4c36f..afca2b6 100755
--- a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
+++ b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
@@ -45,7 +45,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public abstract class CachedStreamTestBase extends Assert {
+public abstract class CachedStreamTestBase {
// use two typical ciphers for testing
private static final String[] CIPHER_LIST = {"RC4", "AES/CTR/NoPadding"};
diff --git a/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java b/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
index 73c46b1..fcb2cce 100644
--- a/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
+++ b/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
@@ -47,7 +47,7 @@ import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class PhaseInterceptorChainTest extends Assert {
+public class PhaseInterceptorChainTest {
private IMocksControl control;
diff --git a/core/src/test/java/org/apache/cxf/resource/ClassLoaderResolverTest.java b/core/src/test/java/org/apache/cxf/resource/ClassLoaderResolverTest.java
index 2cc7635..c81683c 100644
--- a/core/src/test/java/org/apache/cxf/resource/ClassLoaderResolverTest.java
+++ b/core/src/test/java/org/apache/cxf/resource/ClassLoaderResolverTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-public class ClassLoaderResolverTest extends Assert {
+public class ClassLoaderResolverTest {
private static final String RESOURCE_DATA = "this is the resource data";
private String resourceName;
diff --git a/core/src/test/java/org/apache/cxf/resource/DefaultResourceManagerTest.java b/core/src/test/java/org/apache/cxf/resource/DefaultResourceManagerTest.java
index 1f8c36f..ac06d66 100644
--- a/core/src/test/java/org/apache/cxf/resource/DefaultResourceManagerTest.java
+++ b/core/src/test/java/org/apache/cxf/resource/DefaultResourceManagerTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class DefaultResourceManagerTest extends Assert {
+public class DefaultResourceManagerTest {
private DefaultResourceManager manager;
private DummyResolver[] resolvers;
diff --git a/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java b/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java
index 3fa4512..94c9e2f 100644
--- a/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java
+++ b/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class URIResolverTest extends Assert {
+public class URIResolverTest {
private URIResolver uriResolver;
diff --git a/core/src/test/java/org/apache/cxf/service/model/BindingFaultInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/BindingFaultInfoTest.java
index db03fc1..2de2920 100644
--- a/core/src/test/java/org/apache/cxf/service/model/BindingFaultInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/BindingFaultInfoTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-public class BindingFaultInfoTest extends Assert {
+public class BindingFaultInfoTest {
private BindingFaultInfo bindingFaultInfo;
diff --git a/core/src/test/java/org/apache/cxf/service/model/BindingMessageInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/BindingMessageInfoTest.java
index 8d5f17d..7409c0c 100644
--- a/core/src/test/java/org/apache/cxf/service/model/BindingMessageInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/BindingMessageInfoTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-public class BindingMessageInfoTest extends Assert {
+public class BindingMessageInfoTest {
private BindingMessageInfo bindingMessageInfo;
diff --git a/core/src/test/java/org/apache/cxf/service/model/BindingOperationInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/BindingOperationInfoTest.java
index 50819a2..bd5fa47 100644
--- a/core/src/test/java/org/apache/cxf/service/model/BindingOperationInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/BindingOperationInfoTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class BindingOperationInfoTest extends Assert {
+public class BindingOperationInfoTest {
private static final String TEST_NS = "urn:test:ns";
private BindingOperationInfo bindingOperationInfo;
diff --git a/core/src/test/java/org/apache/cxf/service/model/FaultInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/FaultInfoTest.java
index 41af8aa..e08fc35 100644
--- a/core/src/test/java/org/apache/cxf/service/model/FaultInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/FaultInfoTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class FaultInfoTest extends Assert {
+public class FaultInfoTest {
private FaultInfo faultInfo;
diff --git a/core/src/test/java/org/apache/cxf/service/model/InterfaceInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/InterfaceInfoTest.java
index aa34d84..fb6623a 100644
--- a/core/src/test/java/org/apache/cxf/service/model/InterfaceInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/InterfaceInfoTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-public class InterfaceInfoTest extends Assert {
+public class InterfaceInfoTest {
private InterfaceInfo interfaceInfo;
diff --git a/core/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java
index 3cebccb..a662f09 100644
--- a/core/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class MessageInfoTest extends Assert {
+public class MessageInfoTest {
private MessageInfo messageInfo;
diff --git a/core/src/test/java/org/apache/cxf/service/model/MessagePartInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/MessagePartInfoTest.java
index 7646056..db689b9 100644
--- a/core/src/test/java/org/apache/cxf/service/model/MessagePartInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/MessagePartInfoTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class MessagePartInfoTest extends Assert {
+public class MessagePartInfoTest {
private MessagePartInfo messagePartInfo;
diff --git a/core/src/test/java/org/apache/cxf/service/model/OperationInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/OperationInfoTest.java
index d9c7bde..a81fa9e 100644
--- a/core/src/test/java/org/apache/cxf/service/model/OperationInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/OperationInfoTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class OperationInfoTest extends Assert {
+public class OperationInfoTest {
private OperationInfo operationInfo;
diff --git a/core/src/test/java/org/apache/cxf/staxutils/DepthRestrictingStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/DepthRestrictingStreamReaderTest.java
index 974484b..0562557 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/DepthRestrictingStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/DepthRestrictingStreamReaderTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
import static org.junit.Assert.assertTrue;
-public class DepthRestrictingStreamReaderTest extends Assert {
+public class DepthRestrictingStreamReaderTest {
@Test
public void testReaderOK() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java
index e577306..12174e4 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class DepthXMLStreamReaderTest extends Assert {
+public class DepthXMLStreamReaderTest {
@Test
public void testReader() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java
index 517331d..04bd40c 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class FragmentStreamReaderTest extends Assert {
+public class FragmentStreamReaderTest {
@Test
public void testReader() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/staxutils/PartialXMLStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/PartialXMLStreamReaderTest.java
index 586d55e..3e7efe6 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/PartialXMLStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/PartialXMLStreamReaderTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class PartialXMLStreamReaderTest extends Assert {
+public class PartialXMLStreamReaderTest {
@Test
public void testReader() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java
index d729ab9..e6aec72 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class PropertiesExpandingStreamReaderTest extends Assert {
+public class PropertiesExpandingStreamReaderTest {
@Test
public void testSystemPropertyExpansion() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/staxutils/StaxStreamFilterTest.java b/core/src/test/java/org/apache/cxf/staxutils/StaxStreamFilterTest.java
index 1e0718e..51125b6 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/StaxStreamFilterTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/StaxStreamFilterTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class StaxStreamFilterTest extends Assert {
+public class StaxStreamFilterTest {
public static final QName SOAP_ENV =
new QName("http://schemas.xmlsoap.org/soap/envelope/", "Envelope");
public static final QName SOAP_BODY =
diff --git a/core/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java
index 7710c79..3382b05 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class W3CDOMStreamReaderTest extends Assert {
+public class W3CDOMStreamReaderTest {
private static final String RESULT =
"<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\">"
diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContextTest.java b/core/src/test/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContextTest.java
index e31c35b..cd594f4 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContextTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContextTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class DelegatingNamespaceContextTest extends Assert {
+public class DelegatingNamespaceContextTest {
@Test
public void testSomeAddsAndGets() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
index 9656c4e..0fbaa65 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class InTransformReaderTest extends Assert {
+public class InTransformReaderTest {
@Test
public void testReadWithDefaultNamespace() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java b/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
index 9fc14ff..5c377f2 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
@@ -51,7 +51,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class OutTransformWriterTest extends Assert {
+public class OutTransformWriterTest {
@Test
public void testDefaultNamespace() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java b/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java
index cb234ce..5bf03b4 100644
--- a/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java
+++ b/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
import static org.junit.Assert.assertTrue;
-public class ChainInitiationObserverTest extends Assert {
+public class ChainInitiationObserverTest {
private IMocksControl control;
private TestChain chain;
diff --git a/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java b/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java
index d7c5cd8..d99d64b 100644
--- a/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java
+++ b/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class HttpUriMapperTest extends Assert {
+public class HttpUriMapperTest {
@Test
public void testGetContext() throws Exception {
diff --git a/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java b/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
index 1d3b682..39af3d9 100644
--- a/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
+++ b/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
@@ -52,7 +52,7 @@ import static org.junit.Assert.assertSame;
* be set correctly. For Accept-Encoding values that do not enable gzip the
* interceptor should not be added.
*/
-public class GZIPAcceptEncodingTest extends Assert {
+public class GZIPAcceptEncodingTest {
private GZIPOutInterceptor interceptor;
private Message inMessage;
diff --git a/core/src/test/java/org/apache/cxf/version/VersionTest.java b/core/src/test/java/org/apache/cxf/version/VersionTest.java
index c65ff35..27b780f 100644
--- a/core/src/test/java/org/apache/cxf/version/VersionTest.java
+++ b/core/src/test/java/org/apache/cxf/version/VersionTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class VersionTest extends Assert {
+public class VersionTest {
@Test
public void testLoadProperties() {
diff --git a/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java b/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
index 8217b91..defd9df 100644
--- a/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
+++ b/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class AutomaticWorkQueueTest extends Assert {
+public class AutomaticWorkQueueTest {
public static final int UNBOUNDED_MAX_QUEUE_SIZE = -1;
public static final int UNBOUNDED_HIGH_WATER_MARK = -1;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java
index aefbe13..1c80067 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class FireWallClassLoaderTest extends Assert {
+public class FireWallClassLoaderTest {
public FireWallClassLoaderTest() {
}
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
index b5c3e82..658017f 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.fail;
-public class PlugInClassLoaderTest extends Assert {
+public class PlugInClassLoaderTest {
private static final Logger LOG = LogUtils.getLogger(PlugInClassLoaderTest.class);
private static boolean debug;
PlugInClassLoader plugInClassLoader;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java
index 40b11e8..d6281d9 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class LoggerHelperTest extends Assert {
+public class LoggerHelperTest {
public static final String TEST_LOGGER_NAME = "test.logger";
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java
index c19c810..c676923 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class HandlerTest extends Assert {
+public class HandlerTest {
Handler h;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
index 436e42f..b29f0cf 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class ManagedConnectionFactoryImplTest extends Assert {
+public class ManagedConnectionFactoryImplTest {
DummyManagedConnectionFactoryImpl mcf = new DummyManagedConnectionFactoryImpl();
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
index 61a667b..757ba52 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class ManagedConnectionImplTest extends Assert {
+public class ManagedConnectionImplTest {
private DummyManagedConnectionImpl mc;
@Before
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java
index 3d89936..2339e2d 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class ResourceAdapterInternalExceptionTest extends Assert {
+public class ResourceAdapterInternalExceptionTest {
private static final Logger EXCEPTION_LOGGER =
LogUtils.getLogger(ResourceAdapterInternalException.class);
private Level logLevel;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceBeanTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceBeanTest.java
index 0c748db..11bc79e 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceBeanTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceBeanTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
-public class ResourceBeanTest extends Assert {
+public class ResourceBeanTest {
@Test
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java
index 2fb99c8..db7a09e 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class UriHandlerInitTest extends Assert {
+public class UriHandlerInitTest {
private static final String PROP_NAME = "java.protocol.handler.pkgs";
private static final String PKG_ADD = "do.do";
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java
index 9977dc4..8faaf90 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
import static org.junit.Assert.assertTrue;
-public class CXFConnectionRequestInfoTest extends Assert {
+public class CXFConnectionRequestInfoTest {
@Test
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
index 8836bf5..afd99ff 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class ConnectionFactoryImplTest extends Assert {
+public class ConnectionFactoryImplTest {
ManagedConnectionFactory mockConnectionFactory;
ConnectionManager mockConnectionManager;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
index 56f456e..2c48fcf 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
@@ -50,7 +50,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class ManagedConnectionFactoryImplTest extends Assert {
+public class ManagedConnectionFactoryImplTest {
protected ManagedConnectionFactoryImpl mci;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
index 4361a08..ff39a23 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
@@ -36,7 +36,7 @@ import org.junit.Assert;
import org.junit.Before;
-public abstract class ManagedConnectionTestBase extends Assert {
+public abstract class ManagedConnectionTestBase {
protected Subject subj;
protected CXFConnectionRequestInfo cri;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
index 55f7deb..f004268 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
@@ -45,7 +45,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class ResourceAdapterImplTest extends Assert {
+public class ResourceAdapterImplTest {
public ResourceAdapterImplTest() {
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
index fffffc4..ed327b9 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
@@ -33,7 +33,7 @@ import org.junit.Test;
import static org.junit.Assert.fail;
-public class HandlerTestBase extends Assert {
+public class HandlerTestBase {
protected Bus mockBus = EasyMock.createMock(Bus.class);
protected CXFManagedConnection mockManagedConnection =
EasyMock.createMock(CXFManagedConnection.class);
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java
index 0b10e4b..b2ff052 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertTrue;
-public class JarLoaderTest extends Assert {
+public class JarLoaderTest {
private static final Logger LOG = LogUtils.getLogger(JarLoaderTest.class);
private URL exampleRarURL;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java
index 551b0e8..0e59707 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertEquals;
/**
*
*/
-public class EJBEndpointTest extends Assert {
+public class EJBEndpointTest {
private EJBEndpoint endpoint;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java
index 50f3e1e..873d5bc 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
-public class EJBServantConfigTest extends Assert {
+public class EJBServantConfigTest {
@Test
public void testNoWsdl() throws Exception {
diff --git a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
index 4075a8a..3748b0b 100644
--- a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
+++ b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
@@ -49,7 +49,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class ColocMessageObserverTest extends Assert {
+public class ColocMessageObserverTest {
private IMocksControl control = EasyMock.createNiceControl();
private ColocMessageObserver observer;
private Message msg;
diff --git a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
index decfa9c..64f17f6 100644
--- a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
+++ b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
@@ -63,7 +63,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.fail;
-public class ColocOutInterceptorTest extends Assert {
+public class ColocOutInterceptorTest {
private static final String COLOCATED = Message.class.getName() + ".COLOCATED";
private IMocksControl control = EasyMock.createNiceControl();
private ColocOutInterceptor colocOut;
diff --git a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java
index 14c98bf..bce9d80 100644
--- a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java
+++ b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java
@@ -57,7 +57,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
-public class ColocUtilTest extends Assert {
+public class ColocUtilTest {
private IMocksControl control = EasyMock.createNiceControl();
private Bus bus;
diff --git a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandlerTest.java b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandlerTest.java
index bf8804f..2d3ccdb 100644
--- a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandlerTest.java
+++ b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
/**
*
*/
-public class ColocBPNamespaceHandlerTest extends Assert {
+public class ColocBPNamespaceHandlerTest {
@Test
public void testGetSchemaLocation() {
ColocBPNamespaceHandler handler = new ColocBPNamespaceHandler();
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
index aec3790..1d86305 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
@@ -52,7 +52,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class CorbaBindingFactoryTest extends Assert {
+public class CorbaBindingFactoryTest {
protected Bus bus;
protected EndpointInfo endpointInfo;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
index c7422b2..e7768f8 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class CorbaBindingTest extends Assert {
+public class CorbaBindingTest {
private ORB orb;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
index 872bf6b..fc187cc 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
@@ -66,7 +66,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class CorbaConduitTest extends Assert {
+public class CorbaConduitTest {
private static IMocksControl control;
private static ORB orb;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java
index f8d02a0..4be9547 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class CorbaDestinationTest extends Assert {
+public class CorbaDestinationTest {
protected static TestUtils testUtils;
EndpointInfo endpointInfo;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java
index 08f65fd..9e8f2ac 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java
@@ -38,7 +38,7 @@ import org.junit.Test;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class CorbaMessageTest extends Assert {
+public class CorbaMessageTest {
private static ORB orb;
private Message message;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
index 3b0d518..0da3718 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
@@ -56,7 +56,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class CorbaServerConduitTest extends Assert {
+public class CorbaServerConduitTest {
protected EndpointInfo endpointInfo;
protected EndpointReferenceType target;
protected MessageObserver observer;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java
index 21846f1..c190844 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class CorbaTypeMapTest extends Assert {
+public class CorbaTypeMapTest {
@Test
public void testCorbaTypeMap() throws Exception {
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java
index 00fc8c3..c22f122 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class CorbaDSIServantTest extends Assert {
+public class CorbaDSIServantTest {
protected static ORB orb;
protected static Bus bus;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
index d5408b9..d0b9781 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
@@ -60,7 +60,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class CorbaObjectReaderTest extends Assert {
+public class CorbaObjectReaderTest {
private static ORB orb;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
index df4d534..25ec429 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
@@ -53,7 +53,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class CorbaObjectWriterTest extends Assert {
+public class CorbaObjectWriterTest {
private static ORB orb;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
index ab0830e..0cf5cfc 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class CorbaStreamReaderTest extends Assert {
+public class CorbaStreamReaderTest {
private CorbaStreamReader reader;
private CorbaTypeEventProducer mock;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java
index eb303fa..7574086 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class CorbaStreamWriterTest extends Assert {
+public class CorbaStreamWriterTest {
@Test
public void writeCharactersTest() throws XMLStreamException {
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
index a5c8aef..b873545 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class CorbaStreamableTest extends Assert {
+public class CorbaStreamableTest {
private static ORB orb;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
index 3aebe6f..06a89d4 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class CorbaAnyHandlerTest extends Assert {
+public class CorbaAnyHandlerTest {
private ORB orb;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
index 6278b0f..020a561 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class CorbaArrayHandlerTest extends Assert {
+public class CorbaArrayHandlerTest {
private ORB orb;
private CorbaArrayHandler obj;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
index acd15f2..62367e1 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class CorbaEnumHandlerTest extends Assert {
+public class CorbaEnumHandlerTest {
private ORB orb;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java
index c06f492..ed70760 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class CorbaFixedHandlerTest extends Assert {
+public class CorbaFixedHandlerTest {
private ORB orb;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java
index 8d71e47..920a490 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class CorbaHandlerUtilsTest extends Assert {
+public class CorbaHandlerUtilsTest {
protected EndpointInfo endpointInfo;
BindingFactory factory;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
index 9e5b9bb..2773346 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class CorbaObjectHandlerTest extends Assert {
+public class CorbaObjectHandlerTest {
private ORB orb;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
index 5ca41a7..e360070 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class CorbaPrimitiveHandlerTest extends Assert {
+public class CorbaPrimitiveHandlerTest {
private ORB orb;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
index 25aecec..e697e9d 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class CorbaSequenceHandlerTest extends Assert {
+public class CorbaSequenceHandlerTest {
private ORB orb;
private CorbaSequenceHandler obj;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java
index 9f06e91..1ab67c2 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertTrue;
// Since the exception handler is essentially the same as the struct handler (just included in case
// structs and exceptions diverge at a later date), this test should cover both.
-public class CorbaStructHandlerTest extends Assert {
+public class CorbaStructHandlerTest {
private ORB orb;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java
index 42c9cf9..f406425 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertEquals;
/**
* Holder for utility methods relating to contexts.
*/
-public final class ContextUtilsTest extends Assert {
+public final class ContextUtilsTest {
@Test
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java
index c34772c..5b1e68e 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class CorbaUtilsTest extends Assert {
+public class CorbaUtilsTest {
private static ORB orb;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
index 4d2dbd4..46c5efc 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
@@ -52,7 +52,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class ServiceModelUtilTest extends Assert {
+public class ServiceModelUtilTest {
private static final String WSDL_PATH = "test-soap-header.wsdl";
private Definition def;
private Service service;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
index d95dd87..820f694 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class SoapActionInterceptorTest extends Assert {
+public class SoapActionInterceptorTest {
@Test
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
index a9a00bb..e32615a 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
@@ -59,7 +59,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class SoapBindingFactoryTest extends Assert {
+public class SoapBindingFactoryTest {
IMocksControl control;
@Before
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
index 568fbdc..f9e0dfa 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class SoapBindingTest extends Assert {
+public class SoapBindingTest {
@Test
public void testCreateMessage() throws Exception {
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
index 9688162..c19a5df 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
@@ -53,7 +53,7 @@ import org.junit.Before;
import static org.junit.Assert.assertNotNull;
-public class TestBase extends Assert {
+public class TestBase {
protected PhaseInterceptorChain chain;
protected SoapMessage soapMessage;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java
index 8c82fef..6befb26 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
/**
*
*/
-public class SoapBindingBPHandlerTest extends Assert {
+public class SoapBindingBPHandlerTest {
@Test
public void testGetSchemaLocation() {
SoapBindingBPHandler handler = new SoapBindingBPHandler();
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptorTest.java
index 67c455a..9e64cc3 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptorTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertNull;
/**
*
*/
-public class ReadHeadersInterceptorTest extends Assert {
+public class ReadHeadersInterceptorTest {
private static final byte[] TEST_SOAP =
("<soap:Envelope xmlns:soap='http://schemas.xmlsoap.org/soap/envelope/'"
+ " xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'"
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
index de75608..2f00a09 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertNull;
/**
*
*/
-public class SoapActionInInterceptorTest extends Assert {
+public class SoapActionInInterceptorTest {
private IMocksControl control;
@Before
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
index a2f5de7..8c7085b 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
@@ -58,7 +58,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
-public class SoapFaultSerializerTest extends Assert {
+public class SoapFaultSerializerTest {
private void assertValid(String xpathExpression, Document doc) {
Map<String, String> namespaces = new HashMap<>();
namespaces.put("s", "http://schemas.xmlsoap.org/soap/envelope/");
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
index 72d92a9..4ca2507 100755
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
@@ -51,7 +51,7 @@ import static org.junit.Assert.assertTrue;
/**
*
*/
-public class SoapPreProtocolOutInterceptorTest extends Assert {
+public class SoapPreProtocolOutInterceptorTest {
private IMocksControl control;
private SoapPreProtocolOutInterceptor interceptor;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
index 9ba1367..263ef5d 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertSame;
/**
*
*/
-public class SoapFaultFactoryTest extends Assert {
+public class SoapFaultFactoryTest {
private IMocksControl control;
private JMSFault jmsFault;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
index 1568cd7..d2ac3e8 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
@@ -47,7 +47,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class ParseBodyTest extends Assert {
+public class ParseBodyTest {
static final String[] DATA = {
"<SOAP-ENV:Body xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\">\n"
+ " <foo>\n <bar/>\n </foo>\n</SOAP-ENV:Body>",
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
index b1d8373..96188f1 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
import static org.junit.Assert.assertTrue;
-public class XMLBindingFactoryTest extends Assert {
+public class XMLBindingFactoryTest {
@Test
public void testContainsInAttachmentInterceptor() {
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
index fea782c..765ee64 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
@@ -61,7 +61,7 @@ import org.junit.Before;
import static org.junit.Assert.assertNotNull;
-public class TestBase extends Assert {
+public class TestBase {
protected PhaseInterceptorChain chain;
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/DOMMappingTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/DOMMappingTest.java
index 58ca056..4ea7b77 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/DOMMappingTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/DOMMappingTest.java
@@ -39,7 +39,6 @@ import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
/**
* Test mapping DOM.
@@ -96,4 +95,4 @@ public class DOMMappingTest extends AbstractAegisTest {
assertEquals("Is a root vegetable.", text);
*/
}
-}
\ No newline at end of file
+}
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/SchemaAddinsTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/SchemaAddinsTest.java
index 57b42c5..2677815 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/SchemaAddinsTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/SchemaAddinsTest.java
@@ -26,14 +26,13 @@ import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.commons.schema.XmlSchemaSerializer;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
-public class SchemaAddinsTest extends Assert {
+public class SchemaAddinsTest {
private TestUtilities testUtilities;
@Before
@@ -66,4 +65,4 @@ public class SchemaAddinsTest extends Assert {
}
-}
\ No newline at end of file
+}
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfoTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfoTest.java
index 9ec715f..57a9e7f 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfoTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfoTest.java
@@ -29,6 +29,7 @@ import org.apache.cxf.aegis.type.basic.BeanTypeInfo;
import org.apache.cxf.aegis.xml.stax.ElementReader;
import org.apache.ws.commons.schema.constants.Constants;
+import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -98,10 +99,10 @@ public class ArrayTypeInfoTest extends AbstractAegisTest {
ArrayTypeInfo actual = new ArrayTypeInfo(getNamespaceContext(), actualString);
// only compare local part because prefix is only resolved when using the MessageReader constructor
- assertEquals(expected.getRanks(), actual.getRanks());
- assertEquals(expected.getDimensions(), actual.getDimensions());
+ Assert.assertEquals(expected.getRanks(), actual.getRanks());
+ Assert.assertEquals(expected.getDimensions(), actual.getDimensions());
if (expected.getType() != null) {
- assertEquals(expected.getTypeName().getLocalPart(), actual.getTypeName().getLocalPart());
+ Assert.assertEquals(expected.getTypeName().getLocalPart(), actual.getTypeName().getLocalPart());
if (expected.getRanks() == 0) {
assertSame(addressType, actual.getType());
} else {
@@ -109,7 +110,7 @@ public class ArrayTypeInfoTest extends AbstractAegisTest {
+ actual.getType().getClass().getName(), actual.getType() instanceof SoapArrayType);
}
}
- assertEquals(expected.toString(), actual.toString());
+ Assert.assertEquals(expected.toString(), actual.toString());
String xml = "<b:array xmlns:b=\"urn:Bean\"\n"
+ " xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"\n"
@@ -119,10 +120,10 @@ public class ArrayTypeInfoTest extends AbstractAegisTest {
ElementReader reader = new ElementReader(new ByteArrayInputStream(xml.getBytes()));
actual = new ArrayTypeInfo(reader, mapping);
- assertEquals(expected.getRanks(), actual.getRanks());
- assertEquals(expected.getDimensions(), actual.getDimensions());
+ Assert.assertEquals(expected.getRanks(), actual.getRanks());
+ Assert.assertEquals(expected.getDimensions(), actual.getDimensions());
if (expected.getType() != null) {
- assertEquals(expected.getTypeName(), actual.getTypeName());
+ Assert.assertEquals(expected.getTypeName(), actual.getTypeName());
if (expected.getRanks() == 0) {
assertSame(addressType, actual.getType());
} else {
@@ -130,7 +131,7 @@ public class ArrayTypeInfoTest extends AbstractAegisTest {
+ actual.getType().getClass().getName(), actual.getType() instanceof SoapArrayType);
}
}
- assertEquals(expected.toString(), actual.toString());
+ Assert.assertEquals(expected.toString(), actual.toString());
}
public void assertInvalid(String actualString) {
@@ -141,4 +142,4 @@ public class ArrayTypeInfoTest extends AbstractAegisTest {
// expected
}
}
-}
\ No newline at end of file
+}
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
index 2c3edd7..e96b1c5 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
@@ -66,7 +66,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class BareInInterceptorTest extends Assert {
+public class BareInInterceptorTest {
PhaseInterceptorChain chain;
MessageImpl message;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
index 2898c6c..4bdc083 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
@@ -65,7 +65,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class DocLiteralInInterceptorTest extends Assert {
+public class DocLiteralInInterceptorTest {
PhaseInterceptorChain chain;
MessageImpl message;
Bus bus;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
index 0d83f7b..2171c7b 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
@@ -82,7 +82,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class JAXBDataBindingTest extends Assert {
+public class JAXBDataBindingTest {
private static final Logger LOG = LogUtils.getLogger(JAXBDataBindingTest.class);
private static final String WSDL_PATH = "/wsdl/jaxb/hello_world.wsdl";
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
index a3a15f7..204afe0 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
@@ -81,7 +81,7 @@ import static org.junit.Assert.fail;
/**
* JAXBEncoderDecoderTest
*/
-public class JAXBEncoderDecoderTest extends Assert {
+public class JAXBEncoderDecoderTest {
public static final QName SOAP_ENV =
new QName("http://schemas.xmlsoap.org/soap/envelope/", "Envelope");
public static final QName SOAP_BODY =
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
index 53d7a8e..85a68b9 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-public class JAXBUtilsTest extends Assert {
+public class JAXBUtilsTest {
@Test
public void testBuiltInTypeToJavaType() {
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
index 021a3db..1180307 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class JAXBWrapperHelperTest extends Assert {
+public class JAXBWrapperHelperTest {
@Test
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
index bda68df..318c8fc 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
@@ -61,7 +61,7 @@ import org.junit.Before;
import static org.easymock.EasyMock.createNiceControl;
import static org.easymock.EasyMock.expect;
-public class TestBase extends Assert {
+public class TestBase {
PhaseInterceptorChain chain;
MessageImpl message;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java
index 61ba87f..b710a40 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
import static org.junit.Assert.fail;
-public class UtilsTest extends Assert {
+public class UtilsTest {
@Test
public void testGetMethod() {
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
index a2bd3f8..fa2de23 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
@@ -49,7 +49,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class XMLStreamDataReaderTest extends Assert {
+public class XMLStreamDataReaderTest {
private XMLInputFactory factory;
private XMLStreamReader reader;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java
index b0cece2..b79e09b 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java
@@ -55,7 +55,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class XMLStreamDataWriterTest extends Assert {
+public class XMLStreamDataWriterTest {
private ByteArrayOutputStream baos;
private XMLStreamWriter streamWriter;
private XMLInputFactory inFactory;
diff --git a/rt/features/clustering/src/test/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandlerTest.java b/rt/features/clustering/src/test/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandlerTest.java
index 31b1c8d..54025b9 100644
--- a/rt/features/clustering/src/test/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandlerTest.java
+++ b/rt/features/clustering/src/test/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
/**
*
*/
-public class ClusteringBPNamespaceHandlerTest extends Assert {
+public class ClusteringBPNamespaceHandlerTest {
@Test
public void testGetSchemaLocation() {
ClusteringBPNamespaceHandler handler = new ClusteringBPNamespaceHandler();
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java
index 7e8b6d6..048e261 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
-public class JAXRSServerFactoryBeanTest extends Assert {
+public class JAXRSServerFactoryBeanTest {
@Test
public void testRegisterProviders() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBeanTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBeanTest.java
index a732eb1..a8e8b7a 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBeanTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBeanTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class JAXRSServiceFactoryBeanTest extends Assert {
+public class JAXRSServiceFactoryBeanTest {
@Before
public void setUp() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
index 62a7752..eb286b8 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
@@ -65,7 +65,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
-public class SelectMethodCandidatesTest extends Assert {
+public class SelectMethodCandidatesTest {
@Test
public void testFindFromAbstractGenericClass() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandlerTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandlerTest.java
index 483e7d4..ce0a9b1 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandlerTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
/**
*
*/
-public class JAXRSBPNamespaceHandlerTest extends Assert {
+public class JAXRSBPNamespaceHandlerTest {
@Test
public void testGetSchemaLocation() {
JAXRSBPNamespaceHandler handler = new JAXRSBPNamespaceHandler();
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java
index 4b30816..4b03bf3 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java
@@ -57,7 +57,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
-public class MessageContextImplTest extends Assert {
+public class MessageContextImplTest {
@Test
public void testGetProperty() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/form/FormTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/form/FormTest.java
index 620f248..3049f77 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/form/FormTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/form/FormTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class FormTest extends Assert {
+public class FormTest {
@Test
public void testToString() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentTest.java
index 14b3d44..df47318 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class AttachmentTest extends Assert {
+public class AttachmentTest {
@Test
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/ContentDispositionTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/ContentDispositionTest.java
index 60d3e95..3b8d543 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/ContentDispositionTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/ContentDispositionTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class ContentDispositionTest extends Assert {
+public class ContentDispositionTest {
@Test
public void testContentDisposition() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBodyTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBodyTest.java
index d70b67f..b16a3f9 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBodyTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBodyTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
-public class MultipartBodyTest extends Assert {
+public class MultipartBodyTest {
@Test
public void testGetAttachments() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java
index 7c24c5d..30ca101 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class XMLSourceTest extends Assert {
+public class XMLSourceTest {
@Test
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/AsyncResponseImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/AsyncResponseImplTest.java
index adb269f..4b4ae79 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/AsyncResponseImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/AsyncResponseImplTest.java
@@ -40,7 +40,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class AsyncResponseImplTest extends Assert {
+public class AsyncResponseImplTest {
private IMocksControl control;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProviderTest.java
index bfe3ec3..3e555ea 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProviderTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class CacheControlHeaderProviderTest extends Assert {
+public class CacheControlHeaderProviderTest {
@Test(expected = IllegalArgumentException.class)
public void testValueOfNull() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java
index 2985dd5..33b24ef 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java
@@ -57,7 +57,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class ConfigurationImplTest extends Assert {
+public class ConfigurationImplTest {
@Test
public void testIsRegistered() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CookieHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CookieHeaderProviderTest.java
index ee06bb9..4538940 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CookieHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/CookieHeaderProviderTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class CookieHeaderProviderTest extends Assert {
+public class CookieHeaderProviderTest {
@Test
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/DateHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/DateHeaderProviderTest.java
index 7383d19..013b95d 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/DateHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/DateHeaderProviderTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class DateHeaderProviderTest extends Assert {
+public class DateHeaderProviderTest {
@Test
public void testToFromSimpleString() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProviderTest.java
index b636f2a..66e1688 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProviderTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class EntityTagHeaderProviderTest extends Assert {
+public class EntityTagHeaderProviderTest {
@Test
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
index 456af44..b162c80 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
@@ -47,7 +47,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class HttpHeadersImplTest extends Assert {
+public class HttpHeadersImplTest {
@Test
public void testNoRequestHeader() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java
index dab2e28..1ce55f1 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class LinkBuilderImplTest extends Assert {
+public class LinkBuilderImplTest {
@Test
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkHeaderProviderTest.java
index d843753..c463c8d 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkHeaderProviderTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class LinkHeaderProviderTest extends Assert {
+public class LinkHeaderProviderTest {
@Test
public void testFromSimpleString() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProviderTest.java
index d7585c5..64e6ad4 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProviderTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-public class MediaTypeHeaderProviderTest extends Assert {
+public class MediaTypeHeaderProviderTest {
@Test(expected = IllegalArgumentException.class)
public void testNullValue() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java
index 3b025e2..ca42227 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertTrue;
-public class MetadataMapTest extends Assert {
+public class MetadataMapTest {
@Test
public void testPutSingle() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProviderTest.java
index 29edcac..f9f2950 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProviderTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class NewCookieHeaderProviderTest extends Assert {
+public class NewCookieHeaderProviderTest {
@Test(expected = IllegalArgumentException.class)
public void testNullValue() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/PathSegmentImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/PathSegmentImplTest.java
index 44bf6b3..e76e36d 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/PathSegmentImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/PathSegmentImplTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class PathSegmentImplTest extends Assert {
+public class PathSegmentImplTest {
@Test
public void testPlainPathSegment() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java
index 9e35bae..681b3c9 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java
@@ -47,7 +47,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
-public class RequestImplTest extends Assert {
+public class RequestImplTest {
private Message m;
private MultivaluedMap<String, String> metadata;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java
index 110f2b5..b70dddf 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.assertEquals;
-public class RequestPreprocessorTest extends Assert {
+public class RequestPreprocessorTest {
private IMocksControl control;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImplTest.java
index bc42000..a75bc30 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImplTest.java
@@ -51,7 +51,7 @@ import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-public class ResponseBuilderImplTest extends Assert {
+public class ResponseBuilderImplTest {
@Test
public void testStatusSet() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
index 1eb9fcc..0b5f308 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
@@ -73,7 +73,7 @@ import static org.junit.Assert.assertTrue;
@SuppressWarnings("resource") // Responses built in this test don't need to be closed
-public class ResponseImplTest extends Assert {
+public class ResponseImplTest {
@Test
public void testReadEntityWithNullOutMessage() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImplTest.java
index 76e3e3e..0c7d1e0 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImplTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
import static org.junit.Assert.assertSame;
-public class RuntimeDelegateImplTest extends Assert {
+public class RuntimeDelegateImplTest {
@Test
public void testRuntimeDelegate() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/SecurityContextImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/SecurityContextImplTest.java
index 9c728ec..ff1631d 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/SecurityContextImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/SecurityContextImplTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class SecurityContextImplTest extends Assert {
+public class SecurityContextImplTest {
@Test
public void testAuthenticationScheme() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java
index 3ebe6ea..5551a3b 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java
@@ -43,7 +43,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-public class UriBuilderImplTest extends Assert {
+public class UriBuilderImplTest {
@Test
public void testFromUriRelativePath() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java
index 0ce2d37..816c8e5 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java
@@ -53,7 +53,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class UriInfoImplTest extends Assert {
+public class UriInfoImplTest {
private IMocksControl control;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImplTest.java
index 49d402c..3a1b45b 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImplTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class VariantListBuilderImplTest extends Assert {
+public class VariantListBuilderImplTest {
@Test
public void testBuildAll() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/lifecycle/PerRequestResourceProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/lifecycle/PerRequestResourceProviderTest.java
index ab72088..9675246 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/lifecycle/PerRequestResourceProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/lifecycle/PerRequestResourceProviderTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class PerRequestResourceProviderTest extends Assert {
+public class PerRequestResourceProviderTest {
@Test
public void testGetInstance() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java
index 75184da..00384a7 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java
@@ -57,7 +57,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-public class ClassResourceInfoTest extends Assert {
+public class ClassResourceInfoTest {
@Path("/bar")
@Produces("test/bar")
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/OperationResourceInfoTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/OperationResourceInfoTest.java
index 70b9f92..f7aa337 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/OperationResourceInfoTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/OperationResourceInfoTest.java
@@ -38,7 +38,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class OperationResourceInfoTest extends Assert {
+public class OperationResourceInfoTest {
@Produces("text/xml")
@Consumes("application/xml")
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java
index 5ba6642..4fbb06a 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class URITemplateTest extends Assert {
+public class URITemplateTest {
@Before
public void setUp() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/doc/JavaDocProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/doc/JavaDocProviderTest.java
index a4a4ef6..ed0aaf0 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/doc/JavaDocProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/doc/JavaDocProviderTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class JavaDocProviderTest extends Assert {
+public class JavaDocProviderTest {
@Test
public void testJava6Docs() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/BinaryDataProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/BinaryDataProviderTest.java
index 4b228de..535428c 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/BinaryDataProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/BinaryDataProviderTest.java
@@ -44,7 +44,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class BinaryDataProviderTest extends Assert {
+public class BinaryDataProviderTest {
@Test
public void testIsWriteable() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
index da74286..0cb88ea 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class DataSourceProviderTest extends Assert {
+public class DataSourceProviderTest {
@Test
public void testReadDataHandler() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
index 7b10077..e73af66 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class FormEncodingProviderTest extends Assert {
+public class FormEncodingProviderTest {
@Test
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
index af8c77f..cf49905 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
@@ -107,7 +107,7 @@ import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class JAXBElementProviderTest extends Assert {
+public class JAXBElementProviderTest {
@Test
public void testReadFromISO() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
index c8c03d7..ba41b74 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class PrimitiveTextProviderTest extends Assert {
+public class PrimitiveTextProviderTest {
@Test
public void testNumberIsWriteable() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
index a411519..58b0c94 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
@@ -90,7 +90,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-public class ProviderFactoryTest extends Assert {
+public class ProviderFactoryTest {
@Before
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProviderTest.java
index eb62eac..e0d6377 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProviderTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class RequestDispatcherProviderTest extends Assert {
+public class RequestDispatcherProviderTest {
@Test
public void testIsWriteableEnum() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java
index 1deda4d..c8f2cad 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java
@@ -56,7 +56,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-public class SourceProviderTest extends Assert {
+public class SourceProviderTest {
@Test
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java
index 6e871f7..a3fa356 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class XPathProviderTest extends Assert {
+public class XPathProviderTest {
@Test
public void testIsReadableClassName() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java
index 4ff4380..a3a26ef 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java
@@ -53,7 +53,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class XSLTJaxbProviderTest extends Assert {
+public class XSLTJaxbProviderTest {
private static final String TEMPLATE_LOCATION = "classpath:/org/apache/cxf/jaxrs/provider/template.xsl";
private static final String BOOK_XML = "<Book><id>123</id><name>TheBook</name></Book>";
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilterTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilterTest.java
index 63846e3..c50e0a0 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilterTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilterTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class JAASAuthenticationFilterTest extends Assert {
+public class JAASAuthenticationFilterTest {
@Test
public void testRFC2617() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java
index ef73027..f059859 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertSame;
-public class JAXRSServerFactoryBeanTest extends Assert {
+public class JAXRSServerFactoryBeanTest {
@After
public void tearDown() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/SpringResourceFactoryTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/SpringResourceFactoryTest.java
index f7c4337..be58b2f 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/SpringResourceFactoryTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/SpringResourceFactoryTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertSame;
-public class SpringResourceFactoryTest extends Assert {
+public class SpringResourceFactoryTest {
@After
public void tearDown() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java
index 3e7c7d8..57c3046 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
-public class AnnotationTestUtilsTest extends Assert {
+public class AnnotationTestUtilsTest {
@Test
public void testGetAnnotatedMethodFromInterface() throws Exception {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ExceptionUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ExceptionUtilsTest.java
index 4ed7419..b6f5f30 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ExceptionUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ExceptionUtilsTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertEquals;
-public class ExceptionUtilsTest extends Assert {
+public class ExceptionUtilsTest {
@Test
public void testConvertFaultToResponseWAEWithResponse() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java
index 4e06bbd..3c87da2 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class FormUtilsTest extends Assert {
+public class FormUtilsTest {
private static final String HTTP_PARAM1 = "httpParam1";
private static final String HTTP_PARAM2 = "httpParam2";
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
index e3af69f..ce6ec20 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class HttpUtilsTest extends Assert {
+public class HttpUtilsTest {
@Test
public void testEncodePartiallyEncoded() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
index be546b4..a870a99 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
@@ -62,7 +62,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class InjectionUtilsTest extends Assert {
+public class InjectionUtilsTest {
@Test
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
index 830d23f..bc0e674 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
@@ -120,7 +120,7 @@ import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class JAXRSUtilsTest extends Assert {
+public class JAXRSUtilsTest {
@Before
public void setUp() {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java
index 50f6aa9..6fabc05 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java
@@ -57,7 +57,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class ResourceUtilsTest extends Assert {
+public class ResourceUtilsTest {
@Test
public void testFindResourceConstructor() {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
index 81083a2..6318258 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
@@ -54,7 +54,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class ConfiguredEndpointTest extends Assert {
+public class ConfiguredEndpointTest {
private static final QName SERVICE_NAME =
new QName("http://apache.org/hello_world_soap_http", "SOAPService");
private static final QName PORT_NAME =
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
index 4a27ca4..bb9dc0d 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
@@ -66,7 +66,7 @@ import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class JAXWSMethodInvokerTest extends Assert {
+public class JAXWSMethodInvokerTest {
private static final QName TEST_HEADER_NAME = new QName("testHeader");
Factory factory = EasyMock.createMock(Factory.class);
Object target = EasyMock.createMock(Hello.class);
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java
index 7fc83009..d4035c4 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java
@@ -42,7 +42,7 @@ import org.junit.Assert;
import static org.junit.Assert.assertTrue;
-public class WrapperClassGeneratorTest extends Assert {
+public class WrapperClassGeneratorTest {
@After
public void tearDown() {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandlerTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandlerTest.java
index 83a75d3..9a543d9 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandlerTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
/**
*
*/
-public class JAXWSBPNamespaceHandlerTest extends Assert {
+public class JAXWSBPNamespaceHandlerTest {
@Test
public void testGetSchemaLocation() {
JAXWSBPNamespaceHandler handler = new JAXWSBPNamespaceHandler();
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
index e6eb853..c6d0091 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-public class WebServiceContextImplTest extends Assert {
+public class WebServiceContextImplTest {
@After
public void tearDown() {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java
index bc49678..f2a9ba2 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertTrue;
/**
*
*/
-public class WrappedAttachmentsTest extends Assert {
+public class WrappedAttachmentsTest {
@Test
public void testCreateAndModify() {
Map<String, DataHandler> content = new HashMap<>();
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedMessageContextTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedMessageContextTest.java
index 0e579e9..49eb78f 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedMessageContextTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedMessageContextTest.java
@@ -45,7 +45,7 @@ import static org.junit.Assert.fail;
/**
*
*/
-public class WrappedMessageContextTest extends Assert {
+public class WrappedMessageContextTest {
@Test
public void testPutAndGetJaxwsAttachments() throws Exception {
WrappedMessageContext context =
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java
index 25bf7d8..5b3f75a 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java
@@ -42,7 +42,7 @@ import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.isA;
import static org.junit.Assert.assertEquals;
-public class AbstractProtocolHandlerInterceptorTest extends Assert {
+public class AbstractProtocolHandlerInterceptorTest {
private IMocksControl control;
private Binding binding;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java
index 59f4fb9..e166295 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class AnnotationHandlerChainBuilderTest extends Assert {
+public class AnnotationHandlerChainBuilderTest {
@Before
public void setUp() {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java
index 4fad9eb..a96d6de 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java
@@ -48,7 +48,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@SuppressWarnings("rawtypes")
-public class HandlerChainBuilderTest extends Assert {
+public class HandlerChainBuilderTest {
Handler[] allHandlers = {EasyMock.createMock(LogicalHandler.class), EasyMock.createMock(Handler.class),
EasyMock.createMock(Handler.class), EasyMock.createMock(LogicalHandler.class)};
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
index 6ed724b..acbf297 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
@@ -61,7 +61,7 @@ import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class HandlerChainInvokerTest extends Assert {
+public class HandlerChainInvokerTest {
private static final int HANDLER_COUNT = 4;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/InitParamResourceResolverTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/InitParamResourceResolverTest.java
index 6ecb04d..7216786 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/InitParamResourceResolverTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/InitParamResourceResolverTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class InitParamResourceResolverTest extends Assert {
+public class InitParamResourceResolverTest {
public static final String STRING_PARAM = "stringParam";
public static final String STRING_VALUE = "a string";
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
index c07c658..c5d82b1 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
@@ -52,7 +52,7 @@ import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.isA;
import static org.junit.Assert.assertEquals;
-public class LogicalHandlerInterceptorTest extends Assert {
+public class LogicalHandlerInterceptorTest {
private IMocksControl control;
private Binding binding;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java
index d2b8cc1..ad6b378 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java
@@ -41,7 +41,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class LogicalMessageImplTest extends Assert {
+public class LogicalMessageImplTest {
AddNumbers req;
List<Object> args;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
index 20c8a26..f9c97d3 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
@@ -85,7 +85,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class SOAPHandlerInterceptorTest extends Assert {
+public class SOAPHandlerInterceptorTest {
@Before
public void setUp() {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
index 00a185a..5aa719f 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
@@ -71,7 +71,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class SpringBeansTest extends Assert {
+public class SpringBeansTest {
@After
public void tearDown() throws Exception {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java
index 4ce8022..4ba94d5 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java
@@ -49,7 +49,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class ContextPropertiesMappingTest extends Assert {
+public class ContextPropertiesMappingTest {
private static final String ADDRESS = "test address";
private static final String REQUEST_METHOD = "GET";
private static final String HEADER = "header";
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfoTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfoTest.java
index 0c613fd..931c88c 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfoTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfoTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class JaxWsImplementorInfoTest extends Assert {
+public class JaxWsImplementorInfoTest {
@Test
public void testGetWSDLLocation() throws Exception {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java
index 9dff387..050bc1e 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java
@@ -51,7 +51,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class JaxWsServiceConfigurationTest extends Assert {
+public class JaxWsServiceConfigurationTest {
@Before
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java
index 2739ee6..92ccbd5 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java
@@ -58,7 +58,7 @@ import static org.junit.Assert.assertTrue;
/**
*
*/
-public class PolicyAnnotationTest extends Assert {
+public class PolicyAnnotationTest {
@org.junit.Test
public void testAnnotations() throws Exception {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/HttpHandlerImplTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/HttpHandlerImplTest.java
index 331696f..43e3dca 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/HttpHandlerImplTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/HttpHandlerImplTest.java
@@ -30,7 +30,7 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-public class HttpHandlerImplTest extends Assert {
+public class HttpHandlerImplTest {
private IMocksControl control;
private HttpHandler handler;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java
index 5e4e983..f142b0d 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-public class JAXWSHttpSpiDestinationTest extends Assert {
+public class JAXWSHttpSpiDestinationTest {
private static final String ADDRESS = "http://localhost:80/foo/bar";
private static final String CONTEXT_PATH = "/foo";
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java
index 6abefb7..3075554 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class JAXWSHttpSpiTransportFactoryTest extends Assert {
+public class JAXWSHttpSpiTransportFactoryTest {
private IMocksControl control;
private HttpContext context;
diff --git a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java
index 96a6d3e..1a80afb 100644
--- a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java
+++ b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.fail;
-public class AbstractDOMProviderTest extends Assert {
+public class AbstractDOMProviderTest {
private String epAddr = "http://cxf.apache.org/";
diff --git a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java
index 3ebdda5..dcf1865 100644
--- a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java
+++ b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.fail;
-public class ProviderFactoryTest extends Assert {
+public class ProviderFactoryTest {
private String epAddr = "http://cxf.apache.org/";
diff --git a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java
index f77997f..31d98dc 100644
--- a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java
+++ b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class ServerAppTest extends Assert {
+public class ServerAppTest {
private String epAddr = "http://cxf.apache.org/";
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandlerTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandlerTest.java
index e4861a1..968f005 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandlerTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
/**
*
*/
-public class SimpleBPNamespaceHandlerTest extends Assert {
+public class SimpleBPNamespaceHandlerTest {
@Test
public void testGetSchemaLocation() {
SimpleBPNamespaceHandler handler = new SimpleBPNamespaceHandler();
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java
index b504843..6840eda 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java
@@ -25,7 +25,7 @@ import org.junit.After;
import org.junit.Assert;
-public class AbstractSimpleFrontendSpringTest extends Assert {
+public class AbstractSimpleFrontendSpringTest {
protected AbstractApplicationContext ctx;
@After
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/BasicNameManagerTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/BasicNameManagerTest.java
index 35f8808..5ba4b1a 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/BasicNameManagerTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/BasicNameManagerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertEquals;
/**
* Simple tests of the name manager.
*/
-public class BasicNameManagerTest extends Assert {
+public class BasicNameManagerTest {
@Test
public void testPrefixGeneration() {
diff --git a/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java b/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
index 15f8042..0261afc 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class InstrumentationManagerTest extends Assert {
+public class InstrumentationManagerTest {
InstrumentationManager im;
Bus bus;
diff --git a/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java b/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java
index 428fc06..3131c5d 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class CounterRepositoryTest extends Assert {
+public class CounterRepositoryTest {
private Bus bus;
private CounterRepository cr;
private List<Interceptor<? extends Message>> inlist = new ArrayList<>();
diff --git a/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java b/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
index 8234a65..47ab303 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
@@ -40,7 +40,7 @@ import org.junit.Before;
-public class AbstractMessageResponseTestBase extends Assert {
+public class AbstractMessageResponseTestBase {
protected static final QName SERVICE_NAME = new QName("http://org.apache.cxf", "hello");
protected static final QName OPERATION_NAME = new QName("http://org.apache.cxf", "world");
protected static final QName PORT_NAME = new QName("http://org.apache.cxf", "port");
diff --git a/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java b/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java
index ffbcff8..1bc5991 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertTrue;
/**
*
*/
-public class BusRegistrationTest extends Assert {
+public class BusRegistrationTest {
private Bus serverBus;
private Bus clientBus;
private InstrumentationManager serverIM;
diff --git a/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java b/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java
index 45ce61c..d6a10f9 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java
@@ -38,7 +38,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-public class JMXManagedComponentManagerTest extends Assert {
+public class JMXManagedComponentManagerTest {
private static final String PORT = TestUtil.getPortNumber(JMXManagedComponentManagerTest.class);
private static final String NAME_ATTRIBUTE = "Name";
private InstrumentationManagerImpl manager;
diff --git a/rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorTest.java b/rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorTest.java
index cb98d63..9075449 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertFalse;
-public class MBServerConnectorTest extends Assert {
+public class MBServerConnectorTest {
private static final String PORT = TestUtil.getPortNumber(MBServerConnectorTest.class);
@Test
diff --git a/rt/management/src/test/java/org/apache/cxf/management/utils/ManagementConsoleTest.java b/rt/management/src/test/java/org/apache/cxf/management/utils/ManagementConsoleTest.java
index 8e49bd0..b5d4167 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/utils/ManagementConsoleTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/utils/ManagementConsoleTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-public class ManagementConsoleTest extends Assert {
+public class ManagementConsoleTest {
private ManagementConsole mc = new ManagementConsole();
@Test
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
index 3b2006f..8614677 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
@@ -53,7 +53,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-public class JAXRSClientFactoryBeanTest extends Assert {
+public class JAXRSClientFactoryBeanTest {
@Test
public void testCreateClient() throws Exception {
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/WebClientTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/WebClientTest.java
index 50dbff9..31ec37b 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/WebClientTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/WebClientTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class WebClientTest extends Assert {
+public class WebClientTest {
@Test
public void testReplaceHeader() {
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandlerTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandlerTest.java
index 5a593e0..3561952 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandlerTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
/**
*
*/
-public class JAXRSBPNamespaceHandlerTest extends Assert {
+public class JAXRSBPNamespaceHandlerTest {
@Test
public void testGetSchemaLocation() {
JAXRSBPNamespaceHandler handler = new JAXRSBPNamespaceHandler();
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientCacheTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientCacheTest.java
index 7f0296d..ef5c57b 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientCacheTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientCacheTest.java
@@ -49,7 +49,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class ClientCacheTest extends Assert {
+public class ClientCacheTest {
public static final String ADDRESS = "local://transport";
private static Server server;
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientTest.java
index 64e553e..cef9b56 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class ClientTest extends Assert {
+public class ClientTest {
public static final String ADDRESS = "local://transport";
@Test
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientImplTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientImplTest.java
index 5488be0..7882685 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientImplTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientImplTest.java
@@ -54,7 +54,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class ClientImplTest extends Assert {
+public class ClientImplTest {
private static final String MY_INTERCEPTOR_NAME = "MyInterceptor";
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientRequestFilterTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientRequestFilterTest.java
index 1433535..b85ff6d 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientRequestFilterTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientRequestFilterTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class ClientRequestFilterTest extends Assert {
+public class ClientRequestFilterTest {
public static class NonStringObject {
private String theString;
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/InvocationBuilderImplTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/InvocationBuilderImplTest.java
index ea3fad9..1828a0e 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/InvocationBuilderImplTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/InvocationBuilderImplTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class InvocationBuilderImplTest extends Assert {
+public class InvocationBuilderImplTest {
public static class TestFilter implements ClientRequestFilter {
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java
index 1e51126..c936333 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class JAXRSClientFactoryBeanTest extends Assert {
+public class JAXRSClientFactoryBeanTest {
@After
public void tearDown() throws Exception {
diff --git a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/Swagger2FeatureTest.java b/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/Swagger2FeatureTest.java
index 9c073ca..306b9c1 100644
--- a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/Swagger2FeatureTest.java
+++ b/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/Swagger2FeatureTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertNull;
/**
*
*/
-public class Swagger2FeatureTest extends Assert {
+public class Swagger2FeatureTest {
@Test
public void testSetBasePathByAddress() {
Swagger2Feature f = new Swagger2Feature();
diff --git a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtilsTest.java b/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtilsTest.java
index 9f6d171..86aabeb 100644
--- a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtilsTest.java
+++ b/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtilsTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class SwaggerToOpenApiConversionUtilsTest extends Assert {
+public class SwaggerToOpenApiConversionUtilsTest {
@Test
public void testConvertFromSwaggerToOpenApi() {
diff --git a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtilsTest.java b/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtilsTest.java
index c543f57..e046ae8 100644
--- a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtilsTest.java
+++ b/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtilsTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-public class SwaggerParseUtilsTest extends Assert {
+public class SwaggerParseUtilsTest {
@Test
public void testConvertPetShopDocToUserApp() {
diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java
index 26f4512..8654d26 100644
--- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java
+++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-public class ServerProviderFactoryTest extends Assert {
+public class ServerProviderFactoryTest {
@Before
diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java
index 7288681..fbbbb75 100644
--- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java
+++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java
@@ -57,7 +57,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class WadlGeneratorJsonTest extends Assert {
+public class WadlGeneratorJsonTest {
private IMocksControl control;
diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
index 5c1a637..6be69cf 100644
--- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
+++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
@@ -71,7 +71,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class WadlGeneratorTest extends Assert {
+public class WadlGeneratorTest {
private IMocksControl control;
diff --git a/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java b/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java
index 01f29b0..8902d09 100644
--- a/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java
+++ b/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
-public class JsonMapObjectReaderWriterTest extends Assert {
+public class JsonMapObjectReaderWriterTest {
@Test
public void testWriteMap() throws Exception {
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryAllTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryAllTest.java
index bd0e2bf..7fd9133 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryAllTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryAllTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-public class ProviderFactoryAllTest extends Assert {
+public class ProviderFactoryAllTest {
@Before
public void setUp() {
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProviderTest.java
index ff1401c..befd4ff 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProviderTest.java
@@ -45,7 +45,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class AegisElementProviderTest extends Assert {
+public class AegisElementProviderTest {
private Properties properties;
private String simpleBeanXml;
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java
index dcaf853..ceda71e 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class AtomEntryProviderTest extends Assert {
+public class AtomEntryProviderTest {
private AtomEntryProvider afd;
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java
index b9aedda..dd382e4 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class AtomFeedProviderTest extends Assert {
+public class AtomFeedProviderTest {
private AtomFeedProvider afd;
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java
index ab5e596..944e019 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class AtomPojoProviderTest extends Assert {
+public class AtomPojoProviderTest {
private ClassPathXmlApplicationContext ctx;
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
index 092d610..d95c83c 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
@@ -49,7 +49,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class DOM4JProviderTest extends Assert {
+public class DOM4JProviderTest {
@Test
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
index 57987c9..403c1ec 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
@@ -88,7 +88,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class JSONProviderTest extends Assert {
+public class JSONProviderTest {
@Test
public void testReadMalformedJson() throws Exception {
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java
index 9c237f0..4361028 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class JsonpInterceptorTest extends Assert {
+public class JsonpInterceptorTest {
public static final String JSON = "{}";
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java
index 1ced424..da817ad 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class BeanspectorTest extends Assert {
+public class BeanspectorTest {
@Test
public void testSimpleBean() throws SearchParseException {
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplCustomParserTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplCustomParserTest.java
index 152871a..eac06f0 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplCustomParserTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplCustomParserTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class SearchContextImplCustomParserTest extends Assert {
+public class SearchContextImplCustomParserTest {
@Test
public void testQuery() {
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplTest.java
index 8d74d9c..1a06d42 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class SearchContextImplTest extends Assert {
+public class SearchContextImplTest {
@Test
public void testPlainQuery1() {
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchUtilsTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchUtilsTest.java
index 3680db3..24c296f 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchUtilsTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchUtilsTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class SearchUtilsTest extends Assert {
+public class SearchUtilsTest {
@Test
public void testSqlWildcardString() {
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilderTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilderTest.java
index b1a32ab..1b78536 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilderTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilderTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class FiqlSearchConditionBuilderTest extends Assert {
+public class FiqlSearchConditionBuilderTest {
private static FiqlSearchConditionBuilder b = new FiqlSearchConditionBuilder();
private static TimeZone tz;
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlCollectionsTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlCollectionsTest.java
index 6da65cd..e08b988 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlCollectionsTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlCollectionsTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
import static org.junit.Assert.assertNotNull;
-public class FiqlCollectionsTest extends Assert {
+public class FiqlCollectionsTest {
@Test
public void testWithCollectionAfterFirstLevelOnCollection() throws SearchParseException {
FiqlParser<Place> placeParser = new FiqlParser<>(Place.class);
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java
index f55374a..ada5911 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class FiqlParserTest extends Assert {
+public class FiqlParserTest {
private FiqlParser<Condition> parser = new FiqlParser<>(Condition.class);
@Test(expected = SearchParseException.class)
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java
index 2c3cc9c..92dc4ec 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java
@@ -40,7 +40,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class HBaseVisitorTest extends Assert {
+public class HBaseVisitorTest {
public static final byte[] BOOK_FAMILY = "book".getBytes();
public static final byte[] NAME_QUALIFIER = "name".getBytes();
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java
index ff26659..b1fa721 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java
@@ -47,7 +47,7 @@ import org.junit.Before;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public abstract class AbstractJPATypedQueryVisitorTest extends Assert {
+public abstract class AbstractJPATypedQueryVisitorTest {
private EntityManagerFactory emFactory;
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPALanguageVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPALanguageVisitorTest.java
index 45cf08e..691e881 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPALanguageVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPALanguageVisitorTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class JPALanguageVisitorTest extends Assert {
+public class JPALanguageVisitorTest {
@Test
public void testSimpleQuery() throws Exception {
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/ldap/LdapQueryVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/ldap/LdapQueryVisitorTest.java
index 7b51447..55ce6ef 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/ldap/LdapQueryVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/ldap/LdapQueryVisitorTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class LdapQueryVisitorTest extends Assert {
+public class LdapQueryVisitorTest {
private FiqlParser<Condition> parser = new FiqlParser<>(Condition.class);
@Test
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParserTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParserTest.java
index ecdab26..92db1ac 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParserTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParserTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class ODataParserTest extends Assert {
+public class ODataParserTest {
private ODataParser<Person> parser;
public static class Person {
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLHierarchicalQueryTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLHierarchicalQueryTest.java
index c417aff..b5dfa25 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLHierarchicalQueryTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLHierarchicalQueryTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
//userName eq "admin@amarkevich.talend.com" and entitlements sw "TDP_"
-public class SQLHierarchicalQueryTest extends Assert {
+public class SQLHierarchicalQueryTest {
@Test
public void testSimpleHierarchicalQuery() throws SearchParseException {
FiqlParser<SearchBean> parser = new FiqlParser<>(SearchBean.class);
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java
index b980c50..f4f7ad3 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
import static org.junit.Assert.assertTrue;
-public class SQLPrinterVisitorTest extends Assert {
+public class SQLPrinterVisitorTest {
private FiqlParser<Condition> parser = new FiqlParser<>(Condition.class);
@Test
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractorTest.java
index 38c58a2..70df918 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractorTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class TikaContentExtractorTest extends Assert {
+public class TikaContentExtractorTest {
private TikaContentExtractor extractor;
private SearchConditionParser< SearchBean > parser;
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaLuceneContentExtractorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaLuceneContentExtractorTest.java
index 95b73cc..b9fadd7 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaLuceneContentExtractorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/tika/TikaLuceneContentExtractorTest.java
@@ -49,7 +49,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class TikaLuceneContentExtractorTest extends Assert {
+public class TikaLuceneContentExtractorTest {
private TikaLuceneContentExtractor extractor;
private Directory directory;
private IndexWriter writer;
diff --git a/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/CxfTypeSafeClientBuilderTest.java b/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/CxfTypeSafeClientBuilderTest.java
index 0edb79a..c5205cf 100644
--- a/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/CxfTypeSafeClientBuilderTest.java
+++ b/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/CxfTypeSafeClientBuilderTest.java
@@ -54,7 +54,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class CxfTypeSafeClientBuilderTest extends Assert {
+public class CxfTypeSafeClientBuilderTest {
@Test
public void testConfigMethods() {
@@ -184,11 +184,11 @@ public class CxfTypeSafeClientBuilderTest extends Assert {
.baseUri(new URI("http://localhost:8080/neverUsed"))
.build(MyClient.class);
client.myDefaultMethod(true);
- fail("Should have thrown IOException");
+ Assert.fail("Should have thrown IOException");
}
private void fail(Response r, String failureMessage) {
System.out.println(r.getStatus());
- fail(failureMessage);
+ Assert.fail(failureMessage);
}
-}
\ No newline at end of file
+}
diff --git a/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/ValidatorTest.java b/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/ValidatorTest.java
index f4a3102..f5af28f 100644
--- a/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/ValidatorTest.java
+++ b/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/ValidatorTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class ValidatorTest extends Assert {
+public class ValidatorTest {
public abstract static class NotAnInterface {
@GET
diff --git a/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/cdi/RestClientCdiTest.java b/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/cdi/RestClientCdiTest.java
index ea0e984..e576462 100644
--- a/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/cdi/RestClientCdiTest.java
+++ b/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/cdi/RestClientCdiTest.java
@@ -43,7 +43,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class RestClientCdiTest extends Assert {
+public class RestClientCdiTest {
@Test
public void testProvidersRegisteredViaMPConfigProperty() throws Exception {
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwkJoseCookBookTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwkJoseCookBookTest.java
index c7cc3bc..cb714f0 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwkJoseCookBookTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwkJoseCookBookTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class JwkJoseCookBookTest extends Assert {
+public class JwkJoseCookBookTest {
private static final String EC_X_COORDINATE_VALUE = "AHKZLLOsCOzz5cY97ewNUajB957y-C-U88c3v13nmGZx6sYl_oJXu9"
+ "A5RkTKqjqvjyekWF-7ytDyRXYgCF5cj0Kt";
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java
index 7a3ca07..7699b33 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java
@@ -46,7 +46,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-public class JweCompactReaderWriterTest extends Assert {
+public class JweCompactReaderWriterTest {
// A1 example
static final byte[] CONTENT_ENCRYPTION_KEY_A1 = {
(byte)177, (byte)161, (byte)244, (byte)128, 84, (byte)143, (byte)225,
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
index 2b4a005..93bb172 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
@@ -42,7 +42,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-public class JweJsonConsumerTest extends Assert {
+public class JweJsonConsumerTest {
static final String SINGLE_RECIPIENT_ALL_HEADERS_AAD_MODIFIED_OUTPUT =
"{"
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java
index e2e251a..a40ecbe 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java
@@ -40,7 +40,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class JweJsonProducerTest extends Assert {
+public class JweJsonProducerTest {
static final byte[] WRAPPER_BYTES1 = {91, 96, 105, 38, 99, 108, 110, 8, -93, 50, -15, 62, 0, -115, 73, -39};
static final byte[] WRAPPER_BYTES2 = {-39, 96, 105, 38, 99, 108, 110, 8, -93, 50, -15, 62, 0, -115, 73, 91};
static final byte[] CEK_BYTES = {-43, 123, 77, 115, 40, 49, -4, -9, -48, -74, 62, 59, 60, 102, -22, -100};
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JwePbeHmacAesWrapTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JwePbeHmacAesWrapTest.java
index 26b0901..3e75e5b 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JwePbeHmacAesWrapTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JwePbeHmacAesWrapTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class JwePbeHmacAesWrapTest extends Assert {
+public class JwePbeHmacAesWrapTest {
@Before
public void registerBouncyCastleIfNeeded() throws Exception {
Security.addProvider(new BouncyCastleProvider());
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeyTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeyTest.java
index 2f96c65..20edd6f 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeyTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeyTest.java
@@ -37,7 +37,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class JsonWebKeyTest extends Assert {
+public class JsonWebKeyTest {
private static final String RSA_MODULUS_VALUE = "0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx4cbbfAAt"
+ "VT86zwu1RK7aPFFxuhDR1L6tSoc_BJECPebWKRXjBZCiFV4n3oknjhMstn64tZ_2W-5JsGY4Hc5n9yBXArwl93lqt7_RN5w6Cf"
+ "0h4QyQ5v-65YGjQR0_FDW2QvzqY368QQMicAtaSqzs8KJZgnYb9c7d0zgdAZHzu6qMQvRL5hajrn1n91CbOpbISD08qNLyrdkt"
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JwkUtilsTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JwkUtilsTest.java
index 73dcf98..5bdb2ad 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JwkUtilsTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JwkUtilsTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
-public class JwkUtilsTest extends Assert {
+public class JwkUtilsTest {
private static final String RSA_KEY = "{"
+ "\"kty\": \"RSA\","
+ "\"n\": \"0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx4cbbfAAt"
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactHeaderTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactHeaderTest.java
index 16997f0..fee458d 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactHeaderTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactHeaderTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class JwsCompactHeaderTest extends Assert {
+public class JwsCompactHeaderTest {
/**
* JWS string, which lacks the "alg" header field.
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactReaderWriterTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactReaderWriterTest.java
index 8ccdc77..d0d08cb 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactReaderWriterTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactReaderWriterTest.java
@@ -47,7 +47,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class JwsCompactReaderWriterTest extends Assert {
+public class JwsCompactReaderWriterTest {
public static final String TOKEN_WITH_DETACHED_UNENCODED_PAYLOAD =
"eyJhbGciOiJIUzI1NiIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..A5dxf2s96_n5FLueVuW1Z_vh161FwXZC4YLPff6dmDY";
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonConsumerTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonConsumerTest.java
index 1b0121a..6810b73 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonConsumerTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonConsumerTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class JwsJsonConsumerTest extends Assert {
+public class JwsJsonConsumerTest {
private static final String DUAL_SIGNED_DOCUMENT =
"{\"payload\":\n"
+ "\t\"eyJpc3MiOiJqb2UiLA0KICJleHAiOjEzMDA4MTkzODAsDQogImh0dHA6Ly9leGFtcGxlLmNvbS9pc19yb290Ijp0cnVlfQ\",\n"
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonProducerTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonProducerTest.java
index 8a805ae..1ced7ca 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonProducerTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonProducerTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class JwsJsonProducerTest extends Assert {
+public class JwsJsonProducerTest {
public static final String ENCODED_MAC_KEY_1 = "AyM1SysPpbyDfgZld3umj1qzKObwVMkoqQ-EstJQLr_T-1qS0gZH75"
+ "aKtMN3Yj0iPS4hcgUuTwjAzZr1Z9CAow";
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsUtilsTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsUtilsTest.java
index 2d5d97a..88e890b 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsUtilsTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsUtilsTest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class JwsUtilsTest extends Assert {
+public class JwsUtilsTest {
@Test
public void testSignatureAlgorithm() {
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwt/JwtUtilsTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwt/JwtUtilsTest.java
index 2f5db9c..ea7c2aa 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwt/JwtUtilsTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwt/JwtUtilsTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.fail;
/**
* Some tests for JwtUtils
*/
-public class JwtUtilsTest extends Assert {
+public class JwtUtilsTest {
@org.junit.Test
public void testExpiredToken() throws Exception {
diff --git a/rt/rs/security/oauth-parent/oauth/src/test/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtilsTest.java b/rt/rs/security/oauth-parent/oauth/src/test/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtilsTest.java
index 9705c5d..913ec6d 100644
--- a/rt/rs/security/oauth-parent/oauth/src/test/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtilsTest.java
+++ b/rt/rs/security/oauth-parent/oauth/src/test/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtilsTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class OAuthUtilsTest extends Assert {
+public class OAuthUtilsTest {
@Test
public void testCheckRequestURI() throws Exception {
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/common/UserSubjectTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/common/UserSubjectTest.java
index d66c16b2..bcddc4b 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/common/UserSubjectTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/common/UserSubjectTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class UserSubjectTest extends Assert {
+public class UserSubjectTest {
@Test
public void testId() {
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/TokenGrantHandlerTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/TokenGrantHandlerTest.java
index 1986e57..2fc7e09 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/TokenGrantHandlerTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/TokenGrantHandlerTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class TokenGrantHandlerTest extends Assert {
+public class TokenGrantHandlerTest {
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java
index 99c2690..feb55ef 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class JCacheCodeDataProviderTest extends Assert {
+public class JCacheCodeDataProviderTest {
private JCacheCodeDataProvider provider;
@Before
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
index 4d7aea2..e84b1f2 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
-public class JPACodeDataProviderTest extends Assert {
+public class JPACodeDataProviderTest {
private EntityManagerFactory emFactory;
private Connection connection;
private JPACodeDataProvider provider;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/JwtUserSubjectTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/JwtUserSubjectTest.java
index a7fef49..1a4d7ca 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/JwtUserSubjectTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/JwtUserSubjectTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import static org.junit.Assert.assertNotNull;
-public class JwtUserSubjectTest extends Assert {
+public class JwtUserSubjectTest {
@Test
public void testJwtUserSubject() {
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProviderTest.java
index 71ac33a..8a676d5 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProviderTest.java
@@ -50,7 +50,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-abstract class AbstractOAuthDataProviderTest extends Assert {
+abstract class AbstractOAuthDataProviderTest {
private static KeyPair keyPair;
private AbstractOAuthDataProvider provider;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProviderTest.java
index 806a970..5824c55 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProviderTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class OAuthJSONProviderTest extends Assert {
+public class OAuthJSONProviderTest {
@Test
public void testWriteBearerClientAccessToken() throws Exception {
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorTest.java
index af52fc7..afef034 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorTest.java
@@ -37,7 +37,7 @@ import org.junit.Test;
import static org.junit.Assert.assertNotNull;
-public class HawkAccessTokenValidatorTest extends Assert {
+public class HawkAccessTokenValidatorTest {
private HawkAccessTokenValidator validator = new HawkAccessTokenValidator();
private OAuthDataProvider dataProvider = EasyMock.createMock(OAuthDataProvider.class);
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImplTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImplTest.java
index 04d9966..a3e7333 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImplTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImplTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-public class NonceVerifierImplTest extends Assert {
+public class NonceVerifierImplTest {
private NonceVerifierImpl nonceVerifier;
private NonceStore nonceStore = EasyMock.createMock(NonceStore.class);
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/AuthorizationUtilsTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/AuthorizationUtilsTest.java
index 10d1a90..0528bc8 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/AuthorizationUtilsTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/AuthorizationUtilsTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
-public class AuthorizationUtilsTest extends Assert {
+public class AuthorizationUtilsTest {
@Test
public void testThrowAuthorizationFailureSingleChallenge() {
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtilsTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtilsTest.java
index e584b27..f1a19d5 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtilsTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtilsTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class OAuthUtilsTest extends Assert {
+public class OAuthUtilsTest {
@Test
public void testValidateScopesStrict() {
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/crypto/CryptoUtilsTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/crypto/CryptoUtilsTest.java
index 71bd5a0..bc62bc2 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/crypto/CryptoUtilsTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/crypto/CryptoUtilsTest.java
@@ -54,7 +54,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class CryptoUtilsTest extends Assert {
+public class CryptoUtilsTest {
private CodeGrantEncryptingDataProvider p;
diff --git a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
index 240133f..f40ea46 100644
--- a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
+++ b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
@@ -37,7 +37,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-public class JPAOidcUserSubjectTest extends Assert {
+public class JPAOidcUserSubjectTest {
private EntityManagerFactory emFactory;
private JPAOAuthDataProvider provider;
diff --git a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/utils/OidcUtilsTest.java b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/utils/OidcUtilsTest.java
index 79341d8..a8c642c 100644
--- a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/utils/OidcUtilsTest.java
+++ b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/utils/OidcUtilsTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class OidcUtilsTest extends Assert {
+public class OidcUtilsTest {
@Test
public void testScopeToClaimsMappingNoValue() {
diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java
index 3a5be80..13bcaa1 100644
--- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java
+++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertNotNull;
/**
*
*/
-public class EHCacheUtilTest extends Assert {
+public class EHCacheUtilTest {
@Test
public void testCreateCacheManager() {
diff --git a/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java b/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java
index 5fa1dc9..1b3ea19 100644
--- a/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java
+++ b/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class DeflateEncoderDecoderTest extends Assert {
+public class DeflateEncoderDecoderTest {
@Test(expected = DataFormatException.class)
public void testInvalidContent() throws Exception {
diff --git a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/claims/SAMLClaimsTest.java b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/claims/SAMLClaimsTest.java
index b0154c5..9a4b2d2 100644
--- a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/claims/SAMLClaimsTest.java
+++ b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/claims/SAMLClaimsTest.java
@@ -42,7 +42,7 @@ import org.junit.Assert;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class SAMLClaimsTest extends Assert {
+public class SAMLClaimsTest {
@org.junit.Test
public void testSAML2Claims() throws Exception {
diff --git a/rt/security/src/test/java/org/apache/cxf/rt/security/claims/ClaimTest.java b/rt/security/src/test/java/org/apache/cxf/rt/security/claims/ClaimTest.java
index 000a099..baaf648 100644
--- a/rt/security/src/test/java/org/apache/cxf/rt/security/claims/ClaimTest.java
+++ b/rt/security/src/test/java/org/apache/cxf/rt/security/claims/ClaimTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.fail;
-public class ClaimTest extends Assert {
+public class ClaimTest {
@Test
public void testCloneNull() {
diff --git a/rt/security/src/test/java/org/apache/cxf/rt/security/claims/interceptor/ClaimsAuthorizingInterceptorTest.java b/rt/security/src/test/java/org/apache/cxf/rt/security/claims/interceptor/ClaimsAuthorizingInterceptorTest.java
index 010332d..9eb732e 100644
--- a/rt/security/src/test/java/org/apache/cxf/rt/security/claims/interceptor/ClaimsAuthorizingInterceptorTest.java
+++ b/rt/security/src/test/java/org/apache/cxf/rt/security/claims/interceptor/ClaimsAuthorizingInterceptorTest.java
@@ -54,7 +54,7 @@ import org.junit.Test;
import static org.junit.Assert.fail;
-public class ClaimsAuthorizingInterceptorTest extends Assert {
+public class ClaimsAuthorizingInterceptorTest {
private ClaimsAuthorizingInterceptor interceptor;
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
index 2224284..452cdcf 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
@@ -87,7 +87,7 @@ import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class JettyHTTPDestinationTest extends Assert {
+public class JettyHTTPDestinationTest {
protected static final String AUTH_HEADER = "Authorization";
protected static final String USER = "copernicus";
protected static final String PASSWD = "epicycles";
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java
index 6fc3f14..15f457e 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.fail;
public class JettyHTTPServerEngineFactoryTest
- extends Assert {
+ {
Bus bus;
@BeforeClass
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
index 92b16a7..e4630ba 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
@@ -65,7 +65,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class JettyHTTPServerEngineTest extends Assert {
+public class JettyHTTPServerEngineTest {
private static final int PORT1
= Integer.valueOf(TestUtil.getPortNumber(JettyHTTPServerEngineTest.class, 1));
private static final int PORT2
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandlerTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandlerTest.java
index 22e0c60..2796070 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandlerTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
/**
*
*/
-public class HTTPJettyTransportNamespaceHandlerTest extends Assert {
+public class HTTPJettyTransportNamespaceHandlerTest {
@Test
public void testGetSchemaLocation() {
HTTPJettyTransportNamespaceHandler handler = new HTTPJettyTransportNamespaceHandler();
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java
index 44edd4c..233d03e 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java
@@ -51,7 +51,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class ApplicationContextTest extends Assert {
+public class ApplicationContextTest {
private static final String S1 =
ApplicationContextTest.class.getResource("/META-INF/cxf/cxf.xml").toString();
diff --git a/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactoryTest.java b/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactoryTest.java
index 7502b3f..00a75d1 100644
--- a/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactoryTest.java
+++ b/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactoryTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertTrue;
-public class NettyHttpConduitFactoryTest extends Assert {
+public class NettyHttpConduitFactoryTest {
Bus bus;
@BeforeClass
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
index f721efe..6d5d321 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
@@ -86,7 +86,7 @@ import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class NettyHttpDestinationTest extends Assert {
+public class NettyHttpDestinationTest {
protected static final String AUTH_HEADER = "Authorization";
protected static final String USER = "copernicus";
protected static final String PASSWD = "epicycles";
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactoryTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactoryTest.java
index 3b0fe72..70aab9f 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactoryTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactoryTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertTrue;
public class NettyHttpServerEngineFactoryTest
- extends Assert {
+ {
Bus bus;
@BeforeClass
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java
index 4b209c7..e2149a8 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java
@@ -45,7 +45,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class NettyHttpServerEngineTest extends Assert {
+public class NettyHttpServerEngineTest {
private static final int PORT1
= Integer.valueOf(TestUtil.getPortNumber(NettyHttpServerEngineTest.class, 1));
private static final int PORT2
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/spring/ApplicationContextTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/spring/ApplicationContextTest.java
index ef535f7..0e391dc 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/spring/ApplicationContextTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/spring/ApplicationContextTest.java
@@ -50,7 +50,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class ApplicationContextTest extends Assert {
+public class ApplicationContextTest {
private static final String S1 =
ApplicationContextTest.class.getResource("/META-INF/cxf/cxf.xml").toString();
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
index da578d5..087638c 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
@@ -89,7 +89,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class UndertowHTTPDestinationTest extends Assert {
+public class UndertowHTTPDestinationTest {
protected static final String AUTH_HEADER = "Authorization";
protected static final String USER = "copernicus";
protected static final String PASSWD = "epicycles";
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactoryTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactoryTest.java
index 95f4404..d550b99 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactoryTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactoryTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.fail;
public class UndertowHTTPServerEngineFactoryTest
- extends Assert {
+ {
Bus bus;
@BeforeClass
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java
index c884306..202c1c9 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java
@@ -53,7 +53,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class UndertowHTTPServerEngineTest extends Assert {
+public class UndertowHTTPServerEngineTest {
private static final int PORT1
= Integer.valueOf(TestUtil.getPortNumber(UndertowHTTPServerEngineTest.class, 1));
private static final int PORT2
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/blueprint/HTTPUndertowTransportNamespaceHandlerTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/blueprint/HTTPUndertowTransportNamespaceHandlerTest.java
index 39bfa05..a06ceaf 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/blueprint/HTTPUndertowTransportNamespaceHandlerTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/blueprint/HTTPUndertowTransportNamespaceHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
/**
*
*/
-public class HTTPUndertowTransportNamespaceHandlerTest extends Assert {
+public class HTTPUndertowTransportNamespaceHandlerTest {
@Test
public void testGetSchemaLocation() {
HTTPUndertowTransportNamespaceHandler handler = new HTTPUndertowTransportNamespaceHandler();
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/ApplicationContextTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/ApplicationContextTest.java
index 8d1fb33..511dca1 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/ApplicationContextTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/ApplicationContextTest.java
@@ -50,7 +50,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class ApplicationContextTest extends Assert {
+public class ApplicationContextTest {
private static final String S1 =
ApplicationContextTest.class.getResource("/META-INF/cxf/cxf.xml").toString();
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java
index 326e1fb..2da879d 100755
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertTrue;
/**
*
*/
-public class DestinationRegistryImplTest extends Assert {
+public class DestinationRegistryImplTest {
private static final String ADDRESS = "http://bar/snafu";
private static final QName QNAME = new QName(ADDRESS, "foobar");
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
index d27166c..e49d3dc 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
@@ -58,7 +58,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class HTTPConduitTest extends Assert {
+public class HTTPConduitTest {
@Before
public void setUp() throws Exception {
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
index 9fe115a..0c18eac 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
@@ -49,7 +49,7 @@ import static org.junit.Assert.assertTrue;
* implementation of HTTPConduit change (i.e. no longer use the URLConnections)
* this test will break.
*/
-public class HTTPConduitURLConnectionTest extends Assert {
+public class HTTPConduitURLConnectionTest {
@Before
public void setUp() throws Exception {
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
index 9396953..950b0c8 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
@@ -66,7 +66,7 @@ import static org.junit.Assert.assertTrue;
/**
*/
-public class HTTPConduitURLEasyMockTest extends Assert {
+public class HTTPConduitURLEasyMockTest {
private static String oldHttpProxyHost;
private static final String HTTP_RESPONSE_MESSAGE = "Some Response Message I can test";
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPTransportFactoryTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPTransportFactoryTest.java
index 55b7fec..0de0a07 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPTransportFactoryTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPTransportFactoryTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class HTTPTransportFactoryTest extends Assert {
+public class HTTPTransportFactoryTest {
@Test
public void testGetDestination() {
Bus bus = BusFactory.getDefaultBus();
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java
index bdf889d..2de70b6 100755
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java
@@ -48,7 +48,7 @@ import static org.junit.Assert.fail;
/**
*
*/
-public class HeadersTest extends Assert {
+public class HeadersTest {
@Test
public void setHeadersTest() throws Exception {
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/PatternBuilderTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/PatternBuilderTest.java
index 1a6f2f0..0dd4cce 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/PatternBuilderTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/PatternBuilderTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertTrue;
/**
* A {@code PatternBuilderTest} is ...
*/
-public class PatternBuilderTest extends Assert {
+public class PatternBuilderTest {
@Test
public void testPatternBuilder() {
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/blueprint/HttpBPHandlerTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/blueprint/HttpBPHandlerTest.java
index f8eb0e8..a89129b 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/blueprint/HttpBPHandlerTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/blueprint/HttpBPHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
/**
*
*/
-public class HttpBPHandlerTest extends Assert {
+public class HttpBPHandlerTest {
@Test
public void testGetSchemaLocation() {
HttpBPHandler handler = new HttpBPHandler();
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java
index 9b2143f..4dd279f 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class ClientPolicyCalculatorTest extends Assert {
+public class ClientPolicyCalculatorTest {
@Test
public void testCompatibleClientPolicies() {
ClientPolicyCalculator calc = new ClientPolicyCalculator();
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPClientAssertionBuilderTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPClientAssertionBuilderTest.java
index 98e0946..7c6a1eb 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPClientAssertionBuilderTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPClientAssertionBuilderTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertTrue;
/**
*
*/
-public class HTTPClientAssertionBuilderTest extends Assert {
+public class HTTPClientAssertionBuilderTest {
@Test
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPServerAssertionBuilderTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPServerAssertionBuilderTest.java
index b115b93..76af7be 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPServerAssertionBuilderTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPServerAssertionBuilderTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertTrue;
/**
*
*/
-public class HTTPServerAssertionBuilderTest extends Assert {
+public class HTTPServerAssertionBuilderTest {
@Test
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
index 6aad2d9..d1048bf 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
@@ -48,7 +48,7 @@ import static org.junit.Assert.assertTrue;
/**
*
*/
-public class PolicyUtilsTest extends Assert {
+public class PolicyUtilsTest {
private IMocksControl control;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ServerPolicyCalculatorTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ServerPolicyCalculatorTest.java
index 7f264ac..d28a3a1 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ServerPolicyCalculatorTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ServerPolicyCalculatorTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class ServerPolicyCalculatorTest extends Assert {
+public class ServerPolicyCalculatorTest {
@Test
public void testCompatibleServerPolicies() {
ServerPolicyCalculator spc = new ServerPolicyCalculator();
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/HttpConduitConfigurationTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/HttpConduitConfigurationTest.java
index 7a6782c..58fa92a 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/HttpConduitConfigurationTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/HttpConduitConfigurationTest.java
@@ -52,7 +52,7 @@ import static org.junit.Assert.assertTrue;
/**
*
*/
-public class HttpConduitConfigurationTest extends Assert {
+public class HttpConduitConfigurationTest {
private static EndpointInfo ei;
private Bus bus;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java
index 30b237b..1dec03a 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class ServletControllerTest extends Assert {
+public class ServletControllerTest {
private HttpServletRequest req;
private HttpServletResponse res;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
index 9fed3c3..5c7283f 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
@@ -55,7 +55,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public abstract class AbstractJMSTester extends Assert {
+public abstract class AbstractJMSTester {
protected static final String WSDL = "/jms_test.wsdl";
protected static final String SERVICE_NS = "http://cxf.apache.org/hello_world_jms";
protected static final int MAX_RECEIVE_TIME = 10;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSMessageUtilTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSMessageUtilTest.java
index 5a3232f..4f2cf1f 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSMessageUtilTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSMessageUtilTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-public class JMSMessageUtilTest extends Assert {
+public class JMSMessageUtilTest {
@Test
public void testGetEncoding() throws Exception {
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java
index 16cfd19..684e785 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-public class JMSContinuationProviderTest extends Assert {
+public class JMSContinuationProviderTest {
private static Bus bus = BusFactory.getDefaultBus();
@AfterClass
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationTest.java
index 35e75cb..36f42d9 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-public class JMSContinuationTest extends Assert {
+public class JMSContinuationTest {
private Message m;
private Bus b;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java
index 4560d91..60ba97e 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class JMSEndpointTest extends Assert {
+public class JMSEndpointTest {
private static final String TEST_VALUE = "testValue";
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/JMSUtilTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/JMSUtilTest.java
index 25ff77b..d4f6e8f 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/JMSUtilTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/JMSUtilTest.java
@@ -40,7 +40,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class JMSUtilTest extends Assert {
+public class JMSUtilTest {
@Test
public void testCorrelationIDGeneration() {
diff --git a/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalDestinationTest.java b/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalDestinationTest.java
index a8f54c0..ce7c48a 100644
--- a/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalDestinationTest.java
+++ b/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalDestinationTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertNull;
/**
*
*/
-public class LocalDestinationTest extends Assert {
+public class LocalDestinationTest {
/**
* Tests if the status code is available after closing the destination so that it can be logged.
diff --git a/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java b/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java
index f660b82..55e46b1 100644
--- a/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java
+++ b/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
-public class LocalTransportFactoryTest extends Assert {
+public class LocalTransportFactoryTest {
@Test
public void testLocalTransportWithSeparateThread() throws Exception {
testInvocation(false);
diff --git a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketTransportFactoryTest.java b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketTransportFactoryTest.java
index f0f50ec..b026b8c 100644
--- a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketTransportFactoryTest.java
+++ b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketTransportFactoryTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
import static org.junit.Assert.assertNotNull;
-public class WebSocketTransportFactoryTest extends Assert {
+public class WebSocketTransportFactoryTest {
@Test
public void testGetDestination() throws Exception {
diff --git a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketUtilsTest.java b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketUtilsTest.java
index cd72e0c..89fecf2 100644
--- a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketUtilsTest.java
+++ b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketUtilsTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.fail;
/**
*
*/
-public class WebSocketUtilsTest extends Assert {
+public class WebSocketUtilsTest {
private static final byte[] TEST_BODY_BYTES = "buenos dias".getBytes();
private static final byte[] TEST_HEADERS_BYTES = "200\r\nContent-Type: text/xml;charset=utf-8\r\n".getBytes();
private static final byte[] TEST_ID_BYTES =
diff --git a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduitTest.java b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduitTest.java
index 5d3d05f..a9336b0 100644
--- a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduitTest.java
+++ b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduitTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertTrue;
/**
*
*/
-public class AhcWebSocketConduitTest extends Assert {
+public class AhcWebSocketConduitTest {
private static final String TEST_RESPONSE1 =
"200\r\nresponseId: 59610eed-d9de-4692-96d4-bb95a36c41ea\r\nContent-Type: text/plain\r\n\r\nHola!";
private static final String TEST_RESPONSE2 =
diff --git a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestinationTest.java b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestinationTest.java
index d0d8f8f..64f5ca3 100644
--- a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestinationTest.java
+++ b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestinationTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertEquals;
/**
*
*/
-public class AtmosphereWebSocketJettyDestinationTest extends Assert {
+public class AtmosphereWebSocketJettyDestinationTest {
private static final String ENDPOINT_ADDRESS = "ws://localhost:8080/websocket/nada";
private static final QName ENDPOINT_NAME = new QName("urn:websocket:probe", "nada");
diff --git a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestinationTest.java b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestinationTest.java
index 31429a4..febd007 100644
--- a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestinationTest.java
+++ b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestinationTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertNull;
/**
*
*/
-public class AtmosphereWebSocketServletDestinationTest extends Assert {
+public class AtmosphereWebSocketServletDestinationTest {
private static final String ENDPOINT_ADDRESS = "/websocket/nada";
private static final QName ENDPOINT_NAME = new QName("urn:websocket:probe", "nada");
diff --git a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptorTest.java b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptorTest.java
index ace036a..c2744f8 100644
--- a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptorTest.java
+++ b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptorTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertEquals;
/**
*
*/
-public class DefaultProtocolInterceptorTest extends Assert {
+public class DefaultProtocolInterceptorTest {
@Test
public void testCreateResponseWithHeadersFiltering() throws Exception {
diff --git a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
index be9c7d2..d0f4bfc 100644
--- a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
+++ b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.assertNull;
/**
*
*/
-public class JettyWebSocketDestinationTest extends Assert {
+public class JettyWebSocketDestinationTest {
private static final String ENDPOINT_ADDRESS = "ws://localhost:9001/websocket/nada";
private static final QName ENDPOINT_NAME = new QName("urn:websocket:probe", "nada");
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingConstantsImplTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingConstantsImplTest.java
index fd582be..bc3bb54 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingConstantsImplTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingConstantsImplTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class AddressingConstantsImplTest extends Assert {
+public class AddressingConstantsImplTest {
private AddressingConstants constants;
@Before
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandlerTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandlerTest.java
index ea66e01..202fb92 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandlerTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
/**
*
*/
-public class WsBPHandlerTest extends Assert {
+public class WsBPHandlerTest {
@Test
public void testGetSchemaLocation() {
WsBPHandler handler = new WsBPHandler();
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java
index 27952e6..04eaa10 100755
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java
@@ -55,7 +55,7 @@ import static org.junit.Assert.assertNull;
/**
*
*/
-public class ContextUtilsTest extends Assert {
+public class ContextUtilsTest {
private static final QName WSA_ACTION_QNAME =
new QName(JAXWSAConstants.NS_WSA, Names.WSAW_ACTION_NAME);
private static final QName OLD_WSDL_WSA_ACTION_QNAME =
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
index a38f4ad..52e3206 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
@@ -90,7 +90,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-public class MAPAggregatorTest extends Assert {
+public class MAPAggregatorTest {
private MAPAggregatorImpl aggregator;
private IMocksControl control;
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java
index 2066c7c..1806f24 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-public class DecoupledFaultHandlerTest extends Assert {
+public class DecoupledFaultHandlerTest {
@Test
public void testOnewayFault() {
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
index 48dde49..ef6191a 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
@@ -71,7 +71,7 @@ import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class MAPCodecTest extends Assert {
+public class MAPCodecTest {
private MAPCodec codec;
private IMocksControl control;
diff --git a/rt/ws/mex/src/test/java/org/apache/cxf/ws/mex/MEXTest.java b/rt/ws/mex/src/test/java/org/apache/cxf/ws/mex/MEXTest.java
index 12655db..2c11da1 100644
--- a/rt/ws/mex/src/test/java/org/apache/cxf/ws/mex/MEXTest.java
+++ b/rt/ws/mex/src/test/java/org/apache/cxf/ws/mex/MEXTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertNotNull;
/**
*
*/
-public class MEXTest extends Assert {
+public class MEXTest {
static Server server;
static Server mexServer;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java
index d144d2c..a034637 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.fail;
/**
*
*/
-public class AssertionBuilderRegistryImplTest extends Assert {
+public class AssertionBuilderRegistryImplTest {
private IMocksControl control;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java
index 3b0fed5..bb16a1a 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java
@@ -48,7 +48,7 @@ import static org.junit.Assert.fail;
/**
*
*/
-public class AssertionInfoMapTest extends Assert {
+public class AssertionInfoMapTest {
private IMocksControl control;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
index 21cd6a6..9f05cc3 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
@@ -54,7 +54,7 @@ import static org.junit.Assert.fail;
/**
*
*/
-public class EffectivePolicyImplTest extends Assert {
+public class EffectivePolicyImplTest {
private IMocksControl control;
private Message msg = new MessageImpl();
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
index 4f005eb..c0d83df 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
@@ -58,7 +58,7 @@ import static org.junit.Assert.fail;
/**
*
*/
-public class EndpointPolicyImplTest extends Assert {
+public class EndpointPolicyImplTest {
private IMocksControl control;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/IgnorablePolicyInterceptorProviderTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/IgnorablePolicyInterceptorProviderTest.java
index 8557796..bbdb3da 100755
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/IgnorablePolicyInterceptorProviderTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/IgnorablePolicyInterceptorProviderTest.java
@@ -48,7 +48,7 @@ import static org.junit.Assert.fail;
/**
*
*/
-public class IgnorablePolicyInterceptorProviderTest extends Assert {
+public class IgnorablePolicyInterceptorProviderTest {
private static final QName ONEWAY_QNAME = new QName("http://tempuri.org/policy", "OneWay");
private static final QName DUPLEX_QNAME = new QName("http://tempuri.org/policy", "Duplex");
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java
index f96df7a..e49f8af 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class NormalizeTest extends Assert {
+public class NormalizeTest {
private IMocksControl control;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyBuilderTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyBuilderTest.java
index ee2a738..fc2bc1a 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyBuilderTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyBuilderTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class PolicyBuilderTest extends Assert {
+public class PolicyBuilderTest {
private PolicyBuilderImpl builder;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java
index 23d8e30..6940810 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
import static org.junit.Assert.assertTrue;
-public class PolicyDataEngineImplTest extends Assert {
+public class PolicyDataEngineImplTest {
private static final QName TEST_POLICY_NAME = new QName("http://test", "TestPolicy");
class TestPolicy {
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
index 6399d8a..9077e60 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
@@ -67,7 +67,7 @@ import static org.junit.Assert.assertTrue;
/**
*
*/
-public class PolicyEngineTest extends Assert {
+public class PolicyEngineTest {
private IMocksControl control;
private PolicyEngineImpl engine;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java
index 62384fb..ad47c3e 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java
@@ -53,7 +53,7 @@ import static org.junit.Assert.assertTrue;
/**
*
*/
-public class PolicyExtensionsTest extends Assert {
+public class PolicyExtensionsTest {
private static final QName KNOWN = new QName("http://cxf.apache.org/test/policy", "known");
private static final QName KNOWN_DOMAIN_EXPR_TYPE
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java
index 8ec5754..47e5eb6 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertTrue;
/**
*
*/
-public class PolicyInterceptorProviderRegistryImplTest extends Assert {
+public class PolicyInterceptorProviderRegistryImplTest {
private static final QName ASSERTION = new QName("testns", "test");
private static final QName WRONG_ASSERTION = new QName("testns", "wrong");
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
index a43bc65..f1d476d 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
@@ -54,7 +54,7 @@ import static org.junit.Assert.assertSame;
/**
*
*/
-public class PolicyInterceptorsTest extends Assert {
+public class PolicyInterceptorsTest {
private static final QName ASSERTION_QNAME = new QName("http://apache.cxf", "test");
private IMocksControl control;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyRegistryImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyRegistryImplTest.java
index 67b1b83..365fea6 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyRegistryImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyRegistryImplTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertSame;
/**
*
*/
-public class PolicyRegistryImplTest extends Assert {
+public class PolicyRegistryImplTest {
@Test
public void testAll() {
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java
index 8f497f8..089a259 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
/**
*
*/
-public class PolicyVerificationInFaultInterceptorTest extends Assert {
+public class PolicyVerificationInFaultInterceptorTest {
private IMocksControl control;
private Bus bus;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java
index 270f120..be87028 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java
@@ -38,7 +38,7 @@ import org.junit.Test;
/**
*
*/
-public class PolicyVerificationInInterceptorTest extends Assert {
+public class PolicyVerificationInInterceptorTest {
private IMocksControl control;
private Bus bus;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java
index 8348fa8..b6fa205 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
/**
*
*/
-public class PolicyVerificationOutInterceptorTest extends Assert {
+public class PolicyVerificationOutInterceptorTest {
private IMocksControl control;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistryTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistryTest.java
index 148e134..ad36e25 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistryTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistryTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.fail;
/**
*
*/
-public class DomainExpressionBuilderRegistryTest extends Assert {
+public class DomainExpressionBuilderRegistryTest {
private IMocksControl control;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java
index 3ae5203..469085b 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertTrue;
/**
*
*/
-public class EndpointReferenceDomainExpressionTest extends Assert {
+public class EndpointReferenceDomainExpressionTest {
private IMocksControl control;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java
index 531ad1c..efba9c8 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java
@@ -60,7 +60,7 @@ import static org.junit.Assert.fail;
/**
*
*/
-public class ExternalAttachmentProviderTest extends Assert {
+public class ExternalAttachmentProviderTest {
private static final QName TEST_ASSERTION_TYPE = new QName("http://a.b.c", "x");
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachmentTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachmentTest.java
index f1e9b81..b71443f 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachmentTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachmentTest.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertTrue;
/**
*
*/
-public class PolicyAttachmentTest extends Assert {
+public class PolicyAttachmentTest {
private IMocksControl control;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java
index b04c187..402e8bb 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.assertSame;
/**
*
*/
-public class ReferenceResolverTest extends Assert {
+public class ReferenceResolverTest {
private IMocksControl control;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java
index 1c983c8..43749d7 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java
@@ -68,7 +68,7 @@ import static org.junit.Assert.fail;
/**
*
*/
-public class Wsdl11AttachmentPolicyProviderTest extends Assert {
+public class Wsdl11AttachmentPolicyProviderTest {
private static final String NAMESPACE_URI = "http://apache.org/cxf/calculator";
private static final QName OPERATION_NAME = new QName(NAMESPACE_URI, "add");
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java
index a8411f3..a04eff2 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
/**
*
*/
-public class PolicyBPHandlerTest extends Assert {
+public class PolicyBPHandlerTest {
@Test
public void testGetSchemaLocation() {
PolicyBPHandler handler = new PolicyBPHandler();
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java
index 8643d7e..ab16660 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.fail;
/**
*
*/
-public class JaxbAssertionBuilderTest extends Assert {
+public class JaxbAssertionBuilderTest {
@Test
public void testConstructors() throws Exception {
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java
index 47284d1..e56b085 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.assertTrue;
/**
*
*/
-public class JaxbAssertionTest extends Assert {
+public class JaxbAssertionTest {
@Test
public void testBasic() {
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/FirstAlternativeSelectorTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/FirstAlternativeSelectorTest.java
index a5f52fe..e1d59da 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/FirstAlternativeSelectorTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/FirstAlternativeSelectorTest.java
@@ -47,7 +47,7 @@ import static org.junit.Assert.assertSame;
/**
*
*/
-public class FirstAlternativeSelectorTest extends Assert {
+public class FirstAlternativeSelectorTest {
private IMocksControl control;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/MinimalMaximalAlternativeSelectorTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/MinimalMaximalAlternativeSelectorTest.java
index 5931ee7..dcbae33 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/MinimalMaximalAlternativeSelectorTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/MinimalMaximalAlternativeSelectorTest.java
@@ -47,7 +47,7 @@ import static org.junit.Assert.assertSame;
/**
*
*/
-public class MinimalMaximalAlternativeSelectorTest extends Assert {
+public class MinimalMaximalAlternativeSelectorTest {
private IMocksControl control;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java
index 76ecafb..d4be0d4 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class PolicyBeansTest extends Assert {
+public class PolicyBeansTest {
@Test
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractEndpointTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractEndpointTest.java
index f31f174..b6ffef0 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractEndpointTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractEndpointTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertSame;
/**
*
*/
-public class AbstractEndpointTest extends Assert {
+public class AbstractEndpointTest {
private IMocksControl control;
private RMEndpoint rme;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java
index 571b252..574a0de 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java
@@ -49,7 +49,7 @@ import static org.junit.Assert.fail;
/**
*
*/
-public class AbstractRMInterceptorTest extends Assert {
+public class AbstractRMInterceptorTest {
private IMocksControl control;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractSequenceTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractSequenceTest.java
index f7d654d..73feb17 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractSequenceTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractSequenceTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
import static org.junit.Assert.assertTrue;
-public class AbstractSequenceTest extends Assert {
+public class AbstractSequenceTest {
@Test
public void testIdentifierEquals() {
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
index 63be848..0158636 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
@@ -54,7 +54,7 @@ import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class DestinationSequenceTest extends Assert {
+public class DestinationSequenceTest {
private IMocksControl control;
private ObjectFactory factory;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java
index 1bc76ce..d6fbd97 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.fail;
/**
*
*/
-public class DestinationTest extends Assert {
+public class DestinationTest {
private IMocksControl control;
private RMEndpoint rme;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java
index f8f2c03..e3f61b9 100755
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java
@@ -65,7 +65,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class ManagedRMManagerTest extends Assert {
+public class ManagedRMManagerTest {
private static final String TEST_URI = "http://nowhere.com/bar/foo";
private IMocksControl control;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProtocolVariationTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProtocolVariationTest.java
index a087ff5..dd3a73f 100755
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProtocolVariationTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProtocolVariationTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertNull;
/**
*
*/
-public class ProtocolVariationTest extends Assert {
+public class ProtocolVariationTest {
@Test
public void testFindVariant() {
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
index 5cdfafc..6ce0826 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
@@ -68,7 +68,7 @@ import static org.junit.Assert.assertSame;
/**
*
*/
-public class ProxyTest extends Assert {
+public class ProxyTest {
private IMocksControl control;
private RMEndpoint rme;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java
index 3fe86d2..840d5ff 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertTrue;
/**
*
*/
-public class RMContextUtilsTest extends Assert {
+public class RMContextUtilsTest {
private IMocksControl control;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java
index 3263e6e..085514d 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java
@@ -61,7 +61,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-public class RMEndpointTest extends Assert {
+public class RMEndpointTest {
private IMocksControl control;
private RMManager manager;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
index 0996765..ba86e35 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
@@ -58,7 +58,7 @@ import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class RMInInterceptorTest extends Assert {
+public class RMInInterceptorTest {
private IMocksControl control;
private RMInInterceptor interceptor;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerConfigurationTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerConfigurationTest.java
index 0af2b89..b50c814 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerConfigurationTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerConfigurationTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertTrue;
/**
*
*/
-public class RMManagerConfigurationTest extends Assert {
+public class RMManagerConfigurationTest {
private Bus bus;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
index b84b4e5..3cc3e6a 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
@@ -79,7 +79,7 @@ import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class RMManagerTest extends Assert {
+public class RMManagerTest {
private static final String MULTIPART_TYPE = "multipart/related; type=\"text/xml\";"
+ " boundary=\"uuid:74b6a245-2e17-40eb-a86c-308664e18460\"; start=\"<root."
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
index 1a73834..23a97fc 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
@@ -42,7 +42,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class RMOutInterceptorTest extends Assert {
+public class RMOutInterceptorTest {
private IMocksControl control;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java
index 64d24ed..fa4bcb6 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertEquals;
/**
*
*/
-public class RMUtilsTest extends Assert {
+public class RMUtilsTest {
private IMocksControl control;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
index 646c2c4..46601a5 100755
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
@@ -61,7 +61,7 @@ import static org.junit.Assert.assertTrue;
/**
*
*/
-public class ServantTest extends Assert {
+public class ServantTest {
private static final String SERVICE_URL = "http://localhost:9000/SoapContext/GreeterPort";
private static final String DECOUPLED_URL = "http://localhost:9990/decoupled_endpoint";
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java
index f073fac..f9faf21 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-public class SourceSequenceTest extends Assert {
+public class SourceSequenceTest {
private IMocksControl control;
private ObjectFactory factory;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/blueprint/RMBPHandlerTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/blueprint/RMBPHandlerTest.java
index c20b724..d059e6a 100755
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/blueprint/RMBPHandlerTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/blueprint/RMBPHandlerTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
/**
*
*/
-public class RMBPHandlerTest extends Assert {
+public class RMBPHandlerTest {
@Test
public void testGetSchemaLocation() {
RMBPHandler handler = new RMBPHandler();
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/PersistenceUtilsTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/PersistenceUtilsTest.java
index a359348..27d81bd 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/PersistenceUtilsTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/PersistenceUtilsTest.java
@@ -48,7 +48,7 @@ import static org.junit.Assert.assertTrue;
/**
*
*/
-public class PersistenceUtilsTest extends Assert {
+public class PersistenceUtilsTest {
private static final String MULTIPART_TYPE = "multipart/related; type=\"text/xml\";"
+ " boundary=\"uuid:74b6a245-2e17-40eb-a86c-308664e18460\"; start=\"<root."
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/RMMessageTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/RMMessageTest.java
index def0ebe..13dffd7 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/RMMessageTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/RMMessageTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertEquals;
/**
*
*/
-public class RMMessageTest extends Assert {
+public class RMMessageTest {
private static final byte[] DATA =
("<greetMe xmlns=\"http://cxf.apache.org/greeter_control/types\">"
+ "<requestType>one</requestType></greetMe>").getBytes();
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
index 9d7a92e..476c41e 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertTrue;
/**
*
*/
-public class RMTxStoreConfigurationTest extends Assert {
+public class RMTxStoreConfigurationTest {
@Test
public void testTxStoreBean() {
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java
index b488be2..98fde43 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java
@@ -58,7 +58,7 @@ import static org.junit.Assert.fail;
/**
*
*/
-public abstract class RMTxStoreTestBase extends Assert {
+public abstract class RMTxStoreTestBase {
protected static RMTxStore store;
protected static final String CLIENT_ENDPOINT_ID =
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTwoSchemasTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTwoSchemasTest.java
index fbcf7d7..aec24a5 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTwoSchemasTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTwoSchemasTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertNull;
/**
*
*/
-public class RMTxStoreTwoSchemasTest extends Assert {
+public class RMTxStoreTwoSchemasTest {
private static final String TEST_DB_NAME = "rmdbts";
private static final String CLIENT_ENDPOINT_ID =
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreUpgradeTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreUpgradeTest.java
index 6cc039d..16ee676 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreUpgradeTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreUpgradeTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertEquals;
* Tests the automatic table updating of RMTxStore that allows compatible changes
* in the database tables.
*/
-public class RMTxStoreUpgradeTest extends Assert {
+public class RMTxStoreUpgradeTest {
private static final String CREATE_OLD_SRC_SEQ_TABLE_STMT =
"CREATE TABLE CXF_RM_SRC_SEQUENCES "
+ "(SEQ_ID VARCHAR(256) NOT NULL, "
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java
index 8908280..e80d61f 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java
@@ -49,7 +49,7 @@ import static org.junit.Assert.assertTrue;
/**
*
*/
-public class PolicyUtilsTest extends Assert {
+public class PolicyUtilsTest {
private IMocksControl control;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInInterceptorTest.java
index 18afc00..30f7137 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInInterceptorTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInInterceptorTest.java
@@ -51,7 +51,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class RMSoapInInterceptorTest extends Assert {
+public class RMSoapInInterceptorTest {
private static final String SEQ_IDENTIFIER = "http://Business456.com/RM/ABC";
private static final Long ONE = Long.valueOf(1);
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java
index 71bce8f..0d27d81 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java
@@ -58,7 +58,7 @@ import org.junit.Test;
import static org.junit.Assert.assertTrue;
-public class RMSoapOutInterceptorTest extends Assert {
+public class RMSoapOutInterceptorTest {
private static final Long ONE = Long.valueOf(1);
private static final Long TEN = Long.valueOf(10);
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
index 5f5e7aa..8cdb216 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
@@ -58,7 +58,7 @@ import static org.junit.Assert.assertTrue;
/**
* Test resend logic.
*/
-public class RetransmissionQueueImplTest extends Assert {
+public class RetransmissionQueueImplTest {
private static final Long ONE = Long.valueOf(1);
private static final Long TWO = Long.valueOf(2);
private static final Long TEN = Long.valueOf(10);
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java
index 4a0103d..1f890f6 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java
@@ -51,7 +51,7 @@ import static org.junit.Assert.assertSame;
/**
*
*/
-public class SoapFaultFactoryTest extends Assert {
+public class SoapFaultFactoryTest {
private IMocksControl control;
private SequenceFault sf;
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java
index b09dbcb..31d3f31 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-public class EHCacheUtilsTest extends Assert {
+public class EHCacheUtilsTest {
@Test
public void testUseGlobalManager() {
Bus bus = BusFactory.getThreadDefaultBus();
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java
index 2de43fc..ec1d5e2 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java
@@ -57,7 +57,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class STSClientTest extends Assert {
+public class STSClientTest {
@Test
public void testConfigureViaEPR() throws Exception {
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/trust/AuthPolicyValidatingInterceptorTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/trust/AuthPolicyValidatingInterceptorTest.java
index da6d3e1..a9acfa5 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/trust/AuthPolicyValidatingInterceptorTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/trust/AuthPolicyValidatingInterceptorTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class AuthPolicyValidatingInterceptorTest extends Assert {
+public class AuthPolicyValidatingInterceptorTest {
@Test
public void testValidateAuthorizationPolicy() throws Exception {
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java
index 0ba2c11..e5a1370 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java
@@ -49,7 +49,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class JAXBExtensionHelperTest extends Assert {
+public class JAXBExtensionHelperTest {
private WSDLFactory wsdlFactory;
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java
index 579d9d3..01bf05e 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java
@@ -64,7 +64,7 @@ import static org.junit.Assert.assertEquals;
* Unit test for testing DocLiteralInInterceptor to use Source Data Binding
*
*/
-public class DocLiteralInInterceptorTest extends Assert {
+public class DocLiteralInInterceptorTest {
private static final String NS = "http://cxf.apache.org/wsdl-first/types";
protected IMocksControl control;
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java
index 8e07191..06e718d 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.fail;
/**
*
*/
-public class ReflectionServiceFactorBeanTest extends Assert {
+public class ReflectionServiceFactorBeanTest {
protected IMocksControl control;
@Before
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/NSManagerTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/NSManagerTest.java
index e7f4fef..56f41ee 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/NSManagerTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/NSManagerTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class NSManagerTest extends Assert {
+public class NSManagerTest {
@Test
public void testGetPrefix() {
NSManager nsMan = new NSManager();
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
index e0c3bac..c72bc21 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
@@ -73,7 +73,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class ServiceWSDLBuilderTest extends Assert {
+public class ServiceWSDLBuilderTest {
private static final Logger LOG = LogUtils.getLogger(ServiceWSDLBuilderTest.class);
private static final String WSDL_PATH = "hello_world.wsdl";
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java
index 8d900a2..9fc1ba1 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class WSDLManagerImplTest extends Assert {
+public class WSDLManagerImplTest {
@Test
public void testBuildSimpleWSDL() throws Exception {
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
index bad0072..49d4664 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
@@ -79,7 +79,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class WSDLServiceBuilderTest extends Assert {
+public class WSDLServiceBuilderTest {
// TODO: reuse the wsdl in testutils and add the parameter order into one of the wsdl
private static final Logger LOG = LogUtils.getLogger(WSDLServiceBuilderTest.class);
private static final String WSDL_PATH = "hello_world.wsdl";
diff --git a/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointAPITest.java b/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointAPITest.java
index a681b37..f604512 100644
--- a/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointAPITest.java
+++ b/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointAPITest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
-public class EndpointAPITest extends Assert {
+public class EndpointAPITest {
private static int counter;
private static int currentPort;
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java
index 0755354..f22de8a 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java
@@ -51,7 +51,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class OASISCatalogTest extends Assert {
+public class OASISCatalogTest {
static final String PORT = TestUtil.getPortNumber(OASISCatalogTest.class);
private final QName serviceName =
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/schemavalidation/JavaFirstSchemaValidationTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/schemavalidation/JavaFirstSchemaValidationTest.java
index 845fb2b..13a42e6 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/schemavalidation/JavaFirstSchemaValidationTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/schemavalidation/JavaFirstSchemaValidationTest.java
@@ -51,7 +51,7 @@ import org.junit.Test;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class JavaFirstSchemaValidationTest extends Assert {
+public class JavaFirstSchemaValidationTest {
static final String PORT = TestUtil.getNewPortNumber(JavaFirstSchemaValidationTest.class);
static final String PORT2 = TestUtil.getNewPortNumber(JavaFirstSchemaValidationTest.class);
static final String PORT_UNUSED = TestUtil.getNewPortNumber(JavaFirstSchemaValidationTest.class);
diff --git a/systests/microprofile/client/async/src/test/java/org/apache/cxf/systest/microprofile/rest/client/AsyncMethodTest.java b/systests/microprofile/client/async/src/test/java/org/apache/cxf/systest/microprofile/rest/client/AsyncMethodTest.java
index 988472f..4ffd4a0 100644
--- a/systests/microprofile/client/async/src/test/java/org/apache/cxf/systest/microprofile/rest/client/AsyncMethodTest.java
+++ b/systests/microprofile/client/async/src/test/java/org/apache/cxf/systest/microprofile/rest/client/AsyncMethodTest.java
@@ -52,7 +52,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.*;
import static org.junit.Assert.assertEquals;
//CHECKSTYLE:ON
-public class AsyncMethodTest extends Assert {
+public class AsyncMethodTest {
@Rule
public WireMockRule wireMockRule = new WireMockRule(WireMockConfiguration.options().dynamicPort());
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java
index 8d3db8b..5ada08a 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class PublishedEndpointUrlTest extends Assert {
+public class PublishedEndpointUrlTest {
public static final String PORT = TestUtil.getPortNumber(PublishedEndpointUrlTest.class);
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
index 0383a4b..e17b40f 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
@@ -59,7 +59,7 @@ import static org.junit.Assert.fail;
* This class tests starting up and shutting down the embedded server when there
* is extra jetty configuration.
*/
-public class EngineLifecycleTest extends Assert {
+public class EngineLifecycleTest {
private static final String PORT1 = TestUtil.getPortNumber(EngineLifecycleTest.class, 1);
private static final String PORT2 = TestUtil.getPortNumber(EngineLifecycleTest.class, 2);
private GenericApplicationContext applicationContext;
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
index 2ad9de4..0982f01 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
@@ -40,7 +40,7 @@ import org.junit.Test;
import static org.junit.Assert.assertNotNull;
-public class BusExtensionLoadingTest extends Assert {
+public class BusExtensionLoadingTest {
/**
* Tests the ExtensionManagerBus can be built using a given classloader
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java
index 20c6c5e..8b16ff2 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java
@@ -44,7 +44,7 @@ import org.junit.Test;
import static org.junit.Assert.assertNotNull;
-public class BusShutdownTest extends Assert {
+public class BusShutdownTest {
public static final String PORT = TestUtil.getPortNumber(BusShutdownTest.class);
@Test
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java
index 6b20c8f..ec66ae0 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java
@@ -40,7 +40,7 @@ import org.junit.Test;
import static org.junit.Assert.assertNotNull;
-public class SpringBusFactoryTest extends Assert {
+public class SpringBusFactoryTest {
@Test
public void testKnownExtensions() throws BusException {
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/AbstractColocTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/AbstractColocTest.java
index cc8c84b..4822e6d 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/AbstractColocTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/AbstractColocTest.java
@@ -39,7 +39,7 @@ import org.junit.Before;
import static org.junit.Assert.assertNotNull;
-public abstract class AbstractColocTest extends Assert {
+public abstract class AbstractColocTest {
public static final String PORT = TestUtil.getPortNumber(AbstractColocTest.class);
/**
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterImpl.java
index e326b91..f05d765 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterImpl.java
@@ -55,7 +55,7 @@ import static org.junit.Assert.assertEquals;
wsdlLocation = "classpath:/wsdl_systest/hello_world_corba.wsdl",
endpointInterface = "org.apache.cxf.hello_world_corba.Greeter")
-public class BaseGreeterImpl extends Assert implements Greeter {
+public class BaseGreeterImpl implements Greeter {
public static final String GREETME_IN = "test in";
public static final String GREETME_OUT = "test out";
static final String EX_STRING = "CXF RUNTIME EXCEPTION";
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java
index 051d96d..7882c31 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java
@@ -55,7 +55,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-public class LifeCycleTest extends Assert {
+public class LifeCycleTest {
public static final String PORT1 = TestUtil.getPortNumber(LifeCycleTest.class, 1);
public static final String PORT2 = TestUtil.getPortNumber(LifeCycleTest.class, 2);
public static final String PORT3 = TestUtil.getPortNumber(LifeCycleTest.class, 3);
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java
index ea7427a..6623871 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class ManagedBusTest extends Assert {
+public class ManagedBusTest {
public static final String JMX_PORT1 = TestUtil.getPortNumber(ManagedBusTest.class, 1);
public static final String JMX_PORT2 = TestUtil.getPortNumber(ManagedBusTest.class, 3);
public static final String SERVICE_PORT = TestUtil.getPortNumber(ManagedBusTest.class, 4);
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/simple/SimpleFrontendTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/simple/SimpleFrontendTest.java
index 26a5095..e1c0b8b 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/simple/SimpleFrontendTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/simple/SimpleFrontendTest.java
@@ -37,7 +37,7 @@ import org.junit.Test;
import static org.junit.Assert.assertFalse;
-public class SimpleFrontendTest extends Assert {
+public class SimpleFrontendTest {
static final String PORT1 = TestUtil.getPortNumber(SimpleFrontendTest.class);
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/SoapActionTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/SoapActionTest.java
index 9ac7cdc..f1642c7 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/SoapActionTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/SoapActionTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-public class SoapActionTest extends Assert {
+public class SoapActionTest {
static final String PORT1 = TestUtil.getPortNumber(SoapActionTest.class, 1);
static final String PORT2 = TestUtil.getPortNumber(SoapActionTest.class, 2);
static final String PORT3 = TestUtil.getPortNumber(SoapActionTest.class, 3);
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
index 4a821d7..e42d57a 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class MessageFlow extends Assert {
+public class MessageFlow {
private final String addressingNamespace;
private final String rmNamespace;
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
index 4a821d7..e42d57a 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class MessageFlow extends Assert {
+public class MessageFlow {
private final String addressingNamespace;
private final String rmNamespace;
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java b/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
index a900493..7a260a6 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
@@ -50,13 +50,15 @@ import org.apache.cxf.tools.util.ToolsStaxUtils;
import org.apache.ws.commons.schema.constants.Constants;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.ComparisonFailure;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
-public class ProcessorTestBase extends Assert {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class ProcessorTestBase {
public static final List<String> DEFAULT_IGNORE_ATTR = Arrays.asList(new String[]{"attributeFormDefault",
"elementFormDefault",
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java
index b69e277..ae005b0 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java
@@ -29,7 +29,7 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
-public abstract class ToolTestBase extends Assert {
+public abstract class ToolTestBase {
protected PrintStream oldStdErr;
protected PrintStream oldStdOut;
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/ProcessorEnvironmentTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/ProcessorEnvironmentTest.java
index f973577..9a0d2b0 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/ProcessorEnvironmentTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/ProcessorEnvironmentTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class ProcessorEnvironmentTest extends Assert {
+public class ProcessorEnvironmentTest {
@Test
public void testGet() {
Map<String, Object> map = new HashMap<>();
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/ToolContextTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/ToolContextTest.java
index 64e5eef..648f3c7 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/ToolContextTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/ToolContextTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
-public class ToolContextTest extends Assert {
+public class ToolContextTest {
ToolContext context = new ToolContext();
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java
index 3eaf5d8..bc66577 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class WSDLVersionTest extends Assert {
+public class WSDLVersionTest {
@Test
public void testWSDLVersion() {
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/dom/ExtendedDocumentBuilderTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/dom/ExtendedDocumentBuilderTest.java
index 6845186..29cc7b6 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/dom/ExtendedDocumentBuilderTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/dom/ExtendedDocumentBuilderTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class ExtendedDocumentBuilderTest extends Assert {
+public class ExtendedDocumentBuilderTest {
@Test
public void testMassMethod() throws Exception {
ExtendedDocumentBuilder builder = new ExtendedDocumentBuilder();
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JAnnotationTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JAnnotationTest.java
index c461670..82c77ff 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JAnnotationTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JAnnotationTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class JAnnotationTest extends Assert {
+public class JAnnotationTest {
@Test
public void testList() throws Exception {
JAnnotation annotation = new JAnnotation(XmlSeeAlso.class);
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaClassTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaClassTest.java
index 817010f..7e69323 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaClassTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaClassTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class JavaClassTest extends Assert {
+public class JavaClassTest {
@Test
public void testGetterSetter() throws Exception {
JavaField field = new JavaField("arg0",
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaInterfaceTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaInterfaceTest.java
index 2441d06..9ef5509 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaInterfaceTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaInterfaceTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class JavaInterfaceTest extends Assert {
+public class JavaInterfaceTest {
@Test
public void testSetFullClassName() throws Exception {
String fullName = "org.apache.cxf.tools.common.model.JavaInterface";
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaParameterTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaParameterTest.java
index 33bbe28..8d24dd4 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaParameterTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaParameterTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class JavaParameterTest extends Assert {
+public class JavaParameterTest {
@Test
public void testGetHolderDefaultTypeValue() throws Exception {
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaTypeTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaTypeTest.java
index 8fe3d2d..b972e79 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaTypeTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/model/JavaTypeTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class JavaTypeTest extends Assert {
+public class JavaTypeTest {
@Test
public void testGetPredefinedDefaultTypeValue() throws Exception {
assertEquals("0", new JavaType("i", int.class.getName(), null).getDefaultTypeValue());
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/AbstractToolContainerTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/AbstractToolContainerTest.java
index 27c39ac..c572dac 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/AbstractToolContainerTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/AbstractToolContainerTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class AbstractToolContainerTest extends Assert {
+public class AbstractToolContainerTest {
private DummyToolContainer dummyTool;
@Before
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolExceptionTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolExceptionTest.java
index 45f440c..62dfb71 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolExceptionTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolExceptionTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class ToolExceptionTest extends Assert {
+public class ToolExceptionTest {
@Test
public void testMassMethod() {
ToolException e = new ToolException("e");
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSpecTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSpecTest.java
index c62c2e9..8dd971f 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSpecTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSpecTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class ToolSpecTest extends Assert {
+public class ToolSpecTest {
ToolSpec toolSpec;
@Test
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSupportTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSupportTest.java
index 0e60955..1b180fa 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSupportTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/ToolSupportTest.java
@@ -24,7 +24,7 @@ import org.apache.cxf.tools.common.ToolException;
import org.junit.Assert;
import org.junit.Test;
-public class ToolSupportTest extends Assert {
+public class ToolSupportTest {
@Test
public void testProtect() throws ToolException {
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
index 4d49fa3..515f208 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class CommandLineParserTest extends Assert {
+public class CommandLineParserTest {
private CommandLineParser parser;
@Before
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/util/BuiltInTypesJavaMappingUtilTest.java b/tools/common/src/test/java/org/apache/cxf/tools/util/BuiltInTypesJavaMappingUtilTest.java
index d98c165..dc8eb1a 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/util/BuiltInTypesJavaMappingUtilTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/util/BuiltInTypesJavaMappingUtilTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class BuiltInTypesJavaMappingUtilTest extends Assert {
+public class BuiltInTypesJavaMappingUtilTest {
private final String xmlSchemaNS = "http://www.w3.org/2000/10/XMLSchema";
@Test
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/util/FileWriterUtilTest.java b/tools/common/src/test/java/org/apache/cxf/tools/util/FileWriterUtilTest.java
index 99d5c8b..4623ace 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/util/FileWriterUtilTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/util/FileWriterUtilTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
import static org.junit.Assert.assertNotNull;
-public class FileWriterUtilTest extends Assert {
+public class FileWriterUtilTest {
private void cleanDir(File dir) {
try {
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/util/NameUtilTest.java b/tools/common/src/test/java/org/apache/cxf/tools/util/NameUtilTest.java
index 20eb0ea..dfad463 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/util/NameUtilTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/util/NameUtilTest.java
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-public class NameUtilTest extends Assert {
+public class NameUtilTest {
@Test
public void testMangleToClassName() {
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java b/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java
index f255787..4d3bc74 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class URIParserUtilTest extends Assert {
+public class URIParserUtilTest {
@Test
public void testGetPackageName() {
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/ToolTestBase.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/ToolTestBase.java
index cec434a..9e9ba94 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/ToolTestBase.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/ToolTestBase.java
@@ -27,7 +27,7 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
-public abstract class ToolTestBase extends Assert {
+public abstract class ToolTestBase {
protected PrintStream oldStdErr;
protected PrintStream oldStdOut;
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java
index cdfda6b..82a501b 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class IdlPreprocessorReaderTest extends Assert {
+public class IdlPreprocessorReaderTest {
private URL findTestResource(String spec) {
String location = "/idlpreprocessor/" + spec;
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java
index 5d56fc9..0ad4cc0 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java
@@ -69,7 +69,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class WSDLToCorbaBindingTest extends Assert {
+public class WSDLToCorbaBindingTest {
WSDLToCorbaBinding generator;
WSDLWriter writer;
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
index 66cdfce..c1e7e8c 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
@@ -60,7 +60,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class WSDLToCorbaBindingTypeTest extends Assert {
+public class WSDLToCorbaBindingTypeTest {
WSDLToCorbaBinding generator;
WSDLWriter writer;
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
index e0273ed..d68a68a 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
@@ -38,7 +38,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class WSDLToIDLGenerationTest extends Assert {
+public class WSDLToIDLGenerationTest {
protected static final String START_COMMENT = "/*";
protected static final String END_COMMENT = "*/";
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java
index 212bc9f..c68375e 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class WSDLGeneratorFactoryTest extends Assert {
+public class WSDLGeneratorFactoryTest {
@Test
public void testNewWSDL11Generator() {
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotatorTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotatorTest.java
index 2832951..3752223 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotatorTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotatorTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class WrapperBeanAnnotatorTest extends Assert {
+public class WrapperBeanAnnotatorTest {
@Test
public void testAnnotate() {
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanFieldAnnotatorTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanFieldAnnotatorTest.java
index 3258c57..38c22f0 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanFieldAnnotatorTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanFieldAnnotatorTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class WrapperBeanFieldAnnotatorTest extends Assert {
+public class WrapperBeanFieldAnnotatorTest {
@Test
public void testAnnotate() {
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactoryTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactoryTest.java
index 9ce15f2..9f54879 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactoryTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactoryTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class FrontendFactoryTest extends Assert {
+public class FrontendFactoryTest {
FrontendFactory factory = FrontendFactory.getInstance();
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactoryTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactoryTest.java
index b947271..0e296f0 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactoryTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactoryTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class ServiceBuilderFactoryTest extends Assert {
+public class ServiceBuilderFactoryTest {
ServiceBuilderFactory factory = ServiceBuilderFactory.getInstance(new ArrayList<>(),
"jaxb");
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java
index e4de89d..11f3107 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class FaultBeanTest extends Assert {
+public class FaultBeanTest {
@Test
public void testTransform() throws Exception {
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java
index 09002db..52bd6b5 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class RequestWrapperTest extends Assert {
+public class RequestWrapperTest {
JaxwsServiceBuilder builder = new JaxwsServiceBuilder();
private OperationInfo getOperation(Class<?> clz, String opName) {
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapperTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapperTest.java
index b00e082..b8acb26 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapperTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapperTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class ResponseWrapperTest extends Assert {
+public class ResponseWrapperTest {
JaxwsServiceBuilder builder = new JaxwsServiceBuilder();
private OperationInfo getOperation(Class<?> clz, String opName) {
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperTest.java
index 4a239da..8d415a9 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class WrapperTest extends Assert {
+public class WrapperTest {
@Test
public void testGetWrapperBeanClassFromQName() {
QName qname = new QName("http://cxf.apache.org", "sayHi");
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperUtilTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperUtilTest.java
index 899b302..8d075cd 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperUtilTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperUtilTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class WrapperUtilTest extends Assert {
+public class WrapperUtilTest {
String pkgName = "org.apache.cxf.tools.fortest.classnoanno.docwrapped";
Class<?> stockClass;
Method method;
diff --git a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java
index 5dba9bd..64d230c 100644
--- a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java
+++ b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
import static org.junit.Assert.assertTrue;
-public class Stax2DOMTest extends Assert {
+public class Stax2DOMTest {
@Test
public void testGetDocument() throws Exception {
diff --git a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDL11ValidatorTest.java b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDL11ValidatorTest.java
index da0ffc5..ded5296 100644
--- a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDL11ValidatorTest.java
+++ b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDL11ValidatorTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class WSDL11ValidatorTest extends Assert {
+public class WSDL11ValidatorTest {
private ToolContext context = new ToolContext();
@Test
diff --git a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java
index ff18d00..f1fe486 100644
--- a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java
+++ b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class WSDLRefValidatorTest extends Assert {
+public class WSDLRefValidatorTest {
private Definition getWSDL(String wsdl) throws Exception {
Bus b = BusFactory.getDefaultBus();
diff --git a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/model/XNodeTest.java b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/model/XNodeTest.java
index 6d776b6..8ec9bad 100644
--- a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/model/XNodeTest.java
+++ b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/model/XNodeTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class XNodeTest extends Assert {
+public class XNodeTest {
@Test
public void testWSDLDefinition() {
XDef def = new XDef();
diff --git a/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java b/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java
index d6172c8..d27bedc 100644
--- a/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java
+++ b/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class WSDLToJavaContainerTest extends Assert {
+public class WSDLToJavaContainerTest {
@Test
public void testNoPlugin() throws Exception {
diff --git a/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilderTest.java b/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilderTest.java
index 4840196..00bcb82 100644
--- a/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilderTest.java
+++ b/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilderTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class WSDLDefinitionBuilderTest extends Assert {
+public class WSDLDefinitionBuilderTest {
@BeforeClass
public static void ensureNewBus() {
BusFactory.setDefaultBus(null);
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java
index 98fc275..3a3847b 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class CatalogTest extends Assert {
+public class CatalogTest {
@Test
public void testCatalog() throws Exception {
OASISCatalogManager catalogManager = new OASISCatalogManager();
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java
index 447ff27..21b3f4f 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class JAXWSProfileTest extends Assert {
+public class JAXWSProfileTest {
@Test
public void testLoadPlugins() {
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessorTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessorTest.java
index f867bfd..34ad03d 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessorTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessorTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class ParameterProcessorTest extends Assert {
+public class ParameterProcessorTest {
@Test
public void testAddParameter() throws Exception {
ParameterProcessor processor = new ParameterProcessor(new ToolContext());
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessorTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessorTest.java
index 6d70edd..8c917db 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessorTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessorTest.java
@@ -23,7 +23,7 @@ import org.junit.Assert;
import org.junit.Test;
-public class PortTypeProcessorTest extends Assert {
+public class PortTypeProcessorTest {
@Test
public void testProcess() throws Exception {
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtilTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtilTest.java
index 3a873a3..0f8f084 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtilTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtilTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class ProcessorUtilTest extends Assert {
+public class ProcessorUtilTest {
private boolean isWindows() {
return System.getProperty("os.name").contains("Windows");
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebMethodAnnotatorTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebMethodAnnotatorTest.java
index eced9c0..1f3969f 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebMethodAnnotatorTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebMethodAnnotatorTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class WebMethodAnnotatorTest extends Assert {
+public class WebMethodAnnotatorTest {
@Test
public void testAddWebMethodAnnotation() throws Exception {
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotatorTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotatorTest.java
index f4e83ec..e75a497 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotatorTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotatorTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class WebParamAnnotatorTest extends Assert {
+public class WebParamAnnotatorTest {
JavaMethod method;
JavaParameter parameter;
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlSeeAlsoAnnotatorTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlSeeAlsoAnnotatorTest.java
index 09dd2fd..2dbf5f5 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlSeeAlsoAnnotatorTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlSeeAlsoAnnotatorTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-public class XmlSeeAlsoAnnotatorTest extends Assert {
+public class XmlSeeAlsoAnnotatorTest {
@Test
public void testAddXmlSeeAlsoAnnotation() throws Exception {
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/InterfaceMapperTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/InterfaceMapperTest.java
index ff563dc..fcbbfcb 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/InterfaceMapperTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/InterfaceMapperTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class InterfaceMapperTest extends Assert {
+public class InterfaceMapperTest {
@Test
public void testMap() throws Exception {
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/MethodMapperTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/MethodMapperTest.java
index f02c618..968f2df 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/MethodMapperTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/MethodMapperTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class MethodMapperTest extends Assert {
+public class MethodMapperTest {
private OperationInfo getOperation() {
OperationInfo operation = new OperationInfo();
diff --git a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
index 2903081..1302103 100644
--- a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
+++ b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
@@ -41,7 +41,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class JAXWSDefinitionBuilderTest extends Assert {
+public class JAXWSDefinitionBuilderTest {
private ToolContext env;
@Before
diff --git a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaTest.java b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaTest.java
index 4b18237..7f52e4e 100644
--- a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaTest.java
+++ b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class WSDLToJavaTest extends Assert {
+public class WSDLToJavaTest {
@Test
public void testGetFrontEndName() throws Exception {
diff --git a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java
index 98bffd5..5119a76 100644
--- a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java
+++ b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class PluginLoaderTest extends Assert {
+public class PluginLoaderTest {
@Test
public void testLoadPlugins() throws Exception {
diff --git a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
index 2e5a417..5674405 100644
--- a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
+++ b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class JAXWSDefinitionBuilderTest extends Assert {
+public class JAXWSDefinitionBuilderTest {
private ToolContext env;
@Before
[cxf] 02/05: More work on removing extending assert
Posted by co...@apache.org.
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 <co...@apache.org>
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;