Fix assertTrue SONAR issues in apex-pdp/examples and apex-pdp/model

Replace assertTrue with assertEquals and assertFalse with
assertNotEquals in apex-pdp/examples and apex-pdp/model

Issue-ID: POLICY-2690
Change-Id: Ie863dd95ccead62268689a4a8388f9b6e8821649
Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech>

19 files changed, 234 insertions, 228 deletions

diff --git a/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmModelTest.java b/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmModelTest.java
index a44a4cc1a..fe9914061 100644
--- a/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmModelTest.java
+++ b/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmModelTest.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ *  Modifications Copyright (C) 2019-2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +21,7 @@
 
 package org.onap.policy.apex.examples.aadm;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -44,7 +45,7 @@ public class AadmModelTest {
     @Test
     public void testModelValid() throws Exception {
         final AxValidationResult result = testApexModel.testApexModelValid();
-        assertTrue(result.toString().equals(VALID_MODEL_STRING));
+        assertEquals(VALID_MODEL_STRING, result.toString());
     }
 
     @Test
diff --git a/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmUseCaseTest.java b/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmUseCaseTest.java
index 8e05aff51..430074ea8 100644
--- a/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmUseCaseTest.java
+++ b/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmUseCaseTest.java
@@ -22,6 +22,7 @@
 package org.onap.policy.apex.examples.aadm;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -157,7 +158,7 @@ public class AadmUseCaseTest {
         assertTrue(result.getName().startsWith("XSTREAM_AADM_ACT_EVENT"));
         assertEquals("ExecutionIDs are different", event.getExecutionId(), result.getExecutionId());
         // no DOS_IN_eNodeB set so return probe action
-        assertTrue(result.get("ACTTASK").equals("probe"));
+        assertEquals("probe", result.get("ACTTASK"));
         assertTrue((boolean) result.get("TCP_ON"));
         assertTrue((boolean) result.get("PROBE_ON"));
         logger.info("Receiving action event with {} action", result.get("ACTTASK"));
@@ -195,7 +196,7 @@ public class AadmUseCaseTest {
         assertTrue(result.getName().startsWith("XSTREAM_AADM_ACT_EVENT"));
         assertEquals("ExecutionIDs are different", event.getExecutionId(), result.getExecutionId());
         // DOS_IN_eNodeB set to be more than throughput so return act action
-        assertTrue(result.get("ACTTASK").equals("act"));
+        assertEquals("act", result.get("ACTTASK"));
         // only one imsi was sent to process, so stop probe and tcp
         assertTrue(!(boolean) result.get("TCP_ON"));
         assertTrue(!(boolean) result.get("PROBE_ON"));
@@ -232,7 +233,7 @@ public class AadmUseCaseTest {
         result = listener.getResult();
         assertTrue(result.getName().startsWith("XSTREAM_AADM_ACT_EVENT"));
         assertEquals("ExecutionIDs are different", event.getExecutionId(), result.getExecutionId());
-        assertTrue(result.get("ACTTASK").equals("probe"));
+        assertEquals("probe", result.get("ACTTASK"));
         assertTrue((boolean) result.get("TCP_ON"));
         assertTrue((boolean) result.get("PROBE_ON"));
         assertEquals(99, ((ENodeBStatus) eNodeBStatusAlbum.get("123")).getDosCount());
@@ -267,7 +268,7 @@ public class AadmUseCaseTest {
         result = listener.getResult();
         assertTrue(result.getName().startsWith("XSTREAM_AADM_ACT_EVENT"));
         assertEquals("ExecutionIDs are different", event.getExecutionId(), result.getExecutionId());
-        assertTrue(result.get("ACTTASK").equals("act"));
+        assertEquals("act", result.get("ACTTASK"));
         assertTrue(!(boolean) result.get("TCP_ON"));
         assertTrue(!(boolean) result.get("PROBE_ON"));
         assertEquals(98, ((ENodeBStatus) eNodeBStatusAlbum.get("123")).getDosCount());
@@ -304,7 +305,7 @@ public class AadmUseCaseTest {
         result = listener.getResult();
         assertTrue(result.getName().startsWith("XSTREAM_AADM_ACT_EVENT"));
         assertEquals("ExecutionIDs are different", event.getExecutionId(), result.getExecutionId());
-        assertTrue(result.get("ACTTASK").equals("act"));
+        assertEquals("act", result.get("ACTTASK"));
         assertTrue(!(boolean) result.get("TCP_ON"));
         assertTrue(!(boolean) result.get("PROBE_ON"));
         assertEquals(100, ((ENodeBStatus) eNodeBStatusAlbum.get("123")).getDosCount());
@@ -337,7 +338,7 @@ public class AadmUseCaseTest {
         result = listener.getResult();
         assertTrue(result.getName().startsWith("XSTREAM_AADM_ACT_EVENT"));
         assertEquals("ExecutionIDs are different", event.getExecutionId(), result.getExecutionId());
-        assertTrue(result.get("ACTTASK").equals("probe"));
+        assertEquals("probe", result.get("ACTTASK"));
         assertTrue((boolean) result.get("TCP_ON"));
         assertTrue((boolean) result.get("PROBE_ON"));
         assertEquals(99, ((ENodeBStatus) eNodeBStatusAlbum.get("123")).getDosCount());
@@ -375,7 +376,7 @@ public class AadmUseCaseTest {
         result = listener.getResult();
         assertTrue(result.getName().startsWith("XSTREAM_AADM_ACT_EVENT"));
         assertEquals("ExecutionIDs are different", event.getExecutionId(), result.getExecutionId());
-        assertTrue(result.get("ACTTASK").equals("probe"));
+        assertEquals("probe", result.get("ACTTASK"));
         assertTrue((boolean) result.get("TCP_ON"));
         assertTrue((boolean) result.get("PROBE_ON"));
         assertEquals(102, ((ENodeBStatus) eNodeBStatusAlbum.get("123")).getDosCount());
@@ -408,7 +409,7 @@ public class AadmUseCaseTest {
         result = listener.getResult();
         assertTrue(result.getName().startsWith("XSTREAM_AADM_ACT_EVENT"));
         assertEquals("ExecutionIDs are different", event.getExecutionId(), result.getExecutionId());
-        assertTrue(result.get("ACTTASK").equals("probe"));
+        assertEquals("probe", result.get("ACTTASK"));
         assertTrue((boolean) result.get("TCP_ON"));
         assertTrue((boolean) result.get("PROBE_ON"));
         assertEquals(102, ((ENodeBStatus) eNodeBStatusAlbum.get("123")).getDosCount());
@@ -417,8 +418,8 @@ public class AadmUseCaseTest {
         apexEngine.handleEvent(result);
         result = listener.getResult();
         assertTrue(result.getName().startsWith("SAPCBlacklistSubscriberEvent"));
-        assertTrue(result.get("PROFILE").equals("ServiceA"));
-        assertTrue(result.get("BLACKLIST_ON").equals(true));
+        assertEquals("ServiceA", result.get("PROFILE"));
+        assertTrue((boolean) result.get("BLACKLIST_ON"));
 
         event = apexEngine.createEvent(new AxArtifactKey("PeriodicEvent", "0.0.1"));
         event.put("PERIODIC_EVENT_COUNT", (long) 100);
@@ -431,8 +432,8 @@ public class AadmUseCaseTest {
         assertTrue(result.getName().startsWith("SAPCBlacklistSubscriberEvent"));
         assertEquals("ExecutionIDs are different", event.getExecutionId(), result.getExecutionId());
         assertEquals(0L, result.get("IMSI"));
-        assertTrue(result.get("PROFILE").equals("ServiceA"));
-        assertTrue(result.get("BLACKLIST_ON").equals(false));
+        assertEquals("ServiceA", result.get("PROFILE"));
+        assertFalse((boolean) result.get("BLACKLIST_ON"));
 
         apexEngine.stop();
     }
diff --git a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionConceptTest.java b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionConceptTest.java
index f1c8d7dca..d24733224 100644
--- a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionConceptTest.java
+++ b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionConceptTest.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (c) 2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +24,7 @@ package org.onap.policy.apex.examples.adaptive;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import java.util.LinkedList;
@@ -65,40 +67,40 @@ public class AnomalyDetectionConceptTest {
     public void testEquals() {
         AnomalyDetection anomalyDetection = new AnomalyDetection();
         AnomalyDetection comparisonDetection = new AnomalyDetection();
-        assertTrue(anomalyDetection.equals(comparisonDetection));
+        assertEquals(anomalyDetection, comparisonDetection);
         //Compare object to itself
-        assertTrue(anomalyDetection.equals(anomalyDetection));
+        assertEquals(anomalyDetection, anomalyDetection);
         //Compare object to null
-        assertFalse(anomalyDetection.equals(null));
+        assertNotNull(anomalyDetection);
         //compare object to string
-        assertFalse(anomalyDetection.equals("test"));
+        assertNotEquals(anomalyDetection, "test");
         // Anomaly Scores comparison
         anomalyDetection.setAnomalyScores(null);
-        assertFalse(anomalyDetection.equals(comparisonDetection));
+        assertNotEquals(anomalyDetection, comparisonDetection);
         comparisonDetection.setAnomalyScores(null);
-        assertTrue(anomalyDetection.equals(comparisonDetection));
+        assertEquals(anomalyDetection, comparisonDetection);
         List<Double> anomalyScores = new LinkedList<>();
         anomalyScores.add((double) 20);
         anomalyDetection.setAnomalyScores(anomalyScores);
-        assertFalse(anomalyDetection.equals(comparisonDetection));
+        assertNotEquals(anomalyDetection, comparisonDetection);
         comparisonDetection.setAnomalyScores(anomalyScores);
         assertTrue(anomalyDetection.checkSetAnomalyScores());
         //First Round Checks
         anomalyDetection.setFirstRound(false);
-        assertFalse(anomalyDetection.equals(comparisonDetection));
+        assertNotEquals(anomalyDetection, comparisonDetection);
         anomalyDetection.setFirstRound(true);
         //Frequency Checks
         anomalyDetection.setFrequency(55);
-        assertFalse(anomalyDetection.equals(comparisonDetection));
+        assertNotEquals(anomalyDetection, comparisonDetection);
         anomalyDetection.setFrequency(0);
         //FrequencyForecasted Checks
         List<Double> comparisonFrequency = new LinkedList<>();
         comparisonDetection.setFrequencyForecasted(comparisonFrequency);
-        assertFalse(anomalyDetection.equals(comparisonDetection));
+        assertNotEquals(anomalyDetection, comparisonDetection);
         anomalyDetection.setFrequencyForecasted(anomalyScores);
-        assertFalse(anomalyDetection.equals(comparisonDetection));
+        assertNotEquals(anomalyDetection, comparisonDetection);
         anomalyDetection.setFrequencyForecasted(comparisonFrequency);
-        assertTrue(anomalyDetection.equals(comparisonDetection));
+        assertEquals(anomalyDetection, comparisonDetection);
     }
 
     @Test
diff --git a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionModelTest.java b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionModelTest.java
index 5a36d4070..85cecbe8b 100644
--- a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionModelTest.java
+++ b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionModelTest.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +21,7 @@
 
 package org.onap.policy.apex.examples.adaptive;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -44,7 +45,7 @@ public class AnomalyDetectionModelTest {
     @Test
     public void testModelValid() throws Exception {
         final AxValidationResult result = testApexModel.testApexModelValid();
-        assertTrue(result.toString().equals(VALID_MODEL_STRING));
+        assertEquals(VALID_MODEL_STRING, result.toString());
     }
 
     @Test
diff --git a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AutoLearnModelTest.java b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AutoLearnModelTest.java
index 1823f9871..3479ccc9e 100644
--- a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AutoLearnModelTest.java
+++ b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AutoLearnModelTest.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +21,7 @@
 
 package org.onap.policy.apex.examples.adaptive;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -44,7 +45,7 @@ public class AutoLearnModelTest {
     @Test
     public void testModelValid() throws Exception {
         final AxValidationResult result = testApexModel.testApexModelValid();
-        assertTrue(result.toString().equals(VALID_MODEL_STRING));
+        assertEquals(VALID_MODEL_STRING, result.toString());
     }
 
     @Test
diff --git a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpUseCaseTest.java b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpUseCaseTest.java
index c495bd32b..8afe7d7cd 100644
--- a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpUseCaseTest.java
+++ b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpUseCaseTest.java
@@ -308,12 +308,12 @@ public class MfpUseCaseTest {
                 gb.create().fromJson(ResourceUtils.getResourceAsString(inputFile), JsonObject.class);
         assertNotNull(jsonObject);
         assertTrue(jsonObject.has("name"));
-        assertTrue(ret.getName().equals(jsonObject.get("name").getAsString()));
-        assertTrue(ret.getAxEvent().getKey().getName().equals(jsonObject.get("name").getAsString()));
+        assertEquals(ret.getName(), jsonObject.get("name").getAsString());
+        assertEquals(ret.getAxEvent().getKey().getName(), jsonObject.get("name").getAsString());
         assertTrue(jsonObject.has("nameSpace"));
-        assertTrue(ret.getAxEvent().getNameSpace().equals(jsonObject.get("nameSpace").getAsString()));
+        assertEquals(ret.getAxEvent().getNameSpace(), jsonObject.get("nameSpace").getAsString());
         assertTrue(jsonObject.has("version"));
-        assertTrue(ret.getAxEvent().getKey().getVersion().equals(jsonObject.get("version").getAsString()));
+        assertEquals(ret.getAxEvent().getKey().getVersion(), jsonObject.get("version").getAsString());
         final List<String> reserved = Arrays.asList("name", "nameSpace", "version", "source", "target");
         for (final Map.Entry<String, ?> e : jsonObject.entrySet()) {
             if (reserved.contains(e.getKey())) {
@@ -375,12 +375,12 @@ public class MfpUseCaseTest {
                 gb.create().fromJson(ResourceUtils.getResourceAsString(inputFile), JsonObject.class);
         assertNotNull(jsonObject);
         assertTrue(jsonObject.has("name"));
-        assertTrue(ret.getName().equals(jsonObject.get("name").getAsString()));
-        assertTrue(ret.getAxEvent().getKey().getName().equals(jsonObject.get("name").getAsString()));
+        assertEquals(ret.getName(), jsonObject.get("name").getAsString());
+        assertEquals(ret.getAxEvent().getKey().getName(), jsonObject.get("name").getAsString());
         assertTrue(jsonObject.has("nameSpace"));
-        assertTrue(ret.getAxEvent().getNameSpace().equals(jsonObject.get("nameSpace").getAsString()));
+        assertEquals(ret.getAxEvent().getNameSpace(), jsonObject.get("nameSpace").getAsString());
         assertTrue(jsonObject.has("version"));
-        assertTrue(ret.getAxEvent().getKey().getVersion().equals(jsonObject.get("version").getAsString()));
+        assertEquals(ret.getAxEvent().getKey().getVersion(), jsonObject.get("version").getAsString());
         final List<String> reserved = Arrays.asList("name", "nameSpace", "version", "source", "target");
         for (final Map.Entry<String, ?> e : jsonObject.entrySet()) {
             if (reserved.contains(e.getKey())) {
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfoTest.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfoTest.java
index 0278f1672..991d020a4 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfoTest.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfoTest.java
@@ -1,7 +1,7 @@
 /*
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2019 Nordix Foundation.
+ *  Modifications Copyright (C) 2019 Nordix-2020 Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.model.basicmodel.concepts;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -58,16 +57,16 @@ public class AxKeyInfoTest {
         assertTrue(clonedReferenceKey.toString()
                         .startsWith("AxKeyInfo:(artifactId=AxArtifactKey:(name=key,version=0.0.1),uuid="));
 
-        assertFalse(testKeyInfo.hashCode() == 0);
+        assertNotEquals(0, testKeyInfo.hashCode());
 
-        assertTrue(testKeyInfo.equals(testKeyInfo));
-        assertTrue(testKeyInfo.equals(clonedReferenceKey));
-        assertFalse(testKeyInfo.equals(null));
-        assertFalse(testKeyInfo.equals((Object) new AxArtifactKey()));
-        assertFalse(testKeyInfo.equals(new AxKeyInfo(new AxArtifactKey())));
-        assertFalse(testKeyInfo.equals(new AxKeyInfo(key, UUID.randomUUID(), "Some Description")));
-        assertFalse(testKeyInfo.equals(new AxKeyInfo(key, uuid, "Some Description")));
-        assertTrue(testKeyInfo.equals(new AxKeyInfo(key, uuid, "Key Description")));
+        assertEquals(testKeyInfo, testKeyInfo);
+        assertEquals(testKeyInfo, clonedReferenceKey);
+        assertNotNull(testKeyInfo);
+        assertNotEquals(testKeyInfo, (Object) new AxArtifactKey());
+        assertNotEquals(testKeyInfo, new AxKeyInfo(new AxArtifactKey()));
+        assertNotEquals(testKeyInfo, new AxKeyInfo(key, UUID.randomUUID(), "Some Description"));
+        assertNotEquals(testKeyInfo, new AxKeyInfo(key, uuid, "Some Description"));
+        assertEquals(testKeyInfo, new AxKeyInfo(key, uuid, "Key Description"));
 
         assertEquals(0, testKeyInfo.compareTo(testKeyInfo));
         assertEquals(0, testKeyInfo.compareTo(clonedReferenceKey));
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyTest.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyTest.java
index 1467b77d1..ff12fc5e8 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyTest.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyTest.java
@@ -1,7 +1,7 @@
 /*
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2019 Nordix Foundation.
+ *  Modifications Copyright (C) 2019-2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ package org.onap.policy.apex.model.basicmodel.concepts;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -117,9 +118,9 @@ public class AxKeyTest {
         assertEquals(0, someKey0.compareTo(someKey0));
         assertEquals(353602977, someKey0.compareTo(new AxReferenceKey()));
 
-        assertFalse(someKey0.equals(null));
-        assertTrue(someKey0.equals(someKey0));
-        assertFalse(((AxKey) someKey0).equals(new AxReferenceKey()));
+        assertNotNull(someKey0);
+        assertEquals(someKey0, someKey0);
+        assertNotEquals(((AxKey) someKey0), new AxReferenceKey());
 
         AxArtifactKey nullKey0 = AxArtifactKey.getNullKey();
         assertTrue(nullKey0.isNullKey());
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUseTest.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUseTest.java
index 55c444d97..52361438e 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUseTest.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUseTest.java
@@ -1,20 +1,20 @@
 /*
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2019 Nordix Foundation.
+ *  Modifications Copyright (C) 2019-2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  * SPDX-License-Identifier: Apache-2.0
  * ============LICENSE_END=========================================================
  */
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.model.basicmodel.concepts;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -37,41 +36,41 @@ public class AxKeyUseTest {
         assertNotNull(new AxKeyUse());
         assertNotNull(new AxKeyUse(new AxArtifactKey()));
         assertNotNull(new AxKeyUse(new AxReferenceKey()));
-        
+
         AxArtifactKey key = new AxArtifactKey("Key", "0.0.1");
         AxKeyUse keyUse = new AxKeyUse();
         keyUse.setKey(key);
         assertEquals(key, keyUse.getKey());
         assertEquals("Key:0.0.1", keyUse.getId());
         assertEquals(key, keyUse.getKeys().get(0));
-        
+
         assertEquals(Compatibility.IDENTICAL, keyUse.getCompatibility(key));
         assertTrue(keyUse.isCompatible(key));
-        
+
         keyUse.clean();
         assertNotNull(keyUse);
-        
+
         AxValidationResult result = new AxValidationResult();
         result = keyUse.validate(result);
         assertNotNull(result);
-        
+
         assertNotEquals(0, keyUse.hashCode());
-        
+
         AxKeyUse clonedKeyUse = new AxKeyUse(keyUse);
         assertEquals("AxKeyUse:(usedKey=AxArtifactKey:(name=Key,version=0.0.1))", clonedKeyUse.toString());
-        
-        assertFalse(keyUse.hashCode() == 0);
-        
-        assertTrue(keyUse.equals(keyUse));
-        assertTrue(keyUse.equals(clonedKeyUse));
-        assertFalse(keyUse.equals((Object) "Hello"));
-        assertTrue(keyUse.equals(new AxKeyUse(key)));
-        
+
+        assertNotEquals(0, keyUse.hashCode());
+
+        assertEquals(keyUse, keyUse);
+        assertEquals(keyUse, clonedKeyUse);
+        assertNotEquals(keyUse, (Object) "Hello");
+        assertEquals(keyUse, new AxKeyUse(key));
+
         assertEquals(0, keyUse.compareTo(keyUse));
         assertEquals(0, keyUse.compareTo(clonedKeyUse));
         assertNotEquals(0, keyUse.compareTo(new AxArtifactKey()));
         assertEquals(0, keyUse.compareTo(new AxKeyUse(key)));
-        
+
         AxKeyUse keyUseNull = new AxKeyUse(AxArtifactKey.getNullKey());
         AxValidationResult resultNull = new AxValidationResult();
         assertEquals(false, keyUseNull.validate(resultNull).isValid());
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKeyTest.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKeyTest.java
index 27973b5b9..cca0b61ae 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKeyTest.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKeyTest.java
@@ -1,20 +1,20 @@
 /*
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2019 Nordix Foundation.
+ *  Modifications Copyright (C) 2019-2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  * SPDX-License-Identifier: Apache-2.0
  * ============LICENSE_END=========================================================
  */
@@ -85,16 +85,16 @@ public class AxReferenceKeyTest {
         assertEquals("AxReferenceKey:(parentKeyName=NPKN,parentKeyVersion=0.0.1,parentLocalName=NPKLN,localName=NLN)",
             clonedReferenceKey.toString());
 
-        assertFalse(testReferenceKey.hashCode() == 0);
+        assertNotEquals(0, testReferenceKey.hashCode());
 
-        assertTrue(testReferenceKey.equals(testReferenceKey));
-        assertTrue(testReferenceKey.equals(clonedReferenceKey));
-        assertFalse(testReferenceKey.equals((Object) "Hello"));
-        assertFalse(testReferenceKey.equals(new AxReferenceKey("PKN", "0.0.2", "PLN", "LN")));
-        assertFalse(testReferenceKey.equals(new AxReferenceKey("NPKN", "0.0.2", "PLN", "LN")));
-        assertFalse(testReferenceKey.equals(new AxReferenceKey("NPKN", "0.0.1", "PLN", "LN")));
-        assertFalse(testReferenceKey.equals(new AxReferenceKey("NPKN", "0.0.1", "NPLN", "LN")));
-        assertTrue(testReferenceKey.equals(new AxReferenceKey("NPKN", "0.0.1", "NPKLN", "NLN")));
+        assertEquals(testReferenceKey, testReferenceKey);
+        assertEquals(testReferenceKey, clonedReferenceKey);
+        assertNotEquals(testReferenceKey, (Object) "Hello");
+        assertNotEquals(testReferenceKey, new AxReferenceKey("PKN", "0.0.2", "PLN", "LN"));
+        assertNotEquals(testReferenceKey, new AxReferenceKey("NPKN", "0.0.2", "PLN", "LN"));
+        assertNotEquals(testReferenceKey, new AxReferenceKey("NPKN", "0.0.1", "PLN", "LN"));
+        assertNotEquals(testReferenceKey, new AxReferenceKey("NPKN", "0.0.1", "NPLN", "LN"));
+        assertEquals(testReferenceKey, new AxReferenceKey("NPKN", "0.0.1", "NPKLN", "NLN"));
 
         assertEquals(0, testReferenceKey.compareTo(testReferenceKey));
         assertEquals(0, testReferenceKey.compareTo(clonedReferenceKey));
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/dao/EntityTest.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/dao/EntityTest.java
index 2c68c3987..370a4114f 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/dao/EntityTest.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/dao/EntityTest.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -151,13 +152,13 @@ public class EntityTest {
         apexDao.create(keyInfo0);
 
         final AxKeyInfo keyInfoBack0 = apexDao.get(AxKeyInfo.class, aKey0);
-        assertTrue(keyInfo0.equals(keyInfoBack0));
+        assertEquals(keyInfo0, keyInfoBack0);
 
         final AxKeyInfo keyInfoBackNull = apexDao.get(AxKeyInfo.class, AxArtifactKey.getNullKey());
         assertNull(keyInfoBackNull);
 
         final AxKeyInfo keyInfoBack1 = apexDao.getArtifact(AxKeyInfo.class, aKey0);
-        assertTrue(keyInfoBack0.equals(keyInfoBack1));
+        assertEquals(keyInfoBack0, keyInfoBack1);
 
         final AxKeyInfo keyInfoBack2 = apexDao.getArtifact(AxKeyInfo.class, new AxArtifactKey("A-KEY3", "0.0.1"));
         assertNull(keyInfoBack2);
@@ -171,12 +172,12 @@ public class EntityTest {
         Set<AxKeyInfo> keyInfoSetOut = new TreeSet<AxKeyInfo>(apexDao.getAll(AxKeyInfo.class));
 
         keyInfoSetIn.add(keyInfo0);
-        assertTrue(keyInfoSetIn.equals(keyInfoSetOut));
+        assertEquals(keyInfoSetIn, keyInfoSetOut);
 
         apexDao.delete(keyInfo1);
         keyInfoSetIn.remove(keyInfo1);
         keyInfoSetOut = new TreeSet<AxKeyInfo>(apexDao.getAll(AxKeyInfo.class));
-        assertTrue(keyInfoSetIn.equals(keyInfoSetOut));
+        assertEquals(keyInfoSetIn, keyInfoSetOut);
 
         apexDao.deleteCollection(keyInfoSetIn);
         keyInfoSetOut = new TreeSet<AxKeyInfo>(apexDao.getAll(AxKeyInfo.class));
@@ -187,7 +188,7 @@ public class EntityTest {
         keyInfoSetIn.add(keyInfo0);
         apexDao.createCollection(keyInfoSetIn);
         keyInfoSetOut = new TreeSet<AxKeyInfo>(apexDao.getAll(AxKeyInfo.class));
-        assertTrue(keyInfoSetIn.equals(keyInfoSetOut));
+        assertEquals(keyInfoSetIn, keyInfoSetOut);
 
         apexDao.delete(AxKeyInfo.class, aKey0);
         keyInfoSetOut = new TreeSet<AxKeyInfo>(apexDao.getAll(AxKeyInfo.class));
@@ -209,7 +210,7 @@ public class EntityTest {
         keyInfoSetIn.add(keyInfo0);
         apexDao.createCollection(keyInfoSetIn);
         keyInfoSetOut = new TreeSet<AxKeyInfo>(apexDao.getAll(AxKeyInfo.class));
-        assertTrue(keyInfoSetIn.equals(keyInfoSetOut));
+        assertEquals(keyInfoSetIn, keyInfoSetOut);
 
         apexDao.deleteAll(AxKeyInfo.class);
         assertEquals(0, apexDao.size(AxKeyInfo.class));
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelConceptsTester.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelConceptsTester.java
index c666dd667..8676362dd 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelConceptsTester.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelConceptsTester.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2019 Nordix Foundation.
+ *  Modifications Copyright (C) 2019-2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.model.basicmodel.handling;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -68,14 +67,14 @@ public class SupportApexBasicModelConceptsTester {
         final AxModel clonedModel = new AxModel(model);
         assertTrue(clonedModel.toString().startsWith("AxModel:(key=AxArtifactKey:(name=BasicModel"));
 
-        assertFalse(model.hashCode() == 0);
+        assertNotEquals(0, model.hashCode());
 
-        assertTrue(model.equals(model));
-        assertTrue(model.equals(clonedModel));
-        assertFalse(model.equals(null));
-        assertFalse(model.equals((Object) "Hello"));
+        assertEquals(model, model);
+        assertEquals(model, clonedModel);
+        assertNotNull(model);
+        assertNotEquals(model, (Object) "Hello");
         clonedModel.getKey().setVersion("0.0.2");
-        assertFalse(model.equals(clonedModel));
+        assertNotEquals(model, clonedModel);
         clonedModel.getKey().setVersion("0.0.1");
 
         assertEquals(0, model.compareTo(model));
@@ -94,12 +93,12 @@ public class SupportApexBasicModelConceptsTester {
         final AxKeyInformation keyI = model.getKeyInformation();
         final AxKeyInformation clonedKeyI = new AxKeyInformation(keyI);
 
-        assertFalse(keyI.equals(null));
-        assertFalse(keyI.equals((Object) new AxArtifactKey()));
-        assertTrue(keyI.equals(clonedKeyI));
+        assertNotNull(keyI);
+        assertNotEquals(keyI, (Object) new AxArtifactKey());
+        assertEquals(keyI, clonedKeyI);
 
         clonedKeyI.setKey(new AxArtifactKey());
-        assertFalse(keyI.equals(clonedKeyI));
+        assertNotEquals(keyI, clonedKeyI);
         clonedKeyI.setKey(keyI.getKey());
 
         assertEquals(0, keyI.compareTo(keyI));
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelTester.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelTester.java
index 375d15ae8..80e2e15b4 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelTester.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelTester.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +22,6 @@
 package org.onap.policy.apex.model.basicmodel.handling;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -47,7 +47,7 @@ public class SupportApexBasicModelTester {
     @Test
     public void testModelValid() throws Exception {
         final AxValidationResult result = testApexModel.testApexModelValid();
-        assertTrue(result.toString().equals(VALID_MODEL_STRING));
+        assertEquals(VALID_MODEL_STRING, result.toString());
     }
 
     @Test
@@ -62,19 +62,19 @@ public class SupportApexBasicModelTester {
     @Test
     public void testApexModelVaidateWarning() throws Exception {
         final AxValidationResult result = testApexModel.testApexModelVaidateWarning();
-        assertTrue(result.toString().equals(WARNING_MODEL_STRING));
+        assertEquals(WARNING_MODEL_STRING, result.toString());
     }
 
     @Test
     public void testModelVaidateInvalidModel() throws Exception {
         final AxValidationResult result = testApexModel.testApexModelVaidateInvalidModel();
-        assertTrue(result.toString().equals(INVALID_MODEL_STRING));
+        assertEquals(INVALID_MODEL_STRING, result.toString());
     }
 
     @Test
     public void testModelVaidateMalstructured() throws Exception {
         final AxValidationResult result = testApexModel.testApexModelVaidateMalstructured();
-        assertTrue(result.toString().equals(INVALID_MODEL_MALSTRUCTURED_STRING));
+        assertEquals(INVALID_MODEL_MALSTRUCTURED_STRING, result.toString());
     }
 
     @Test
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportConceptGetterTester.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportConceptGetterTester.java
index 2120b984d..2680a6e71 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportConceptGetterTester.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportConceptGetterTester.java
@@ -1,25 +1,27 @@
 /*
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  * SPDX-License-Identifier: Apache-2.0
  * ============LICENSE_END=========================================================
  */
 
 package org.onap.policy.apex.model.basicmodel.handling;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -149,34 +151,34 @@ public class SupportConceptGetterTester {
         basicModel.getKeyInformation().getKeyInfoMap().put(floatKI93.getKey(), floatKI93);
 
         assertNull(basicModel.getKeyInformation().get("NonExistantKey", "0.0.6"));
-        assertTrue(basicModel.getKeyInformation().get("IntegerKIKey26", "0.0.6").equals(intKI26));
-        assertTrue(basicModel.getKeyInformation().get("IntegerKIKey62", "0.0.2").equals(intKI62));
-        assertTrue(basicModel.getKeyInformation().get("IntegerKIKey21", "0.0.1").equals(intKI21));
-        assertTrue(basicModel.getKeyInformation().get("IntegerKIKey61", "0.0.1").equals(intKI61));
+        assertEquals(intKI26, basicModel.getKeyInformation().get("IntegerKIKey26", "0.0.6"));
+        assertEquals(intKI62, basicModel.getKeyInformation().get("IntegerKIKey62", "0.0.2"));
+        assertEquals(intKI21, basicModel.getKeyInformation().get("IntegerKIKey21", "0.0.1"));
+        assertEquals(intKI61, basicModel.getKeyInformation().get("IntegerKIKey61", "0.0.1"));
 
         assertNull(basicModel.getKeyInformation().get("NonExistantKey"));
 
-        assertTrue(basicModel.getKeyInformation().get("IntegerKIKey01").equals(intKI01));
-        assertTrue(basicModel.getKeyInformation().get("IntegerKIKey11").equals(intKI11));
-        assertTrue(basicModel.getKeyInformation().get("IntegerKIKey26").equals(intKI26));
-        assertTrue(basicModel.getKeyInformation().get("IntegerKIKey31").equals(intKI31));
-        assertTrue(basicModel.getKeyInformation().get("IntegerKIKey41").equals(intKI41));
-        assertTrue(basicModel.getKeyInformation().get("IntegerKIKey54").equals(intKI54));
-        assertTrue(basicModel.getKeyInformation().get("IntegerKIKey64").equals(intKI64));
-        assertTrue(basicModel.getKeyInformation().get("IntegerKIKey71").equals(intKI71));
-        assertTrue(basicModel.getKeyInformation().get("IntegerKIKey81").equals(intKI81));
-        assertTrue(basicModel.getKeyInformation().get("IntegerKIKey91").equals(intKI91));
+        assertEquals(intKI01, basicModel.getKeyInformation().get("IntegerKIKey01"));
+        assertEquals(intKI11, basicModel.getKeyInformation().get("IntegerKIKey11"));
+        assertEquals(intKI26, basicModel.getKeyInformation().get("IntegerKIKey26"));
+        assertEquals(intKI31, basicModel.getKeyInformation().get("IntegerKIKey31"));
+        assertEquals(intKI41, basicModel.getKeyInformation().get("IntegerKIKey41"));
+        assertEquals(intKI54, basicModel.getKeyInformation().get("IntegerKIKey54"));
+        assertEquals(intKI64, basicModel.getKeyInformation().get("IntegerKIKey64"));
+        assertEquals(intKI71, basicModel.getKeyInformation().get("IntegerKIKey71"));
+        assertEquals(intKI81, basicModel.getKeyInformation().get("IntegerKIKey81"));
+        assertEquals(intKI91, basicModel.getKeyInformation().get("IntegerKIKey91"));
 
-        assertTrue(basicModel.getKeyInformation().get("FloatKIKey01").equals(floatKI01));
-        assertTrue(basicModel.getKeyInformation().get("FloatKIKey11").equals(floatKI11));
-        assertTrue(basicModel.getKeyInformation().get("FloatKIKey21").equals(floatKI21));
-        assertTrue(basicModel.getKeyInformation().get("FloatKIKey31").equals(floatKI31));
-        assertTrue(basicModel.getKeyInformation().get("FloatKIKey41").equals(floatKI41));
-        assertTrue(basicModel.getKeyInformation().get("FloatKIKey51").equals(floatKI51));
-        assertTrue(basicModel.getKeyInformation().get("FloatKIKey61").equals(floatKI61));
-        assertTrue(basicModel.getKeyInformation().get("FloatKIKey71").equals(floatKI71));
-        assertTrue(basicModel.getKeyInformation().get("FloatKIKey83").equals(floatKI83));
-        assertTrue(basicModel.getKeyInformation().get("FloatKIKey93").equals(floatKI93));
+        assertEquals(floatKI01, basicModel.getKeyInformation().get("FloatKIKey01"));
+        assertEquals(floatKI11, basicModel.getKeyInformation().get("FloatKIKey11"));
+        assertEquals(floatKI21, basicModel.getKeyInformation().get("FloatKIKey21"));
+        assertEquals(floatKI31, basicModel.getKeyInformation().get("FloatKIKey31"));
+        assertEquals(floatKI41, basicModel.getKeyInformation().get("FloatKIKey41"));
+        assertEquals(floatKI51, basicModel.getKeyInformation().get("FloatKIKey51"));
+        assertEquals(floatKI61, basicModel.getKeyInformation().get("FloatKIKey61"));
+        assertEquals(floatKI71, basicModel.getKeyInformation().get("FloatKIKey71"));
+        assertEquals(floatKI83, basicModel.getKeyInformation().get("FloatKIKey83"));
+        assertEquals(floatKI93, basicModel.getKeyInformation().get("FloatKIKey93"));
 
         // Ensure marshalling and unmarshalling is OK
         ApexModelReader<AxModel> modelReader = new ApexModelReader<AxModel>(AxModel.class);
@@ -191,8 +193,8 @@ public class SupportConceptGetterTester {
         FileInputStream xmlFileInputStream = new FileInputStream(tempXmlFile);
         AxModel readXmlModel = modelReader.read(xmlFileInputStream);
         xmlFileInputStream.close();
-        assertTrue(basicModel.equals(readXmlModel));
-        assertTrue(readXmlModel.getKeyInformation().get("IntegerKIKey91").equals(intKI91));
+        assertEquals(basicModel, readXmlModel);
+        assertEquals(intKI91, readXmlModel.getKeyInformation().get("IntegerKIKey91"));
         assertNotNull(readXmlModel.getKeyInformation().get("FloatKIKey"));
         tempXmlFile.delete();
     }
diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextAlbumsTest.java b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextAlbumsTest.java
index 597aa3914..0406543fb 100644
--- a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextAlbumsTest.java
+++ b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextAlbumsTest.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2019 Nordix Foundation.
+ *  Modifications Copyright (C) 2019-2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
 package org.onap.policy.apex.model.contextmodel.concepts;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -119,17 +118,17 @@ public class ContextAlbumsTest {
                         + "scope=NewAlbumScope,isWritable=true,itemSchema="
                         + "AxArtifactKey:(name=AlbumSchemaName,version=0.0.1))", clonedAlbum.toString());
 
-        assertFalse(album.hashCode() == 0);
+        assertNotEquals(0, album.hashCode());
 
-        assertTrue(album.equals(album));
-        assertTrue(album.equals(clonedAlbum));
-        assertFalse(album.equals(null));
-        assertFalse(album.equals((Object) "Hello"));
-        assertFalse(album.equals(new AxContextAlbum(new AxArtifactKey(), "Scope", false, AxArtifactKey.getNullKey())));
-        assertFalse(album.equals(new AxContextAlbum(newKey, "Scope", false, AxArtifactKey.getNullKey())));
-        assertFalse(album.equals(new AxContextAlbum(newKey, "NewAlbumScope", false, AxArtifactKey.getNullKey())));
-        assertFalse(album.equals(new AxContextAlbum(newKey, "NewAlbumScope", true, AxArtifactKey.getNullKey())));
-        assertTrue(album.equals(new AxContextAlbum(newKey, "NewAlbumScope", true, albumSchemaKey)));
+        assertEquals(album, album);
+        assertEquals(album, clonedAlbum);
+        assertNotNull(album);
+        assertNotEquals(album, (Object) "Hello");
+        assertNotEquals(album, new AxContextAlbum(new AxArtifactKey(), "Scope", false, AxArtifactKey.getNullKey()));
+        assertNotEquals(album, new AxContextAlbum(newKey, "Scope", false, AxArtifactKey.getNullKey()));
+        assertNotEquals(album, new AxContextAlbum(newKey, "NewAlbumScope", false, AxArtifactKey.getNullKey()));
+        assertNotEquals(album, new AxContextAlbum(newKey, "NewAlbumScope", true, AxArtifactKey.getNullKey()));
+        assertEquals(album, new AxContextAlbum(newKey, "NewAlbumScope", true, albumSchemaKey));
 
         assertEquals(0, album.compareTo(album));
         assertEquals(0, album.compareTo(clonedAlbum));
@@ -186,13 +185,13 @@ public class ContextAlbumsTest {
         assertTrue(clonedAlbums.toString().startsWith(
                         "AxContextAlbums:(AxContextAlbums:(key=AxArtifactKey:(name=AlbumsKey,version=0.0.1)"));
 
-        assertFalse(albums.hashCode() == 0);
+        assertNotEquals(0, albums.hashCode());
 
-        assertTrue(albums.equals(albums));
-        assertTrue(albums.equals(clonedAlbums));
-        assertFalse(albums.equals(null));
-        assertFalse(albums.equals((Object) "Hello"));
-        assertFalse(albums.equals(new AxContextAlbums(new AxArtifactKey())));
+        assertEquals(albums, albums);
+        assertEquals(albums, clonedAlbums);
+        assertNotNull(albums);
+        assertNotEquals(albums, (Object) "Hello");
+        assertNotEquals(albums, new AxContextAlbums(new AxArtifactKey()));
 
         assertEquals(0, albums.compareTo(albums));
         assertEquals(0, albums.compareTo(clonedAlbums));
diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextModelTest.java b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextModelTest.java
index cac922cc4..1be226cbd 100644
--- a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextModelTest.java
+++ b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextModelTest.java
@@ -1,20 +1,20 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2019 Nordix Foundation.
+ *  Modifications Copyright (C) 2019-2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  * SPDX-License-Identifier: Apache-2.0
  * ============LICENSE_END=========================================================
  */
@@ -22,10 +22,8 @@
 package org.onap.policy.apex.model.contextmodel.concepts;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
@@ -33,7 +31,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInformation;
 
 /**
  * Context model tests.
- * 
+ *
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
 public class ContextModelTest {
@@ -60,22 +58,22 @@ public class ContextModelTest {
 
         final AxContextModel clonedModel = new AxContextModel(model);
 
-        assertFalse(model.hashCode() == 0);
+        assertNotEquals(0, model.hashCode());
 
-        assertTrue(model.equals(model));
-        assertTrue(model.equals(clonedModel));
-        assertFalse(model.equals((Object) "Hello"));
-        assertFalse(model.equals(new AxContextModel(new AxArtifactKey())));
-        assertFalse(model.equals(new AxContextModel(new AxArtifactKey(), new AxContextSchemas(), new AxContextAlbums(),
-                        new AxKeyInformation())));
-        assertFalse(model.equals(new AxContextModel(modelKey, new AxContextSchemas(), new AxContextAlbums(),
-                        new AxKeyInformation())));
-        assertFalse(model.equals(new AxContextModel(modelKey, new AxContextSchemas(), new AxContextAlbums(),
-                        new AxKeyInformation(keyInfoKey))));
-        assertFalse(model.equals(new AxContextModel(modelKey, new AxContextSchemas(schemasKey), new AxContextAlbums(),
-                        new AxKeyInformation(keyInfoKey))));
-        assertTrue(model.equals(new AxContextModel(modelKey, new AxContextSchemas(schemasKey),
-                        new AxContextAlbums(albumsKey), new AxKeyInformation(keyInfoKey))));
+        assertEquals(model, model);
+        assertEquals(model, clonedModel);
+        assertNotEquals(model, (Object) "Hello");
+        assertNotEquals(model, new AxContextModel(new AxArtifactKey()));
+        assertNotEquals(model, new AxContextModel(new AxArtifactKey(), new AxContextSchemas(), new AxContextAlbums(),
+                        new AxKeyInformation()));
+        assertNotEquals(model, new AxContextModel(modelKey, new AxContextSchemas(), new AxContextAlbums(),
+                        new AxKeyInformation()));
+        assertNotEquals(model, new AxContextModel(modelKey, new AxContextSchemas(), new AxContextAlbums(),
+                        new AxKeyInformation(keyInfoKey)));
+        assertNotEquals(model, new AxContextModel(modelKey, new AxContextSchemas(schemasKey), new AxContextAlbums(),
+                        new AxKeyInformation(keyInfoKey)));
+        assertEquals(model, new AxContextModel(modelKey, new AxContextSchemas(schemasKey),
+                        new AxContextAlbums(albumsKey), new AxKeyInformation(keyInfoKey)));
 
         assertEquals(0, model.compareTo(model));
         assertEquals(0, model.compareTo(clonedModel));
diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextSchemasTest.java b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextSchemasTest.java
index d72806a19..e5fc19a20 100644
--- a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextSchemasTest.java
+++ b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextSchemasTest.java
@@ -1,19 +1,20 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  * SPDX-License-Identifier: Apache-2.0
  * ============LICENSE_END=========================================================
  */
@@ -21,7 +22,6 @@
 package org.onap.policy.apex.model.contextmodel.concepts;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -106,16 +106,16 @@ public class ContextSchemasTest {
                         + "schemaFlavour=NewSchemaFlavour,schemaDefinition=NewSchemaDefinition)",
                         clonedSchema.toString());
 
-        assertFalse(schema.hashCode() == 0);
+        assertNotEquals(0, schema.hashCode());
 
-        assertTrue(schema.equals(schema));
-        assertTrue(schema.equals(clonedSchema));
-        assertFalse(schema.equals(null));
-        assertFalse(schema.equals((Object) "Hello"));
-        assertFalse(schema.equals(new AxContextSchema(new AxArtifactKey(), "Flavour", "Def")));
-        assertFalse(schema.equals(new AxContextSchema(newKey, "Flavour", "Def")));
-        assertFalse(schema.equals(new AxContextSchema(newKey, "NewSchemaFlavour", "Def")));
-        assertTrue(schema.equals(new AxContextSchema(newKey, "NewSchemaFlavour", "NewSchemaDefinition")));
+        assertEquals(schema, schema);
+        assertEquals(schema, clonedSchema);
+        assertNotNull(schema);
+        assertNotEquals(schema, (Object) "Hello");
+        assertNotEquals(schema, new AxContextSchema(new AxArtifactKey(), "Flavour", "Def"));
+        assertNotEquals(schema, new AxContextSchema(newKey, "Flavour", "Def"));
+        assertNotEquals(schema, new AxContextSchema(newKey, "NewSchemaFlavour", "Def"));
+        assertEquals(schema, new AxContextSchema(newKey, "NewSchemaFlavour", "NewSchemaDefinition"));
 
         assertEquals(0, schema.compareTo(schema));
         assertEquals(0, schema.compareTo(clonedSchema));
@@ -168,13 +168,13 @@ public class ContextSchemasTest {
         assertTrue(clonedSchemas.toString()
                         .startsWith("AxContextSchemas:(key=AxArtifactKey:(name=SchemasKey,version=0.0.1),"));
 
-        assertFalse(schemas.hashCode() == 0);
+        assertNotEquals(0, schemas.hashCode());
 
-        assertTrue(schemas.equals(schemas));
-        assertTrue(schemas.equals(clonedSchemas));
-        assertFalse(schemas.equals(null));
-        assertFalse(schemas.equals((Object) "Hello"));
-        assertFalse(schemas.equals(new AxContextSchemas(new AxArtifactKey())));
+        assertEquals(schemas, schemas);
+        assertEquals(schemas, clonedSchemas);
+        assertNotNull(schemas);
+        assertNotEquals(schemas, (Object) "Hello");
+        assertNotEquals(schemas, new AxContextSchemas(new AxArtifactKey()));
 
         assertEquals(0, schemas.compareTo(schemas));
         assertEquals(0, schemas.compareTo(clonedSchemas));
diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ApexContextModelTest.java b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ApexContextModelTest.java
index f41c39fd2..89a108ad8 100644
--- a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ApexContextModelTest.java
+++ b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ApexContextModelTest.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +21,7 @@
 
 package org.onap.policy.apex.model.contextmodel.handling;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -51,31 +52,31 @@ public class ApexContextModelTest {
     @Test
     public void testModelValid() throws Exception {
         final AxValidationResult result = testApexModel.testApexModelValid();
-        assertTrue(result.toString().equals(VALID_MODEL_STRING));
+        assertEquals(VALID_MODEL_STRING, result.toString());
     }
 
     @Test
     public void testApexModelVaidateObservation() throws Exception {
         final AxValidationResult result = testApexModel.testApexModelVaidateObservation();
-        assertTrue(result.toString().equals(OBSERVATION_MODEL_STRING));
+        assertEquals(OBSERVATION_MODEL_STRING, result.toString());
     }
 
     @Test
     public void testApexModelVaidateWarning() throws Exception {
         final AxValidationResult result = testApexModel.testApexModelVaidateWarning();
-        assertTrue(result.toString().equals(WARNING_MODEL_STRING));
+        assertEquals(WARNING_MODEL_STRING, result.toString());
     }
 
     @Test
     public void testModelVaidateInvalidModel() throws Exception {
         final AxValidationResult result = testApexModel.testApexModelVaidateInvalidModel();
-        assertTrue(result.toString().equals(INVALID_MODEL_STRING));
+        assertEquals(INVALID_MODEL_STRING, result.toString());
     }
 
     @Test
     public void testModelVaidateMalstructured() throws Exception {
         final AxValidationResult result = testApexModel.testApexModelVaidateMalstructured();
-        assertTrue(result.toString().equals(INVALID_MODEL_MALSTRUCTURED_STRING));
+        assertEquals(INVALID_MODEL_MALSTRUCTURED_STRING, result.toString());
     }
 
     @Test
diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparisonTest.java b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparisonTest.java
index 53e43a80a..483bc3661 100644
--- a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparisonTest.java
+++ b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparisonTest.java
@@ -1,27 +1,28 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  * SPDX-License-Identifier: Apache-2.0
  * ============LICENSE_END=========================================================
  */
 
 package org.onap.policy.apex.model.contextmodel.handling;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -33,7 +34,7 @@ import org.onap.policy.apex.model.utilities.comparison.KeyedMapDifference;
 
 /**
  * Test context comparisons.
- * 
+ *
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
 public class ContextComparisonTest {
@@ -61,12 +62,12 @@ public class ContextComparisonTest {
         final KeyedMapDifference<AxArtifactKey, AxContextSchema> schemaResult = new ContextComparer()
                         .compare(emptyModel.getSchemas(), emptyModel.getSchemas());
         assertNotNull(schemaResult);
-        assertTrue(emptyModel.getSchemas().getSchemasMap().equals(schemaResult.getIdenticalValues()));
+        assertEquals(emptyModel.getSchemas().getSchemasMap(), schemaResult.getIdenticalValues());
 
         final KeyedMapDifference<AxArtifactKey, AxContextAlbum> albumResult = new ContextComparer()
                         .compare(emptyModel.getAlbums(), emptyModel.getAlbums());
         assertNotNull(albumResult);
-        assertTrue(emptyModel.getAlbums().getAlbumsMap().equals(albumResult.getIdenticalValues()));
+        assertEquals(emptyModel.getAlbums().getAlbumsMap(), albumResult.getIdenticalValues());
     }
 
     @Test
@@ -74,12 +75,12 @@ public class ContextComparisonTest {
         final KeyedMapDifference<AxArtifactKey, AxContextSchema> schemaResult = new ContextComparer()
                         .compare(emptyModel.getSchemas(), fullModel.getSchemas());
         assertNotNull(schemaResult);
-        assertTrue(fullModel.getSchemas().getSchemasMap().equals(schemaResult.getRightOnly()));
+        assertEquals(fullModel.getSchemas().getSchemasMap(), schemaResult.getRightOnly());
 
         final KeyedMapDifference<AxArtifactKey, AxContextAlbum> albumResult = new ContextComparer()
                         .compare(emptyModel.getAlbums(), fullModel.getAlbums());
         assertNotNull(albumResult);
-        assertTrue(fullModel.getAlbums().getAlbumsMap().equals(albumResult.getRightOnly()));
+        assertEquals(fullModel.getAlbums().getAlbumsMap(), albumResult.getRightOnly());
     }
 
     @Test
@@ -87,12 +88,12 @@ public class ContextComparisonTest {
         final KeyedMapDifference<AxArtifactKey, AxContextSchema> schemaResult = new ContextComparer()
                         .compare(fullModel.getSchemas(), emptyModel.getSchemas());
         assertNotNull(schemaResult);
-        assertTrue(fullModel.getSchemas().getSchemasMap().equals(schemaResult.getLeftOnly()));
+        assertEquals(fullModel.getSchemas().getSchemasMap(), schemaResult.getLeftOnly());
 
         final KeyedMapDifference<AxArtifactKey, AxContextAlbum> albumResult = new ContextComparer()
                         .compare(fullModel.getAlbums(), emptyModel.getAlbums());
         assertNotNull(albumResult);
-        assertTrue(fullModel.getAlbums().getAlbumsMap().equals(albumResult.getLeftOnly()));
+        assertEquals(fullModel.getAlbums().getAlbumsMap(), albumResult.getLeftOnly());
     }
 
     @Test
@@ -100,12 +101,12 @@ public class ContextComparisonTest {
         final KeyedMapDifference<AxArtifactKey, AxContextSchema> schemaResult = new ContextComparer()
                         .compare(emptyModel.getSchemas(), noGlobalContextModel.getSchemas());
         assertNotNull(schemaResult);
-        assertTrue(noGlobalContextModel.getSchemas().getSchemasMap().equals(schemaResult.getRightOnly()));
+        assertEquals(noGlobalContextModel.getSchemas().getSchemasMap(), schemaResult.getRightOnly());
 
         final KeyedMapDifference<AxArtifactKey, AxContextAlbum> albumResult = new ContextComparer()
                         .compare(emptyModel.getAlbums(), noGlobalContextModel.getAlbums());
         assertNotNull(albumResult);
-        assertTrue(noGlobalContextModel.getAlbums().getAlbumsMap().equals(albumResult.getRightOnly()));
+        assertEquals(noGlobalContextModel.getAlbums().getAlbumsMap(), albumResult.getRightOnly());
     }
 
     @Test
@@ -113,12 +114,12 @@ public class ContextComparisonTest {
         final KeyedMapDifference<AxArtifactKey, AxContextSchema> schemaResult = new ContextComparer()
                         .compare(noGlobalContextModel.getSchemas(), emptyModel.getSchemas());
         assertNotNull(schemaResult);
-        assertTrue(noGlobalContextModel.getSchemas().getSchemasMap().equals(schemaResult.getLeftOnly()));
+        assertEquals(noGlobalContextModel.getSchemas().getSchemasMap(), schemaResult.getLeftOnly());
 
         final KeyedMapDifference<AxArtifactKey, AxContextAlbum> albumResult = new ContextComparer()
                         .compare(noGlobalContextModel.getAlbums(), emptyModel.getAlbums());
         assertNotNull(albumResult);
-        assertTrue(noGlobalContextModel.getAlbums().getAlbumsMap().equals(albumResult.getLeftOnly()));
+        assertEquals(noGlobalContextModel.getAlbums().getAlbumsMap(), albumResult.getLeftOnly());
     }
 
     @Test
@@ -126,12 +127,12 @@ public class ContextComparisonTest {
         final KeyedMapDifference<AxArtifactKey, AxContextSchema> schemaResult = new ContextComparer()
                         .compare(emptyModel.getSchemas(), shellModel.getSchemas());
         assertNotNull(schemaResult);
-        assertTrue(shellModel.getSchemas().getSchemasMap().equals(schemaResult.getRightOnly()));
+        assertEquals(shellModel.getSchemas().getSchemasMap(), schemaResult.getRightOnly());
 
         final KeyedMapDifference<AxArtifactKey, AxContextAlbum> albumResult = new ContextComparer()
                         .compare(emptyModel.getAlbums(), shellModel.getAlbums());
         assertNotNull(albumResult);
-        assertTrue(shellModel.getAlbums().getAlbumsMap().equals(albumResult.getRightOnly()));
+        assertEquals(shellModel.getAlbums().getAlbumsMap(), albumResult.getRightOnly());
     }
 
     @Test
@@ -139,12 +140,12 @@ public class ContextComparisonTest {
         final KeyedMapDifference<AxArtifactKey, AxContextSchema> schemaResult = new ContextComparer()
                         .compare(shellModel.getSchemas(), emptyModel.getSchemas());
         assertNotNull(schemaResult);
-        assertTrue(shellModel.getSchemas().getSchemasMap().equals(schemaResult.getLeftOnly()));
+        assertEquals(shellModel.getSchemas().getSchemasMap(), schemaResult.getLeftOnly());
 
         final KeyedMapDifference<AxArtifactKey, AxContextAlbum> albumResult = new ContextComparer()
                         .compare(shellModel.getAlbums(), emptyModel.getAlbums());
         assertNotNull(albumResult);
-        assertTrue(shellModel.getAlbums().getAlbumsMap().equals(albumResult.getLeftOnly()));
+        assertEquals(shellModel.getAlbums().getAlbumsMap(), albumResult.getLeftOnly());
     }
 
     @Test
@@ -152,12 +153,12 @@ public class ContextComparisonTest {
         final KeyedMapDifference<AxArtifactKey, AxContextSchema> schemaResult = new ContextComparer()
                         .compare(emptyModel.getSchemas(), singleEntryModel.getSchemas());
         assertNotNull(schemaResult);
-        assertTrue(singleEntryModel.getSchemas().getSchemasMap().equals(schemaResult.getRightOnly()));
+        assertEquals(singleEntryModel.getSchemas().getSchemasMap(), schemaResult.getRightOnly());
 
         final KeyedMapDifference<AxArtifactKey, AxContextAlbum> albumResult = new ContextComparer()
                         .compare(emptyModel.getAlbums(), singleEntryModel.getAlbums());
         assertNotNull(albumResult);
-        assertTrue(singleEntryModel.getAlbums().getAlbumsMap().equals(albumResult.getRightOnly()));
+        assertEquals(singleEntryModel.getAlbums().getAlbumsMap(), albumResult.getRightOnly());
     }
 
     @Test
@@ -165,12 +166,12 @@ public class ContextComparisonTest {
         final KeyedMapDifference<AxArtifactKey, AxContextSchema> schemaResult = new ContextComparer()
                         .compare(singleEntryModel.getSchemas(), emptyModel.getSchemas());
         assertNotNull(schemaResult);
-        assertTrue(singleEntryModel.getSchemas().getSchemasMap().equals(schemaResult.getLeftOnly()));
+        assertEquals(singleEntryModel.getSchemas().getSchemasMap(), schemaResult.getLeftOnly());
 
         final KeyedMapDifference<AxArtifactKey, AxContextAlbum> albumResult = new ContextComparer()
                         .compare(singleEntryModel.getAlbums(), emptyModel.getAlbums());
         assertNotNull(albumResult);
-        assertTrue(singleEntryModel.getAlbums().getAlbumsMap().equals(albumResult.getLeftOnly()));
+        assertEquals(singleEntryModel.getAlbums().getAlbumsMap(), albumResult.getLeftOnly());
     }
 
     @Test
@@ -178,11 +179,11 @@ public class ContextComparisonTest {
         final KeyedMapDifference<AxArtifactKey, AxContextSchema> schemaResult = new ContextComparer()
                         .compare(fullModel.getSchemas(), fullModel.getSchemas());
         assertNotNull(schemaResult);
-        assertTrue(fullModel.getSchemas().getSchemasMap().equals(schemaResult.getIdenticalValues()));
+        assertEquals(fullModel.getSchemas().getSchemasMap(), schemaResult.getIdenticalValues());
 
         final KeyedMapDifference<AxArtifactKey, AxContextAlbum> albumResult = new ContextComparer()
                         .compare(fullModel.getAlbums(), fullModel.getAlbums());
         assertNotNull(albumResult);
-        assertTrue(fullModel.getAlbums().getAlbumsMap().equals(albumResult.getIdenticalValues()));
+        assertEquals(fullModel.getAlbums().getAlbumsMap(), albumResult.getIdenticalValues());
     }
 }