Changes for Checkstyle 8.32

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

diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPoliciesTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPoliciesTest.java
index db3635e..47e3433 100644 (file)
--- a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPoliciesTest.java
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPoliciesTest.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
+ *  Copyright (C) 2019-2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2019 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,24 +21,26 @@
 
 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.models.base.PfConceptKey;
+import org.onap.policy.models.base.PfValidationResult;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaPolicies;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaPolicy;
 
 public class JpaToscaPoliciesTest {
 
+    private static final String KEY_IS_NULL = "key is marked .*on.*ull but is null";
+
     @Test
     public void testPolicies() {
         assertNotNull(new JpaToscaPolicies());
@@ -45,44 +48,68 @@ public class JpaToscaPoliciesTest {
         assertNotNull(new JpaToscaPolicies(new PfConceptKey(), new TreeMap<PfConceptKey, JpaToscaPolicy>()));
         assertNotNull(new JpaToscaPolicies(new JpaToscaPolicies()));
 
-        try {
-            new JpaToscaPolicies((PfConceptKey) null);
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("key is marked @NonNull but is null", exc.getMessage());
-        }
-
-        try {
-            new JpaToscaPolicies((JpaToscaPolicies) null);
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("copyConcept is marked @NonNull but is null", exc.getMessage());
-        }
-
-        try {
-            new JpaToscaPolicies(null, null);
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("key is marked @NonNull but is null", exc.getMessage());
-        }
-
-        try {
-            new JpaToscaPolicies(new PfConceptKey(), null);
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("conceptMap is marked @NonNull but is null", exc.getMessage());
-        }
-
-        try {
-            new JpaToscaPolicies(null, new TreeMap<PfConceptKey, JpaToscaPolicy>());
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("key is marked @NonNull but is null", exc.getMessage());
-        }
+        assertThatThrownBy(() -> new JpaToscaPolicies((PfConceptKey) null)).hasMessageMatching(KEY_IS_NULL);
+
+        assertThatThrownBy(() -> new JpaToscaPolicies((JpaToscaPolicies) null))
+                .hasMessageMatching("copyConcept is marked .*on.*ull but is null");
+
+        assertThatThrownBy(() -> new JpaToscaPolicies(null, null)).hasMessageMatching(KEY_IS_NULL);
+
+        assertThatThrownBy(() -> new JpaToscaPolicies(new PfConceptKey(), null))
+                .hasMessageMatching("conceptMap is marked .*on.*ull but is null");
+
+        assertThatThrownBy(() -> new JpaToscaPolicies(null, new TreeMap<PfConceptKey, JpaToscaPolicy>()))
+                .hasMessageMatching(KEY_IS_NULL);
 
         List<Map<String, ToscaPolicy>> polMapList = new ArrayList<>();
         polMapList.add(new LinkedHashMap<>());
-        polMapList.get(0).put("policyType", new ToscaPolicy());
+
+        ToscaPolicy pol0 = new ToscaPolicy();
+        pol0.setName("pol0");
+        pol0.setVersion("0.0.1");
+        pol0.setDescription("pol0 description");
+        pol0.setType("pt0");
+        pol0.setTypeVersion("0.0.1");
+
+        polMapList.get(0).put("pol0", pol0);
         assertNotNull(new JpaToscaPolicies(polMapList));
+        assertTrue(new JpaToscaPolicies(polMapList).validate(new PfValidationResult()).isValid());
+        assertThatThrownBy(() -> new JpaToscaPolicies(polMapList).validate(null))
+                .hasMessageMatching("resultIn is marked .*on.*ull but is null");
+
+        pol0.setDerivedFrom(null);
+        assertTrue(new JpaToscaPolicies(polMapList).validate(new PfValidationResult()).isValid());
+
+        pol0.setDerivedFrom("tosca.Policies.Root");
+        assertTrue(new JpaToscaPolicies(polMapList).validate(new PfValidationResult()).isValid());
+
+        pol0.setDerivedFrom("some.other.Thing");
+        PfValidationResult result = new JpaToscaPolicies(polMapList).validate(new PfValidationResult());
+        assertFalse(result.isValid());
+        assertThat(result.toString()).contains("parent some.other.Thing:0.0.0 of entity not found");
+
+        pol0.setDerivedFrom(null);
+        assertTrue(new JpaToscaPolicies(polMapList).validate(new PfValidationResult()).isValid());
+
+        ToscaPolicy pol1 = new ToscaPolicy();
+        pol1.setName("pol1");
+        pol1.setVersion("0.0.1");
+        pol1.setDescription("pol1 description");
+        pol1.setType("pt0");
+        pol1.setTypeVersion("0.0.1");
+
+        polMapList.get(0).put("pol1", pol1);
+        assertTrue(new JpaToscaPolicies(polMapList).validate(new PfValidationResult()).isValid());
+
+        pol1.setDerivedFrom("pol0");
+        assertTrue(new JpaToscaPolicies(polMapList).validate(new PfValidationResult()).isValid());
+
+        pol1.setDerivedFrom("pol2");
+        result = new JpaToscaPolicies(polMapList).validate(new PfValidationResult());
+        assertFalse(result.isValid());
+        assertThat(result.toString()).contains("parent pol2:0.0.0 of entity not found");
+
+        pol1.setDerivedFrom("pol0");
+        assertTrue(new JpaToscaPolicies(polMapList).validate(new PfValidationResult()).isValid());
     }
 }