1 files changed, 10 insertions, 43 deletions
diff --git a/basic/qa/vba_tests/len.vb b/basic/qa/vba_tests/len.vb
index d524d96b8af1..679ccc49cdbd 100644
--- a/basic/qa/vba_tests/len.vb
+++ b/basic/qa/vba_tests/len.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_testLen()
-If failCount <> 0 Or passCount = 0 Then
-    doUnitTest = result
-Else
-    doUnitTest = "OK"
-End If
+verify_testLen
+doUnitTest = TestUtilModule.GetResult()
 End Function
 
+Sub verify_testLen()
 
-
-Function verify_testLen() As String
-
-    passCount = 0
-    failCount = 0
-
-    result = "Test Results" & Chr$(10) & "============" & Chr$(10)
+    TestUtilModule.TestInit
 
     Dim testName As String
     Dim date1, date2
@@ -29,41 +17,20 @@ Function verify_testLen() As String
 
     date2 = 8
     date1 = Len("sometext")
-    TestLog_ASSERT date1 = date2, "the return Len is: " & date1
+    TestUtilModule.AssertTrue(date1 = date2, "the return Len is: " & date1)
 
     date2 = 9
     date1 = Len("some text")
-    TestLog_ASSERT date1 = date2, "the return Len is: " & date1
+    TestUtilModule.AssertTrue(date1 = date2, "the return Len is: " & date1)
 
     date2 = 0
     date1 = Len("")
-    TestLog_ASSERT date1 = date2, "the return Len is: " & date1
+    TestUtilModule.AssertTrue(date1 = date2, "the return Len is: " & date1)
 
+    TestUtilModule.TestEnd
 
-    result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) & "Tests failed: " & failCount & Chr$(10)
-    verify_testLen = result
-
-    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