소스 검색

pastojs: fixed tests

git-svn-id: trunk@37088 -
Mattias Gaertner 8 년 전
부모
커밋
e54f02048f
1개의 변경된 파일7개의 추가작업 그리고 2개의 파일을 삭제
  1. 7 2
      packages/pastojs/tests/tcmodules.pas

+ 7 - 2
packages/pastojs/tests/tcmodules.pas

@@ -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;