Related: tdf#84098 Unify tests

Shorten the tools module name; use TestUtil.AssertEqual where applicable;
remove unnecessary variables that only made noise and masked what was
actually asserted; add missing licence headers.

Change-Id: If891ed8ceb38fed18335aad061b2b09d341264f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108118
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

1 files changed, 15 insertions, 23 deletions

diff --git a/basic/qa/vba_tests/oct.vb b/basic/qa/vba_tests/oct.vb
index 8d08934b1942..d733bb763d8b 100644
--- a/basic/qa/vba_tests/oct.vb
+++ b/basic/qa/vba_tests/oct.vb
@@ -1,36 +1,28 @@
+'
+' 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_testOct
-doUnitTest = TestUtilModule.GetResult()
+    TestUtil.TestInit
+    verify_testOct
+    doUnitTest = TestUtil.GetResult()
 End Function
 
 Sub verify_testOct()
-
-    TestUtilModule.TestInit
-
-    Dim testName As String
-    Dim date1, date2
-    testName = "Test Oct function"
     On Error GoTo errorHandler
 
-    date2 = 4
-    date1 = Oct(4)
-    TestUtilModule.AssertTrue(date1 = date2, "the return Oct is: " & date1)
-
-    date2 = 10
-    date1 = Oct(8)
-    TestUtilModule.AssertTrue(date1 = date2, "the return Oct is: " & date1)
-
-    date2 = 713
-    date1 = Oct(459)
-    TestUtilModule.AssertTrue(date1 = date2, "the return Oct is: " & date1)
-
-    TestUtilModule.TestEnd
+    TestUtil.AssertEqual(Oct(4),   "4",   "Oct(4)")
+    TestUtil.AssertEqual(Oct(8),   "10",  "Oct(8)")
+    TestUtil.AssertEqual(Oct(459), "713", "Oct(459)")
 
     Exit Sub
 errorHandler:
-        TestUtilModule.AssertTrue(False, testName & ": hit error handler")
+    TestUtil.ReportErrorHandler("verify_testOct", Err, Error$, Erl)
 End Sub
-