fix non regression tests in differential_equations module.

Change-Id: Ibc48c6a12aa2377446d05af8c3a121706c74bf64

diff --git a/scilab/modules/differential_equations/sci_gateway/cpp/sci_daskr.cpp b/scilab/modules/differential_equations/sci_gateway/cpp/sci_daskr.cpp
index c0d763f..a81720f 100644 (file)
--- a/scilab/modules/differential_equations/sci_gateway/cpp/sci_daskr.cpp
+++ b/scilab/modules/differential_equations/sci_gateway/cpp/sci_daskr.cpp
@@ -1108,10 +1108,12 @@ types::Function::ReturnValue sci_daskr(types::typed_list &in, int _iRetCount, ty
 
             if (bCatch)
             {
-                wchar_t szError[bsiz];
-                os_swprintf(szError, bsiz, _W("%s: An error occured in '%s' subroutine.\n").c_str(), "daskr", "ddaskr");
+                               char sError[bsiz];
+                               os_sprintf(sError, "%ls: An error occured in '%ls' subroutine.\n", L"daskr", L"ddaskr");
+                               wchar_t* szError = to_wide_string(sError);
                 os << szError;
                 throw ast::InternalError(os.str());
+                               FREE(szError);
             }
 
             return types::Function::Error;

diff --git a/scilab/modules/differential_equations/sci_gateway/cpp/sci_dasrt.cpp b/scilab/modules/differential_equations/sci_gateway/cpp/sci_dasrt.cpp
index d696a4c..2d6058f 100644 (file)
--- a/scilab/modules/differential_equations/sci_gateway/cpp/sci_dasrt.cpp
+++ b/scilab/modules/differential_equations/sci_gateway/cpp/sci_dasrt.cpp
@@ -786,10 +786,12 @@ types::Function::ReturnValue sci_dasrt(types::typed_list &in, int _iRetCount, ty
 
             if (bCatch)
             {
-                wchar_t szError[bsiz];
-                os_swprintf(szError, bsiz, _W("%s: An error occured in '%s' subroutine.\n").c_str(), "dasrt", "ddasrt");
+                               char sError[bsiz];
+                               os_sprintf(sError, "%ls: An error occured in '%ls' subroutine.\n", L"dasrt", L"ddasrt");
+                               wchar_t* szError = to_wide_string(sError);
                 os << szError;
                 throw ast::InternalError(os.str());
+                               FREE(szError);
             }
 
             return types::Function::Error;

diff --git a/scilab/modules/differential_equations/sci_gateway/cpp/sci_dassl.cpp b/scilab/modules/differential_equations/sci_gateway/cpp/sci_dassl.cpp
index e06787b..17b72c6 100644 (file)
--- a/scilab/modules/differential_equations/sci_gateway/cpp/sci_dassl.cpp
+++ b/scilab/modules/differential_equations/sci_gateway/cpp/sci_dassl.cpp
@@ -720,10 +720,12 @@ types::Function::ReturnValue sci_dassl(types::typed_list &in, int _iRetCount, ty
 
             if (bCatch)
             {
-                wchar_t szError[bsiz];
-                os_swprintf(szError, bsiz, _W("%s: An error occured in '%s' subroutine.\n").c_str(), "dassl", "dassl");
+                               char sError[bsiz];
+                               os_sprintf(sError, "%ls: An error occured in '%ls' subroutine.\n", L"dassl", L"dassl");
+                               wchar_t* szError = to_wide_string(sError);
                 os << szError;
                 throw ast::InternalError(os.str());
+                               FREE(szError);
             }
 
             return types::Function::Error;

diff --git a/scilab/modules/differential_equations/sci_gateway/cpp/sci_intg.cpp b/scilab/modules/differential_equations/sci_gateway/cpp/sci_intg.cpp
index 9d5e25c..a6e7be5 100644 (file)
--- a/scilab/modules/differential_equations/sci_gateway/cpp/sci_intg.cpp
+++ b/scilab/modules/differential_equations/sci_gateway/cpp/sci_intg.cpp
@@ -253,10 +253,12 @@ types::Function::ReturnValue sci_intg(types::typed_list &in, int _iRetCount, typ
 
     if (bCatch)
     {
-        wchar_t szError[bsiz];
-        os_swprintf(szError, bsiz, _W("%s: An error occured in '%s' subroutine.\n").c_str(), "intg", "dqags");
+               char sError[bsiz];
+               os_sprintf(sError, "%ls: An error occured in '%ls' subroutine.\n", L"intg", L"dqags");
+               wchar_t* szError = to_wide_string(sError);
         os << szError;
         throw ast::InternalError(os.str());
+               FREE(szError);
     }
 
     if (ier)

diff --git a/scilab/modules/differential_equations/sci_gateway/cpp/sci_ode.cpp b/scilab/modules/differential_equations/sci_gateway/cpp/sci_ode.cpp
index e91fbff..d7234c9 100644 (file)
--- a/scilab/modules/differential_equations/sci_gateway/cpp/sci_ode.cpp
+++ b/scilab/modules/differential_equations/sci_gateway/cpp/sci_ode.cpp
@@ -1140,10 +1140,12 @@ types::Function::ReturnValue sci_ode(types::typed_list &in, int _iRetCount, type
 
                 if (bCatch)
                 {
-                    wchar_t szError[bsiz];
-                    os_swprintf(szError, bsiz, _W("%s: An error occured in '%s' subroutine.\n").c_str(), "ode", strMeth.c_str());
+                                       char sError[bsiz];
+                                       os_sprintf(sError, "%ls: An error occured in '%s' subroutine.\n", L"ode", strMeth.c_str());
+                                       wchar_t* szError = to_wide_string(sError);
                     os << szError;
                     throw ast::InternalError(os.str());
+                                       FREE(szError);
                 }
 
                 return types::Function::Error;
@@ -1360,10 +1362,12 @@ types::Function::ReturnValue sci_ode(types::typed_list &in, int _iRetCount, type
 
                 if (bCatch)
                 {
-                    wchar_t szError[bsiz];
-                    os_swprintf(szError, bsiz, _W("%s: An error occured in '%s' subroutine.\n").c_str(), "ode", strMeth.c_str());
+                                       char sError[bsiz];
+                                       os_sprintf(sError, "%ls: An error occured in '%s' subroutine.\n", L"ode", strMeth.c_str());
+                                       wchar_t* szError = to_wide_string(sError);
                     os << szError;
                     throw ast::InternalError(os.str());
+                                       FREE(szError);
                 }
 
                 return types::Function::Error;

diff --git a/scilab/modules/differential_equations/tests/nonreg_tests/bug_12118.dia.ref b/scilab/modules/differential_equations/tests/nonreg_tests/bug_12118.dia.ref
index 0633898..dd29094 100644 (file)
--- a/scilab/modules/differential_equations/tests/nonreg_tests/bug_12118.dia.ref
+++ b/scilab/modules/differential_equations/tests/nonreg_tests/bug_12118.dia.ref
@@ -23,7 +23,7 @@ x0 = [1; 0];
 t0 = 0;
 t  = linspace(0, 10, 100);
 refMsg = [msprintf(_("%s: Wrong type for output argument #%d: Real matrix expected.\n"), "f", 1);
-          msprintf(_("%s: An error occured in ''%s'' subroutine."), "ode", "lsoda")];
+msprintf(_("%ls: An error occured in ''%s'' subroutine."), "ode", "lsoda")];
 assert_checkerror("y = ode(zeros(1, 1), t0, t, f);", refMsg);
 assert_checkerror("y = ode(zeros(1, 2), t0, t, f);", refMsg);
 assert_checkerror("y = ode(zeros(1, 3), t0, t, f);", refMsg);

diff --git a/scilab/modules/differential_equations/tests/nonreg_tests/bug_12118.tst b/scilab/modules/differential_equations/tests/nonreg_tests/bug_12118.tst
index c80be17..d32e835 100644 (file)
--- a/scilab/modules/differential_equations/tests/nonreg_tests/bug_12118.tst
+++ b/scilab/modules/differential_equations/tests/nonreg_tests/bug_12118.tst
@@ -26,7 +26,7 @@ t0 = 0;
 t  = linspace(0, 10, 100);
 
 refMsg = [msprintf(_("%s: Wrong type for output argument #%d: Real matrix expected.\n"), "f", 1);
-msprintf(_("%s: An error occured in ''%s'' subroutine."), "ode", "lsoda")];
+msprintf(_("%ls: An error occured in ''%s'' subroutine."), "ode", "lsoda")];
 assert_checkerror("y = ode(zeros(1, 1), t0, t, f);", refMsg);
 assert_checkerror("y = ode(zeros(1, 2), t0, t, f);", refMsg);
 assert_checkerror("y = ode(zeros(1, 3), t0, t, f);", refMsg);

diff --git a/scilab/modules/differential_equations/tests/nonreg_tests/bug_13121.dia.ref b/scilab/modules/differential_equations/tests/nonreg_tests/bug_13121.dia.ref
index 3856675..e17cc0e 100644 (file)
--- a/scilab/modules/differential_equations/tests/nonreg_tests/bug_13121.dia.ref
+++ b/scilab/modules/differential_equations/tests/nonreg_tests/bug_13121.dia.ref
@@ -65,6 +65,6 @@ function ydot=right(t,pl)
     //    end
 endfunction
 t=0:0.01:40;
-refMsg = [msprintf(_("Invalid index."));
-          msprintf(_("%s: An error occured in ''%s'' subroutine.\n"), "ode", "lsrgk")];
+refMsg = [msprintf(_("Invalid index.\n"));
+msprintf(_("%ls: An error occured in ''%s'' subroutine.\n"), "ode", "lsrgk")];
 assert_checkerror("res=ode(""rk"",[x0;y0;v0;teta0;],t0,t,right)", refMsg);

diff --git a/scilab/modules/differential_equations/tests/nonreg_tests/bug_13121.tst b/scilab/modules/differential_equations/tests/nonreg_tests/bug_13121.tst
index bb95026..6b5846e 100644 (file)
--- a/scilab/modules/differential_equations/tests/nonreg_tests/bug_13121.tst
+++ b/scilab/modules/differential_equations/tests/nonreg_tests/bug_13121.tst
@@ -74,6 +74,6 @@ endfunction
 
 t=0:0.01:40;
 
-refMsg = [msprintf(_("Invalid index."));
-msprintf(_("%s: An error occured in ''%s'' subroutine.\n"), "ode", "lsrgk")];
+refMsg = [msprintf(_("Invalid index.\n"));
+msprintf(_("%ls: An error occured in ''%s'' subroutine.\n"), "ode", "lsrgk")];
 assert_checkerror("res=ode(""rk"",[x0;y0;v0;teta0;],t0,t,right)", refMsg);

diff --git a/scilab/modules/differential_equations/tests/nonreg_tests/bug_13491.dia.ref b/scilab/modules/differential_equations/tests/nonreg_tests/bug_13491.dia.ref
index 481ebfb..9a25021 100644 (file)
--- a/scilab/modules/differential_equations/tests/nonreg_tests/bug_13491.dia.ref
+++ b/scilab/modules/differential_equations/tests/nonreg_tests/bug_13491.dia.ref
@@ -18,7 +18,7 @@ ieee(0);
 deff("y = f(x)", "y = sin(x) ./ x");
 // This function is going to be evaluated by intg at the midpoint of the interval [-1; 1], so it will produce a "Division by zero" error.
 refMsg = [msprintf(_("Division by zero...\n"));
-          msprintf(_("%s: An error occured in ''%s'' subroutine."), "intg", "dqags")];
+msprintf(_("%ls: An error occured in ''%ls'' subroutine."), "intg", "dqags")];
 assert_checkerror("intg(-1, 1, f)", refMsg);
 deff("y = g(x)", "y = b");
 // In any evaluation point, 'b' is unknown so the function will yield an error.

diff --git a/scilab/modules/differential_equations/tests/nonreg_tests/bug_13491.tst b/scilab/modules/differential_equations/tests/nonreg_tests/bug_13491.tst
index 396f393..2373ef4 100644 (file)
--- a/scilab/modules/differential_equations/tests/nonreg_tests/bug_13491.tst
+++ b/scilab/modules/differential_equations/tests/nonreg_tests/bug_13491.tst
@@ -18,7 +18,7 @@ ieee(0);
 deff("y = f(x)", "y = sin(x) ./ x");
 // This function is going to be evaluated by intg at the midpoint of the interval [-1; 1], so it will produce a "Division by zero" error.
 refMsg = [msprintf(_("Division by zero...\n"));
-msprintf(_("%s: An error occured in ''%s'' subroutine."), "intg", "dqags")];
+msprintf(_("%ls: An error occured in ''%ls'' subroutine."), "intg", "dqags")];
 assert_checkerror("intg(-1, 1, f)", refMsg);
 
 deff("y = g(x)", "y = b");

diff --git a/scilab/modules/differential_equations/tests/nonreg_tests/bug_13512.dia.ref b/scilab/modules/differential_equations/tests/nonreg_tests/bug_13512.dia.ref
index 23525b2..0d764be 100644 (file)
--- a/scilab/modules/differential_equations/tests/nonreg_tests/bug_13512.dia.ref
+++ b/scilab/modules/differential_equations/tests/nonreg_tests/bug_13512.dia.ref
@@ -24,22 +24,22 @@ t  = 1;
 // The evaluation function purposely lacks the output argument 'ires'
 deff("ydot = f1(t, y, ydot)", "ydot = y^2 - y*sin(t) + cos(t)")
 refMsg = [msprintf(_("%s: Wrong number of output argument(s): %d expected.\n"), "f1", 2);
-          msprintf(_("%s: An error occured in ''%s'' subroutine.\n"), "dassl", "dassl")];
+msprintf(_("%ls: An error occured in ''%ls'' subroutine.\n"), "dassl", "dassl")];
 assert_checkerror("y = dae(y0, t0, t, f1);", refMsg);
 // The evaluation function purposely lacks the input argument 'ydot'
 deff("[ydot,ires] = f2(t, y)", "ydot = y^2 - y*sin(t) + cos(t)");
 refMsg = [msprintf(_("Wrong number of input arguments."));
-          msprintf(_("%s: An error occured in ''%s'' subroutine.\n"), "dassl", "dassl")];
+msprintf(_("%ls: An error occured in ''%ls'' subroutine.\n"), "dassl", "dassl")];
 assert_checkerror("y = dae(y0, t0, t, f2);", refMsg);
 // ----------------------------------
 // Without initial yprime computation
 // The evaluation function purposely lacks the output argument 'ires'
 refMsg = [msprintf(_("%s: Wrong number of output argument(s): %d expected.\n"), "f1", 2);
-          msprintf(_("%s: An error occured in ''%s'' subroutine.\n"), "dassl", "dassl")];
+msprintf(_("%ls: An error occured in ''%ls'' subroutine.\n"), "dassl", "dassl")];
 assert_checkerror("y = dae([y0; 0], t0, t, f1);", refMsg);
 // The evaluation function purposely lacks the input argument 'ydot'
 refMsg = [msprintf(_("Wrong number of input arguments."));
-          msprintf(_("%s: An error occured in ''%s'' subroutine.\n"), "dassl", "dassl")];
+msprintf(_("%ls: An error occured in ''%ls'' subroutine.\n"), "dassl", "dassl")];
 assert_checkerror("y = dae([y0; 0], t0, t, f2);", refMsg);
 // ==================================================================
 // DASRT
