update based on Bogdan comments

ATS/06_types_and_values/0601_basic_types_and_values/060101_basic_string_types_and_values/060101_toplevel/Sem_060101_TopLevel_007.ttcn

@@ -19,17 +19,21 @@ module Sem_060101_TopLevel_007 {
     type component GeneralComp {}
     
     testcase TC_Sem_060101_TopLevel_007() runs on GeneralComp {
-        var universal charstring v_a :=  char(U0041);  //USI notation for character "A"
-        var universal charstring v_b :=  char(U0171);  //USI notation for character "ű"
-        var universal charstring v_c :=  char(U41);    //USI notation for character "A" without leading zeroes
-        var universal charstring v_b :=  char(U+171);  //USI notation for character "ű"  without leading zeroes and + sign notation
-         var universal charstring v_d :=  char(U171,U41);  //USI notation for character "ű" and "A"  without leading zeroes and + sign notation
+        var universal charstring v_a  :=  char(U0041);  //USI notation for character "A"
+        var universal charstring v_b  :=  char(U0171);  //USI notation for character "ű"
+        var universal charstring v_c  :=  char(U41);    //USI notation for character "A" without leading zeroes
+        var universal charstring v_d  :=  char(U+171,U41);  //USI notation for character "ű" and "A"  without leading zeroes and + sign notation
+
         
-    	if ((v_a == "A") and (v_b == "ű") and (v_c == "A") and (v_d == "űA") ){
-    		setverdict(pass);
+               
+    	if (match(v_a,"A") and 
+            match(v_b,"ű") and
+            match(v_c,"A") and
+            match(v_d,"űA") ){
+    		setverdict(pass,"v_a:",v_a,", v_b:",v_b,", v_c:",v_c,", v_d:",v_d);
     	}
     	else {
-    		setverdict(fail);
+    		setverdict(fail,"v_a:",v_a,", v_b:",v_b,", v_c:",v_c,", v_d:",v_d);
     	}
     }
     

ATS/06_types_and_values/0601_basic_types_and_values/060102_subtyping_of_basic_types/06010205_pattern_subtyping_of_character_string_types/NegSyn_06010205_StringPattern_002.ttcn

@@ -6,13 +6,13 @@
  ***************************************************/
 
 module NegSyn_06010205_StringPattern_002 {
-    type charstring MyString (pattern "\q{0,0,1,116}abc"); //error: is not a legal character of the TTCN 3 charstring type
+    type charstring MyString (pattern "\q{0,0,1,116}abc"); //error: not a legal character for the TTCN 3 charstring type
 
     
     type component GeneralComp {}
     
     testcase TC_NegSyn_06010205_StringPattern_002() runs on GeneralComp {
-        var MyString v_c := "Ŵabc";    //error: is not a legal character of the TTCN 3 charstring type
+        var MyString v_c := "Ŵabc";    //error: not a legal character of the TTCN 3 charstring type
     }
     
     control{

ATS/06_types_and_values/0601_basic_types_and_values/060102_subtyping_of_basic_types/06010205_pattern_subtyping_of_character_string_types/Sem_06010205_StringPattern_003.ttcn

@@ -24,7 +24,7 @@ module Sem_06010205_StringPattern_003 {
         v_c := "AbC.xyZ";
         v_c := "ABc*xYZ";
         v_c := "ABC?XYZ";
-		setverdict(pass);
+		setverdict(pass,"The resuls is: ",v_c);
     }
     
     control{

ATS/06_types_and_values/0601_basic_types_and_values/060102_subtyping_of_basic_types/06010206_mixing_subtyping_mechanisms/0601020602_using_length_restriction_with_other_constraints/Sem_0601020602_StringMixing_007.ttcn

@@ -22,7 +22,7 @@ module Sem_0601020602_StringMixing_007 {
         v_b :=v_a;        //v_b :="abxyz";
         v_b :="AbXyZ";      
 
-      	setverdict(pass);
+      	setverdict(pass,"The result is: ",v_b);
     }
     
     control{

ATS/06_types_and_values/0602_structured_types_and_values/060209_comm_port_types/Sem_060209_CommunicationPortTypes_005.ttcn

@@ -6,7 +6,7 @@
  *****************************************************************/
 
 /* The following requirements are tested:
- * 6.2.9 Communication port types - Restriction e. MessageTypeshall be a data type as defined in clause 3.1.
+ * 6.2.9 Communication port types - Restriction e. MessageType shall be a data type as defined in clause 3.1.
  */
 
 module Sem_060209_CommunicationPortTypes_005 {
@@ -62,26 +62,177 @@ module Sem_060209_CommunicationPortTypes_005 {
       var MyUnionType uni :={number:=1};
       v_a.integer :=1;
         
-      pt_myPort.send(j);              //send integer via port
-      pt_myPort.send(int2float(j));   //send float via port
-      pt_myPort.send(int2char(j));    //send character via port
-      pt_myPort.send(int2bit(j,4));   //send bitstring via port
-      pt_myPort.send(int2oct(j,4));   //send octetstring via port
-      pt_myPort.send(int2hex(j,4));   //send hexstring via port
-      pt_myPort.send(int2str(j));     //send charstring via port
-      pt_myPort.send(v_2);            //send boolean via port
-      pt_myPort.send(v_3);            //send verdicttype via port
-      pt_myPort.send(v_4);            //send universal charstring via port
-      pt_myPort.send(v_a.integer);    //send anytype via port
-      pt_myPort.send(MyR);            //send record via port
-      pt_myPort.send(MyS);            //send set via port
-      pt_myPort.send(RoI);            //send record of integers via port
-      pt_myPort.send(SoI);            //send set of integers via port
-      pt_myPort.send(enu);            //send enum via port
-      pt_myPort.send(uni);            //send union via port
-        
-     setverdict(pass);
-    
+//send integer via port 
+    pt_myPort.send(j); 
+    alt {
+     [] pt_myPort.receive(j) {
+        setverdict(pass,"Send success, received:", j);
+     }
+     [] pt_myPort.receive {
+        setverdict(fail,"integer sent failed",j);
+     }
+    }
+//send float via port   
+        pt_myPort.send(int2float(j)); 
+            alt {
+     [] pt_myPort.receive(int2float(j)) {
+        setverdict(pass,"Send success,received:", int2float(j));
+     }
+     [] pt_myPort.receive {
+        setverdict(fail,"float sent failed", int2float(j));
+     }
+    }
+//send character via port
+      pt_myPort.send(int2char(j));   
+               alt {
+     [] pt_myPort.receive(int2char(j)) {
+        setverdict(pass,"Send success,received:", int2char(j));
+     }
+     [] pt_myPort.receive {
+        setverdict(fail,"character sent failed", int2char(j));
+     }
+    }
+ //send bitstring via port   
+        pt_myPort.send(int2bit(j,4));  
+             alt {
+     [] pt_myPort.receive(int2bit(j,4)) {
+        setverdict(pass,"Send success,received:", int2bit(j,4));
+     }
+     [] pt_myPort.receive {
+        setverdict(fail,"bitstring sent failed", int2bit(j,4));
+     }
+    }
+//send octetstring via port  
+        pt_myPort.send(int2oct(j,4));  
+          alt {
+     [] pt_myPort.receive(int2oct(j,4)) {
+        setverdict(pass,"Send success,received:", int2oct(j,4));
+     }
+     [] pt_myPort.receive {
+        setverdict(fail,"octetstring sent failed", int2oct(j,4));
+     }
+    }
+//send hexstring via port
+      pt_myPort.send(int2hex(j,4));   
+         alt {
+     [] pt_myPort.receive(int2hex(j,4)) {
+        setverdict(pass,"Send success,received:",int2hex(j,4));
+     }
+     [] pt_myPort.receive {
+        setverdict(fail,"octetstring sent failed",int2hex(j,4));
+     }
+    }
+//send charstring via port
+      pt_myPort.send(int2str(j));     
+          alt {
+     [] pt_myPort.receive(int2str(j)) {
+        setverdict(pass,"Send success,received:",int2str(j));
+     }
+     [] pt_myPort.receive {
+        setverdict(fail,"charstring sent failed",int2str(j));
+     }
+    }
+//send boolean via port
+      pt_myPort.send(v_2);          
+                      alt {
+     [] pt_myPort.receive(v_2) {
+        setverdict(pass,"Send success,received:",v_2);
+     }
+     [] pt_myPort.receive {
+        setverdict(fail,"charstring sent failed", v_2);
+     }
+    }
+//send verdicttype via port
+      pt_myPort.send(v_3);   
+                              alt {
+     [] pt_myPort.receive(v_3) {
+        setverdict(pass,"Send success,received:",v_3);
+     }
+     [] pt_myPort.receive {
+        setverdict(fail,"verdict type sent failed", v_3);
+     }
+    }
+//send universal charstring via port        
+      pt_myPort.send(v_4);            
+       alt {
+     [] pt_myPort.receive(v_4) {
+        setverdict(pass,"Send success,received:",v_4);
+     }
+     [] pt_myPort.receive {
+        setverdict(fail,"universal charstring sent failed", v_4);
+     }
+    }
+//send anytype via port
+      pt_myPort.send(v_a.integer);    
+        alt {
+     [] pt_myPort.receive(v_a.integer) {
+        setverdict(pass,"Send success,received:",v_a.integer);
+     }
+     [] pt_myPort.receive {
+        setverdict(fail,"anytype sent failed", v_a.integer);
+     }
+    }
+//send record via port
+      pt_myPort.send(MyR);            
+        alt {
+     [] pt_myPort.receive(MyR) {
+        setverdict(pass,"Send success,received:",MyR);
+     }
+     [] pt_myPort.receive {
+        setverdict(fail,"Record sent failed", MyR);
+     }
+    }
+//send set via port      
+              pt_myPort.send(MyS);            
+        alt {
+     [] pt_myPort.receive(MyS) {
+        setverdict(pass,"Send success,received:",MyS);
+     }
+     [] pt_myPort.receive {
+        setverdict(fail,"Set sent failed", MyS);
+     }
+    }
+//send record of integers via port     
+      pt_myPort.send(RoI);           
+        alt {
+     [] pt_myPort.receive(RoI) {
+        setverdict(pass,"Send success,received:",RoI);
+     }
+     [] pt_myPort.receive {
+        setverdict(fail,"Record of integers sent failed", RoI);
+     }
+    }
+//send set of integers via port
+      pt_myPort.send(SoI);           
+        alt {
+     [] pt_myPort.receive(SoI) {
+        setverdict(pass,"Send success,received:",SoI);
+     }
+     [] pt_myPort.receive {
+        setverdict(fail,"Record of integers sent failed", SoI);
+     }
+    }
+//send enum via port
+      pt_myPort.send(enu);           
+       alt {
+     [] pt_myPort.receive(enu) {
+        setverdict(pass,"Send success,received:",enu);
+     }
+     [] pt_myPort.receive {
+        setverdict(fail,"Enum sent failed", enu);
+     }
+    }
+//send union via port
+      pt_myPort.send(uni);           
+                 alt {
+     [] pt_myPort.receive(uni) {
+        setverdict(pass,"Send success,received:",uni);
+     }
+     [] pt_myPort.receive {
+        setverdict(fail,"Union sent failed", uni);
+     }
+    }
+            
   }
 
     control{

ATS/06_types_and_values/0602_structured_types_and_values/060210_component_types/06021002_reuse_component_type/Sem_060210_ReuseofComponentTypes_001.ttcn

@@ -35,10 +35,10 @@ module Sem_060210_ReuseofComponentTypes_001 {
 
     alt {
      [] pt_myPort.receive(2) {
-        setverdict(pass);
+        setverdict(pass, "Receive successful");
      }
      [] pt_myPort.receive {
-        setverdict(fail);
+        setverdict(fail, "Unexpected result");
      }
     }
 

ATS/06_types_and_values/0602_structured_types_and_values/060210_component_types/06021002_reuse_component_type/Sem_060210_ReuseofComponentTypes_002.ttcn

@@ -41,10 +41,10 @@ module Sem_060210_ReuseofComponentTypes_002 {
      pt_myPortA.send(2);    
     alt {
      [] pt_myPortA.receive(2) {
-        setverdict(pass);
+        setverdict(pass,"Receive successful");
      }
      [] pt_myPortA.receive {
-        setverdict(fail);
+        setverdict(fail,"Unexpected result");
      }
     }
         
@@ -52,10 +52,10 @@ module Sem_060210_ReuseofComponentTypes_002 {
      pt_myPortB.send(1.0);    
     alt {
      [] pt_myPortB.receive(1.0) {
-        setverdict(pass);
+        setverdict(pass,"Receive successful");
      }
      [] pt_myPortB.receive {
-        setverdict(fail);
+        setverdict(fail,"Unexpected result");
      }
     }
 

ATS/06_types_and_values/0602_structured_types_and_values/060210_component_types/06021002_reuse_component_type/Sem_060210_ReuseofComponentTypes_003.ttcn

@@ -44,10 +44,10 @@ module Sem_060210_ReuseofComponentTypes_003 {
      pt_myPortA.send(2);    
     alt {
      [] pt_myPortA.receive(2) {
-        setverdict(pass);
+        setverdict(pass,"Receive successful");
      }
      [] pt_myPortA.receive {
-        setverdict(fail);
+        setverdict(fail,"Unexpected result");
      }
     }
         
@@ -55,10 +55,10 @@ module Sem_060210_ReuseofComponentTypes_003 {
      pt_myPortB.send(1.0);    
     alt {
      [] pt_myPortB.receive(1.0) {
-        setverdict(pass);
+        setverdict(pass,"Receive successful");
      }
      [] pt_myPortB.receive {
-        setverdict(fail);
+        setverdict(fail,"Unexpected result");
      }
     }
 

ATS/06_types_and_values/0602_structured_types_and_values/060212_addressing_entities_inside_sut/NegSem_060212_AddressingEntitiesInsideSut_003.ttcn

@@ -32,7 +32,7 @@ module NegSem_060212_AddressingEntitiesInsideSut_003 {
 		if(p.checkstate("Connected")) {
 			 p.send(MyMessType: 1) to mtc;
         } else {
-			setverdict(fail);
+			setverdict(fail,"Not connected");
 		}
 	}
 

ATS/06_types_and_values/0602_structured_types_and_values/060212_addressing_entities_inside_sut/NegSem_060212_AddressingEntitiesInsideSut_004.ttcn

@@ -31,9 +31,9 @@ module NegSem_060212_AddressingEntitiesInsideSut_004 {
 		function CheckConnected() runs on TestCaseComp
 	{
 		if(p1.checkstate("Connected")) {
-	        setverdict(pass);
+	        setverdict(pass,"Connected");
         } else {
-			setverdict(fail);
+			setverdict(fail,"Not connected");
 		}
 	}
     

ATS/09_test_configurations/0901_communication_ports/Sem_0901_Communication_ports_009.ttcn

@@ -21,9 +21,9 @@ module Sem_0901_Communication_ports_009 {
 	function checkConnected() runs on GeneralComp
 	{
 		if(p.checkstate("Connected")) {
-			setverdict(pass);			
+			setverdict(pass,"Connected");			
 		} else {
-			setverdict(fail);
+			setverdict(fail,"Not Connected");
 		}
 	}
 	

ATS/09_test_configurations/0901_communication_ports/Sem_0901_Communication_ports_010.ttcn

@@ -26,9 +26,9 @@ module Sem_0901_Communication_ports_010 {
     	function checkMapped() runs on MyCompA
 	{
 		if(p.checkstate("Mapped")) {
-			setverdict(pass);			
+			setverdict(pass,"Mapped");			
 		} else {
-			setverdict(fail);
+			setverdict(fail,"Not Mapped");
 		}
 	}
 	

ATS/09_test_configurations/0901_communication_ports/Sem_0901_Communication_ports_011.ttcn

@@ -25,9 +25,9 @@ module Sem_0901_Communication_ports_011 {
 	function checkMapped() runs on MyComp
 	{
 		if(p1.checkstate("Mapped") and p2.checkstate("Mapped")) {
-			setverdict(pass);			
+			setverdict(pass,"Mapped");			
 		} else {
-			setverdict(fail);
+			setverdict(fail,"Mapped");
 		}
 	}
 	

ATS/10_constants/NegSem_10_Constants_004.ttcn

@@ -28,8 +28,8 @@ module NegSem_10_Constants_004 {
                           field2 := 2};
  
    const integer C1 := R1.field1; //error
-        
-	if (C1 == R1.field1) { setverdict(pass) }
+   
+   if (match(C1, R1.field1)) { setverdict(pass,"match") }
 		else { setverdict(fail) }
     }
     

ATS/10_constants/NegSem_10_Constants_005.ttcn

@@ -27,7 +27,7 @@ module NegSem_10_Constants_005 {
    const default C2 := R2;       //allowed     
    const integer C1 := R1[0];    //error
         
-	if (C1 == R1[0]) { setverdict(pass) }
+	if (match(C1,R1[0])) { setverdict(pass,"match") }
 		else { setverdict(fail) }
     }
     

ATS/11_variables/1101_value_variables/NegSem_1101_ValueVars_003.ttcn

@@ -29,7 +29,7 @@ testcase TC_NegSem_1101_ValueVars_003() runs on GeneralComp {
   
     var integer Myvar := R1.field1;    //error
     
-	if (Myvar== R1.field1) { setverdict(pass) }
+	if (match(Myvar, R1.field1)) { setverdict(pass,"match") }
 		else { setverdict(fail) }
     }
     

ATS/11_variables/1101_value_variables/NegSem_1101_ValueVars_004.ttcn

@@ -24,7 +24,7 @@ testcase TC_NegSem_1101_ValueVars_004() runs on GeneralComp {
   
     var integer Myvar := R1[0];    //error
     
-	if (Myvar== R1[0]) { setverdict(pass) }
+	if (match(Myvar,R1[0])) { setverdict(pass,"match") }
 		else { setverdict(fail) }
     }
     

ATS/11_variables/1102_template_variables/NegSem_1102_TemplateVars_003.ttcn

@@ -41,10 +41,10 @@ testcase TC_NegSem_1102_TemplateVars_003() runs on GeneralComp {
 
     alt {
      [] messagePort.receive(v_set) {
-        setverdict(pass);
+        setverdict(pass,v_set);
      }
      [] messagePort.receive {
-        setverdict(fail);
+        setverdict(fail,v_set);
      }
     }
 }

ATS/11_variables/1102_template_variables/NegSem_1102_TemplateVars_004.ttcn

@@ -35,10 +35,10 @@ testcase TC_NegSem_1102_TemplateVars_004() runs on GeneralComp {
 
     alt {
      [] messagePort.receive(v_set) {
-        setverdict(pass);
+        setverdict(pass,v_set);
      }
      [] messagePort.receive {
-        setverdict(fail);
+        setverdict(fail,v_set);
      }
     }
 }

ATS/16_functions_altsteps_testcases/1601_functions/160102_predefined_functions/Sem_160102_predefined_functions_026.ttcn

@@ -6,12 +6,7 @@
  ***************************************************/
 
 /* The following requirements are tested:
-   This function converts an octetstring invalue to a universal charstring.
- * and
- * This function converts a universal charstring invalue to an octetstring.*/
-
-/*NOTE: 
- * "UTF-16LE","UTF-16BE", "UTF-32LE" and "UTF-32BE" in not working with TestCast v.6.8.2.5 */
+ * This function converts a universal charstring value to an octetstring.*/
 
 
 module Sem_160102_predefined_functions_026 {
@@ -26,39 +21,17 @@ module Sem_160102_predefined_functions_026 {
     // universal charstring:    
         var universal charstring v_0 := "ABC123abc";
         
-    // predefined functions for universal charstring to octetstring conversion:     
-        var octetstring v_1a := unichar2oct(v_0);        //string_encoding parameter is omitted, the default value "UTF-8"
-        var octetstring v_1b := unichar2oct(v_0, "UTF-8");
-        var octetstring v_1c := unichar2oct(v_0, "UTF-16");
-        var octetstring v_1d := unichar2oct(v_0, "UTF-32");
-        var octetstring v_1e := unichar2oct(v_0, "UTF-16LE");
-        var octetstring v_1f := unichar2oct(v_0, "UTF-16BE");
-        var octetstring v_1g := unichar2oct(v_0, "UTF-32LE");
-        var octetstring v_1h := unichar2oct(v_0, "UTF-32BE");
-   
-   // predefined functions for octetstring to universal charstring conversion:  
-        var universal charstring v_2a := oct2unichar(v_1a);
-        var universal charstring v_2b := oct2unichar(v_1b, "UTF-8");
-        var universal charstring v_2c := oct2unichar(v_1c, "UTF-16");
-        var universal charstring v_2d := oct2unichar(v_1d, "UTF-32");
-        var universal charstring v_2e := oct2unichar(v_1e, "UTF-16LE");
-        var universal charstring v_2f := oct2unichar(v_1f, "UTF-16BE");
-        var universal charstring v_2g := oct2unichar(v_1g, "UTF-32LE");
-        var universal charstring v_2h := oct2unichar(v_1f, "UTF-32BE");
+    // predefined function for universal charstring to octetstring conversion:     
+        var octetstring v_encoded := unichar2oct(v_0);        //string_encoding parameter is omitted, the default value "UTF-8", expected value: '414243313233616263'O
+        var octetstring v_1 := '414243313233616263'O;
+  
 
-        if( match(v_0,v_2a) and
-            match(v_0,v_2b) and
-            match(v_0,v_2c) and
-            match(v_0,v_2d) and
-            match(v_0,v_2e) and
-            match(v_0,v_2f) and
-            match(v_0,v_2g) and
-            match(v_0,v_2h)
+        if( match(v_encoded,v_1)
         ) {
-            setverdict(pass);
+            setverdict(pass,"Encoded value for: ",v_0, " is ", v_encoded);
         }
         else {
-            setverdict(fail);
+            setverdict(fail,"encoded value is: ", v_encoded, " expected ", v_1);
         }
     }