[cxf] branch master updated: Using assertEquals instead of assertTrue in some of the tests

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

[cxf] branch master updated: Using assertEquals instead of assertTrue in some of the tests

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 4955ca6  Using assertEquals instead of assertTrue in some of the tests
4955ca6 is described below

commit 4955ca652f16e781524612383af27c650e10cbdc
Author: Colm O hEigeartaigh <[hidden email]>
AuthorDate: Mon Feb 11 12:53:47 2019 +0000

    Using assertEquals instead of assertTrue in some of the tests
---
 .../cxf/bus/spring/SpringBusFactoryTest.java       |   4 +-
 .../org/apache/cxf/endpoint/EndpointImplTest.java  |   5 +-
 .../java/org/apache/cxf/helpers/NameSpaceTest.java |   5 +-
 .../staxutils/transform/InTransformReaderTest.java |   5 +-
 .../cxf/jca/cxf/CXFConnectionRequestInfoTest.java  |  19 +--
 .../jca/cxf/ManagedConnectionFactoryImplTest.java  |   3 +-
 .../apache/cxf/binding/corba/CorbaMessageTest.java |   2 +-
 .../corba/runtime/CorbaObjectReaderTest.java       |  14 +--
 .../corba/runtime/CorbaObjectWriterTest.java       |  15 +--
 .../binding/corba/runtime/CorbaStreamableTest.java |   2 +-
 .../binding/corba/types/CorbaAnyHandlerTest.java   |   5 +-
 .../binding/corba/types/CorbaArrayHandlerTest.java |   7 +-
 .../binding/corba/types/CorbaEnumHandlerTest.java  |   5 +-
 .../binding/corba/types/CorbaFixedHandlerTest.java |   7 +-
 .../corba/types/CorbaObjectHandlerTest.java        |   7 +-
 .../corba/types/CorbaPrimitiveHandlerTest.java     |  31 ++---
 .../corba/types/CorbaSequenceHandlerTest.java      |   7 +-
 .../corba/types/CorbaStructHandlerTest.java        |  11 +-
 .../cxf/aegis/standalone/StandaloneReadTest.java   |   2 +-
 .../cxf/aegis/type/basic/DynamicProxyTest.java     |   2 +-
 .../org/apache/cxf/aegis/xml/stax/ReaderTest.java  |   2 +-
 .../jaxb/DataBindingMarshallerPropertiesTest.java  |   6 +-
 .../apache/cxf/jaxb/JAXBEncoderDecoderTest.java    |   4 +-
 .../cxf/jaxrs/provider/BinaryDataProviderTest.java |  20 ++--
 .../jaxrs/provider/PrimitiveTextProviderTest.java  |  10 +-
 .../org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java |  12 +-
 .../cxf/jaxrs/ext/search/fiql/FiqlParserTest.java  |   4 +-
 .../ext/search/sql/SQLPrinterVisitorTest.java      |   9 +-
 .../cxf/ws/policy/EndpointPolicyImplTest.java      |   2 +-
 .../cxf/ws/security/wss4j/WSS4JFaultCodeTest.java  |   7 +-
 .../apache/cxf/wsdl11/ServiceWSDLBuilderTest.java  |   4 +-
 .../cxf/sts/operation/IssueSamlUnitTest.java       |   4 +-
 .../apache/cxf/sts/operation/IssueUnitTest.java    |   3 +-
 .../apache/cxf/sts/operation/ValidateUnitTest.java |   2 +-
 .../token/renewer/SAMLTokenRenewerRealmTest.java   |   5 +-
 .../validator/JWTTokenValidatorRealmTest.java      |   5 +-
 .../sts/token/validator/JWTTokenValidatorTest.java |   3 +-
 .../SAMLTokenValidatorCachedRealmTest.java         |   3 +-
 .../validator/SAMLTokenValidatorRealmTest.java     |   5 +-
 .../token/validator/SAMLTokenValidatorTest.java    |   4 +-
 .../cxf/sts/token/validator/SCTValidatorTest.java  |   3 +-
 .../cxf/systest/sts/batch/SAMLBatchUnitTest.java   |   9 +-
 .../cxf/systest/sts/renew/SAMLRenewUnitTest.java   |   5 +-
 .../systest/sts/delegation/SAMLDelegationTest.java |   9 +-
 .../cxf/systest/sts/issueunit/IssueUnitTest.java   |  19 +--
 .../cxf/systest/sts/itests/unit/STSUnitTest.java   |   2 +-
 ...entServerResourceJacksonSpringProviderTest.java |   4 +-
 .../cxf/systest/jaxrs/JAXRSMultipartTest.java      |  16 +--
 .../jaxrs/failover/AbstractFailoverTest.java       |   8 +-
 .../systest/dispatch/DispatchClientServerTest.java |   8 +-
 .../cxf/systest/ldap/sts/LDAPClaimsTest.java       |   8 +-
 .../org/apache/cxf/systest/corba/CorbaTest.java    |   3 +-
 .../ManualHttpMulitplexClientServerTest.java       |   7 +-
 .../MultiplexHttpAddressClientServerTest.java      |   3 +-
 .../systest/type_test/AbstractTypeTestClient.java  | 129 ++++++++++-----------
 .../cxf/systest/ws/rm/ManagedEndpointsTest.java    |   4 +-
 .../ws/rm/policy/WSRMOptionalPolicyTest.java       |   5 +-
 .../apache/cxf/systest/ws/action/ActionTest.java   |   6 +-
 .../systest/ws/security/WSSecurityClientTest.java  |   6 +-
 .../cxf/systest/ws/tokens/DoubleItBSTImpl.java     |   3 +-
 .../cxf/systest/ws/ut/UsernameTokenTest.java       |   2 +-
 .../toolspec/parser/CommandLineParserTest.java     |   2 +-
 .../apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java |   2 +-
 63 files changed, 278 insertions(+), 257 deletions(-)

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 8b16510..505a7e4 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
@@ -168,11 +168,11 @@ public class SpringBusFactoryTest {
         SortedSet<Phase> cxfPhases = cxfPM.getInPhases();
         SortedSet<Phase> defaultPhases = defaultPM.getInPhases();
         assertEquals(defaultPhases.size(), cxfPhases.size());
-        assertTrue(cxfPhases.equals(defaultPhases));
+        assertEquals(cxfPhases, defaultPhases);
         cxfPhases = cxfPM.getOutPhases();
         defaultPhases = defaultPM.getOutPhases();
         assertEquals(defaultPhases.size(), cxfPhases.size());
-        assertTrue(cxfPhases.equals(defaultPhases));
+        assertEquals(cxfPhases, defaultPhases);
     }
 
     @Test
