Improve testing stability 20/126520/4
authorvasraz <vasyl.razinkov@est.tech>
Mon, 10 Jan 2022 19:23:57 +0000 (19:23 +0000)
committerMichael Morris <michael.morris@est.tech>
Thu, 13 Jan 2022 09:38:58 +0000 (09:38 +0000)
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: I3f631642a97e65d6628816767e0a5408f02f4bc6
Issue-ID: SDC-3839

150 files changed:
asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/tasks/artifacts/ArtifactValidationUtilsTest.java
catalog-be-plugins/etsi-nfv-nsd-csar-plugin/src/test/java/org/openecomp/sdc/be/plugins/etsi/nfv/nsd/generator/EtsiNfvNsCsarEntryGeneratorTest.java
catalog-be-plugins/etsi-nfv-nsd-csar-plugin/src/test/java/org/openecomp/sdc/be/plugins/etsi/nfv/nsd/generator/EtsiNfvNsdCsarGeneratorImplTest.java
catalog-be-plugins/etsi-nfv-nsd-csar-plugin/src/test/java/org/openecomp/sdc/be/plugins/etsi/nfv/nsd/generator/NsDescriptorGeneratorImplTest.java
catalog-be-plugins/etsi-nfv-nsd-csar-plugin/src/test/java/org/openecomp/sdc/be/plugins/etsi/nfv/nsd/security/NsdCsarEtsiOption2SignerTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/PropertyBusinessLogicTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/ServiceDistributionBLTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/EnvironmentsEngineTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/ServiceDistributionArtifactsBuilderTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/StepsTenantIsolation.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogicTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/CapabilitiesBusinessLogicTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/CapabilityTypeImportManagerTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/CategoriesImportManagerTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ComponentInterfaceOperationBusinessLogicTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ComponentLockerTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ComponentNodeFilterBusinessLogicTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ComponentSubstitutionFilterBusinessLogicTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ConsumerBusinessLogicTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/DataTypeBusinessLogicTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/DistributionMonitoringBusinessLogicTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/InputsBusinessLogicTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/InterfaceLifecycleTypeImportManagerTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/OutputsBusinessLogicTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/PolicyBusinessLogicTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ProductBusinessLogicTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/RequirementBusinessLogicTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogicTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ResourceInstanceBusinessLogicTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ServiceImportBusinessLogicTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ServiceImportParseLogicTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/GlobalInputsFilteringBusinessLogicTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/TopologyComparatorTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/ComponentCapabilitiesPropertiesMergeBLTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceArtifactsMergeTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceHeatEnvMergeTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceInterfacesMergeTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceMergeDataBusinessLogicTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstancePropsAndInputsMergeTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/path/ComponentInstanceForwardingPathMergeTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/property/ComponentInstanceInputsMergeBLTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/property/ComponentInstancePropertiesMergeBLTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/property/DataDefinitionsValuesMergingBusinessLogicTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/path/ForwardingPathValidatorTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/property/ComponentInstanceInputPropertyDeceleratorTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/property/PropertyDeclarationOrchestratorTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/property/PropertyDeserializationOrchestratorTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/property/propertytopolicydeclarators/ComponentInstancePropertyToPolicyDeclaratorTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/scheduledtasks/RecoveryThreadManagerTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/upgrade/UpgradeBusinessLogicTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/validation/CapabilitiesValidationTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/validation/ComponentValidationsTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/validation/InterfaceOperationValidationTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/validation/NodeFilterValidationTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/validation/RequirementValidationTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/validation/ServiceDistributionValidationTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/validation/UserValidationsTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/distribution/DistributionBusinessLogicTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/filters/GatewayFilterTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/filters/ReqValidationFilterTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/impl/aaf/RoleAuthorizationHandlerTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ComponentNodeFilterServletTest.java
catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/ArtifactCassandraDaoTest.java
catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/AuditCassandraDaoTest.java
catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/OperationalEnvironmentDaoTest.java
catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/SdcSchemaFilesCassandraDaoTest.java
catalog-dao/src/test/java/org/openecomp/sdc/be/dao/janusgraph/JanusGraphDaoMockTest.java
catalog-fe/src/test/java/org/openecomp/sdc/fe/impl/PluginStatusBLTest.java
catalog-fe/src/test/java/org/openecomp/sdc/fe/servlets/ConfigServletTest.java
catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/CapabilitiesOperationTest.java
catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaOperationFacadeTest.java
catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/InterfaceLifecycleOperationTest.java
catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/RelationshipTypeOperationTest.java
catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/UserAdminOperationTest.java
common-be/src/test/java/org/openecomp/sdc/be/csar/security/CertificateManagerImplTest.java
common-be/src/test/java/org/openecomp/sdc/be/csar/security/model/CertificateInfoImplTest.java
openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/src/test/java/org/openecomp/sdcrests/action/rest/services/ActionsImplTest.java
openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/src/test/java/org/openecomp/sdcrests/applicationconfig/rest/services/ApplicationConfigurationImplTest.java
openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/externaltesting-rest-services/src/test/java/org/openecomp/sdcrests/externaltesting/rest/services/ApiTest.java
openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/src/test/java/org/openecomp/sdcrests/validation/rest/service/ValidationImplTest.java
openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/services/ComponentDependenciesImplTest.java
openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/services/ComponentImplTest.java
openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/services/ComponentMonitoringUploadsImplTest.java
openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/services/ComponentProcessesImplTest.java
openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/services/ComputeImplTest.java
openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/services/DeploymentFlavorsImplTest.java
openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/services/ImagesImplTest.java
openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/services/NetworksImplTest.java
openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/services/NicsImplTest.java
openecomp-be/backend/openecomp-sdc-action-manager/src/test/java/org/openecomp/sdc/action/impl/ActionManagerImplTest.java
openecomp-be/backend/openecomp-sdc-item-permissions-manager/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsManagerImplTest.java
openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/LimitTest.java
openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/VendorLicenseFacadeImplTest.java
openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/EntitlementPoolTest.java
openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/FeatureGroupTest.java
openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/LicenseAgreementTest.java
openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/LicenseKeyGroupTest.java
openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/VendorLicenseModelTest.java
openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/ImagesTest.java
openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/QuestionnaireDataServiceTest.java
openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ComponentDependencyModelTest.java
openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ComponentManagerImplTest.java
openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/CompositionEntityDataManagerImplTest.java
openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ComputeManagerImplTest.java
openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/DeploymentFlavorManagerImplTest.java
openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ImageManagerImplTest.java
openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ManualVspToscaManagerImplTest.java
openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/MonitoringUploadsManagerImplTest.java
openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/NetworkManagerImplTest.java
openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/NicManagerImplTest.java
openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/OrchestrationTemplateCandidateManagerImplTest.java
openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ProcessManagerImplTest.java
openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/CandidateServiceImplTest.java
openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/composition/CompositionDataExtractorImplTest.java
openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/tree/UploadFileTest.java
openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/upload/csar/UploadCSARFileTest.java
openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/src/test/java/org/openecomp/sdc/common/session/impl/SessionContextProviderFactoryImplTest.java
openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/src/test/java/org/openecomp/core/zusammen/impl/ZusammenAdaptorImplTest.java
openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/test/java/org/openecomp/sdc/healing/healers/ManufacturerReferenceNumberHealerTest.java
openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/test/java/org/openecomp/sdc/healing/healers/NetworkPackageHealerTest.java
openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/services/HeatStructureUtilTest.java
openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/services/tree/HeatTreeManagerUtilTest.java
openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImplTest.java
openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/test/java/org/openecomp/sdc/itempermissions/servlet/PermissionsFilterTest.java
openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/external/artifact/MonitoringMibEnricherTest.java
openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/external/artifact/ProcessArtifactEnricherTest.java
openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/tosca/AbstractSubstituteToscaEnricherTest.java
openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/tosca/ComponentQuestionnaireDataTest.java
openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/src/test/java/org/openecomp/core/externaltesting/impl/ExternalTestingManagerImplTest.java
openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/src/test/java/org/openecomp/sdc/notification/services/impl/NotificationPropagationManagerImplTest.java
openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/src/test/java/org/openecomp/sdc/notification/services/impl/NotificationsServiceImplTest.java
openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/src/test/java/org/openecomp/sdc/notification/services/impl/PropagationServiceImplTest.java
openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml
openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/ComputeConsolidationDataHandlerTest.java
openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/ComputeConsolidationDataTest.java
openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/FileComputeConsolidationDataTest.java
openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/NestedConsolidationDataHandlerTest.java
openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/PortConsolidationDataTest.java
openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/TypeComputeConsolidationDataTest.java
openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationServiceTest.java
openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java
openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/dao/impl/zusammen/ItemZusammenDaoImplTest.java
openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/dao/impl/zusammen/VersionZusammenDaoImplTest.java
openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/impl/AsdcItemManagerImplTest.java
openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/impl/ItemManagerImplTest.java
openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/impl/VersioningManagerImplTest.java
openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImplTest.java
openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaFileOutputServiceCsarImplTest.java
pom.xml

