diff options
Diffstat (limited to 'controlloop/common/model-impl/sdc/src/test/java')
2 files changed, 19 insertions, 19 deletions
diff --git a/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestResource.java b/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestResource.java index 7e64787f8..7b3a3e1f6 100644 --- a/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestResource.java +++ b/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestResource.java @@ -32,26 +32,26 @@ public class TestResource { @Test public void testConstructors() { Resource res = new Resource(); - assertEquals(null, res.getResourceUUID()); - assertEquals(null, res.getResourceInvariantUUID()); + assertEquals(null, res.getResourceUuid()); + assertEquals(null, res.getResourceInvariantUuid()); assertEquals(null, res.getResourceName()); assertEquals(null, res.getResourceType()); assertEquals(null, res.getResourceVersion()); UUID uuid = UUID.randomUUID(); res = new Resource(uuid); - assertEquals(uuid, res.getResourceUUID()); - assertEquals(null, res.getResourceInvariantUUID()); + assertEquals(uuid, res.getResourceUuid()); + assertEquals(null, res.getResourceInvariantUuid()); assertEquals(null, res.getResourceName()); assertEquals(null, res.getResourceType()); assertEquals(null, res.getResourceVersion()); String name = "constTest"; res = new Resource(name, ResourceType.CP); - assertEquals(null, res.getResourceUUID()); + assertEquals(null, res.getResourceUuid()); assertEquals(name, res.getResourceName()); assertEquals(ResourceType.CP, res.getResourceType()); - assertEquals(null, res.getResourceInvariantUUID()); + assertEquals(null, res.getResourceInvariantUuid()); assertEquals(null, res.getResourceVersion()); uuid = UUID.randomUUID(); @@ -59,15 +59,15 @@ public class TestResource { name = "constTestUUID"; String version = "0.0.1"; res = new Resource(uuid, uuidInvariant, name, version, ResourceType.VF); - assertEquals(uuid, res.getResourceUUID()); - assertEquals(uuidInvariant, res.getResourceInvariantUUID()); + assertEquals(uuid, res.getResourceUuid()); + assertEquals(uuidInvariant, res.getResourceInvariantUuid()); assertEquals(name, res.getResourceName()); assertEquals(ResourceType.VF, res.getResourceType()); assertEquals(version, res.getResourceVersion()); Resource r2 = new Resource(res); - assertEquals(uuid, r2.getResourceUUID()); - assertEquals(uuidInvariant, r2.getResourceInvariantUUID()); + assertEquals(uuid, r2.getResourceUuid()); + assertEquals(uuidInvariant, r2.getResourceInvariantUuid()); assertEquals(name, r2.getResourceName()); assertEquals(ResourceType.VF, r2.getResourceType()); assertEquals(version, r2.getResourceVersion()); @@ -77,16 +77,16 @@ public class TestResource { public void testUuid() { Resource res = new Resource(); UUID uuid = UUID.randomUUID(); - res.setResourceUUID(uuid); - assertEquals(uuid, res.getResourceUUID()); + res.setResourceUuid(uuid); + assertEquals(uuid, res.getResourceUuid()); } @Test public void testInvariantUuid() { Resource res = new Resource(); UUID uuid = UUID.randomUUID(); - res.setResourceInvariantUUID(uuid); - assertEquals(uuid, res.getResourceInvariantUUID()); + res.setResourceInvariantUuid(uuid); + assertEquals(uuid, res.getResourceInvariantUuid()); } @Test diff --git a/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestResourceInstance.java b/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestResourceInstance.java index 77847f167..2a1dc42b3 100644 --- a/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestResourceInstance.java +++ b/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestResourceInstance.java @@ -33,7 +33,7 @@ public class TestResourceInstance { public void testConstructors() { ResourceInstance ri = new ResourceInstance(); assertEquals(null, ri.getResourceInstanceName()); - assertEquals(null, ri.getResourceUUID()); + assertEquals(null, ri.getResourceUuid()); assertEquals(null, ri.getResourceInvariantUUID()); assertEquals(null, ri.getResourceName()); assertEquals(null, ri.getResourceType()); @@ -41,7 +41,7 @@ public class TestResourceInstance { ResourceInstance ri2 = new ResourceInstance((ResourceInstance) null); assertEquals(null, ri2.getResourceInstanceName()); - assertEquals(null, ri2.getResourceUUID()); + assertEquals(null, ri2.getResourceUuid()); assertEquals(null, ri2.getResourceInvariantUUID()); assertEquals(null, ri2.getResourceName()); assertEquals(null, ri2.getResourceType()); @@ -49,7 +49,7 @@ public class TestResourceInstance { ri2 = new ResourceInstance(ri); assertEquals(ri2.getResourceInstanceName(), ri.getResourceInstanceName()); - assertEquals(ri2.getResourceUUID(), ri.getResourceUUID()); + assertEquals(ri2.getResourceUuid(), ri.getResourceUuid()); assertEquals(ri2.getResourceInvariantUUID(), ri.getResourceInvariantUUID()); assertEquals(ri2.getResourceName(), ri.getResourceName()); assertEquals(ri2.getResourceType(), ri.getResourceType()); @@ -68,8 +68,8 @@ public class TestResourceInstance { public void testUuid() { ResourceInstance ri = new ResourceInstance(); UUID uuid = UUID.randomUUID(); - ri.setResourceUUID(uuid); - assertEquals(uuid, ri.getResourceUUID()); + ri.setResourceUuid(uuid); + assertEquals(uuid, ri.getResourceUuid()); } @Test |