Add collaboration feature

[sdc.git] / openecomp-be / backend / openecomp-sdc-vendor-software-product-manager / src / test / java / org / openecomp / sdc / vendorsoftwareproduct / impl / ComponentManagerImplTest.java

diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ComponentManagerImplTest.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ComponentManagerImplTest.java
index ee8295c..c7aa818 100644 (file)
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ComponentManagerImplTest.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ComponentManagerImplTest.java
@@ -2,12 +2,9 @@ package org.openecomp.sdc.vendorsoftwareproduct.impl;
 
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.mockito.Spy;
 import org.openecomp.sdc.common.errors.CoreException;
-import org.openecomp.sdc.logging.api.Logger;
-import org.openecomp.sdc.logging.api.LoggerFactory;
 import org.openecomp.sdc.vendorsoftwareproduct.NicManager;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.ComponentDao;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.VendorSoftwareProductInfoDao;
@@ -37,16 +34,13 @@ import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
 public class ComponentManagerImplTest {
-
-  private final Logger log = (Logger) LoggerFactory.getLogger(this.getClass().getName());
-
-  private static final String COMP_NOT_EXIST_MSG =
-      "Vendor Software Product Component with Id 1 does not exist for Vendor Software Product with id VSP_ID and version 0.1";
-  private static final String USER = "componentsTestUser";
   private static final String VSP_ID = "VSP_ID";
-  private static final Version VERSION = new Version(0, 1);
-  private static final String COMP1_ID = "1";
-  private static final String COMP2_ID = "2";
+  private static final Version VERSION = new Version("version_id");
+  private static final String COMP1_ID = "comp1";
+  private static final String COMP2_ID = "comp2";
+  private static final String COMP_NOT_EXIST_MSG =
+      "Vendor Software Product Component with Id comp1 does not exist " +
+          "for Vendor Software Product with id VSP_ID and version version_id";
 
   @Mock
   private ComponentDao componentDaoMock;
@@ -67,20 +61,15 @@ public class ComponentManagerImplTest {
 
   @Test
   public void testListWhenNone() {
-    Collection<ComponentEntity> components =
-        componentManager.listComponents(VSP_ID, VERSION, USER);
+    Collection<ComponentEntity> components = componentManager.listComponents(VSP_ID, VERSION);
     Assert.assertEquals(components.size(), 0);
   }
 
   @Test(expectedExceptions = CoreException.class,
-      expectedExceptionsMessageRegExp = "Vendor Software Product Component with Id dummyComponentId " +
-          "does not exist for Vendor Software Product with id dummyVsp and version 1.0")
+      expectedExceptionsMessageRegExp = COMP_NOT_EXIST_MSG)
   public void validateExceptionWhenTryingToRetriveNotExistingComponentEntity() {
-    Version version = Mockito.mock(Version.class);
-    doReturn("1.0").when(version).toString();
     doReturn(null).when(componentDaoMock).get(anyObject());
-    componentManager.validateComponentExistence("dummyVsp", version, "dummyComponentId",
-        "dummyUser");
+    componentManager.validateComponentExistence(VSP_ID, VERSION, COMP1_ID);
   }
 
   @Test
@@ -90,21 +79,20 @@ public class ComponentManagerImplTest {
         createComponent(VSP_ID, VERSION, COMP2_ID)))
         .when(componentDaoMock).list(anyObject());
 
