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, 23 insertions, 41 deletions

diff --git a/basic/qa/vba_tests/array.vb b/basic/qa/vba_tests/array.vb
index 0390e77c37ec..608974462b2c 100644
--- a/basic/qa/vba_tests/array.vb
+++ b/basic/qa/vba_tests/array.vb
@@ -1,3 +1,11 @@
+'
+' 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/.
+'
+
 Rem Attribute VBA_ModuleType=VBAModule
 Option VBASupport 1
 Option Explicit
@@ -8,59 +16,33 @@ Type MyType
 End Type
 
 Function doUnitTest() As String
-verify_testARRAY
-doUnitTest = TestUtilModule.GetResult()
+    TestUtil.TestInit
+    verify_testARRAY
+    doUnitTest = TestUtil.GetResult()
 End Function
 
 Sub verify_testARRAY()
-
-    TestUtilModule.TestInit
-
-    Dim testName As String
-    Dim a, b, C As Variant
-    a = Array(10, 20, 30)
-    testName = "Test ARRAY function"
     On Error GoTo errorHandler
 
-    b = 10
-    C = a(0)
-    TestUtilModule.AssertTrue(b = C, "the return ARRAY is: " & C)
-
-    b = 20
-    C = a(1)
-    TestUtilModule.AssertTrue(b = C, "the return ARRAY is: " & C)
-
-    b = 30
-    C = a(2)
-    TestUtilModule.AssertTrue(b = C, "the return ARRAY is: " & C)
+    Dim a
+    a = Array(10, 20, 30)
+    TestUtil.AssertEqual(a(0), 10, "a(0)")
+    TestUtil.AssertEqual(a(1), 20, "a(1)")
+    TestUtil.AssertEqual(a(2), 30, "a(2)")
 
-    Dim MyWeek, MyDay
+    Dim MyWeek
     MyWeek = Array("Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun")
+    TestUtil.AssertEqual(MyWeek(1), "Tue", "MyWeek(1)")
+    TestUtil.AssertEqual(MyWeek(3), "Thu", "MyWeek(3)")
 
-    b = "Tue"
-    MyDay = MyWeek(1)   ' MyDay contains "Tue".
-    TestUtilModule.AssertTrue(b = MyDay, "the return ARRAY is: " & MyDay)
-
-    b = "Thu"
-        MyDay = MyWeek(3)   ' MyDay contains "Thu".
-    TestUtilModule.AssertTrue(b = MyDay, "the return ARRAY is: " & MyDay)
-
-Dim mt As MyType
+    Dim mt As MyType
     mt.ax(0) = 42
     mt.ax(1) = 43
     mt.bx = 3.14
-     b = 43
-        C = mt.ax(1)
-    TestUtilModule.AssertTrue(b = C, "the return ARRAY is: " & C)
-
-    b = 3.14
-    C = mt.bx
-    TestUtilModule.AssertTrue(b = C, "the return ARRAY is: " & C)
-
-    TestUtilModule.TestEnd
+    TestUtil.AssertEqual(mt.ax(1), 43, "mt.ax(1)")
+    TestUtil.AssertEqual(mt.bx,  3.14, "mt.bx")
 
     Exit Sub
 errorHandler:
-        TestUtilModule.AssertTrue(False, testName & ": hit error handler")
+    TestUtil.ReportErrorHandler("verify_testARRAY", Err, Error$, Erl)
 End Sub
-