diff --git a/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java b/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java
index 5167ec7..01bde17 100755
--- a/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java
+++ b/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java
@@ -27,6 +27,7 @@ import org.apache.cxf.service.model.EndpointInfo;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
@@ -55,7 +56,7 @@ public class EndpointImplTest {
         assertTrue("hashcodes must be equal", hashcode == hashcode1);
         assertTrue("hashcodes must not be equal", hashcode != hashcode2);
 
-        assertTrue("reflexivity violated", ep.equals(ep));
+        assertEquals("reflexivity violated", ep, ep);
         assertFalse("two objects must not be equal", ep.equals(ep1));
         assertFalse("two objects must not be equal", ep.equals(ep2));
 
@@ -64,4 +65,4 @@ public class EndpointImplTest {
         assertTrue("hashcode must remain equal", hashcode == ep.hashCode());
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java b/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java
index 6f7a722..5afc8e8 100644
--- a/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java
@@ -24,7 +24,6 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 
 public class NameSpaceTest {
 
@@ -66,7 +65,7 @@ public class NameSpaceTest {
         NSDecl nsDecl3 = new NSDecl(MY_OWN_PREFIX, MY_CUSTOM_URL);
 
         assertFalse(nsDecl2.equals(nsDecl1));
-        assertTrue(nsDecl3.equals(nsDecl1));
+        assertEquals(nsDecl3, nsDecl1);
 
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
index cf99e6f..7f00109 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
@@ -36,7 +36,6 @@ import org.apache.cxf.staxutils.StaxUtils;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 public class InTransformReaderTest {
 
@@ -51,7 +50,7 @@ public class InTransformReaderTest {
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         StaxUtils.copy(reader, bos);
         String value = bos.toString();
-        assertTrue("<test2 xmlns=\"\"/>".equals(value));
+        assertEquals("<test2 xmlns=\"\"/>", value);
     }
 
     @Test
@@ -462,4 +461,4 @@ public class InTransformReaderTest {
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java
index b296559..e180a83 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java
@@ -24,9 +24,10 @@ import javax.xml.namespace.QName;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 
-
 public class CXFConnectionRequestInfoTest {
 
 
@@ -42,7 +43,7 @@ public class CXFConnectionRequestInfoTest {
                                                                           new QName("service"),
                                                                           new QName("fooPort"));
 
-        assertTrue("Checking equals ", cr1.equals(cr2));
+        assertEquals("Checking equals ", cr1, cr2);
 
         assertTrue("Checking hashcodes ", cr1.hashCode() == cr2.hashCode());
 
@@ -50,7 +51,7 @@ public class CXFConnectionRequestInfoTest {
 
         cr2 = new CXFConnectionRequestInfo(Foo.class, null, new QName("service"), null);
 
-        assertTrue("Checking equals with null parameters ", cr1.equals(cr2));
+        assertEquals("Checking equals with null parameters ", cr1, cr2);
 
         assertTrue("Checking hashcodes  with null parameters ", cr1.hashCode() == cr2.hashCode());
 
@@ -59,36 +60,36 @@ public class CXFConnectionRequestInfoTest {
         cr2 = new CXFConnectionRequestInfo(String.class, new URL("file:/tmp/foo"), new QName("service"),
                                               new QName("fooPort"));
 
-        assertTrue("Checking that objects are not equals ", !cr1.equals(cr2));
+        assertNotEquals("Checking that objects are not equals ", cr1, cr2);
 
         cr1 = new CXFConnectionRequestInfo(Foo.class, new URL("file:/tmp/foox"), new QName("service"),
                                               new QName("fooPort"));
         cr2 = new CXFConnectionRequestInfo(Foo.class, new URL("file:/tmp/foo"), new QName("service"),
                                               new QName("fooPort"));
 
-        assertTrue("Checking that objects are not equal ", !cr1.equals(cr2));
+        assertNotEquals("Checking that objects are not equal ", cr1, cr2);
 
         cr1 = new CXFConnectionRequestInfo(Foo.class, new URL("file:/tmp/foo"), new QName("service"),
                                               new QName("fooPort"));
         cr2 = new CXFConnectionRequestInfo(Foo.class, new URL("file:/tmp/foo"), new QName("servicex"),
                                               new QName("fooPort"));
 
-        assertTrue("Checking that objects are not equal ", !cr1.equals(cr2));
+        assertNotEquals("Checking that objects are not equal ", cr1, cr2);
 
         cr1 = new CXFConnectionRequestInfo(Foo.class, new URL("file:/tmp/foo"), new QName("service"),
                                               new QName("fooPort"));
         cr2 = new CXFConnectionRequestInfo(Foo.class, new URL("file:/tmp/foo"), new QName("service"),
                                               new QName("fooPortx"));
 
-        assertTrue("Checking that objects are not equal ", !cr1.equals(cr2));
+        assertNotEquals("Checking that objects are not equal ", cr1, cr2);
 
         cr1 = new CXFConnectionRequestInfo(Foo.class, new URL("file:/tmp/foo"), new QName("service"),
                                               new QName("fooPort"));
         cr2 = new CXFConnectionRequestInfo(Foo.class, null, new QName("service"), new QName("fooPort"));
 
-        assertTrue("Checking that objects are not equal ", !cr1.equals(cr2));
+        assertNotEquals("Checking that objects are not equal ", cr1, cr2);
 
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
index 16baf6f..d2509de 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
@@ -42,6 +42,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
@@ -149,7 +150,7 @@ public class ManagedConnectionFactoryImplTest {
         assertTrue("not Object's hashCode method", hashCodeMethod != Object.class
             .getDeclaredMethod("hashCode", (Class[])null));
         assertEquals("equal with its self", mci, mci);
-        assertTrue("not equal with another", !mci.equals(new ManagedConnectionFactoryImpl()));
+        assertNotEquals("not equal with another", mci, new ManagedConnectionFactoryImpl());
     }
 
     @Test
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java
index 5c65971..8046e1b 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java
@@ -142,6 +142,6 @@ public class CorbaMessageTest {
         msg.s.setException(ex);
         Exception msgEx = msg.getException();
         assertNotNull(msgEx);
-        assertTrue(msgEx.getMessage().equals(ex.getMessage()));*/
+        assertEquals(msgEx.getMessage(), ex.getMessage());*/
     }
 }
\ No newline at end of file
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
index a3d7603..b0e1268 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
@@ -236,7 +236,7 @@ public class CorbaObjectReaderTest {
         CorbaObjectReader reader = new CorbaObjectReader(iStream);
 
         String stringValue = reader.readString();
-        assertTrue("String".equals(stringValue));
+        assertEquals("String", stringValue);
     }
 
     @Test
@@ -248,7 +248,7 @@ public class CorbaObjectReaderTest {
         CorbaObjectReader reader = new CorbaObjectReader(iStream);
 
         String wstringValue = reader.readWString();
-        assertTrue("WString".equals(wstringValue));
+        assertEquals("WString", wstringValue);
     }
 
     // need to add tests for arrays, sequences, struct, exceptions
@@ -324,7 +324,7 @@ public class CorbaObjectReaderTest {
         reader.readSequence(obj);
         int length = obj.getElements().size();
         for (int i = 0; i < length; ++i) {
-            assertTrue(((CorbaPrimitiveHandler)obj.getElement(i)).getDataFromValue().equals(data[i]));
+            assertEquals(((CorbaPrimitiveHandler)obj.getElement(i)).getDataFromValue(), data[i]);
         }
     }
 
@@ -390,7 +390,7 @@ public class CorbaObjectReaderTest {
         List<CorbaObjectHandler> nestedObjs = obj.getMembers();
         assertTrue(Integer.valueOf(((CorbaPrimitiveHandler)nestedObjs.get(0)).getDataFromValue()).intValue()
                    == member1);
-        assertTrue(((CorbaPrimitiveHandler)nestedObjs.get(1)).getDataFromValue().equals(member2));
+        assertEquals(((CorbaPrimitiveHandler)nestedObjs.get(1)).getDataFromValue(), member2);
         assertTrue(Boolean.valueOf(((CorbaPrimitiveHandler)nestedObjs.get(2))
                                    .getDataFromValue()).booleanValue()
                    == member3);
@@ -451,7 +451,7 @@ public class CorbaObjectReaderTest {
         List<CorbaObjectHandler> nestedObjs = obj.getMembers();
         assertTrue(Short.valueOf(((CorbaPrimitiveHandler)nestedObjs.get(0))
                                  .getDataFromValue()).shortValue() == code);
-        assertTrue(((CorbaPrimitiveHandler)nestedObjs.get(1)).getDataFromValue().equals(message));
+        assertEquals(((CorbaPrimitiveHandler)nestedObjs.get(1)).getDataFromValue(), message);
     }
 
     @Test
@@ -483,7 +483,7 @@ public class CorbaObjectReaderTest {
         CorbaEnumHandler obj = new CorbaEnumHandler(enumName, enumIdlType, enumTC, enumType);
 
         reader.readEnum(obj);
-        assertTrue(obj.getValue().equals(enums[1]));
+        assertEquals(obj.getValue(), enums[1]);
     }
 
     @Test
@@ -513,7 +513,7 @@ public class CorbaObjectReaderTest {
 
         reader.readFixed(obj);
 
-        assertTrue(obj.getValue().equals(new java.math.BigDecimal("12345.67")));
+        assertEquals(obj.getValue(), new java.math.BigDecimal("12345.67"));
     }
 
     @Test
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
index 204b3bc..d2c4aa2 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
@@ -48,6 +48,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -229,7 +230,7 @@ public class CorbaObjectWriterTest {
 
         InputStream iStream = oStream.create_input_stream();
         String s = iStream.read_string();
-        assertTrue(s.equals(stringValue));
+        assertEquals(s, stringValue);
     }
 
     @Test
@@ -242,7 +243,7 @@ public class CorbaObjectWriterTest {
 
         InputStream iStream = oStream.create_input_stream();
         String s = iStream.read_wstring();
-        assertTrue(s.equals(wstringValue));
+        assertEquals(s, wstringValue);
     }
 
     @Test
@@ -311,7 +312,7 @@ public class CorbaObjectWriterTest {
         int length = iStream.read_long();
         for (int i = 0; i < length; ++i) {
             String val = iStream.read_string();
-            assertTrue(val.equals(data[i]));
+            assertEquals(val, data[i]);
         }
     }
 
@@ -379,7 +380,7 @@ public class CorbaObjectWriterTest {
         int readMember1 = iStream.read_long();
         assertTrue(readMember1 == member1);
         String readMember2 = iStream.read_string();
-        assertTrue(readMember2.equals(member2));
+        assertEquals(readMember2, member2);
         boolean readMember3 = iStream.read_boolean();
         assertTrue(readMember3 == member3);
     }
@@ -438,11 +439,11 @@ public class CorbaObjectWriterTest {
         InputStream iStream = oStream.create_input_stream();
 
         String readId = iStream.read_string();
-        assertTrue(readId.equals(reposID));
+        assertEquals(readId, reposID);
         short readCode = iStream.read_short();
         assertTrue(readCode == code);
         String readMessage = iStream.read_string();
-        assertTrue(readMessage.equals(message));
+        assertEquals(readMessage, message);
     }
 
     @Test
@@ -476,4 +477,4 @@ public class CorbaObjectWriterTest {
         org.omg.CORBA.Object resultObj = iStream.read_Object();
         assertTrue(resultObj._is_equivalent(obj.getReference()));
     }
-}
\ No newline at end of file
+}
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
index 9e377c9..9489dad 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
@@ -91,7 +91,7 @@ public class CorbaStreamableTest {
         assertTrue(mode == org.omg.CORBA.ARG_OUT.value);
 
         String name = streamable.getName();
-        assertTrue(name.equals(objName.getLocalPart()));
+        assertEquals(name, objName.getLocalPart());
     }
 
     @Test
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
index 5598328..ce2942a 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
@@ -34,7 +34,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 CorbaAnyHandlerTest {
@@ -85,6 +84,6 @@ public class CorbaAnyHandlerTest {
 
         // Test get/set CorbaTypeMap methods
         CorbaTypeMap resultTM = anyHandler.getTypeMap();
-        assertTrue(resultTM.getTargetNamespace().equals(CorbaConstants.NU_WSDL_CORBA));
+        assertEquals(resultTM.getTargetNamespace(), CorbaConstants.NU_WSDL_CORBA);
     }
-}
\ No newline at end of file
+}
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
index 3fe6097..35c1cd7 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
@@ -30,6 +30,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -90,11 +91,11 @@ public class CorbaArrayHandlerTest {
 
         QName nameResult = obj.getName();
         assertNotNull(nameResult);
-        assertTrue(objName.equals(nameResult));
+        assertEquals(objName, nameResult);
 
         QName idlTypeResult = obj.getIdlType();
         assertNotNull(idlTypeResult);
-        assertTrue(idlTypeResult.equals(objIdlType));
+        assertEquals(idlTypeResult, objIdlType);
 
         TypeCode tcResult = obj.getTypeCode();
         assertNotNull(tcResult);
@@ -110,4 +111,4 @@ public class CorbaArrayHandlerTest {
             assertNotNull(elResult);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
index 199208c..5b072cf 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
@@ -30,6 +30,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -84,8 +85,8 @@ public class CorbaEnumHandlerTest {
         assertNotNull(obj);
 
         obj.setValue(members[1]);
-        assertTrue(obj.getValue().equals(enumerator1.getValue()));
+        assertEquals(obj.getValue(), enumerator1.getValue());
 
         assertTrue(obj.getIndex() == 1);
     }
-}
\ No newline at end of file
+}
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java
index dc6275d..bcfa418 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java
@@ -30,6 +30,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -72,12 +73,12 @@ public class CorbaFixedHandlerTest {
         java.math.BigDecimal value = new java.math.BigDecimal(123.45);
         obj.setValue(value);
 
-        assertTrue(value.equals(obj.getValue()));
+        assertEquals(value, obj.getValue());
 
         String valueData = obj.getValueData();
-        assertTrue(valueData.equals(value.toString()));
+        assertEquals(valueData, value.toString());
 
         assertTrue(fixedType.getDigits() == obj.getDigits());
         assertTrue(fixedType.getScale() == obj.getScale());
     }
-}
\ No newline at end of file
+}
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
index bd28609..523f3aa 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
@@ -30,6 +30,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -76,11 +77,11 @@ public class CorbaObjectHandlerTest {
 
         QName name = obj.getName();
         assertNotNull(name);
-        assertTrue(name.equals(objName));
+        assertEquals(name, objName);
 
         QName idlType = obj.getIdlType();
         assertNotNull(idlType);
-        assertTrue(idlType.equals(objIdlType));
+        assertEquals(idlType, objIdlType);
 
         TypeCode tc = obj.getTypeCode();
         assertNotNull(tc);
@@ -89,4 +90,4 @@ public class CorbaObjectHandlerTest {
         Object objDef = obj.getType();
         assertNull(objDef);
     }
-}
\ No newline at end of file
+}
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
index fdeb4b1..de1d645 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
@@ -28,6 +28,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -65,7 +66,7 @@ public class CorbaPrimitiveHandlerTest {
 
         obj.setValueFromData(val.toString());
         String result = obj.getDataFromValue();
-        assertTrue(val.toString().equals(result));
+        assertEquals(val.toString(), result);
 
         obj.setValue(val);
         Object resultObj = obj.getValue();
@@ -137,7 +138,7 @@ public class CorbaPrimitiveHandlerTest {
 
         obj.setValueFromData(val.toString());
         String result = obj.getDataFromValue();
-        assertTrue(val.toString().equals(result));
+        assertEquals(val.toString(), result);
 
         obj.setValue(val);
         Object resultObj = obj.getValue();
@@ -159,7 +160,7 @@ public class CorbaPrimitiveHandlerTest {
 
         obj.setValueFromData(val.toString());
         String result = obj.getDataFromValue();
-        assertTrue(val.toString().equals(result));
+        assertEquals(val.toString(), result);
 
         obj.setValue(val);
         Object resultObj = obj.getValue();
@@ -181,7 +182,7 @@ public class CorbaPrimitiveHandlerTest {
 
         obj.setValueFromData(val.toString());
         String result = obj.getDataFromValue();
-        assertTrue(val.toString().equals(result));
+        assertEquals(val.toString(), result);
 
         obj.setValue(val);
         Object resultObj = obj.getValue();
@@ -203,7 +204,7 @@ public class CorbaPrimitiveHandlerTest {
 
         obj.setValueFromData(val.toString());
         String result = obj.getDataFromValue();
-        assertTrue(val.toString().equals(result));
+        assertEquals(val.toString(), result);
 
         obj.setValue(val);
         Object resultObj = obj.getValue();
@@ -225,7 +226,7 @@ public class CorbaPrimitiveHandlerTest {
 
         obj.setValueFromData(val.toString());
         String result = obj.getDataFromValue();
-        assertTrue(val.toString().equals(result));
+        assertEquals(val.toString(), result);
 
         obj.setValue(val);
         Object resultObj = obj.getValue();
@@ -247,7 +248,7 @@ public class CorbaPrimitiveHandlerTest {
 
         obj.setValueFromData(val.toString());
         String result = obj.getDataFromValue();
-        assertTrue(val.toString().equals(result));
+        assertEquals(val.toString(), result);
 
         obj.setValue(val);
         Object resultObj = obj.getValue();
@@ -269,7 +270,7 @@ public class CorbaPrimitiveHandlerTest {
 
         obj.setValueFromData(val.toString());
         String result = obj.getDataFromValue();
-        assertTrue(val.toString().equals(result));
+        assertEquals(val.toString(), result);
 
         obj.setValue(val);
         Object resultObj = obj.getValue();
@@ -291,7 +292,7 @@ public class CorbaPrimitiveHandlerTest {
 
         obj.setValueFromData(val.toString());
         String result = obj.getDataFromValue();
-        assertTrue(val.toString().equals(result));
+        assertEquals(val.toString(), result);
 
         obj.setValue(val);
         Object resultObj = obj.getValue();
@@ -313,7 +314,7 @@ public class CorbaPrimitiveHandlerTest {
 
         obj.setValueFromData(val.toString());
         String result = obj.getDataFromValue();
-        assertTrue(val.toString().equals(result));
+        assertEquals(val.toString(), result);
 
         obj.setValue(val);
         Object resultObj = obj.getValue();
@@ -335,14 +336,14 @@ public class CorbaPrimitiveHandlerTest {
 
         obj.setValueFromData(val.toString());
         String result = obj.getDataFromValue();
-        assertTrue(val.equals(result));
+        assertEquals(val, result);
 
         obj.setValue(val);
         Object resultObj = obj.getValue();
         assertNotNull(resultObj);
         assertTrue(resultObj instanceof String);
         String stringResult = (String)resultObj;
-        assertTrue(stringResult.equals(val));
+        assertEquals(stringResult, val);
     }
 
     @Test
@@ -357,13 +358,13 @@ public class CorbaPrimitiveHandlerTest {
 
         obj.setValueFromData(val.toString());
         String result = obj.getDataFromValue();
-        assertTrue(val.equals(result));
+        assertEquals(val, result);
 
         obj.setValue(val);
         Object resultObj = obj.getValue();
         assertNotNull(resultObj);
         assertTrue(resultObj instanceof String);
         String stringResult = (String)resultObj;
-        assertTrue(stringResult.equals(val));
+        assertEquals(stringResult, val);
     }
-}
\ No newline at end of file
+}
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
index 769aadd..75e898a 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
@@ -30,6 +30,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -92,11 +93,11 @@ public class CorbaSequenceHandlerTest {
 
         QName nameResult = obj.getName();
         assertNotNull(nameResult);
-        assertTrue(objName.equals(nameResult));
+        assertEquals(objName, nameResult);
 
         QName idlTypeResult = obj.getIdlType();
         assertNotNull(idlTypeResult);
-        assertTrue(idlTypeResult.equals(objIdlType));
+        assertEquals(idlTypeResult, objIdlType);
 
         TypeCode tcResult = obj.getTypeCode();
         assertNotNull(tcResult);
@@ -112,4 +113,4 @@ public class CorbaSequenceHandlerTest {
             assertNotNull(elResult);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java
index d7b9e2c..384f64a 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java
@@ -34,6 +34,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -109,17 +110,17 @@ public class CorbaStructHandlerTest {
         assertTrue(memberSize == 2);
 
         QName nameResult = obj.getName();
-        assertTrue(structName.equals(nameResult));
+        assertEquals(structName, nameResult);
 
         QName idlTypeResult = obj.getIdlType();
-        assertTrue(structIdlType.equals(idlTypeResult));
+        assertEquals(structIdlType, idlTypeResult);
 
         CorbaObjectHandler member0Result = obj.getMemberByName("member0");
         assertNotNull(member0Result);
-        assertTrue(member0Result.getName().equals(objMember0.getName()));
+        assertEquals(member0Result.getName(), objMember0.getName());
 
         CorbaObjectHandler member1Result = obj.getMember(1);
         assertNotNull(member1Result);
-        assertTrue(member1Result.getName().equals(objMember1.getName()));
+        assertEquals(member1Result.getName(), objMember1.getName());
     }
-}
\ No newline at end of file
+}
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java
index 1e8b9cd..99b2918 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java
@@ -62,7 +62,7 @@ public class StandaloneReadTest {
         XMLStreamReader streamReader = testUtilities.getResourceAsXMLStreamReader("stringElement.xml");
         AegisReader<XMLStreamReader> reader = context.createXMLStreamReader();
         Object something = reader.read(streamReader);
-        assertTrue("ball-of-yarn".equals(something));
+        assertEquals("ball-of-yarn", something);
     }
 
     @Test
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java
index 766641b..bd0c457 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java
@@ -61,7 +61,7 @@ public class DynamicProxyTest extends AbstractAegisTest {
         assertEquals(false, data.isUseless());
 
         assertTrue(data.hashCode() != 0);
-        assertTrue(data.equals(data));
+        assertEquals(data, data);
         // checkstyle isn't smart enough to know we're testing equals....
 //        assertFalse(data.equals(null));
 //        assertFalse("bigjunk".equals(data));
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java
index d608b74..3141e39 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java
@@ -61,7 +61,7 @@ public class ReaderTest extends AbstractCXFTest {
     }
 
     public void testReading(MessageReader reader) {
-        assertTrue("Envelope".equals(reader.getLocalName()));
+        assertEquals("Envelope", reader.getLocalName());
 
         // make sure we can repeat this
         assertTrue(reader.hasMoreElementReaders());
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DataBindingMarshallerPropertiesTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DataBindingMarshallerPropertiesTest.java
index 6746808..46032c8 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DataBindingMarshallerPropertiesTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DataBindingMarshallerPropertiesTest.java
@@ -24,7 +24,7 @@ import java.util.Map;
 
 import org.junit.Test;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
 
 public class DataBindingMarshallerPropertiesTest extends TestBase {
     @Test
@@ -36,6 +36,6 @@ public class DataBindingMarshallerPropertiesTest extends TestBase {
 
         db.initialize(service);
 
-        assertTrue("somevalue".equals(db.getUnmarshallerProperties().get("someproperty")));
+        assertEquals("somevalue", db.getUnmarshallerProperties().get("someproperty"));
     }
-}
\ No newline at end of file
+}
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
index 8f6c681..98e8d21 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
@@ -590,7 +590,7 @@ public class JAXBEncoderDecoderTest {
         int idx = 0;
         for (Type t : genericParameterTypes) {
             Class<?> cls = JAXBEncoderDecoder.getClassFromType(t);
-            assertTrue(cls.equals(paramTypes[idx]));
+            assertEquals(cls, paramTypes[idx]);
             idx++;
         }
 
@@ -601,7 +601,7 @@ public class JAXBEncoderDecoderTest {
         idx = 0;
         for (Type t : genericParameterTypes) {
             Class<?> cls = JAXBEncoderDecoder.getClassFromType(t);
-            assertTrue(cls.equals(paramTypes[idx]));
+            assertEquals(cls, paramTypes[idx]);
             idx++;
         }
     }
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/BinaryDataProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/BinaryDataProviderTest.java
index af9167d..260e65b 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/BinaryDataProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/BinaryDataProviderTest.java
@@ -28,7 +28,6 @@ import java.io.OutputStream;
 import java.io.Reader;
 import java.io.StringReader;
 import java.lang.annotation.Annotation;
-import java.util.Arrays;
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.StreamingOutput;
@@ -40,6 +39,7 @@ import org.apache.cxf.jaxrs.impl.MetadataMap;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -72,14 +72,14 @@ public class BinaryDataProviderTest {
                                           MediaType.APPLICATION_OCTET_STREAM_TYPE,
                                           new MetadataMap<String, Object>(),
                                           new ByteArrayInputStream("hi".getBytes()));
-        assertTrue(Arrays.equals(new String("hi").getBytes(), bytes));
+        assertArrayEquals(new String("hi").getBytes(), bytes);
 
         InputStream is = (InputStream)p.readFrom(InputStream.class, InputStream.class, new Annotation[]{},
                                                  MediaType.APPLICATION_OCTET_STREAM_TYPE,
                                                  new MetadataMap<String, Object>(),
             new ByteArrayInputStream("hi".getBytes()));
         bytes = IOUtils.readBytesFromStream(is);
-        assertTrue(Arrays.equals(new String("hi").getBytes(), bytes));
+        assertArrayEquals(new String("hi").getBytes(), bytes);
 
         Reader r = (Reader)p.readFrom(Reader.class, Reader.class, new Annotation[]{},
                                       MediaType.APPLICATION_OCTET_STREAM_TYPE,
@@ -95,7 +95,7 @@ public class BinaryDataProviderTest {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         so.write(baos);
         bytes = baos.toByteArray();
-        assertTrue(Arrays.equals(new String("hi").getBytes(), bytes));
+        assertArrayEquals(new String("hi").getBytes(), bytes);
     }
     
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -107,7 +107,7 @@ public class BinaryDataProviderTest {
                                           MediaType.APPLICATION_OCTET_STREAM_TYPE,
                                           new MetadataMap<String, Object>(),
                                           new ByteArrayInputStream(utf8Bytes));
-        assertTrue(Arrays.equals(utf8Bytes, readBytes));
+        assertArrayEquals(utf8Bytes, readBytes);
     }
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -116,21 +116,21 @@ public class BinaryDataProviderTest {
         MessageBodyWriter p = new BinaryDataProvider();
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         p.writeTo(new byte[]{'h', 'i'}, null, null, null, null, null, os);
-        assertTrue(Arrays.equals(new String("hi").getBytes(), os.toByteArray()));
+        assertArrayEquals(new String("hi").getBytes(), os.toByteArray());
         ByteArrayInputStream is = new ByteArrayInputStream("hi".getBytes());
         os = new ByteArrayOutputStream();
         p.writeTo(is, null, null, null, null, null, os);
-        assertTrue(Arrays.equals(os.toByteArray(), new String("hi").getBytes()));
+        assertArrayEquals(os.toByteArray(), new String("hi").getBytes());
 
         Reader r = new StringReader("hi");
         os = new ByteArrayOutputStream();
         p.writeTo(r, null, null, null, MediaType.valueOf("text/xml"), null, os);
-        assertTrue(Arrays.equals(os.toByteArray(), new String("hi").getBytes()));
+        assertArrayEquals(os.toByteArray(), new String("hi").getBytes());
 
         os = new ByteArrayOutputStream();
         p.writeTo(new StreamingOutputImpl(), null, null, null,
                   MediaType.valueOf("text/xml"), null, os);
-        assertTrue(Arrays.equals(os.toByteArray(), new String("hi").getBytes()));
+        assertArrayEquals(os.toByteArray(), new String("hi").getBytes());
     }
 
 
@@ -141,4 +141,4 @@ public class BinaryDataProviderTest {
         }
 
     }
-}
\ No newline at end of file
+}
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
index 8e88100..caf04b6 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
@@ -23,7 +23,6 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.lang.annotation.Annotation;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
@@ -35,6 +34,7 @@ import org.apache.cxf.jaxrs.impl.MetadataMap;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -172,13 +172,13 @@ public class PrimitiveTextProviderTest {
         MessageBodyWriter p = new PrimitiveTextProvider();
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         p.writeTo(Boolean.TRUE, null, null, null, MediaType.TEXT_PLAIN_TYPE, null, os);
-        assertTrue(Arrays.equals(new String("true").getBytes(), os.toByteArray()));
+        assertArrayEquals(new String("true").getBytes(), os.toByteArray());
 
         os = new ByteArrayOutputStream();
 
         final boolean value = true;
         p.writeTo(value, null, null, null, MediaType.TEXT_PLAIN_TYPE, null, os);
-        assertTrue(Arrays.equals(new String("true").getBytes(), os.toByteArray()));
+        assertArrayEquals(new String("true").getBytes(), os.toByteArray());
     }
 
 
@@ -239,7 +239,7 @@ public class PrimitiveTextProviderTest {
         assertTrue(p.isWriteable(value.getClass(), null, null, MediaType.TEXT_PLAIN_TYPE));
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         p.writeTo(value, null, null, null, MediaType.TEXT_PLAIN_TYPE, null, os);
-        assertTrue(Arrays.equals(value.toString().getBytes(), os.toByteArray()));
+        assertArrayEquals(value.toString().getBytes(), os.toByteArray());
 
         assertTrue(p.isReadable(value.getClass(), null, null, MediaType.TEXT_PLAIN_TYPE));
         @SuppressWarnings("unchecked")
@@ -248,4 +248,4 @@ public class PrimitiveTextProviderTest {
         assertEquals(value, valueRead);
     }
 
-}
\ No newline at end of file
+}
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
index c99d7f7..18867a5 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
@@ -604,7 +604,7 @@ public class JAXRSUtilsTest {
                                                  MediaType.valueOf("application/json"));
 
         assertEquals(1, candidateList.size());
-        assertTrue("application/json".equals(candidateList.get(0).toString()));
+        assertEquals("application/json", candidateList.get(0).toString());
 
         //test basic
         methodMimeTypes = JAXRSUtils.parseMediaTypes(
@@ -613,7 +613,7 @@ public class JAXRSUtilsTest {
                                                       MediaType.valueOf("application/json"));
 
         assertEquals(1, candidateList.size());
-        assertTrue("application/json".equals(candidateList.get(0).toString()));
+        assertEquals("application/json", candidateList.get(0).toString());
 
         //test accept wild card */*
         candidateList = JAXRSUtils.intersectMimeTypes(
@@ -636,19 +636,19 @@ public class JAXRSUtilsTest {
         candidateList = JAXRSUtils.intersectMimeTypes("*/*", "application/json");
 
         assertEquals(1, candidateList.size());
-        assertTrue("application/json".equals(candidateList.get(0).toString()));
+        assertEquals("application/json", candidateList.get(0).toString());
 
         //test produce wild card application/*
         candidateList = JAXRSUtils.intersectMimeTypes("application/*", "application/json");
 
         assertEquals(1, candidateList.size());
-        assertTrue("application/json".equals(candidateList.get(0).toString()));
+        assertEquals("application/json", candidateList.get(0).toString());
 
         //test produce wild card */*, accept wild card */*
         candidateList = JAXRSUtils.intersectMimeTypes("*/*", "*/*");
 
         assertEquals(1, candidateList.size());
-        assertTrue("*/*".equals(candidateList.get(0).toString()));
+        assertEquals("*/*", candidateList.get(0).toString());
     }
 
     @Test
@@ -2203,4 +2203,4 @@ public class JAXRSUtilsTest {
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java
index 0650b7a..45a17ba 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java
@@ -294,7 +294,7 @@ public class FiqlParserTest {
     public void testSQL5() throws SearchParseException {
         SearchCondition<Condition> filter = parser.parse("name==test");
         String sql = SearchUtils.toSQL(filter, "table");
-        assertTrue("SELECT * FROM table WHERE name = 'test'".equals(sql));
+        assertEquals("SELECT * FROM table WHERE name = 'test'", sql);
     }
 
     @Test
@@ -404,4 +404,4 @@ public class FiqlParserTest {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java
index e3927dd..50b75a8f 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.jaxrs.ext.search.visitor.SBThreadLocalVisitorState;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 
@@ -138,7 +139,7 @@ public class SQLPrinterVisitorTest {
         SQLPrinterVisitor<Condition> visitor = new SQLPrinterVisitor<>("table");
         filter.accept(visitor);
         String sql = visitor.getQuery();
-        assertTrue("SELECT * FROM table WHERE name = 'test'".equals(sql));
+        assertEquals("SELECT * FROM table WHERE name = 'test'", sql);
     }
 
     @Test
@@ -148,7 +149,7 @@ public class SQLPrinterVisitorTest {
             new SQLPrinterVisitor<>("table", "NAMES");
         filter.accept(visitor);
         String sql = visitor.getQuery();
-        assertTrue("SELECT NAMES FROM table WHERE name = 'test'".equals(sql));
+        assertEquals("SELECT NAMES FROM table WHERE name = 'test'", sql);
     }
 
     @Test
@@ -160,7 +161,7 @@ public class SQLPrinterVisitorTest {
                 "table", Collections.singletonList("NAMES"));
         filter.accept(visitor);
         String sql = visitor.getQuery();
-        assertTrue("SELECT NAMES FROM table WHERE NAMES = 'test'".equals(sql));
+        assertEquals("SELECT NAMES FROM table WHERE NAMES = 'test'", sql);
     }
 
     @Ignore
@@ -207,4 +208,4 @@ public class SQLPrinterVisitorTest {
         }
 
     }
-}
\ No newline at end of file
+}
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
index eb5fb0e..8184a9f 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
@@ -302,7 +302,7 @@ public class EndpointPolicyImplTest {
         assertEquals("1 assertion should be available", 1, assertions1.size());
 
         QName n1 = assertions1.get(0).getName();
-        assertTrue("Policy was not merged", n1.equals(aqn1));
+        assertEquals("Policy was not merged", n1, aqn1);
     }
 
     private PolicyAssertion mockAssertion(QName name, int howMany, boolean normalize) {
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java
index 821d9c8..569de66 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java
@@ -43,6 +43,7 @@ import org.apache.wss4j.common.WSS4JConstants;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -99,7 +100,7 @@ public class WSS4JFaultCodeTest extends AbstractSecurityTest {
             assertTrue(fault.getReason().startsWith(
                 "An error was discovered processing the <wsse:Security> header"));
             QName faultCode = new QName(WSS4JConstants.WSSE_NS, "InvalidSecurity");
-            assertTrue(fault.getFaultCode().equals(faultCode));
+            assertEquals(fault.getFaultCode(), faultCode);
         }
     }
 
@@ -160,7 +161,7 @@ public class WSS4JFaultCodeTest extends AbstractSecurityTest {
         } catch (SoapFault fault) {
             assertTrue(fault.getReason().contains("Invalid timestamp"));
             QName faultCode = new QName(WSS4JConstants.WSSE_NS, "MessageExpired");
-            assertTrue(fault.getFaultCode().equals(faultCode));
+            assertEquals(fault.getFaultCode(), faultCode);
         }
     }
 
@@ -219,7 +220,7 @@ public class WSS4JFaultCodeTest extends AbstractSecurityTest {
             assertTrue(fault.getReason().startsWith(
                 "An error was discovered processing the <wsse:Security> header"));
             QName faultCode = new QName(WSS4JConstants.WSSE_NS, "InvalidSecurity");
-            assertTrue(fault.getFaultCode().equals(faultCode));
+            assertEquals(fault.getFaultCode(), faultCode);
         }
     }
 
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
index bfd5720..04d0a1b 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
@@ -168,7 +168,7 @@ public class ServiceWSDLBuilderTest {
         assertEquals(1, newDef.getPortTypes().size());
         PortType portType = (PortType)newDef.getPortTypes().values().iterator().next();
         assertNotNull(portType);
-        assertTrue(portType.getQName().equals(new QName(newDef.getTargetNamespace(), "Greeter")));
+        assertEquals(portType.getQName(), new QName(newDef.getTargetNamespace(), "Greeter"));
 
     }
 
@@ -311,7 +311,7 @@ public class ServiceWSDLBuilderTest {
     public void testBindingWithDifferentNamespaceImport() throws Exception {
         setupWSDL("wsdl2/person.wsdl");
         assertEquals(newDef.getBindings().size(), 1);
-        assertTrue("http://cxf.apache.org/samples/wsdl-first".equals(newDef.getNamespace("ns3")));
+        assertEquals("http://cxf.apache.org/samples/wsdl-first", newDef.getNamespace("ns3"));
     }
 
     @Test
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 5012fd2..6206b18 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
@@ -21,7 +21,6 @@ package org.apache.cxf.sts.operation;
 import java.security.Principal;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Base64;
 import java.util.Collections;
 import java.util.List;
@@ -79,6 +78,7 @@ import org.apache.wss4j.dom.message.WSSecEncryptedKey;
 import org.apache.wss4j.dom.saml.WSSSAMLKeyInfoProcessor;
 import org.apache.wss4j.dom.util.WSSecurityUtil;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -894,7 +894,7 @@ public class IssueSamlUnitTest {
         );
 
         SAMLKeyInfo samlKeyInfo = assertionWrapper.getSubjectKeyInfo();
-        assertTrue(Arrays.equals(secret, samlKeyInfo.getSecret()));
+        assertArrayEquals(secret, samlKeyInfo.getSecret());
     }
 
 
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 e6c51ba..e1a1e65 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
@@ -51,7 +51,6 @@ 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;
 
 /**
@@ -352,7 +351,7 @@ public class IssueUnitTest {
         List<RequestSecurityTokenResponseType> securityTokenResponse =
             response.getRequestSecurityTokenResponse();
         assertFalse(securityTokenResponse.isEmpty());
-        assertTrue("AuthenticationContext".equals(securityTokenResponse.get(0).getContext()));
+        assertEquals("AuthenticationContext", securityTokenResponse.get(0).getContext());
     }
 
     /**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUnitTest.java
index 4fb7d56..9de5e5e 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUnitTest.java
@@ -294,7 +294,7 @@ public class ValidateUnitTest {
         RequestSecurityTokenResponseType response =
             validateOperation.validate(request, null, msgCtx);
         assertTrue(validateResponse(response));
-        assertTrue("AuthenticationContext".equals(response.getContext()));
+        assertEquals("AuthenticationContext", response.getContext());
     }
 
     /**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
index d12ec1d..2fccc17 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
@@ -64,6 +64,7 @@ import org.apache.wss4j.common.util.DateUtil;
 
 import org.junit.BeforeClass;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -116,7 +117,7 @@ public class SAMLTokenRenewerRealmTest {
         assertNotNull(validatorResponse);
         assertNotNull(validatorResponse.getToken());
         assertTrue(validatorResponse.getToken().getState() == STATE.EXPIRED);
-        assertTrue("A".equals(validatorResponse.getTokenRealm()));
+        assertEquals("A", validatorResponse.getTokenRealm());
 
         // Renew the Assertion
         TokenRenewerParameters renewerParameters = new TokenRenewerParameters();
@@ -189,7 +190,7 @@ public class SAMLTokenRenewerRealmTest {
         assertNotNull(validatorResponse);
         assertNotNull(validatorResponse.getToken());
         assertTrue(validatorResponse.getToken().getState() == STATE.EXPIRED);
-        assertTrue("B".equals(validatorResponse.getTokenRealm()));
+        assertEquals("B", validatorResponse.getTokenRealm());
 
         // Renew the Assertion
         TokenRenewerParameters renewerParameters = new TokenRenewerParameters();
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java
index d95e2da..4f1fc1d 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java
@@ -53,6 +53,7 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.common.principal.CustomTokenPrincipal;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -108,7 +109,7 @@ public class JWTTokenValidatorRealmTest {
         assertNotNull(validatorResponse);
         assertNotNull(validatorResponse.getToken());
         assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
-        assertTrue("A".equals(validatorResponse.getTokenRealm()));
+        assertEquals("A", validatorResponse.getTokenRealm());
 
         Principal principal = validatorResponse.getPrincipal();
         assertTrue(principal != null && principal.getName() != null);
@@ -159,7 +160,7 @@ public class JWTTokenValidatorRealmTest {
         assertNotNull(validatorResponse);
         assertNotNull(validatorResponse.getToken());
         assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
-        assertTrue("B".equals(validatorResponse.getTokenRealm()));
+        assertEquals("B", validatorResponse.getTokenRealm());
 
         Principal principal = validatorResponse.getPrincipal();
         assertTrue(principal != null && principal.getName() != null);
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorTest.java
index 12909fc..95350e4 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorTest.java
@@ -59,6 +59,7 @@ import org.apache.wss4j.common.ext.WSPasswordCallback;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.common.principal.CustomTokenPrincipal;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -321,7 +322,7 @@ public class JWTTokenValidatorTest {
         assertTrue(principal != null && principal.getName() != null);
         Set<Principal> roles = validatorResponse.getRoles();
         assertTrue(roles != null && !roles.isEmpty());
-        assertTrue("manager".equals(roles.iterator().next().getName()));
+        assertEquals("manager", roles.iterator().next().getName());
     }
 
     private TokenProviderParameters createProviderParameters() throws WSSecurityException {
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java
index 6813ec0..a6416a5 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java
@@ -54,6 +54,7 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal;
 
 import org.junit.BeforeClass;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -99,7 +100,7 @@ public class SAMLTokenValidatorCachedRealmTest {
         assertNotNull(validatorResponse);
         assertNotNull(validatorResponse.getToken());
         assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
-        assertTrue("A".equals(validatorResponse.getTokenRealm()));
+        assertEquals("A", validatorResponse.getTokenRealm());
 
     }
 
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java
index 9440223..fd03d54 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java
@@ -50,6 +50,7 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.common.principal.CustomTokenPrincipal;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -96,7 +97,7 @@ public class SAMLTokenValidatorRealmTest {
         assertNotNull(validatorResponse);
         assertNotNull(validatorResponse.getToken());
         assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
-        assertTrue("A".equals(validatorResponse.getTokenRealm()));
+        assertEquals("A", validatorResponse.getTokenRealm());
 
         Principal principal = validatorResponse.getPrincipal();
         assertTrue(principal != null && principal.getName() != null);
@@ -139,7 +140,7 @@ public class SAMLTokenValidatorRealmTest {
         assertNotNull(validatorResponse);
         assertNotNull(validatorResponse.getToken());
         assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
-        assertTrue("B".equals(validatorResponse.getTokenRealm()));
+        assertEquals("B", validatorResponse.getTokenRealm());
 
         Principal principal = validatorResponse.getPrincipal();
         assertTrue(principal != null && principal.getName() != null);
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
index c9dc623..cfe5d79 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
@@ -393,7 +393,7 @@ public class SAMLTokenValidatorTest {
         assertTrue(principal != null && principal.getName() != null);
         Set<Principal> roles = validatorResponse.getRoles();
         assertTrue(roles != null && !roles.isEmpty());
-        assertTrue("manager".equals(roles.iterator().next().getName()));
+        assertEquals("manager", roles.iterator().next().getName());
     }
 
     @org.junit.Test
@@ -427,7 +427,7 @@ public class SAMLTokenValidatorTest {
         assertTrue(principal != null && principal.getName() != null);
         Set<Principal> roles = validatorResponse.getRoles();
         assertTrue(roles != null && !roles.isEmpty());
-        assertTrue("employee".equals(roles.iterator().next().getName()));
+        assertEquals("employee", roles.iterator().next().getName());
     }
 
     /**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SCTValidatorTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SCTValidatorTest.java
index f7aff79..d8d362d 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SCTValidatorTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SCTValidatorTest.java
@@ -46,6 +46,7 @@ import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.common.principal.CustomTokenPrincipal;
 import org.apache.wss4j.dom.message.token.SecurityContextToken;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -82,7 +83,7 @@ public class SCTValidatorTest {
         assertTrue(
             validatorResponse.getAdditionalProperties().get(SCTValidator.SCT_VALIDATOR_SECRET) != null
         );
-        assertTrue("alice".equals(validatorResponse.getPrincipal().getName()));
+        assertEquals("alice", validatorResponse.getPrincipal().getName());
 
         // Now remove the SCT from the cache
         tokenStore.remove(tokenStore.getToken(providerResponse.getTokenId()).getId());
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java
index 66d89fe..8ee5dd6 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java
@@ -41,6 +41,7 @@ import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized.Parameters;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -124,10 +125,10 @@ public class SAMLBatchUnitTest extends AbstractBusClientServerTestBase {
             requestSecurityTokens(bus, wsdlLocation, requestList, action, requestType, port);
         assertTrue(tokens != null && tokens.size() == 2);
 
-        assertTrue("Assertion".equals(tokens.get(0).getToken().getLocalName()));
-        assertTrue(tokens.get(0).getToken().getNamespaceURI().equals(SAMLConstants.SAML1_NS));
-        assertTrue("Assertion".equals(tokens.get(1).getToken().getLocalName()));
-        assertTrue(tokens.get(1).getToken().getNamespaceURI().equals(SAMLConstants.SAML20_NS));
+        assertEquals("Assertion", tokens.get(0).getToken().getLocalName());
+        assertEquals(tokens.get(0).getToken().getNamespaceURI(), SAMLConstants.SAML1_NS);
+        assertEquals("Assertion", tokens.get(1).getToken().getLocalName());
+        assertEquals(tokens.get(1).getToken().getNamespaceURI(), SAMLConstants.SAML20_NS);
 
         // Now validate the tokens
         requestList.get(0).setValidateTarget(tokens.get(0).getToken());
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java
index b3ca089..923ca01 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java
@@ -40,6 +40,7 @@ import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized.Parameters;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -214,7 +215,7 @@ public class SAMLRenewUnitTest extends AbstractBusClientServerTestBase {
         // Validate the token
         List<SecurityToken> validatedTokens = validateSecurityToken(bus, wsdlLocation, token);
         assertFalse(validatedTokens.isEmpty());
-        assertTrue(validatedTokens.get(0).equals(token));
+        assertEquals(validatedTokens.get(0), token);
 
         // Renew the token
         SecurityToken renewedToken = renewSecurityToken(bus, wsdlLocation, token, false);
@@ -277,7 +278,7 @@ public class SAMLRenewUnitTest extends AbstractBusClientServerTestBase {
         // Validate the token
         List<SecurityToken> validatedTokens = validateSecurityToken(bus, wsdlLocation, token);
         assertFalse(validatedTokens.isEmpty());
-        assertTrue(validatedTokens.get(0).equals(token));
+        assertEquals(validatedTokens.get(0), token);
 
         // Renew the token
         SecurityToken renewedToken = renewSecurityToken(bus, wsdlLocation, token, false);
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
index 432f00c..e14e003 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
@@ -54,6 +54,7 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal;
 
 import org.junit.BeforeClass;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -106,7 +107,7 @@ public class SAMLDelegationTest extends AbstractBusClientServerTestBase {
         SecurityToken token =
             requestSecurityToken(SAML2_TOKEN_TYPE, BEARER_KEYTYPE, bus,
                                  DEFAULT_ADDRESS, "Transport_UT_Port");
-        assertTrue(SAML2_TOKEN_TYPE.equals(token.getTokenType()));
+        assertEquals(SAML2_TOKEN_TYPE, token.getTokenType());
         assertNotNull(token.getToken());
 
         // Use the first token as OnBehalfOf to get another token
@@ -124,7 +125,7 @@ public class SAMLDelegationTest extends AbstractBusClientServerTestBase {
         SecurityToken token2 =
             requestSecurityToken(SAML2_TOKEN_TYPE, BEARER_KEYTYPE, token.getToken(), bus,
                                  DEFAULT_ADDRESS, true, "Transport_Port");
-        assertTrue(SAML2_TOKEN_TYPE.equals(token2.getTokenType()));
+        assertEquals(SAML2_TOKEN_TYPE, token2.getTokenType());
         assertNotNull(token2.getToken());
 
         bus.shutdown(true);
@@ -143,7 +144,7 @@ public class SAMLDelegationTest extends AbstractBusClientServerTestBase {
         SecurityToken token =
             requestSecurityToken(SAML2_TOKEN_TYPE, BEARER_KEYTYPE, bus,
                                  DEFAULT_ADDRESS, "Transport_UT_Port");
-        assertTrue(SAML2_TOKEN_TYPE.equals(token.getTokenType()));
+        assertEquals(SAML2_TOKEN_TYPE, token.getTokenType());
         assertNotNull(token.getToken());
 
         // Use the first token as ActAs to get another token
@@ -161,7 +162,7 @@ public class SAMLDelegationTest extends AbstractBusClientServerTestBase {
         SecurityToken token2 =
             requestSecurityToken(SAML2_TOKEN_TYPE, BEARER_KEYTYPE, token.getToken(), bus,
                                  DEFAULT_ADDRESS, false, "Transport_Port");
-        assertTrue(SAML2_TOKEN_TYPE.equals(token2.getTokenType()));
+        assertEquals(SAML2_TOKEN_TYPE, token2.getTokenType());
         assertNotNull(token2.getToken());
 
         bus.shutdown(true);
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
index 590d929..6587e26 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
@@ -74,6 +74,7 @@ import org.apache.wss4j.dom.processor.SAMLTokenProcessor;
 
 import org.junit.BeforeClass;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -156,7 +157,7 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
         SecurityToken token =
             requestSecurityToken(SAML1_TOKEN_TYPE, SYMMETRIC_KEY_KEYTYPE, bus, DEFAULT_ADDRESS);
         assertTrue(token.getSecret() != null && token.getSecret().length > 0);
-        assertTrue(SAML1_TOKEN_TYPE.equals(token.getTokenType()));
+        assertEquals(SAML1_TOKEN_TYPE, token.getTokenType());
         assertNotNull(token.getToken());
 
         // Process the token
@@ -197,7 +198,7 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
         SecurityToken token =
             requestSecurityToken(SAML2_TOKEN_TYPE, PUBLIC_KEY_KEYTYPE, bus, DEFAULT_ADDRESS);
         assertTrue(token.getSecret() == null && token.getX509Certificate() != null);
-        assertTrue(SAML2_TOKEN_TYPE.equals(token.getTokenType()));
+        assertEquals(SAML2_TOKEN_TYPE, token.getTokenType());
         assertNotNull(token.getToken());
 
         // Process the token
@@ -236,7 +237,7 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
         // Get a token
         SecurityToken token =
             requestSecurityToken(SAML1_TOKEN_TYPE, BEARER_KEYTYPE, bus, DEFAULT_ADDRESS);
-        assertTrue(SAML1_TOKEN_TYPE.equals(token.getTokenType()));
+        assertEquals(SAML1_TOKEN_TYPE, token.getTokenType());
         assertNotNull(token.getToken());
 
         // Process the token
@@ -275,7 +276,7 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
             requestSecurityToken(
                 SAML2_TOKEN_TYPE, BEARER_KEYTYPE, null, bus, DEFAULT_ADDRESS, null, null, null, null
             );
-        assertTrue(SAML2_TOKEN_TYPE.equals(token.getTokenType()));
+        assertEquals(SAML2_TOKEN_TYPE, token.getTokenType());
         assertNotNull(token.getToken());
 
         // Process the token
@@ -335,7 +336,7 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
         String context = "AuthenticationContext";
         SecurityToken token =
             requestSecurityToken(SAML1_TOKEN_TYPE, BEARER_KEYTYPE, bus, DEFAULT_ADDRESS, context);
-        assertTrue(SAML1_TOKEN_TYPE.equals(token.getTokenType()));
+        assertEquals(SAML1_TOKEN_TYPE, token.getTokenType());
         assertNotNull(token.getToken());
 
         // Process the token
@@ -372,7 +373,7 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
         // Get a token
         SecurityToken token =
             requestSecurityTokenTTL(SAML1_TOKEN_TYPE, BEARER_KEYTYPE, bus, DEFAULT_ADDRESS);
-        assertTrue(SAML1_TOKEN_TYPE.equals(token.getTokenType()));
+        assertEquals(SAML1_TOKEN_TYPE, token.getTokenType());
         assertNotNull(token.getToken());
 
         // Process the token
@@ -440,7 +441,7 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
                 requestSecurityToken(SAML2_TOKEN_TYPE, BEARER_KEYTYPE, null,
                         bus, DEFAULT_ADDRESS, null, properties, "b-issuer", null);
                         */
-        assertTrue(SAML2_TOKEN_TYPE.equals(token.getTokenType()));
+        assertEquals(SAML2_TOKEN_TYPE, token.getTokenType());
         assertNotNull(token.getToken());
 
         List<WSSecurityEngineResult> results = processToken(token);
@@ -457,9 +458,9 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
         }
         assertTrue(confirmMethod != null && confirmMethod.contains("bearer"));
 
-        assertTrue("b-issuer".equals(assertion.getIssuerString()));
+        assertEquals("b-issuer", assertion.getIssuerString());
         String subjectName = assertion.getSaml2().getSubject().getNameID().getValue();
-        assertTrue("Subject must be ALICE instead of " + subjectName, "ALICE".equals(subjectName));
+        assertEquals("Subject must be ALICE instead of " + subjectName, "ALICE", subjectName);
 
     }
 
diff --git a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java
index ee7a27b..af6d6f5 100644
--- a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java
+++ b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java
@@ -82,7 +82,7 @@ public class STSUnitTest extends BasicSTSIntegrationTest {
         // Get a token
         SecurityToken token =
             requestSecurityToken(SAML2_TOKEN_TYPE, BEARER_KEYTYPE, bus, stsEndpoint);
-        Assert.assertTrue(SAML2_TOKEN_TYPE.equals(token.getTokenType()));
+        Assert.assertEquals(SAML2_TOKEN_TYPE, token.getTokenType());
         Assert.assertNotNull(token.getToken());
 
         // Process the token
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceJacksonSpringProviderTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceJacksonSpringProviderTest.java
index 35e8a4b..a32b399 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceJacksonSpringProviderTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceJacksonSpringProviderTest.java
@@ -22,7 +22,6 @@ package org.apache.cxf.systest.jaxrs;
 import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -46,6 +45,7 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -111,7 +111,7 @@ public class JAXRSClientServerResourceJacksonSpringProviderTest extends Abstract
         byte[] image1 = IOUtils.readBytesFromStream(
             getClass().getResourceAsStream("/org/apache/cxf/systest/jaxrs/resources/java.jpg"));
         byte[] image2 = IOUtils.readBytesFromStream(is2);
-        assertTrue(Arrays.equals(image1, image2));
+        assertArrayEquals(image1, image2);
     }
 
     @Test
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
index 2968cff..d7503bb 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
@@ -27,7 +27,6 @@ import java.io.InputStream;
 import java.io.PushbackInputStream;
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashMap;
@@ -73,6 +72,7 @@ import org.apache.http.util.EntityUtils;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
@@ -617,7 +617,7 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
         byte[] image1 = IOUtils.readBytesFromStream(
             getClass().getResourceAsStream("/org/apache/cxf/systest/jaxrs/resources/java.jpg"));
         byte[] image2 = IOUtils.readBytesFromStream(is2);
-        assertTrue(Arrays.equals(image1, image2));
+        assertArrayEquals(image1, image2);
     }
 
     @Test
@@ -660,7 +660,7 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
         byte[] image1 = IOUtils.readBytesFromStream(
             getClass().getResourceAsStream("/org/apache/cxf/systest/jaxrs/resources/java.jpg"));
         byte[] image2 = IOUtils.readBytesFromStream(is2);
-        assertTrue(Arrays.equals(image1, image2));
+        assertArrayEquals(image1, image2);
     }
 
     private Map<String, String> doTestAddBookJaxbJsonImageWebClient(String multipartType) throws Exception {
@@ -689,7 +689,7 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
         byte[] image1 = IOUtils.readBytesFromStream(
             getClass().getResourceAsStream("/org/apache/cxf/systest/jaxrs/resources/java.jpg"));
         byte[] image2 = IOUtils.readBytesFromStream(is2);
-        assertTrue(Arrays.equals(image1, image2));
+        assertArrayEquals(image1, image2);
 
         String ctString =
             client.getResponse().getMetadata().getFirst("Content-Type").toString();
@@ -775,7 +775,7 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
         byte[] image1 = IOUtils.readBytesFromStream(
             getClass().getResourceAsStream("/org/apache/cxf/systest/jaxrs/resources/java.jpg"));
         byte[] image2 = IOUtils.readBytesFromStream(is2);
-        assertTrue(Arrays.equals(image1, image2));
+        assertArrayEquals(image1, image2);
     }
 
     @Test
@@ -813,7 +813,7 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
         byte[] image1 = IOUtils.readBytesFromStream(
             getClass().getResourceAsStream("/org/apache/cxf/systest/jaxrs/resources/java.jpg"));
         byte[] image2 = IOUtils.readBytesFromStream(is2);
-        assertTrue(Arrays.equals(image1, image2));
+        assertArrayEquals(image1, image2);
 
     }
 
@@ -842,7 +842,7 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
         byte[] image1 = IOUtils.readBytesFromStream(
             getClass().getResourceAsStream("/org/apache/cxf/systest/jaxrs/resources/java.jpg"));
         byte[] image2 = IOUtils.readBytesFromStream(is2);
-        assertTrue(Arrays.equals(image1, image2));
+        assertArrayEquals(image1, image2);
         ContentDisposition cd2 = body2.getRootAttachment().getContentDisposition();
         assertEquals("attachment;filename=java.jpg", cd2.toString());
         assertEquals("java.jpg", cd2.getParameter("filename"));
@@ -881,7 +881,7 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
         byte[] image1 = IOUtils.readBytesFromStream(
             getClass().getResourceAsStream("/org/apache/cxf/systest/jaxrs/resources/java.jpg"));
         byte[] image2 = IOUtils.readBytesFromStream(is2);
-        assertTrue(Arrays.equals(image1, image2));
+        assertArrayEquals(image1, image2);
         ContentDisposition cd2 = body2.getRootAttachment().getContentDisposition();
         assertEquals("form-data;name=file;filename=java.jpg", cd2.toString());
         assertEquals("java.jpg", cd2.getParameter("filename"));
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/AbstractFailoverTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/AbstractFailoverTest.java
index 37f3e67..904d603 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/AbstractFailoverTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/AbstractFailoverTest.java
@@ -256,7 +256,7 @@ public abstract class AbstractFailoverTest extends AbstractBusClientServerTestBa
             } catch (Exception error) {
                 if (!expectServerException) {
                     //String currEndpoint = getCurrentEndpointAddress(bookStore);
-                    //assertTrue(currEndpoint.equals(inactiveReplica));
+                    //assertEquals(currEndpoint, inactiveReplica);
                     throw error;
                 }
                 ex = error;
@@ -317,7 +317,7 @@ public abstract class AbstractFailoverTest extends AbstractBusClientServerTestBa
             if (expectRandom) {
                 assertTrue(currEndpoint.equals(activeReplica1) || currEndpoint.equals(activeReplica2));
             } else {
-                assertTrue(currEndpoint.equals(activeReplica1));
+                assertEquals(currEndpoint, activeReplica1);
             }
             if (expectServerException) {
                 assertNotNull(ex);
@@ -345,9 +345,9 @@ public abstract class AbstractFailoverTest extends AbstractBusClientServerTestBa
         assertEquals(406, r.getStatus());
         String currEndpoint = getCurrentEndpointAddress(bookStore);
         if (notAvailableOnly) {
-            assertTrue(currEndpoint.equals(currentReplica));
+            assertEquals(currEndpoint, currentReplica);
         } else {
-            assertTrue(currEndpoint.equals(newReplica));
+            assertEquals(currEndpoint, newReplica);
         }
     }
 
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
index a3225ce..b50a85b 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
@@ -561,7 +561,7 @@ public class DispatchClientServerTest extends AbstractBusClientServerTestBase {
         Object response = disp.invoke(greetMe);
         assertNotNull(response);
         String responseValue = ((GreetMeResponse)response).getResponseType();
-        assertTrue("Expected string, " + expected, expected.equals(responseValue));
+        assertEquals("Expected string, " + expected, expected, responseValue);
 
         // Test oneway
         disp.invokeOneWay(greetMe);
@@ -571,7 +571,7 @@ public class DispatchClientServerTest extends AbstractBusClientServerTestBase {
         assertNotNull(response2);
         GreetMeResponse greetMeResponse = (GreetMeResponse)response2.get();
         String responseValue2 = greetMeResponse.getResponseType();
-        assertTrue("Expected string, " + expected, expected.equals(responseValue2));
+        assertEquals("Expected string, " + expected, expected, responseValue2);
 
         // Test async callback
         TestJAXBHandler tjbh = new TestJAXBHandler();
@@ -580,7 +580,7 @@ public class DispatchClientServerTest extends AbstractBusClientServerTestBase {
         waitForFuture(fd);
 
         String responseValue3 = ((GreetMeResponse)tjbh.getResponse()).getResponseType();
-        assertTrue("Expected string, " + expected, expected.equals(responseValue3));
+        assertEquals("Expected string, " + expected, expected, responseValue3);
 
         org.apache.hello_world_soap_http.types.TestDocLitFault fr =
             new org.apache.hello_world_soap_http.types.TestDocLitFault();
@@ -652,7 +652,7 @@ public class DispatchClientServerTest extends AbstractBusClientServerTestBase {
         Object response = disp.invoke(greetMe);
         assertNotNull(response);
         String responseValue = ((GreetMeResponse)response).getResponseType();
-        assertTrue("Expected string, " + expected, expected.equals(responseValue));
+        assertEquals("Expected string, " + expected, expected, responseValue);
 
         assertEquals("Feature should be applied", 1, TestDispatchFeature.getCount());
         assertEquals("Feature based interceptors should be added",
diff --git a/systests/ldap/src/test/java/org/apache/cxf/systest/ldap/sts/LDAPClaimsTest.java b/systests/ldap/src/test/java/org/apache/cxf/systest/ldap/sts/LDAPClaimsTest.java
index 23765c9..a1f0917 100644
--- a/systests/ldap/src/test/java/org/apache/cxf/systest/ldap/sts/LDAPClaimsTest.java
+++ b/systests/ldap/src/test/java/org/apache/cxf/systest/ldap/sts/LDAPClaimsTest.java
@@ -419,7 +419,7 @@ public class LDAPClaimsTest extends AbstractLdapTestUnit {
             claimsManager.retrieveClaimValues(requestedClaims, params);
 
         Assert.assertTrue(retrievedClaims.size() == 1);
-        Assert.assertTrue(retrievedClaims.get(0).getClaimType().equals(roleURI));
+        Assert.assertEquals(retrievedClaims.get(0).getClaimType(), roleURI);
         Assert.assertTrue(retrievedClaims.get(0).getValues().size() == 2);
     }
 
@@ -442,7 +442,7 @@ public class LDAPClaimsTest extends AbstractLdapTestUnit {
             claimsManager.retrieveClaimValues(requestedClaims, params);
 
         Assert.assertTrue(retrievedClaims.size() == 1);
-        Assert.assertTrue(retrievedClaims.get(0).getClaimType().equals(roleURI));
+        Assert.assertEquals(retrievedClaims.get(0).getClaimType(), roleURI);
         Assert.assertTrue(retrievedClaims.get(0).getValues().size() == 2);
     }
 
@@ -468,7 +468,7 @@ public class LDAPClaimsTest extends AbstractLdapTestUnit {
             claimsManager.retrieveClaimValues(requestedClaims, params);
 
         Assert.assertTrue(retrievedClaims.size() == 1);
-        Assert.assertTrue(retrievedClaims.get(0).getClaimType().equals(roleURI));
+        Assert.assertEquals(retrievedClaims.get(0).getClaimType(), roleURI);
         Assert.assertTrue(retrievedClaims.get(0).getValues().size() == 2);
     }
 
@@ -494,7 +494,7 @@ public class LDAPClaimsTest extends AbstractLdapTestUnit {
             claimsManager.retrieveClaimValues(requestedClaims, params);
 
         Assert.assertTrue(retrievedClaims.size() == 1);
-        Assert.assertTrue(retrievedClaims.get(0).getClaimType().equals(roleURI));
+        Assert.assertEquals(retrievedClaims.get(0).getClaimType(), roleURI);
         Assert.assertTrue(retrievedClaims.get(0).getValues().size() == 1);
     }
 
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTest.java
index ae860ef..7406856 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTest.java
@@ -34,6 +34,7 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -76,7 +77,7 @@ public class CorbaTest extends AbstractBusClientServerTestBase {
 
 
         String output = port.greetMe("Betty");
-        assertTrue("Unexpected returned string: " + output, "Hello Betty".equals(output));
+        assertEquals("Unexpected returned string: " + output, "Hello Betty", output);
     }
 
     @Test
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualHttpMulitplexClientServerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualHttpMulitplexClientServerTest.java
index b1fc23b..3509003 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualHttpMulitplexClientServerTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualHttpMulitplexClientServerTest.java
@@ -47,6 +47,7 @@ import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -116,21 +117,21 @@ public class ManualHttpMulitplexClientServerTest extends AbstractBusClientServer
         setupContextWithEprAddress(epr, num);
 
         IsEvenResponse numResp = num.isEven();
-        assertTrue("2 is even", Boolean.TRUE.equals(numResp.isEven()));
+        assertEquals("2 is even", Boolean.TRUE, numResp.isEven());
 
         // try again with the address from another epr
         w3cEpr = nfact.create("3");
         epr = ProviderImpl.convertToInternal(w3cEpr);
         setupContextWithEprAddress(epr, num);
         numResp = num.isEven();
-        assertTrue("3 is not even", Boolean.FALSE.equals(numResp.isEven()));
+        assertEquals("3 is not even", Boolean.FALSE, numResp.isEven());
 
         // try again with the address from another epr
         w3cEpr = nfact.create("6");
         epr = ProviderImpl.convertToInternal(w3cEpr);
         setupContextWithEprAddress(epr, num);
         numResp = num.isEven();
-        assertTrue("6 is even", Boolean.TRUE.equals(numResp.isEven()));
+        assertEquals("6 is even", Boolean.TRUE, numResp.isEven());
     }
 
     @Test
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexHttpAddressClientServerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexHttpAddressClientServerTest.java
index 50b7715..e87b3f7 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexHttpAddressClientServerTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexHttpAddressClientServerTest.java
@@ -47,6 +47,7 @@ import org.apache.cxf.testutil.common.TestUtil;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -130,7 +131,7 @@ public class MultiplexHttpAddressClientServerTest extends AbstractBusClientServe
                                    NUMBER_SERVANT_ADDRESS_ROOT + "103");
 
         IsEvenResponse numResp = num.isEven();
-        assertTrue("103 is not even", Boolean.FALSE.equals(numResp.isEven()));
+        assertEquals("103 is not even", Boolean.FALSE, numResp.isEven());
     }
 
     @Test
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
index 40b5900..07c4dc2 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
@@ -45,6 +45,7 @@ import org.apache.type_test.types1.StringEnum;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -788,9 +789,9 @@ public abstract class AbstractTypeTestClient
         } else {
             ret = rpcClient.testGYear(x, y, z);
         }
-        assertTrue("testGYear(): Incorrect value for inout param", x.equals(y.value));
-        assertTrue("testGYear(): Incorrect value for out param", yOrig.equals(z.value));
-        assertTrue("testGYear(): Incorrect return value", x.equals(ret));
+        assertEquals("testGYear(): Incorrect value for inout param", x, y.value);
+        assertEquals("testGYear(): Incorrect value for out param", yOrig, z.value);
+        assertEquals("testGYear(): Incorrect return value", x, ret);
     }
 
     @Test
@@ -814,9 +815,9 @@ public abstract class AbstractTypeTestClient
         } else {
             ret = rpcClient.testGYearMonth(x, y, z);
         }
-        assertTrue("testGYearMonth(): Incorrect value for inout param", x.equals(y.value));
-        assertTrue("testGYearMonth(): Incorrect value for out param", yOrig.equals(z.value));
-        assertTrue("testGYearMonth(): Incorrect return value", x.equals(ret));
+        assertEquals("testGYearMonth(): Incorrect value for inout param", x, y.value);
+        assertEquals("testGYearMonth(): Incorrect value for out param", yOrig, z.value);
+        assertEquals("testGYearMonth(): Incorrect return value", x, ret);
     }
 
     @Test
@@ -849,9 +850,9 @@ public abstract class AbstractTypeTestClient
         } else {
             ret = rpcClient.testGMonth(x, y, z);
         }
