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/isnumeric.vb | |
parent | 8beaafcaa27a66841a9d959eba125ec410d0392d (diff) |
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/isnumeric.vb')
-rw-r--r-- | basic/qa/vba_tests/isnumeric.vb | 58 |
1 files changed, 19 insertions, 39 deletions
diff --git a/basic/qa/vba_tests/isnumeric.vb b/basic/qa/vba_tests/isnumeric.vb index d2b6e2715182..ead7e83e1494 100644 --- a/basic/qa/vba_tests/isnumeric.vb +++ b/basic/qa/vba_tests/isnumeric.vb @@ -1,52 +1,32 @@ +' +' This file is part of the LibreOffice project. +' +' This Source Code Form is subject to the terms of the Mozilla Public +' License, v. 2.0. If a copy of the MPL was not distributed with this +' file, You can obtain one at http://mozilla.org/MPL/2.0/. +' + Option VBASupport 1 Option Explicit Function doUnitTest() As String -verify_testIsNumeric -doUnitTest = TestUtilModule.GetResult() + TestUtil.TestInit + verify_testIsNumeric + doUnitTest = TestUtil.GetResult() End Function Sub verify_testIsNumeric() - - TestUtilModule.TestInit - - Dim testName As String - Dim date1, date2 - testName = "Test IsNumeric function" On Error GoTo errorHandler - date2 = True - date1 = IsNumeric(123) - TestUtilModule.AssertTrue(date1 = date2, "the return IsNumeric is: " & date1) - - date2 = True - date1 = IsNumeric(-123) - TestUtilModule.AssertTrue(date1 = date2, "the return IsNumeric is: " & date1) - - date2 = True - date1 = IsNumeric(123.8) - TestUtilModule.AssertTrue(date1 = date2, "the return IsNumeric is: " & date1) - - date2 = False - date1 = IsNumeric("a") - TestUtilModule.AssertTrue(date1 = date2, "the return IsNumeric is: " & date1) - -rem date2 = True -rem date1 = IsNumeric(True) -rem TestUtilModule.AssertTrue(date1 = date2, "the return IsNumeric is: " & date1) - - date2 = True - date1 = IsNumeric("123") - TestUtilModule.AssertTrue(date1 = date2, "the return IsNumeric is: " & date1) - - date2 = True - date1 = IsNumeric("+123") - TestUtilModule.AssertTrue(date1 = date2, "the return IsNumeric is: " & date1) - - TestUtilModule.TestEnd + TestUtil.Assert(IsNumeric(123), "IsNumeric(123)") + TestUtil.Assert(IsNumeric(-123), "IsNumeric(-123)") + TestUtil.Assert(IsNumeric(123.8), "IsNumeric(123.8)") + TestUtil.Assert(Not IsNumeric("a"), "Not IsNumeric(""a"")") +rem TestUtil.Assert(IsNumeric(True), "IsNumeric(True)") + TestUtil.Assert(IsNumeric("123"), "IsNumeric(""123"")") + TestUtil.Assert(IsNumeric("+123"), "IsNumeric(""+123"")") Exit Sub errorHandler: - TestUtilModule.AssertTrue(False, testName & ": hit error handler") + TestUtil.ReportErrorHandler("verify_testIsNumeric", Err, Error$, Erl) End Sub - |