New testcases have been mapped from titan.core 4

Signed-off-by: balaskoa <Jeno.Balasko@ericsson.com>

Regression_Test_java/.TITAN_properties

@@ -70,6 +70,20 @@
         <ExcludeFromBuild>true</ExcludeFromBuild>
       </FolderProperties>
     </FolderResource>
+    <FolderResource>
+      <FolderPath>src/cfgFile/testport_parameters</FolderPath>
+      <FolderProperties>
+        <CentralStorage>false</CentralStorage>
+        <ExcludeFromBuild>true</ExcludeFromBuild>
+      </FolderProperties>
+    </FolderResource>
+    <FolderResource>
+      <FolderPath>src/cfg_list_concat</FolderPath>
+      <FolderProperties>
+        <CentralStorage>false</CentralStorage>
+        <ExcludeFromBuild>true</ExcludeFromBuild>
+      </FolderProperties>
+    </FolderResource>
     <FolderResource>
       <FolderPath>src/json</FolderPath>
       <FolderProperties>

Regression_Test_java/single_bugs.cfg

@@ -4,18 +4,31 @@
 # - running in single mode with not passed result (error or fail)
 # Not compilable or not runnable tests are excluded from the project.
 # Test running only in parallel mode are collected separately.
+
+# Hint: comment out every test except of the one to be fixed
+
 [MODULE_PARAMETERS]
 # This section shall contain the values of all parameters that are defined in your TTCN-3 modules.
 
 [EXECUTE]
 all_from_with_functions #TODO: JSON enc-dec function handling,
 encdec_OK #TODO: JSON, BER encoder
+TbitstrOper.tc__value_list_bs #fails
+
 [ORDERED_INCLUDE]
 #First edit the cfg file! Line 21 should active
 "src/assignmentNotation/TassignmentNotation.cfg" #Verdict Statistics: 0 none (0 %), 7 pass (100 %), 0 inconc (0 %), 0 fail (0 %), 0 error (0 %)
 #HACK: escaped double quote added, ass. not. nok Error message:
 # Error while setting parameter field 'tsp_editor' to 'vim': Referenced module parameter cannot be found. Module `vim' does not exist, and no parameter with name `vim' exists in any module.
 
+### cfgFile ###
+"src/cfgFile/define/macro_reference/TSTM_macro_test_main.cfg" #nok, it went 57 pass but now stops with StackOverflowError
+"src/cfgFile/define/structured/structured.cfg" #nok, stops with StackOverflowError
+"src/cfgFile/module_parameters/nested/nested.cfg" #TODO; it is simplified and reported in NestedRoI;  RT2 bugfix it! Dot notation problem! Reported
+"src/cfgFile/module_parameters/references/references.cfg" #TODO: mp:=mp+1
+"src/cfgFile/ordered_include/oi_after_list1.cfg" #Error while setting parameter field 'tsp_c' to '0': Type mismatch: charstring value was expected instead of null.
+#"src/cfgFile/testport_parameters/array_index.cfg" #compiled, not runnining, it shall be excluded anyway!!!
+
 [LOGGING]
 # In this section you can specify the name of the log file and the classes of events
 # you want to log into the file or display on console (standard error).

Regression_Test_java/single_config.cfg

@@ -40,6 +40,30 @@ Test303T.control #ok
 #TassignmentNotation # requires [ORDERED_INCLUDE] see there!
 #basicStatem:
 TbasicStatem # TODO: basicStatemLabelGoto2 => none because goto is not implemented, commented out
+#BER*  #TODO: implement BER encoding
+#bitstrOper:
+TbitstrOper.control //TODO: line 800: bugfix BS.send(vl_str[0]); - compilation error
+TbitstrOperLonger.control
+#boolOPer:
+TboolOper.control
+
+#cfg_list_concat -excluded because module name duplication 
+#concat1
+#(cfg_list_concat/concat.ttcn and cfgFile/module_parameters/concat/concat.ttcn + 
+#   "src/cfg_list_concat/everything.cfg" #see in [ORDERED_INCLUDE]
+
+#cfgFile/: see under [ORDERED_INCLUDE]
+  #define/:
+  #  macro_reference: ok, see below
+  #  structured: nok, TODO: macro handling and concat
+  #module_parameters/ :
+  # assignment #requires [MODULE_PARAMS]! see under [INCLUDE]
+  # concat - TODO: requires &= in cfg file, only in RT2
+  # nested - TODO: requires &= in cfg file, only in RT2
+  # references - requires references ( mod par on the right side)
+  #SpecialValues see under [ORDERED_INCLUDE]
+  #ordered_include - excluded, cannot executed in one step
+  #testport_parameters -excluded, TODO
 
 #
 #json (There are testcases commented out in it!! In preinit of JsonTypes it stops with exception)
