Fix 4 newly added Sonar bugs

[policy/models.git] / models-base / src / test / java / org / onap / policy / models / base / PfKeyUseTest.java

diff --git a/models-base/src/test/java/org/onap/policy/models/base/PfKeyUseTest.java b/models-base/src/test/java/org/onap/policy/models/base/PfKeyUseTest.java
index f9ad889..58c872c 100644 (file)
--- a/models-base/src/test/java/org/onap/policy/models/base/PfKeyUseTest.java
+++ b/models-base/src/test/java/org/onap/policy/models/base/PfKeyUseTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019-2020 Nordix Foundation.
+ *  Copyright (C) 2019-2021 Nordix Foundation.
  *  Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -62,9 +62,7 @@ public class PfKeyUseTest {
         keyUse.clean();
         assertNotNull(keyUse);
 
-        PfValidationResult result = new PfValidationResult();
-        result = keyUse.validate(result);
-        assertNotNull(result);
+        assertNotNull(keyUse.validate(""));
 
         assertNotEquals(0, keyUse.hashCode());
 
@@ -82,10 +80,13 @@ public class PfKeyUseTest {
         assertEquals(0, keyUse.compareTo(clonedKeyUse));
         assertNotEquals(0, keyUse.compareTo(new PfConceptKey()));
         assertEquals(0, keyUse.compareTo(new PfKeyUse(key)));
+    }
 
+    @Test
+    public void testNullKey() {
         PfKeyUse keyUseNull = new PfKeyUse(PfConceptKey.getNullKey());
-        PfValidationResult resultNull = new PfValidationResult();
-        assertEquals(false, keyUseNull.validate(resultNull).isValid());
+        PfKeyUse keyUse = new PfKeyUse();
+        assertEquals(false, keyUseNull.validate("").isValid());
 
         assertThatThrownBy(() -> keyUse.setKey(null)).hasMessageMatching("^key is marked .*on.*ull but is null$");
 
@@ -93,7 +94,8 @@ public class PfKeyUseTest {
 
         assertThatThrownBy(() -> keyUse.isCompatible(null)).hasMessageMatching(OTHER_KEY_IS_NULL);
 
-        assertThatThrownBy(() -> keyUse.validate(null)).hasMessageMatching("^result is marked .*on.*ull but is null$");
+        assertThatThrownBy(() -> keyUse.validate(null))
+                        .hasMessageMatching("^fieldName is marked .*on.*ull but is null$");
 
         PfKeyUse testKeyUse = new PfKeyUse(new DummyPfConceptKeySub(new PfConceptKey()));
         assertEquals(testKeyUse, new PfKeyUse(testKeyUse));