1 files changed, 8 insertions, 38 deletions
diff --git a/basic/qa/vba_tests/datevalue.vb b/basic/qa/vba_tests/datevalue.vb
index 6ece72a6d055..116b3e5c7c69 100644
--- a/basic/qa/vba_tests/datevalue.vb
+++ b/basic/qa/vba_tests/datevalue.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_testDateValue()
-If failCount <> 0 Or passCount = 0 Then
-    doUnitTest = result
-Else
-    doUnitTest = "OK"
-End If
+verify_testDateValue
+doUnitTest = TestUtilModule.GetResult()
 End Function
 
-
-
 Function verify_testDateValue() as String
 
-    passCount = 0
-    failCount = 0
-
-    result = "Test Results" & Chr$(10) & "============" & Chr$(10)
+    TestUtilModule.TestInit
 
     Dim testName As String
     Dim date1, date2 As Date
@@ -30,34 +18,16 @@ Function verify_testDateValue() as String
     On Error GoTo errorHandler
 
     date1 = DateValue("February 12, 1969") '2/12/1969
-    TestLog_ASSERT date1 = date2, "the return date is: " & date1
+    TestUtilModule.AssertTrue(date1 = date2, "the return date is: " & date1)
 
     date2 = 39468
     date1 = DateValue("21/01/2008") '1/21/2008
-    TestLog_ASSERT date1 = date2, "the return date is: " & date1
-    result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) & "Tests failed: " & failCount & Chr$(10)
-    verify_testDateValue = result
+    TestUtilModule.AssertTrue(date1 = date2, "the return date is: " & date1)
+    TestUtilModule.TestEnd
 
     Exit Function
 errorHandler:
-        TestLog_ASSERT (False),  testName & ": hit error handler"
+    TestUtilModule.AssertTrue(False, "ERROR", "#" & Str(Err.Number) &" at line"& Str(Erl) &" - "& Error$)
+    TestUtilModule.TestEnd
 End Sub
 
-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
-
-End Sub