Code Review / sdc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Add collaboration feature
[sdc.git] / openecomp-be / backend / openecomp-sdc-vendor-software-product-manager / src / test / java / org / openecomp / sdc / vendorsoftwareproduct / impl / NicManagerImplTest.java
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/NicManagerImplTest.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/NicManagerImplTest.java
index ba04e91..959b501 100644 (file)
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/NicManagerImplTest.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/NicManagerImplTest.java
@@ -1,10 +1,5 @@
 package org.openecomp.sdc.vendorsoftwareproduct.impl;
 
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
@@ -35,17 +30,21 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
 public class NicManagerImplTest {
 
   private final Logger log = (Logger) LoggerFactory.getLogger(this.getClass().getName());
 
   private static final String NIC_NOT_EXIST_MSG =
       "Vendor Software Product NIC with Id nic1 does not exist for Vendor Software Product with " +
-          "id VSP_ID and version 0.1";
+          "id VSP_ID and version version_id";
 
-  private static final String USER = "nicTestUser";
   private static final String VSP_ID = "VSP_ID";
-  private static final Version VERSION = new Version(0, 1);
+  private static final Version VERSION = new Version("version_id");
   private static final String COMPONENT_ID = "COMPONENT_ID";
   private static final String NIC1_ID = "nic1";
   private static final String NIC2_ID = "nic2";
@@ -71,7 +70,7 @@ public class NicManagerImplTest {
 
   @Test
   public void testListWhenNone() {
-    Collection<NicEntity> nics = nicManager.listNics(VSP_ID, VERSION, COMPONENT_ID, USER);
+    Collection<NicEntity> nics = nicManager.listNics(VSP_ID, VERSION, COMPONENT_ID);
     Assert.assertEquals(nics.size(), 0);
   }
 
@@ -85,9 +84,9 @@ public class NicManagerImplTest {
     NetworkEntity network1 = NetworkManagerImplTest.createNetwork(VSP_ID, VERSION, NETWORK1_ID);
     NetworkEntity network2 = NetworkManagerImplTest.createNetwork(VSP_ID, VERSION, NETWORK2_ID);
     doReturn(Arrays.asList(network1, network2))
-        .when(networkManagerMock).listNetworks(VSP_ID, VERSION, USER);
+        .when(networkManagerMock).listNetworks(VSP_ID, VERSION);
 
-    Collection<NicEntity> nics = nicManager.listNics(VSP_ID, VERSION, COMPONENT_ID, USER);
+    Collection<NicEntity> nics = nicManager.listNics(VSP_ID, VERSION, COMPONENT_ID);
     Assert.assertEquals(nics.size(), 2);
     for (NicEntity nic : nics) {
       Assert.assertEquals(nic.getNicCompositionData().getNetworkName(),
@@ -103,12 +102,12 @@ public class NicManagerImplTest {
     Nic nic = nicEntity.getNicCompositionData();
     nic.setNetworkType(NetworkType.Internal);
     nicEntity.setNicCompositionData(nic);
-    doReturn(true).when(vspInfoDao).isManual(anyObject(),anyObject());
+    doReturn(true).when(vspInfoDao).isManual(anyObject(), anyObject());
     Collection<NicEntity> nicEntities = new ArrayList<>();
     doReturn(nicEntities).when(nicDao).list(anyObject());
     doReturn(nicEntity).when(compositionEntityDataManagerMock).createNic(anyObject());
 
-    NicEntity created = nicManager.createNic(nicEntity,USER);
+    NicEntity created = nicManager.createNic(nicEntity);
     Assert.assertNotNull(created);
   }
 
@@ -118,7 +117,7 @@ public class NicManagerImplTest {
     Nic nic = nicEntity.getNicCompositionData();
     nic.setNetworkType(NetworkType.Internal);
     nicEntity.setNicCompositionData(nic);
-    doReturn(true).when(vspInfoDao).isManual(anyObject(),anyObject());
+    doReturn(true).when(vspInfoDao).isManual(anyObject(), anyObject());
     Collection<NicEntity> nicEntities = new ArrayList<>();
 
     NicEntity nicEntityDiffName = createNic(VSP_ID, VERSION, COMPONENT_ID, NIC1_ID, NETWORK1_ID);
@@ -130,11 +129,11 @@ public class NicManagerImplTest {
     doReturn(nicEntity).when(compositionEntityDataManagerMock).createNic(anyObject());
 
     try {
-      NicEntity created = nicManager.createNic(nicEntity,USER);
-    }  catch (CoreException exception) {
-      log.debug("",exception);
-            Assert.assertEquals(VendorSoftwareProductErrorCodes.NIC_NAME_FORMAT_NOT_ALLOWED,
-              exception.code().id());
+      NicEntity created = nicManager.createNic(nicEntity);
+    } catch (CoreException exception) {
+      log.debug("", exception);
+      Assert.assertEquals(VendorSoftwareProductErrorCodes.NIC_NAME_FORMAT_NOT_ALLOWED,
+          exception.code().id());
     }
   }
 
@@ -144,7 +143,7 @@ public class NicManagerImplTest {
     Nic nic = nicEntity.getNicCompositionData();
     nic.setNetworkType(NetworkType.Internal);
     nicEntity.setNicCompositionData(nic);
-    doReturn(true).when(vspInfoDao).isManual(anyObject(),anyObject());
+    doReturn(true).when(vspInfoDao).isManual(anyObject(), anyObject());
     Collection<NicEntity> nicEntities = new ArrayList<>();
 
     NicEntity nicEntityDiffName = createNic(VSP_ID, VERSION, COMPONENT_ID, NIC1_ID, NETWORK1_ID);
@@ -156,11 +155,11 @@ public class NicManagerImplTest {
     doReturn(nicEntity).when(compositionEntityDataManagerMock).createNic(anyObject());
 
     try {
-      NicEntity created = nicManager.createNic(nicEntity,USER);
-    }  catch (CoreException exception) {
-      log.debug("",exception);
-      Assert.assertEquals("Invalid request, NIC with name "+ nic.getName() +
-          " already exist for component with ID "+ nicEntity.getComponentId() +".",
+      NicEntity created = nicManager.createNic(nicEntity);
+    } catch (CoreException exception) {
+      log.debug("", exception);
+      Assert.assertEquals("Invalid request, NIC with name " + nic.getName() +
+              " already exist for component with ID " + nicEntity.getComponentId() + ".",
           exception.code().message());
       Assert.assertEquals(VendorSoftwareProductErrorCodes.DUPLICATE_NIC_NAME_NOT_ALLOWED,
           exception.code().id());
@@ -173,19 +172,20 @@ public class NicManagerImplTest {
     Nic nic = nicEntity.getNicCompositionData();
     nic.setNetworkType(NetworkType.External);
     nicEntity.setNicCompositionData(nic);
-    doReturn(true).when(vspInfoDao).isManual(anyObject(),anyObject());
+    doReturn(true).when(vspInfoDao).isManual(anyObject(), anyObject());
     Collection<NicEntity> nicEntities = new ArrayList<>();
     doReturn(nicEntities).when(nicDao).list(anyObject());
     doReturn(nicEntity).when(compositionEntityDataManagerMock).createNic(anyObject());
 
     try {
-      NicEntity created = nicManager.createNic(nicEntity,USER);
-    }  catch (CoreException exception) {
-      log.debug("",exception);
+      NicEntity created = nicManager.createNic(nicEntity);
+    } catch (CoreException exception) {
+      log.debug("", exception);
       Assert.assertEquals("Invalid request,NetworkId not allowed for External Networks",
           exception.code().message());
-      Assert.assertEquals(VendorSoftwareProductErrorCodes.NETWORKID_NOT_ALLOWED_FOR_EXTERNAL_NETWORK,
-          exception.code().id());
+      Assert
+          .assertEquals(VendorSoftwareProductErrorCodes.NETWORKID_NOT_ALLOWED_FOR_EXTERNAL_NETWORK,
+              exception.code().id());
     }
   }
 
@@ -196,29 +196,29 @@ public class NicManagerImplTest {
     nic.setNetworkType(NetworkType.Internal);
     nic.setNetworkDescription(NIC1_ID);
     nicEntity.setNicCompositionData(nic);
-    doReturn(true).when(vspInfoDao).isManual(anyObject(),anyObject());
+    doReturn(true).when(vspInfoDao).isManual(anyObject(), anyObject());
     Collection<NicEntity> nicEntities = new ArrayList<>();
     doReturn(nicEntities).when(nicDao).list(anyObject());
     doReturn(nicEntity).when(compositionEntityDataManagerMock).createNic(anyObject());
 
     try {
-      NicEntity created = nicManager.createNic(nicEntity,USER);
-    }  catch (CoreException exception) {
-      log.debug("",exception);
+      NicEntity created = nicManager.createNic(nicEntity);
+    } catch (CoreException exception) {
+      log.debug("", exception);
       Assert.assertEquals("Invalid request, Network Description not allowed for Internal Networks",
           exception.code().message());
       Assert.assertEquals(VendorSoftwareProductErrorCodes
-          .NETWORK_DESCRIPTION_NOT_ALLOWED_FOR_INTERNAL_NETWORK,exception.code().id());
+          .NETWORK_DESCRIPTION_NOT_ALLOWED_FOR_INTERNAL_NETWORK, exception.code().id());
     }
   }
 
   @Test
   public void testDeleteNic() {
     NicEntity nicEntity = createNic(VSP_ID, VERSION, COMPONENT_ID, NIC1_ID, NETWORK1_ID);
-    doReturn(true).when(vspInfoDao).isManual(anyObject(),anyObject());
+    doReturn(true).when(vspInfoDao).isManual(anyObject(), anyObject());
     doReturn(nicEntity).when(nicDao).get(anyObject());
 
-    nicManager.deleteNic(VSP_ID,new Version(0,1),COMPONENT_ID,NIC1_ID,USER);
+    nicManager.deleteNic(VSP_ID, VERSION, COMPONENT_ID, NIC1_ID);
 
   }
 
@@ -227,9 +227,12 @@ public class NicManagerImplTest {
     NicEntity nicEntity = createNic(VSP_ID, VERSION, COMPONENT_ID, NIC1_ID, NETWORK1_ID);
 
     doReturn(nicEntity).when(nicDao).get(anyObject());
+    doReturn("{}").when(nicManager).getNicCompositionSchema(anyObject());
 
-    nicManager.updateNicQuestionnaire(VSP_ID,new Version(0,1),COMPONENT_ID,NIC1_ID,"Ques",USER);
+    nicManager
+        .updateNicQuestionnaire(VSP_ID, VERSION, COMPONENT_ID, NIC1_ID, "Ques");
 
+    verify(nicDao).updateQuestionnaireData(VSP_ID, VERSION, COMPONENT_ID, NIC1_ID, "Ques");
   }
 
 //    @Test(dependsOnMethods = "testListWhenNone")
@@ -243,7 +246,7 @@ public class NicManagerImplTest {
         Nic nicData = new Nic();
         nicData.setName("nic1 name");
         nic.setNicCompositionData(nicData);
-        testCreate_negative(nic, USER, UniqueValueUtil.UNIQUE_VALUE_VIOLATION);
+        testCreate_negative(nic, UniqueValueUtil.UNIQUE_VALUE_VIOLATION);
     }*/
 
 //    @Test(dependsOnMethods = {"testCreate"})
@@ -254,7 +257,7 @@ public class NicManagerImplTest {
 //        compData12.setDescription("comp12 desc");
 //        component12.setComponentCompositionData(compData12);
 //
-//        String component12Id = nicManager.createComponent(component12, USER).getId();
+//        String component12Id = nicManager.createComponent(component12).getId();
 //        testCreate(VSP_ID, component12Id, NETWORK1_ID, NETWORK1_ID.getNetworkCompositionData().getName());
 //    }
 
@@ -266,7 +269,7 @@ public class NicManagerImplTest {
   @Test
   public void testCreateOnUploadVsp_negative() {
 
-    testCreate_negative(new NicEntity(VSP_ID, VERSION, COMPONENT_ID, null), USER,
+    testCreate_negative(new NicEntity(VSP_ID, VERSION, COMPONENT_ID, null),
         VendorSoftwareProductErrorCodes.ADD_NIC_NOT_ALLOWED_IN_HEAT_ONBOARDING);
   }
 
@@ -274,7 +277,7 @@ public class NicManagerImplTest {
   public void testUpdateNonExistingNicId_negative() {
     doReturn(null).when(nicDao).get(anyObject());
 
-    testUpdate_negative(VSP_ID, VERSION, COMPONENT_ID, NIC1_ID, USER,
+    testUpdate_negative(VSP_ID, VERSION, COMPONENT_ID, NIC1_ID,
         VersioningErrorCodes.VERSIONABLE_SUB_ENTITY_NOT_FOUND);
   }
 
@@ -295,7 +298,7 @@ public class NicManagerImplTest {
     nicEntity.setNicCompositionData(nicData);
 
     CompositionEntityValidationData validationData =
-        nicManager.updateNic(nicEntity, USER);
+        nicManager.updateNic(nicEntity);
     Assert.assertTrue(validationData == null || validationData.getErrors() == null);
     verify(nicDao).update(nicEntity);
   }
@@ -319,7 +322,7 @@ public class NicManagerImplTest {
     nicData.setNetworkId(NETWORK1_ID);
     nicEntity.setNicCompositionData(nicData);
 
-    CompositionEntityValidationData validationData = nicManager.updateNic(nicEntity, USER);
+    CompositionEntityValidationData validationData = nicManager.updateNic(nicEntity);
     Assert.assertNotNull(validationData);
     Assert.assertEquals(validationData.getErrors().size(), 2);
 
@@ -329,14 +332,14 @@ public class NicManagerImplTest {
   @Test
   public void testUpdateIncorrectNameFormat() {
     doReturn(createNic(VSP_ID, VERSION, COMPONENT_ID, NIC1_ID, NETWORK1_ID))
-            .when(nicDao).get(anyObject());
+        .when(nicDao).get(anyObject());
 
     CompositionEntityValidationData toBeReturned =
-            new CompositionEntityValidationData(CompositionEntityType.nic, NIC1_ID);
+        new CompositionEntityValidationData(CompositionEntityType.nic, NIC1_ID);
     toBeReturned.setErrors(Arrays.asList("error1", "error2"));
     doReturn(toBeReturned)
-            .when(compositionEntityDataManagerMock)
-            .validateEntity(anyObject(), anyObject(), anyObject());
+        .when(compositionEntityDataManagerMock)
+        .validateEntity(anyObject(), anyObject(), anyObject());
     doReturn(true).when(vspInfoDao).isManual(anyObject(), anyObject());
 
     NicEntity nicEntity = new NicEntity(VSP_ID, VERSION, COMPONENT_ID, NIC1_ID);
@@ -347,20 +350,19 @@ public class NicManagerImplTest {
     nicEntity.setNicCompositionData(nicData);
 
     try {
-      nicManager.updateNic(nicEntity, USER);
+      nicManager.updateNic(nicEntity);
       Assert.fail();
-    }
-    catch (CoreException ex) {
-      log.debug("",ex);
+    } catch (CoreException ex) {
+      log.debug("", ex);
       Assert.assertEquals(VendorSoftwareProductErrorCodes.NIC_NAME_FORMAT_NOT_ALLOWED,
-              ex.code().id());
+          ex.code().id());
     }
   }
 
 
   @Test
   public void testGetNonExistingNicId_negative() {
-    testGet_negative(VSP_ID, VERSION, COMPONENT_ID, "non existing nic id", USER,
+    testGet_negative(VSP_ID, VERSION, COMPONENT_ID, "non existing nic id",
         VersioningErrorCodes.VERSIONABLE_SUB_ENTITY_NOT_FOUND);
   }
 
@@ -373,7 +375,7 @@ public class NicManagerImplTest {
     doReturn(compositionSchema).when(nicManager).getNicCompositionSchema(anyObject());
 
     CompositionEntityResponse<Nic> response =
-        nicManager.getNic(VSP_ID, VERSION, COMPONENT_ID, NIC1_ID, USER);
+        nicManager.getNic(VSP_ID, VERSION, COMPONENT_ID, NIC1_ID);
     Assert.assertEquals(response.getId(), expected.getId());
     Assert.assertEquals(response.getData(), expected.getNicCompositionData());
     Assert.assertEquals(response.getSchema(), compositionSchema);
@@ -387,32 +389,32 @@ public class NicManagerImplTest {
 
     @Test
     public void testDeleteNonExistingNicId_negative() {
-        testDelete_negative(VSP_ID, COMPONENT_ID, "non existing nic id", USER, VersioningErrorCodes.VERSIONABLE_SUB_ENTITY_NOT_FOUND);
+        testDelete_negative(VSP_ID, COMPONENT_ID, "non existing nic id", VersioningErrorCodes.VERSIONABLE_SUB_ENTITY_NOT_FOUND);
     }
 
     @Test(dependsOnMethods = "testList")
     public void testDeleteNonExistingComponentId_negative() {
-        testDelete_negative(VSP_ID, "non existing component id", NIC1_ID, USER, VersioningErrorCodes.VERSIONABLE_SUB_ENTITY_NOT_FOUND);
+        testDelete_negative(VSP_ID, "non existing component id", NIC1_ID, VersioningErrorCodes.VERSIONABLE_SUB_ENTITY_NOT_FOUND);
     }*/
 
 /*
     @Test(dependsOnMethods = "testList")
     public void testDelete() {
-        nicManager.deleteNic(VSP_ID, COMPONENT_ID, NIC1_ID, USER);
+        nicManager.deleteNic(VSP_ID, COMPONENT_ID, NIC1_ID);
         NicEntity actual = vendorSoftwareProductDao.getNic(VSP_ID, VERSION, COMPONENT_ID, NIC1_ID);
         Assert.assertNull(actual);
     }*/
 
   @Test
   public void testDeleteOnUploadVsp_negative() {
-    testDelete_negative(VSP_ID, VERSION, COMPONENT_ID, NIC1_ID, USER,
+    testDelete_negative(VSP_ID, VERSION, COMPONENT_ID, NIC1_ID,
         VendorSoftwareProductErrorCodes.DELETE_NIC_NOT_ALLOWED);
   }
 
   @Test(expectedExceptions = CoreException.class,
       expectedExceptionsMessageRegExp = NIC_NOT_EXIST_MSG)
   public void testGetNonExistingNicQuestionnaire() throws Exception {
-    nicManager.getNicQuestionnaire(VSP_ID, VERSION, COMPONENT_ID, NIC1_ID, USER);
+    nicManager.getNicQuestionnaire(VSP_ID, VERSION, COMPONENT_ID, NIC1_ID);
   }
 
   @Test
@@ -425,7 +427,7 @@ public class NicManagerImplTest {
     doReturn(schema).when(nicManager).getNicQuestionnaireSchema(anyObject());
 
     QuestionnaireResponse questionnaire =
-        nicManager.getNicQuestionnaire(VSP_ID, VERSION, COMPONENT_ID, NIC1_ID, USER);
+        nicManager.getNicQuestionnaire(VSP_ID, VERSION, COMPONENT_ID, NIC1_ID);
     Assert.assertNotNull(questionnaire);
     Assert.assertEquals(questionnaire.getData(), nic.getQuestionnaireData());
     Assert.assertEquals(questionnaire.getSchema(), schema);
@@ -437,7 +439,7 @@ public class NicManagerImplTest {
   public void testUpdateNonExistingNicQuestionnaire() throws Exception {
     doReturn(null).when(nicDao).get(anyObject());
     nicManager
-        .updateNicQuestionnaire(VSP_ID, VERSION, COMPONENT_ID, NIC1_ID, "questionnaire data", USER);
+        .updateNicQuestionnaire(VSP_ID, VERSION, COMPONENT_ID, NIC1_ID, "questionnaire data");
   }
 
   @Test
@@ -445,46 +447,45 @@ public class NicManagerImplTest {
 
   }
 
-  private void testCreate_negative(NicEntity nic, String user, String expectedErrorCode) {
+  private void testCreate_negative(NicEntity nic, String expectedErrorCode) {
     try {
-      nicManager.createNic(nic, user);
+      nicManager.createNic(nic);
       Assert.fail();
     } catch (CoreException exception) {
-      log.debug("",exception);
+      log.debug("", exception);
       Assert.assertEquals(exception.code().id(), expectedErrorCode);
     }
   }
 
   private void testGet_negative(String vspId, Version version, String componentId, String nicId,
-                                String user, String expectedErrorCode) {
+                                String expectedErrorCode) {
     try {
-      nicManager.getNic(vspId, version, componentId, nicId, user);
+      nicManager.getNic(vspId, version, componentId, nicId);
       Assert.fail();
     } catch (CoreException exception) {
-      log.debug("",exception);
+      log.debug("", exception);
       Assert.assertEquals(exception.code().id(), expectedErrorCode);
     }
   }
 
   private void testUpdate_negative(String vspId, Version version, String componentId, String nicId,
-                                   String user, String expectedErrorCode) {
+                                   String expectedErrorCode) {
     try {
-      nicManager.updateNic(new NicEntity(vspId, version, componentId, nicId), user);
+      nicManager.updateNic(new NicEntity(vspId, version, componentId, nicId));
       Assert.fail();
     } catch (CoreException exception) {
-      log.debug("",exception);
+      log.debug("", exception);
       Assert.assertEquals(exception.code().id(), expectedErrorCode);
     }
   }
 
   private void testDelete_negative(String vspId, Version version, String componentId, String nicId,
-                                   String user,
                                    String expectedErrorCode) {
     try {
-      nicManager.deleteNic(vspId, version, componentId, nicId, user);
+      nicManager.deleteNic(vspId, version, componentId, nicId);
       Assert.fail();
     } catch (CoreException exception) {
-      log.debug("",exception);
+      log.debug("", exception);
       Assert.assertEquals(exception.code().id(), expectedErrorCode);
     }
   }
SDC Parent Project Catalog FE and BE