[cxf] branch master updated: Some junit assertion optimisations

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[cxf] branch master updated: Some junit assertion optimisations

coheigea
Administrator
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


The following commit(s) were added to refs/heads/master by this push:
     new db7ce85  Some junit assertion optimisations
db7ce85 is described below

commit db7ce85f644a6a693b8ee581ad60cd348a598a7c
Author: Colm O hEigeartaigh <[hidden email]>
AuthorDate: Fri Feb 8 14:38:26 2019 +0000

    Some junit assertion optimisations
---
 .../apache/cxf/bus/extension/ExtensionTest.java    |  5 +--
 .../extension/TextExtensionFragmentParserTest.java |  5 +--
 .../cxf/bus/spring/SpringBusFactoryTest.java       |  5 +--
 .../configuration/spring/ConfigurerImplTest.java   | 15 ++++-----
 .../java/org/apache/cxf/helpers/FileUtilsTest.java |  5 +--
 .../cxf/phase/PhaseInterceptorChainTest.java       | 18 +++++------
 .../cxf/jca/cxf/ConnectionFactoryImplTest.java     |  6 ++--
 .../cxf/jca/cxf/ManagedConnectionImplTest.java     |  4 +--
 .../ObjectMethodInvocationHandlerTest.java         |  3 +-
 .../cxf/jaxrs/model/doc/JavaDocProviderTest.java   |  3 +-
 .../apache/cxf/jaxws/ConfiguredEndpointTest.java   | 12 ++++----
 .../cxf/jaxws/handler/HandlerChainBuilderTest.java |  5 +--
 .../cxf/jaxws/handler/HandlerChainInvokerTest.java |  6 ++--
 .../ResponseTimeMessageInInterceptorTest.java      |  7 +++--
 .../cxf/jaxrs/model/wadl/WadlGeneratorTest.java    |  2 +-
 .../http/policy/ClientPolicyCalculatorTest.java    | 11 ++++---
 .../policy/HTTPClientAssertionBuilderTest.java     |  7 +++--
 .../policy/HTTPServerAssertionBuilderTest.java     |  7 +++--
 .../http/policy/ServerPolicyCalculatorTest.java    |  9 +++---
 .../cxf/transport/https/CertConstraintsTest.java   |  3 +-
 .../policy/AssertionBuilderRegistryImplTest.java   |  5 +--
 .../apache/cxf/ws/policy/AssertionInfoMapTest.java |  5 +--
 .../org/apache/cxf/ws/policy/PolicyEngineTest.java |  5 +--
 .../EndpointReferenceDomainExpressionTest.java     | 13 ++++----
 .../attachment/external/PolicyAttachmentTest.java  | 13 ++++----
 .../wsdl11/Wsdl11AttachmentPolicyProviderTest.java | 35 +++++++++++----------
 .../ws/policy/builder/jaxb/JaxbAssertionTest.java  | 17 +++++-----
 .../cxf/ws/rm/AbstractRMInterceptorTest.java       |  8 ++---
 .../org/apache/cxf/ws/rm/AbstractSequenceTest.java |  7 +++--
 .../apache/cxf/ws/rm/DestinationSequenceTest.java  | 10 +++---
 .../org/apache/cxf/ws/rm/RMContextUtilsTest.java   | 11 ++++---
 .../java/org/apache/cxf/ws/rm/RMManagerTest.java   |  2 +-
 .../org/apache/cxf/ws/rm/RMOutInterceptorTest.java |  5 +--
 .../org/apache/cxf/ws/rm/SourceSequenceTest.java   | 36 +++++++++++-----------
 .../apache/cxf/ws/rm/policy/PolicyUtilsTest.java   |  4 +--
 .../ws/rm/soap/RetransmissionQueueImplTest.java    | 12 ++++----
 .../apache/cxf/ws/security/sts/STSClientTest.java  |  6 ++--
 .../security/wss4j/AbstractPolicySecurityTest.java |  2 +-
 .../sts/claims/mapper/JexlIssueSamlClaimsTest.java |  2 +-
 .../cxf/sts/operation/IssueEncryptedUnitTest.java  | 18 +++++------
 .../cxf/sts/operation/IssueJWTClaimsUnitTest.java  |  3 +-
 .../sts/operation/IssueJWTOnbehalfofUnitTest.java  |  7 +++--
 .../cxf/sts/operation/IssueJWTRealmUnitTest.java   |  9 +++---
 .../apache/cxf/sts/operation/IssueJWTUnitTest.java |  3 +-
 .../cxf/sts/operation/IssueOnbehalfofUnitTest.java | 21 +++++++------
 .../apache/cxf/sts/operation/IssueSCTUnitTest.java |  6 ++--
 .../cxf/sts/operation/IssueSamlClaimsUnitTest.java |  3 +-
 .../cxf/sts/operation/IssueSamlRealmUnitTest.java  | 10 +++---
 .../cxf/sts/operation/IssueSamlUnitTest.java       | 30 +++++++++---------
 .../apache/cxf/sts/operation/IssueUnitTest.java    | 15 ++++-----
 .../systest/jaxrs/JAXRSClientServerBookTest.java   |  5 +--
 .../cxf/systest/jaxws/LocatorClientServerTest.java |  2 +-
 .../cxf/systest/management/ManagedBusTest.java     |  5 +--
 .../ws/policy/JavaFirstPolicyServiceTest.java      | 34 ++++++++++----------
 .../cxf/systest/ws/tokens/DoubleItBSTImpl.java     |  4 +--
 .../apache/cxf/tools/common/ProcessorTestBase.java |  5 +--
 .../common/toolspec/AbstractToolContainerTest.java |  4 +--
 .../cxf/tools/common/toolspec/ToolSpecTest.java    |  5 +--
 .../jaxws/wsdl11/JAXWSDefinitionBuilderTest.java   |  4 +--
 .../apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java | 10 +++---
 .../cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java |  5 +--
 61 files changed, 287 insertions(+), 257 deletions(-)

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 5604c41..f586ba4 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
@@ -23,6 +23,7 @@ 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;
@@ -43,7 +44,7 @@ public class ExtensionTest {
         e.setInterfaceName(interfaceName);
         assertEquals("Unexpected interface name.", interfaceName, e.getInterfaceName());
 
-        assertTrue("Extension is deferred.", !e.isDeferred());
+        assertFalse("Extension is deferred.", e.isDeferred());
         e.setDeferred(true);
         assertTrue("Extension is not deferred.", e.isDeferred());
 
@@ -108,4 +109,4 @@ public class ExtensionTest {
         }
     }
 
-}
\ 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 8d555d1..f7587ef 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,7 @@ import java.util.List;
 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;
 
