JPA concepts for TOSCA

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

diff --git a/models-base/src/test/java/org/onap/policy/models/base/ValidationTest.java b/models-base/src/test/java/org/onap/policy/models/base/ValidationTest.java
index 385039c..6030d2a 100644 (file)
--- a/models-base/src/test/java/org/onap/policy/models/base/ValidationTest.java
+++ b/models-base/src/test/java/org/onap/policy/models/base/ValidationTest.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.
@@ -30,8 +31,11 @@ import org.onap.policy.models.base.PfValidationResult.ValidationResult;
 
 public class ValidationTest {
 
+    private static final String HELLO = "hello";
+    private static final String SOME_MESSAGE = "Some message";
+
     @Test
-    public void test() {
+    public void testValidation1() {
         PfValidationResult result = new PfValidationResult();
         PfConceptKey pfKeyey = new PfConceptKey("PK", "0.0.1");
         result = pfKeyey.validate(result);
@@ -43,48 +47,87 @@ public class ValidationTest {
         assertNotNull(result.getMessageList());
 
         PfValidationMessage vmess0 = new PfValidationMessage(PfConceptKey.getNullKey(), PfConceptKey.class,
-                        ValidationResult.VALID, "Some message");
+                ValidationResult.VALID, SOME_MESSAGE);
         result.addValidationMessage(vmess0);
 
         assertTrue(result.isOk());
         assertTrue(result.isValid());
         assertEquals(PfValidationResult.ValidationResult.VALID, result.getValidationResult());
         assertNotNull(result.getMessageList());
-        assertNotNull("hello", result.toString());
+        assertNotNull(HELLO, result.toString());
 
         PfValidationMessage vmess1 = new PfValidationMessage(PfConceptKey.getNullKey(), PfConceptKey.class,
-                        ValidationResult.OBSERVATION, "Some message");
+                ValidationResult.OBSERVATION, SOME_MESSAGE);
         result.addValidationMessage(vmess1);
 
         assertTrue(result.isOk());
         assertTrue(result.isValid());
         assertEquals(PfValidationResult.ValidationResult.OBSERVATION, result.getValidationResult());
         assertNotNull(result.getMessageList());
-        assertNotNull("hello", result.toString());
+        assertNotNull(HELLO, result.toString());
+    }
+
+
+    @Test
+    public void testValidation2() {
+        PfValidationResult result = new PfValidationResult();
 
         PfValidationMessage vmess2 = new PfValidationMessage(PfConceptKey.getNullKey(), PfConceptKey.class,
-                        ValidationResult.WARNING, "Some message");
+                ValidationResult.WARNING, SOME_MESSAGE);
         result.addValidationMessage(vmess2);
 
         assertFalse(result.isOk());
         assertTrue(result.isValid());
         assertEquals(PfValidationResult.ValidationResult.WARNING, result.getValidationResult());
         assertNotNull(result.getMessageList());
-        assertNotNull("hello", result.toString());
+        assertNotNull(HELLO, result.toString());
 
         PfValidationMessage vmess3 = new PfValidationMessage(PfConceptKey.getNullKey(), PfConceptKey.class,
-                        ValidationResult.INVALID, "Some message");
+                ValidationResult.INVALID, SOME_MESSAGE);
         result.addValidationMessage(vmess3);
 
         assertFalse(result.isOk());
         assertFalse(result.isValid());
         assertEquals(PfValidationResult.ValidationResult.INVALID, result.getValidationResult());
         assertNotNull(result.getMessageList());
-        assertNotNull("hello", result.toString());
+        assertNotNull(HELLO, result.toString());
+
+        assertEquals(PfValidationResult.ValidationResult.INVALID, result.getMessageList().get(1).getValidationResult());
+        assertEquals(SOME_MESSAGE, result.getMessageList().get(1).getMessage());
+        assertEquals(PfConceptKey.class.getName(), result.getMessageList().get(1).getObservedClass());
+        assertEquals(PfConceptKey.getNullKey(), result.getMessageList().get(1).getObservedKey());
+    }
 
-        assertEquals(PfValidationResult.ValidationResult.INVALID, result.getMessageList().get(3).getValidationResult());
-        assertEquals("Some message", result.getMessageList().get(3).getMessage());
-        assertEquals(PfConceptKey.class.getCanonicalName(), result.getMessageList().get(3).getObservedClass());
-        assertEquals(PfConceptKey.getNullKey(), result.getMessageList().get(3).getObservedKey());
+    @Test
+    public void testValidationAppend() {
+        PfValidationResult result = new PfValidationResult();
+
+        PfValidationResult result2 = new PfValidationResult();
+        PfValidationMessage vmess1 = new PfValidationMessage(PfConceptKey.getNullKey(), PfConceptKey.class,
+                ValidationResult.OBSERVATION, "Message 1");
+        result2.addValidationMessage(vmess1);
+
+        result.append(result2);
+        assertEquals(1, result.getMessageList().size());
+        assertEquals(ValidationResult.OBSERVATION, result.getValidationResult());
+
+        PfValidationResult result3 = new PfValidationResult();
+        PfValidationMessage vmess2 = new PfValidationMessage(PfConceptKey.getNullKey(), PfConceptKey.class,
+                ValidationResult.WARNING, "Message 2");
+        result3.addValidationMessage(vmess2);
+        result.append(result3);
+        assertEquals(2, result.getMessageList().size());
+        assertEquals(ValidationResult.WARNING, result.getValidationResult());
+
+        PfValidationResult result4 = new PfValidationResult();
+        PfValidationMessage vmess3 = new PfValidationMessage(PfConceptKey.getNullKey(), PfConceptKey.class,
+                ValidationResult.INVALID, "Message 3");
+        PfValidationMessage vmess4 = new PfValidationMessage(PfConceptKey.getNullKey(), PfConceptKey.class,
+                ValidationResult.VALID, "Message 4");
+        result4.addValidationMessage(vmess3);
+        result4.addValidationMessage(vmess4);
+        result.append(result4);
+        assertEquals(4, result.getMessageList().size());
+        assertEquals(ValidationResult.INVALID, result.getValidationResult());
     }
 }