diff options
Diffstat (limited to 'basic/qa/vba_tests/hour.vb')
-rw-r--r-- | basic/qa/vba_tests/hour.vb | 52 |
1 files changed, 10 insertions, 42 deletions
diff --git a/basic/qa/vba_tests/hour.vb b/basic/qa/vba_tests/hour.vb index 9236463f42e8..e0de888e8f2c 100644 --- a/basic/qa/vba_tests/hour.vb +++ b/basic/qa/vba_tests/hour.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_testHour() -If failCount <> 0 Or passCount = 0 Then - doUnitTest = result -Else - doUnitTest = "OK" -End If +verify_testHour +doUnitTest = TestUtilModule.GetResult() End Function +Sub verify_testHour() - -Function verify_testHour() As String - - passCount = 0 - failCount = 0 - - result = "Test Results" & Chr$(10) & "============" & Chr$(10) + TestUtilModule.TestInit Dim testName As String Dim date1, date2, myTime @@ -30,42 +18,22 @@ Function verify_testHour() As String myTime = "6:25:39 AM" date2 = 6 date1 = Hour(myTime) - TestLog_ASSERT date1 = date2, "the return Hour is: " & date1 + TestUtilModule.AssertTrue(date1 = date2, "the return Hour is: " & date1) myTime = "6:25:39 PM" date2 = 18 date1 = Hour(myTime) - TestLog_ASSERT date1 = date2, "the return Hour is: " & date1 + TestUtilModule.AssertTrue(date1 = date2, "the return Hour is: " & date1) myTime = "06:25:39 AM" date2 = 6 date1 = Hour(myTime) - TestLog_ASSERT date1 = date2, "the return Hour is: " & date1 + TestUtilModule.AssertTrue(date1 = date2, "the return Hour is: " & date1) - result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) & "Tests failed: " & failCount & Chr$(10) - verify_testHour = result + TestUtilModule.TestEnd - 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 |