diff options
| author |   Francis Toth <francis.toth@yoppworks.com> | 2020-05-01 12:42:58 -0400 |
|---|---|---|
| committer |   Ofir Sonsino <ofir.sonsino@intl.att.com> | 2020-05-18 10:58:18 +0000 |
| commit | bf37c21229e1b60937202c3962b24f14b45c96e5 (patch) | |
| tree | f1c63a658f3b266d318bc0ffc385da53e706b77f /catalog-be/src/test/java/org | |
| parent | 0ff3fcba8b7d645e497a7300776bde86590ec70c (diff) | |
Refactor CsarUtil::extractVfcArtifact
Signed-off-by: Francis Toth <francis.toth@yoppworks.com>
Change-Id: Ica8d17d4f3c763920f406ccb89fb3e464d05eab4
Issue-ID: SDC-2812
Diffstat (limited to 'catalog-be/src/test/java/org')
| -rw-r--r-- | catalog-be/src/test/java/org/openecomp/sdc/be/tosca/CsarUtilsTest.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/CsarUtilsTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/CsarUtilsTest.java index 092dd1d2b5..3ee2b89047 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/CsarUtilsTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/CsarUtilsTest.java @@ -26,6 +26,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import fj.data.Either; import java.io.IOException; @@ -40,6 +41,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Optional; import java.util.Set; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -660,10 +662,14 @@ public class CsarUtilsTest extends BeConfDependentTest { map.put(path, "value".getBytes()); Entry<String, byte[]> entry = map.entrySet().iterator().next(); - ImmutablePair<String, ArtifactDefinition> output = Deencapsulation.invoke(testSubject, "extractVfcArtifact", entry, new HashMap<>()); + Optional<ImmutablePair<String, ArtifactDefinition>> output = + Deencapsulation.invoke(testSubject, "extractVfcArtifact", entry, new HashMap<>()); - assertNotNull(output); - assertEquals("to",output.left); + if(output.isPresent()) { + assertEquals("to", output.get().left); + } else { + fail("`output` is empty!"); + } } @Test |