diff options
Diffstat (limited to 'plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/test')
3 files changed, 12 insertions, 12 deletions
diff --git a/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/NodesControllerTest.java b/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/NodesControllerTest.java index 50ab04c6..e67d0987 100644 --- a/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/NodesControllerTest.java +++ b/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/NodesControllerTest.java @@ -39,7 +39,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.onap.aai.domain.yang.ServiceInstance; import org.onap.so.aaisimulator.models.Format; -import org.onap.so.aaisimulator.models.Result; +import org.onap.so.aaisimulator.models.Results; import org.onap.so.aaisimulator.service.providers.CustomerCacheServiceProvider; import org.onap.so.aaisimulator.service.providers.NodesCacheServiceProvider; import org.onap.so.aaisimulator.utils.Constants; @@ -130,14 +130,14 @@ public class NodesControllerTest { final ResponseEntity<Void> response2 = invokeHttpPut(url, getServiceInstance()); assertEquals(HttpStatus.ACCEPTED, response2.getStatusCode()); - final ResponseEntity<Result> actual = restTemplate.exchange( + final ResponseEntity<Results> actual = restTemplate.exchange( getNodesEndPointUrl() + SERVICE_INSTANCE_URL + "?format=" + Format.PATHED.getValue(), HttpMethod.GET, - new HttpEntity<>(getHttpHeaders()), Result.class); + new HttpEntity<>(getHttpHeaders()), Results.class); assertEquals(HttpStatus.OK, actual.getStatusCode()); assertTrue(actual.hasBody()); - final Result result = actual.getBody(); + final Results result = actual.getBody(); assertNotNull(result.getValues()); assertFalse(result.getValues().isEmpty()); diff --git a/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/OwningEntityControllerTest.java b/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/OwningEntityControllerTest.java index 7f825db8..7aabc665 100644 --- a/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/OwningEntityControllerTest.java +++ b/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/OwningEntityControllerTest.java @@ -34,7 +34,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.onap.aai.domain.yang.OwningEntity; import org.onap.so.aaisimulator.models.Format; -import org.onap.so.aaisimulator.models.Result; +import org.onap.so.aaisimulator.models.Results; import org.onap.so.aaisimulator.service.providers.OwnEntityCacheServiceProvider; import org.onap.so.aaisimulator.utils.Constants; import org.onap.so.aaisimulator.utils.TestUtils; @@ -112,12 +112,12 @@ public class OwningEntityControllerTest { assertEquals(HttpStatus.ACCEPTED, actual.getStatusCode()); - final ResponseEntity<Result> actualResponse = - invokeHttpGet(url + "?resultIndex=0&resultSize=1&format=" + Format.COUNT.getValue(), Result.class); + final ResponseEntity<Results> actualResponse = + invokeHttpGet(url + "?resultIndex=0&resultSize=1&format=" + Format.COUNT.getValue(), Results.class); assertEquals(HttpStatus.OK, actualResponse.getStatusCode()); assertTrue(actualResponse.hasBody()); - final Result result = actualResponse.getBody(); + final Results result = actualResponse.getBody(); assertNotNull(result.getValues()); assertFalse(result.getValues().isEmpty()); assertEquals(1, result.getValues().get(0).get(Constants.OWNING_ENTITY)); diff --git a/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/ProjectControllerTest.java b/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/ProjectControllerTest.java index e7b067db..d4f686db 100644 --- a/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/ProjectControllerTest.java +++ b/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/ProjectControllerTest.java @@ -32,7 +32,7 @@ import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; import org.onap.aai.domain.yang.Project; -import org.onap.so.aaisimulator.models.Result; +import org.onap.so.aaisimulator.models.Results; import org.onap.so.aaisimulator.service.providers.ProjectCacheServiceProvider; import org.onap.so.aaisimulator.utils.Constants; import org.onap.so.aaisimulator.utils.TestUtils; @@ -135,12 +135,12 @@ public class ProjectControllerTest { assertEquals(HttpStatus.ACCEPTED, actual.getStatusCode()); - final ResponseEntity<Result> actualResponse = - invokeHttpGet(url + "?resultIndex=0&resultSize=1&format=count", Result.class); + final ResponseEntity<Results> actualResponse = + invokeHttpGet(url + "?resultIndex=0&resultSize=1&format=count", Results.class); assertEquals(HttpStatus.OK, actualResponse.getStatusCode()); assertTrue(actualResponse.hasBody()); - final Result result = actualResponse.getBody(); + final Results result = actualResponse.getBody(); assertNotNull(result.getValues()); assertFalse(result.getValues().isEmpty()); assertEquals(1, result.getValues().get(0).get(Constants.PROJECT)); |