@@ -167,6 +191,17 @@ TsetofOper.control
 "src/assignmentNotation/TassignmentNotation.cfg" 
 #HACK: escaped double quote added, ass. not. nok, Error while setting parameter field 'tsp_editor' to 'vim': Referenced module parameter cannot be found. Module `vim' does not exist, and no parameter with name `vim' exists in any module.
 
+### cfgFile ###
+#"src/cfgFile/define/macro_reference/TSTM_macro_test_main.cfg" #nok, it went 57 pass but now stops with StackOverflowError
+#"src/cfgFile/define/structured/structured.cfg" #TODO: SError while setting parameter field 'tsp_1' to 'a': Referenced module parameter cannot be found. Module `a' does not exist, and no parameter with name `a' exists in any module.
+"src/cfgFile/module_parameters/assignment/assignment.cfg" #enum modulepar, 19 pass
+"src/cfgFile/module_parameters/concat/concat.cfg" #fixed: record concat, &= in cfg file
+#"src/cfgFile/module_parameters/nested/nested.cfg" #TODO; it is simplified and reported in NestedRoI;  RT2 bugfix it! Dot notation problem! Reported
+#"src/cfgFile/module_parameters/references/references.cfg" #TODO: mp:=mp+1
+"src/cfgFile/module_parameters/special_values/SpecialValues.cfg"
+#"src/cfgFile/ordered_include/oi_after_list1.cfg" #Error while setting parameter field 'tsp_c' to '0': Type mismatch: charstring value was expected instead of null.
+#"src/cfgFile/testport_parameters/array_index.cfg" #compiled, not runnining, it shall be excluded anyway!!!
+
 [LOGGING]
 # In this section you can specify the name of the log file and the classes of events
 # you want to log into the file or display on console (standard error).

Regression_Test_java/single_experimental.cfg

@@ -6,7 +6,19 @@
 [EXECUTE]
 
 [ORDERED_INCLUDE]
-"src/assignmentNotation/TassignmentNotation.cfg" 
+#"src/assignmentNotation/TassignmentNotation.cfg" 
+#HACK: escaped double quote added, ass. not. nok, Error while setting parameter field 'tsp_editor' to 'vim': Referenced module parameter cannot be found. Module `vim' does not exist, and no parameter with name `vim' exists in any module.
+
+### cfgFile ###
+#"src/cfgFile/define/macro_reference/TSTM_macro_test_main.cfg" #nok, it went 57 pass but now stops with StackOverflowError
+#"src/cfgFile/define/structured/structured.cfg" #TODO: SError while setting parameter field 'tsp_1' to 'a': Referenced module parameter cannot be found. Module `a' does not exist, and no parameter with name `a' exists in any module.
+"src/cfgFile/module_parameters/assignment/assignment.cfg" #enum modulepar, 19 pass
+"src/cfgFile/module_parameters/concat/concat.cfg" #fixed: record concat, &= in cfg file
+#"src/cfgFile/module_parameters/nested/nested.cfg" #TODO; it is simplified and reported in NestedRoI;  RT2 bugfix it! Dot notation problem! Reported
+#"src/cfgFile/module_parameters/references/references.cfg" #TODO: mp:=mp+1
+"src/cfgFile/module_parameters/special_values/SpecialValues.cfg"
+#"src/cfgFile/ordered_include/oi_after_list1.cfg" #Error while setting parameter field 'tsp_c' to '0': Type mismatch: charstring value was expected instead of null.
+#"src/cfgFile/testport_parameters/array_index.cfg" #compiled, not runnining, it shall be excluded anyway!!!
 [LOGGING]
 # In this section you can specify the name of the log file and the classes of events
 # you want to log into the file or display on console (standard error).

Regression_Test_java/src/basicStatem/TbasicStatem.ttcn

