From 121a7a375d1cea2764dfc34d82f4e2f252099a33 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Tue, 27 Feb 2018 16:10:32 +0200 Subject: Revert "vLAN Tagging - Support Policies" This reverts commit 5e7130be2350a29d8dbc65f52cdca596a188114f. Issue-ID: SDC-1056 Change-Id: I8526a8965e2a69c9d9189e6628cbc36e92282228 Signed-off-by: Michael Lando --- .../sdc/toscaparser/api/JToscaImportTest.java | 64 +++++++++++++++++++++ .../resources/csars/resource-Spgw-csar-ZTE.csar | Bin 0 -> 31639 bytes src/test/resources/csars/sdc-onboarding_csar.csar | Bin 0 -> 80596 bytes 3 files changed, 64 insertions(+) create mode 100644 src/test/java/org/openecomp/sdc/toscaparser/api/JToscaImportTest.java create mode 100644 src/test/resources/csars/resource-Spgw-csar-ZTE.csar create mode 100644 src/test/resources/csars/sdc-onboarding_csar.csar (limited to 'src/test') diff --git a/src/test/java/org/openecomp/sdc/toscaparser/api/JToscaImportTest.java b/src/test/java/org/openecomp/sdc/toscaparser/api/JToscaImportTest.java new file mode 100644 index 0000000..c8a30fa --- /dev/null +++ b/src/test/java/org/openecomp/sdc/toscaparser/api/JToscaImportTest.java @@ -0,0 +1,64 @@ +package org.openecomp.sdc.toscaparser.api; + +import org.junit.Test; +import org.openecomp.sdc.toscaparser.api.common.JToscaException; +import org.openecomp.sdc.toscaparser.api.utils.ThreadLocalsHolder; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +import static org.junit.Assert.assertEquals; + +public class JToscaImportTest { + + @Test + public void testNoMissingTypeValidationError() throws JToscaException { + String fileStr = JToscaImportTest.class.getClassLoader().getResource + ("csars/sdc-onboarding_csar.csar").getFile(); + File file = new File(fileStr); + new ToscaTemplate(file.getAbsolutePath(), null, true, null); + List missingTypeErrors = ThreadLocalsHolder.getCollector() + .getValidationIssueReport() + .stream() + .filter(s -> s.contains("JE136")) + .collect(Collectors.toList()); + assertEquals(0, missingTypeErrors.size()); + } + + @Test + public void testNoStackOverFlowError() { + Exception jte = null; + try { + String fileStr = JToscaImportTest.class.getClassLoader().getResource + ("csars/sdc-onboarding_csar.csar").getFile(); + File file = new File(fileStr); + new ToscaTemplate(file.getAbsolutePath(), null, true, null); + } catch (Exception e){ + jte = e; + } + assertEquals(null, jte); + } + + @Test + public void testNoInvalidImports() throws JToscaException { + List fileNames = new ArrayList<>(); + fileNames.add("csars/tmpCSAR_Huawei_vSPGW_fixed.csar"); + fileNames.add("csars/sdc-onboarding_csar.csar"); + fileNames.add("csars/resource-Spgw-csar-ZTE.csar"); + + for (String fileName : fileNames) { + String fileStr = JToscaImportTest.class.getClassLoader().getResource(fileName).getFile(); + File file = new File(fileStr); + new ToscaTemplate(file.getAbsolutePath(), null, true, null); + List invalidImportErrors = ThreadLocalsHolder.getCollector() + .getValidationIssueReport() + .stream() + .filter(s -> s.contains("JE195")) + .collect(Collectors.toList()); + assertEquals(0, invalidImportErrors.size()); + } + } + +} diff --git a/src/test/resources/csars/resource-Spgw-csar-ZTE.csar b/src/test/resources/csars/resource-Spgw-csar-ZTE.csar new file mode 100644 index 0000000..58c3ddd Binary files /dev/null and b/src/test/resources/csars/resource-Spgw-csar-ZTE.csar differ diff --git a/src/test/resources/csars/sdc-onboarding_csar.csar b/src/test/resources/csars/sdc-onboarding_csar.csar new file mode 100644 index 0000000..e1c3267 Binary files /dev/null and b/src/test/resources/csars/sdc-onboarding_csar.csar differ -- cgit 1.2.3-korg