@@ -38,7 +39,7 @@ public class TextExtensionFragmentParserTest {
         assertEquals("Unexpected number of Extension elements.", 3, extensions.size());
 
         Extension e = extensions.get(0);
-        assertTrue("Extension is deferred.", !e.isDeferred());
+        assertFalse("Extension is deferred.", e.isDeferred());
         assertEquals("Unexpected class name.",
                      "org.apache.cxf.foo.FooImpl", e.getClassname());
         assertEquals("Unexpected number of namespace elements.", 0, e.getNamespaces().size());
@@ -49,4 +50,4 @@ public class TextExtensionFragmentParserTest {
         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/spring/SpringBusFactoryTest.java b/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
index 5d27611..8b16510 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,7 @@ import org.junit.After;
 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;
@@ -179,7 +180,7 @@ public class SpringBusFactoryTest {
         Bus bus = new SpringBusFactory().createBus("org/apache/cxf/bus/spring/testjsr250.xml");
         TestExtension te = bus.getExtension(TestExtension.class);
         assertTrue("@PostConstruct annotated method has not been called.", te.postConstructMethodCalled);
-        assertTrue("@PreDestroy annoated method has been called already.", !te.preDestroyMethodCalled);
+        assertFalse("@PreDestroy annoated method has been called already.", te.preDestroyMethodCalled);
         bus.shutdown(true);
         assertTrue("@PreDestroy annotated method has not been called.", te.preDestroyMethodCalled);
 
@@ -282,4 +283,4 @@ public class SpringBusFactoryTest {
         }
 
     }
-}
\ 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 21c57af..f0899b6 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,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 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;
 
@@ -140,8 +141,8 @@ public class ConfigurerImplTest {
         configurer.configureBean(sb);
         assertEquals("Unexpected value for attribute stringAttr",
                      "hallo", sb.getStringAttr());
-        assertTrue("Unexpected value for attribute booleanAttr",
-                   !sb.getBooleanAttr());
+        assertFalse("Unexpected value for attribute booleanAttr",
+                   sb.getBooleanAttr());
         assertEquals("Unexpected value for attribute integerAttr",
                      BigInteger.TEN, sb.getIntegerAttr());
         assertEquals("Unexpected value for attribute intAttr",
@@ -177,8 +178,8 @@ public class ConfigurerImplTest {
         ConfigurerImpl configurer = new ConfigurerImpl();
         configurer.setApplicationContext(ac);
         configurer.configureBean(sb);
-        assertTrue("Unexpected value for attribute booleanAttr",
-                   !sb.getBooleanAttr());
+        assertFalse("Unexpected value for attribute booleanAttr",
+                   sb.getBooleanAttr());
         assertEquals("Unexpected value for attribute integerAttr",
                      BigInteger.TEN, sb.getIntegerAttr());
         assertEquals("Unexpected value for attribute stringAttr",
@@ -195,8 +196,8 @@ public class ConfigurerImplTest {
         ConfigurerImpl configurer = new ConfigurerImpl();
         configurer.setApplicationContext(ac);
         configurer.configureBean(sb);
-        assertTrue("Unexpected value for attribute booleanAttr",
-                   !sb.getBooleanAttr());
+        assertFalse("Unexpected value for attribute booleanAttr",
+                   sb.getBooleanAttr());
         assertEquals("Unexpected value for attribute integerAttr",
                      BigInteger.TEN, sb.getIntegerAttr());
         assertEquals("Unexpected value for attribute stringAttr",
@@ -412,4 +413,4 @@ public class ConfigurerImplTest {
         }
 
     }
-}
\ 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 db6bfd6..14f7dfc 100644
--- a/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java
@@ -30,6 +30,7 @@ import java.util.Optional;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 public class FileUtilsTest {
@@ -62,7 +63,7 @@ public class FileUtilsTest {
         assertTrue(p.isPresent());
 
         List<String> lines = FileUtils.readLines(p.get().toFile());
-        assertTrue(!lines.isEmpty());
+        assertFalse(lines.isEmpty());
     }
 
     @Test
@@ -78,4 +79,4 @@ public class FileUtilsTest {
 
         assertEquals(foundFiles, foundFiles2);
     }
-}
\ No newline at end of file
+}
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 d48638f..b0626e3 100644
--- a/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
+++ b/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
@@ -42,8 +42,8 @@ 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 PhaseInterceptorChainTest {
@@ -130,7 +130,7 @@ public class PhaseInterceptorChainTest {
         chain.add(p);
         Iterator<Interceptor<? extends Message>> it = chain.iterator();
         assertSame(p, it.next());
-        assertTrue(!it.hasNext());
+        assertFalse(it.hasNext());
     }
 
     @Test
@@ -142,12 +142,12 @@ public class PhaseInterceptorChainTest {
         chain.add(p, false);
         Iterator<Interceptor<? extends Message>> it = chain.iterator();
         assertSame(p, it.next());
-        assertTrue(!it.hasNext());
+        assertFalse(it.hasNext());
         chain.add(p, true);
         it = chain.iterator();
         assertSame(p, it.next());
         assertSame(p, it.next());
-        assertTrue(!it.hasNext());
+        assertFalse(it.hasNext());
     }
 
     @Test
@@ -160,12 +160,12 @@ public class PhaseInterceptorChainTest {
         chain.add(p2, false);
         Iterator<Interceptor<? extends Message>> it = chain.iterator();
         assertSame(p1, it.next());
-        assertTrue(!it.hasNext());
+        assertFalse(it.hasNext());
         chain.add(p2, true);
         it = chain.iterator();
         assertSame(p1, it.next());
         assertSame(p2, it.next());
-        assertTrue(!it.hasNext());
+        assertFalse(it.hasNext());
     }
 
     @Test
@@ -181,7 +181,7 @@ public class PhaseInterceptorChainTest {
 
         assertSame("Unexpected interceptor at this position.", p1, it.next());
         assertSame("Unexpected interceptor at this position.", p2, it.next());
-        assertTrue(!it.hasNext());
+        assertFalse(it.hasNext());
     }
 
     @Test
@@ -202,7 +202,7 @@ public class PhaseInterceptorChainTest {
         assertSame("Unexpected interceptor at this position.", p3, it.next());
         assertSame("Unexpected interceptor at this position.", p2, it.next());
         assertSame("Unexpected interceptor at this position.", p1, it.next());
-        assertTrue(!it.hasNext());
+        assertFalse(it.hasNext());
     }
 
     @Test
@@ -539,4 +539,4 @@ public class PhaseInterceptorChainTest {
         }
     }
 
-}
\ 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 955cb77..f48c8a9 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
@@ -185,7 +185,7 @@ public class ConnectionFactoryImplTest {
             cf.getConnection(param);
             fail("Expect exception on using of none interface class");
         } catch (ResourceException re) {
-            assertTrue(true);
+            // expected
         }
     }
 
@@ -196,8 +196,8 @@ public class ConnectionFactoryImplTest {
             cf.getConnection(param);
             fail("Expect exception of no interface here");
         } catch (ResourceException re) {
-            assertTrue(true);
+            // expected
         }
     }
 
-}
\ 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 8688d32..9f86bb1 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
@@ -203,7 +203,7 @@ public class ManagedConnectionImplTest extends ManagedConnectionTestBase {
             mci.associateConnection(dodgyHandle);
             fail("Except exception on call with ClassCast Exception");
         } catch (ResourceAdapterInternalException raie) {
-            assertTrue(true);
+            // expected
         }
 
     }
@@ -216,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/handlers/ObjectMethodInvocationHandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java
index 7e225ca..2eecdd4 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
@@ -28,6 +28,7 @@ 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;
 
 
@@ -115,7 +116,7 @@ public class ObjectMethodInvocationHandlerTest extends AbstractInvocationHandler
             (TestInterface)Proxy.newProxyInstance(TestInterface.class.getClassLoader(), interfaces, handler2);
 
         assertEquals(proxy1, proxy1);
