From a2705637c17beb663c47f82b03279e479ed2f8ca Mon Sep 17 00:00:00 2001 From: Yuli Shlosberg Date: Tue, 14 Aug 2018 16:52:58 +0300 Subject: Enable types validation feature InvalidTypeError added to conf This conf addition will case to parser throw exception in case that invalid type found during parsing process Change-Id: I6497d32862e64abaeec20d30da50fff4c5964d4e Issue-ID: SDC-1646 Signed-off-by: Yuli Shlosberg --- .../jtosca-validation-issue-configuration.yaml | 8 ++++++++ src/test/resources/csars/resource-Vdbe-csar.csar | Bin 67692 -> 68234 bytes .../resources/csars/service-AlService-csar.csar | Bin 37564 -> 37560 bytes .../csars/service-Ipassignservice-csar.csar | Bin 49044 -> 52208 bytes src/test/resources/csars/service-PortMirroring.csar | Bin 55678 -> 55584 bytes .../service-ServiceForToscaParserTests-csar.csar | Bin 77413 -> 77409 bytes src/test/resources/csars/service-VdbeSrv-csar.csar | Bin 73851 -> 74393 bytes .../resources/csars/service-VlanD2dSrv-csar.csar | Bin 73963 -> 74505 bytes .../csars/service-resolve-get-input-csar.csar | Bin 49461 -> 52513 bytes .../csars/service-resolve-get-input-csar_QA.csar | Bin 49407 -> 52459 bytes src/test/resources/log4j.properties | 8 ++++++++ 11 files changed, 16 insertions(+) create mode 100644 src/test/resources/log4j.properties (limited to 'src/test') diff --git a/src/test/resources/config/jtosca-validation-issue-configuration.yaml b/src/test/resources/config/jtosca-validation-issue-configuration.yaml index f4bb949..3f62953 100644 --- a/src/test/resources/config/jtosca-validation-issue-configuration.yaml +++ b/src/test/resources/config/jtosca-validation-issue-configuration.yaml @@ -46,4 +46,12 @@ validationIssues: #MissingRequiredFieldError3 JE010: - issueType: WARNING + sinceCsarConformanceLevel: 3.0 + #InvalidTypeError + JE136: + - issueType: CRITICAL + sinceCsarConformanceLevel: 3.0 + #Exception from SnakeYAML + JE198: + - issueType: CRITICAL sinceCsarConformanceLevel: 3.0 \ No newline at end of file diff --git a/src/test/resources/csars/resource-Vdbe-csar.csar b/src/test/resources/csars/resource-Vdbe-csar.csar index 32a11b9..0705852 100644 Binary files a/src/test/resources/csars/resource-Vdbe-csar.csar and b/src/test/resources/csars/resource-Vdbe-csar.csar differ diff --git a/src/test/resources/csars/service-AlService-csar.csar b/src/test/resources/csars/service-AlService-csar.csar index c02097d..653b80d 100644 Binary files a/src/test/resources/csars/service-AlService-csar.csar and b/src/test/resources/csars/service-AlService-csar.csar differ diff --git a/src/test/resources/csars/service-Ipassignservice-csar.csar b/src/test/resources/csars/service-Ipassignservice-csar.csar index c065fea..007b96a 100644 Binary files a/src/test/resources/csars/service-Ipassignservice-csar.csar and b/src/test/resources/csars/service-Ipassignservice-csar.csar differ diff --git a/src/test/resources/csars/service-PortMirroring.csar b/src/test/resources/csars/service-PortMirroring.csar index b90f3b1..c3a44a0 100644 Binary files a/src/test/resources/csars/service-PortMirroring.csar and b/src/test/resources/csars/service-PortMirroring.csar differ diff --git a/src/test/resources/csars/service-ServiceForToscaParserTests-csar.csar b/src/test/resources/csars/service-ServiceForToscaParserTests-csar.csar index a3e6f70..9afc278 100644 Binary files a/src/test/resources/csars/service-ServiceForToscaParserTests-csar.csar and b/src/test/resources/csars/service-ServiceForToscaParserTests-csar.csar differ diff --git a/src/test/resources/csars/service-VdbeSrv-csar.csar b/src/test/resources/csars/service-VdbeSrv-csar.csar index b0e5131..f911753 100644 Binary files a/src/test/resources/csars/service-VdbeSrv-csar.csar and b/src/test/resources/csars/service-VdbeSrv-csar.csar differ diff --git a/src/test/resources/csars/service-VlanD2dSrv-csar.csar b/src/test/resources/csars/service-VlanD2dSrv-csar.csar index 9cc3b13..efec4c0 100644 Binary files a/src/test/resources/csars/service-VlanD2dSrv-csar.csar and b/src/test/resources/csars/service-VlanD2dSrv-csar.csar differ diff --git a/src/test/resources/csars/service-resolve-get-input-csar.csar b/src/test/resources/csars/service-resolve-get-input-csar.csar index 7c14159..d793229 100644 Binary files a/src/test/resources/csars/service-resolve-get-input-csar.csar and b/src/test/resources/csars/service-resolve-get-input-csar.csar differ diff --git a/src/test/resources/csars/service-resolve-get-input-csar_QA.csar b/src/test/resources/csars/service-resolve-get-input-csar_QA.csar index 7206139..a290ff1 100644 Binary files a/src/test/resources/csars/service-resolve-get-input-csar_QA.csar and b/src/test/resources/csars/service-resolve-get-input-csar_QA.csar differ diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties new file mode 100644 index 0000000..c18c3da --- /dev/null +++ b/src/test/resources/log4j.properties @@ -0,0 +1,8 @@ +# Root logger option +log4j.rootLogger=info, stdout + +# Direct log messages to stdout +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.Target=System.out +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n -- cgit 1.2.3-korg