1 files changed, 12 insertions, 59 deletions

diff --git a/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/WorkflowManagerImplTest.java b/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/WorkflowManagerImplTest.java
index 2a69dbd6..1db24092 100644
--- a/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/WorkflowManagerImplTest.java
+++ b/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/WorkflowManagerImplTest.java
@@ -19,16 +19,16 @@ package org.onap.sdc.workflow.services.impl;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.onap.sdc.common.versioning.services.types.VersionStatus.Certified;
 import static org.onap.sdc.workflow.TestUtil.createItem;
 import static org.onap.sdc.workflow.TestUtil.createWorkflow;
 import static org.onap.sdc.workflow.services.types.PagingConstants.DEFAULT_LIMIT;
 import static org.onap.sdc.workflow.services.types.PagingConstants.DEFAULT_OFFSET;
 import static org.onap.sdc.workflow.services.types.PagingConstants.MAX_LIMIT;
-import static org.openecomp.sdc.versioning.dao.types.VersionStatus.Certified;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -42,9 +42,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
+import org.onap.sdc.common.versioning.services.ItemManager;
+import org.onap.sdc.common.versioning.services.types.Item;
+import org.onap.sdc.common.versioning.services.types.ItemStatus;
 import org.onap.sdc.workflow.services.UniqueValueService;
 import org.onap.sdc.workflow.services.exceptions.EntityNotFoundException;
-import org.onap.sdc.workflow.services.exceptions.WorkflowStatusModificationException;
 import org.onap.sdc.workflow.services.impl.mappers.VersionStateMapper;
 import org.onap.sdc.workflow.services.impl.mappers.WorkflowMapper;
 import org.onap.sdc.workflow.services.types.ArchivingStatus;
@@ -56,11 +58,6 @@ import org.onap.sdc.workflow.services.types.Sort;
 import org.onap.sdc.workflow.services.types.SortingRequest;
 import org.onap.sdc.workflow.services.types.Workflow;
 import org.onap.sdc.workflow.services.types.WorkflowVersionState;