-        assertTrue("testGMonth(): Incorrect value for inout param", x.equals(y.value));
-        assertTrue("testGMonth(): Incorrect value for out param", yOrig.equals(z.value));
-        assertTrue("testGMonth(): Incorrect return value", x.equals(ret));
+        assertEquals("testGMonth(): Incorrect value for inout param", x, y.value);
+        assertEquals("testGMonth(): Incorrect value for out param", yOrig, z.value);
+        assertEquals("testGMonth(): Incorrect return value", x, ret);
     }
 
     @Test
@@ -875,9 +876,9 @@ public abstract class AbstractTypeTestClient
         } else {
             ret = rpcClient.testGMonthDay(x, y, z);
         }
-        assertTrue("testGMonthDay(): Incorrect value for inout param", x.equals(y.value));
-        assertTrue("testGMonthDay(): Incorrect value for out param", yOrig.equals(z.value));
-        assertTrue("testGMonthDay(): Incorrect return value", x.equals(ret));
+        assertEquals("testGMonthDay(): Incorrect value for inout param", x, y.value);
+        assertEquals("testGMonthDay(): Incorrect value for out param", yOrig, z.value);
+        assertEquals("testGMonthDay(): Incorrect return value", x, ret);
     }
 
     @Test
@@ -901,9 +902,9 @@ public abstract class AbstractTypeTestClient
         } else {
             ret = rpcClient.testGDay(x, y, z);
         }
