diff options
| -rw-r--r-- | pom.xml | 4 | ||||
| -rw-r--r-- | src/test/java/org/openecomp/sdc/impl/ToscaParserValidationIssueTest.java | 2 | ||||
| -rw-r--r-- | src/test/java/org/openecomp/sdc/impl/myTest.java | 42 | ||||
| -rw-r--r-- | src/test/resources/csars/service-Oren1-csar-4.csar | bin | 0 -> 31574 bytes | |||
| -rw-r--r-- | version.properties | 2 |
5 files changed, 46 insertions, 4 deletions
@@ -7,7 +7,7 @@ <artifactId>sdc-tosca</artifactId>
<name>sdc-sdc-tosca</name>
<description>SDC Tosca Parser JAR file for use by consumers</description>
- <version>1.1.55-SNAPSHOT</version>
+ <version>1.1.56-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
@@ -112,7 +112,7 @@ <dependency>
<groupId>org.openecomp.sdc.jtosca</groupId>
<artifactId>jtosca</artifactId>
- <version>1.1.16-SNAPSHOT</version>
+ <version>1.1.19-SNAPSHOT</version>
</dependency>
diff --git a/src/test/java/org/openecomp/sdc/impl/ToscaParserValidationIssueTest.java b/src/test/java/org/openecomp/sdc/impl/ToscaParserValidationIssueTest.java index 72bb5df..288cea6 100644 --- a/src/test/java/org/openecomp/sdc/impl/ToscaParserValidationIssueTest.java +++ b/src/test/java/org/openecomp/sdc/impl/ToscaParserValidationIssueTest.java @@ -46,7 +46,7 @@ public class ToscaParserValidationIssueTest extends SdcToscaParserBasicTest { public void testMultiSinceConformanceLevelIssues() throws SdcToscaParserException { ISdcCsarHelper Nfod2images = getCsarHelper("csars/service-Nfod2images-csar.csar");//conformance level 4.0 List<JToscaValidationIssue> notAnalyzedReport = factory.getNotAnalyzadExceptions(); - assertEquals( notAnalyzedReport.size(),17); + assertEquals( notAnalyzedReport.size(),2); List<JToscaValidationIssue> warningsReport = factory.getWarningExceptions(); assertEquals( warningsReport.size(),0); List<JToscaValidationIssue> criticalsReport = factory.getCriticalExceptions(); diff --git a/src/test/java/org/openecomp/sdc/impl/myTest.java b/src/test/java/org/openecomp/sdc/impl/myTest.java new file mode 100644 index 0000000..2f0da7f --- /dev/null +++ b/src/test/java/org/openecomp/sdc/impl/myTest.java @@ -0,0 +1,42 @@ +package org.openecomp.sdc.impl; + +import org.openecomp.sdc.toscaparser.api.NodeTemplate; +import org.testng.annotations.Test; +import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper; +import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException; +import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory; + +import java.io.File; +import java.util.List; + +import static org.openecomp.sdc.impl.SdcToscaParserBasicTest.getCsarHelper; + +public class myTest { + + static SdcToscaParserFactory factory; + static ISdcCsarHelper fdntCsarHelper; + + @Test + public void testNoValidationIssues() throws SdcToscaParserException { + + +// factory = SdcToscaParserFactory.getInstance(); +// fdntCsarHelper = getCsarHelper("csars/service-Oren1-csar-4.csar"); +// +// +// List<NodeTemplate> serviceNodeTemplatesByType = fdntCsarHelper.getServiceNodeTemplatesByType("org.openecomp.nodes.ForwardingPath"); +// +// String target_range = fdntCsarHelper.getNodeTemplatePropertyLeafValue(serviceNodeTemplatesByType.get(0), "target_range"); + + } + + + protected static ISdcCsarHelper getCsarHelper(String path) throws SdcToscaParserException { + System.out.println("Parsing CSAR "+path+"..."); + String fileStr1 = SdcToscaParserBasicTest.class.getClassLoader().getResource(path).getFile(); + File file1 = new File(fileStr1); + ISdcCsarHelper sdcCsarHelper = factory.getSdcCsarHelper(file1.getAbsolutePath()); + return sdcCsarHelper; + } + +} diff --git a/src/test/resources/csars/service-Oren1-csar-4.csar b/src/test/resources/csars/service-Oren1-csar-4.csar Binary files differnew file mode 100644 index 0000000..1e1f738 --- /dev/null +++ b/src/test/resources/csars/service-Oren1-csar-4.csar diff --git a/version.properties b/version.properties index d427655..87baeab 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ major=1 minor=1 -patch=53 +patch=56 base_version=${major}.${minor}.${patch} |