diff --git a/Examples/test-suite/scilab/integers_runme.sci b/Examples/test-suite/scilab/integers_runme.sci index fc588b8bb..1a59578d8 100644 --- a/Examples/test-suite/scilab/integers_runme.sci +++ b/Examples/test-suite/scilab/integers_runme.sci @@ -1,29 +1,29 @@ exec("swigtest.start", -1); // Negative values -if signed_char_identity(-1) <> -1 then swigtesterror(); end -if signed_short_identity(-1) <> -1 then swigtesterror(); end -if signed_int_identity(-1) <> -1 then swigtesterror(); end -if signed_long_identity(-1) <> -1 then swigtesterror(); end +checkequal(signed_char_identity(-1), -1, "signed_char_identity(-1)"); +checkequal(signed_short_identity(-1), -1, "signed_short_identity(-1)"); +checkequal(signed_int_identity(-1), -1, "signed_int_identity(-1)"); +checkequal(signed_long_identity(-1), -1, "signed_long_identity(-1)"); // Overflow errors ierr = execstr('signed_char_identity(2^8)', 'errcatch'); -if ierr <> 999 then swigtesterror(); end +checkequal(ierr, 20007, 'signed_char_identity(2^8)'); ierr = execstr('signed_short_identity(2^16)', 'errcatch'); -if ierr <> 999 then swigtesterror(); end +checkequal(ierr, 20007, 'signed_short_identity(2^16)'); ierr = execstr('signed_int_identity(2^32)', 'errcatch'); -if ierr <> 999 then swigtesterror(); end +checkequal(ierr, 20007, 'signed_int_identity(2^32)'); ierr = execstr('signed_long_identity(2^64)', 'errcatch'); -if ierr <> 999 then swigtesterror(); end +checkequal(ierr, 20007, 'signed_long_identity(2^64)'); // Value errors ierr = execstr('signed_char_identity(100.2)', 'errcatch'); -if ierr <> 999 then swigtesterror(); end +checkequal(ierr, 20009, 'signed_char_identity(100.2)'); ierr = execstr('signed_short_identity(100.2)', 'errcatch'); -if ierr <> 999 then swigtesterror(); end +checkequal(ierr, 20009, 'signed_short_identity(100.2)'); ierr = execstr('signed_int_identity(100.2)', 'errcatch'); -if ierr <> 999 then swigtesterror(); end +checkequal(ierr, 20009, 'signed_int_identity(100.2)'); ierr = execstr('signed_long_identity(100.2)', 'errcatch'); -if ierr <> 999 then swigtesterror(); end +checkequal(ierr, 20009, 'signed_long_identity(100.2)'); exec("swigtest.quit", -1); diff --git a/Examples/test-suite/scilab/li_std_except_runme.sci b/Examples/test-suite/scilab/li_std_except_runme.sci index 149fa4c0a..21a2ce991 100644 --- a/Examples/test-suite/scilab/li_std_except_runme.sci +++ b/Examples/test-suite/scilab/li_std_except_runme.sci @@ -2,7 +2,7 @@ exec('swigtest.start', -1); function checkException(cmd, expected_error_msg) ierr = execstr(cmd, 'errcatch'); - checkequal(ierr, 999, cmd + ': ierr'); + checkequal(ierr, 20010, cmd + ': ierr'); checkequal(lasterror(), 'SWIG/Scilab: ' + expected_error_msg, cmd + ': msg'); endfunction diff --git a/Examples/test-suite/scilab/throw_exception_runme.sci b/Examples/test-suite/scilab/throw_exception_runme.sci index fee4eba2c..f82db036f 100644 --- a/Examples/test-suite/scilab/throw_exception_runme.sci +++ b/Examples/test-suite/scilab/throw_exception_runme.sci @@ -2,7 +2,7 @@ exec("swigtest.start", -1); function checkException(cmd, expected_error_msg) ierr = execstr(cmd, 'errcatch'); - checkequal(ierr, 999, cmd + ': ierr'); + checkequal(ierr, 20000, cmd + ': ierr'); checkequal(lasterror(), 'SWIG/Scilab: ' + expected_error_msg, cmd + ': msg'); endfunction