Clean up minor checkstyle/sonar issues

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

diff --git a/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceInstanceTest.java b/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceInstanceTest.java
index ca2cb3d..c81a12f 100644 (file)
--- a/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceInstanceTest.java
+++ b/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceInstanceTest.java
@@ -3,7 +3,7 @@
  * sdc
  * ================================================================================
  * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * 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.
@@ -30,33 +30,37 @@ import org.junit.Test;
 
 public class ServiceInstanceTest {
 
+    private static final String SERVICE = "service";
+    private static final String INSTANCE = "instance";
+    private static final String VERSION_333 = "3.3.3";
+
     @Test
     public void testConstructors() {
         ServiceInstance si = new ServiceInstance();
         assertEquals(null, si.getServiceInstanceName());
-        assertEquals(null, si.getServiceUUID());
-        assertEquals(null, si.getServiceInstanceUUID());
+        assertEquals(null, si.getServiceUuid());
+        assertEquals(null, si.getServiceInstanceUuid());
         assertEquals(null, si.getServiceName());
-        assertEquals(null, si.getPersonaModelUUID());
-        assertEquals(null, si.getWidgetModelUUID());
+        assertEquals(null, si.getPersonaModelUuid());
+        assertEquals(null, si.getWidgetModelUuid());
         assertEquals(null, si.getWidgetModelVersion());
 
         ServiceInstance si2 = new ServiceInstance((ServiceInstance) null);
         assertEquals(null, si2.getServiceInstanceName());
-        assertEquals(null, si2.getServiceUUID());
-        assertEquals(null, si2.getServiceInstanceUUID());
+        assertEquals(null, si2.getServiceUuid());
+        assertEquals(null, si2.getServiceInstanceUuid());
         assertEquals(null, si2.getServiceName());
-        assertEquals(null, si2.getPersonaModelUUID());
-        assertEquals(null, si2.getWidgetModelUUID());
+        assertEquals(null, si2.getPersonaModelUuid());
+        assertEquals(null, si2.getWidgetModelUuid());
         assertEquals(null, si2.getWidgetModelVersion());
 
         si2 = new ServiceInstance(si);
         assertEquals(si2.getServiceInstanceName(), si.getServiceInstanceName());
-        assertEquals(si2.getServiceUUID(), si.getServiceUUID());
-        assertEquals(si2.getServiceInstanceUUID(), si.getServiceInstanceUUID());
+        assertEquals(si2.getServiceUuid(), si.getServiceUuid());
+        assertEquals(si2.getServiceInstanceUuid(), si.getServiceInstanceUuid());
         assertEquals(si2.getServiceName(), si.getServiceName());
-        assertEquals(si2.getPersonaModelUUID(), si.getPersonaModelUUID());
-        assertEquals(si2.getWidgetModelUUID(), si.getWidgetModelUUID());
+        assertEquals(si2.getPersonaModelUuid(), si.getPersonaModelUuid());
+        assertEquals(si2.getWidgetModelUuid(), si.getWidgetModelUuid());
         assertEquals(si2.getWidgetModelVersion(), si.getWidgetModelVersion());
     }
 
@@ -64,7 +68,8 @@ public class ServiceInstanceTest {
     public void testInstanceName() {
         ServiceInstance si = new ServiceInstance();
         String name = "nameTestInstance";
-        si.setServiceInstanceName(name);;
+        si.setServiceInstanceName(name);
+        ;
         assertEquals(name, si.getServiceInstanceName());
     }
 
@@ -72,16 +77,16 @@ public class ServiceInstanceTest {
     public void testUuid() {
         ServiceInstance si = new ServiceInstance();
         UUID uuid = UUID.randomUUID();
-        si.setServiceUUID(uuid);
-        assertEquals(uuid, si.getServiceUUID());
+        si.setServiceUuid(uuid);
+        assertEquals(uuid, si.getServiceUuid());
     }
 
     @Test
     public void testInstanceUuid() {
         ServiceInstance si = new ServiceInstance();
         UUID uuid = UUID.randomUUID();
-        si.setServiceInstanceUUID(uuid);
-        assertEquals(uuid, si.getServiceInstanceUUID());
+        si.setServiceInstanceUuid(uuid);
+        assertEquals(uuid, si.getServiceInstanceUuid());
     }
 
     @Test
@@ -96,23 +101,24 @@ public class ServiceInstanceTest {
     public void testPersonaModelUuid() {
         ServiceInstance si = new ServiceInstance();
         UUID uuid = UUID.randomUUID();
-        si.setPersonaModelUUID(uuid);
-        assertEquals(uuid, si.getPersonaModelUUID());
+        si.setPersonaModelUuid(uuid);
+        assertEquals(uuid, si.getPersonaModelUuid());
     }
 
     @Test
     public void testWidgetModelUuid() {
         ServiceInstance si = new ServiceInstance();
         UUID uuid = UUID.randomUUID();
-        si.setWidgetModelUUID(uuid);
-        assertEquals(uuid, si.getWidgetModelUUID());
+        si.setWidgetModelUuid(uuid);
+        assertEquals(uuid, si.getWidgetModelUuid());
     }
 
     @Test
     public void testWidgetModelVersion() {
         ServiceInstance si = new ServiceInstance();
         String version = "2.2.2";
-        si.setWidgetModelVersion(version);;
+        si.setWidgetModelVersion(version);
+        ;
         assertEquals(version, si.getWidgetModelVersion());
     }
 
@@ -123,13 +129,13 @@ public class ServiceInstanceTest {
         assertTrue(si1.equals(si2));
         assertTrue(si2.equals(si1));
 
-        si1.setServiceInstanceName("instance");
-        si1.setServiceName("service");
-        si1.setServiceInstanceUUID(UUID.randomUUID());
-        si1.setServiceUUID(UUID.randomUUID());
-        si1.setPersonaModelUUID(UUID.randomUUID());
-        si1.setWidgetModelUUID(UUID.randomUUID());
-        si1.setWidgetModelVersion("3.3.3");
+        si1.setServiceInstanceName(INSTANCE);
+        si1.setServiceName(SERVICE);
+        si1.setServiceInstanceUuid(UUID.randomUUID());
+        si1.setServiceUuid(UUID.randomUUID());
+        si1.setPersonaModelUuid(UUID.randomUUID());
+        si1.setWidgetModelUuid(UUID.randomUUID());
+        si1.setWidgetModelVersion(VERSION_333);
         si2 = new ServiceInstance(si1);
         assertTrue(si1.equals(si2));
         assertTrue(si2.equals(si1));
@@ -141,13 +147,13 @@ public class ServiceInstanceTest {
         ServiceInstance si2 = new ServiceInstance(si1);
         assertEquals(si1.toString(), si2.toString());
 
-        si1.setServiceInstanceName("instance");
-        si1.setServiceName("service");
-        si1.setServiceInstanceUUID(UUID.randomUUID());
-        si1.setServiceUUID(UUID.randomUUID());
-        si1.setPersonaModelUUID(UUID.randomUUID());
-        si1.setWidgetModelUUID(UUID.randomUUID());
-        si1.setWidgetModelVersion("3.3.3");
+        si1.setServiceInstanceName(INSTANCE);
+        si1.setServiceName(SERVICE);
+        si1.setServiceInstanceUuid(UUID.randomUUID());
+        si1.setServiceUuid(UUID.randomUUID());
+        si1.setPersonaModelUuid(UUID.randomUUID());
+        si1.setWidgetModelUuid(UUID.randomUUID());
+        si1.setWidgetModelVersion(VERSION_333);
         si2 = new ServiceInstance(si1);
         assertEquals(si1.toString(), si2.toString());
     }
@@ -158,13 +164,13 @@ public class ServiceInstanceTest {
         ServiceInstance si2 = new ServiceInstance(si1);
         assertEquals(si1.hashCode(), si2.hashCode());
 
-        si1.setServiceInstanceName("instance");
-        si1.setServiceName("service");
-        si1.setServiceInstanceUUID(UUID.randomUUID());
-        si1.setServiceUUID(UUID.randomUUID());
-        si1.setPersonaModelUUID(UUID.randomUUID());
-        si1.setWidgetModelUUID(UUID.randomUUID());
-        si1.setWidgetModelVersion("3.3.3");
+        si1.setServiceInstanceName(INSTANCE);
+        si1.setServiceName(SERVICE);
+        si1.setServiceInstanceUuid(UUID.randomUUID());
+        si1.setServiceUuid(UUID.randomUUID());
+        si1.setPersonaModelUuid(UUID.randomUUID());
+        si1.setWidgetModelUuid(UUID.randomUUID());
+        si1.setWidgetModelVersion(VERSION_333);
         si2 = new ServiceInstance(si1);
         assertEquals(si1.hashCode(), si2.hashCode());
     }