Skip to content
Snippets Groups Projects
Commit 294e6c93 authored by Arpad Lovassy's avatar Arpad Lovassy Committed by Gerrit Code Review
Browse files

Merge changes I9e0c7392,Ie634bf00

* changes:
  Small corrections in predef. func.
  Temporary spaces in cfg file of floatOper till bug fix
parents 94661daf c5db2ef3
No related branches found
No related tags found
No related merge requests found
...@@ -12,11 +12,11 @@ ...@@ -12,11 +12,11 @@
# #
############################################################################### ###############################################################################
[MODULE_PARAMETERS] [MODULE_PARAMETERS]
tsp_f_changed1 := 1.2+3.6/2.0; tsp_f_changed1 := 1.2 + 3.6 / 2.0
#Stops at reading cfg file: #Stops at reading cfg file:
#Error while setting parameter field 'tsp_f_changed2' to '3.600000 / 0.000000': Floating point division by zero #Error while setting parameter field 'tsp_f_changed2' to '3.600000 / 0.000000': Floating point division by zero
#tsp_f_changed2 := 1.2+3.6/0.0; //division zero #tsp_f_changed2 := 1.2+3.8/0.0; //division zero
tsp_f_changed2 := -tsp_f_changed1+2.0*1.5-1.3 tsp_f_changed2 := -tsp_f_changed1+ 2.0*1.5- 1.3
[LOGGING] [LOGGING]
Logfile := "floatOper.log" Logfile := "floatOper.log"
FileMask := LOG_ALL FileMask := LOG_ALL
......
...@@ -1237,6 +1237,10 @@ testcase tc_predef_int2char_bad2() runs on CT { ...@@ -1237,6 +1237,10 @@ testcase tc_predef_int2char_bad2() runs on CT {
setverdict(pass, "DTE catched") setverdict(pass, "DTE catched")
} }
} }
//===int2enum===
//see: enumOper
//==== int2float ===== //==== int2float =====
testcase tc_predef_int2float_good1() runs on CT { testcase tc_predef_int2float_good1() runs on CT {
var RoI vl_intlist := {1,-123,0,1,2,3,4,5,-600, 71250000000, 4294967296,9000000, 123000000000000000 } var RoI vl_intlist := {1,-123,0,1,2,3,4,5,-600, 71250000000, 4294967296,9000000, 123000000000000000 }
...@@ -3293,9 +3297,10 @@ testcase tc_predef_substring_octetstring6() runs on CT { ...@@ -3293,9 +3297,10 @@ testcase tc_predef_substring_octetstring6() runs on CT {
// const octetstring vl_bs := substr(vl_cs,1,4) // const octetstring vl_bs := substr(vl_cs,1,4)
// setverdict(fail); // setverdict(fail);
//} //}
//runtime error //runtime error
testcase tc_predef_substring_octetstring8() runs on CT { testcase tc_predef_substring_octetstring8() runs on CT {
var octetstring vl_cs := '00100110'O; var octetstring vl_cs := '01020304'O;
@try { @try {
var octetstring vl_bs := substr(vl_cs,1,4) var octetstring vl_bs := substr(vl_cs,1,4)
setverdict(fail,"DTE expected"); setverdict(fail,"DTE expected");
...@@ -3826,7 +3831,7 @@ control{ ...@@ -3826,7 +3831,7 @@ control{
execute(tc_predef_replace_bitstring_5()); execute(tc_predef_replace_bitstring_5());
execute(tc_predef_replace_bitstring_6()); execute(tc_predef_replace_bitstring_6());
execute(tc_predef_replace_bitstring_7()); execute(tc_predef_replace_bitstring_7());
// execute(tc_predef_replace_bitstring_8()); execute(tc_predef_replace_bitstring_8());
execute(tc_predef_replace_bitstring_9()); execute(tc_predef_replace_bitstring_9());
// execute(tc_predef_replace_bitstring_10()); // execute(tc_predef_replace_bitstring_10());
execute(tc_predef_replace_bitstring_11()); execute(tc_predef_replace_bitstring_11());
...@@ -3953,7 +3958,7 @@ control{ ...@@ -3953,7 +3958,7 @@ control{
execute(tc_predef_substring_octetstring4()); execute(tc_predef_substring_octetstring4());
execute(tc_predef_substring_octetstring5()); execute(tc_predef_substring_octetstring5());
execute(tc_predef_substring_octetstring6()); execute(tc_predef_substring_octetstring6());
// execute(tc_predef_substring_octetstring7()); //semantic error //execute(tc_predef_substring_octetstring7()); //semantic error
execute(tc_predef_substring_octetstring8()); execute(tc_predef_substring_octetstring8());
// execute(tc_predef_substring_octetstring9()); //semantic error // execute(tc_predef_substring_octetstring9()); //semantic error
execute(tc_predef_substring_octetstring10()); execute(tc_predef_substring_octetstring10());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment