Clean up minor checkstyle/sonar issues

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

diff --git a/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceTest.java b/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceTest.java
index 1923862..dc5d9d3 100644 (file)
--- a/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceTest.java
+++ b/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceTest.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.
@@ -36,23 +36,23 @@ public class ServiceTest {
     @Test
     public void testConstructors() {
         Service svc = new Service();
-        assertEquals(null, svc.getServiceUUID());
-        assertEquals(null, svc.getServiceInvariantUUID());
+        assertEquals(null, svc.getServiceUuid());
+        assertEquals(null, svc.getServiceInvariantUuid());
         assertEquals(null, svc.getServiceName());
         assertEquals(null, svc.getServiceVersion());
 
         UUID uuid = UUID.randomUUID();
         svc = new Service(uuid);
-        assertEquals(uuid, svc.getServiceUUID());
-        assertEquals(null, svc.getServiceInvariantUUID());
+        assertEquals(uuid, svc.getServiceUuid());
+        assertEquals(null, svc.getServiceInvariantUuid());
         assertEquals(null, svc.getServiceName());
         assertEquals(null, svc.getServiceVersion());
 
         String name = "constTest";
         svc = new Service(name);
-        assertEquals(null, svc.getServiceUUID());
+        assertEquals(null, svc.getServiceUuid());
         assertEquals(name, svc.getServiceName());
-        assertEquals(null, svc.getServiceInvariantUUID());
+        assertEquals(null, svc.getServiceInvariantUuid());
         assertEquals(null, svc.getServiceVersion());
 
         uuid = UUID.randomUUID();
@@ -60,14 +60,14 @@ public class ServiceTest {
         name = "constTestUUID";
         String version = "0.0.1";
         svc = new Service(uuid, uuidInvariant, name, version);
-        assertEquals(uuid, svc.getServiceUUID());
-        assertEquals(uuidInvariant, svc.getServiceInvariantUUID());
+        assertEquals(uuid, svc.getServiceUuid());
+        assertEquals(uuidInvariant, svc.getServiceInvariantUuid());
         assertEquals(name, svc.getServiceName());
         assertEquals(version, svc.getServiceVersion());
 
         Service s2 = new Service(svc);
-        assertEquals(uuid, s2.getServiceUUID());
-        assertEquals(uuidInvariant, s2.getServiceInvariantUUID());
+        assertEquals(uuid, s2.getServiceUuid());
+        assertEquals(uuidInvariant, s2.getServiceInvariantUuid());
         assertEquals(name, s2.getServiceName());
         assertEquals(version, s2.getServiceVersion());
     }
@@ -76,16 +76,16 @@ public class ServiceTest {
     public void testUuid() {
         Service svc = new Service();
         UUID uuid = UUID.randomUUID();
-        svc.setServiceUUID(uuid);
-        assertEquals(uuid, svc.getServiceUUID());
+        svc.setServiceUuid(uuid);
+        assertEquals(uuid, svc.getServiceUuid());
     }
 
     @Test
     public void testInvariantUuid() {
         Service svc = new Service();
         UUID uuid = UUID.randomUUID();
-        svc.setServiceInvariantUUID(uuid);
-        assertEquals(uuid, svc.getServiceInvariantUUID());
+        svc.setServiceInvariantUuid(uuid);
+        assertEquals(uuid, svc.getServiceInvariantUuid());
     }
 
     @Test