-        assertTrue(!proxy1.equals(proxy2));
+        assertFalse(proxy1.equals(proxy2));
     }
 
 
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 d7c9e04..7268e33 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
@@ -75,7 +75,6 @@ public class JavaDocProviderTest {
         assertTrue(getStatus2Tested);
         assertTrue(getStatus3Tested);
         assertTrue(noDocsTested);
-        assertTrue(true);
     }
 
     private void testOperWithNoJavaDocs(JavaDocProvider p, OperationResourceInfo ori) {
@@ -106,4 +105,4 @@ public class JavaDocProviderTest {
         assertEquals("the query2", p.getMethodParameterDoc(ori, 2));
     }
 
-}
\ 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 87f3410..8a99164 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,8 +50,8 @@ import org.junit.After;
 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 ConfiguredEndpointTest {
     private static final QName SERVICE_NAME =
@@ -98,8 +98,8 @@ public class ConfiguredEndpointTest {
         Client client = eih.getClient();
         JaxWsEndpointImpl endpoint = (JaxWsEndpointImpl)client.getEndpoint();
         assertEquals("Unexpected bean name", PORT_NAME.toString() + ".endpoint", endpoint.getBeanName());
-        assertTrue("Unexpected value for property validating",
-                   !Boolean.TRUE.equals(endpoint.get(Message.SCHEMA_VALIDATION_ENABLED)));
+        assertFalse("Unexpected value for property validating",
+                   Boolean.TRUE.equals(endpoint.get(Message.SCHEMA_VALIDATION_ENABLED)));
 
         // System.out.println("endpoint interceptors");
         List<Interceptor<? extends Message>> interceptors = endpoint.getInInterceptors();
@@ -199,8 +199,8 @@ public class ConfiguredEndpointTest {
 
         JaxWsEndpointImpl endpoint = (JaxWsEndpointImpl)ei.getEndpoint();
         assertEquals("Unexpected bean name", PORT_NAME.toString() + ".endpoint", endpoint.getBeanName());
-        assertTrue("Unexpected value for property validating",
-                   !Boolean.TRUE.equals(endpoint.get(Message.SCHEMA_VALIDATION_ENABLED)));
+        assertFalse("Unexpected value for property validating",
+                   Boolean.TRUE.equals(endpoint.get(Message.SCHEMA_VALIDATION_ENABLED)));
 
         List<Interceptor<? extends Message>> interceptors = endpoint.getInInterceptors();
         assertNull("Unexpected test interceptor", findTestInterceptor(interceptors));
@@ -340,4 +340,4 @@ public class ConfiguredEndpointTest {
         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/handler/HandlerChainBuilderTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java
index 2e36e28..238883a 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,7 @@ import org.easymock.EasyMock;
 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;
@@ -80,7 +81,7 @@ public class HandlerChainBuilderTest {
         assertEquals(TestProtocolHandler.class, chain.get(3).getClass());
 
         TestLogicalHandler tlh = (TestLogicalHandler)chain.get(0);
-        assertTrue(!tlh.initCalled);
+        assertFalse(tlh.initCalled);
         assertNull(tlh.config);
     }
 
@@ -248,4 +249,4 @@ public class HandlerChainBuilderTest {
             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 7760243..6572803 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
@@ -117,7 +117,7 @@ public class HandlerChainInvokerTest {
 
         assertEquals(HANDLER_COUNT, invoker.getProtocolHandlers().size());
         for (Handler<?> h : invoker.getProtocolHandlers()) {
-            assertTrue(!(h instanceof LogicalHandler));
+            assertFalse(h instanceof LogicalHandler);
         }
 
     }
@@ -950,7 +950,7 @@ public class HandlerChainInvokerTest {
         invoker.invokeLogicalHandlers(true, lmc);
 
         assertEquals(7, invoker.getInvokedHandlers().size());
-//        assertTrue(!invoker.getInvokedHandlers().contains(logicalHandlers[1]));
+//        assertFalse(invoker.getInvokedHandlers().contains(logicalHandlers[1]));
         assertTrue(invoker.getInvokedHandlers().contains(protocolHandlers[0]));
         assertTrue(invoker.getInvokedHandlers().contains(protocolHandlers[1]));
         assertEquals(0, logicalHandlers[0].getHandleMessageCount());
@@ -1150,4 +1150,4 @@ public class HandlerChainInvokerTest {
         }
     }
 
-}
\ 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 0a2b795..1b360eb 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,7 @@ import org.apache.cxf.message.MessageImpl;
 import org.easymock.EasyMock;
 import org.junit.Test;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 public class ResponseTimeMessageInInterceptorTest extends AbstractMessageResponseTestBase {
@@ -172,9 +173,9 @@ public class ResponseTimeMessageInInterceptorTest extends AbstractMessageRespons
         Message message2 = new MessageImpl();
         Message message3 = new MessageImpl();
         message3.put(Message.REQUESTOR_ROLE, Boolean.TRUE);
-        assertTrue("the message should not be client", !rtmii.isClient(message1));
-        assertTrue("the message should not be client", !rtmii.isClient(message2));
+        assertFalse("the message should not be client", rtmii.isClient(message1));
+        assertFalse("the message should not be client", rtmii.isClient(message2));
         assertTrue("the message should be client", rtmii.isClient(message3));
     }
 
-}
\ 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 8c313fc..4e622e7 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
@@ -418,7 +418,7 @@ public class WadlGeneratorTest {
     }
 
     private void checkGrammarsWithLinks(Element appElement, List<String> links) {
-        assertTrue(!links.isEmpty());
+        assertFalse(links.isEmpty());
         List<Element> grammarEls = DOMUtils.getChildrenWithName(appElement, WadlGenerator.WADL_NS,
                                                                 "grammars");
         assertEquals(1, grammarEls.size());
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 114c8ff..255f6aa 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,7 @@ import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 public class ClientPolicyCalculatorTest {
@@ -43,7 +44,7 @@ public class ClientPolicyCalculatorTest {
         assertTrue("Policies are not compatible.", calc.compatible(p1, p2));
         p1.setAllowChunking(false);
         p2.setAllowChunking(true);
-        assertTrue("Policies are compatible.", !calc.compatible(p1, p2));
+        assertFalse("Policies are compatible.", calc.compatible(p1, p2));
         p2.setAllowChunking(false);
         assertTrue("Policies are compatible.", calc.compatible(p1, p2));
     }
@@ -79,7 +80,7 @@ public class ClientPolicyCalculatorTest {
         p1.setAllowChunking(false);
         p2.setAllowChunking(false);
         p = calc.intersect(p1, p2);
-        assertTrue(!p.isAllowChunking());
+        assertFalse(p.isAllowChunking());
     }
 
     @Test
@@ -90,11 +91,11 @@ public class ClientPolicyCalculatorTest {
         HTTPClientPolicy p2 = new HTTPClientPolicy();
         assertTrue(calc.equals(p1, p2));
         p1.setDecoupledEndpoint("http://localhost:8080/decoupled");
-        assertTrue(!calc.equals(p1, p2));
+        assertFalse(calc.equals(p1, p2));
         p2.setDecoupledEndpoint("http://localhost:8080/decoupled");
         assertTrue(calc.equals(p1, p2));
         p1.setReceiveTimeout(10000L);
-        assertTrue(!calc.equals(p1, p2));
+        assertFalse(calc.equals(p1, p2));
     }
 
     @Test
@@ -130,4 +131,4 @@ public class ClientPolicyCalculatorTest {
         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 d0affb9..5657b4c 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,7 @@ import org.apache.neethi.Assertion;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -42,7 +43,7 @@ public class HTTPClientAssertionBuilderTest {
         assertTrue(a instanceof JaxbAssertion);
         assertTrue(a instanceof HTTPClientAssertionBuilder.HTTPClientPolicyAssertion);
         assertEquals(new ClientPolicyCalculator().getDataClassName(), a.getName());
-        assertTrue(!a.isOptional());
+        assertFalse(a.isOptional());
     }
 
     @Test
@@ -61,6 +62,6 @@ public class HTTPClientAssertionBuilderTest {
         b.setData(pb);
         assertTrue(a.equal(b));
         pa.setDecoupledEndpoint("http://localhost:9999/decoupled_endpoint");
-        assertTrue(!a.equal(b));
+        assertFalse(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 3e05fe5..d08c351 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,7 @@ import org.apache.neethi.Assertion;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -42,7 +43,7 @@ public class HTTPServerAssertionBuilderTest {
         assertTrue(a instanceof JaxbAssertion);
         assertTrue(a instanceof HTTPServerAssertionBuilder.HTTPServerPolicyAssertion);
         assertEquals(new ServerPolicyCalculator().getDataClassName(), a.getName());
-        assertTrue(!a.isOptional());
+        assertFalse(a.isOptional());
     }
 
     @Test
@@ -61,7 +62,7 @@ public class HTTPServerAssertionBuilderTest {
         b.setData(pb);
         assertTrue(a.equal(b));
         pa.setSuppressClientSendErrors(true);
-        assertTrue(!a.equal(b));
+        assertFalse(a.equal(b));
     }
 
-}
\ 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 74a99d3..759a17e 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,7 @@ import org.apache.cxf.transports.http.configuration.HTTPServerPolicy;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 public class ServerPolicyCalculatorTest {
@@ -42,7 +43,7 @@ public class ServerPolicyCalculatorTest {
         p1.setSuppressClientSendErrors(false);
         assertTrue("Policies are compatible.", spc.compatible(p1, p2));
         p1.setSuppressClientSendErrors(true);
-        assertTrue("Policies are compatible.", !spc.compatible(p1, p2));
+        assertFalse("Policies are compatible.", spc.compatible(p1, p2));
         p2.setSuppressClientSendErrors(true);
         assertTrue("Policies are compatible.", spc.compatible(p1, p2));
     }
@@ -76,10 +77,10 @@ public class ServerPolicyCalculatorTest {
         HTTPServerPolicy p2 = new HTTPServerPolicy();
         assertTrue(spc.equals(p1, p2));
         p1.setContentEncoding("encoding");
-        assertTrue(!spc.equals(p1, p2));
+        assertFalse(spc.equals(p1, p2));
         p2.setContentEncoding("encoding");
         assertTrue(spc.equals(p1, p2));
         p1.setSuppressClientSendErrors(true);
-        assertTrue(!spc.equals(p1, p2));
+        assertFalse(spc.equals(p1, p2));
     }
-}
\ No newline at end of file
+}
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 398255e..39d3eb9 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
@@ -33,6 +33,7 @@ import org.apache.cxf.configuration.security.CertificateConstraintsType;
 import org.apache.cxf.staxutils.StaxUtils;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 public class CertConstraintsTest {
@@ -72,7 +73,7 @@ public class CertConstraintsTest {
         // neither are O=BadApacheTest
         //
         tmp = loadCertConstraints("subject-CN-bethal-O-badapache");
-        assertTrue(!tmp.matches(bethalCert) && !tmp.matches(gordyCert));
+        assertFalse(tmp.matches(bethalCert) || tmp.matches(gordyCert));
 
         //
         // both satisfy either CN=Bethal or O=ApacheTest
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 2800261..de2f96d 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
@@ -34,6 +34,7 @@ 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;
 
@@ -79,7 +80,7 @@ public class AssertionBuilderRegistryImplTest {
         control.replay();
         reg.setBus(bus);
 
-        assertTrue(!reg.isIgnoreUnknownAssertions());
+        assertFalse(reg.isIgnoreUnknownAssertions());
         try {
             reg.build(elems[0]);
             fail("Expected PolicyException not thrown.");
@@ -98,4 +99,4 @@ public class AssertionBuilderRegistryImplTest {
         }
         assertTrue(reg.build(elems[10]) instanceof PrimitiveAssertion);
     }
-}
\ No newline at end of file
+}
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 2a9f09b..69307c6 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
@@ -40,6 +40,7 @@ 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;
@@ -103,7 +104,7 @@ public class AssertionInfoMapTest {
         alt2.add(c);
 
         control.replay();
-        assertTrue(!aim.supportsAlternative(alt1, new ArrayList<>()));
+        assertFalse(aim.supportsAlternative(alt1, new ArrayList<>()));
         assertTrue(aim.supportsAlternative(alt2, new ArrayList<>()));
         control.verify();
     }
@@ -220,4 +221,4 @@ public class AssertionInfoMapTest {
                    ais[0].getAssertion(), c);
 
     }
-}
\ No newline at end of file
+}
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 bd8ccd9..16b60b3 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
@@ -58,6 +58,7 @@ 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;
@@ -98,7 +99,7 @@ public class PolicyEngineTest {
         assertNull(engine.getBus());
         assertNotNull(engine.getPolicyProviders());
         assertNull(engine.getAlternativeSelector());
-        assertTrue(!engine.isEnabled());
+        assertFalse(engine.isEnabled());
         Bus bus = new ExtensionManagerBus();
 
         engine.setBus(bus);
@@ -687,4 +688,4 @@ public class PolicyEngineTest {
     }
 
 
-}
\ No newline at end of file
+}
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 bbc5cab..2e74128 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
@@ -32,6 +32,7 @@ import org.easymock.IMocksControl;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
@@ -69,10 +70,10 @@ public class EndpointReferenceDomainExpressionTest {
         bmi = control.createMock(BindingMessageInfo.class);
         bfi = control.createMock(BindingFaultInfo.class);
 
-        assertTrue(!eprde.appliesTo(si));
-        assertTrue(!eprde.appliesTo(boi));
-        assertTrue(!eprde.appliesTo(bmi));
-        assertTrue(!eprde.appliesTo(bfi));
+        assertFalse(eprde.appliesTo(si));
+        assertFalse(eprde.appliesTo(boi));
+        assertFalse(eprde.appliesTo(bmi));
+        assertFalse(eprde.appliesTo(bfi));
 
         EndpointInfo ei = control.createMock(EndpointInfo.class);
         EasyMock.expect(ei.getAddress()).andReturn("http://localhost:8080/GreeterPort");
@@ -80,7 +81,7 @@ public class EndpointReferenceDomainExpressionTest {
         EasyMock.expect(epr.getAddress()).andReturn(auri);
         EasyMock.expect(auri.getValue()).andReturn("http://localhost:8080/Greeter");
         control.replay();
-        assertTrue(!eprde.appliesTo(ei));
+        assertFalse(eprde.appliesTo(ei));
         control.verify();
 
         control.reset();
@@ -97,4 +98,4 @@ public class EndpointReferenceDomainExpressionTest {
         si = null;
     }
 
-}
\ No newline at end of file
+}
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 300d6d6..4d2add7 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
@@ -35,6 +35,7 @@ import org.easymock.IMocksControl;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
@@ -79,7 +80,7 @@ public class PolicyAttachmentTest {
         EasyMock.expect(de.appliesTo(si1)).andReturn(false);
         EasyMock.expect(de.appliesTo(si2)).andReturn(true);
         control.replay();
-        assertTrue(!pa.appliesTo(si1));
+        assertFalse(pa.appliesTo(si1));
         assertTrue(pa.appliesTo(si2));
         control.verify();
     }
@@ -96,7 +97,7 @@ public class PolicyAttachmentTest {
         EasyMock.expect(de.appliesTo(ei1)).andReturn(false);
         EasyMock.expect(de.appliesTo(ei2)).andReturn(true);
         control.replay();
-        assertTrue(!pa.appliesTo(ei1));
+        assertFalse(pa.appliesTo(ei1));
         assertTrue(pa.appliesTo(ei2));
         control.verify();
     }
@@ -113,7 +114,7 @@ public class PolicyAttachmentTest {
         EasyMock.expect(de.appliesTo(boi1)).andReturn(false);
         EasyMock.expect(de.appliesTo(boi2)).andReturn(true);
         control.replay();
-        assertTrue(!pa.appliesTo(boi1));
+        assertFalse(pa.appliesTo(boi1));
         assertTrue(pa.appliesTo(boi2));
         control.verify();
     }
@@ -130,7 +131,7 @@ public class PolicyAttachmentTest {
         EasyMock.expect(de.appliesTo(bmi1)).andReturn(false);
         EasyMock.expect(de.appliesTo(bmi2)).andReturn(true);
         control.replay();
-        assertTrue(!pa.appliesTo(bmi1));
+        assertFalse(pa.appliesTo(bmi1));
         assertTrue(pa.appliesTo(bmi2));
         control.verify();
     }
@@ -147,10 +148,10 @@ public class PolicyAttachmentTest {
         EasyMock.expect(de.appliesTo(bfi1)).andReturn(false);
         EasyMock.expect(de.appliesTo(bfi2)).andReturn(true);
         control.replay();
-        assertTrue(!pa.appliesTo(bfi1));
+        assertFalse(pa.appliesTo(bfi1));
         assertTrue(pa.appliesTo(bfi2));
         control.verify();
     }
 
 
-}
\ No newline at end of file
+}
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 aa0c0e9..faa36f5 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
@@ -59,6 +59,7 @@ import org.junit.BeforeClass;
 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;
@@ -181,13 +182,13 @@ public class Wsdl11AttachmentPolicyProviderTest {
         // one extension of type Policy
         p = app.getElementPolicy(services[3]);
         assertNotNull(p);
-        assertTrue(!p.isEmpty());
+        assertFalse(p.isEmpty());
         verifyAssertionsOnly(p, 2);
 
         // two extensions of type Policy
         p = app.getElementPolicy(services[4]);
         assertNotNull(p);
-        assertTrue(!p.isEmpty());
+        assertFalse(p.isEmpty());
         verifyAssertionsOnly(p, 3);
 
         EndpointInfo ei = new EndpointInfo();
@@ -221,7 +222,7 @@ public class Wsdl11AttachmentPolicyProviderTest {
         // one extension of type Policy
         ep = app.getEffectivePolicy(services[3], null);
         assertNotNull(ep);
-        assertTrue(!ep.isEmpty());
+        assertFalse(ep.isEmpty());
         verifyAssertionsOnly(ep, 2);
         p = app.getElementPolicy(services[3]);
         assertTrue(PolicyComparator.compare(p, ep));
@@ -229,7 +230,7 @@ public class Wsdl11AttachmentPolicyProviderTest {
         // two extensions of type Policy
         ep = app.getEffectivePolicy(services[4], null);
         assertNotNull(ep);
-        assertTrue(!ep.isEmpty());
+        assertFalse(ep.isEmpty());
         verifyAssertionsOnly(ep, 3);
         p = app.getElementPolicy(services[4]);
         assertTrue(PolicyComparator.compare(p, ep));
@@ -251,7 +252,7 @@ public class Wsdl11AttachmentPolicyProviderTest {
         // porttype has no extensions
         ep = app.getEffectivePolicy(endpoints[5], null);
         assertNotNull(ep);
-        assertTrue(!ep.isEmpty());
+        assertFalse(ep.isEmpty());
         verifyAssertionsOnly(ep, 1);
         p = app.getElementPolicy(endpoints[5]);
         assertTrue(PolicyComparator.compare(p, ep));
@@ -261,7 +262,7 @@ public class Wsdl11AttachmentPolicyProviderTest {
         // porttype has no extensions
         ep = app.getEffectivePolicy(endpoints[6], null);
         assertNotNull(ep);
-        assertTrue(!ep.isEmpty());
+        assertFalse(ep.isEmpty());
         verifyAssertionsOnly(ep, 1);
         p = app.getElementPolicy(endpoints[6].getBinding());
         assertTrue(PolicyComparator.compare(p, ep));
@@ -271,7 +272,7 @@ public class Wsdl11AttachmentPolicyProviderTest {
         // porttype has one extension of type Policy
         ep = app.getEffectivePolicy(endpoints[7], null);
         assertNotNull(ep);
-        assertTrue(!ep.isEmpty());
+        assertFalse(ep.isEmpty());
         verifyAssertionsOnly(ep, 1);
         p = app.getElementPolicy(endpoints[7].getInterface());
         assertTrue(PolicyComparator.compare(p, ep));
@@ -281,7 +282,7 @@ public class Wsdl11AttachmentPolicyProviderTest {
         // binding has one extension of type Policy
         ep = app.getEffectivePolicy(endpoints[8], null);
         assertNotNull(ep);
-        assertTrue(!ep.isEmpty());
+        assertFalse(ep.isEmpty());
         verifyAssertionsOnly(ep, 3);
 
         // port has no extensions
@@ -291,7 +292,7 @@ public class Wsdl11AttachmentPolicyProviderTest {
 
         ep = app.getEffectivePolicy(endpoints[18], null);
         assertNotNull(ep);
-        assertTrue(!ep.isEmpty());
+        assertFalse(ep.isEmpty());
         verifyAssertionsOnly(ep, 2);
     }
 
@@ -308,21 +309,21 @@ public class Wsdl11AttachmentPolicyProviderTest {
         // binding operation has one extension of type Policy
         ep = app.getEffectivePolicy(getBindingOperationInfo(endpoints[9]), null);
         assertNotNull(ep);
-        assertTrue(!ep.isEmpty());
+        assertFalse(ep.isEmpty());
         verifyAssertionsOnly(ep, 1);
 
         // operation has one extension of type Policy
         // binding operation has no extensions
         ep = app.getEffectivePolicy(getBindingOperationInfo(endpoints[10]), null);
         assertNotNull(ep);
-        assertTrue(!ep.isEmpty());
+        assertFalse(ep.isEmpty());
         verifyAssertionsOnly(ep, 2);
 
         // operation has one extension of type Policy
         // binding operation one extension of type Policy
         ep = app.getEffectivePolicy(getBindingOperationInfo(endpoints[11]), null);
         assertNotNull(ep);
-        assertTrue(!ep.isEmpty());
+        assertFalse(ep.isEmpty());
         verifyAssertionsOnly(ep, 3);
     }
 
@@ -340,28 +341,28 @@ public class Wsdl11AttachmentPolicyProviderTest {
         // operation message has no extensions
         // message has no extensions
         ep = app.getEffectivePolicy(getBindingMessageInfo(endpoints[12], true), null);
-        assertTrue(!ep.isEmpty());
+        assertFalse(ep.isEmpty());
         verifyAssertionsOnly(ep, 1);
 
         // binding operation message has no extensions
         // operation message has one extension of type Policy
         // message has no extensions
         ep = app.getEffectivePolicy(getBindingMessageInfo(endpoints[13], true), null);
-        assertTrue(!ep.isEmpty());
+        assertFalse(ep.isEmpty());
         verifyAssertionsOnly(ep, 1);
 
         // binding operation message has no extensions
         // operation message has no extensions
         // message has one extension of type Policy
         ep = app.getEffectivePolicy(getBindingMessageInfo(endpoints[14], true), null);
-        assertTrue(!ep.isEmpty());
+        assertFalse(ep.isEmpty());
         verifyAssertionsOnly(ep, 1);
 
         // binding operation message has one extension of type Policy
         // operation message has one extension of type Policy
         // message has one extension of type Policy
         ep = app.getEffectivePolicy(getBindingMessageInfo(endpoints[15], true), null);
-        assertTrue(!ep.isEmpty());
+        assertFalse(ep.isEmpty());
         verifyAssertionsOnly(ep, 3);
     }
 
@@ -429,4 +430,4 @@ public class Wsdl11AttachmentPolicyProviderTest {
     }
 
 
-}
\ No newline at end of file
+}
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 ca95adb..eab0efb 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
@@ -38,6 +38,7 @@ import org.easymock.IMocksControl;
 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;
@@ -52,7 +53,7 @@ public class JaxbAssertionTest {
         JaxbAssertion<FooType> assertion = new JaxbAssertion<>();
         assertNull(assertion.getName());
         assertNull(assertion.getData());
-        assertTrue(!assertion.isOptional());
+        assertFalse(assertion.isOptional());
         assertEquals(Constants.TYPE_ASSERTION, assertion.getType());
         FooType data = new FooType();
         data.setName("CXF");
@@ -78,11 +79,11 @@ public class JaxbAssertionTest {
         assertion.setData(data);
 
         PolicyComponent pc = new Policy();
-        assertTrue(!assertion.equal(pc));
+        assertFalse(assertion.equal(pc));
         pc = new All();
-        assertTrue(!assertion.equal(pc));
+        assertFalse(assertion.equal(pc));
         pc = new ExactlyOne();
-        assertTrue(!assertion.equal(pc));
+        assertFalse(assertion.equal(pc));
 
         IMocksControl ctrl = EasyMock.createNiceControl();
         PrimitiveAssertion xpa = ctrl.createMock(PrimitiveAssertion.class);
@@ -91,7 +92,7 @@ public class JaxbAssertionTest {
         EasyMock.expect(xpa.getType()).andReturn(Constants.TYPE_ASSERTION);
 
         ctrl.replay();
-        assertTrue(!assertion.equal(xpa));
+        assertFalse(assertion.equal(xpa));
         ctrl.verify();
 
         FooType odata = new FooType();
@@ -100,7 +101,7 @@ public class JaxbAssertionTest {
         JaxbAssertion<FooType> oassertion = new JaxbAssertion<>();
         oassertion.setData(odata);
         oassertion.setName(qn);
-        assertTrue(!assertion.equal(oassertion));
+        assertFalse(assertion.equal(oassertion));
         oassertion.setData(data);
         assertTrue(assertion.equal(oassertion));
         assertTrue(assertion.equal(assertion));
@@ -134,7 +135,7 @@ public class JaxbAssertionTest {
                 total += pcs.size();
             }
         }
-        assertTrue(!alternatives.hasNext());
+        assertFalse(alternatives.hasNext());
         assertEquals(1, total);
     }
-}
\ No newline at end of file
+}
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 3affdff..2c655a5 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
@@ -40,9 +40,9 @@ 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;
 import static org.junit.Assert.fail;
 
 /**
@@ -156,10 +156,10 @@ public class AbstractRMInterceptorTest {
         EasyMock.expectLastCall();
         control.replay();
         interceptor.assertReliability(message);
-        assertTrue(!ai.isAsserted());
+        assertFalse(ai.isAsserted());
         aim.put(RM10Constants.RMASSERTION_QNAME, ais);
         interceptor.assertReliability(message);
-        assertTrue(!ai.isAsserted());
+        assertFalse(ai.isAsserted());
         ais.add(ai);
         interceptor.assertReliability(message);
 
@@ -187,4 +187,4 @@ public class AbstractRMInterceptorTest {
             }
         }
     }
-}
\ No newline at end of file
+}
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 973758f..378d897 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
@@ -23,6 +23,7 @@ import org.apache.cxf.ws.rm.v200702.ObjectFactory;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 public class AbstractSequenceTest {
@@ -36,14 +37,14 @@ public class AbstractSequenceTest {
         ObjectFactory factory = new ObjectFactory();
         id1 = factory.createIdentifier();
         id1.setValue("seq1");
-        assertTrue(!AbstractSequence.identifierEquals(id1, id2));
+        assertFalse(AbstractSequence.identifierEquals(id1, id2));
 
         id2 = factory.createIdentifier();
         id2.setValue("seq2");
-        assertTrue(!AbstractSequence.identifierEquals(id1, id2));
+        assertFalse(AbstractSequence.identifierEquals(id1, id2));
 
         id2.setValue("seq1");
         assertTrue(AbstractSequence.identifierEquals(id1, id2));
     }
 
-}
\ No newline at end of file
+}
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 877ecf3..2dc35b1 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
@@ -116,14 +116,14 @@ public class DestinationSequenceTest {
         DestinationSequence seq = new DestinationSequence(id, ref, destination,
             ProtocolVariation.RM10WSA200408);
         DestinationSequence otherSeq = null;
-        assertTrue(!seq.equals(otherSeq));
+        assertFalse(seq.equals(otherSeq));
         otherSeq = new DestinationSequence(id, ref, destination, ProtocolVariation.RM10WSA200408);
         assertEquals(seq, otherSeq);
         assertEquals(seq.hashCode(), otherSeq.hashCode());
         Identifier otherId = factory.createIdentifier();
         otherId.setValue("otherSeq");
         otherSeq = new DestinationSequence(otherId, ref, destination, ProtocolVariation.RM10WSA200408);
-        assertTrue(!seq.equals(otherSeq));
+        assertFalse(seq.equals(otherSeq));
         assertTrue(seq.hashCode() != otherSeq.hashCode());
     }
 
@@ -397,7 +397,7 @@ public class DestinationSequenceTest {
 
         DestinationSequence seq = new DestinationSequence(id, ref, destination,
             ProtocolVariation.RM10WSA200408);
-        assertTrue(!seq.sendAcknowledgement());
+        assertFalse(seq.sendAcknowledgement());
 
         seq.acknowledge(message);
 
@@ -431,7 +431,7 @@ public class DestinationSequenceTest {
         ap.setIntraMessageThreshold(0);
         config.setAcknowledgementInterval(Long.valueOf(200));
 
-        assertTrue(!seq.sendAcknowledgement());
+        assertFalse(seq.sendAcknowledgement());
 
         for (int i = 0; i < messages.length; i++) {
             seq.acknowledge(messages[i]);
@@ -644,7 +644,7 @@ public class DestinationSequenceTest {
         String addr = "http://localhost:9999/reponses";
         EasyMock.expect(uri.getValue()).andReturn(addr);
         control.replay();
-        assertTrue(!seq.canPiggybackAckOnPartialResponse());
+        assertFalse(seq.canPiggybackAckOnPartialResponse());
         control.verify();
         control.reset();
         EasyMock.expect(ref.getAddress()).andReturn(uri);
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 7f2edf0..81d3b21 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
@@ -30,6 +30,7 @@ import org.junit.After;
 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.assertSame;
 import static org.junit.Assert.assertTrue;
@@ -70,18 +71,18 @@ public class RMContextUtilsTest {
         EasyMock.expect(msg.getExchange()).andReturn(ex);
         EasyMock.expect(ex.getDestination()).andReturn(null);
         control.replay();
-        assertTrue(!RMContextUtils.isServerSide(msg));
+        assertFalse(RMContextUtils.isServerSide(msg));
     }
 
     @Test
     public void testIsRmPrtocolMessage() {
         control.replay();
         String action = null;
-        assertTrue(!RMContextUtils.isRMProtocolMessage(action));
+        assertFalse(RMContextUtils.isRMProtocolMessage(action));
         action = "";
-        assertTrue(!RMContextUtils.isRMProtocolMessage(action));
+        assertFalse(RMContextUtils.isRMProtocolMessage(action));
         action = "greetMe";
-        assertTrue(!RMContextUtils.isRMProtocolMessage(action));
+        assertFalse(RMContextUtils.isRMProtocolMessage(action));
         action = RM10Constants.CREATE_SEQUENCE_ACTION;
         assertTrue(RMContextUtils.isRMProtocolMessage(action));
     }
@@ -154,4 +155,4 @@ public class RMContextUtilsTest {
 
 
 
-}
\ No newline at end of file
+}
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 45792f7..b450953 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
@@ -776,7 +776,7 @@ public class RMManagerTest {
         assertNotNull(id1.getValue());
         Identifier id2 = generator.generateSequenceIdentifier();
         assertTrue(id1 != id2);
-        assertTrue(!id1.getValue().equals(id2.getValue()));
+        assertFalse(id1.getValue().equals(id2.getValue()));
         control.replay();
     }
 
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 c1ca498..2582e36 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
@@ -39,6 +39,7 @@ 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 RMOutInterceptorTest {
@@ -162,7 +163,7 @@ public class RMOutInterceptorTest {
         EasyMock.expect(message.getExchange()).andReturn(exchange).anyTimes();
         EasyMock.expect(exchange.getOutFaultMessage()).andReturn(null).anyTimes();
         control.replay();
-        assertTrue(!rmi.isRuntimeFault(message));
+        assertFalse(rmi.isRuntimeFault(message));
         control.verify();
     }
 
@@ -220,4 +221,4 @@ public class RMOutInterceptorTest {
         return maps;
 
     }
-}
\ No newline at end of file
+}
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 039127d..1ad6529 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
@@ -101,24 +101,24 @@ public class SourceSequenceTest {
 
         seq = new SourceSequence(id, ProtocolVariation.RM10WSA200408);
         assertEquals(id, seq.getIdentifier());
-        assertTrue(!seq.isLastMessage());
-        assertTrue(!seq.isExpired());
+        assertFalse(seq.isLastMessage());
+        assertFalse(seq.isExpired());
         assertEquals(0, seq.getCurrentMessageNr());
         assertNotNull(seq.getAcknowledgement());
         assertEquals(0, seq.getAcknowledgement().getAcknowledgementRange().size());
-        assertTrue(!seq.allAcknowledged());
+        assertFalse(seq.allAcknowledged());
         assertFalse(seq.offeredBy(otherId));
 
         Date expiry = new Date(System.currentTimeMillis() + 3600 * 1000);
 
         seq = new SourceSequence(id, expiry, null, ProtocolVariation.RM10WSA200408);
         assertEquals(id, seq.getIdentifier());
-        assertTrue(!seq.isLastMessage());
-        assertTrue(!seq.isExpired());
+        assertFalse(seq.isLastMessage());
+        assertFalse(seq.isExpired());
         assertEquals(0, seq.getCurrentMessageNr());
         assertNotNull(seq.getAcknowledgement());
         assertEquals(0, seq.getAcknowledgement().getAcknowledgementRange().size());
-        assertTrue(!seq.allAcknowledged());
+        assertFalse(seq.allAcknowledged());
         assertFalse(seq.offeredBy(otherId));
 
         seq = new SourceSequence(id, expiry, otherId, ProtocolVariation.RM10WSA200408);
@@ -133,7 +133,7 @@ public class SourceSequenceTest {
         Expires expires = factory.createExpires();
         seq.setExpires(expires);
 
-        assertTrue(!seq.isExpired());
+        assertFalse(seq.isExpired());
 
         Duration d = DatatypeFactory.PT0S;
         expires.setValue(d);
@@ -141,13 +141,13 @@ public class SourceSequenceTest {
         try {
             Thread.sleep(1000);
         } catch (InterruptedException ex) {
-            assertTrue(!seq.isExpired());
+            assertFalse(seq.isExpired());
         }
 
         d = DatatypeFactory.createDuration("PT1S");
         expires.setValue(d);
         seq.setExpires(expires);
-        assertTrue(!seq.isExpired());
+        assertFalse(seq.isExpired());
 
         d = DatatypeFactory.createDuration("-PT1S");
         expires.setValue(d);
@@ -159,14 +159,14 @@ public class SourceSequenceTest {
     public void testEqualsAndHashCode() {
         SourceSequence seq = new SourceSequence(id, ProtocolVariation.RM10WSA200408);
         SourceSequence otherSeq = null;
-        assertTrue(!seq.equals(otherSeq));
+        assertFalse(seq.equals(otherSeq));
         otherSeq = new SourceSequence(id, ProtocolVariation.RM10WSA200408);
         assertEquals(seq, otherSeq);
         assertEquals(seq.hashCode(), otherSeq.hashCode());
         Identifier otherId = factory.createIdentifier();
         otherId.setValue("otherSeq");
         otherSeq = new SourceSequence(otherId, ProtocolVariation.RM10WSA200408);
-        assertTrue(!seq.equals(otherSeq));
+        assertFalse(seq.equals(otherSeq));
         assertTrue(seq.hashCode() != otherSeq.hashCode());
     }
 
@@ -198,7 +198,7 @@ public class SourceSequenceTest {
         seq.setAcknowledged(ack);
         assertSame(ack, seq.getAcknowledgement());
         assertEquals(3, ack.getAcknowledgementRange().size());
-        assertTrue(!seq.isAcknowledged(3));
+        assertFalse(seq.isAcknowledged(3));
         assertTrue(seq.isAcknowledged(5));
         control.verify();
     }
@@ -211,9 +211,9 @@ public class SourceSequenceTest {
         setUpSource();
         seq.setSource(source);
 
-        assertTrue(!seq.allAcknowledged());
+        assertFalse(seq.allAcknowledged());
         seq.setLastMessage(true);
-        assertTrue(!seq.allAcknowledged());
+        assertFalse(seq.allAcknowledged());
         SequenceAcknowledgement ack = factory.createSequenceAcknowledgement();
         SequenceAcknowledgement.AcknowledgementRange r =
             factory.createSequenceAcknowledgementAcknowledgementRange();
@@ -225,7 +225,7 @@ public class SourceSequenceTest {
 
         control.replay();
         seq.setAcknowledged(ack);
-        assertTrue(!seq.allAcknowledged());
+        assertFalse(seq.allAcknowledged());
         r.setUpper(Long.valueOf(4));
         assertTrue(seq.allAcknowledged());
         control.verify();
@@ -243,7 +243,7 @@ public class SourceSequenceTest {
 
         seq = new SourceSequence(id, ProtocolVariation.RM10WSA200408);
         seq.setSource(source);
-        assertTrue(!nextMessages(seq, 10));
+        assertFalse(nextMessages(seq, 10));
         control.verify();
 
         // termination policy max length = 1
@@ -259,7 +259,7 @@ public class SourceSequenceTest {
         seq = new SourceSequence(id, ProtocolVariation.RM10WSA200408);
         seq.setSource(source);
         stp.setMaxLength(5);
-        assertTrue(!nextMessages(seq, 2));
+        assertFalse(nextMessages(seq, 2));
         control.verify();
 
         // termination policy max range exceeded
@@ -280,7 +280,7 @@ public class SourceSequenceTest {
         stp.setMaxLength(0);
         stp.setMaxRanges(4);
         acknowledge(seq, 1, 2, 4, 5, 6, 8, 9, 10);
-        assertTrue(!nextMessages(seq, 10));
+        assertFalse(nextMessages(seq, 10));
         control.verify();
 
         // termination policy max unacknowledged
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 c8e7939..38679ea 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
@@ -68,13 +68,13 @@ public class PolicyUtilsTest {
         InactivityTimeout iat = new RMAssertion.InactivityTimeout();
         iat.setMilliseconds(Long.valueOf(10));
         a.setInactivityTimeout(iat);
-        assertTrue(!RMPolicyUtilities.equals(a, b));
+        assertFalse(RMPolicyUtilities.equals(a, b));
         b.setInactivityTimeout(iat);
         assertTrue(RMPolicyUtilities.equals(a, b));
 
         ExponentialBackoff eb = new RMAssertion.ExponentialBackoff();
         a.setExponentialBackoff(eb);
-        assertTrue(!RMPolicyUtilities.equals(a, b));
+        assertFalse(RMPolicyUtilities.equals(a, b));
         b.setExponentialBackoff(eb);
         assertTrue(RMPolicyUtilities.equals(a, b));
     }
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 b65459a..921bd5c 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
@@ -121,10 +121,10 @@ public class RetransmissionQueueImplTest {
         assertSame(message, candidate.getMessage());
         assertEquals(0, candidate.getRetries());
         Date refDate = new Date(now + 5000);
-        assertTrue(!candidate.getNext().before(refDate));
+        assertFalse(candidate.getNext().before(refDate));
         refDate = new Date(now + 7000);
-        assertTrue(!candidate.getNext().after(refDate));
-        assertTrue(!candidate.isPending());
+        assertFalse(candidate.getNext().after(refDate));
+        assertFalse(candidate.isPending());
     }
 
     @Test
@@ -137,10 +137,10 @@ public class RetransmissionQueueImplTest {
         candidate.attempted();
         assertEquals(1, candidate.getRetries());
         Date refDate = new Date(now + 15000);
-        assertTrue(!candidate.getNext().before(refDate));
+        assertFalse(candidate.getNext().before(refDate));
         refDate = new Date(now + 17000);
-        assertTrue(!candidate.getNext().after(refDate));
-        assertTrue(!candidate.isPending());
+        assertFalse(candidate.getNext().after(refDate));
+        assertFalse(candidate.isPending());
     }
 
     @Test
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 00d8e51..5b7d7d4 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
@@ -53,8 +53,8 @@ import org.apache.cxf.wsdl11.WSDLServiceFactory;
 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 STSClientTest {
 
@@ -112,7 +112,7 @@ public class STSClientTest {
         }
 
         assertNotNull(wsdlDefinition);
-        assertTrue(!schemas.isEmpty());
+        assertFalse(schemas.isEmpty());
 
         WSDLManager wsdlManager = bus.getExtension(WSDLManager.class);
         Definition definition = wsdlManager.getDefinition(wsdlDefinition);
@@ -134,4 +134,4 @@ public class STSClientTest {
 
     }
 
-}
\ No newline at end of file
+}
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 0a6415b..ba15034 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
@@ -454,7 +454,7 @@ public abstract class AbstractPolicySecurityTest extends AbstractSecurityTest {
 
         List<WSSecurityEngineResult> signatureResults =
             results.get(0).getActionResults().get(WSConstants.SIGN);
-        assertTrue(!(signatureResults == null || signatureResults.isEmpty()));
+        assertFalse(signatureResults == null || signatureResults.isEmpty());
     }
 
     protected void verifyWss4jEncResults(SoapMessage inmsg) {
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 b40f5ed..689f7de 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
@@ -109,7 +109,7 @@ public class JexlIssueSamlClaimsTest {
         RequestSecurityTokenResponseCollectionType response =
             issueOperation.issue(request, principal, messageContext);
         List<RequestSecurityTokenResponseType> securityTokenResponse = response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
         return securityTokenResponse;
     }
 
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 02b5432..11316cd 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,7 +49,7 @@ 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.assertFalse;
 import static org.junit.Assert.fail;
 
 /**
@@ -112,7 +112,7 @@ public class IssueEncryptedUnitTest {
             issueOperation.issue(request, null, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
     }
 
     /**
@@ -163,7 +163,7 @@ public class IssueEncryptedUnitTest {
             issueOperation.issue(request, null, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         encryptionProperties.setEncryptionName("myservicekey");
         service.setEncryptionProperties(encryptionProperties);
@@ -171,7 +171,7 @@ public class IssueEncryptedUnitTest {
         // Issue a (encrypted) token
         response = issueOperation.issue(request, null, msgCtx);
         securityTokenResponse = response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
     }
 
 
@@ -222,7 +222,7 @@ public class IssueEncryptedUnitTest {
             issueOperation.issue(request, null, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         encryptionProperties.setEncryptionAlgorithm(WSS4JConstants.KEYTRANSPORT_RSA15);
         try {
@@ -284,7 +284,7 @@ public class IssueEncryptedUnitTest {
             issueOperation.issue(request, null, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Now specify a non-supported algorithm
         List<String> acceptedAlgorithms = Collections.singletonList(WSS4JConstants.KEYTRANSPORT_RSA15);
@@ -362,7 +362,7 @@ public class IssueEncryptedUnitTest {
             issueOperation.issue(request, null, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         encryptionProperties.setKeyWrapAlgorithm(WSS4JConstants.AES_128);
         try {
@@ -435,7 +435,7 @@ public class IssueEncryptedUnitTest {
             issueOperation.issue(request, null, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Now specify a non-supported algorithm
         String aesKw = "http://www.w3.org/2001/04/xmlenc#kw-aes128";
@@ -505,7 +505,7 @@ public class IssueEncryptedUnitTest {
             issueOperation.issue(request, null, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         encryptionProperties.setKeyIdentifierType(WSConstants.SKI_KEY_IDENTIFIER);
         issueOperation.issue(request, null, msgCtx);
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 3fb5c03..7a38708 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
@@ -88,6 +88,7 @@ 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.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -175,7 +176,7 @@ public class IssueJWTClaimsUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
         return securityTokenResponse;
     }
 
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 424ece9..866c2ed 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,6 +80,7 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal;
 
 import org.junit.Assert;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -160,7 +161,7 @@ public class IssueJWTOnbehalfofUnitTest {
             issueOperation.issue(request, null, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element token = null;
@@ -257,7 +258,7 @@ public class IssueJWTOnbehalfofUnitTest {
             issueOperation.issue(request, null, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element token = null;
@@ -358,7 +359,7 @@ public class IssueJWTOnbehalfofUnitTest {
             issueOperation.issue(request, null, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element token = null;
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 6696460..18c5576 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,6 +64,7 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal;
 
 import org.junit.Assert;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -135,7 +136,7 @@ public class IssueJWTRealmUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element token = null;
@@ -208,7 +209,7 @@ public class IssueJWTRealmUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element token = null;
@@ -281,7 +282,7 @@ public class IssueJWTRealmUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element token = null;
@@ -374,7 +375,7 @@ public class IssueJWTRealmUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element token = null;
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 3d5795e..291d0a9 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,6 +62,7 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal;
 
 import org.junit.Assert;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -131,7 +132,7 @@ public class IssueJWTUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element token = null;
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 81967b6..c67f65e 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
@@ -89,6 +89,7 @@ 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.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -169,7 +170,7 @@ public class IssueOnbehalfofUnitTest {
             issueOperation.issue(request, null, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
     }
 
     /**
@@ -240,7 +241,7 @@ public class IssueOnbehalfofUnitTest {
             issueOperation.issue(request, null, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
     }
 
     /**
@@ -321,7 +322,7 @@ public class IssueOnbehalfofUnitTest {
             issueOperation.issue(request, null, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
     }
 
     /**
@@ -402,7 +403,7 @@ public class IssueOnbehalfofUnitTest {
             issueOperation.issue(request, null, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
     }
 
     /**
@@ -483,7 +484,7 @@ public class IssueOnbehalfofUnitTest {
             issueOperation.issue(request, null, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
     }
 
     /**
@@ -564,7 +565,7 @@ public class IssueOnbehalfofUnitTest {
             issueOperation.issue(request, null, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
     }
 
     /**
@@ -798,7 +799,7 @@ public class IssueOnbehalfofUnitTest {
             issueOperation.issue(request, null, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
     }
 
     /**
@@ -960,7 +961,7 @@ public class IssueOnbehalfofUnitTest {
         List<RequestSecurityTokenResponseType> securityTokenResponseList =
             response.getRequestSecurityTokenResponse();
 
-        assertTrue(!securityTokenResponseList.isEmpty());
+        assertFalse(securityTokenResponseList.isEmpty());
         RequestSecurityTokenResponseType securityTokenResponse = securityTokenResponseList.get(0);
 
         // Test the generated token.
@@ -1056,7 +1057,7 @@ public class IssueOnbehalfofUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element assertion = null;
@@ -1178,7 +1179,7 @@ public class IssueOnbehalfofUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element assertion = null;
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 317fbcb..1908d58 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
@@ -134,7 +134,7 @@ public class IssueSCTUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element securityContextToken = null;
@@ -212,7 +212,7 @@ public class IssueSCTUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element securityContextToken = null;
@@ -286,7 +286,7 @@ public class IssueSCTUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test that no references were returned
         boolean foundReference = false;
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 e166a1d..5683ed8 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,6 +87,7 @@ 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;
 import static org.junit.Assert.fail;
@@ -345,7 +346,7 @@ public class IssueSamlClaimsUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
         return securityTokenResponse;
     }
 
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 282ef2d..c414239 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
@@ -130,7 +130,7 @@ public class IssueSamlRealmUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element assertion = null;
@@ -206,7 +206,7 @@ public class IssueSamlRealmUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element assertion = null;
@@ -282,7 +282,7 @@ public class IssueSamlRealmUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element assertion = null;
@@ -378,7 +378,7 @@ public class IssueSamlRealmUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element assertion = null;
@@ -465,7 +465,7 @@ public class IssueSamlRealmUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element assertion = null;
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 432b36d..5012fd2 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
@@ -154,7 +154,7 @@ public class IssueSamlUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element assertion = null;
@@ -226,7 +226,7 @@ public class IssueSamlUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element assertion = null;
@@ -299,7 +299,7 @@ public class IssueSamlUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element assertion = null;
@@ -479,7 +479,7 @@ public class IssueSamlUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element assertion = null;
@@ -569,7 +569,7 @@ public class IssueSamlUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element assertion = null;
@@ -666,7 +666,7 @@ public class IssueSamlUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element assertion = null;
@@ -759,7 +759,7 @@ public class IssueSamlUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element assertion = null;
@@ -853,7 +853,7 @@ public class IssueSamlUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element assertion = null;
@@ -950,7 +950,7 @@ public class IssueSamlUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test that no references were returned
         boolean foundReference = false;
@@ -1030,7 +1030,7 @@ public class IssueSamlUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element assertion = null;
@@ -1121,7 +1121,7 @@ public class IssueSamlUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element assertion = null;
@@ -1205,7 +1205,7 @@ public class IssueSamlUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element assertion = null;
@@ -1249,7 +1249,7 @@ public class IssueSamlUnitTest {
         stsProperties.setValidateUseKey(false);
         response = issueOperation.issue(request, principal, msgCtx);
         securityTokenResponse = response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
     }
 
     @org.junit.Test
@@ -1321,7 +1321,7 @@ public class IssueSamlUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element assertion = null;
@@ -1413,7 +1413,7 @@ public class IssueSamlUnitTest {
             issueOperation.issue(request, principal, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
 
         // Test the generated token.
         Element assertion = null;
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 42af1c5..e6c51ba 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
@@ -50,6 +50,7 @@ import org.apache.wss4j.common.WSS4JConstants;
 import org.apache.wss4j.common.util.DateUtil;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -97,7 +98,7 @@ public class IssueUnitTest {
             issueOperation.issue(request, null, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
     }
 
     /**
@@ -209,7 +210,7 @@ public class IssueUnitTest {
             issueOperation.issue(request, null, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
     }
 
 
@@ -264,7 +265,7 @@ public class IssueUnitTest {
             issueOperation.issue(request, null, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
     }
 
     /**
@@ -305,7 +306,7 @@ public class IssueUnitTest {
             issueOperation.issue(request, null, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
     }
 
 
@@ -350,7 +351,7 @@ public class IssueUnitTest {
             issueOperation.issue(request, null, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
         assertTrue("AuthenticationContext".equals(securityTokenResponse.get(0).getContext()));
     }
 
@@ -398,7 +399,7 @@ public class IssueUnitTest {
             issueOperation.issue(request, null, msgCtx);
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
-        assertTrue(!securityTokenResponse.isEmpty());
+        assertFalse(securityTokenResponse.isEmpty());
     }
 
     /**
@@ -438,7 +439,7 @@ public class IssueUnitTest {
         // Issue a token
         RequestSecurityTokenResponseType response =
             issueOperation.issueSingle(request, null, msgCtx);
-        assertTrue(!response.getAny().isEmpty());
+        assertFalse(response.getAny().isEmpty());
     }
 
 
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
index 99a3230..4ca468a 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
@@ -87,6 +87,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertNull;
@@ -771,7 +772,7 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
         assertEquals(200, wc.getResponse().getStatus());
         assertEquals(123L, book.getId());
         MultivaluedMap<String, Object> headers = wc.getResponse().getMetadata();
-        assertTrue(!headers.isEmpty());
+        assertFalse(headers.isEmpty());
         Object etag = headers.getFirst("ETag");
         assertNotNull(etag);
         assertTrue(etag.toString().startsWith("\""));
@@ -1932,7 +1933,7 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
         assertTrue(response.startsWith("{"));
         assertTrue(response.endsWith("}"));
         assertTrue(response.contains("\"Book\":{"));
-        assertFalse(response.indexOf("\"Book\":{") == 1);
+        assertNotEquals(1, response.indexOf("\"Book\":{"));
 
     }
 
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
index b3dc96b..602a7b4 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
@@ -110,7 +110,7 @@ public class LocatorClientServerTest extends AbstractBusClientServerTestBase {
             builder.build();
             fail("Address in an EPR cannot be null, when serviceName or portName is null");
         } catch (IllegalStateException ie) {
-            assertTrue(true);
+            // expected
         } catch (Exception e) {
             fail("Unexpected Exception " + e.getClass() + " raised: " + e.getMessage());
         }
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 909027c..82bb4d1 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
@@ -41,6 +41,7 @@ import org.apache.hello_world_soap_http.GreeterImpl;
 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;
@@ -99,7 +100,7 @@ public class ManagedBusTest {
         InstrumentationManagerImpl imi = (InstrumentationManagerImpl)im;
         assertEquals("service:jmx:rmi:///jndi/rmi://localhost:9913/jmxrmi",
                      imi.getJMXServiceURL());
-        assertTrue(!imi.isEnabled());
+        assertFalse(imi.isEnabled());
         assertNull(imi.getMBeanServer());
 
         //Test that registering without an MBeanServer is a no-op
@@ -196,4 +197,4 @@ public class ManagedBusTest {
 
         bus.shutdown(true);
     }
-}
\ No newline at end of file
+}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
index 0e6ad57..88c95dc 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
@@ -101,7 +101,7 @@ public class JavaFirstPolicyServiceTest extends AbstractBusClientServerTestBase
             svc.doInputMessagePolicy();
             fail("Expected authentication failure");
         } catch (Exception e) {
-            assertTrue(true);
+            // expected
         }
 
         wssOut.setProperties(getNoPasswordProperties("alice"));
@@ -110,7 +110,7 @@ public class JavaFirstPolicyServiceTest extends AbstractBusClientServerTestBase
             svc.doInputMessagePolicy();
             fail("Expected authentication failure");
         } catch (Exception e) {
-            assertTrue(true);
+            // expected
         }
 
         ctx.close();
@@ -137,7 +137,7 @@ public class JavaFirstPolicyServiceTest extends AbstractBusClientServerTestBase
             svc.doSslAndUsernamePasswordPolicy();
             fail("Expected authentication failure");
         } catch (Exception e) {
-            assertTrue(true);
+            // expected
         }
 
         wssOut.setProperties(getNoPasswordProperties("alice"));
@@ -146,7 +146,7 @@ public class JavaFirstPolicyServiceTest extends AbstractBusClientServerTestBase
             svc.doSslAndUsernamePasswordPolicy();
             fail("Expected authentication failure");
         } catch (Exception e) {
-            assertTrue(true);
+            // expected
         }
 
         ctx.close();
@@ -167,7 +167,7 @@ public class JavaFirstPolicyServiceTest extends AbstractBusClientServerTestBase
             simpleService.doStuff();
             fail("Expected exception as no credentials");
         } catch (SOAPFaultException e) {
-            assertTrue(true);
+            // expected
         }
 
         WSS4JOutInterceptor wssOut = addToClient(simpleService);
@@ -177,7 +177,7 @@ public class JavaFirstPolicyServiceTest extends AbstractBusClientServerTestBase
             simpleService.doStuff();
             fail("Expected exception as no password and no client cert");
         } catch (SOAPFaultException e) {
-            assertTrue(true);
+            // expected
         }
 
         wssOut.setProperties(getPasswordProperties("alice", "password"));
@@ -201,7 +201,7 @@ public class JavaFirstPolicyServiceTest extends AbstractBusClientServerTestBase
             simpleService.doStuff();
             fail("Expected exception as no credentials");
         } catch (SOAPFaultException e) {
-            assertTrue(true);
+            // expected
         }
 
         WSS4JOutInterceptor wssOut = addToClient(simpleService);
@@ -233,7 +233,7 @@ public class JavaFirstPolicyServiceTest extends AbstractBusClientServerTestBase
             simpleService.doStuff();
             fail("Expected exception as no credentials");
         } catch (SOAPFaultException e) {
-            assertTrue(true);
+            // expected
         }
 
         WSS4JOutInterceptor wssOut = addToClient(simpleService);
@@ -243,7 +243,7 @@ public class JavaFirstPolicyServiceTest extends AbstractBusClientServerTestBase
             simpleService.doStuff();
             fail("Expected exception as no password and no client cert");
         } catch (SOAPFaultException e) {
-            assertTrue(true);
+            // expected
         }
 
         wssOut.setProperties(getPasswordProperties("alice", "password"));
@@ -251,7 +251,7 @@ public class JavaFirstPolicyServiceTest extends AbstractBusClientServerTestBase
             simpleService.doStuff();
             fail("Expected exception as no client cert and password not allowed");
         } catch (SOAPFaultException e) {
-            assertTrue(true);
+            // expected
         }
 
         wssOut.setProperties(getNoPasswordProperties("alice"));
@@ -259,7 +259,7 @@ public class JavaFirstPolicyServiceTest extends AbstractBusClientServerTestBase
             simpleService.ping();
             fail("Expected exception as no password");
         } catch (SOAPFaultException e) {
-            assertTrue(true);
+            // expected
         }
 
         wssOut.setProperties(getPasswordProperties("alice", "password"));
@@ -284,7 +284,7 @@ public class JavaFirstPolicyServiceTest extends AbstractBusClientServerTestBase
             simpleService.doStuff();
             fail("Expected exception as no credentials");
         } catch (SOAPFaultException e) {
-            assertTrue(true);
+            // expected
         }
 
         WSS4JOutInterceptor wssOut = addToClient(simpleService);
@@ -297,7 +297,7 @@ public class JavaFirstPolicyServiceTest extends AbstractBusClientServerTestBase
             simpleService.doStuff();
             fail("Expected exception as password not allowed");
         } catch (SOAPFaultException e) {
-            assertTrue(true);
+            // expected
         }
 
         wssOut.setProperties(getNoPasswordProperties("alice"));
@@ -305,7 +305,7 @@ public class JavaFirstPolicyServiceTest extends AbstractBusClientServerTestBase
             simpleService.ping();
             fail("Expected exception as no password");
         } catch (SOAPFaultException e) {
-            assertTrue(true);
+            // expected
         }
 
         wssOut.setProperties(getPasswordProperties("alice", "password"));
@@ -332,7 +332,7 @@ public class JavaFirstPolicyServiceTest extends AbstractBusClientServerTestBase
             simpleService.doStuff();
             fail("Expected exception as no credentials");
         } catch (SOAPFaultException e) {
-            assertTrue(true);
+            // expected
         }
 
         WSS4JOutInterceptor wssOut = addToClient(simpleService);
@@ -342,7 +342,7 @@ public class JavaFirstPolicyServiceTest extends AbstractBusClientServerTestBase
             simpleService.doStuff();
             fail("Expected exception as no password and no client cert");
         } catch (SOAPFaultException e) {
-            assertTrue(true);
+            // expected
         }
 
         // this is successful because the alternative policy allows a password to be specified.
@@ -370,7 +370,7 @@ public class JavaFirstPolicyServiceTest extends AbstractBusClientServerTestBase
             simpleService.doStuff();
             fail("Expected exception as no credentials");
         } catch (SOAPFaultException e) {
-            assertTrue(true);
+            // expected
         }
 
         WSS4JOutInterceptor wssOut = addToClient(simpleService);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/DoubleItBSTImpl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/DoubleItBSTImpl.java
index c262235..9c67403 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/DoubleItBSTImpl.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/DoubleItBSTImpl.java
@@ -53,12 +53,12 @@ public class DoubleItBSTImpl implements DoubleItPortType {
         List<WSHandlerResult> results =
             CastUtils.cast((List<?>)wsContext.getMessageContext().get(WSHandlerConstants.RECV_RESULTS));
         Assert.assertNotNull("Security Results cannot be null", results);
-        Assert.assertTrue(!results.isEmpty());
+        Assert.assertFalse(results.isEmpty());
 
         WSHandlerResult result = results.get(0);
         List<WSSecurityEngineResult> securityResults = result.getResults();
         Assert.assertNotNull("Security Results cannot be null", securityResults);
-        Assert.assertTrue(!securityResults.isEmpty());
+        Assert.assertFalse(securityResults.isEmpty());
 
         WSSecurityEngineResult securityResult = securityResults.get(0);
         BinarySecurity binarySecurityToken =
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 7a260a6..1f77aef 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
@@ -56,6 +56,7 @@ import org.junit.Rule;
 import org.junit.rules.TemporaryFolder;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 public class ProcessorTestBase {
@@ -203,8 +204,8 @@ public class ProcessorTestBase {
                          + " != " + location2.getAbsolutePath(), tok1, tok2);
         }
 
-        assertTrue(!st1.hasMoreTokens());
-        assertTrue(!st2.hasMoreTokens());
+        assertFalse(st1.hasMoreTokens());
+        assertFalse(st2.hasMoreTokens());
         assertTrue("Files did not match: " + unmatched, unmatched.isEmpty());
     }
 
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 cce4cd6..826f240 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
@@ -26,7 +26,6 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
 public class AbstractToolContainerTest {
     private DummyToolContainer dummyTool;
@@ -59,7 +58,6 @@ public class AbstractToolContainerTest {
             assertEquals("Tool specification has to be set before initializing", e.getMessage());
             return;
         }
-        assertTrue(true);
     }
 
     @Test
@@ -68,4 +66,4 @@ public class AbstractToolContainerTest {
         String[] args = {"-r", "wsdlurl=dfd"};
         ToolRunner.runTool(DummyToolContainer.class, getClass().getResourceAsStream(tsSource), false, args);
     }
-}
\ No newline at end of file
+}
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 45734be..9b82e7b 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
@@ -24,6 +24,7 @@ import org.apache.cxf.tools.common.ToolException;
 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;
@@ -79,7 +80,7 @@ public class ToolSpecTest {
         String tsSource = "parser/resources/testtool1.xml";
         toolSpec = new ToolSpec(getClass().getResourceAsStream(tsSource), false);
         assertTrue(toolSpec.isValidInputStream("testID"));
-        assertTrue(!toolSpec.isValidInputStream("dummyID"));
+        assertFalse(toolSpec.isValidInputStream("dummyID"));
         assertTrue(toolSpec.getInstreamIds().size() == 1);
     }
 
@@ -97,4 +98,4 @@ public class ToolSpecTest {
         toolSpec = new ToolSpec(getClass().getResourceAsStream(tsSource), false);
         assertTrue(toolSpec.getOutstreamIds().size() == 1);
     }
-}
\ No newline at end of file
+}
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 f6114aa..62f72b0 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
@@ -161,8 +161,6 @@ public class JAXWSDefinitionBuilderTest {
 
         // this call will fail before CXF-556
         builder.customize();
-
-        assertTrue(true);
     }
 
     @Test
@@ -178,4 +176,4 @@ public class JAXWSDefinitionBuilderTest {
         assertTrue(def.getServices().keySet().contains(new QName("http://apache.org/hello_world_soap_http",
                                                                  "SOAPService")));
     }
-}
\ No newline at end of file
+}
diff --git a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
index 3c31203..b7ea9f8 100644
--- a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
+++ b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
@@ -86,7 +86,7 @@ public class CodeGenTest extends AbstractCodeGenTest {
                     if ("OrderPizza".equals(parm.name())) {
                         assertEquals("http://mypizzaco.com/pizza/types", parm.targetNamespace());
                         assertEquals("OrderPizza", parm.name());
-                        assertTrue(!parm.header());
+                        assertFalse(parm.header());
                     } else if ("CallerIDHeader".equals(parm.name())) {
                         assertEquals("http://mypizzaco.com/pizza/types", parm.targetNamespace());
                         assertEquals("callerID", parm.partName());
@@ -107,7 +107,7 @@ public class CodeGenTest extends AbstractCodeGenTest {
                     if ("OrderPizza".equals(parm.name())) {
                         assertEquals("http://mypizzaco.com/pizza/types", parm.targetNamespace());
                         assertEquals("OrderPizza", parm.name());
-                        assertTrue(!parm.header());
+                        assertFalse(parm.header());
                     } else if ("CallerIDHeader".equals(parm.name())) {
                         assertEquals("http://mypizzaco.com/pizza/types", parm.targetNamespace());
                         assertEquals("callerID", parm.partName());
@@ -146,7 +146,7 @@ public class CodeGenTest extends AbstractCodeGenTest {
                     if ("OrderPizza".equals(parm.name())) {
                         assertEquals("http://mypizzaco.com/pizza/types", parm.targetNamespace());
                         assertEquals("OrderPizza", parm.name());
-                        assertTrue(!parm.header());
+                        assertFalse(parm.header());
                     } else if ("CallerIDHeader".equals(parm.name())) {
                         fail("If the exsh turned off, should not generate this parameter");
                     } else {
@@ -180,7 +180,7 @@ public class CodeGenTest extends AbstractCodeGenTest {
                     if ("OrderPizza".equals(parm.name())) {
                         assertEquals("http://mypizzaco.com/pizza/types", parm.targetNamespace());
                         assertEquals("OrderPizza", parm.name());
-                        assertTrue(!parm.header());
+                        assertFalse(parm.header());
                     } else if ("CallerIDHeader".equals(parm.name())) {
                         fail("If the exsh turned off, should not generate this parameter");
                     } else {
@@ -214,7 +214,7 @@ public class CodeGenTest extends AbstractCodeGenTest {
                     WebParam parm = (WebParam)annotations[i][0];
                     if ("Toppings".equals(parm.name())) {
                         assertEquals("http://cxf.apache.org/pizza_wrapped/types", parm.targetNamespace());
-                        assertTrue(!parm.header());
+                        assertFalse(parm.header());
                     } else if ("CallerIDHeader".equals(parm.name())) {
                         assertEquals("http://cxf.apache.org/pizza_wrapped/types", parm.targetNamespace());
                         assertTrue(parm.header());
diff --git a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java
index cc74aa3..7d3d986 100644
--- a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java
+++ b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java
@@ -49,6 +49,7 @@ import org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.WSDLToJavaProcessor;
 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;
 
@@ -232,10 +233,10 @@ public class JAXWSContainerTest extends ProcessorTestBase {
         JAXWSContainer container = new JAXWSContainer(null);
         List<ServiceValidator> validators = container.getServiceValidators();
         assertNotNull(validators);
-        assertTrue(!validators.isEmpty());
+        assertFalse(validators.isEmpty());
     }
 
     protected String getLocation(String wsdlFile) throws URISyntaxException {
         return getClass().getResource(wsdlFile).toString();
     }
-}
\ No newline at end of file
+}