diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-12-21 09:00:03 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-12-22 06:18:50 +0100 |
| commit | 66b135fa80452144baf57e91a6814b172f8174e2 (patch) | |
| tree | d69170bf4a81c7736ea5a57c00dca55c5a7fb834 /basic/qa/vba_tests/Err.Raise.vb | |
| parent | Retire the bit-rotting LibreOfficeLight iOS app (diff) | |
| download | core-66b135fa80452144baf57e91a6814b172f8174e2.tar.gz core-66b135fa80452144baf57e91a6814b172f8174e2.zip | |
Related: tdf#84098 Unify tests
Shorten the tools module name; use TestUtil.AssertEqual where applicable;
remove unnecessary variables that only made noise and masked what was
actually asserted; add missing licence headers.
Change-Id: If891ed8ceb38fed18335aad061b2b09d341264f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108118
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'basic/qa/vba_tests/Err.Raise.vb')
| -rw-r--r-- | basic/qa/vba_tests/Err.Raise.vb | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/basic/qa/vba_tests/Err.Raise.vb b/basic/qa/vba_tests/Err.Raise.vb index e04d2cfd5916..914906c342c0 100644 --- a/basic/qa/vba_tests/Err.Raise.vb +++ b/basic/qa/vba_tests/Err.Raise.vb @@ -14,15 +14,14 @@ Function doUnitTest() Const MIN_ERR = &hFFFFFFFF : Const MAX_ERR = 2^31-1 ''' Raise one-to-many User-Defined Errors as signed Int32 ''' - TestUtilModule.TestInit() + TestUtil.TestInit() ' test_Description | Err # | Err_Source | Err_Description Call TestErrRaise("MAXimum error value", MAX_ERR, "doUnitTest.vb", "Custom Error Maximum value") Call TestErrRaise("Positive custom error", 1789, "" , "User-Defined Error Number") Call TestErrRaise("Negative custom error", -1793, "doUnitTest.vb", "Negative User-Defined Error Number") Call TestErrRaise("MINimum error value", MIN_ERR, "" , "Custom Error Minimum value") - TestUtilModule.TestEnd() - doUnitTest = TestUtilModule.GetResult() + doUnitTest = TestUtil.GetResult() End Function Sub TestErrRaise(TestName As String, CurErrNo As Long, CurErrSource As String, CurErrDescription As String) @@ -32,23 +31,23 @@ try: On Error Goto catch Dim errorHandled As Integer Err.Raise(CurErrNo, CurErrSource, CurErrDescription, "", "") - TestUtilModule.AssertTrue(errorHandled = 1, TestName, "error handler did not execute!") - TestUtilModule.AssertTrue(Erl = 0, TestName, "Erl = " & Erl) - TestUtilModule.AssertTrue(Err = 0, TestName, "Err = " & Err) - TestUtilModule.AssertTrue(Error = "", TestName, "Error = " & Error) - TestUtilModule.AssertTrue(Err.Description = "", "Err.Description reset", "Err.Description = "& Err.Description) - TestUtilModule.AssertTrue(Err.Number = 0, "Err.Number reset", "Err.Number = " & Err.Number) - TestUtilModule.AssertTrue(Err.Source = "", "Err.Source reset", "Err.Source = " & Err.Source) + TestUtil.Assert(errorHandled = 1, TestName, "error handler did not execute!") + TestUtil.Assert(Erl = 0, TestName, "Erl = " & Erl) + TestUtil.Assert(Err = 0, TestName, "Err = " & Err) + TestUtil.Assert(Error = "", TestName, "Error = " & Error) + TestUtil.Assert(Err.Description = "", "Err.Description reset", "Err.Description = "& Err.Description) + TestUtil.Assert(Err.Number = 0, "Err.Number reset", "Err.Number = " & Err.Number) + TestUtil.Assert(Err.Source = "", "Err.Source reset", "Err.Source = " & Err.Source) Exit Sub catch: - TestUtilModule.AssertTrue(Err.Number = CurErrNo, "Err.Number failure", "Err.Number = " & Err.Number) - TestUtilModule.AssertTrue(Err.Source = CurErrSource, "Err.Source failure", "Err.Source = " & Err.Source) - TestUtilModule.AssertTrue(Err.Description = CurErrDescription, "Err.Description failure", "Err.Description = " & Err.Description) + TestUtil.Assert(Err.Number = CurErrNo, "Err.Number failure", "Err.Number = " & Err.Number) + TestUtil.Assert(Err.Source = CurErrSource, "Err.Source failure", "Err.Source = " & Err.Source) + TestUtil.Assert(Err.Description = CurErrDescription, "Err.Description failure", "Err.Description = " & Err.Description) - TestUtilModule.AssertTrue(Erl = 33, "line# failure", "Erl = " & Erl ' WATCH OUT for HARDCODED LINE # HERE !) - TestUtilModule.AssertTrue(Err = CurErrNo, "Err# failure", "Err = " & Err) - TestUtilModule.AssertTrue(Error = CurErrDescription, "Error description failure", "Error$ = " & Error$) + TestUtil.Assert(Erl = 32, "line# failure", "Erl = " & Erl ' WATCH OUT for HARDCODED LINE # HERE !) + TestUtil.Assert(Err = CurErrNo, "Err# failure", "Err = " & Err) + TestUtil.Assert(Error = CurErrDescription, "Error description failure", "Error$ = " & Error$) errorHandled = 1 Resume Next ' Err object properties reset from here … |