@@ -208,12 +208,12 @@ if (x2==1) {setverdict(pass)}  // "zero-sized" loop
  else {setverdict(fail)};
 }
 
-testcase basicStatemLabelGoto1() runs on basicStatem_mycomp {
-goto L1;		// forward
-setverdict(fail);
-label L1;
-setverdict(pass);
-}
+//testcase basicStatemLabelGoto1() runs on basicStatem_mycomp {
+//goto L1;		// forward
+//setverdict(fail);
+//label L1;
+//setverdict(pass);
+//}
 
 testcase basicStatemLabelGoto2() runs on basicStatem_mycomp {
 var integer x;
@@ -375,8 +375,8 @@ control {
  execute(basicStatemFor());
  execute(basicStatemWhile());
  execute(basicStatemDoWhile());
- execute(basicStatemLabelGoto1());
- execute(basicStatemLabelGoto2());
+// execute(basicStatemLabelGoto1());
+// execute(basicStatemLabelGoto2());
  execute(basicStatemStop());
  //execute(basicStatemfunctionCallAlias());
  execute(tc_HM79493_set());  // Set component variables/variable templates.

Regression_Test_java/src/bitstrOper/TbitstrOper.ttcn

@@ -793,14 +793,15 @@ testcase tc_altstep_bs() runs on CT {
   T.stop;
 }
 
-testcase tc_altstep_bs_idx() runs on CT {
-  var bitstring vl_str := '01'B
-  connect(self:BS, self:BS);
-  T.start(1.0);
-  BS.send(vl_str[0]);
-  as_bs(vl_str[0]);
-  T.stop;
-}
+//TODO: bugfix BS.send(vl_str[0]); - compilation error
+//testcase tc_altstep_bs_idx() runs on CT {
+//  var bitstring vl_str := '01'B
+//  connect(self:BS, self:BS);
+//  T.start(1.0);
+//  BS.send(vl_str[0]);
+//  as_bs(vl_str[0]);
+//  T.stop;
+//}
 
 altstep as_bs_template(in template bitstring  str) runs on CT {
   var template bitstring vl_str := ?;
@@ -888,9 +889,9 @@ control
 
   execute(tc_bs());
   execute(tc_altstep_bs());
-  execute(tc_altstep_bs_idx());
+//  execute(tc_altstep_bs_idx());
   execute(tc_altstep_bs_template());
-  execute(tc__value_list_bs());
+//  execute(tc__value_list_bs());
   execute(tc__match_bs_idx());
 }
 }

Regression_Test_java/src/cfgFile/define/macro_reference/TSTM_macro_test_main.cfg

+###############################################################################
+# Copyright (c) 2000-2019 Ericsson Telecom AB
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
+#
+# Contributors:
+#   Balasko, Jeno
+#   Baranyi, Botond
+#   Beres, Szabolcs
+#
+###############################################################################
+[LOGGING]
+*.MatchingHints := Compact
+# In this section you can specify the name of the log file and the classes of events
+# you want to log into the file or display on console (standard error).
+
+LogFile := "logs/%e.%h-%r.%s"
+FileMask :=WARNING|VERDICTOP|USER|TESTCASE|STATISTICS|PORTEVENT|ERROR| ACTION| MATCHING| STATISTICS 
+ConsoleMask :=VERDICTOP|USER| FUNCTION| ACTION|ERROR | WARNING | TESTCASE | STATISTICS  
+LogSourceInfo := Yes
+AppendFile := No
+TimeStampFormat := DateTime
+LogEventTypes := No
+SourceInfoFormat := Stack
+LogEntityName := Yes
+
+[TESTPORT_PARAMETERS]
+# In this section you can specify parameters that are passed to Test Ports.
+
+[INCLUDE]
+# To use configuration settings given in other configuration files,
+# the configuration files just need to be listed in this section, with their full or relative pathnames.
+
+[EXECUTE]
+TSTM_macro_test_testcases.control
+
+[DEFINE]
+//These commented lines are part of the test, do not remove them!!!
+# In this section you can create macro definitions,
+# that can be used in other configuration file sections except [INCLUDE].
+
+// In this section you can create macro definitions,
+// that can be used in other configuration file sections except [INCLUDE].
+
+/*
+ In this section you can create macro definitions,
+ that can be used in other configuration file sections except [INCLUDE].
+*/
+
+#Primary macros:
+MACRO_1_0:=1
+MACRO_1_1 := 1234567890
+MACRO_1_2 :="1234567890"
+MACRO_1_3:=subidubi1
+MACRO_1_4 := "subidubi2"
+MACRO_1_5:=123456789.abc-def_ghijklmnopqrstuvwxyz-F //F0::0A
+MACRO_1_6:=00:01:02:03:04:05:06:07
+MACRO_1_7:=0:1:2:3:4:5:6:7
+MACRO_1_8:=0::ABBA
+MACRO_1_9:=0::1
+MACRO_1_10:=::
+MACRO_1_11:=:::     #Why is this accepted???
+#Macros with one reference
+
+MACRO_2_0:=$MACRO_1_0    //accepted but wrong, TR: not written yet
+MACRO_2_1:=$MACRO_1_1
+MACRO_2_2:=$MACRO_1_2
+MACRO_2_3:=$MACRO_1_3
+MACRO_2_4:=$MACRO_1_4
+MACRO_2_5:=$MACRO_1_5
+MACRO_2_6:=$MACRO_1_6
+MACRO_2_7:=$MACRO_1_7
+MACRO_2_8:=$MACRO_1_8
+MACRO_2_9:=$MACRO_1_9
+MACRO_2_10:=$MACRO_1_10
+MACRO_2_11:=$MACRO_1_11
+
+MACRO_3_0:=${MACRO_1_0} 
+MACRO_4_0:="${MACRO_1_0}"
+MACRO_4_0x1:=${MACRO_1_0}${MACRO_1_1}
+MACRO_4_0x0:=${MACRO_1_0}${MACRO_1_0}
+MACRO_4_0x1x2:=${MACRO_1_0}${MACRO_1_1}${MACRO_1_2}
+MACRO_4_0xSx1:=${MACRO_1_0}something${MACRO_1_1}
+MACRO_4_Sx0x1x2:=something${MACRO_1_0}${MACRO_1_1}${MACRO_1_2}
+MACRO_4_0xSx1x2:=${MACRO_1_0}something${MACRO_1_1}${MACRO_1_2}
+MACRO_4_0xsx1x2:=${MACRO_1_0}"something"${MACRO_1_1}${MACRO_1_2}
+
+MACRO_4_0x1xSx2:=${MACRO_1_0}${MACRO_1_1}something${MACRO_1_2}
+
+MACRO_4_0xSx1xSx2:=${MACRO_1_0}something${MACRO_1_1}something${MACRO_1_2}
+
+MACRO_4_0xSx1xSx2xS:=${MACRO_1_0}something${MACRO_1_1}something${MACRO_1_2}something
+
+MACRO_4_Sx0xSx1xSx2xS:=something${MACRO_1_0}something${MACRO_1_1}something${MACRO_1_2}something
+MACRO_4_sx0xSx1xSx2xS:="something."${MACRO_1_0}something${MACRO_1_1}something${MACRO_1_2}something
+
+MACRO_4_horror1:= ${MACRO_4_Sx0xSx1xSx2xS}${MACRO_4_Sx0xSx1xSx2xS}
+MACRO_4_0x0x0x0x0x0x0x0:=${MACRO_1_0}${MACRO_1_0}${MACRO_1_0}${MACRO_1_0}${MACRO_1_0}${MACRO_1_0}${MACRO_1_0}${MACRO_1_0}
+
+
+MACRO_4_comment1:=${MACRO_1_0}${MACRO_1_0}
+MACRO_4_comment2:=${MACRO_1_0}"how can You
+handle
+this?"${MACRO_1_0}
+
+# repetition is not allowed:
+#MACRO_4_0:="${MACRO_1_0}"
+#MACRO_2_1:=$MACRO_1_1
+
+#strange lines
+d = 1 e = 2 f = 3${e}${d} i := $d"00"$e"00"$f
+#f=321
+#i=100200321
+o=ABBA
+o1=ABBA$e${f}
+
+#duplicates
+val := 123
+val := -8
+ES_TEE_AR := cool
+ES_TEE_AR := "not "$ES_TEE_AR", man"
+
+[MODULE_PARAMETERS]
+# This section shall contain the values of all parameters that are defined in your TTCN-3 modules.
+tsp_old_1_0:=$MACRO_1_0
+tsp_old_1_1:=$MACRO_1_1
+tsp_old_1_2:=$MACRO_1_2
+tsp_old_1_3:=$MACRO_1_3
+tsp_old_1_4:=$MACRO_1_4
+tsp_old_1_5:=$MACRO_1_5
+tsp_old_1_6:=$MACRO_1_6
+tsp_old_1_7:=$MACRO_1_7
+tsp_old_1_8:=$MACRO_1_8
+tsp_old_1_9:=$MACRO_1_9
+tsp_old_1_10:=$MACRO_1_10
+
+/* not accepted yet: */
+tsp_new_2_0 :=$MACRO_2_0
+tsp_new_2_1 :=$MACRO_2_1
+tsp_new_2_2 :=$MACRO_2_2
+tsp_new_2_3 :=$MACRO_2_3
+tsp_new_2_4 :=$MACRO_2_4
+tsp_new_2_5 :=$MACRO_2_5
+tsp_new_2_6 :=$MACRO_2_6
+tsp_new_2_7 :=$MACRO_2_7
+tsp_new_2_8 :=$MACRO_2_8
+tsp_new_2_9 :=$MACRO_2_9
+tsp_new_2_10:=$MACRO_2_10
+tsp_new_2_11:=$MACRO_2_11
+
+tsp_new_3_0      :=$MACRO_3_0
+tsp_new_4_0      :=$MACRO_4_0
+
+tsp_new_4_0x1    :=$MACRO_4_0x1
+tsp_new_4_0x0    :=$MACRO_4_0x0
+tsp_new_4_0x1x2  :=$MACRO_4_0x1x2
+
+tsp_new_4_0xSx1  :=$MACRO_4_0xSx1
+tsp_new_4_Sx0x1x2:=$MACRO_4_Sx0x1x2
+
+tsp_new_4_0xSx1x2:=$MACRO_4_0xSx1x2
+
+tsp_new_4_0xsx1x2:=$MACRO_4_0xsx1x2
+
+tsp_new_4_0x1xSx2:=$MACRO_4_0x1xSx2
+tsp_new_4_0xSx1xSx2:=$MACRO_4_0xSx1xSx2
+
+tsp_new_4_0xSx1xSx2xS:=$MACRO_4_0xSx1xSx2xS
+
+tsp_new_4_Sx0xSx1xSx2xS:=$MACRO_4_Sx0xSx1xSx2xS
+tsp_new_4_sx0xSx1xSx2xS:=$MACRO_4_sx0xSx1xSx2xS
+tsp_new_4_horror1:=$MACRO_4_horror1
+
+tsp_new_4_0x0x0x0x0x0x0x0:=$MACRO_4_0x0x0x0x0x0x0x0
+tsp_new_4_comment1:=$MACRO_4_comment1
+tsp_new_4_comment2:=$MACRO_4_comment2
+
+tsp_d:=$d
+tsp_e:=${e}
+tsp_f:=${ f}
+tsp_i:=${i }
+tsp_o=${o,octetstring}
+tsp_d1:=${d,charstring}
+TSTM_macro_test_testcases.tsp_e1:=${e,integer}
+TSTM_macro_test_testcases.tsp_f1=$f
+TSTM_macro_test_testcases.tsp_i1=${i,charstring}
+TSTM_macro_test_testcases.tsp_o1=${o1,octetstring}
+TSTM_macro_test_testcases.mp_int := ${val,integer}
+TSTM_macro_test_testcases.mp_str := $ES_TEE_AR

Regression_Test_java/src/cfgFile/define/macro_reference/TSTM_macro_test_testcases.ttcn

+/******************************************************************************
+ * Copyright (c) 2000-2019 Ericsson Telecom AB
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
+ *
+ * Contributors:
+ *   Balasko, Jeno
+ *   Baranyi, Botond
+ *   Beres, Szabolcs
+ *
+ ******************************************************************************/
+//Version:0.1
+//Date: 2012-10-18
+//Description: Positive test cases for macros in section [DEFINE] 
+module TSTM_macro_test_testcases{
+
+//import from dummy all;
+
+modulepar {
+  charstring tsp_old_1_0:="0";
+  charstring tsp_old_1_1:="0";
+  charstring tsp_old_1_2:="0";
+  charstring tsp_old_1_3:="0";
+  charstring tsp_old_1_4:="0";
+  charstring tsp_old_1_5:="0";
+  charstring tsp_old_1_6:="0";
+  charstring tsp_old_1_7:="0";
+  charstring tsp_old_1_8:="0";
+  charstring tsp_old_1_9:="0"; 
+  charstring tsp_old_1_10:="0";
+  charstring tsp_old_1_11:="0";
+  //charstring tsp_1_2:="3";
+
+  charstring tsp_new_2_0:="0";
+  charstring tsp_new_2_1:="0";
+  charstring tsp_new_2_2:="0";
+  charstring tsp_new_2_3:="0";
+  charstring tsp_new_2_4:="0";
+  charstring tsp_new_2_5:="0";
+  charstring tsp_new_2_6:="0";
+  charstring tsp_new_2_7:="0";
+  charstring tsp_new_2_8:="0";
+  charstring tsp_new_2_9:="0"; 
+  charstring tsp_new_2_10:="0";
+  charstring tsp_new_2_11:="0"
+
+  charstring tsp_new_3_0:="0";
+  charstring tsp_new_4_0:="0";
+  charstring tsp_new_4_0x1:="0";
+  charstring tsp_new_4_0x0:="0";
+  charstring tsp_new_4_0x1x2:="0";
+  charstring tsp_new_4_0xSx1:="0";
+
+  charstring  tsp_new_4_Sx0x1x2:="0";
+  charstring  tsp_new_4_0xSx1x2:="0";
+  charstring  tsp_new_4_0xsx1x2:="0";
+  charstring  tsp_new_4_0x1xSx2:="0";
+  charstring  tsp_new_4_0xSx1xSx2:="0";
+  charstring  tsp_new_4_0xSx1xSx2xS:="0";
+  charstring  tsp_new_4_Sx0xSx1xSx2xS:="0";
+  charstring  tsp_new_4_sx0xSx1xSx2xS:="0";
+  charstring  tsp_new_4_horror1:="0";
+  charstring  tsp_new_4_0x0x0x0x0x0x0x0:="0";
+  charstring  tsp_new_4_comment1:="0";
+  charstring  tsp_new_4_comment2:="0";
+  charstring  tsp_d := "0"
+  charstring  tsp_e :=""
+  charstring  tsp_f:="";
+  charstring  tsp_i:=""
+  octetstring tsp_o:=''O; 
+  charstring  tsp_d1 := "0"
+  integer  tsp_e1 :=-1;
+  charstring  tsp_f1:="";
+  charstring  tsp_i1:=""
+  octetstring tsp_o1:=''O; 
+
+  integer mp_int := 0;
+  charstring mp_str := "cool";
+}
+
+type component MyComp_CT{}
+
+//=========================================================================
+// Testcases
+//=========================================================================
+
+testcase tc_old_0() runs on MyComp_CT {
+  if(match(tsp_old_1_0, "1") ) {setverdict(pass)} else {setverdict(fail,tsp_old_1_0)}; 
+}
+
+testcase tc_old_1() runs on MyComp_CT {
+  if(match(tsp_old_1_1, "1234567890") ) {setverdict(pass)} else {setverdict(fail, tsp_old_1_1)};
+}
+
+testcase tc_old_2() runs on MyComp_CT {
+  if(match(tsp_old_1_2, "1234567890") ) {setverdict(pass)} else {setverdict(fail,tsp_old_1_2)};
+}
+
+testcase tc_old_3() runs on MyComp_CT {
+  if(match(tsp_old_1_3, "subidubi1") ) {setverdict(pass)} else {setverdict(fail)};
+}
+
+testcase tc_old_4() runs on MyComp_CT {
+  if(match(tsp_old_1_4, "subidubi2") ) {setverdict(pass)} else {setverdict(fail)};
+}
+
+testcase tc_old_5() runs on MyComp_CT {
+  if(match(tsp_old_1_5, "123456789.abc-def_ghijklmnopqrstuvwxyz-F") ) {setverdict(pass)} else {setverdict(fail)};
+}
+
+testcase tc_old_6() runs on MyComp_CT {
+  if(match(tsp_old_1_6, "00:01:02:03:04:05:06:07") ) {setverdict(pass)} else {setverdict(fail)};  
+}
+
+testcase tc_old_7() runs on MyComp_CT {
+  if(match(tsp_old_1_7, "0:1:2:3:4:5:6:7") ) {setverdict(pass)} else {setverdict(fail)};
+}
+
+testcase tc_old_8() runs on MyComp_CT {
+  if(match(tsp_old_1_8, "0::ABBA") ) {setverdict(pass)} else {setverdict(fail)};
+}
+
+testcase tc_old_9() runs on MyComp_CT { 
+  if(match(tsp_old_1_9, "0::1") ) {setverdict(pass)} else {setverdict(fail)};
+}
+
+testcase tc_old_10() runs on MyComp_CT {
+  if(match(tsp_old_1_10, "::") ) {setverdict(pass)} else {setverdict(fail)};
+}
+
+testcase tc_old_11() runs on MyComp_CT {
+  if(match(tsp_old_1_11, ":::") ) {setverdict(pass)} else {setverdict(fail)};
+}
+
+//================ NEW ===================
+
+
+//TODO: Modify the expected value for a real one
+testcase tc_new_2_0() runs on MyComp_CT {
+  if(match(tsp_new_2_0, "1") ) {setverdict(pass)} else {setverdict(fail)};
+}
+
+testcase tc_new_2_1() runs on MyComp_CT {
+  if(match(tsp_new_2_1, "1234567890") ) {setverdict(pass)} else {setverdict(fail)};
+}
+
+testcase tc_new_2_2() runs on MyComp_CT {
+  if(match(tsp_new_2_2, "1234567890") ) {setverdict(pass)} else {setverdict(fail)};
+}
+testcase tc_new_2_3() runs on MyComp_CT {
+  if(match(tsp_new_2_3, "subidubi1") ) {setverdict(pass)} else {setverdict(fail)};
+}
+
+testcase tc_new_2_4() runs on MyComp_CT {
+  if(match(tsp_new_2_4, "subidubi2") ) {setverdict(pass)} else {setverdict(fail)};
+}
+
+testcase tc_new_2_5() runs on MyComp_CT {
+  if(match(tsp_new_2_5, "123456789.abc-def_ghijklmnopqrstuvwxyz-F") ) {setverdict(pass)} else {setverdict(fail)};
+}
+
+testcase tc_new_2_6() runs on MyComp_CT {
+  if(match(tsp_new_2_6, "00:01:02:03:04:05:06:07") ) {setverdict(pass)} else {setverdict(fail)};
+}
+
+testcase tc_new_2_7() runs on MyComp_CT {
+  if(match(tsp_new_2_7, "0:1:2:3:4:5:6:7") ) {setverdict(pass)} else {setverdict(fail)};
+}
+
+testcase tc_new_2_8() runs on MyComp_CT {
+  if(match(tsp_new_2_8, "0::ABBA") ) {setverdict(pass)} else {setverdict(fail)};
+}
+
+testcase tc_new_2_9() runs on MyComp_CT {
+  if(match(tsp_new_2_9, "0::1") ) {setverdict(pass)} else {setverdict(fail)};
+}
+
+testcase tc_new_2_10() runs on MyComp_CT {
+  if(match(tsp_new_2_10, "::") ) {setverdict(pass)} else {setverdict(fail)};
+}
+
+testcase tc_new_2_11() runs on MyComp_CT {
+  if(match(tsp_new_2_11, ":::") ) {setverdict(pass)} else {setverdict(fail)};
+}
+
+testcase tc_new_3_0() runs on MyComp_CT {
+  if(match(tsp_new_3_0, "1") ) {setverdict(pass)} else {setverdict(fail)};
+}
+
+testcase tc_new_4_0() runs on MyComp_CT {
+  if(match(tsp_new_4_0, "${MACRO_1_0}") ) {setverdict(pass)} else {setverdict(fail)};
+}
+
+testcase tc_new_4_0x1() runs on MyComp_CT {
+  if(match(tsp_new_4_0x1, "11234567890") ) {setverdict(pass)} else {setverdict(fail)};
+}
+
+testcase tc_new_4_0x0() runs on MyComp_CT {
+  if(match(tsp_new_4_0x0, "11") ) {setverdict(pass)} else {setverdict(fail)};
+}
+
+testcase tc_new_4_0x1x2() runs on</