From 9190a395477e7ab0f284c1dc293b0204149d50d3 Mon Sep 17 00:00:00 2001
From: Adrien Kirjak <adrien.kirjak@ericsson.com>
Date: Wed, 12 Apr 2017 16:22:53 +0200
Subject: [PATCH] Corrected negative tests
Signed-off-by: Adrien Kirjak <adrien.kirjak@ericsson.com>
---
.../negative_tests/05_basic_language_elements.script | 6 +++++-
.../negative_tests/06_types_and_values.script | 4 ++--
.../core_language_tests/negative_tests/07-14_folder.script | 2 +-
.../core_language_tests/negative_tests/15_templates.script | 2 +-
.../core_language_tests/negative_tests/16-20_folders.script | 6 +++---
5 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/conformance_test/core_language_tests/negative_tests/05_basic_language_elements.script b/conformance_test/core_language_tests/negative_tests/05_basic_language_elements.script
index b2ed01fef..795212f1d 100644
--- a/conformance_test/core_language_tests/negative_tests/05_basic_language_elements.script
+++ b/conformance_test/core_language_tests/negative_tests/05_basic_language_elements.script
@@ -2057,7 +2057,11 @@ module NegSyn_05040101_parameters_of_kind_value_009 {
<END_MODULE>
<RESULT COUNT 1>
-error: at or before token `map': syntax error, unexpected MapKeyword, expecting InOutParKeyword or InParKeyword or OutParKeyword or '\}'
+error: at or before token `map': syntax error, unexpected MapKeyword
+<END_RESULT>
+
+<RESULT COUNT 1>
+error: at or before token `\(': syntax error, unexpected '\(', expecting MessageKeyword or MixedKeyword or ProcedureKeyword
<END_RESULT>
<END_TC>
diff --git a/conformance_test/core_language_tests/negative_tests/06_types_and_values.script b/conformance_test/core_language_tests/negative_tests/06_types_and_values.script
index 53a4b2712..eb0db169e 100644
--- a/conformance_test/core_language_tests/negative_tests/06_types_and_values.script
+++ b/conformance_test/core_language_tests/negative_tests/06_types_and_values.script
@@ -6964,7 +6964,7 @@ module NegSem_060209_CommunicationPortTypes_004 {
<END_MODULE>
<RESULT COUNT 1>
-error: at or before token `\}': syntax error, unexpected '\}', expecting InOutParKeyword or InParKeyword or OutParKeyword
+error: at or before token `\}': syntax error, unexpected '\}'
<END_RESULT>
<END_TC>
@@ -7017,7 +7017,7 @@ module NegSem_060209_CommunicationPortTypes_005 {
<END_MODULE>
<RESULT COUNT 1>
-error: at or before token `\}': syntax error, unexpected '\}', expecting InOutParKeyword or InParKeyword or OutParKeyword
+error: at or before token `\}': syntax error, unexpected '\}'
<END_RESULT>
<END_TC>
diff --git a/conformance_test/core_language_tests/negative_tests/07-14_folder.script b/conformance_test/core_language_tests/negative_tests/07-14_folder.script
index 9a80171cf..80f0b4b8f 100644
--- a/conformance_test/core_language_tests/negative_tests/07-14_folder.script
+++ b/conformance_test/core_language_tests/negative_tests/07-14_folder.script
@@ -2286,7 +2286,7 @@ module NegSem_1101_ValueVars_001 {
<END_MODULE>
<RESULT COUNT 1>
-error: integer value was expected
+error: any value is not allowed in this context
<END_RESULT>
<END_TC>
diff --git a/conformance_test/core_language_tests/negative_tests/15_templates.script b/conformance_test/core_language_tests/negative_tests/15_templates.script
index 541ed90f7..195cea34b 100644
--- a/conformance_test/core_language_tests/negative_tests/15_templates.script
+++ b/conformance_test/core_language_tests/negative_tests/15_templates.script
@@ -4580,7 +4580,7 @@ module NegSem_1511_ConcatenatingTemplatesOfStringAndListTypes_004 {
<END_MODULE>
<RESULT COUNT 1>
-error: Operands of charstring template concatenation must be specific value templates
+error: any or omit is not allowed in charstring template concatenation
<END_RESULT>
<END_TC>
diff --git a/conformance_test/core_language_tests/negative_tests/16-20_folders.script b/conformance_test/core_language_tests/negative_tests/16-20_folders.script
index 0589099a8..df20a877a 100644
--- a/conformance_test/core_language_tests/negative_tests/16-20_folders.script
+++ b/conformance_test/core_language_tests/negative_tests/16-20_folders.script
@@ -2399,14 +2399,14 @@ error: `omit' value is not allowed in this context
.*---------------------------------------------------------------------*
:xmp tab=0.
-<TC - 1901_001 Ensure that the IUT properly evaluates assignment statements >
+<TC - 1901_001 Ensure that the IUT properly evaluates assignment statements syntaxis >
<COMPILE>
<MODULE TTCN NegSyn_1901_assignments_001 NegSyn_1901_assignments_001.ttcn >
/***************************************************
** @version 0.0.1
- ** @purpose 1:19.1, Ensure that the IUT properly evaluates assignment statements
+ ** @purpose 1:19.1, Ensure that the IUT properly evaluates assignment statements syntaxis
** @verdict pass reject
***************************************************/
module NegSyn_1901_assignments_001 {
@@ -2434,7 +2434,7 @@ module NegSyn_1901_assignments_001 {
<END_MODULE>
<RESULT COUNT 1>
-error: at or before token `:=': syntax error, unexpected :=, expecting ','
+error: at or before token `:=': syntax error, unexpected :=, expecting '\)' or ','
<END_RESULT>
<END_TC>
--
GitLab