Added/Corrected tests

Signed-off-by: Adrien Kirjak <adrien.kirjak@ericsson.com>

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: at or before token `\?': syntax error, unexpected '\?'
+error: integer value was expected
 <END_RESULT>
 
 <END_TC>

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: at or before token `\*': syntax error, unexpected '\*'
+error: Operands of charstring template concatenation must be specific value templates
 <END_RESULT>
 
 <END_TC>
@@ -4644,52 +4644,6 @@ error: at or before token `\*': syntax error, unexpected '\*', expecting Identif
 <END_TC>
 :exmp
 
-*---------------------------------------------------------------------*
-:h3. NegSem_1511_ConcatenatingTemplatesOfStringAndListTypes_006 negative test
-.*---------------------------------------------------------------------*
-:xmp tab=0.
-
-<TC - Ensure that concatenation of octetstring types and ? patterns works as expected. >
-
-<COMPILE>
-
-<MODULE TTCN NegSem_1511_ConcatenatingTemplatesOfStringAndListTypes_006 NegSem_1511_ConcatenatingTemplatesOfStringAndListTypes_006.ttcn >
-/*****************************************************************
- ** @version  0.0.1
- ** @purpose  1:15.11, Ensure that concatenation of octetstring types and ? patterns works as expected.
- ** @verdict  pass reject
- *****************************************************************/
-
-module NegSem_1511_ConcatenatingTemplatesOfStringAndListTypes_006 {
-
-	type component GeneralComp { }
-
-	testcase TC_NegSem_1511_ConcatenatingTemplatesOfStringAndListTypes_006() runs on GeneralComp {	
-		var template octetstring v_myString1 := 'ABCD'O & ? length(2) length (6);  //missing parenthesis
-		if (match('ABCD12'O, v_myString1)) {
-		    setverdict(pass);
-		} else {
-		    setverdict(fail);
-		}
-	}
-
-	control{
-		execute(TC_NegSem_1511_ConcatenatingTemplatesOfStringAndListTypes_006());
-	}
-
-}
-<END_MODULE>
-
-<RESULT COUNT 1>
-error: at or before token `\?': syntax error, unexpected '\?' 
-<END_RESULT>
-<RESULT COUNT 1>
-error: at or before token `else': syntax error, unexpected ElseKeyword
-<END_RESULT>
-
-<END_TC>
-:exmp
-
 .*---------------------------------------------------------------------*
 :h1.References
 .*---------------------------------------------------------------------*

conformance_test/core_language_tests/positive_tests/pos_conf_tests.cfg

@@ -781,8 +781,10 @@ Sem_1509_MatchOperation_008.control
 Sem_1509_MatchOperation_010.control
 Sem_1510_ValueOfOperation_001.control
 Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_001.control
+Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_002.control
 Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_006.control
 Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_010.control
+Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_013.control
 Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_014.control
 Sem_160101_invoking_functions_001.control
 Sem_160102_predefined_functions_001.control

conformance_test/core_language_tests/positive_tests/pos_conf_tests.tpd

@@ -2034,7 +2034,7 @@
 <!--    <FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/NegSem_1511_ConcatenatingTemplatesOfStringAndListTypes_005.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/NegSem_1511_ConcatenatingTemplatesOfStringAndListTypes_005.ttcn"/>-->
 <!--    <FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/NegSem_1511_ConcatenatingTemplatesOfStringAndListTypes_006.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/NegSem_1511_ConcatenatingTemplatesOfStringAndListTypes_006.ttcn"/>-->
     <FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_001.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_001.ttcn"/>
-<!--    <FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_002.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_002.ttcn"/>-->
+    <FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_002.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_002.ttcn"/>
 <!--    <FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_003.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_003.ttcn"/>-->
 <!--    <FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_004.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_004.ttcn"/>-->
 <!--    <FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_005.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_005.ttcn"/>-->
@@ -2045,7 +2045,7 @@
     <FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_010.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_010.ttcn"/>
 <!--    <FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_011.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_011.ttcn"/>-->
 <!--    <FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_012.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_012.ttcn"/>-->
-<!--    <FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_013.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_013.ttcn"/>-->
+    <FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_013.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_013.ttcn"/>
     <FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_014.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_014.ttcn"/>
 <!--    <FileResource projectRelativePath="15_templates/15_toplevel/NegSem_15_TopLevel_001.ttcn" relativeURI="15_templates/15_toplevel/NegSem_15_TopLevel_001.ttcn"/>-->
 <!--    <FileResource projectRelativePath="15_templates/15_toplevel/NegSem_15_TopLevel_002.ttcn" relativeURI="15_templates/15_toplevel/NegSem_15_TopLevel_002.ttcn"/>-->