diff options
| author | George Bateman <george.bateman16@gmail.com> | 2020-12-16 22:28:02 +0000 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-12-19 23:40:13 +0100 |
| commit | 73ba462935a217a2b2d5ad296679d54f42f4b1ba (patch) | |
| tree | 643bc69450bf6d1f6b2d1b7d3acad453dac65e99 /basic/qa/vba_tests/month.vb | |
| parent | 6c161bfe61679194d5f09d83c0bf8f780b508d1f (diff) | |
tdf#84098 kill copy+paste in VBA tests
Move repeated code into _test_asserts.vb
Change-Id: Idfe124a8dbab4925309fa5f1322e0cce5f097b7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107860
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'basic/qa/vba_tests/month.vb')
| -rw-r--r-- | basic/qa/vba_tests/month.vb | 57 |
1 files changed, 12 insertions, 45 deletions
diff --git a/basic/qa/vba_tests/month.vb b/basic/qa/vba_tests/month.vb index 98d614a571b2..faa074560b3d 100644 --- a/basic/qa/vba_tests/month.vb +++ b/basic/qa/vba_tests/month.vb @@ -1,26 +1,14 @@ Option VBASupport 1 Option Explicit -Dim passCount As Integer -Dim failCount As Integer -Dim result As String Function doUnitTest() As String -result = verify_testMonth() -If failCount <> 0 Or passCount = 0 Then - doUnitTest = result -Else - doUnitTest = "OK" -End If +verify_testMonth +doUnitTest = TestUtilModule.GetResult() End Function +Sub verify_testMonth() - -Function verify_testMonth() As String - - passCount = 0 - failCount = 0 - - result = "Test Results" & Chr$(10) & "============" & Chr$(10) + TestUtilModule.TestInit Dim testName As String Dim date1, date2 @@ -31,49 +19,28 @@ Function verify_testMonth() As String date2 = 4 date1 = Month(ldate) - TestLog_ASSERT date1 = date2, "the return Month is: " & date1 + TestUtilModule.AssertTrue(date1 = date2, "the return Month is: " & date1) date2 = 2 date1 = Month("01/02/2007") - TestLog_ASSERT date1 = date2, "the return Month is: " & date1 + TestUtilModule.AssertTrue(date1 = date2, "the return Month is: " & date1) date2 = 12 date1 = Month(1) - TestLog_ASSERT date1 = date2, "the return Month is: " & date1 + TestUtilModule.AssertTrue(date1 = date2, "the return Month is: " & date1) date2 = 2 date1 = Month(60) - TestLog_ASSERT date1 = date2, "the return Month is: " & date1 + TestUtilModule.AssertTrue(date1 = date2, "the return Month is: " & date1) date2 = 6 date1 = Month(2000) - TestLog_ASSERT date1 = date2, "the return Month is: " & date1 + TestUtilModule.AssertTrue(date1 = date2, "the return Month is: " & date1) + TestUtilModule.TestEnd - result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) & "Tests failed: " & failCount & Chr$(10) - verify_testMonth = result - - Exit Function + Exit Sub errorHandler: - TestLog_ASSERT (False), testName & ": 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 - + TestUtilModule.AssertTrue(False, testName & ": hit error handler") End Sub |