-        assertTrue("testGDay(): Incorrect value for inout param", x.equals(y.value));
-        assertTrue("testGDay(): Incorrect value for out param", yOrig.equals(z.value));
-        assertTrue("testGDay(): Incorrect return value", x.equals(ret));
+        assertEquals("testGDay(): Incorrect value for inout param", x, y.value);
+        assertEquals("testGDay(): Incorrect value for out param", yOrig, z.value);
+        assertEquals("testGDay(): Incorrect return value", x, ret);
     }
 
     @Test
@@ -927,9 +928,9 @@ public abstract class AbstractTypeTestClient
         } else {
             ret = rpcClient.testDuration(x, y, z);
         }
-        assertTrue("testDuration(): Incorrect value for inout param", x.equals(y.value));
-        assertTrue("testDuration(): Incorrect value for out param", yOrig.equals(z.value));
-        assertTrue("testDuration(): Incorrect return value", x.equals(ret));
+        assertEquals("testDuration(): Incorrect value for inout param", x, y.value);
+        assertEquals("testDuration(): Incorrect value for out param", yOrig, z.value);
+        assertEquals("testDuration(): Incorrect return value", x, ret);
     }
 
     @Test
@@ -951,9 +952,9 @@ public abstract class AbstractTypeTestClient
         } else {
             ret = rpcClient.testNormalizedString(x, y, z);
         }
