* 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.
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());
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());
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());
public void testInstanceName() {
ResourceInstance ri = new ResourceInstance();
String name = "nameTestInstance";
- ri.setResourceInstanceName(name);;
+ ri.setResourceInstanceName(name);
+ ;
assertEquals(name, ri.getResourceInstanceName());
}
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
ri1.setResourceInstanceName(INSTANCE);
ri1.setResourceName(RESOURCE);
- ri1.setResourceInvariantUUID(UUID.randomUUID());
- ri1.setResourceInvariantUUID(UUID.randomUUID());
+ ri1.setResourceInvariantUuid(UUID.randomUUID());
+ ri1.setResourceInvariantUuid(UUID.randomUUID());
ri1.setResourceVersion(VERSION_000);
ri1.setResourceType(ResourceType.VL);
ri2 = new ResourceInstance(ri1);
ri1.setResourceInstanceName(INSTANCE);
ri1.setResourceName(RESOURCE);
- ri1.setResourceInvariantUUID(UUID.randomUUID());
- ri1.setResourceInvariantUUID(UUID.randomUUID());
+ ri1.setResourceInvariantUuid(UUID.randomUUID());
+ ri1.setResourceInvariantUuid(UUID.randomUUID());
ri1.setResourceVersion(VERSION_000);
ri1.setResourceType(ResourceType.VL);
ri2 = new ResourceInstance(ri1);
ri1.setResourceInstanceName(INSTANCE);
ri1.setResourceName(RESOURCE);
- ri1.setResourceInvariantUUID(UUID.randomUUID());
- ri1.setResourceInvariantUUID(UUID.randomUUID());
+ ri1.setResourceInvariantUuid(UUID.randomUUID());
+ ri1.setResourceInvariantUuid(UUID.randomUUID());
ri1.setResourceVersion(VERSION_000);
ri1.setResourceType(ResourceType.VL);
ri2 = new ResourceInstance(ri1);