-import org.openecomp.sdc.common.errors.CoreException;
-import org.openecomp.sdc.common.errors.ErrorCode;
-import org.openecomp.sdc.versioning.ItemManager;
-import org.openecomp.sdc.versioning.types.Item;
-import org.openecomp.sdc.versioning.types.ItemStatus;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
@@ -118,8 +115,8 @@ public class WorkflowManagerImplTest {
         doReturn(Certified).when(versionStateMapperMock)
                            .workflowVersionStateToVersionStatus(WorkflowVersionState.CERTIFIED);
         doReturn(Arrays.asList(ITEMS.get(0), ITEMS.get(2))).when(itemManagerMock).list(any());
-        doReturn(MAPPED_WORKFLOWS.get(0)).when(workflowMapperMock).itemToWorkflow(ITEMS.get(0));
-        doReturn(MAPPED_WORKFLOWS.get(2)).when(workflowMapperMock).itemToWorkflow(ITEMS.get(2));
+        doReturn(MAPPED_WORKFLOWS.get(0)).when(workflowMapperMock).fromItem(ITEMS.get(0));
+        doReturn(MAPPED_WORKFLOWS.get(2)).when(workflowMapperMock).fromItem(ITEMS.get(2));
 
         RequestSpec requestSpec = createRequestSpec(0, 20, true);
         Page<Workflow> workflows =
@@ -135,48 +132,12 @@ public class WorkflowManagerImplTest {
     }
 
     @Test(expected = EntityNotFoundException.class)
-    public void shouldThrowExceptionWhenWorkflowDontExistTryingToUpdateStatus() {
-        doReturn(null).when(itemManagerMock).get(ITEM1_ID);
-        workflowManager.updateStatus(ITEM1_ID, ArchivingStatus.ARCHIVED);
-    }
-
-    @Test(expected = WorkflowStatusModificationException.class)
-    public void shouldThrowExceptionWhenFailingToUpdateStatus() {
-        Item mockItem = new Item();
-        mockItem.setId(ITEM1_ID);
-        mockItem.setStatus(ItemStatus.ARCHIVED);
-        doReturn(mockItem).when(itemManagerMock).get(ITEM1_ID);
-        doThrow(new CoreException(new ErrorCode.ErrorCodeBuilder().build())).when(itemManagerMock).archive(mockItem);
-        workflowManager.updateStatus(ITEM1_ID, ArchivingStatus.ARCHIVED);
-    }
-
-    @Test
-    public void shouldArchiveWorkflow() {
-        Item mockItem = new Item();
-        mockItem.setId(ITEM1_ID);
-        mockItem.setStatus(ItemStatus.ACTIVE);
-        doReturn(mockItem).when(itemManagerMock).get(ITEM1_ID);
-        workflowManager.updateStatus(ITEM1_ID, ArchivingStatus.ARCHIVED);
-        verify(itemManagerMock).archive(mockItem);
-    }
-
-    @Test
-    public void shouldRestoreWorkflow() {
-        Item mockItem = new Item();
-        mockItem.setId(ITEM1_ID);
-        mockItem.setStatus(ItemStatus.ARCHIVED);
-        doReturn(mockItem).when(itemManagerMock).get(ITEM1_ID);
-        workflowManager.updateStatus(ITEM1_ID, ArchivingStatus.ACTIVE);
-        verify(itemManagerMock).restore(mockItem);
-    }
-
-    @Test(expected = EntityNotFoundException.class)
     public void shouldThrowExceptionWhenWorkflowDontExist() {
         Workflow nonExistingWorkflow = new Workflow();
         nonExistingWorkflow.setId(ITEM1_ID);
         doReturn(null).when(itemManagerMock).get(ITEM1_ID);
         workflowManager.get(nonExistingWorkflow);
-        verify(workflowMapperMock, times(3)).itemToWorkflow(any(Item.class));
+        verify(workflowMapperMock, times(3)).fromItem(any(Item.class));
     }
 
     @Test
@@ -186,22 +147,15 @@ public class WorkflowManagerImplTest {
         Workflow workflow = createWorkflow(1, true, ArchivingStatus.ACTIVE);
         workflowManager.get(workflow);
         verify(itemManagerMock).get(ITEM1_ID);
-        verify(workflowMapperMock).itemToWorkflow(retrievedItem);
+        verify(workflowMapperMock).fromItem(retrievedItem);
     }
 
     @Test
     public void shouldCreateWorkflowItemFromWorkflow() {
         Workflow workflowToBeCreated = createWorkflow(1, false, ArchivingStatus.ACTIVE);
-        Item createdWorkflowItem = createItem(1, false, true, ItemStatus.ACTIVE);
-        doReturn(createdWorkflowItem).when(workflowMapperMock).workflowToItem(workflowToBeCreated);
-        doReturn(createdWorkflowItem).when(itemManagerMock).create(createdWorkflowItem);
         workflowManager.create(workflowToBeCreated);
+        verify(itemManagerMock).create(any(Item.class));
         verify(uniqueValueServiceMock).validateUniqueValue(WORKFLOW_NAME_UNIQUE_TYPE, workflowToBeCreated.getName());
-
-        createdWorkflowItem.setStatus(ItemStatus.ACTIVE);
-        createdWorkflowItem.setType(WORKFLOW_TYPE);
-        verify(itemManagerMock).create(createdWorkflowItem);
-        verify(uniqueValueServiceMock).createUniqueValue(WORKFLOW_NAME_UNIQUE_TYPE, workflowToBeCreated.getName());
     }
 
     @Test
@@ -209,9 +163,8 @@ public class WorkflowManagerImplTest {
         Item workflowItem = createItem(1, true, true, ItemStatus.ACTIVE);
         doReturn(workflowItem).when(itemManagerMock).get(ITEM1_ID);
         Workflow workflowToBeUpdated = createWorkflow(1, true, ArchivingStatus.ACTIVE);
-        doReturn(workflowItem).when(workflowMapperMock).workflowToItem(workflowToBeUpdated);
         workflowManager.update(workflowToBeUpdated);
-        verify(itemManagerMock).update(workflowItem);
+        verify(itemManagerMock).update(eq(ITEM1_ID),any(Item.class));
         verify(uniqueValueServiceMock)
                 .updateUniqueValue(WORKFLOW_NAME_UNIQUE_TYPE, workflowItem.getName(), workflowToBeUpdated.getName());
 
@@ -389,7 +342,7 @@ public class WorkflowManagerImplTest {
 
     private void mockItemToWorkflowMaps() {
         for (int i = 0; i < ITEMS.size(); i++) {
-            doReturn(MAPPED_WORKFLOWS.get(i)).when(workflowMapperMock).itemToWorkflow(ITEMS.get(i));
+            doReturn(MAPPED_WORKFLOWS.get(i)).when(workflowMapperMock).fromItem(ITEMS.get(i));
         }
     }