Fix Sonar Issues models-tosca-simple

[policy/models.git] / models-tosca / src / test / java / org / onap / policy / models / tosca / simple / concepts / JpaToscaPolicyTypesTest.java

diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPolicyTypesTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPolicyTypesTest.java
index d0ea178..2e8459b 100644 (file)
--- a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPolicyTypesTest.java
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPolicyTypesTest.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 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");
  * you may not use this file except in compliance with the License.
@@ -20,59 +21,96 @@
 
 package org.onap.policy.models.tosca.simple.concepts;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.assertTrue;
 
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.TreeMap;
-
 import org.junit.Test;
+import org.onap.policy.common.parameters.BeanValidationResult;
 import org.onap.policy.models.base.PfConceptKey;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaPolicyType;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaPolicyTypes;
+import org.onap.policy.models.base.Validated;
+import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyType;
 
 public class JpaToscaPolicyTypesTest {
 
+    private static final String KEY_IS_NULL = "key is marked .*on.*ull but is null";
+
     @Test
-    public void testPolicyTypes() {
+    public void testPolicyTypesNull() {
         assertNotNull(new JpaToscaPolicyTypes());
         assertNotNull(new JpaToscaPolicyTypes(new PfConceptKey()));
         assertNotNull(new JpaToscaPolicyTypes(new PfConceptKey(), new TreeMap<PfConceptKey, JpaToscaPolicyType>()));
         assertNotNull(new JpaToscaPolicyTypes(new JpaToscaPolicyTypes()));
 
-        try {
-            new JpaToscaPolicyTypes((PfConceptKey) null);
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("key is marked @NonNull but is null", exc.getMessage());
-        }
-
-        try {
-            new JpaToscaPolicyTypes((JpaToscaPolicyTypes) null);
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("copyConcept is marked @NonNull but is null", exc.getMessage());
-        }
-
-        try {
-            new JpaToscaPolicyTypes(null, null);
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("key is marked @NonNull but is null", exc.getMessage());
-        }
-
-        try {
-            new JpaToscaPolicyTypes(new PfConceptKey(), null);
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("conceptMap is marked @NonNull but is null", exc.getMessage());
-        }
-
-        try {
-            new JpaToscaPolicyTypes(null, new TreeMap<PfConceptKey, JpaToscaPolicyType>());
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("key is marked @NonNull but is null", exc.getMessage());
-        }
+        assertThatThrownBy(() -> new JpaToscaPolicyTypes((PfConceptKey) null)).hasMessageMatching(KEY_IS_NULL);
+
+        assertThatThrownBy(() -> new JpaToscaPolicyTypes((JpaToscaPolicyTypes) null))
+                .hasMessageMatching("copyConcept is marked .*on.*ull but is null");
+
+        assertThatThrownBy(() -> new JpaToscaPolicyTypes(null, null)).hasMessageMatching(KEY_IS_NULL);
+
+        assertThatThrownBy(() -> new JpaToscaPolicyTypes(new PfConceptKey(), null))
+                .hasMessageMatching("conceptMap is marked .*on.*ull but is null");
+
+        assertThatThrownBy(() -> new JpaToscaPolicyTypes(null, new TreeMap<PfConceptKey, JpaToscaPolicyType>()))
+                .hasMessageMatching(KEY_IS_NULL);
+    }
+
+    @Test
+    public void testPolicyTypes() {
+        List<Map<String, ToscaPolicyType>> ptMapList = new ArrayList<>();
+        ptMapList.add(new LinkedHashMap<>());
+
+        ToscaPolicyType pt0 = new ToscaPolicyType();
+        pt0.setName("pt0");
+        pt0.setVersion("0.0.1");
+        pt0.setDescription("pt0 description");
+
+        ptMapList.get(0).put("pt0", pt0);
+        assertNotNull(new JpaToscaPolicyTypes(ptMapList));
+        assertTrue(new JpaToscaPolicyTypes(ptMapList).validate("").isValid());
+        assertThatThrownBy(() -> new JpaToscaPolicyTypes(ptMapList).validate(null))
+                .hasMessageMatching("fieldName is marked .*on.*ull but is null");
+
+        pt0.setDerivedFrom(null);
+        assertTrue(new JpaToscaPolicyTypes(ptMapList).validate("").isValid());
+
+        pt0.setDerivedFrom("tosca.PolicyTypes.Root");
+        assertTrue(new JpaToscaPolicyTypes(ptMapList).validate("").isValid());
+
+        pt0.setDerivedFrom("some.other.Thing");
+        BeanValidationResult result = new JpaToscaPolicyTypes(ptMapList).validate("");
+        assertFalse(result.isValid());
+        assertThat(result.getResult()).contains("parent").contains("some.other.Thing:0.0.0")
+                        .contains(Validated.NOT_FOUND);
+
+        pt0.setDerivedFrom(null);
+        assertTrue(new JpaToscaPolicyTypes(ptMapList).validate("").isValid());
+
+        ToscaPolicyType pt1 = new ToscaPolicyType();
+        pt1.setName("pt1");
+        pt1.setVersion("0.0.1");
+        pt1.setDescription("pt1 description");
+
+        ptMapList.get(0).put("pt1", pt1);
+        assertTrue(new JpaToscaPolicyTypes(ptMapList).validate("").isValid());
+
+        pt1.setDerivedFrom("pt0");
+        assertTrue(new JpaToscaPolicyTypes(ptMapList).validate("").isValid());
+
+        pt1.setDerivedFrom("pt2");
+        result = new JpaToscaPolicyTypes(ptMapList).validate("");
+        assertFalse(result.isValid());
+        assertThat(result.getResult()).contains("parent").contains("pt2:0.0.0").contains(Validated.NOT_FOUND);
+
+        pt1.setDerivedFrom("pt0");
+        assertTrue(new JpaToscaPolicyTypes(ptMapList).validate("").isValid());
     }
 }