-        assertTrue("testNormalizedString(): Incorrect value for inout param", x.equals(y.value));
-        assertTrue("testNormalizedString(): Incorrect value for out param", yOrig.equals(z.value));
-        assertTrue("testNormalizedString(): Incorrect return value", x.equals(ret));
+        assertEquals("testNormalizedString(): Incorrect value for inout param", x, y.value);
+        assertEquals("testNormalizedString(): Incorrect value for out param", yOrig, z.value);
+        assertEquals("testNormalizedString(): Incorrect return value", x, ret);
     }
 
     @Test
@@ -975,9 +976,9 @@ public abstract class AbstractTypeTestClient
         } else {
             ret = rpcClient.testToken(x, y, z);
         }
-        assertTrue("testToken(): Incorrect value for inout param", x.equals(y.value));
-        assertTrue("testToken(): Incorrect value for out param", yOrig.equals(z.value));
-        assertTrue("testToken(): Incorrect return value", x.equals(ret));
+        assertEquals("testToken(): Incorrect value for inout param", x, y.value);
+        assertEquals("testToken(): Incorrect value for out param", yOrig, z.value);
+        assertEquals("testToken(): Incorrect return value", x, ret);
     }
 
     @Test
@@ -999,9 +1000,9 @@ public abstract class AbstractTypeTestClient
         } else {
             ret = rpcClient.testLanguage(x, y, z);
         }