@@ -48,21 +48,21 @@ deff("r = g(t, y)", "r = ones(y)");
 // With initial yprime computation
 // The evaluation function purposely lacks the output argument 'ires'
 refMsg = [msprintf(_("%s: Wrong number of output argument(s): %d expected.\n"), "f1", 2);
-          msprintf(_("%s: An error occured in ''%s'' subroutine.\n"), "dasrt", "ddasrt")];
+msprintf(_("%ls: An error occured in ''%ls'' subroutine.\n"), "dasrt", "ddasrt")];
 assert_checkerror("[y, r] = dae(""root"", y0, t0, t, f1, 1, g);", refMsg);
 // The evaluation function purposely lacks the input argument 'ydot'
 refMsg = [msprintf(_("Wrong number of input arguments."));
-          msprintf(_("%s: An error occured in ''%s'' subroutine.\n"), "dasrt", "ddasrt")];
+msprintf(_("%ls: An error occured in ''%ls'' subroutine.\n"), "dasrt", "ddasrt")];
 assert_checkerror("[y, r] = dae(""root"", y0, t0, t, f2, 1, g);", refMsg);
 // ----------------------------------
 // Without initial yprime computation
 // The evaluation function purposely lacks the output argument 'ires'
 refMsg = [msprintf(_("%s: Wrong number of output argument(s): %d expected.\n"), "f1", 2);
-          msprintf(_("%s: An error occured in ''%s'' subroutine.\n"), "dasrt", "ddasrt")];
+msprintf(_("%ls: An error occured in ''%ls'' subroutine.\n"), "dasrt", "ddasrt")];
 assert_checkerror("[y, r] = dae(""root"", [y0; 0], t0, t, f1, 1, g);", refMsg);
 // The evaluation function purposely lacks the input argument 'ydot'
 refMsg = [msprintf(_("Wrong number of input arguments."));
-          msprintf(_("%s: An error occured in ''%s'' subroutine.\n"), "dasrt", "ddasrt")];
+msprintf(_("%ls: An error occured in ''%ls'' subroutine.\n"), "dasrt", "ddasrt")];
 assert_checkerror("[y, r] = dae(""root"", [y0; 0], t0, t, f2, 1, g);", refMsg);
 // ==================================================================
 // DASKR
