1 files changed, 14 insertions, 19 deletions
diff --git a/basic/qa/vba_tests/isnull.vb b/basic/qa/vba_tests/isnull.vb
index 1819f3c72ef3..7550238895ff 100644
--- a/basic/qa/vba_tests/isnull.vb
+++ b/basic/qa/vba_tests/isnull.vb
@@ -1,32 +1,27 @@
+'
+' 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_testIsNull
-doUnitTest = TestUtilModule.GetResult()
+    TestUtil.TestInit
+    verify_testIsNull
+    doUnitTest = TestUtil.GetResult()
 End Function
 
 Sub verify_testIsNull()
-
-    TestUtilModule.TestInit
-
-    Dim testName As String
-    Dim date1, date2
-    testName = "Test IsNull function"
     On Error GoTo errorHandler
 
-    date2 = True
-    date1 = IsNull(Null)
-    TestUtilModule.AssertTrue(date1 = date2, "the return IsNull is: " & date1)
-
-    date2 = False
-    date1 = IsNull("")
-    TestUtilModule.AssertTrue(date1 = date2, "the return IsNull is: " & date1)
-
-    TestUtilModule.TestEnd
+    TestUtil.Assert(IsNull(Null),   "IsNull(Null)")
+    TestUtil.Assert(Not IsNull(""), "Not IsNull("""")")
 
     Exit Sub
 errorHandler:
-        TestUtilModule.AssertTrue(False, testName & ": hit error handler")
+    TestUtil.ReportErrorHandler("verify_testIsNull", Err, Error$, Erl)
 End Sub
-