From dc14facf0f51fff5bacbd77a50aaf065db6399c6 Mon Sep 17 00:00:00 2001 From: Michael Hwang Date: Tue, 26 Sep 2017 17:50:21 -0400 Subject: Add more unit tests Change-Id: I514389aa3d154a35505d833fd4ae0155f07b7f67 Issue-Id: DCAEGEN2-60 Signed-off-by: Michael Hwang --- src/test/java/DcaeServicesApiServiceImplTests.java | 252 +++++++++++++++++++++ .../DcaeServicesGroupbyApiServiceImplTests.java | 92 ++++++++ src/test/java/Util.java | 130 +++++++++++ .../models/DCAEServiceComponentObjectTests.java | 71 ++++++ .../dbthings/models/DCAEServiceObjectTests.java | 72 ++++++ 5 files changed, 617 insertions(+) create mode 100644 src/test/java/DcaeServicesApiServiceImplTests.java create mode 100644 src/test/java/DcaeServicesGroupbyApiServiceImplTests.java create mode 100644 src/test/java/Util.java create mode 100644 src/test/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceComponentObjectTests.java create mode 100644 src/test/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceObjectTests.java diff --git a/src/test/java/DcaeServicesApiServiceImplTests.java b/src/test/java/DcaeServicesApiServiceImplTests.java new file mode 100644 index 0000000..50d6e5b --- /dev/null +++ b/src/test/java/DcaeServicesApiServiceImplTests.java @@ -0,0 +1,252 @@ +/*- + * ============LICENSE_START======================================================= + * dcae-inventory + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +import io.swagger.api.NotFoundException; +import io.swagger.api.impl.DcaeServicesApiServiceImpl; +import io.swagger.model.DCAEService; +import io.swagger.model.DCAEServiceComponent; +import io.swagger.model.DCAEServiceRequest; +import org.joda.time.DateTime; +import org.junit.Before; +import org.junit.Test; +import org.junit.internal.runners.statements.Fail; +import org.junit.runner.RunWith; +import org.openecomp.dcae.inventory.clients.DCAEControllerClient; +import org.openecomp.dcae.inventory.clients.DatabusControllerClient; +import org.openecomp.dcae.inventory.daos.DCAEServiceComponentsDAO; +import org.openecomp.dcae.inventory.daos.DCAEServiceTypesDAO; +import org.openecomp.dcae.inventory.daos.DCAEServicesDAO; +import org.openecomp.dcae.inventory.daos.InventoryDAOManager; +import org.openecomp.dcae.inventory.dbthings.mappers.DCAEServiceObjectMapper; +import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceComponentObject; +import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceObject; +import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; + +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.*; + +import org.skife.jdbi.v2.Foreman; +import org.skife.jdbi.v2.Handle; +import org.skife.jdbi.v2.Query; +import org.skife.jdbi.v2.tweak.Argument; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.ws.rs.core.Response; +import javax.ws.rs.core.SecurityContext; +import javax.ws.rs.core.UriInfo; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import static org.junit.Assert.fail; + +/** + * Created by mhwang on 9/25/17. + */ +@PrepareForTest({InventoryDAOManager.class}) +@RunWith(PowerMockRunner.class) +public class DcaeServicesApiServiceImplTests { + + private final static Logger LOG = LoggerFactory.getLogger(DcaeServicesApiServiceImplTests.class); + + private DCAEServiceTypesDAO mockTypesDAO = null; + private DCAEServicesDAO mockServicesDAO = null; + private DCAEServiceComponentsDAO mockComponentsDAO = null; + + @Before + public void setupClass() { + mockTypesDAO = mock(DCAEServiceTypesDAO.class); + mockServicesDAO = mock(DCAEServicesDAO.class); + mockComponentsDAO = mock(DCAEServiceComponentsDAO.class); + + // PowerMockito does bytecode magic to mock static methods and use final classes + PowerMockito.mockStatic(InventoryDAOManager.class); + InventoryDAOManager mockDAOManager = mock(InventoryDAOManager.class); + + when(InventoryDAOManager.getInstance()).thenReturn(mockDAOManager); + when(mockDAOManager.getDCAEServicesDAO()).thenReturn(mockServicesDAO); + when(mockDAOManager.getDCAEServiceComponentsDAO()).thenReturn(mockComponentsDAO); + when(mockDAOManager.getDCAEServiceTypesDAO()).thenReturn(mockTypesDAO); + } + + @Test + public void testCreateDCAEService() { + Method createDCAEService = null; + + // This block is a trick to make a private method accessible for testing + try { + createDCAEService = DcaeServicesApiServiceImpl.class.getDeclaredMethod("createDCAEService", DCAEServiceObject.class, + Collection.class, UriInfo.class); + createDCAEService.setAccessible(true); + } catch(NoSuchMethodException e) { + fail("Failed to do the reflection trick to test the private method: createDCAEService"); + } + + DCAEControllerClient dcc = mock(DCAEControllerClient.class); + DatabusControllerClient dbcc = mock(DatabusControllerClient.class); + DcaeServicesApiServiceImpl api = new DcaeServicesApiServiceImpl(dcc, dbcc); + + DCAEServiceRequest serviceRequest = new DCAEServiceRequest(); + serviceRequest.setTypeId("type-id-abc"); + serviceRequest.setVnfId("vnf-id-def"); + String serviceId = "service-id-123"; + DCAEServiceObject serviceObject = new DCAEServiceObject(serviceId, serviceRequest); + List components = new ArrayList(); + UriInfo uriInfo = new Util.FakeUriInfo(); + + try { + DCAEService service = (DCAEService) createDCAEService.invoke(api, serviceObject, components, uriInfo); + assertEquals(service.getServiceId(), serviceObject.getServiceId()); + } catch(Exception e) { + fail("Failed to execute the hacked createDCAEService method"); + } + } + + @Test + public void testDcaeServicesServiceIdGet() { + String serviceId = "service-id-123"; + DCAEServiceRequest serviceRequest = new DCAEServiceRequest(); + serviceRequest.setTypeId("type-id-abc"); + serviceRequest.setVnfId("vnf-id-def"); + DCAEServiceObject serviceObject = new DCAEServiceObject(serviceId, serviceRequest); + when(mockServicesDAO.getByServiceId(DCAEServiceObject.DCAEServiceStatus.RUNNING, serviceId)).thenReturn(serviceObject); + when(mockComponentsDAO.getByServiceId(serviceId)).thenReturn(new ArrayList()); + + DCAEControllerClient dcc = mock(DCAEControllerClient.class); + DatabusControllerClient dbcc = mock(DatabusControllerClient.class); + DcaeServicesApiServiceImpl api = new DcaeServicesApiServiceImpl(dcc, dbcc); + UriInfo uriInfo = new Util.FakeUriInfo(); + + try { + Response response = api.dcaeServicesServiceIdGet(serviceId, uriInfo, null); + assertEquals(response.getStatus(), 200); + } catch(NotFoundException e) { + fail("Service should have been found"); + } + } + + /* + Commented this unit test because could not get past Nullpointer in the line trying to mock the explicit "bind" function + call. Mockito does not handle mocking overloaded functions well so it goes into the actual method where an member variable + called foreman is null. + @Test + public void testDcaeServicesGet() { + Handle mockHandle = mock(Handle.class); + when(InventoryDAOManager.getInstance().getHandle()).thenReturn(mockHandle); + Query mockQueryGeneric = mock(Query.class); + Query mockQuery = mock(Query.class); + when(mockHandle.createQuery(any())).thenReturn(mockQueryGeneric); + when(mockQueryGeneric.map(any(DCAEServiceObjectMapper.class))).thenReturn(mockQuery); + // LOOK HERE! + doReturn(null).when(mockQuery.bind(anyString(), any(DateTime.class))); + when(mockQuery.bind(anyString(), anyInt())).thenReturn(null); + + DCAEControllerClient dcc = mock(DCAEControllerClient.class); + DatabusControllerClient dbcc = mock(DatabusControllerClient.class); + DcaeServicesApiServiceImpl api = new DcaeServicesApiServiceImpl(dcc, dbcc); + + String typeId = "some-type-id"; + String vnfId = "some-vnf-id"; + String vnfType = "some-vnf-type"; + String vnfLocation = "some-vnf-location"; + String componentType = "some-component-type"; + Boolean shareable = Boolean.TRUE; + DateTime created = null; + Integer offset = 0; + UriInfo uriInfo = new Util.FakeUriInfo(); + SecurityContext securityContext = null; + + when(mockQuery.list()).thenReturn(new ArrayList()); + + Response response = api.dcaeServicesGet(typeId, vnfId, vnfType, vnfLocation, componentType, shareable, created, + offset, uriInfo, securityContext); + assertEquals(response.getStatus(), 200); + } + */ + + @Test + public void testDcaeServicesServiceIdPutMissingType() { + String serviceId = "service-id-123"; + DCAEServiceRequest serviceRequest = new DCAEServiceRequest(); + serviceRequest.setTypeId("type-id-abc"); + serviceRequest.setVnfId("vnf-id-def"); + + when(mockTypesDAO.getByTypeIdActiveOnly(serviceRequest.getTypeId())).thenReturn(null); + + DCAEControllerClient dcc = mock(DCAEControllerClient.class); + DatabusControllerClient dbcc = mock(DatabusControllerClient.class); + DcaeServicesApiServiceImpl api = new DcaeServicesApiServiceImpl(dcc, dbcc); + UriInfo uriInfo = new Util.FakeUriInfo(); + + Response response = api.dcaeServicesServiceIdPut(serviceId, serviceRequest, uriInfo, null); + assertEquals(response.getStatus(), 422); + } + + @Test + public void testDcaeServicesServiceIdDelete() { + String serviceId = "service-id-123"; + DCAEServiceRequest serviceRequest = new DCAEServiceRequest(); + serviceRequest.setTypeId("type-id-abc"); + serviceRequest.setVnfId("vnf-id-def"); + DCAEServiceObject serviceObject = new DCAEServiceObject(serviceId, serviceRequest); + when(mockServicesDAO.getByServiceId(DCAEServiceObject.DCAEServiceStatus.RUNNING, serviceId)).thenReturn(serviceObject); + + DCAEControllerClient dcc = mock(DCAEControllerClient.class); + DatabusControllerClient dbcc = mock(DatabusControllerClient.class); + DcaeServicesApiServiceImpl api = new DcaeServicesApiServiceImpl(dcc, dbcc); + UriInfo uriInfo = new Util.FakeUriInfo(); + + try { + Response response = api.dcaeServicesServiceIdDelete(serviceId, null); + assertEquals(response.getStatus(), 200); + } catch(NotFoundException e) { + fail("Should have NOT thrown a NotFoundException"); + } catch(Exception e) { + LOG.error("Unexpected exception", e); + fail("Unexpected exception"); + } + } + + @Test + public void testDcaeServicesServiceIdDeleteMissingService() { + String serviceId = "service-id-123"; + when(mockServicesDAO.getByServiceId(DCAEServiceObject.DCAEServiceStatus.RUNNING, serviceId)).thenReturn(null); + + DCAEControllerClient dcc = mock(DCAEControllerClient.class); + DatabusControllerClient dbcc = mock(DatabusControllerClient.class); + DcaeServicesApiServiceImpl api = new DcaeServicesApiServiceImpl(dcc, dbcc); + UriInfo uriInfo = new Util.FakeUriInfo(); + + try { + api.dcaeServicesServiceIdDelete(serviceId, null); + fail("Should have thrown a NotFoundException"); + } catch(NotFoundException e) { + LOG.info("NotFoundException successfully thrown"); + } catch(Exception e) { + LOG.error("Unexpected exception", e); + fail("Unexpected exception"); + } + } + +} diff --git a/src/test/java/DcaeServicesGroupbyApiServiceImplTests.java b/src/test/java/DcaeServicesGroupbyApiServiceImplTests.java new file mode 100644 index 0000000..ffe7cb2 --- /dev/null +++ b/src/test/java/DcaeServicesGroupbyApiServiceImplTests.java @@ -0,0 +1,92 @@ +/*- + * ============LICENSE_START======================================================= + * dcae-inventory + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +import io.swagger.api.impl.DcaeServicesGroupbyApiServiceImpl; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.stubbing.OngoingStubbing; +import org.openecomp.dcae.inventory.daos.InventoryDAOManager; +import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceObject; +import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; +import org.skife.jdbi.v2.Handle; +import org.skife.jdbi.v2.Query; + +import javax.ws.rs.core.Response; +import javax.ws.rs.core.UriInfo; + +import static org.junit.Assert.assertEquals; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +/** + * Created by mhwang on 9/27/17. + */ +@PrepareForTest({InventoryDAOManager.class}) +@RunWith(PowerMockRunner.class) +public class DcaeServicesGroupbyApiServiceImplTests { + + @Before + public void setupClass() { + // PowerMockito does bytecode magic to mock static methods and use final classes + PowerMockito.mockStatic(InventoryDAOManager.class); + InventoryDAOManager mockDAOManager = mock(InventoryDAOManager.class); + + when(InventoryDAOManager.getInstance()).thenReturn(mockDAOManager); + } + + @Test + public void testBadRequest() { + DcaeServicesGroupbyApiServiceImpl api = new DcaeServicesGroupbyApiServiceImpl(); + + String propertyName = "non-existent"; + UriInfo uriInfo = new Util.FakeUriInfo(); + Response response = api.dcaeServicesGroupbyPropertyNameGet(propertyName, uriInfo, null); + assertEquals(response.getStatus(), 400); + } + + /* + Commented this unit test because could not get past Nullpointer in the line trying to mock the explicit "bind" function + call. Mockito does not handle mocking overloaded functions well so it goes into the actual method where an member variable + called foreman is null. + @Test + public void testNoResults() { + DcaeServicesGroupbyApiServiceImpl api = new DcaeServicesGroupbyApiServiceImpl(); + + String propertyName = "type"; + UriInfo uriInfo = new Util.FakeUriInfo(); + + Handle mockHandle = mock(Handle.class); + when(InventoryDAOManager.getInstance().getHandle()).thenReturn(mockHandle); + Query mockQueryGeneric = mock(Query.class); + when(mockHandle.createQuery(any())).thenReturn(mockQueryGeneric); + // LOOK HERE! + when(mockQueryGeneric.bind(any(), DCAEServiceObject.DCAEServiceStatus.RUNNING)).thenReturn(mockQueryGeneric); + when(mockQueryGeneric.list()).thenReturn(null); + + Response response = api.dcaeServicesGroupbyPropertyNameGet(propertyName, uriInfo, null); + assertEquals(response.getStatus(), 400); + } + */ + +} diff --git a/src/test/java/Util.java b/src/test/java/Util.java new file mode 100644 index 0000000..9607148 --- /dev/null +++ b/src/test/java/Util.java @@ -0,0 +1,130 @@ +/*- + * ============LICENSE_START======================================================= + * dcae-inventory + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +import javax.ws.rs.core.MultivaluedMap; +import javax.ws.rs.core.PathSegment; +import javax.ws.rs.core.UriBuilder; +import javax.ws.rs.core.UriInfo; +import java.net.URI; +import java.util.List; + +/** + * Created by mhwang on 9/25/17. + */ +public class Util { + + public static class FakeUriInfo implements UriInfo { + + @Override + public String getPath() { + return null; + } + + @Override + public String getPath(boolean b) { + return null; + } + + @Override + public List getPathSegments() { + return null; + } + + @Override + public List getPathSegments(boolean b) { + return null; + } + + @Override + public URI getRequestUri() { + return null; + } + + @Override + public UriBuilder getRequestUriBuilder() { + return null; + } + + @Override + public URI getAbsolutePath() { + return null; + } + + @Override + public UriBuilder getAbsolutePathBuilder() { + return null; + } + + @Override + public URI getBaseUri() { + return null; + } + + @Override + public UriBuilder getBaseUriBuilder() { + return UriBuilder.fromUri("http://some-fake-base-uri"); + } + + @Override + public MultivaluedMap getPathParameters() { + return null; + } + + @Override + public MultivaluedMap getPathParameters(boolean b) { + return null; + } + + @Override + public MultivaluedMap getQueryParameters() { + return null; + } + + @Override + public MultivaluedMap getQueryParameters(boolean b) { + return null; + } + + @Override + public List getMatchedURIs() { + return null; + } + + @Override + public List getMatchedURIs(boolean b) { + return null; + } + + @Override + public List getMatchedResources() { + return null; + } + + @Override + public URI resolve(URI uri) { + return null; + } + + @Override + public URI relativize(URI uri) { + return null; + } + } +} diff --git a/src/test/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceComponentObjectTests.java b/src/test/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceComponentObjectTests.java new file mode 100644 index 0000000..44f4f73 --- /dev/null +++ b/src/test/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceComponentObjectTests.java @@ -0,0 +1,71 @@ +/*- + * ============LICENSE_START======================================================= + * dcae-inventory + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.inventory.dbthings.models; + +import io.swagger.model.DCAEServiceComponentRequest; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; + +/** + * Created by mhwang on 9/27/17. + */ +public class DCAEServiceComponentObjectTests { + + @Test + public void testConstructionByRequest() { + DCAEServiceComponentRequest request = (new DCAEServiceComponentRequest()).componentId("some-component-id") + .componentType("scary-component-type"); + request.setComponentSource("controller"); + request.setShareable(0); + + DCAEServiceComponentObject object = new DCAEServiceComponentObject(request); + assertEquals(object.getComponentId(), request.getComponentId()); + assertNotNull(object.getCreated()); + assertNotNull(object.getModified()); + } + + @Test + public void testConstructionForUpdating() { + DCAEServiceComponentRequest requestFirst = (new DCAEServiceComponentRequest()).componentId("some-component-id") + .componentType("scary-component-type"); + requestFirst.setComponentSource("controller"); + requestFirst.setShareable(0); + + DCAEServiceComponentObject objectFirst = new DCAEServiceComponentObject(requestFirst); + + DCAEServiceComponentRequest requestSecond = (new DCAEServiceComponentRequest()).componentId("some-other-component-id") + .componentType("happy-component-type"); + requestFirst.setComponentSource("controllerless"); + requestFirst.setShareable(1); + + DCAEServiceComponentObject objectUpdated = new DCAEServiceComponentObject(objectFirst, requestSecond); + assertEquals(objectUpdated.getComponentId(), requestFirst.getComponentId()); + assertEquals(objectUpdated.getCreated(), objectFirst.getCreated()); + assertEquals(objectUpdated.getComponentType(), requestSecond.getComponentType()); + assertEquals(objectUpdated.getComponentSource(), requestSecond.getComponentSource()); + assertEquals(objectUpdated.getShareable(), requestSecond.getShareable()); + assertNotSame(objectUpdated.getModified(), objectFirst.getModified()); + } + +} diff --git a/src/test/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceObjectTests.java b/src/test/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceObjectTests.java new file mode 100644 index 0000000..9f7b6f8 --- /dev/null +++ b/src/test/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceObjectTests.java @@ -0,0 +1,72 @@ +/*- + * ============LICENSE_START======================================================= + * dcae-inventory + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.inventory.dbthings.models; + +import io.swagger.model.DCAEServiceRequest; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +/** + * Created by mhwang on 9/27/17. + */ +public class DCAEServiceObjectTests { + + @Test + public void testConstructionByRequest() { + DCAEServiceRequest request = new DCAEServiceRequest(); + request.setTypeId("some-type-id"); + request.setVnfType("foo-vnf-type"); + request.setVnfLocation("san-janero"); + + String serviceId = "some-service-id"; + + DCAEServiceObject object = new DCAEServiceObject(serviceId, request); + assertEquals(object.getServiceId(), serviceId); + assertNotNull(object.getCreated()); + assertNotNull(object.getModified()); + } + + @Test + public void testConstructionByUpdating() { + DCAEServiceRequest requestFirst = new DCAEServiceRequest(); + requestFirst.setTypeId("some-type-id"); + requestFirst.setVnfType("foo-vnf-type"); + requestFirst.setVnfLocation("san-janero"); + + String serviceId = "some-service-id"; + + DCAEServiceObject objectFirst = new DCAEServiceObject(serviceId, requestFirst); + + DCAEServiceRequest requestSecond = new DCAEServiceRequest(); + requestFirst.setTypeId("other-type-id"); + requestFirst.setVnfType("bar-vnf-type"); + requestFirst.setVnfLocation("san-junipero"); + + DCAEServiceObject objectUpdated = new DCAEServiceObject(objectFirst, requestSecond); + assertEquals(objectUpdated.getServiceId(), objectFirst.getServiceId()); + assertEquals(objectUpdated.getTypeId(), requestSecond.getTypeId()); + assertEquals(objectUpdated.getVnfType(), requestSecond.getVnfType()); + assertEquals(objectUpdated.getVnfLocation(), requestSecond.getVnfLocation()); + } + +} -- cgit 1.2.3-korg