diff options
Diffstat (limited to 'openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/tree')
-rw-r--r-- | openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/tree/UploadFileTest.java | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/tree/UploadFileTest.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/tree/UploadFileTest.java index 8081184f68..cc73bd766f 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/tree/UploadFileTest.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/tree/UploadFileTest.java @@ -52,6 +52,7 @@ import org.openecomp.sdc.vendorsoftwareproduct.dao.OrchestrationTemplateDao; import org.openecomp.sdc.vendorsoftwareproduct.dao.VendorSoftwareProductInfoDao; import org.openecomp.sdc.vendorsoftwareproduct.dao.type.OrchestrationTemplateEntity; import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspDetails; +import org.openecomp.sdc.vendorsoftwareproduct.exception.OnboardPackageException; import org.openecomp.sdc.vendorsoftwareproduct.impl.OrchestrationTemplateCandidateManagerImpl; import org.openecomp.sdc.vendorsoftwareproduct.services.composition.CompositionDataExtractor; import org.openecomp.sdc.vendorsoftwareproduct.services.impl.filedatastructuremodule.CandidateServiceImpl; @@ -62,9 +63,6 @@ import org.openecomp.sdc.versioning.dao.types.Version; public class UploadFileTest { private static final Logger LOGGER = LoggerFactory.getLogger(UploadFileTest.class); - - private static final String USER1 = "vspTestUser1"; - public static final Version VERSION01 = new Version(0, 1); @Mock @@ -98,21 +96,22 @@ public class UploadFileTest { } @Test - public void testUploadFile() throws IOException { + public void testUploadFile() throws IOException, OnboardPackageException { doReturn(vspDetails).when(vspInfoDaoMock).get(any(VspDetails.class)); try (final InputStream inputStream = getZipInputStream("/legalUpload")) { onboardPackageInfo = new OnboardPackageInfo("legalUpload", OnboardingTypesEnum.ZIP.toString(), - convertFileInputStream(inputStream)); + convertFileInputStream(inputStream), OnboardingTypesEnum.ZIP); candidateManager.upload(vspDetails, onboardPackageInfo); } } - private void testLegalUpload(String vspId, Version version, InputStream upload, String user) { + private void testLegalUpload(String vspId, Version version, InputStream upload, String user) + throws IOException, OnboardPackageException { onboardPackageInfo = new OnboardPackageInfo("file", OnboardingTypesEnum.ZIP.toString(), - convertFileInputStream(upload)); + convertFileInputStream(upload), OnboardingTypesEnum.ZIP); final UploadFileResponse uploadFileResponse = candidateManager.upload(vspDetails, onboardPackageInfo); - assertEquals(uploadFileResponse.getOnboardingType(), OnboardingTypesEnum.ZIP); + assertEquals(OnboardingTypesEnum.ZIP, uploadFileResponse.getOnboardingType()); OrchestrationTemplateEntity uploadData = orchestrationTemplateDataDaoMock.get(vspId, version); } |