summaryrefslogtreecommitdiffstats
path: root/mso-api-handlers/mso-api-handler-infra/src/test/java
diff options
context:
space:
mode:
Diffstat (limited to 'mso-api-handlers/mso-api-handler-infra/src/test/java')
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/validator/NetworkDeleteValidatorTest.java4
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/validator/ServiceInstanceDeleteValidatorTest.java8
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/validator/VnfDeleteValidatorTest.java8
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/validator/VolumeGroupDeleteValidatorTest.java4
4 files changed, 12 insertions, 12 deletions
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/validator/NetworkDeleteValidatorTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/validator/NetworkDeleteValidatorTest.java
index 7780f0ee2b..20ec6d6708 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/validator/NetworkDeleteValidatorTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/validator/NetworkDeleteValidatorTest.java
@@ -58,7 +58,7 @@ public class NetworkDeleteValidatorTest {
public void validateSuccessTest() {
instanceIdMap.put("networkInstanceId", "1");
when(aaiDataRetrieval.isNetworkRelatedToModules("1")).thenReturn(false);
- Optional<String> result = networkValidator.validate(instanceIdMap, null, null);
+ Optional<String> result = networkValidator.validate(instanceIdMap, null, null, null);
assertEquals(false, result.isPresent());
}
@@ -66,7 +66,7 @@ public class NetworkDeleteValidatorTest {
public void validateFailureTest() {
instanceIdMap.put("networkInstanceId", "1");
when(aaiDataRetrieval.isNetworkRelatedToModules("1")).thenReturn(true);
- Optional<String> result = networkValidator.validate(instanceIdMap, null, null);
+ Optional<String> result = networkValidator.validate(instanceIdMap, null, null, null);
assertEquals(true, result.isPresent());
}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/validator/ServiceInstanceDeleteValidatorTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/validator/ServiceInstanceDeleteValidatorTest.java
index f461df3720..c082c96074 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/validator/ServiceInstanceDeleteValidatorTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/validator/ServiceInstanceDeleteValidatorTest.java
@@ -76,7 +76,7 @@ public class ServiceInstanceDeleteValidatorTest {
when(aaiDataRetrieval.isServiceRelatedToGenericVnf("1")).thenReturn(false);
when(aaiDataRetrieval.isServiceRelatedToNetworks("1")).thenReturn(false);
when(aaiDataRetrieval.isServiceRelatedToConfiguration("1")).thenReturn(false);
- Optional<String> result = serviceValidator.validate(instanceIdMap, null, null);
+ Optional<String> result = serviceValidator.validate(instanceIdMap, null, null, null);
assertEquals(false, result.isPresent());
}
@@ -84,7 +84,7 @@ public class ServiceInstanceDeleteValidatorTest {
public void validateFailureVnfTest() {
instanceIdMap.put("serviceInstanceId", "1");
when(aaiDataRetrieval.isServiceRelatedToGenericVnf("1")).thenReturn(true);
- Optional<String> result = serviceValidator.validate(instanceIdMap, null, null);
+ Optional<String> result = serviceValidator.validate(instanceIdMap, null, null, null);
assertEquals(true, result.isPresent());
}
@@ -93,7 +93,7 @@ public class ServiceInstanceDeleteValidatorTest {
instanceIdMap.put("serviceInstanceId", "1");
when(aaiDataRetrieval.isServiceRelatedToGenericVnf("1")).thenReturn(false);
when(aaiDataRetrieval.isServiceRelatedToNetworks("1")).thenReturn(true);
- Optional<String> result = serviceValidator.validate(instanceIdMap, null, null);
+ Optional<String> result = serviceValidator.validate(instanceIdMap, null, null, null);
assertEquals(true, result.isPresent());
}
@@ -103,7 +103,7 @@ public class ServiceInstanceDeleteValidatorTest {
when(aaiDataRetrieval.isServiceRelatedToGenericVnf("1")).thenReturn(false);
when(aaiDataRetrieval.isServiceRelatedToNetworks("1")).thenReturn(false);
when(aaiDataRetrieval.isServiceRelatedToConfiguration("1")).thenReturn(true);
- Optional<String> result = serviceValidator.validate(instanceIdMap, null, null);
+ Optional<String> result = serviceValidator.validate(instanceIdMap, null, null, null);
assertEquals(true, result.isPresent());
}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/validator/VnfDeleteValidatorTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/validator/VnfDeleteValidatorTest.java
index 65ce355ad1..6eb6fc95d6 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/validator/VnfDeleteValidatorTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/validator/VnfDeleteValidatorTest.java
@@ -53,7 +53,7 @@ public class VnfDeleteValidatorTest {
public void validateFailureVfModuleVnfTest() {
instanceIdMap.put("vnfInstanceId", "1");
doReturn(Optional.of("test")).when(aaiDataRetrieval).getVfModuleIdsByVnfId("1");
- Optional<String> result = vnfValidator.validate(instanceIdMap, null, null);
+ Optional<String> result = vnfValidator.validate(instanceIdMap, null, null, null);
assertEquals(true, result.isPresent());
}
@@ -61,7 +61,7 @@ public class VnfDeleteValidatorTest {
public void validateSuccessVfModuleVnfTest() {
instanceIdMap.put("vnfInstanceId", "1");
doReturn(Optional.empty()).when(aaiDataRetrieval).getVfModuleIdsByVnfId("1");
- Optional<String> result = vnfValidator.validate(instanceIdMap, null, null);
+ Optional<String> result = vnfValidator.validate(instanceIdMap, null, null, null);
assertEquals(false, result.isPresent());
}
@@ -69,7 +69,7 @@ public class VnfDeleteValidatorTest {
public void validateFailureVolumeGroupVnfTest() {
instanceIdMap.put("vnfInstanceId", "1");
doReturn(Optional.of("test")).when(aaiDataRetrieval).getVolumeGroupIdsByVnfId("1");
- Optional<String> result = vnfValidator.validate(instanceIdMap, null, null);
+ Optional<String> result = vnfValidator.validate(instanceIdMap, null, null, null);
assertEquals(true, result.isPresent());
}
@@ -77,7 +77,7 @@ public class VnfDeleteValidatorTest {
public void validateSuccessVolumeGroupVnfTest() {
instanceIdMap.put("vnfInstanceId", "1");
doReturn(Optional.empty()).when(aaiDataRetrieval).getVolumeGroupIdsByVnfId("1");
- Optional<String> result = vnfValidator.validate(instanceIdMap, null, null);
+ Optional<String> result = vnfValidator.validate(instanceIdMap, null, null, null);
assertEquals(false, result.isPresent());
}
}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/validator/VolumeGroupDeleteValidatorTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/validator/VolumeGroupDeleteValidatorTest.java
index 3d81ee66c9..7aa12a61a6 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/validator/VolumeGroupDeleteValidatorTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/validator/VolumeGroupDeleteValidatorTest.java
@@ -54,7 +54,7 @@ public class VolumeGroupDeleteValidatorTest {
public void validateSuccessTest() {
instanceIdMap.put("volumeGroupInstanceId", "1");
when(aaiDataRetrieval.isVolumeGroupRelatedToVFModule("1")).thenReturn(false);
- Optional<String> result = volumeGroupDeleteValidator.validate(instanceIdMap, null, null);
+ Optional<String> result = volumeGroupDeleteValidator.validate(instanceIdMap, null, null, null);
assertEquals(false, result.isPresent());
}
@@ -62,7 +62,7 @@ public class VolumeGroupDeleteValidatorTest {
public void validateFailureVnfTest() {
instanceIdMap.put("volumeGroupInstanceId", "1");
when(aaiDataRetrieval.isVolumeGroupRelatedToVFModule("1")).thenReturn(true);
- Optional<String> result = volumeGroupDeleteValidator.validate(instanceIdMap, null, null);
+ Optional<String> result = volumeGroupDeleteValidator.validate(instanceIdMap, null, null, null);
assertEquals(true, result.isPresent());
}