1 files changed, 21 insertions, 48 deletions
diff --git a/basic/qa/vba_tests/datepart.vb b/basic/qa/vba_tests/datepart.vb
index 4872487640da..28989c27abbc 100644
--- a/basic/qa/vba_tests/datepart.vb
+++ b/basic/qa/vba_tests/datepart.vb
@@ -1,61 +1,34 @@
+'
+' 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_testDatePart
-doUnitTest = TestUtilModule.GetResult()
+    TestUtil.TestInit
+    verify_testDatePart
+    doUnitTest = TestUtil.GetResult()
 End Function
 
 Sub verify_testDatePart()
-
-    TestUtilModule.TestInit
-
-    Dim testName As String
-    Dim date1   'variables for test
-    Dim date2
-    testName = "Test DatePart function"
     On Error GoTo errorHandler
 
-    date2 = 1969
-    date1 = DatePart("yyyy", "1969-02-12")
-    TestUtilModule.AssertTrue(date1 = date2, "the return DatePart is: " & date1)
-
-    date2 = 1
-    date1 = DatePart("q", "1969-02-12")
-    TestUtilModule.AssertTrue(date1 = date2, "the return DatePart is: " & date1)
-
-    date2 = 43
-    date1 = DatePart("y", "1969-02-12")
-    TestUtilModule.AssertTrue(date1 = date2, "the return DatePart is: " & date1)
-
-    date2 = 12
-    date1 = DatePart("d", "1969-02-12")
-    TestUtilModule.AssertTrue(date1 = date2, "the return DatePart is: " & date1)
-
-    date2 = 4
-    date1 = DatePart("w", "1969-02-12")
-    TestUtilModule.AssertTrue(date1 = date2, "the return DatePart is: " & date1)
-
-    date2 = 7
-    date1 = DatePart("ww", "1969-02-12")
-    TestUtilModule.AssertTrue(date1 = date2, "the return DatePart is: " & date1)
-
-    date2 = 16
-    date1 = DatePart("h", "1969-02-12 16:32:00")
-    TestUtilModule.AssertTrue(date1 = date2, "the return DatePart is: " & date1)
-
-    date2 = 32
-    date1 = DatePart("n", "1969-02-12 16:32:00")
-    TestUtilModule.AssertTrue(date1 = date2, "the return DatePart is: " & date1)
-
-    date2 = 0
-    date1 = DatePart("s", "1969-02-12 16:32:00")
-    TestUtilModule.AssertTrue(date1 = date2, "the return DatePart is: " & date1)
-
-    TestUtilModule.TestEnd
+    TestUtil.AssertEqual(DatePart("yyyy", "1969-02-12"),     1969, "DatePart(""yyyy"", ""1969-02-12"")")
+    TestUtil.AssertEqual(DatePart("q", "1969-02-12"),           1, "DatePart(""q"", ""1969-02-12"")")
+    TestUtil.AssertEqual(DatePart("y", "1969-02-12"),          43, "DatePart(""y"", ""1969-02-12"")")
+    TestUtil.AssertEqual(DatePart("d", "1969-02-12"),          12, "DatePart(""d"", ""1969-02-12"")")
+    TestUtil.AssertEqual(DatePart("w", "1969-02-12"),           4, "DatePart(""w"", ""1969-02-12"")")
+    TestUtil.AssertEqual(DatePart("ww", "1969-02-12"),          7, "DatePart(""ww"", ""1969-02-12"")")
+    TestUtil.AssertEqual(DatePart("h", "1969-02-12 16:32:00"), 16, "DatePart(""h"", ""1969-02-12 16:32:00"")")
+    TestUtil.AssertEqual(DatePart("n", "1969-02-12 16:32:00"), 32, "DatePart(""n"", ""1969-02-12 16:32:00"")")
+    TestUtil.AssertEqual(DatePart("s", "1969-02-12 16:32:00"),  0, "DatePart(""s"", ""1969-02-12 16:32:00"")")
 
     Exit Sub
 errorHandler:
-        TestUtilModule.AssertTrue(False, testName & ": hit error handler")
+    TestUtil.ReportErrorHandler("verify_testDatePart", Err, Error$, Erl)
 End Sub
-