-        assertTrue("testLanguage(): Incorrect value for inout param", x.equals(y.value));
-        assertTrue("testLanguage(): Incorrect value for out param", yOrig.equals(z.value));
-        assertTrue("testLanguage(): Incorrect return value", x.equals(ret));
+        assertEquals("testLanguage(): Incorrect value for inout param", x, y.value);
+        assertEquals("testLanguage(): Incorrect value for out param", yOrig, z.value);
+        assertEquals("testLanguage(): Incorrect return value", x, ret);
     }
 
     @Test
@@ -1023,9 +1024,9 @@ public abstract class AbstractTypeTestClient
         } else {
             ret = rpcClient.testNMTOKEN(x, y, z);
         }
-        assertTrue("testNMTOKEN(): Incorrect value for inout param", x.equals(y.value));
-        assertTrue("testNMTOKEN(): Incorrect value for out param", yOrig.equals(z.value));
-        assertTrue("testNMTOKEN(): Incorrect return value", x.equals(ret));
+        assertEquals("testNMTOKEN(): Incorrect value for inout param", x, y.value);
+        assertEquals("testNMTOKEN(): Incorrect value for out param", yOrig, z.value);
+        assertEquals("testNMTOKEN(): Incorrect return value", x, ret);
     }
 
     @Test
