Fix some sonars in policy-models

[policy/models.git] / models-interactions / model-impl / sdc / src / test / java / org / onap / policy / sdc / ResourceInstanceTest.java

diff --git a/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ResourceInstanceTest.java b/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ResourceInstanceTest.java
index 9409635..fd05aff 100644 (file)
--- a/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ResourceInstanceTest.java
+++ b/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ResourceInstanceTest.java
@@ -2,8 +2,8 @@
  * ============LICENSE_START=======================================================
  * sdc
  * ================================================================================
- * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019-2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,20 +22,22 @@
 package org.onap.policy.sdc;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 import java.util.UUID;
-
 import org.junit.Test;
 
 public class ResourceInstanceTest {
 
+    private static final String RESOURCE = "resource";
+    private static final String INSTANCE = "instance";
+    private static final String VERSION_000 = "0.0.0";
+
     @Test
     public void testConstructors() {
         ResourceInstance ri = new ResourceInstance();
         assertEquals(null, ri.getResourceInstanceName());
         assertEquals(null, ri.getResourceUuid());
-        assertEquals(null, ri.getResourceInvariantUUID());
+        assertEquals(null, ri.getResourceInvariantUuid());
         assertEquals(null, ri.getResourceName());
         assertEquals(null, ri.getResourceType());
         assertEquals(null, ri.getResourceVersion());
@@ -43,7 +45,7 @@ public class ResourceInstanceTest {
         ResourceInstance ri2 = new ResourceInstance((ResourceInstance) null);
         assertEquals(null, ri2.getResourceInstanceName());
         assertEquals(null, ri2.getResourceUuid());
-        assertEquals(null, ri2.getResourceInvariantUUID());
+        assertEquals(null, ri2.getResourceInvariantUuid());
         assertEquals(null, ri2.getResourceName());
         assertEquals(null, ri2.getResourceType());
         assertEquals(null, ri2.getResourceVersion());
@@ -51,7 +53,7 @@ public class ResourceInstanceTest {
         ri2 = new ResourceInstance(ri);
         assertEquals(ri2.getResourceInstanceName(), ri.getResourceInstanceName());
         assertEquals(ri2.getResourceUuid(), ri.getResourceUuid());
-        assertEquals(ri2.getResourceInvariantUUID(), ri.getResourceInvariantUUID());
+        assertEquals(ri2.getResourceInvariantUuid(), ri.getResourceInvariantUuid());
         assertEquals(ri2.getResourceName(), ri.getResourceName());
         assertEquals(ri2.getResourceType(), ri.getResourceType());
         assertEquals(ri2.getResourceVersion(), ri.getResourceVersion());
@@ -61,7 +63,8 @@ public class ResourceInstanceTest {
     public void testInstanceName() {
         ResourceInstance ri = new ResourceInstance();
         String name = "nameTestInstance";
-        ri.setResourceInstanceName(name);;
+        ri.setResourceInstanceName(name);
+        ;
         assertEquals(name, ri.getResourceInstanceName());
     }
 
@@ -77,8 +80,8 @@ public class ResourceInstanceTest {
     public void testInvariantUuid() {
         ResourceInstance ri = new ResourceInstance();
         UUID uuid = UUID.randomUUID();
-        ri.setResourceInvariantUUID(uuid);
-        assertEquals(uuid, ri.getResourceInvariantUUID());
+        ri.setResourceInvariantUuid(uuid);
+        assertEquals(uuid, ri.getResourceInvariantUuid());
     }
 
     @Test
@@ -108,18 +111,18 @@ public class ResourceInstanceTest {
     public void testEquals() {
         ResourceInstance ri1 = new ResourceInstance();
         ResourceInstance ri2 = new ResourceInstance(ri1);
-        assertTrue(ri1.equals(ri2));
-        assertTrue(ri2.equals(ri1));
-
-        ri1.setResourceInstanceName("instance");
-        ri1.setResourceName("resource");
-        ri1.setResourceInvariantUUID(UUID.randomUUID());
-        ri1.setResourceInvariantUUID(UUID.randomUUID());
-        ri1.setResourceVersion("0.0.0");
+        assertEquals(ri1, ri2);
+        assertEquals(ri2, ri1);
+
+        ri1.setResourceInstanceName(INSTANCE);
+        ri1.setResourceName(RESOURCE);
+        ri1.setResourceInvariantUuid(UUID.randomUUID());
+        ri1.setResourceInvariantUuid(UUID.randomUUID());
+        ri1.setResourceVersion(VERSION_000);
         ri1.setResourceType(ResourceType.VL);
         ri2 = new ResourceInstance(ri1);
-        assertTrue(ri1.equals(ri2));
-        assertTrue(ri2.equals(ri1));
+        assertEquals(ri1, ri2);
+        assertEquals(ri2, ri1);
     }
 
     @Test
@@ -128,11 +131,11 @@ public class ResourceInstanceTest {
         ResourceInstance ri2 = new ResourceInstance(ri1);
         assertEquals(ri1.toString(), ri2.toString());
 
-        ri1.setResourceInstanceName("instance");
-        ri1.setResourceName("resource");
-        ri1.setResourceInvariantUUID(UUID.randomUUID());
-        ri1.setResourceInvariantUUID(UUID.randomUUID());
-        ri1.setResourceVersion("0.0.0");
+        ri1.setResourceInstanceName(INSTANCE);
+        ri1.setResourceName(RESOURCE);
+        ri1.setResourceInvariantUuid(UUID.randomUUID());
+        ri1.setResourceInvariantUuid(UUID.randomUUID());
+        ri1.setResourceVersion(VERSION_000);
         ri1.setResourceType(ResourceType.VL);
         ri2 = new ResourceInstance(ri1);
         assertEquals(ri1.toString(), ri2.toString());
@@ -144,11 +147,11 @@ public class ResourceInstanceTest {
         ResourceInstance ri2 = new ResourceInstance(ri1);
         assertEquals(ri1.hashCode(), ri2.hashCode());
 
-        ri1.setResourceInstanceName("instance");
-        ri1.setResourceName("resource");
-        ri1.setResourceInvariantUUID(UUID.randomUUID());
-        ri1.setResourceInvariantUUID(UUID.randomUUID());
-        ri1.setResourceVersion("0.0.0");
+        ri1.setResourceInstanceName(INSTANCE);
+        ri1.setResourceName(RESOURCE);
+        ri1.setResourceInvariantUuid(UUID.randomUUID());
+        ri1.setResourceInvariantUuid(UUID.randomUUID());
+        ri1.setResourceVersion(VERSION_000);
         ri1.setResourceType(ResourceType.VL);
         ri2 = new ResourceInstance(ri1);
         assertEquals(ri1.hashCode(), ri2.hashCode());