-    Collection<ComponentEntity> actual =
-        componentManager.listComponents(VSP_ID, VERSION, USER);
+    Collection<ComponentEntity> actual = componentManager.listComponents(VSP_ID, VERSION);
     Assert.assertEquals(actual.size(), 2);
   }
 
   @Test
   public void testDeleteListOnUploadVsp_negative() {
-    testDeleteList_negative(VSP_ID, VERSION, USER,
+    testDeleteList_negative(VSP_ID, VERSION,
         VendorSoftwareProductErrorCodes.VSP_COMPOSITION_EDIT_NOT_ALLOWED);
   }
 
-/*    @Test
-    public void testCreate() {
-        COMP1_ID = testCreate(VSP_ID);
-    }*/
+  /*    @Test
+      public void testCreate() {
+          COMP1_ID = testCreate(VSP_ID);
+      }*/
   @Test
   public void testCreate() {
     ComponentEntity expected = new ComponentEntity(VSP_ID, null, null);
@@ -113,12 +101,12 @@ public class ComponentManagerImplTest {
     compData.setDescription("comp1 desc");
     expected.setComponentCompositionData(compData);
 
-    doReturn(true).when(vspInfoDao).isManual(anyObject(),anyObject());
+    doReturn(true).when(vspInfoDao).isManual(anyObject(), anyObject());
     Collection<ComponentEntity> vspComponentList = new ArrayList<>();
     doReturn(vspComponentList).when(componentDaoMock).list(anyObject());
     doReturn(expected).when(compositionEntityDataManagerMock).createComponent(anyObject());
 
-    ComponentEntity created = componentManager.createComponent(expected, USER);
+    ComponentEntity created = componentManager.createComponent(expected);
     Assert.assertNotNull(created);
     //expected.setId(created.getId());
     //expected.setVersion(VERSION);
@@ -137,15 +125,14 @@ public class ComponentManagerImplTest {
     compData.setDescription("comp1 desc");
     expected.setComponentCompositionData(compData);
 
-    doReturn(true).when(vspInfoDao).isManual(anyObject(),anyObject());
+    doReturn(true).when(vspInfoDao).isManual(anyObject(), anyObject());
     Collection<ComponentEntity> vspComponentList = new ArrayList<>();
     vspComponentList.add(expected);
     doReturn(vspComponentList).when(componentDaoMock).list(anyObject());
 
     try {
-      ComponentEntity created = componentManager.createComponent(expected, USER);
-    }  catch (CoreException exception) {
-      log.debug("",exception);
+      ComponentEntity created = componentManager.createComponent(expected);
+    } catch (CoreException exception) {
       Assert.assertEquals("Creation of only one VFC per VSP allowed.", exception.code().message());
       Assert.assertEquals(VendorSoftwareProductErrorCodes.VSP_VFC_COUNT_EXCEED,
           exception.code().id());
@@ -161,14 +148,14 @@ public class ComponentManagerImplTest {
     expected.setComponentCompositionData(compData);
 
     doReturn(expected).when(componentDaoMock).get(anyObject());
-    doReturn(true).when(vspInfoDao).isManual(anyObject(),anyObject());
+    doReturn(true).when(vspInfoDao).isManual(anyObject(), anyObject());
     Collection<ComponentEntity> vspComponentList = new ArrayList<>();
     vspComponentList.add(expected);
     doReturn(vspComponentList).when(componentDaoMock).list(anyObject());
-    doReturn(new CompositionEntityValidationData(null,null)).when(compositionEntityDataManagerMock)
-        .validateEntity(anyObject(),anyObject(),anyObject());
+    doReturn(new CompositionEntityValidationData(null, null)).when(compositionEntityDataManagerMock)
+        .validateEntity(anyObject(), anyObject(), anyObject());
 
-    CompositionEntityValidationData created = componentManager.updateComponent(expected, USER);
+    CompositionEntityValidationData created = componentManager.updateComponent(expected);
     Assert.assertNotNull(created);
   }
 
@@ -182,20 +169,19 @@ public class ComponentManagerImplTest {
     expected.setComponentCompositionData(compData);
 
     doReturn(expected).when(componentDaoMock).get(anyObject());
-    doReturn(true).when(vspInfoDao).isManual(anyObject(),anyObject());
+    doReturn(true).when(vspInfoDao).isManual(anyObject(), anyObject());
     Collection<ComponentEntity> vspComponentList = new ArrayList<>();
     vspComponentList.add(expected);
-    ComponentEntity expected2 = new ComponentEntity(VSP_ID+"2", null, COMP1_ID+"2");
+    ComponentEntity expected2 = new ComponentEntity(VSP_ID + "2", null, COMP1_ID + "2");
     expected2.setComponentCompositionData(compData);
     vspComponentList.add(expected2);
     doReturn(vspComponentList).when(componentDaoMock).list(anyObject());
-    doReturn(new CompositionEntityValidationData(null,null)).when(compositionEntityDataManagerMock)
-        .validateEntity(anyObject(),anyObject(),anyObject());
+    doReturn(new CompositionEntityValidationData(null, null)).when(compositionEntityDataManagerMock)
+        .validateEntity(anyObject(), anyObject(), anyObject());
 
     try {
-      CompositionEntityValidationData created = componentManager.updateComponent(expected, USER);
-    }  catch (CoreException exception) {
-      log.debug("",exception);
+      CompositionEntityValidationData created = componentManager.updateComponent(expected);
+    } catch (CoreException exception) {
       Assert.assertEquals("VFC with specified name already present in given VSP.",
           exception.code().message());
       Assert.assertEquals(VendorSoftwareProductErrorCodes.VSP_VFC_DUPLICATE_NAME,
@@ -220,7 +206,7 @@ public class ComponentManagerImplTest {
 
   @Test
   public void testCreateOnUploadVsp_negative() {
-    testCreate_negative(new ComponentEntity(VSP_ID, VERSION, null), USER,
+    testCreate_negative(new ComponentEntity(VSP_ID, VERSION, null),
         VendorSoftwareProductErrorCodes.VFC_ADD_NOT_ALLOWED_IN_HEAT_ONBOARDING);
   }
 
@@ -229,7 +215,7 @@ public class ComponentManagerImplTest {
     String componentId = "non existing component id";
     doReturn(null).when(componentDaoMock).get(anyObject());
 
-    testUpdate_negative(VSP_ID, VERSION, componentId, USER,
+    testUpdate_negative(VSP_ID, VERSION, componentId,
         VersioningErrorCodes.VERSIONABLE_SUB_ENTITY_NOT_FOUND);
   }
 
@@ -254,7 +240,7 @@ public class ComponentManagerImplTest {
 
 
     CompositionEntityValidationData validationData =
-        componentManager.updateComponent(component, USER);
+        componentManager.updateComponent(component);
     Assert.assertTrue(validationData == null || validationData.getErrors() == null);
     verify(componentDaoMock).update(component);
   }
@@ -277,7 +263,7 @@ public class ComponentManagerImplTest {
     component.setComponentCompositionData(compData);
 
     CompositionEntityValidationData validationData =
-        componentManager.updateComponent(component, USER);
+        componentManager.updateComponent(component);
     Assert.assertNotNull(validationData);
     Assert.assertEquals(validationData.getErrors().size(), 2);
 
@@ -289,7 +275,7 @@ public class ComponentManagerImplTest {
     String componentId = "non existing component id";
     doReturn(null).when(componentDaoMock).get(anyObject());
 
-    testGet_negative(VSP_ID, VERSION, componentId, USER,
+    testGet_negative(VSP_ID, VERSION, componentId,
         VersioningErrorCodes.VERSIONABLE_SUB_ENTITY_NOT_FOUND);
   }
 
@@ -300,7 +286,7 @@ public class ComponentManagerImplTest {
 
     doReturn("schema string").when(componentManager).getComponentCompositionSchema(anyObject());
 
-    testGet(VSP_ID, VERSION, COMP1_ID, USER, expected);
+    testGet(VSP_ID, VERSION, COMP1_ID, expected);
   }
 
 
@@ -329,14 +315,14 @@ public class ComponentManagerImplTest {
 
   @Test
   public void testDeleteOnUploadVsp_negative() {
-    testDelete_negative(VSP_ID, VERSION, COMP1_ID, USER,
+    testDelete_negative(VSP_ID, VERSION, COMP1_ID,
         VendorSoftwareProductErrorCodes.VSP_COMPOSITION_EDIT_NOT_ALLOWED);
   }
 
   @Test(expectedExceptions = CoreException.class,
       expectedExceptionsMessageRegExp = COMP_NOT_EXIST_MSG)
   public void testGetNonExistingComponentQuestionnaire() throws Exception {
-    componentManager.getQuestionnaire(VSP_ID, VERSION, COMP1_ID, USER);
+    componentManager.getQuestionnaire(VSP_ID, VERSION, COMP1_ID);
   }
 
   @Test
@@ -347,7 +333,7 @@ public class ComponentManagerImplTest {
     doReturn(schema).when(componentManager).getComponentQuestionnaireSchema(anyObject());
 
     QuestionnaireResponse questionnaire =
-        componentManager.getQuestionnaire(VSP_ID, VERSION, COMP1_ID, USER);
+        componentManager.getQuestionnaire(VSP_ID, VERSION, COMP1_ID);
     Assert.assertNotNull(questionnaire);
     Assert.assertEquals(questionnaire.getData(), null);
     Assert.assertEquals(questionnaire.getSchema(), schema);
@@ -372,13 +358,13 @@ public class ComponentManagerImplTest {
     nicEntity2.setNicCompositionData(nic2);
 
     doReturn(Arrays.asList(nicEntity1, nicEntity2))
-        .when(nicManagerMock).listNics(VSP_ID, VERSION, COMP1_ID, USER);
+        .when(nicManagerMock).listNics(VSP_ID, VERSION, COMP1_ID);
 
     String schema = "schema string";
     doReturn(schema).when(componentManager).getComponentQuestionnaireSchema(anyObject());
 
     QuestionnaireResponse questionnaire =
-        componentManager.getQuestionnaire(VSP_ID, VERSION, COMP1_ID, USER);
+        componentManager.getQuestionnaire(VSP_ID, VERSION, COMP1_ID);
     Assert.assertNotNull(questionnaire);
     Assert.assertEquals(questionnaire.getData(), component.getQuestionnaireData());
     Assert.assertEquals(questionnaire.getSchema(), schema);
@@ -389,7 +375,7 @@ public class ComponentManagerImplTest {
       expectedExceptionsMessageRegExp = COMP_NOT_EXIST_MSG)
   public void testUpdateNonExistingComponentQuestionnaire() throws Exception {
     doReturn(null).when(componentDaoMock).get(anyObject());
-    componentManager.updateQuestionnaire(VSP_ID, VERSION, COMP1_ID, "questionnaire data", USER);
+    componentManager.updateQuestionnaire(VSP_ID, VERSION, COMP1_ID, "questionnaire data");
   }
 
   @Test
@@ -397,7 +383,7 @@ public class ComponentManagerImplTest {
     ComponentEntity component = createComponent(VSP_ID, VERSION, COMP1_ID);
     doReturn(component).when(componentDaoMock).get(anyObject());
 
-    componentManager.updateQuestionnaire(VSP_ID, VERSION, COMP1_ID, "questionnaire data", USER);
+    componentManager.updateQuestionnaire(VSP_ID, VERSION, COMP1_ID, "questionnaire data");
 
     verify(componentDaoMock)
         .updateQuestionnaireData(VSP_ID, VERSION, COMP1_ID, "questionnaire data");
@@ -417,79 +403,72 @@ public class ComponentManagerImplTest {
         Assert.assertEquals(actual.size(), 0);
     }*/
 
-  private void testGet(String vspId, Version version, String componentId, String user,
+  private void testGet(String vspId, Version version, String componentId,
                        ComponentEntity expected) {
 
     CompositionEntityResponse<ComponentData>
-        response = componentManager.getComponent(vspId, version, componentId, user);
+        response = componentManager.getComponent(vspId, version, componentId);
     Assert.assertEquals(response.getId(), expected.getId());
     Assert.assertEquals(response.getData(), expected.getComponentCompositionData());
     Assert.assertNotNull(response.getSchema());
   }
 
-  private void testCreate_negative(ComponentEntity component, String user,
+  private void testCreate_negative(ComponentEntity component,
                                    String expectedErrorCode) {
     try {
-      componentManager.createComponent(component, user);
+      componentManager.createComponent(component);
       Assert.fail();
     } catch (CoreException exception) {
-      log.debug("",exception);
       Assert.assertEquals(exception.code().id(), expectedErrorCode);
     }
   }
 
-  private void testGet_negative(String vspId, Version version, String componentId, String user,
+  private void testGet_negative(String vspId, Version version, String componentId,
                                 String expectedErrorCode) {
     try {
-      componentManager.getComponent(vspId, version, componentId, user);
+      componentManager.getComponent(vspId, version, componentId);
       Assert.fail();
     } catch (CoreException exception) {
-      log.debug("",exception);
       Assert.assertEquals(exception.code().id(), expectedErrorCode);
     }
   }
 
-  private void testUpdate_negative(String vspId, Version version, String componentId, String user,
+  private void testUpdate_negative(String vspId, Version version, String componentId,
                                    String expectedErrorCode) {
     try {
-      componentManager
-          .updateComponent(new ComponentEntity(vspId, version, componentId), user);
+      componentManager.updateComponent(new ComponentEntity(vspId, version, componentId));
       Assert.fail();
     } catch (CoreException exception) {
-      log.debug("",exception);
       Assert.assertEquals(exception.code().id(), expectedErrorCode);
     }
   }
 
-  private void testList_negative(String vspId, Version version, String user,
+  private void testList_negative(String vspId, Version version,
                                  String expectedErrorCode) {
     try {
-      componentManager.listComponents(vspId, version, user);
+      componentManager.listComponents(vspId, version);
       Assert.fail();
     } catch (CoreException exception) {
-      log.debug("",exception);
       Assert.assertEquals(exception.code().id(), expectedErrorCode);
     }
   }
 
-  private void testDeleteList_negative(String vspId, Version version, String user,
+  private void testDeleteList_negative(String vspId, Version version,
                                        String expectedErrorCode) {
     try {
-      componentManager.deleteComponents(vspId, version, user);
+      componentManager.deleteComponents(vspId, version);
       Assert.fail();
     } catch (CoreException exception) {
-      log.debug("",exception);
       Assert.assertEquals(exception.code().id(), expectedErrorCode);
     }
   }
 
-  private void testDelete_negative(String vspId, Version version, String componentId, String user,
+  private void testDelete_negative(String vspId, Version version, String componentId,
                                    String expectedErrorCode) {
     try {
-      componentManager.deleteComponent(vspId, version, componentId, user);
+      componentManager.deleteComponent(vspId, version, componentId);
       Assert.fail();
     } catch (CoreException exception) {
-      log.debug("",exception);
       Assert.assertEquals(exception.code().id(), expectedErrorCode);
     }
   }