index 58ce197..f3997ed 100644 (file)
@@ -86,7 +86,7 @@ public class ArtifactValidationUtilsTest {
 
     @BeforeEach
     public void initMocks() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         when(artifactCassandraDao.getCountOfArtifactById(ES_ID)).thenReturn(Either.left(1L));
         when(artifactCassandraDao.getCountOfArtifactById(ES_ID_NOT_IN_CASS)).thenReturn(Either.right(CassandraOperationStatus.NOT_FOUND));
 
index b1b8157..31798ef 100644 (file)
@@ -81,7 +81,7 @@ class EtsiNfvNsdCsarGeneratorImplTest {
 
     @BeforeEach
     void setUp() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         final EtsiVersion version2_5_1 = EtsiVersion.VERSION_2_5_1;
         etsiNfvNsdCsarGenerator = new EtsiNfvNsdCsarGeneratorImpl(new NsDescriptorConfig(version2_5_1),
             vnfDescriptorGenerator, nsDescriptorGeneratorFactory, artifactCassandraDao, nsdCsarEtsiOption2Signer);
index 516c2ec..4c2c0a9 100644 (file)
@@ -107,7 +107,7 @@ class NsDescriptorGeneratorImplTest {
     @BeforeEach
     void setUp() {
         setUpConfigurationMock();
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         nsDescriptorGenerator = new NsDescriptorGeneratorImpl(toscaExportHandler, toscaTemplateYamlGeneratorProvider);
     }
 
index e6e8957..8d3f126 100644 (file)
@@ -66,7 +66,7 @@ class NsdCsarEtsiOption2SignerTest {
 
     @BeforeEach
     void setUp() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         when(environment.getProperty(SDC_NSD_CERT_NAME)).thenReturn(CERT_NAME);
         when(certificateManager.getCertificate(CERT_NAME)).thenReturn(Optional.of(certificateInfo));
         when(certificateInfo.isValid()).thenReturn(true);
index 63bb0b8..e6457c9 100644 (file)
@@ -120,7 +120,7 @@ public class PropertyBusinessLogicTest extends BaseBusinessLogicMock {
 
     @Before
     public void setup() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         ExternalConfiguration.setAppName("catalog-be");
 
         // User data and management
index 9b6a26d..72cb516 100644 (file)
@@ -87,7 +87,7 @@ class ServiceDistributionBLTest extends ComponentBusinessLogicMock {
     public void setup() {
 
         ExternalConfiguration.setAppName("catalog-be");
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         final ComponentsUtils componentsUtils = new ComponentsUtils(Mockito.mock(AuditingManager.class));
         bl.setComponentsUtils(componentsUtils);
         serviceToActivate = new Service();
index 8473bb2..94245c7 100644 (file)
@@ -82,7 +82,7 @@ public class DistributionEngineTest{
 
        @Before
        public void setUpMock() throws Exception {
-               MockitoAnnotations.initMocks(this);
+               MockitoAnnotations.openMocks(this);
                distributionEngineConfigurationMock = new DummyDistributionConfigurationManager();
                envs = getEnvs(ENV_ID);
         modifier.setUserId(USER_ID);
index 1097434..357010e 100644 (file)
@@ -76,7 +76,7 @@ public class EnvironmentsEngineTest {
 
     @Before
     public void preStart() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         new ConfigurationManager(new FSConfigurationSource(ExternalConfiguration.getChangeListener(), "src/test/resources/config/catalog-be"));
     }
 
index c1cd5f3..46fcbdd 100644 (file)
@@ -62,7 +62,7 @@ public class ServiceDistributionArtifactsBuilderTest extends BeConfDependentTest
 
        @Before
        public void setUpMock() throws Exception {
-               MockitoAnnotations.initMocks(this);
+               MockitoAnnotations.openMocks(this);
        }
 
        @Test
index 77c332a..40e76d3 100644 (file)
@@ -90,7 +90,7 @@ public class StepsTenantIsolation {
 
     @Before
     public void beforeScenario() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         when(operationalEnvironmentDao.getByEnvironmentsStatus(EnvironmentStatusEnum.COMPLETED))
             .thenReturn(Either.right(CassandraOperationStatus.NOT_FOUND));
         doNothing().when(envEngine).createUebTopicsForEnvironments();
index 14d00ef..0734bc5 100644 (file)
@@ -215,7 +215,7 @@ public class ArtifactsBusinessLogicTest extends BaseBusinessLogicMock {
 
     @Before
     public void initMocks() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         Either<ArtifactDefinition, StorageOperationStatus> NotFoundResult = Either
                 .right(StorageOperationStatus.NOT_FOUND);
 
index 9bbe64f..e70f3a7 100644 (file)
@@ -92,7 +92,7 @@ public class CapabilitiesBusinessLogicTest extends BaseBusinessLogicMock {
 
     @Before
     public void setup() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         ExternalConfiguration.setAppName("catalog-be");
 
         ComponentsUtils componentsUtils = new ComponentsUtils(Mockito.mock(AuditingManager.class));
index a4d02e1..10ca58d 100644 (file)
@@ -80,7 +80,7 @@ public class CapabilityTypeImportManagerTest {
 
     @Before
     public void initMocks() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
     }
 
     @Test
index a42f2ef..f7d0709 100644 (file)
@@ -80,7 +80,7 @@ public class CategoriesImportManagerTest {
 
     @Before
     public void initMocks() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
     }
 
     @Test
index 93334d1..6018207 100644 (file)
@@ -88,7 +88,7 @@ public class ComponentInterfaceOperationBusinessLogicTest extends BaseBusinessLo
 
     @BeforeEach
     public void init() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         componentInterfaceOperationBusinessLogic =
             new ComponentInterfaceOperationBusinessLogic(elementDao, groupOperation, groupInstanceOperation,
                 groupTypeOperation, interfaceOperation, interfaceLifecycleTypeOperation, artifactToscaOperation,
index d2c7c7a..74d0e61 100644 (file)
@@ -46,7 +46,7 @@ public class ComponentLockerTest {
 \r
     @Before\r
     public void init() {\r
-        MockitoAnnotations.initMocks(this);\r
+        MockitoAnnotations.openMocks(this);\r
     }\r
 \r
     @Test\r
index cd70859..ed5c5b9 100644 (file)
@@ -124,7 +124,7 @@ public class ComponentNodeFilterBusinessLogicTest extends BaseBusinessLogicMock
 
     @BeforeEach
     public void init() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         componentNodeFilterBusinessLogic =
             new ComponentNodeFilterBusinessLogic(elementDao, groupOperation, groupInstanceOperation,
                 groupTypeOperation, interfaceOperation, interfaceLifecycleTypeOperation, artifactToscaOperation,
index ffda5ec..7435a8b 100644 (file)
@@ -102,7 +102,7 @@ public class ComponentSubstitutionFilterBusinessLogicTest extends BaseBusinessLo
 
     @BeforeEach
     public void init() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         componentSubstitutionFilterBusinessLogic =
             new ComponentSubstitutionFilterBusinessLogic(elementDao, groupOperation, groupInstanceOperation,
                 groupTypeOperation, interfaceOperation, interfaceLifecycleTypeOperation, artifactToscaOperation,
index 6239d33..886747e 100644 (file)
@@ -80,7 +80,7 @@ class ConsumerBusinessLogicTest extends BaseBusinessLogicMock {
             interfaceOperation, interfaceLifecycleTypeOperation, artifactToscaOperation);
         consumerDataDefinition = new ConsumerDataDefinition();
         consumer = new ConsumerDefinition();
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         user = new User("Stan", "Lee", "stan.lee",
             "stan.lee@marvel.com", "ADMIN", 1542024000L);
     }
index c870d3b..3719b9b 100644 (file)
@@ -87,7 +87,7 @@ public class DataTypeBusinessLogicTest {
 
     @Before
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
 
         testInstance.setToscaOperationFacade(toscaOperationFacadeMock);
 
index 0d6e87a..7b111ba 100644 (file)
@@ -67,7 +67,7 @@ public class DistributionMonitoringBusinessLogicTest extends BaseBusinessLogicMo
 
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         businessLogic = new DistributionMonitoringBusinessLogic(elementDao, groupOperation, groupInstanceOperation,
             groupTypeOperation, interfaceOperation, interfaceLifecycleTypeOperation,
             cassandraDao, artifactToscaOperation);
index 9700a86..bd3e9ae 100644 (file)
@@ -149,7 +149,7 @@ public class InputsBusinessLogicTest {
 
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         service = new Service();
         service.setUniqueId(COMPONENT_ID);
         service.setLastUpdaterUserId(USER_ID);
index 9aa68d8..93a861d 100644 (file)
@@ -80,7 +80,7 @@ public class InterfaceLifecycleTypeImportManagerTest {
 
     @Before
     public void initMocks() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
     }
 
     @Test
index 88d98de..9c7e384 100644 (file)
@@ -127,7 +127,7 @@ class OutputsBusinessLogicTest {
 
     @BeforeEach
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         service = new Service();
         service.setUniqueId(COMPONENT_ID);
         service.setLastUpdaterUserId(USER_ID);
index 8ee13e8..7a8a15a 100644 (file)
@@ -143,7 +143,7 @@ public class PolicyBusinessLogicTest {
 
     @Before
     public void initBl() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         businessLogic.setComponentsUtils(componentsUtils);
         businessLogic.setToscaOperationFacade(toscaOperationFacade);
         businessLogic.setJanusGraphDao(janusGraphDao);
index 42d4e4b..fd8aede 100644 (file)
@@ -106,7 +106,7 @@ public class ProductBusinessLogicTest extends ComponentBusinessLogicMock {
                        artifactsBusinessLogic, componentInstanceBusinessLogic, artifactToscaOperation, componentContactIdValidator,
                        componentNameValidator, componentTagsValidator, componentValidator,
                        componentIconValidator, componentProjectCodeValidator, componentDescriptionValidator );
-               MockitoAnnotations.initMocks(this);
+               MockitoAnnotations.openMocks(this);
                product = new Product();
                user = new User();
                contacts = new ArrayList<>();
index 671715e..63a9d3c 100644 (file)
@@ -89,7 +89,7 @@ public class RequirementBusinessLogicTest extends BaseBusinessLogicMock {
 
     @Before
     public void setup() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         ExternalConfiguration.setAppName("catalog-be");
 
         ComponentsUtils componentsUtils = new ComponentsUtils(Mockito.mock(AuditingManager.class));
index 334bffd..0018ed0 100644 (file)
@@ -261,7 +261,7 @@ public class ResourceBusinessLogicTest {
 
        @Before
        public void setup() {
-               MockitoAnnotations.initMocks(this);
+               MockitoAnnotations.openMocks(this);
                Mockito.reset(propertyOperation);
 
                // Elements
index f69a9dc..b503717 100644 (file)
@@ -100,7 +100,7 @@ public class ResourceInstanceBusinessLogicTest extends BaseBusinessLogicMock {
 
     @Before
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         Map<String, Object> deploymentResourceArtifacts = ConfigurationManager.getConfigurationManager().getConfiguration().getDeploymentResourceInstanceArtifacts();
         Map<String, Object> placeHolderData = (Map<String, Object>) deploymentResourceArtifacts.get(ArtifactsBusinessLogic.HEAT_ENV_NAME);
 
index 822fad5..884978a 100644 (file)
@@ -136,7 +136,7 @@ class ServiceImportBusinessLogicTest extends ServiceImportBussinessLogicBaseTest
 
     @BeforeEach
     public void initMocks() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         when(artifactDefinition.getMandatory()).thenReturn(true);
         when(artifactDefinition.getArtifactName()).thenReturn("creatorFullName");
         when(artifactDefinition.getArtifactType()).thenReturn("TOSCA_CSAR");
index 6d9467d..368b388 100644 (file)
@@ -137,7 +137,7 @@ class ServiceImportParseLogicTest extends ServiceImportBussinessLogicBaseTestSet
 
     @BeforeEach
     public void setup() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
 
         // Elements
         mockElementDao = new ElementOperationMock();
index 3c2c1c3..458d104 100644 (file)
@@ -64,7 +64,7 @@ public class GlobalInputsFilteringBusinessLogicTest {
 
     @Before
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
     }
 
     @Test
index 7f77b7d..9e8cff5 100644 (file)
@@ -57,7 +57,7 @@ public class TopologyComparatorTest {
 
     @Before
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
     }
 
     @Test
index 2b48f1e..473f6fb 100644 (file)
@@ -65,7 +65,7 @@ public class ComponentCapabilitiesPropertiesMergeBLTest {
 
        @Before
        public void setUp() {
-               MockitoAnnotations.initMocks(this);
+               MockitoAnnotations.openMocks(this);
        }
 
        @Test
index 66c535e..d29621a 100644 (file)
@@ -61,7 +61,7 @@ public class ComponentInstanceArtifactsMergeTest {
        
        @Before
        public void setUp() throws Exception {
-               MockitoAnnotations.initMocks(this);
+               MockitoAnnotations.openMocks(this);
        }
 
        @Test
index a23508f..1be72f5 100644 (file)
@@ -69,7 +69,7 @@ public class ComponentInstanceHeatEnvMergeTest {
 
     @Before
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
     }
 
     @Test
index 33590e8..5c19dcb 100644 (file)
@@ -76,7 +76,7 @@ public class ComponentInstanceInterfacesMergeTest {
 
   @Before
   public void setUpData() {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     user = new User();
     user.setUserId("44");
     user.setRole(UserRoleEnum.ADMIN.getName());
index bbd2467..5f0f6af 100644 (file)
@@ -73,7 +73,7 @@ public class ComponentInstanceMergeDataBusinessLogicTest {
 
     @Before
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         testInstance.setComponentInstancesMergeBLs(Arrays.asList(componentInstanceMergeInterfaceMock1, componentInstanceMergeInterfaceMock2));
         new ConfigurationManager(new FSConfigurationSource(ExternalConfiguration.getChangeListener(), "src/test/resources/config/catalog-be"));
     }
index eedd44d..e12010c 100644 (file)
@@ -87,7 +87,7 @@ class ComponentInstancePropsAndInputsMergeTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         resourceToUpdate = new ResourceBuilder().addInstanceInput(INSTANCE_ID1, "instInput1")
             .addInstanceInput(INSTANCE_ID1, "instInput2")
             .addInstanceProperty(INSTANCE_ID1, "instProp1")
index 50eaea9..322a2bf 100644 (file)
@@ -57,7 +57,7 @@ public class ComponentInstanceForwardingPathMergeTest extends BaseForwardingPath
 
     @BeforeEach
     public void setUpData() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         user = new User();
         user.setUserId("44");
         user.setRole(UserRoleEnum.ADMIN.getName());
index 429b2d7..9b8752f 100644 (file)
@@ -66,7 +66,7 @@ public class ComponentInstanceInputsMergeBLTest {
 
     @Before
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         ComponentInstance instance1 = new ComponentInstanceBuilder().setId(INSTANCE1).setName(INSTANCE1).build();
         ComponentInstance instance2 = new ComponentInstanceBuilder().setId(INSTANCE2).setName(INSTANCE2).build();
 
index 77cb761..818b225 100644 (file)
@@ -69,7 +69,7 @@ public class ComponentInstancePropertiesMergeBLTest {
 
     @Before
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         oldResource = new ResourceBuilder()
                 .addComponentInstance(INSTANCE1, OLD_INSTANCE1)
                 .addComponentInstance(INSTANCE2, OLD_INSTANCE2)
index ae44cea..eef8c80 100644 (file)
@@ -60,7 +60,7 @@ public class ForwardingPathValidatorTest implements ForwardingPathTestUtils {
 
     @BeforeEach
     public void init() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         mock = Mockito.mock(ResponseFormatManager.class);
         when(toscaOperationFacade.getToscaElement(any(), any(ComponentParametersView.class))).thenReturn(Either.left(service));
         when(mock.getResponseFormat(any())).thenReturn(new ResponseFormat());
index 538e465..82e32c3 100644 (file)
@@ -56,7 +56,7 @@ public class ComponentInstanceInputPropertyDeceleratorTest {
 
        @Before
        public void setUp() {
-               MockitoAnnotations.initMocks(this);
+               MockitoAnnotations.openMocks(this);
        }
 
        @Test
index d6bd322..5f242d8 100644 (file)
@@ -86,7 +86,7 @@ public class PropertyDeclarationOrchestratorTest {
        @Before
        public void setUp() throws Exception {
 
-               MockitoAnnotations.initMocks(this);
+               MockitoAnnotations.openMocks(this);
 
                service = new ServiceBuilder().setUniqueId(SERVICE_UID).build();
        }
index d1cf303..37fce9b 100644 (file)
@@ -59,7 +59,7 @@ public class PropertyDeserializationOrchestratorTest {
        @Before
        public void setUp() throws Exception {
 
-               MockitoAnnotations.initMocks(this);
+               MockitoAnnotations.openMocks(this);
        }
 
        @Test(expected = IllegalStateException.class)
index 0d1c839..13d8471 100644 (file)
@@ -60,7 +60,7 @@ public class RecoveryThreadManagerTest extends BeConfDependentTest {
 
     @Before
     public void initMocks() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         reset(operationalEnvironmentDao, environmentsEngine, scheduledService);
         recoveryThreadManager.init();
     }
index 7b4e8d9..7b1a7e9 100644 (file)
@@ -114,7 +114,7 @@ public class UpgradeBusinessLogicTest {
 
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
 
         upgradeBusinessLogic = new UpgradeBusinessLogic(lifecycleBusinessLogic, componentInstanceBusinessLogic,
                 userValidations, toscaOperationFacade, componentsUtils, upgradeOperation,
index 672a383..e6274cd 100644 (file)
@@ -44,7 +44,7 @@ public class CapabilitiesValidationTest  {
     private final CapabilitiesValidationUtilTest capabilitiesValidationUtilTest = new CapabilitiesValidationUtilTest();
     @Before
     public void init() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         responseFormatManagerMock = Mockito.mock(ResponseFormatManager.class);
         when(responseFormatManagerMock.getResponseFormat(any())).thenReturn(new ResponseFormat());
         when(responseFormatManagerMock.getResponseFormat(any(), any())).thenReturn(new ResponseFormat());
index bbdbcdf..829b0b9 100644 (file)
@@ -58,7 +58,7 @@ class ComponentValidationsTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         new ConfigurationManager(new FSConfigurationSource(ExternalConfiguration.getChangeListener(), "src/test/resources/config/catalog-be"));
     }
 
index 2f132ab..bfcfd59 100644 (file)
@@ -72,7 +72,7 @@ public class InterfaceOperationValidationTest {
     @Before
     public void setup() {
 
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         responseFormatManagerMock = Mockito.mock(ResponseFormatManager.class);
         when(responseFormatManagerMock.getResponseFormat(any())).thenReturn(new ResponseFormat());
         when(responseFormatManagerMock.getResponseFormat(any(), any())).thenReturn(new ResponseFormat());
index 3a15959..3bdd22c 100644 (file)
@@ -72,7 +72,7 @@ public class NodeFilterValidationTest {
     @BeforeEach
     public void setup() {
         componentsUtils = Mockito.mock(ComponentsUtils.class);
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         new ConfigurationManager(new FSConfigurationSource(ExternalConfiguration.getChangeListener(), "src/test/resources/config/catalog-be"));
     }
 
index 309490a..16ca6ac 100644 (file)
@@ -42,7 +42,7 @@ public class RequirementValidationTest {
     private final RequirementValidationUtilTest requirementValidationUtilTest = new RequirementValidationUtilTest();
     @Before
     public void init() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         responseFormatManagerMock = Mockito.mock(ResponseFormatManager.class);
         when(responseFormatManagerMock.getResponseFormat(any())).thenReturn(new ResponseFormat());
         when(responseFormatManagerMock.getResponseFormat(any(), any())).thenReturn(new ResponseFormat());
index 483becc..44e35fc 100644 (file)
@@ -87,7 +87,7 @@ public class ServiceDistributionValidationTest {
 
     @Before
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         user = new User();
         user.setUserId(USER_ID);
         errResponse = new ResponseFormat();
index 6c08fcb..c19cf46 100644 (file)
@@ -53,7 +53,7 @@ public class UserValidationsTest {
        @BeforeEach
        public void setUp() {
                //TestUtilsSdc.setFinalStatic(UserValidations.class, "log", LoggerFactory.getLogger(UserValidations.class));
-               MockitoAnnotations.initMocks(this);
+               MockitoAnnotations.openMocks(this);
                new ConfigurationManager(new FSConfigurationSource(ExternalConfiguration.getChangeListener(), "src/test/resources/config/catalog-be"));
        }
 
index 997ea2f..523f58f 100644 (file)
@@ -67,7 +67,7 @@ public class DistributionBusinessLogicTest extends BeConfDependentTest {
 
     @Before
     public void init() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         Mockito.reset(cambriaHandler);
     }
 
index 08d3691..56b2d46 100644 (file)
@@ -93,7 +93,7 @@ public class GatewayFilterTest {
 
     @Before
     public void initMocks(){
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
     }
 
     @Before
index 8656560..06843e6 100644 (file)
@@ -73,7 +73,7 @@ public class ReqValidationFilterTest {
 
     @Before
     public void initMocks(){
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
     }
 
     @Before
index c83cd3d..d9f249a 100644 (file)
@@ -65,7 +65,7 @@ class RoleAuthorizationHandlerTest {
 
     @BeforeEach
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         when(joinPoint.getSignature()).thenReturn(signature);
         when(signature.toShortString()).thenReturn("methodName");
         when(joinPoint.getThis()).thenReturn(beGenericServlet);
index fac1586..548a046 100644 (file)
@@ -147,7 +147,7 @@ class ComponentNodeFilterServletTest extends JerseyTest {
 
     @BeforeAll
     public void initClass() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         when(request.getSession()).thenReturn(session);
         when(session.getServletContext()).thenReturn(servletContext);
         when(servletContext.getAttribute(Constants.WEB_APPLICATION_CONTEXT_WRAPPER_ATTR)).thenReturn(webAppContextWrapper);
index 3931e5e..2666ead 100644 (file)
@@ -51,7 +51,7 @@ public class ArtifactCassandraDaoTest {
        
        @Before
        public void setUp() throws Exception {
-               MockitoAnnotations.initMocks(this);
+               MockitoAnnotations.openMocks(this);
        }
 
        @Test(expected = RuntimeException.class)
index af2bd1c..6512dae 100644 (file)
@@ -50,7 +50,7 @@ public class AuditCassandraDaoTest {
 
        @Before
        public void setUp() throws Exception {
-               MockitoAnnotations.initMocks(this);
+               MockitoAnnotations.openMocks(this);
        }
 
        @Test(expected = RuntimeException.class)
index 95d5b37..9ca5858 100644 (file)
@@ -48,7 +48,7 @@ public class OperationalEnvironmentDaoTest {
 
        @Before
        public void setUp() throws Exception {
-               MockitoAnnotations.initMocks(this);
+               MockitoAnnotations.openMocks(this);
        }
 
        @Test
index 147b849..1dea26f 100644 (file)
@@ -47,7 +47,7 @@ public class SdcSchemaFilesCassandraDaoTest {
 
        @Before
        public void setUp() throws Exception {
-               MockitoAnnotations.initMocks(this);
+               MockitoAnnotations.openMocks(this);
        }
 
        @Test
index a745567..7a0152d 100644 (file)
@@ -56,7 +56,7 @@ class JanusGraphDaoMockTest extends DAOConfDependentTest {
 
     @BeforeEach
     void BeforeEach() throws Exception {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
     }
 
     @Test
index 3a8bb34..c70e55a 100644 (file)
@@ -30,7 +30,7 @@ import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.when;
-import static org.mockito.MockitoAnnotations.initMocks;
+import static org.mockito.MockitoAnnotations.openMocks;
 
 public class PluginStatusBLTest {
 
@@ -40,7 +40,7 @@ public class PluginStatusBLTest {
 
     @Before
     public void setUp() {
-        initMocks(this);
+        openMocks(this);
     }
 
     @Test
index 1bc3a06..733f235 100644 (file)
@@ -41,7 +41,7 @@ import javax.ws.rs.core.Response;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
-import static org.mockito.MockitoAnnotations.initMocks;
+import static org.mockito.MockitoAnnotations.openMocks;
 
 public class ConfigServletTest {
 
@@ -60,7 +60,7 @@ public class ConfigServletTest {
 
     @Before
     public void setUp() {
-        initMocks(this);
+        openMocks(this);
         String appConfigDir = "src/test/resources/config/catalog-fe";
         ConfigurationSource configurationSource =
                 new FSConfigurationSource(ExternalConfiguration.getChangeListener(), appConfigDir);
index 556e362..6b5a210 100644 (file)
@@ -51,7 +51,7 @@ public class CapabilitiesOperationTest {
 
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
 
         when(mockJanusGraphDao.commit()).thenReturn(JanusGraphOperationStatus.OK);
         when(mockJanusGraphDao.getVertexById(anyString(), any())).thenReturn(Either.left(new GraphVertex()));
index 753953f..c0c417a 100644 (file)
@@ -140,7 +140,7 @@ public class ToscaOperationFacadeTest {
     @Before
     public void setUp() throws Exception {
         testInstance = new ToscaOperationFacade();
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
     }
 
     @SuppressWarnings("unchecked")
index 7ccf1f6..b8230ff 100644 (file)
@@ -80,7 +80,7 @@ public class InterfaceLifecycleOperationTest {
 
     @BeforeEach
     public void createUserAndCategory() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         CategoryData categoryData = new CategoryData(NodeTypeEnum.ResourceCategory);
         when(janusGraphGenericDao.createNode(any(), any())).thenReturn(Either.left(categoryData));
         deleteAndCreateCategory(CATEGORY_NAME);
index ee3ea9e..73a6007 100644 (file)
@@ -100,7 +100,7 @@ public class RelationshipTypeOperationTest extends ModelTestBase {
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
 
         Mockito.doReturn(JanusGraphOperationStatus.OK).when(janusGraphGenericDao).commit();
         Mockito.doReturn(JanusGraphOperationStatus.OK).when(janusGraphGenericDao).rollback();
index e17c61e..e8e6d0b 100644 (file)
@@ -81,7 +81,7 @@ public class UserAdminOperationTest extends ModelTestBase {
 
     @Before
     public void initMocks() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         Mockito.reset(janusGraphGenericDao);
         mockJanusGraphUpdate();
         mockJanusGraphDelete();
index 6287c0e..2a099f7 100644 (file)
@@ -72,7 +72,7 @@ class CertificateManagerImplTest {
 
     @BeforeEach
     void setUp() throws CertificateNotYetValidException, CertificateExpiredException {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         when(environment.getProperty(CERT_DIR_ENV_VARIABLE)).thenReturn(certificateFolderPath.toString());
         when(certificateMock.getType()).thenReturn("X.509");
         doNothing().when(certificateMock).checkValidity();
index 6b09413..bfcd70a 100644 (file)
@@ -43,7 +43,7 @@ class CertificateInfoImplTest {
 
     @BeforeEach
     void setUp() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
     }
 
     @Test
index 2d265fc..ed0da6b 100644 (file)
@@ -62,7 +62,7 @@ public class ActionsImplTest {
 
     @Before
     public void init() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         when(request.getRemoteUser()).thenReturn("unit-test-user");
         when(request.getHeader(X_OPEN_ECOMP_INSTANCE_ID_HEADER_PARAM)).thenReturn("X-OPEN-ECOMP-InstanceID");
         when(request.getHeader(X_OPEN_ECOMP_REQUEST_ID_HEADER_PARAM)).thenReturn("X-OPEN-ECOMP-RequestID");
index 43ebeab..88194bb 100644 (file)
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.mockito.MockitoAnnotations.initMocks;
+import static org.mockito.MockitoAnnotations.openMocks;
 
 public class ApplicationConfigurationImplTest {
 
@@ -52,7 +52,7 @@ public class ApplicationConfigurationImplTest {
 
     @Before
     public void setUp() {
-        initMocks(this);
+        openMocks(this);
         applicationConfiguration = new ApplicationConfigurationImpl(applicationConfigManager);
     }
 
index 9ecc92a..3833bb3 100644 (file)
@@ -17,7 +17,7 @@
 package org.openecomp.sdcrests.externaltesting.rest.services;
 
 
-import static org.mockito.MockitoAnnotations.initMocks;
+import static org.mockito.MockitoAnnotations.openMocks;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -59,7 +59,7 @@ public class ApiTest {
     @Before
     public void setUp() {
         try {
-            initMocks(this);
+            openMocks(this);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -167,7 +167,7 @@ public class ApiTest {
      */
     @Test()
     public void testConfigExceptions() {
-        initMocks(this);
+        openMocks(this);
 
         ExternalTestingManager m = new ApiTestExternalTestingManager();
         ExternalTestingImpl testingF = new ExternalTestingImpl(m, vendorSoftwareProductManager);
@@ -184,7 +184,7 @@ public class ApiTest {
      */
     @Test()
     public void testEndpointExceptions() {
-        initMocks(this);
+        openMocks(this);
 
         ExternalTestingManager m = new ApiTestExternalTestingManager();
         ExternalTestingImpl testingF = new ExternalTestingImpl(m, vendorSoftwareProductManager);
@@ -201,7 +201,7 @@ public class ApiTest {
      */
     @Test()
     public void testExecutionExceptions() {
-        initMocks(this);
+        openMocks(this);
 
         ExternalTestingManager m = new ApiTestExternalTestingManager();
         ExternalTestingImpl testingF = new ExternalTestingImpl(m, vendorSoftwareProductManager);
@@ -220,7 +220,7 @@ public class ApiTest {
      */
     @Test()
     public void testScenarioExceptions() {
-        initMocks(this);
+        openMocks(this);
 
         ExternalTestingManager m = new ApiTestExternalTestingManager();
         ExternalTestingImpl testingF = new ExternalTestingImpl(m, vendorSoftwareProductManager);
@@ -235,7 +235,7 @@ public class ApiTest {
      */
     @Test()
     public void testTestCaseExceptions() {
-        initMocks(this);
+        openMocks(this);
 
         ExternalTestingManager m = new ApiTestExternalTestingManager();
         ExternalTestingImpl testingF = new ExternalTestingImpl(m, vendorSoftwareProductManager);
@@ -250,7 +250,7 @@ public class ApiTest {
      */
     @Test()
     public void testTestCasesExceptions() {
-        initMocks(this);
+        openMocks(this);
 
         ExternalTestingManager m = new ApiTestExternalTestingManager();
         ExternalTestingImpl testingF = new ExternalTestingImpl(m, vendorSoftwareProductManager);
@@ -265,7 +265,7 @@ public class ApiTest {
      */
     @Test()
     public void testTestSuitesExceptions() {
-        initMocks(this);
+        openMocks(this);
 
         ExternalTestingManager m = new ApiTestExternalTestingManager();
         ExternalTestingImpl testingF = new ExternalTestingImpl(m, vendorSoftwareProductManager);
@@ -280,7 +280,7 @@ public class ApiTest {
      */
     @Test()
     public void testTreeExceptions() {
-        initMocks(this);
+        openMocks(this);
 
         ExternalTestingManager m = new ApiTestExternalTestingManager();
         ExternalTestingImpl testingF = new ExternalTestingImpl(m, vendorSoftwareProductManager);
index d88b3e9..70e35d0 100644 (file)
@@ -35,7 +35,7 @@ import java.io.IOException;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
-import static org.mockito.MockitoAnnotations.initMocks;
+import static org.mockito.MockitoAnnotations.openMocks;
 
 public class ValidationImplTest {
 
@@ -46,7 +46,7 @@ public class ValidationImplTest {
 
     @Before
     public void setUp(){
-        initMocks(this);
+        openMocks(this);
     }
 
     @Test
index fe90ed2..1bc1e33 100644 (file)
@@ -43,7 +43,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.UUID;
 
-import static org.mockito.MockitoAnnotations.initMocks;
+import static org.mockito.MockitoAnnotations.openMocks;
 import static org.mockito.Mockito.when;
 
 public class ComponentDependenciesImplTest {
@@ -66,7 +66,7 @@ public class ComponentDependenciesImplTest {
   @Before
   public void setUp() {
     try {
-      initMocks(this);
+      openMocks(this);
 
       ComponentDependencyModelEntity e = new ComponentDependencyModelEntity();
       e.setSourceComponentId("sourceid");
index ab64bfc..8542906 100644 (file)
@@ -47,7 +47,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.UUID;
 
-import static org.mockito.MockitoAnnotations.initMocks;
+import static org.mockito.MockitoAnnotations.openMocks;
 import static org.mockito.Mockito.when;
 
 public class ComponentImplTest {
@@ -67,7 +67,7 @@ public class ComponentImplTest {
   @Before
   public void setUp() {
     try {
-      initMocks(this);
+      openMocks(this);
 
       ComponentEntity ce = new ComponentEntity();
       ce.setId(vspId);
index 119a5db..28dc1cb 100644 (file)
@@ -41,7 +41,7 @@ import javax.ws.rs.core.Response;
 import java.io.ByteArrayInputStream;
 import java.util.UUID;
 
-import static org.mockito.MockitoAnnotations.initMocks;
+import static org.mockito.MockitoAnnotations.openMocks;
 import static org.mockito.Mockito.when;
 
 public class ComponentMonitoringUploadsImplTest {
@@ -64,7 +64,7 @@ public class ComponentMonitoringUploadsImplTest {
   @Before
   public void setUp() {
     try {
-      initMocks(this);
+      openMocks(this);
 
       MonitoringUploadStatus result = new MonitoringUploadStatus();
       result.setSnmpPoll("p");
index 48011ea..6320a38 100644 (file)
@@ -47,7 +47,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.UUID;
 
-import static org.mockito.MockitoAnnotations.initMocks;
+import static org.mockito.MockitoAnnotations.openMocks;
 import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.mock;
 
@@ -75,7 +75,7 @@ public class ComponentProcessesImplTest {
   @Before
   public void setUp() {
     try {
-      initMocks(this);
+      openMocks(this);
 
       ProcessEntity pe = new ProcessEntity();
       pe.setId(vspId);
index 7cd78e0..8195ae0 100644 (file)
@@ -48,7 +48,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.UUID;
 
-import static org.mockito.MockitoAnnotations.initMocks;
+import static org.mockito.MockitoAnnotations.openMocks;
 import static org.mockito.Mockito.when;
 
 public class ComputeImplTest {
@@ -72,7 +72,7 @@ public class ComputeImplTest {
   @Before
   public void setUp() {
     try {
-      initMocks(this);
+      openMocks(this);
 
       ListComputeResponse lcr = new ListComputeResponse();
       lcr.setAssociatedWithDeploymentFlavor(false);
index 008ef81..4b0710a 100644 (file)
@@ -44,7 +44,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.UUID;
 
-import static org.mockito.MockitoAnnotations.initMocks;
+import static org.mockito.MockitoAnnotations.openMocks;
 import static org.mockito.Mockito.when;
 
 public class DeploymentFlavorsImplTest {
@@ -64,7 +64,7 @@ public class DeploymentFlavorsImplTest {
   @Before
   public void setUp() {
     try {
-      initMocks(this);
+      openMocks(this);
 
       DeploymentFlavorEntity e = new DeploymentFlavorEntity();
       e.setId(deploymentFlavorId);
index 349ab9b..e7dc284 100644 (file)
@@ -49,7 +49,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.UUID;
 
-import static org.mockito.MockitoAnnotations.initMocks;
+import static org.mockito.MockitoAnnotations.openMocks;
 import static org.mockito.Mockito.when;
 
 public class ImagesImplTest {
@@ -79,7 +79,7 @@ public class ImagesImplTest {
   @Before
   public void setUp() {
     try {
-      initMocks(this);
+      openMocks(this);
 
       ImageEntity ie = new ImageEntity();
       ie.setComponentId(componentId);
index 756e8fd..0fcb19d 100644 (file)
@@ -21,7 +21,7 @@
 package org.openecomp.sdcrests.vsp.rest.services;
 
 import static org.mockito.Mockito.when;
-import static org.mockito.MockitoAnnotations.initMocks;
+import static org.mockito.MockitoAnnotations.openMocks;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -57,7 +57,7 @@ public class NetworksImplTest {
 
     @Before
     public void setUp() {
-        initMocks(this);
+        openMocks(this);
 
         NetworkEntity e = new NetworkEntity();
         e.setId(networkId);
index a6a4e98..4f0a5d3 100644 (file)
@@ -47,7 +47,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.UUID;
 
-import static org.mockito.MockitoAnnotations.initMocks;
+import static org.mockito.MockitoAnnotations.openMocks;
 import static org.mockito.Mockito.when;
 
 public class NicsImplTest {
@@ -71,7 +71,7 @@ public class NicsImplTest {
   @Before
   public void setUp() {
     try {
-      initMocks(this);
+      openMocks(this);
 
       NicEntity e = new NicEntity();
       e.setComponentId(componentId);
index f1ca47e..a203820 100644 (file)
@@ -80,7 +80,7 @@ public class ActionManagerImplTest {
 
     @Before
     public void init() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         actionManager = new ActionManagerImpl(actionDao, versioningManager, actionArtifactDao,
             versionInfoDao, uniqueValueDao);
     }
index f214e69..eb7afd6 100644 (file)
@@ -81,7 +81,7 @@ class PermissionsManagerImplTest {
     public void setUp() throws Exception {
         SessionContextProviderFactory.getInstance().createInterface().create(USER,
             tenant);
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
     }
 
     @Test
index d8e2959..96e78a4 100644 (file)
@@ -74,7 +74,7 @@ public class LicenseKeyGroupTest {
 
   @Before
   public void setUp() throws Exception {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
   }
 
   @After
@@ -495,7 +495,7 @@ public class LicenseKeyGroupTest {
 
   @BeforeMethod
   public void setUp() throws Exception {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
   }
 
   /*@BeforeClass
index 274af8f..e9894ec 100644 (file)
@@ -98,7 +98,7 @@ public class CompositionEntityDataManagerImplTest {
 
   @Before
   public void setUp() throws Exception {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     compositionEntityDataManager.addEntity(new VspQuestionnaireEntity(VSP1, VERSION), null);
 
     doReturn(SIMPLE_SCHEMA).when(compositionEntityDataManager).generateSchema(SchemaTemplateContext.questionnaire, CompositionEntityType.vsp, null);
index ef82828..0c2e84b 100644 (file)
@@ -74,7 +74,7 @@ public class ManualVspToscaManagerImplTest {
 
   @Test
   public void testGatherVspInformationInvalidVsp() {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     VspModelInfo expectedVspData = new VspModelInfo();
     doThrow(new RuntimeException())
         .when(manualVspDataCollectionServiceMock)
@@ -99,7 +99,7 @@ public class ManualVspToscaManagerImplTest {
 
   @Test
   public void testGatherVspInformationValidVsp() {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     Map<String, DeploymentFlavorModel> deploymentFlavorData = getDeploymentFlavorData();
     Map<String, List<Nic>> componentNics = getComponentNics();
     Map<String, String> componentData = getComponentData();
index 017ba2f..9f8a42e 100644 (file)
@@ -79,7 +79,7 @@ public class UploadCSARFileTest {
 
   @Before
   public void setUp() throws Exception {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     candidateService = new CandidateServiceImpl(manifestCreator, orchestrationTemplateCandidateDao);
     candidateManager = new OrchestrationTemplateCandidateManagerImpl(vspInfoDaoMock,
         candidateService);
index cf813f8..797441a 100644 (file)
@@ -88,7 +88,7 @@ public class NetworkPackageHealerTest {
     @Before
     public void init() {
         SessionContextProviderFactory.getInstance().createInterface().create("test", tenant);
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         networkPackageHealer = new NetworkPackageHealer(vspInfoDaoMock, zusammenAdaptorMock, candidateEntityBuilder);
     }
 
index 70f149b..bddb6d6 100644 (file)
@@ -41,7 +41,7 @@ public class HeatStructureUtilTest {
 
     @Before
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
     }
 
     @Test
index fceb6b5..48dd4d7 100644 (file)
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-      <version>${mockitoJupiter.version}</version>
-      <scope>test</scope>
-    </dependency>
-
   </dependencies>
 
   <build>
diff --git a/pom.xml b/pom.xml
index 7bd8d3b..fbc49bb 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -301,6 +301,12 @@ Modifications copyright (c) 2018-2019 Nokia
             <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-inline</artifactId>
+            <version>${mockito.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <reporting>