@@ -70,17 +70,17 @@ assert_checkerror("[y, r] = dae(""root"", [y0; 0], t0, t, f2, 1, g);", refMsg);
 // With initial yprime computation
 // The evaluation function purposely lacks the output argument 'ires'
 refMsg = [msprintf(_("%s: Wrong number of output argument(s): %d expected.\n"), "f1", 2);
-          msprintf(_("%s: An error occured in ''%s'' subroutine.\n"), "daskr", "ddaskr")];
+msprintf(_("%ls: An error occured in ''%ls'' subroutine.\n"), "daskr", "ddaskr")];
 assert_checkerror("[y, r] = dae(""root2"", y0, t0, t, f1, 1, g);", refMsg);
 // The evaluation function purposely lacks the input argument 'ydot'
 refMsg = [msprintf(_("Wrong number of input arguments."));
-          msprintf(_("%s: An error occured in ''%s'' subroutine.\n"), "daskr", "ddaskr")];
+msprintf(_("%ls: An error occured in ''%ls'' subroutine.\n"), "daskr", "ddaskr")];
 assert_checkerror("[y, r] = dae(""root2"", y0, t0, t, f2, 1, g);", refMsg);
 // ----------------------------------
 // Without initial yprime computation
 // The evaluation function purposely lacks the output argument 'ires'
 refMsg = [msprintf(_("%s: Wrong size for output argument #%d: A matrix of size %d expected.\n"), "g", 1, 1);
-         msprintf(_("%s: An error occured in ''%s'' subroutine.\n"), "daskr", "ddaskr")];
+msprintf(_("%ls: An error occured in ''%ls'' subroutine.\n"), "daskr", "ddaskr")];
 assert_checkerror("[y, r] = dae(""root2"", [y0; 0], t0, t, f1, 1, g);", refMsg);
 // The evaluation function purposely lacks the input argument 'ydot'
 assert_checkerror("[y, r] = dae(""root2"", [y0; 0], t0, t, f2, 1, g);", refMsg);

