tdf#84098 kill copy+paste in VBA tests

Move repeated code into _test_asserts.vb

Change-Id: Idfe124a8dbab4925309fa5f1322e0cce5f097b7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107860
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

1 files changed, 14 insertions, 46 deletions

diff --git a/basic/qa/vba_tests/isnumeric.vb b/basic/qa/vba_tests/isnumeric.vb
index 511a51bd9106..d2b6e2715182 100644
--- a/basic/qa/vba_tests/isnumeric.vb
+++ b/basic/qa/vba_tests/isnumeric.vb
@@ -1,26 +1,14 @@
 Option VBASupport 1
 Option Explicit
-Dim passCount As Integer
-Dim failCount As Integer
-Dim result As String
 
 Function doUnitTest() As String
-result = verify_testIsNumeric()
-If failCount <> 0 Or passCount = 0 Then
-    doUnitTest = result
-Else
-    doUnitTest = "OK"
-End If
+verify_testIsNumeric
+doUnitTest = TestUtilModule.GetResult()
 End Function
 
+Sub verify_testIsNumeric()
 
-
-Function verify_testIsNumeric() As String
-
-    passCount = 0
-    failCount = 0
-
-    result = "Test Results" & Chr$(10) & "============" & Chr$(10)
+    TestUtilModule.TestInit
 
     Dim testName As String
     Dim date1, date2
@@ -29,56 +17,36 @@ Function verify_testIsNumeric() As String
 
     date2 = True
     date1 = IsNumeric(123)
-    TestLog_ASSERT date1 = date2, "the return IsNumeric is: " & date1
+    TestUtilModule.AssertTrue(date1 = date2, "the return IsNumeric is: " & date1)
 
     date2 = True
     date1 = IsNumeric(-123)
-    TestLog_ASSERT date1 = date2, "the return IsNumeric is: " & date1
+    TestUtilModule.AssertTrue(date1 = date2, "the return IsNumeric is: " & date1)
 
     date2 = True
     date1 = IsNumeric(123.8)
-    TestLog_ASSERT date1 = date2, "the return IsNumeric is: " & date1
+    TestUtilModule.AssertTrue(date1 = date2, "the return IsNumeric is: " & date1)
 
     date2 = False
     date1 = IsNumeric("a")
-    TestLog_ASSERT date1 = date2, "the return IsNumeric is: " & date1
+    TestUtilModule.AssertTrue(date1 = date2, "the return IsNumeric is: " & date1)
 
 rem    date2 = True
 rem    date1 = IsNumeric(True)
-rem    TestLog_ASSERT date1 = date2, "the return IsNumeric is: " & date1
+rem    TestUtilModule.AssertTrue(date1 = date2, "the return IsNumeric is: " & date1)
 
     date2 = True
     date1 = IsNumeric("123")
-    TestLog_ASSERT date1 = date2, "the return IsNumeric is: " & date1
+    TestUtilModule.AssertTrue(date1 = date2, "the return IsNumeric is: " & date1)
 
     date2 = True
     date1 = IsNumeric("+123")
-    TestLog_ASSERT date1 = date2, "the return IsNumeric is: " & date1
+    TestUtilModule.AssertTrue(date1 = date2, "the return IsNumeric is: " & date1)
 
-    result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) & "Tests failed: " & failCount & Chr$(10)
-    verify_testIsNumeric = result
+    TestUtilModule.TestEnd
 
-    Exit Function
+    Exit Sub
 errorHandler:
-        TestLog_ASSERT (False), testName & ": hit error handler"
-End Function
-
-Sub TestLog_ASSERT(assertion As Boolean, Optional testId As String, Optional testComment As String)
-
-    If assertion = True Then
-        passCount = passCount + 1
-    Else
-        Dim testMsg As String
-        If Not IsMissing(testId) Then
-            testMsg = testMsg + " : " + testId
-        End If
-        If Not IsMissing(testComment) And Not (testComment = "") Then
-            testMsg = testMsg + " (" + testComment + ")"
-        End If
-
-        result = result & Chr$(10) & " Failed: " & testMsg
-        failCount = failCount + 1
-    End If
-
+        TestUtilModule.AssertTrue(False, testName & ": hit error handler")
 End Sub