1 files changed, 19 insertions, 60 deletions
diff --git a/basic/qa/vba_tests/partition.vb b/basic/qa/vba_tests/partition.vb
index d134a4227fbd..a31b7a6c83f6 100644
--- a/basic/qa/vba_tests/partition.vb
+++ b/basic/qa/vba_tests/partition.vb
@@ -1,71 +1,30 @@
+'
+' 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
-Dim passCount As Integer
-Dim failCount As Integer
-Dim result As String
 
 Function doUnitTest() As String
-result = verify_testPartition()
-If failCount <> 0 Or passCount = 0 Then
-    doUnitTest = result
-Else
-    doUnitTest = "OK"
-End If
+    TestUtil.TestInit
+    verify_testPartition
+    doUnitTest = TestUtil.GetResult()
 End Function
 
-Function verify_testPartition() as String
-    passCount = 0
-    failCount = 0
-
-    result = "Test Results" & Chr$(10) & "============" & Chr$(10)
-
-
-    Dim testName As String
-    Dim retStr As String
-    testName = "Test Partition function"
+Sub verify_testPartition()
     On Error GoTo errorHandler
 
-    retStr = Partition(20, 0, 98, 5)
-    'MsgBox retStr
-    TestLog_ASSERT retStr = "20:24", "the number 20 occurs in the range:" & retStr
-
-    retStr = Partition(20, 0, 99, 1)
-    'MsgBox retStr
-    TestLog_ASSERT retStr = " 20: 20", "the number 20 occurs in the range:" & retStr
-
-    retStr = Partition(120, 0, 99, 5)
-    'MsgBox retStr
-    TestLog_ASSERT retStr = "100:   ", "the number 120 occurs in the range:" & retStr
+    TestUtil.AssertEqual(Partition(20, 0, 98, 5),  "20:24",   "Partition(20, 0, 98, 5)")
+    TestUtil.AssertEqual(Partition(20, 0, 99, 1),  " 20: 20", "Partition(20, 0, 99, 1)")
+    TestUtil.AssertEqual(Partition(120, 0, 99, 5), "100:   ", "Partition(120, 0, 99, 5)")
+    TestUtil.AssertEqual(Partition(-5, 0, 99, 5),  "   : -1", "Partition(-5, 0, 99, 5)")
+    TestUtil.AssertEqual(Partition(2, 0, 5, 2),    " 2: 3",   "Partition(2, 0, 5, 2)")
 
-     retStr = Partition(-5, 0, 99, 5)
-    'MsgBox retStr
-    TestLog_ASSERT retStr = "   : -1", "the number -5 occurs in the range:" & retStr
-
-     retStr = Partition(2, 0, 5, 2)
-    'MsgBox retStr
-    TestLog_ASSERT retStr = " 2: 3", "the number 2 occurs in the range:" & retStr
-    result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) & "Tests failed: " & failCount & Chr$(10)
-    verify_testPartition = result
-    Exit Function
+    Exit Sub
 errorHandler:
-    TestLog_ASSERT (false), "verify_testPartion failed, 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
-
+    TestUtil.ReportErrorHandler("verify_testPartition", Err, Error$, Erl)
 End Sub