diff --git a/scilab/modules/differential_equations/tests/nonreg_tests/bug_13512.tst b/scilab/modules/differential_equations/tests/nonreg_tests/bug_13512.tst
index 7735242..ba422d3 100644 (file)
--- a/scilab/modules/differential_equations/tests/nonreg_tests/bug_13512.tst
+++ b/scilab/modules/differential_equations/tests/nonreg_tests/bug_13512.tst
@@ -29,7 +29,7 @@ t  = 1;
 deff("ydot = f1(t, y, ydot)", "ydot = y^2 - y*sin(t) + cos(t)")
 
 refMsg = [msprintf(_("%s: Wrong number of output argument(s): %d expected.\n"), "f1", 2);
-msprintf(_("%s: An error occured in ''%s'' subroutine.\n"), "dassl", "dassl")];
+msprintf(_("%ls: An error occured in ''%ls'' subroutine.\n"), "dassl", "dassl")];
 
 assert_checkerror("y = dae(y0, t0, t, f1);", refMsg);
 
@@ -37,7 +37,7 @@ assert_checkerror("y = dae(y0, t0, t, f1);", refMsg);
 deff("[ydot,ires] = f2(t, y)", "ydot = y^2 - y*sin(t) + cos(t)");
 
 refMsg = [msprintf(_("Wrong number of input arguments."));
-msprintf(_("%s: An error occured in ''%s'' subroutine.\n"), "dassl", "dassl")];
+msprintf(_("%ls: An error occured in ''%ls'' subroutine.\n"), "dassl", "dassl")];
 assert_checkerror("y = dae(y0, t0, t, f2);", refMsg);
 
 // ----------------------------------
