X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fmodel-loader.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Faai%2Fmodelloader%2Fcsar%2Fextractor%2FVnfCatalogExtractorTest.java;h=b3335fc207808d9817a09e3e13e13f93dc6ad406;hp=043edc31dc6a4878b33c6d08f021802f3fc4fd25;hb=HEAD;hpb=0b4016fbde53d49f9511a4253e22285681840572 diff --git a/src/test/java/org/onap/aai/modelloader/csar/extractor/VnfCatalogExtractorTest.java b/src/test/java/org/onap/aai/modelloader/csar/extractor/VnfCatalogExtractorTest.java index 043edc3..b3335fc 100644 --- a/src/test/java/org/onap/aai/modelloader/csar/extractor/VnfCatalogExtractorTest.java +++ b/src/test/java/org/onap/aai/modelloader/csar/extractor/VnfCatalogExtractorTest.java @@ -22,8 +22,8 @@ package org.onap.aai.modelloader.csar.extractor; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; @@ -32,7 +32,7 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.onap.aai.modelloader.entity.Artifact; import org.onap.aai.modelloader.entity.ArtifactType; import org.onap.aai.modelloader.extraction.InvalidArchiveException; @@ -86,8 +86,8 @@ public class VnfCatalogExtractorTest { List vnfcArtifacts = new VnfCatalogExtractor().extract( new ArtifactTestUtils().loadResource("compressedArtifacts/noVnfcFilesArchive.csar"), "noVnfcFilesArchive.csar"); - assertTrue("No VNFC files should have been extracted, but " + vnfcArtifacts.size() + " were found.", - vnfcArtifacts.isEmpty()); + assertTrue(vnfcArtifacts.isEmpty(), + "No VNFC files should have been extracted, but " + vnfcArtifacts.size() + " were found."); } @Test