@@ -1043,9 +1044,9 @@ public abstract class AbstractTypeTestClient
             Holder<List<String>> y = new Holder<>(yOrig);
             Holder<List<String>> z = new Holder<>();
             List<String> ret = testXMLBinding ? xmlClient.testNMTOKENS(x, y, z) : docClient.testNMTOKENS(x, y, z);
-            assertTrue("testNMTOKENS(): Incorrect value for inout param", x.equals(y.value));
-            assertTrue("testNMTOKENS(): Incorrect value for out param", yOrig.equals(z.value));
-            assertTrue("testNMTOKENS(): Incorrect return value", x.equals(ret));
+            assertEquals("testNMTOKENS(): Incorrect value for inout param", x, y.value);
+            assertEquals("testNMTOKENS(): Incorrect value for out param", yOrig, z.value);
+            assertEquals("testNMTOKENS(): Incorrect return value", x, ret);
         } else {
             String[] x = new String[1];
             x[0] = "123:abc";
@@ -1057,9 +1058,9 @@ public abstract class AbstractTypeTestClient
             Holder<String[]> z = new Holder<>();
 
             String[] ret = rpcClient.testNMTOKENS(x, y, z);
-            assertTrue("testNMTOKENS(): Incorrect value for inout param", Arrays.equals(x, y.value));
-            assertTrue("testNMTOKENS(): Incorrect value for out param", Arrays.equals(yOrig, z.value));
-            assertTrue("testNMTOKENS(): Incorrect return value", Arrays.equals(x, ret));
+            assertArrayEquals("testNMTOKENS(): Incorrect value for inout param", x, y.value);
+            assertArrayEquals("testNMTOKENS(): Incorrect value for out param", yOrig, z.value);
+            assertArrayEquals("testNMTOKENS(): Incorrect return value", x, ret);
         }
     }
 
@@ -1082,9 +1083,9 @@ public abstract class AbstractTypeTestClient
         } else {
             ret = rpcClient.testName(x, y, z);
         }
-        assertTrue("testName(): Incorrect value for inout param", x.equals(y.value));
-        assertTrue("testName(): Incorrect value for out param", yOrig.equals(z.value));
-        assertTrue("testName(): Incorrect return value", x.equals(ret));
+        assertEquals("testName(): Incorrect value for inout param", x, y.value);
+        assertEquals("testName(): Incorrect value for out param", yOrig, z.value);
+        assertEquals("testName(): Incorrect return value", x, ret);
     }
 
     @Test
@@ -1106,9 +1107,9 @@ public abstract class AbstractTypeTestClient
         } else {
             ret = rpcClient.testNCName(x, y, z);
         }
-        assertTrue("testNCName(): Incorrect value for inout param", x.equals(y.value));
-        assertTrue("testNCName(): Incorrect value for out param", yOrig.equals(z.value));
-        assertTrue("testNCName(): Incorrect return value", x.equals(ret));
+        assertEquals("testNCName(): Incorrect value for inout param", x, y.value);
+        assertEquals("testNCName(): Incorrect value for out param", yOrig, z.value);
+        assertEquals("testNCName(): Incorrect return value", x, ret);
     }
 
     @Test
@@ -1321,10 +1322,9 @@ public abstract class AbstractTypeTestClient
             ret = rpcClient.testHexBinary(x, y, z);
         }
         if (!perfTestOnly) {
-            assertTrue("testHexBinary(): Incorrect value for inout param", Arrays.equals(x, y.value));
-            assertTrue("testHexBinary(): Incorrect value for out param", Arrays.equals(yOriginal.value,
-                                                                                       z.value));
-            assertTrue("testHexBinary(): Incorrect return value", Arrays.equals(x, ret));
+            assertArrayEquals("testHexBinary(): Incorrect value for inout param", x, y.value);
+            assertArrayEquals("testHexBinary(): Incorrect value for out param", yOriginal.value, z.value);
+            assertArrayEquals("testHexBinary(): Incorrect return value", x, ret);
         }
     }
 