@@ -45,12 +45,12 @@ assert_checkerror("y = dae(y0, t0, t, f2);", refMsg);
 
 // The evaluation function purposely lacks the output argument 'ires'
 refMsg = [msprintf(_("%s: Wrong number of output argument(s): %d expected.\n"), "f1", 2);
-msprintf(_("%s: An error occured in ''%s'' subroutine.\n"), "dassl", "dassl")];
+msprintf(_("%ls: An error occured in ''%ls'' subroutine.\n"), "dassl", "dassl")];
 assert_checkerror("y = dae([y0; 0], t0, t, f1);", refMsg);
 
 // The evaluation function purposely lacks the input argument 'ydot'
 refMsg = [msprintf(_("Wrong number of input arguments."));
-msprintf(_("%s: An error occured in ''%s'' subroutine.\n"), "dassl", "dassl")];
+msprintf(_("%ls: An error occured in ''%ls'' subroutine.\n"), "dassl", "dassl")];
 assert_checkerror("y = dae([y0; 0], t0, t, f2);", refMsg);
 
 
@@ -64,12 +64,12 @@ deff("r = g(t, y)", "r = ones(y)");
 
 // The evaluation function purposely lacks the output argument 'ires'
 refMsg = [msprintf(_("%s: Wrong number of output argument(s): %d expected.\n"), "f1", 2);
-msprintf(_("%s: An error occured in ''%s'' subroutine.\n"), "dasrt", "ddasrt")];
+msprintf(_("%ls: An error occured in ''%ls'' subroutine.\n"), "dasrt", "ddasrt")];
 assert_checkerror("[y, r] = dae(""root"", y0, t0, t, f1, 1, g);", refMsg);
 
 // The evaluation function purposely lacks the input argument 'ydot'
 refMsg = [msprintf(_("Wrong number of input arguments."));
-msprintf(_("%s: An error occured in ''%s'' subroutine.\n"), "dasrt", "ddasrt")];
+msprintf(_("%ls: An error occured in ''%ls'' subroutine.\n"), "dasrt", "ddasrt")];
 assert_checkerror("[y, r] = dae(""root"", y0, t0, t, f2, 1, g);", refMsg);
 
 // ----------------------------------
