1 files changed, 32 insertions, 30 deletions
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/property/GroupPropertyDeclaratorTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/property/GroupPropertyDeclaratorTest.java
index 1619e550d6..616e0babfa 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/property/GroupPropertyDeclaratorTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/property/GroupPropertyDeclaratorTest.java
@@ -21,14 +21,14 @@
 package org.openecomp.sdc.be.components.property;
 
 import fj.data.Either;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.openecomp.sdc.be.components.utils.GroupDefinitionBuilder;
 import org.openecomp.sdc.be.components.utils.PropertyDataDefinitionBuilder;
 import org.openecomp.sdc.be.components.utils.ResourceBuilder;
@@ -48,12 +48,14 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class GroupPropertyDeclaratorTest extends PropertyDeclaratorTestBase {
 
 
@@ -70,7 +72,7 @@ public class GroupPropertyDeclaratorTest extends PropertyDeclaratorTestBase {
     private InputDefinition input;
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         super.setUp();
         resource = createResourceWithGroup();
@@ -83,7 +85,7 @@ public class GroupPropertyDeclaratorTest extends PropertyDeclaratorTestBase {
     @Test
     public void testDeclarePropertiesAsInputs_groupNotExist() {
         Either<List<InputDefinition>, StorageOperationStatus> declareResult = groupPropertyDeclarator.declarePropertiesAsInputs(resource, "nonExistingGroup", Collections.emptyList());
-        assertThat(declareResult.right().value()).isEqualTo(StorageOperationStatus.NOT_FOUND);
+        assertEquals(StorageOperationStatus.NOT_FOUND, declareResult.right().value());
         verifyZeroInteractions(groupOperation);
     }
 
@@ -91,7 +93,7 @@ public class GroupPropertyDeclaratorTest extends PropertyDeclaratorTestBase {
     public void testDeclarePropertiesAsInputs_failedToUpdateProperties() {
         when(groupOperation.updateGroupProperties(eq(resource), eq(GROUP_ID), updatedPropsCapture.capture())).thenReturn(StorageOperationStatus.GENERAL_ERROR);
         Either<List<InputDefinition>, StorageOperationStatus> declareResult = groupPropertyDeclarator.declarePropertiesAsInputs(resource, GROUP_ID, Collections.emptyList());
-        assertThat(declareResult.right().value()).isEqualTo(StorageOperationStatus.GENERAL_ERROR);
+        assertEquals(StorageOperationStatus.GENERAL_ERROR, declareResult.right().value());
     }
 
     @Test
@@ -101,7 +103,7 @@ public class GroupPropertyDeclaratorTest extends PropertyDeclaratorTestBase {
         when(groupOperation.updateGroupProperties(eq(resource), eq(GROUP_ID), updatedPropsCapture.capture())).thenReturn(StorageOperationStatus.OK);
         Either<List<InputDefinition>, StorageOperationStatus> createdInputs = groupPropertyDeclarator.declarePropertiesAsInputs(resource, GROUP_ID, propsToDeclare);
         List<InputDefinition> inputs = createdInputs.left().value();
-        assertThat(inputs).hasSize(2);
+        assertEquals(2, inputs.size());
         verifyInputPropertiesList(inputs, updatedPropsCapture.getValue());
         //creation of inputs values is part of the DefaultPropertyDeclarator and is tested in the ComponentInstancePropertyDeclaratorTest class
     }
@@ -110,14 +112,14 @@ public class GroupPropertyDeclaratorTest extends PropertyDeclaratorTestBase {
     public void testUnDeclareProperties_whenComponentHasNoGroups_returnOk() {
         Resource resource = new Resource();
         StorageOperationStatus storageOperationStatus = groupPropertyDeclarator.unDeclarePropertiesAsInputs(resource, input);
-        assertThat(storageOperationStatus).isEqualTo(StorageOperationStatus.OK);
+        assertEquals(StorageOperationStatus.OK, storageOperationStatus);
         verifyZeroInteractions(groupOperation);
     }
 
     @Test
     public void testUnDeclareProperties_whenNoPropertiesFromGroupMatchInputId_returnOk() {
         StorageOperationStatus storageOperationStatus = groupPropertyDeclarator.unDeclarePropertiesAsInputs(createResourceWithGroup(), input);
-        assertThat(storageOperationStatus).isEqualTo(StorageOperationStatus.OK);
+        assertEquals(StorageOperationStatus.OK, storageOperationStatus);
         verifyZeroInteractions(groupOperation);
     }
 
@@ -125,13 +127,13 @@ public class GroupPropertyDeclaratorTest extends PropertyDeclaratorTestBase {
     public void whenFailingToUpdateDeclaredProperties_returnErrorStatus() {
         Resource resource = createResourceWithGroups(GROUP_ID);
         Optional<GroupDefinition> groupDefinition = resource.getGroupById(GROUP_ID);
-        assertThat(groupDefinition.isPresent()).isTrue();
+        assertTrue(groupDefinition.isPresent());
         PropertyDataDefinition getInputPropForInput = buildGetInputProperty(INPUT_ID);
         groupDefinition.get().setProperties(Collections.singletonList(getInputPropForInput));
         when(propertyOperation.findDefaultValueFromSecondPosition(Collections.emptyList(), getInputPropForInput.getUniqueId(), getInputPropForInput.getDefaultValue())).thenReturn(Either.left(getInputPropForInput.getDefaultValue()));
         when(groupOperation.updateGroupProperties(eq(resource), eq(GROUP_ID), updatedPropsCapture.capture())).thenReturn(StorageOperationStatus.GENERAL_ERROR);
         StorageOperationStatus storageOperationStatus = groupPropertyDeclarator.unDeclarePropertiesAsInputs(resource, input);
-        assertThat(storageOperationStatus).isEqualTo(StorageOperationStatus.GENERAL_ERROR);
+        assertEquals(StorageOperationStatus.GENERAL_ERROR, storageOperationStatus);
     }
 
     @Test
@@ -146,28 +148,28 @@ public class GroupPropertyDeclaratorTest extends PropertyDeclaratorTestBase {
         when(groupOperation.updateGroupProperties(eq(resource), eq(GROUP_ID), updatedPropsCapture.capture())).thenReturn(StorageOperationStatus.OK);
         StorageOperationStatus storageOperationStatus = groupPropertyDeclarator.unDeclarePropertiesAsInputs(resource, input);
 
-        assertThat(storageOperationStatus).isEqualTo(StorageOperationStatus.OK);
+        assertEquals(StorageOperationStatus.OK, storageOperationStatus);
         List<PropertyDataDefinition> updatedProperties = updatedPropsCapture.getValue();
-        assertThat(updatedProperties).hasSize(1);
+        assertEquals(1, updatedProperties.size());
         PropertyDataDefinition updatedProperty = updatedProperties.get(0);
-        assertThat(updatedProperty.isGetInputProperty()).isFalse();
-        assertThat(updatedProperty.getValue()).isEmpty();
-        assertThat(updatedProperty.getDefaultValue()).isEqualTo(getInputPropForInput.getDefaultValue());
-        assertThat(updatedProperty.getUniqueId()).isEqualTo(getInputPropForInput.getUniqueId());
+        assertFalse(updatedProperty.isGetInputProperty());
+        assertTrue(updatedProperty.getValue().isEmpty());
+        assertEquals(getInputPropForInput.getDefaultValue(), updatedProperty.getDefaultValue());
+        assertEquals(getInputPropForInput.getUniqueId(), updatedProperty.getUniqueId());
     }
 
     @Test
     public void testUnDeclarePropertiesAsListInputs_whenComponentHasNoGroups_returnOk() {
         Resource resource = new Resource();
         StorageOperationStatus storageOperationStatus = groupPropertyDeclarator.unDeclarePropertiesAsListInputs(resource, input);
-        assertThat(storageOperationStatus).isEqualTo(StorageOperationStatus.OK);
+        assertEquals(StorageOperationStatus.OK, storageOperationStatus);
         verifyZeroInteractions(groupOperation);
     }
 
     @Test
     public void testUnDeclarePropertiesAsListInputs_whenNoPropertiesFromGroupMatchInputId_returnOk() {
         StorageOperationStatus storageOperationStatus = groupPropertyDeclarator.unDeclarePropertiesAsListInputs(createResourceWithGroup(), input);
-        assertThat(storageOperationStatus).isEqualTo(StorageOperationStatus.OK);
+        assertEquals(StorageOperationStatus.OK, storageOperationStatus);
         verifyZeroInteractions(groupOperation);
     }
 
@@ -175,13 +177,13 @@ public class GroupPropertyDeclaratorTest extends PropertyDeclaratorTestBase {
     public void whenFailingToUpdateDeclaredPropertiesAsListInputs_returnErrorStatus() {
         Resource resource = createResourceWithGroups(GROUP_ID);
         Optional<GroupDefinition> groupDefinition = resource.getGroupById(GROUP_ID);
-        assertThat(groupDefinition.isPresent()).isTrue();
+        assertTrue(groupDefinition.isPresent());
         PropertyDataDefinition getInputPropForInput = buildGetInputProperty(INPUT_ID);
         groupDefinition.get().setProperties(Collections.singletonList(getInputPropForInput));
         when(propertyOperation.findDefaultValueFromSecondPosition(Collections.emptyList(), getInputPropForInput.getUniqueId(), getInputPropForInput.getDefaultValue())).thenReturn(Either.left(getInputPropForInput.getDefaultValue()));
         when(groupOperation.updateGroupProperties(eq(resource), eq(GROUP_ID), updatedPropsCapture.capture())).thenReturn(StorageOperationStatus.GENERAL_ERROR);
         StorageOperationStatus storageOperationStatus = groupPropertyDeclarator.unDeclarePropertiesAsListInputs(resource, input);
-        assertThat(storageOperationStatus).isEqualTo(StorageOperationStatus.GENERAL_ERROR);
+        assertEquals(StorageOperationStatus.GENERAL_ERROR, storageOperationStatus);
     }
 
     @Test
@@ -196,14 +198,14 @@ public class GroupPropertyDeclaratorTest extends PropertyDeclaratorTestBase {
         when(groupOperation.updateGroupProperties(eq(resource), eq(GROUP_ID), updatedPropsCapture.capture())).thenReturn(StorageOperationStatus.OK);
         StorageOperationStatus storageOperationStatus = groupPropertyDeclarator.unDeclarePropertiesAsListInputs(resource, input);
 
-        assertThat(storageOperationStatus).isEqualTo(StorageOperationStatus.OK);
+        assertEquals(StorageOperationStatus.OK, storageOperationStatus);
         List<PropertyDataDefinition> updatedProperties = updatedPropsCapture.getValue();
-        assertThat(updatedProperties).hasSize(1);
+        assertEquals(1, updatedProperties.size());
         PropertyDataDefinition updatedProperty = updatedProperties.get(0);
-        assertThat(updatedProperty.isGetInputProperty()).isFalse();
-        assertThat(updatedProperty.getValue()).isEmpty();
-        assertThat(updatedProperty.getDefaultValue()).isEqualTo(getInputPropForInput.getDefaultValue());
-        assertThat(updatedProperty.getUniqueId()).isEqualTo(getInputPropForInput.getUniqueId());
+        assertFalse(updatedProperty.isGetInputProperty());
+        assertTrue(updatedProperty.getValue().isEmpty());
+        assertEquals(getInputPropForInput.getDefaultValue(), updatedProperty.getDefaultValue());
+        assertEquals(getInputPropForInput.getUniqueId(), updatedProperty.getUniqueId());
     }
 
     private Resource createResourceWithGroup() {