From 5222844a7befd0adaed24c7dbe6e90c63add9655 Mon Sep 17 00:00:00 2001 From: Bogumil Zebek Date: Fri, 26 Apr 2019 08:05:20 +0200 Subject: Basic PNFD validation Change-Id: I959324f3fc0ba89d99a291d0608aa5a5ba778077 Issue-ID: VNFSDK-341 Signed-off-by: Zebek Bogumil --- .../java/org/onap/cvc/csar/cc/sol004/IntegrationTestUtils.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'csarvalidation/src/test/java/org/onap') diff --git a/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/IntegrationTestUtils.java b/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/IntegrationTestUtils.java index 5e1c836..bed3a90 100644 --- a/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/IntegrationTestUtils.java +++ b/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/IntegrationTestUtils.java @@ -24,7 +24,7 @@ import org.onap.cli.fw.input.OnapCommandParameter; import org.onap.cli.fw.output.OnapCommandResult; import org.onap.cli.fw.output.OnapCommandResultAttribute; import org.onap.cvc.csar.CSARArchive; -import org.onap.cvc.csar.cc.VTPValidatePnfCSARBase; +import org.onap.cvc.csar.cc.VTPValidateCSARBase; import java.net.URISyntaxException; import java.util.List; @@ -38,11 +38,11 @@ public class IntegrationTestUtils { } public static String absoluteFilePath(String relativeFilePath) throws URISyntaxException { - return VTPValidatePnfCSARBase.class.getClassLoader().getResource(relativeFilePath) + return VTPValidateCSARBase.class.getClassLoader().getResource(relativeFilePath) .toURI().getPath(); } - static void configureTestCase(VTPValidatePnfCSARBase testCase, String fileName) throws OnapCommandException, URISyntaxException { + static void configureTestCase(VTPValidateCSARBase testCase, String fileName) throws OnapCommandException, URISyntaxException { configureCommandAttributes(testCase); testCase.initializeSchema("vtp-validate-csar-r146092.yaml"); @@ -50,7 +50,7 @@ public class IntegrationTestUtils { configurePathToCsar(testCase, fileName); } - private static void configureCommandAttributes(VTPValidatePnfCSARBase testCase) { + private static void configureCommandAttributes(VTPValidateCSARBase testCase) { OnapCommandResult onapCommandResult = new OnapCommandResult(); OnapCommandResultAttribute onapCommandResultAttributeCode = new OnapCommandResultAttribute(); onapCommandResultAttributeCode.setName("code"); @@ -65,7 +65,7 @@ public class IntegrationTestUtils { testCase.setResult(onapCommandResult); } - private static void configurePathToCsar(VTPValidatePnfCSARBase testCase, String fileName) throws URISyntaxException, OnapCommandInvalidParameterValue { + private static void configurePathToCsar(VTPValidateCSARBase testCase, String fileName) throws URISyntaxException, OnapCommandInvalidParameterValue { String pathToFile = absoluteFilePath(fileName); Set parameters = testCase.getParameters(); OnapCommandParameter csar = parameters.stream().filter(op -> op.getName().equals("csar")).findFirst().get(); -- cgit 1.2.3-korg