paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-12-08 14:17:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

pastojs: fixed tests

Browse Source 
git-svn-id: trunk@37088 -
This commit is contained in:
Mattias Gaertner 2017-08-31 13:18:04 +00:00
parent b5332501d7
commit e54f02048f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/pastojs/tests/tcmodules.pas
View File

@ -1251,9 +1251,11 @@ end;
function TCustomTestModule.IsErrorExpected(E: Exception): boolean; function TCustomTestModule.IsErrorExpected(E: Exception): boolean;
var var
MsgNumber: Integer; MsgNumber: Integer;
Msg: String;
begin begin
Result:=false; Result:=false;
if (ExpectedErrorClass=nil) or (ExpectedErrorClass<>E.ClassType) then exit; if (ExpectedErrorClass=nil) or (ExpectedErrorClass<>E.ClassType) then exit;
Msg:=E.Message;
if E is EPas2JS then if E is EPas2JS then
MsgNumber:=EPas2JS(E).MsgNumber MsgNumber:=EPas2JS(E).MsgNumber
else if E is EPasResolve then else if E is EPasResolve then
@ -1261,10 +1263,13 @@ begin
else if E is EParserError then else if E is EParserError then
MsgNumber:=Parser.LastMsgNumber MsgNumber:=Parser.LastMsgNumber
else if E is EScannerError then else if E is EScannerError then
MsgNumber:=Scanner.LastMsgNumber begin
MsgNumber:=Scanner.LastMsgNumber;
Msg:=Scanner.LastMsg;
end
else else
MsgNumber:=0; MsgNumber:=0;
Result:=(MsgNumber=ExpectedErrorNumber) and (E.Message=ExpectedErrorMsg); Result:=(MsgNumber=ExpectedErrorNumber) and (Msg=ExpectedErrorMsg);
if Result then if Result then
SkipTests:=true; SkipTests:=true;
end; end;