re base code

[sdc.git] / catalog-be / src / test / java / org / openecomp / sdc / be / components / property / PolicyPropertyDeclaratorTest.java

diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/property/PolicyPropertyDeceleratorTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/property/PolicyPropertyDeclaratorTest.java
similarity index 88%
rename from catalog-be/src/test/java/org/openecomp/sdc/be/components/property/PolicyPropertyDeceleratorTest.java
rename to catalog-be/src/test/java/org/openecomp/sdc/be/components/property/PolicyPropertyDeclaratorTest.java
index 5802995..72c2654 100644 (file)
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/property/PolicyPropertyDeceleratorTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/property/PolicyPropertyDeclaratorTest.java
@@ -1,16 +1,6 @@
 package org.openecomp.sdc.be.components.property;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
+import fj.data.Either;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -31,18 +21,24 @@ import org.openecomp.sdc.be.model.jsontitan.operations.PolicyOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.PropertyOperation;
 
-import fj.data.Either;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
-//note that testing for most of the common logic is under the ComponentInstancePropertyDeceleratorTest
-public class PolicyPropertyDeceleratorTest extends PropertyDeceleratorTestBase{
+//note that testing for most of the common logic is under the ComponentInstancePropertyDeclaratorTest
+public class PolicyPropertyDeclaratorTest extends PropertyDeclaratorTestBase {
 
     private static final String POLICY_ID = "policyId";
-    private static final String RESOURCE_ID = "resourceId";
-    private static final String INPUT_ID = "inputId";
     @InjectMocks
-    private PolicyPropertyDecelerator policyPropertyDecelerator;
+    private PolicyPropertyDeclarator policyPropertyDeclarator;
     @Mock
     private PolicyOperation policyOperation;
     @Mock
@@ -65,7 +61,7 @@ public class PolicyPropertyDeceleratorTest extends PropertyDeceleratorTestBase{
 
     @Test
     public void testDeclarePropertiesAsInputs_policyNotExist() {
-        Either<List<InputDefinition>, StorageOperationStatus> declareResult = policyPropertyDecelerator.declarePropertiesAsInputs(resource, "nonExistingPolicy", Collections.emptyList());
+        Either<List<InputDefinition>, StorageOperationStatus> declareResult = policyPropertyDeclarator.declarePropertiesAsInputs(resource, "nonExistingPolicy", Collections.emptyList());
         assertThat(declareResult.right().value()).isEqualTo(StorageOperationStatus.NOT_FOUND);
         verifyZeroInteractions(policyOperation);
     }
@@ -73,7 +69,7 @@ public class PolicyPropertyDeceleratorTest extends PropertyDeceleratorTestBase{
     @Test
     public void testDeclarePropertiesAsInputs_failedToUpdateProperties() {
         when(policyOperation.updatePolicyProperties(eq(resource), eq(POLICY_ID), updatedPropsCapture.capture())).thenReturn(StorageOperationStatus.GENERAL_ERROR);
-        Either<List<InputDefinition>, StorageOperationStatus> declareResult = policyPropertyDecelerator.declarePropertiesAsInputs(resource, POLICY_ID, Collections.emptyList());
+        Either<List<InputDefinition>, StorageOperationStatus> declareResult = policyPropertyDeclarator.declarePropertiesAsInputs(resource, POLICY_ID, Collections.emptyList());
         assertThat(declareResult.right().value()).isEqualTo(StorageOperationStatus.GENERAL_ERROR);
     }
 
@@ -82,24 +78,24 @@ public class PolicyPropertyDeceleratorTest extends PropertyDeceleratorTestBase{
         List<PropertyDataDefinition> properties = Arrays.asList(prop1, prop2);
         List<ComponentInstancePropInput> propsToDeclare = createInstancePropInputList(properties);
         when(policyOperation.updatePolicyProperties(eq(resource), eq(POLICY_ID), updatedPropsCapture.capture())).thenReturn(StorageOperationStatus.OK);
-        Either<List<InputDefinition>, StorageOperationStatus> createdInputs = policyPropertyDecelerator.declarePropertiesAsInputs(resource, POLICY_ID, propsToDeclare);
+        Either<List<InputDefinition>, StorageOperationStatus> createdInputs = policyPropertyDeclarator.declarePropertiesAsInputs(resource, POLICY_ID, propsToDeclare);
         List<InputDefinition> inputs = createdInputs.left().value();
         assertThat(inputs).hasSize(2);
         verifyInputPropertiesList(inputs, updatedPropsCapture.getValue());
-        //creation of inputs values is part of the DefaultPropertyDecelerator and is tested in the ComponentInstancePropertyDeceleratorTest class
+        //creation of inputs values is part of the DefaultPropertyDeclarator and is tested in the ComponentInstancePropertyDeclaratorTest class
     }
 
     @Test
     public void testUnDeclareProperties_whenComponentHasNoPolicies_returnOk() {
         Resource resource = new Resource();
-        StorageOperationStatus storageOperationStatus = policyPropertyDecelerator.unDeclarePropertiesAsInputs(resource, input);
+        StorageOperationStatus storageOperationStatus = policyPropertyDeclarator.unDeclarePropertiesAsInputs(resource, input);
         assertThat(storageOperationStatus).isEqualTo(StorageOperationStatus.OK);
         verifyZeroInteractions(policyOperation);
     }
 
     @Test
     public void testUnDeclareProperties_whenNoPropertiesFromPolicyMatchInputId_returnOk() {
-        StorageOperationStatus storageOperationStatus = policyPropertyDecelerator.unDeclarePropertiesAsInputs(createResourceWithPolicy(), input);
+        StorageOperationStatus storageOperationStatus = policyPropertyDeclarator.unDeclarePropertiesAsInputs(createResourceWithPolicy(), input);
         assertThat(storageOperationStatus).isEqualTo(StorageOperationStatus.OK);
         verifyZeroInteractions(policyOperation);
     }
@@ -112,7 +108,7 @@ public class PolicyPropertyDeceleratorTest extends PropertyDeceleratorTestBase{
         policyDefinition.setProperties(Collections.singletonList(getInputPropForInput));
         when(propertyOperation.findDefaultValueFromSecondPosition(Collections.emptyList(), getInputPropForInput.getUniqueId(), getInputPropForInput.getDefaultValue())).thenReturn(Either.left(getInputPropForInput.getDefaultValue()));
         when(policyOperation.updatePolicyProperties(eq(resource), eq(POLICY_ID), updatedPropsCapture.capture())).thenReturn(StorageOperationStatus.GENERAL_ERROR);
-        StorageOperationStatus storageOperationStatus = policyPropertyDecelerator.unDeclarePropertiesAsInputs(resource, input);
+        StorageOperationStatus storageOperationStatus = policyPropertyDeclarator.unDeclarePropertiesAsInputs(resource, input);
         assertThat(storageOperationStatus).isEqualTo(StorageOperationStatus.GENERAL_ERROR);
     }
 
@@ -126,7 +122,7 @@ public class PolicyPropertyDeceleratorTest extends PropertyDeceleratorTestBase{
 
         when(propertyOperation.findDefaultValueFromSecondPosition(Collections.emptyList(), getInputPropForInput.getUniqueId(), getInputPropForInput.getDefaultValue())).thenReturn(Either.left(getInputPropForInput.getDefaultValue()));
         when(policyOperation.updatePolicyProperties(eq(resource), eq(POLICY_ID), updatedPropsCapture.capture())).thenReturn(StorageOperationStatus.OK);
-        StorageOperationStatus storageOperationStatus = policyPropertyDecelerator.unDeclarePropertiesAsInputs(resource, input);
+        StorageOperationStatus storageOperationStatus = policyPropertyDeclarator.unDeclarePropertiesAsInputs(resource, input);
 
         assertThat(storageOperationStatus).isEqualTo(StorageOperationStatus.OK);
         List<PropertyDataDefinition> updatedProperties = updatedPropsCapture.getValue();
@@ -170,4 +166,5 @@ public class PolicyPropertyDeceleratorTest extends PropertyDeceleratorTestBase{
     }
 
 
-}
\ No newline at end of file
+}
+