Fix Sonar Issues in models-pdp

[policy/models.git] / models-pdp / src / test / java / org / onap / policy / models / pdp / persistence / concepts / JpaPdpGroupTest.java

diff --git a/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpGroupTest.java b/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpGroupTest.java
index 1daadcf..060f650 100644 (file)
--- a/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpGroupTest.java
+++ b/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpGroupTest.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- *  Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ *  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");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,6 @@ import java.util.List;
 import org.junit.Test;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfReferenceKey;
-import org.onap.policy.models.base.PfValidationResult;
 import org.onap.policy.models.pdp.concepts.PdpGroup;
 import org.onap.policy.models.pdp.enums.PdpState;
 import org.onap.policy.models.pdp.testconcepts.DummyJpaPdpSubgroupChild;
@@ -96,21 +95,17 @@ public class JpaPdpGroupTest {
 
         assertNotNull(new JpaPdpGroup((new PfConceptKey())));
         assertNotNull(new JpaPdpGroup((new JpaPdpGroup())));
+    }
 
+    @Test
+    public void testPdpGroupSet() {
         PdpGroup testPdpGroup = new PdpGroup();
         testPdpGroup.setName(PDP_GROUP0);
         testPdpGroup.setPdpSubgroups(new ArrayList<>());
-        JpaPdpGroup testJpaPdpGroup = new JpaPdpGroup();
-        testJpaPdpGroup.setKey(null);
 
-        testJpaPdpGroup.setKey(new PfConceptKey());
-
-        testPdpGroup.setVersion(VERSION);
-        testJpaPdpGroup.fromAuthorative(testPdpGroup);
+        JpaPdpGroup testJpaPdpGroup = setUpSmallJpaPdpGroup();
 
         assertEquals(PDP_GROUP0, testJpaPdpGroup.getKey().getName());
-        testJpaPdpGroup.setKey(PfConceptKey.getNullKey());
-        testJpaPdpGroup.fromAuthorative(testPdpGroup);
 
         assertThatThrownBy(() -> {
             testJpaPdpGroup.fromAuthorative(null);
@@ -127,53 +122,63 @@ public class JpaPdpGroupTest {
 
         testJpaPdpGroup.clean();
         assertEquals(PDP_GROUP0, testJpaPdpGroup.getKey().getName());
+    }
+
+    @Test
+    public void testPdpGroupValidation() {
+        JpaPdpGroup testJpaPdpGroup = setUpSmallJpaPdpGroup();
 
         assertThatThrownBy(() -> {
             testJpaPdpGroup.validate(null);
-        }).hasMessageMatching("resultIn" + NULL_ERROR);
+        }).hasMessageMatching("fieldName" + NULL_ERROR);
 
-        assertFalse(testJpaPdpGroup.validate(new PfValidationResult()).isOk());
+        assertFalse(testJpaPdpGroup.validate("").isValid());
         testJpaPdpGroup.setPdpGroupState(PdpState.PASSIVE);
-        assertTrue(testJpaPdpGroup.validate(new PfValidationResult()).isOk());
+        assertTrue(testJpaPdpGroup.validate("").isValid());
 
         testJpaPdpGroup.setKey(PfConceptKey.getNullKey());
-        assertFalse(testJpaPdpGroup.validate(new PfValidationResult()).isOk());
+        assertFalse(testJpaPdpGroup.validate("").isValid());
         testJpaPdpGroup.setKey(new PfConceptKey("PdpGroup0", VERSION));
-        assertTrue(testJpaPdpGroup.validate(new PfValidationResult()).isOk());
+        assertTrue(testJpaPdpGroup.validate("").isValid());
 
         testJpaPdpGroup.setDescription("   ");
-        assertFalse(testJpaPdpGroup.validate(new PfValidationResult()).isOk());
+        assertFalse(testJpaPdpGroup.validate("").isValid());
         testJpaPdpGroup.setDescription("  A Description ");
-        assertTrue(testJpaPdpGroup.validate(new PfValidationResult()).isOk());
+        assertTrue(testJpaPdpGroup.validate("").isValid());
         testJpaPdpGroup.setDescription(null);
-        assertTrue(testJpaPdpGroup.validate(new PfValidationResult()).isOk());
+        assertTrue(testJpaPdpGroup.validate("").isValid());
 
         testJpaPdpGroup.setProperties(new LinkedHashMap<>());
         testJpaPdpGroup.getProperties().put(null, null);
-        assertFalse(testJpaPdpGroup.validate(new PfValidationResult()).isOk());
+        assertFalse(testJpaPdpGroup.validate("").isValid());
         testJpaPdpGroup.getProperties().remove(null);
-        assertTrue(testJpaPdpGroup.validate(new PfValidationResult()).isOk());
+        assertTrue(testJpaPdpGroup.validate("").isValid());
 
         testJpaPdpGroup.setProperties(new LinkedHashMap<>());
         testJpaPdpGroup.getProperties().put("NullKey", null);
-        assertFalse(testJpaPdpGroup.validate(new PfValidationResult()).isOk());
+        assertFalse(testJpaPdpGroup.validate("").isValid());
         testJpaPdpGroup.getProperties().remove("NullKey");
-        assertTrue(testJpaPdpGroup.validate(new PfValidationResult()).isOk());
+        assertTrue(testJpaPdpGroup.validate("").isValid());
+    }
+
+    @Test
+    public void testPdpSubgroups() {
+        JpaPdpGroup testJpaPdpGroup = setUpJpaPdpGroup();
 
         List<JpaPdpSubGroup> jpaPdpSubgroups = testJpaPdpGroup.getPdpSubGroups();
         assertNotNull(jpaPdpSubgroups);
         testJpaPdpGroup.setPdpSubGroups(null);
-        assertFalse(testJpaPdpGroup.validate(new PfValidationResult()).isOk());
+        assertFalse(testJpaPdpGroup.validate("").isValid());
         testJpaPdpGroup.setPdpSubGroups(new ArrayList<>());
-        assertTrue(testJpaPdpGroup.validate(new PfValidationResult()).isOk());
+        assertTrue(testJpaPdpGroup.validate("").isValid());
         testJpaPdpGroup.setPdpSubGroups(jpaPdpSubgroups);
-        assertTrue(testJpaPdpGroup.validate(new PfValidationResult()).isOk());
+        assertTrue(testJpaPdpGroup.validate("").isValid());
 
         JpaPdpGroup otherJpaPdpGroup = new JpaPdpGroup(testJpaPdpGroup);
         assertEquals(0, testJpaPdpGroup.compareTo(otherJpaPdpGroup));
         assertEquals(-1, testJpaPdpGroup.compareTo(null));
         assertEquals(0, testJpaPdpGroup.compareTo(testJpaPdpGroup));
-        assertFalse(testJpaPdpGroup.compareTo(new DummyJpaPdpSubgroupChild()) == 0);
+        assertNotEquals(0, testJpaPdpGroup.compareTo(new DummyJpaPdpSubgroupChild()));
 
         testJpaPdpGroup.getKey().setName("OtherName");
         assertEquals(-1, testJpaPdpGroup.compareTo(otherJpaPdpGroup));
@@ -213,8 +218,12 @@ public class JpaPdpGroupTest {
         psg = testJpaPdpGroup.toAuthorative();
         assertNull(psg.getProperties());
         testJpaPdpGroup.setProperties(new LinkedHashMap<>());
+    }
+
+    @Test
+    public void testPdpGroupsProperties() {
+        JpaPdpGroup testJpaPdpGroup = setUpJpaPdpGroup();
 
-        testJpaPdpGroup.clean();
         testJpaPdpGroup.getProperties().put(" PropKey ", " Prop Value ");
         testJpaPdpGroup.clean();
         assertEquals("PropKey", testJpaPdpGroup.getProperties().keySet().iterator().next());
@@ -223,6 +232,9 @@ public class JpaPdpGroupTest {
         testJpaPdpGroup.clean();
         assertEquals("A Description", testJpaPdpGroup.getDescription());
 
+        JpaPdpSubGroup anotherPdpSubgroup =
+                new JpaPdpSubGroup(new PfReferenceKey(testJpaPdpGroup.getKey(), "AnotherPdpSubgroup"));
+
         assertEquals(1, testJpaPdpGroup.getKeys().size());
         testJpaPdpGroup.getPdpSubGroups().add(anotherPdpSubgroup);
         assertEquals(2, testJpaPdpGroup.getKeys().size());
@@ -231,4 +243,30 @@ public class JpaPdpGroupTest {
 
         assertEquals(testJpaPdpGroup, new JpaPdpGroup(testJpaPdpGroup));
     }
+
+    private JpaPdpGroup setUpSmallJpaPdpGroup() {
+        PdpGroup testPdpGroup = new PdpGroup();
+        testPdpGroup.setName(PDP_GROUP0);
+        testPdpGroup.setPdpSubgroups(new ArrayList<>());
+        testPdpGroup.setVersion(VERSION);
+
+        JpaPdpGroup testJpaPdpGroup = new JpaPdpGroup();
+        testJpaPdpGroup.setKey(new PfConceptKey(PDP_GROUP0, VERSION));
+        testJpaPdpGroup.fromAuthorative(testPdpGroup);
+        testJpaPdpGroup.clean();
+
+        return testJpaPdpGroup;
+    }
+
+    private JpaPdpGroup setUpJpaPdpGroup() {
+        JpaPdpGroup testJpaPdpGroup = setUpSmallJpaPdpGroup();
+
+        testJpaPdpGroup.setKey(new PfConceptKey("PdpGroup0", VERSION));
+        testJpaPdpGroup.setDescription(null);
+        testJpaPdpGroup.setPdpGroupState(PdpState.PASSIVE);
+        testJpaPdpGroup.setProperties(new LinkedHashMap<>());
+        testJpaPdpGroup.clean();
+
+        return testJpaPdpGroup;
+    }
 }