@@ -77,12 +77,12 @@ assert_checkerror("[y, r] = dae(""root"", y0, t0, t, f2, 1, g);", refMsg);
 
 // The evaluation function purposely lacks the output argument 'ires'
 refMsg = [msprintf(_("%s: Wrong number of output argument(s): %d expected.\n"), "f1", 2);
-msprintf(_("%s: An error occured in ''%s'' subroutine.\n"), "dasrt", "ddasrt")];
+msprintf(_("%ls: An error occured in ''%ls'' subroutine.\n"), "dasrt", "ddasrt")];
 assert_checkerror("[y, r] = dae(""root"", [y0; 0], t0, t, f1, 1, g);", refMsg);
 
 // The evaluation function purposely lacks the input argument 'ydot'
 refMsg = [msprintf(_("Wrong number of input arguments."));
-msprintf(_("%s: An error occured in ''%s'' subroutine.\n"), "dasrt", "ddasrt")];
+msprintf(_("%ls: An error occured in ''%ls'' subroutine.\n"), "dasrt", "ddasrt")];
 assert_checkerror("[y, r] = dae(""root"", [y0; 0], t0, t, f2, 1, g);", refMsg);
 
 
@@ -94,12 +94,12 @@ assert_checkerror("[y, r] = dae(""root"", [y0; 0], t0, t, f2, 1, g);", refMsg);
 
 // The evaluation function purposely lacks the output argument 'ires'
 refMsg = [msprintf(_("%s: Wrong number of output argument(s): %d expected.\n"), "f1", 2);
-msprintf(_("%s: An error occured in ''%s'' subroutine.\n"), "daskr", "ddaskr")];
+msprintf(_("%ls: An error occured in ''%ls'' subroutine.\n"), "daskr", "ddaskr")];
 assert_checkerror("[y, r] = dae(""root2"", y0, t0, t, f1, 1, g);", refMsg);
 
 // The evaluation function purposely lacks the input argument 'ydot'
 refMsg = [msprintf(_("Wrong number of input arguments."));
-msprintf(_("%s: An error occured in ''%s'' subroutine.\n"), "daskr", "ddaskr")];
+msprintf(_("%ls: An error occured in ''%ls'' subroutine.\n"), "daskr", "ddaskr")];
 assert_checkerror("[y, r] = dae(""root2"", y0, t0, t, f2, 1, g);", refMsg);
 
 // ----------------------------------
@@ -107,7 +107,7 @@ assert_checkerror("[y, r] = dae(""root2"", y0, t0, t, f2, 1, g);", refMsg);
 
 // The evaluation function purposely lacks the output argument 'ires'
 refMsg = [msprintf(_("%s: Wrong size for output argument #%d: A matrix of size %d expected.\n"), "g", 1, 1);
-msprintf(_("%s: An error occured in ''%s'' subroutine.\n"), "daskr", "ddaskr")];
+msprintf(_("%ls: An error occured in ''%ls'' subroutine.\n"), "daskr", "ddaskr")];
 assert_checkerror("[y, r] = dae(""root2"", [y0; 0], t0, t, f1, 1, g);", refMsg);
 
 // The evaluation function purposely lacks the input argument 'ydot'