Sonar Fixes policy/models, removing model-yaml

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

diff --git a/models-base/src/test/java/org/onap/policy/models/base/ValidatedTest.java b/models-base/src/test/java/org/onap/policy/models/base/ValidatedTest.java
index 391e733..5d13670 100644 (file)
--- a/models-base/src/test/java/org/onap/policy/models/base/ValidatedTest.java
+++ b/models-base/src/test/java/org/onap/policy/models/base/ValidatedTest.java
@@ -2,7 +2,8 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy Models
  * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+ * 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.
@@ -35,6 +36,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class ValidatedTest {
+    private static final String COLLECTION_TEXT = "collection";
     private static final String ERROR_MESSAGE = "error message";
     private static final String COLLECTION_FIELD = "coll";
     private static final String VALID_VALUE = "abc123";
@@ -147,9 +149,10 @@ public class ValidatedTest {
         assertTrue(msg.getMessage().contains("name invalid-null"));
         assertTrue(it.next().getMessage().contains("version invalid-null"));
 
+        PfValidationResult pfValidationResult = new PfValidationResult();
         final PfConceptKey key2 = key;
         assertThatThrownBy(() -> validated.validateNotNull(key2, null)).isInstanceOf(NullPointerException.class);
-        assertThatThrownBy(() -> validated.validateNotNull(null, new PfValidationResult()))
+        assertThatThrownBy(() -> validated.validateNotNull(null, pfValidationResult))
                         .isInstanceOf(NullPointerException.class);
     }
 
@@ -236,7 +239,7 @@ public class ValidatedTest {
     @Test
     public void testValidateCollectionNotNull() {
         PfValidationResult result = new PfValidationResult();
-        result = validated.validateCollectionNotNull(this, "collection", null, result);
+        result = validated.validateCollectionNotNull(this, COLLECTION_TEXT, null, result);
         assertTrue(result.isValid());
         assertEquals(0, result.getMessageList().size());
 
@@ -273,7 +276,7 @@ public class ValidatedTest {
     @Test
     public void testValidateCollection() {
         PfValidationResult result = new PfValidationResult();
-        result = validated.validateCollection(this, "collection", null, result);
+        result = validated.validateCollection(this, COLLECTION_TEXT, null, result);
         assertTrue(result.isValid());
         assertEquals(0, result.getMessageList().size());
 
@@ -288,13 +291,13 @@ public class ValidatedTest {
 
         // check first item
         PfValidationMessage msg = it.next();
-        assertEquals(MyValid.class.getName().replace('$', '.'), msg.getObservedClass());
+        assertEquals(MyValid.class.getName(), msg.getObservedClass());
         assertEquals(MY_TO_STRING, msg.getObservedKey().toString());
         assertTrue(msg.getMessage().contains("index.0 invalid-wrong value"));
 
         // check null value
         msg = it.next();
-        assertEquals(MyValid.class.getName().replace('$', '.'), msg.getObservedClass());
+        assertEquals(MyValid.class.getName(), msg.getObservedClass());
         assertEquals(MY_TO_STRING, msg.getObservedKey().toString());
         assertTrue(msg.getMessage().contains("index.2 invalid-wrong value"));
 
@@ -310,7 +313,7 @@ public class ValidatedTest {
     @Test
     public void testValidateConceptCollection() {
         PfValidationResult result = new PfValidationResult();
-        result = validated.validateConceptCollection(this, "collection", null, result);
+        result = validated.validateConceptCollection(this, COLLECTION_TEXT, null, result);
         assertTrue(result.isValid());
         assertEquals(0, result.getMessageList().size());
 
@@ -325,13 +328,13 @@ public class ValidatedTest {
 
         // check first item
         PfValidationMessage msg = it.next();
-        assertEquals(MyConcept.class.getName().replace('$', '.'), msg.getObservedClass());
+        assertEquals(MyConcept.class.getName(), msg.getObservedClass());
         assertEquals(MY_TO_STRING, msg.getObservedKey().toString());
         assertTrue(msg.getMessage().contains("index.0 invalid-wrong value"));
 
         // check null value
         msg = it.next();
-        assertEquals(MyConcept.class.getName().replace('$', '.'), msg.getObservedClass());
+        assertEquals(MyConcept.class.getName(), msg.getObservedClass());
         assertEquals(MY_TO_STRING, msg.getObservedKey().toString());
         assertTrue(msg.getMessage().contains("index.2 invalid-wrong value"));