@@ -1346,10 +1346,9 @@ public abstract class AbstractTypeTestClient
             ret = rpcClient.testBase64Binary(x, y, z);
         }
         if (!perfTestOnly) {
-            assertTrue("testBase64Binary(): Incorrect value for inout param", Arrays.equals(x, y.value));
-            assertTrue("testBase64Binary(): Incorrect value for out param", Arrays.equals(yOriginal.value,
-                                                                                          z.value));
-            assertTrue("testBase64Binary(): Incorrect return value", Arrays.equals(x, ret));
+            assertArrayEquals("testBase64Binary(): Incorrect value for inout param", x, y.value);
+            assertArrayEquals("testBase64Binary(): Incorrect value for out param", yOriginal.value, z.value);
+            assertArrayEquals("testBase64Binary(): Incorrect return value", x, ret);
         }
 
         // Test uninitialized holder value
@@ -1988,9 +1987,9 @@ public abstract class AbstractTypeTestClient
             List<String> ret = testDocLiteral ? docClient.testSimpleListRestriction2(x, y, z) : xmlClient
                 .testSimpleListRestriction2(x, y, z);
             if (!perfTestOnly) {
-                assertTrue("testStringList(): Incorrect value for inout param", x.equals(y.value));
-                assertTrue("testStringList(): Incorrect value for out param", yOrig.equals(z.value));
-                assertTrue("testStringList(): Incorrect return value", x.equals(ret));
+                assertEquals("testStringList(): Incorrect value for inout param", x, y.value);
+                assertEquals("testStringList(): Incorrect value for out param", yOrig, z.value);
+                assertEquals("testStringList(): Incorrect return value", x, ret);
             }
             x = new ArrayList<>();
             y = new Holder<>(yOrig);
@@ -2038,9 +2037,9 @@ public abstract class AbstractTypeTestClient
             List<String> ret = testDocLiteral ? docClient.testStringList(x, y, z) : xmlClient
                 .testStringList(x, y, z);
             if (!perfTestOnly) {
-                assertTrue("testStringList(): Incorrect value for inout param", x.equals(y.value));
-                assertTrue("testStringList(): Incorrect value for out param", yOrig.equals(z.value));
-                assertTrue("testStringList(): Incorrect return value", x.equals(ret));
+                assertEquals("testStringList(): Incorrect value for inout param", x, y.value);
+                assertEquals("testStringList(): Incorrect value for out param", yOrig, z.value);
+                assertEquals("testStringList(): Incorrect return value", x, ret);
             }
             if (testDocLiteral) {
                 try {
@@ -2084,9 +2083,9 @@ public abstract class AbstractTypeTestClient
             List<Integer> ret = testDocLiteral ? docClient.testNumberList(x, y, z) : xmlClient
                 .testNumberList(x, y, z);
             if (!perfTestOnly) {
-                assertTrue("testNumberList(): Incorrect value for inout param", x.equals(y.value));
-                assertTrue("testNumberList(): Incorrect value for out param", yOrig.equals(z.value));
-                assertTrue("testNumberList(): Incorrect return value", x.equals(ret));
+                assertEquals("testNumberList(): Incorrect value for inout param", x, y.value);
+                assertEquals("testNumberList(): Incorrect value for out param", yOrig, z.value);
+                assertEquals("testNumberList(): Incorrect return value", x, ret);
             }
         } else {
             Integer[] x = {1, 2, 3};
@@ -2128,9 +2127,9 @@ public abstract class AbstractTypeTestClient
                                                                                                           y,
                                                                                                           z);
             if (!perfTestOnly) {
-                assertTrue("testQNameList(): Incorrect value for inout param", x.equals(y.value));
-                assertTrue("testQNameList(): Incorrect value for out param", yOrig.equals(z.value));
-                assertTrue("testQNameList(): Incorrect return value", x.equals(ret));
+                assertEquals("testQNameList(): Incorrect value for inout param", x, y.value);
+                assertEquals("testQNameList(): Incorrect value for out param", yOrig, z.value);
+                assertEquals("testQNameList(): Incorrect return value", x, ret);
             }
         } else {
             QName[] x = {new QName("http://schemas.iona.com/type_test", "testqname1"),
@@ -2172,9 +2171,9 @@ public abstract class AbstractTypeTestClient
             List<String> ret = testDocLiteral ? docClient.testSimpleUnionList(x, y, z) : xmlClient
                 .testSimpleUnionList(x, y, z);
             if (!perfTestOnly) {
-                assertTrue("testSimpleUnionList(): Incorrect value for inout param", x.equals(y.value));
-                assertTrue("testSimpleUnionList(): Incorrect value for out param", yOrig.equals(z.value));
-                assertTrue("testSimpleUnionList(): Incorrect return value", x.equals(ret));
+                assertEquals("testSimpleUnionList(): Incorrect value for inout param", x, y.value);
+                assertEquals("testSimpleUnionList(): Incorrect value for out param", yOrig, z.value);
+                assertEquals("testSimpleUnionList(): Incorrect return value", x, ret);
             }
         } else {
             String[] x = {"5", "-7"};
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ManagedEndpointsTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ManagedEndpointsTest.java
index f46e8e9..8107a79 100755
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ManagedEndpointsTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ManagedEndpointsTest.java
@@ -159,7 +159,7 @@ public class ManagedEndpointsTest extends AbstractClientServerTestBase {
         String sseqId = getSingleSourceSequenceId(mbs, clientEndpointName);
 
         o = mbs.invoke(clientEndpointName, "getCurrentSourceSequenceId", null, null);
-        assertTrue("Expected sequence identifier", o instanceof String && sseqId.equals(o));
+        assertEquals("Expected sequence identifier", sseqId, o);
 
         o = mbs.invoke(serverEndpointName, "getDestinationSequenceIds", null, null);
         verifyArray("Expected sequence identifier", o, new String[]{sseqId}, false);
@@ -220,7 +220,7 @@ public class ManagedEndpointsTest extends AbstractClientServerTestBase {
         String sseqId = getSingleSourceSequenceId(mbs, clientEndpointName);
 
         o = mbs.invoke(clientEndpointName, "getCurrentSourceSequenceId", null, null);
-        assertTrue("Expected sequence identifier", o instanceof String && sseqId.equals(o));
+        assertEquals("Expected sequence identifier", sseqId, o);
 
         o = mbs.invoke(serverEndpointName, "getDestinationSequenceIds", null, null);
         verifyArray("Expected sequence identifier", o, new String[]{sseqId}, false);
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/policy/WSRMOptionalPolicyTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/policy/WSRMOptionalPolicyTest.java
index 9664ded..f8a98ae 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/policy/WSRMOptionalPolicyTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/policy/WSRMOptionalPolicyTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 public class WSRMOptionalPolicyTest extends AbstractBusClientServerTestBase {
@@ -46,8 +47,8 @@ public class WSRMOptionalPolicyTest extends AbstractBusClientServerTestBase {
     @Test
     public void testBasicConnection() throws Exception {
         Greeting service = createService();
-        assertTrue("Hello, cxf!".equals(service.hello("cxf")));
-        assertTrue("Goodbye, cxf!".equals(service.goodbye("cxf")));
+        assertEquals("Hello, cxf!", service.hello("cxf"));
+        assertEquals("Goodbye, cxf!", service.goodbye("cxf"));
     }
 
     private static Greeting createService() {
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
index db826db..095e8e3 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
@@ -150,7 +150,7 @@ public class ActionTest extends AbstractBusClientServerTestBase {
             port.doubleIt(25);
             fail("Failure expected on not sending a UsernameToken element");
         } catch (javax.xml.ws.soap.SOAPFaultException ex) {
-            assertTrue(ex.getMessage().equals(WSSecurityException.UNIFIED_SECURITY_ERR));
+            assertEquals(ex.getMessage(), WSSecurityException.UNIFIED_SECURITY_ERR);
         }
 
         // Here the Server is adding the WSS4JInInterceptor in code
@@ -192,7 +192,7 @@ public class ActionTest extends AbstractBusClientServerTestBase {
             port.doubleIt(25);
             fail("Failure expected on a replayed UsernameToken");
         } catch (javax.xml.ws.soap.SOAPFaultException ex) {
-            assertTrue(ex.getMessage().equals(WSSecurityException.UNIFIED_SECURITY_ERR));
+            assertEquals(ex.getMessage(), WSSecurityException.UNIFIED_SECURITY_ERR);
         }
 
         ((java.io.Closeable)port).close();
@@ -253,7 +253,7 @@ public class ActionTest extends AbstractBusClientServerTestBase {
             port.doubleIt(25);
             fail("Failure expected on a replayed Timestamp");
         } catch (javax.xml.ws.soap.SOAPFaultException ex) {
-            assertTrue(ex.getMessage().equals(WSSecurityException.UNIFIED_SECURITY_ERR));
+            assertEquals(ex.getMessage(), WSSecurityException.UNIFIED_SECURITY_ERR);
         }
 
         ((java.io.Closeable)port).close();
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java
index afcc204..a29bff7 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java
@@ -347,7 +347,7 @@ public class WSSecurityClientTest extends AbstractBusClientServerTestBase {
             dispatcher.invoke(new StreamSource(is));
             fail("exception should have been generated");
         } catch (SOAPFaultException ex) {
-            assertTrue(ex.getMessage().equals(WSSecurityException.UNIFIED_SECURITY_ERR));
+            assertEquals(ex.getMessage(), WSSecurityException.UNIFIED_SECURITY_ERR);
         }
 
         //
@@ -359,7 +359,7 @@ public class WSSecurityClientTest extends AbstractBusClientServerTestBase {
             dispatcher.invoke(new StreamSource(is));
             fail("exception should have been generated");
         } catch (SOAPFaultException ex) {
-            assertTrue(ex.getMessage().equals(WSSecurityException.UNIFIED_SECURITY_ERR));
+            assertEquals(ex.getMessage(), WSSecurityException.UNIFIED_SECURITY_ERR);
         }
         //
         // Sending and empty security header should result in a Fault
@@ -370,7 +370,7 @@ public class WSSecurityClientTest extends AbstractBusClientServerTestBase {
             dispatcher.invoke(new StreamSource(is));
             fail("exception should have been generated");
         } catch (SOAPFaultException ex) {
-            assertTrue(ex.getMessage().equals(WSSecurityException.UNIFIED_SECURITY_ERR));
+            assertEquals(ex.getMessage(), WSSecurityException.UNIFIED_SECURITY_ERR);
         }
 
     }
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 9c67403..a378c68 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
@@ -18,7 +18,6 @@
  */
 package org.apache.cxf.systest.ws.tokens;
 
-import java.util.Arrays;
 import java.util.List;
 
 import javax.annotation.Resource;
@@ -65,7 +64,7 @@ public class DoubleItBSTImpl implements DoubleItPortType {
             (BinarySecurity)securityResult.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
         Assert.assertNotNull(binarySecurityToken);
 
-        Assert.assertTrue(Arrays.equals(binarySecurityToken.getToken(), "This is a token".getBytes()));
+        Assert.assertArrayEquals(binarySecurityToken.getToken(), "This is a token".getBytes());
 
         return numberToDouble * 2;
     }
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java
index 26baddc..99974fc 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java
@@ -549,7 +549,7 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
                 utPort.doubleIt(25);
                 fail("Failure expected on a replayed UsernameToken");
             } catch (javax.xml.ws.soap.SOAPFaultException ex) {
-                assertTrue(ex.getMessage().equals(WSSecurityException.UNIFIED_SECURITY_ERR));
+                assertEquals(ex.getMessage(), WSSecurityException.UNIFIED_SECURITY_ERR);
             }
         }
 
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
index ec9d4de..39f9880 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
@@ -312,7 +312,7 @@ public class CommandLineParserTest {
 
     @Test
     public void testGetDetailedUsage() {
-        assertTrue("Namespace".equals(parser.getDetailedUsage("namespace")));
+        assertEquals("Namespace", parser.getDetailedUsage("namespace"));
     }
 
 
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 b7ea9f8..bf9cea9 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
@@ -641,7 +641,7 @@ public class CodeGenTest extends AbstractCodeGenTest {
 
         Class<?> clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_soap_http.types.SayHi");
         Method method = clz.getMethod("dummy", new Class[] {});
-        assertTrue("method declared on SayHi", method.getDeclaringClass().equals(clz));
+        assertEquals("method declared on SayHi", method.getDeclaringClass(), clz);
     }
 
     @Test