[[ Tests ]] Centralise 'errorDialog' handling

livecodeali · livecodeali · commit 56d8c9bf0202 · 2017-05-29T10:27:38.000+01:00
diff --git a/docs/testing.md b/docs/testing.md
@@ -71,7 +71,7 @@ Before running each test command, the test framework inserts a test library stac
 	- `pTarget` is the object to which `pHandlerName` should be dispatched.
 	- `pTimeOut` is the amount of milliseconds to continue testing the result of the handler.
 	- `pParamsArray` is an array of parameters, keyed by the 1-based index of the required parameter to be passed to the handler.
-
+* `TestAssertErrorDialog pDescription, pErrorCode`: Assert that this test triggers an errorDialog message with the given error.
 Tests can have additional setup requirements before running, for example loading custom libraries. If the script test contains a handler called `TestSetup`, this will be run prior to running each test command. For example:
 ````
 on TestSetup
diff --git a/tests/_testlib.livecodescript b/tests/_testlib.livecodescript
@@ -259,13 +259,21 @@ on TestAssertDoesNotThrow pDescription, pHandler, pTarget, pParam
   TestAssert pDescription, tError is empty 
 end TestAssertDoesNotThrow
 
+local sError
 on ErrorDialog pError
-   TestAssert "test runs without error - " && line 1 of pError \
-      , false
-   TestDiagnostic pError
-   quit 1
+	put pError into sError
 end ErrorDialog
 
+on TestAssertErrorDialog pDescription, pErrorCode
+	wait for messages
+	TestAssert pDescription, __TestErrorMatches(sError, pErrorCode)
+	put empty into sError
+end TestAssertErrorDialog
+
+function TestGetUncaughtErrorDialog
+	return sError
+end TestGetUncaughtErrorDialog
+
 function TestGetEngineRepositoryPath
   set the itemdelimiter to "/"
   return item 1 to -3 of the filename of me
diff --git a/tests/_testrunner.livecodescript b/tests/_testrunner.livecodescript
@@ -185,6 +185,14 @@ private command invokeTest pInfo
 
    -- Do common cleanup tasks
    dispatch "TestTearDown" to tStackName
+   
+   -- Check for uncaught errors
+   local tError
+   put TestGetUncaughtErrorDialog() into tError
+   if tError is not empty then
+      TestAssert "uncaught error dialog", line 1 of tError
+      TestDiagnostic tError
+   end if
 end invokeTest
 
 -- Add the unit test library stack and the input library to the backscripts
diff --git a/tests/lcs/core/engine/widget.livecodescript b/tests/lcs/core/engine/widget.livecodescript
@@ -48,21 +48,16 @@ end TestWidgetBindErrorsDontEscape
 
 //////////
 
-global gLastSentWidgetError
-
 private command _DoTestWidgetScriptObjectAccess pMode
    set the testMode of widget "Test" to pMode
 
    export widget "Test" to array tVar
 
-   put empty into gLastSentWidgetError
-   wait for messages
-
-   TestAssert "no script access allowed for" && pMode, gLastSentWidgetError contains "script access not allowed"
+   TestAssertErrorDialog "no script access allowed for" && pMode, \ 
+       "EE_EXTENSION_ERROR_DOMAIN"
 end _DoTestWidgetScriptObjectAccess
 
 on TestWidgetScriptObjectAccess
-   set the lockErrorDialogs to true
    create stack "WidgetScriptAccessTest"
    set the defaultStack to "WidgetScriptAccessTest"
 
@@ -75,9 +70,3 @@ on TestWidgetScriptObjectAccess
 
    delete stack "WidgetScriptAccessTest"
 end TestWidgetScriptObjectAccess
-
-//////////
-
-on errorDialog pError
-   put pError into gLastSentWidgetError
-end errorDialog
diff --git a/tests/lcs/core/interface/image-undo.livecodescript b/tests/lcs/core/interface/image-undo.livecodescript
@@ -76,13 +76,6 @@ on TestRotateImageWorks
     TestAssert "check if undo worked", the prop of this card is not empty
 end TestRotateImageWorks
 
-global gLastSentImageError
-
-on errorDialog pError
-   put pError into gLastSentImageError
-end errorDialog
-
-
 on TestSetTextLockThrows
     create stack
     set the defaultStack to the short name of it
