Просмотр исходного кода

* Also catch javascript errors

Michaël Van Canneyt 5 месяцев назад
Родитель
Сommit
37b7f89a39
1 измененных файлов с 8 добавлено и 6 удалено
  1. 8 6
      packages/fpcunit/src/fpcunit.pas

+ 8 - 6
packages/fpcunit/src/fpcunit.pas

@@ -570,14 +570,16 @@ begin
   try
   try
     protect(ATestCase, Self);
     protect(ATestCase, Self);
   except
   except
-    on E: EIgnoredTest do
-      AddFailure(ATestCase, E, FIgnoredTests{, ExceptAddr});
-    on E: EAssertionFailedError do
-      AddFailure(ATestCase, E, FFailures{, ExceptAddr});
-    on E: Exception do
+    on EI: EIgnoredTest do
+      AddFailure(ATestCase, EI, FIgnoredTests{, ExceptAddr});
+    on EF: EAssertionFailedError do
+      AddFailure(ATestCase, EF, FFailures{, ExceptAddr});
+    on EE: Exception do
       begin
       begin
-        AddError(ATestCase, E{, ExceptAddr});
+        AddError(ATestCase, EE{, ExceptAddr});
       end;
       end;
+    on EJ: TJSError do
+      AddError(ATestCase, EJSException.Create(EJ){, ExceptAddr});
   end;
   end;
 end;
 end;