Add manifest non mano set support

Issue-ID: SDC-2141

Change-Id: I056e8f7c1da8f17ce8583207660882f85a4d11a4
Signed-off-by: kooper <sergey.sachkov@est.tech>

2 files changed, 1 insertions, 79 deletions

diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImplTest.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImplTest.java
index a858e18aea..6e9d1ea83c 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImplTest.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImplTest.java
@@ -409,7 +409,7 @@ public class VendorSoftwareProductManagerImplTest {
   }
 
   @Test
-  public void testCreatePackage() {
+  public void testCreatePackage() throws IOException {
     /*VspDetails vspDetailsMock = new VspDetails("vspId", new Version(1, 0));
     doReturn(vspDetailsMock).when(vspInfoDaoMock).get(anyObject());*/
     VersionInfo versionInfo = new VersionInfo();
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/upload/csar/ManifestParsingTest.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/upload/csar/ManifestParsingTest.java
deleted file mode 100644
index 687ddc18c4..0000000000
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/upload/csar/ManifestParsingTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright © 2016-2018 European Support Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.openecomp.sdc.vendorsoftwareproduct.upload.csar;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-import org.openecomp.sdc.common.errors.Messages;
-import org.openecomp.sdc.vendorsoftwareproduct.impl.orchestration.csar.OnboardingManifest;
-
-import java.io.IOException;
-import java.io.InputStream;
-import org.testng.annotations.Test;
-
-
-public class ManifestParsingTest {
-
-  @Test
-  public void testSuccessfulParsing() throws IOException {
-    try (InputStream is = getClass()
-        .getResourceAsStream("/vspmanager.csar/manifest/ValidTosca.mf")) {
-      OnboardingManifest onboardingManifest = new OnboardingManifest(is);
-      assertTrue(onboardingManifest.isValid());
-      assertEquals(onboardingManifest.getMetadata().size(), 4);
-      assertEquals(onboardingManifest.getSources().size(), 5);
-    }
-  }
-
-  @Test
-  public void testNoMetadataParsing() throws IOException {
-    try (InputStream is = getClass()
-        .getResourceAsStream("/vspmanager.csar/manifest/InvalidTosca1.mf")) {
-      OnboardingManifest onboardingManifest = new OnboardingManifest(is);
-      assertFalse(onboardingManifest.isValid());
-      assertTrue(onboardingManifest.getErrors().stream().anyMatch(error -> error
-          .contains(Messages.MANIFEST_INVALID_LINE.getErrorMessage().substring(0, 10))));
-    }
-  }
-
-  @Test
-  public void testBrokenMDParsing() throws IOException {
-    try (InputStream is = getClass()
-        .getResourceAsStream("/vspmanager.csar/manifest/InvalidTosca2.mf")) {
-      OnboardingManifest onboardingManifest = new OnboardingManifest(is);
-      assertFalse(onboardingManifest.isValid());
-      assertTrue(onboardingManifest.getErrors().stream().anyMatch(error -> error
-          .contains(Messages.MANIFEST_INVALID_LINE.getErrorMessage().substring(0, 10))));
-    }
-  }
-
-  @Test
-  public void testNoMetaParsing() throws IOException {
-    try (InputStream is = getClass()
-        .getResourceAsStream("/vspmanager.csar/manifest/InvalidTosca4.mf")) {
-      OnboardingManifest onboardingManifest = new OnboardingManifest(is);
-      assertFalse(onboardingManifest.isValid());
-      assertTrue(onboardingManifest.getErrors().stream().anyMatch(error -> error
-          .contains(Messages.MANIFEST_NO_METADATA.getErrorMessage().substring(0, 10))));
-    }
-  }
-
-
-}