From a2c746ecd82ea1ff6a03e3eec8374c913d19c823 Mon Sep 17 00:00:00 2001 From: Zdeněk Crhonek Date: Wed, 29 Mar 2017 22:13:54 +0200 Subject: VBA tests - add DATEDIFF and DATEPART test case Change-Id: I3d0026e707369e435013be1d11e1366a77ff2d0b Reviewed-on: https://gerrit.libreoffice.org/35881 Tested-by: Jenkins Reviewed-by: Zdenek Crhonek --- basic/qa/cppunit/test_vba.cxx | 2 + basic/qa/vba_tests/datediff.vb | 139 +++++++++++++++++++++++++++++++++++++++++ basic/qa/vba_tests/datepart.vb | 96 ++++++++++++++++++++++++++++ 3 files changed, 237 insertions(+) create mode 100644 basic/qa/vba_tests/datediff.vb create mode 100644 basic/qa/vba_tests/datepart.vb (limited to 'basic') diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx index 81b1504e3d02..1f113cf79c86 100644 --- a/basic/qa/cppunit/test_vba.cxx +++ b/basic/qa/cppunit/test_vba.cxx @@ -72,6 +72,8 @@ void VBATest::testMiscVBAFunctions() "cvdate.vb", "cverr.vb", "dateadd.vb", + "datediff.vb", + "datepart.vb", #ifndef WIN32 // missing 64bit Currency marshalling. "win32compat.vb", // windows compatibility hooks. #endif diff --git a/basic/qa/vba_tests/datediff.vb b/basic/qa/vba_tests/datediff.vb new file mode 100644 index 000000000000..150e89210d7b --- /dev/null +++ b/basic/qa/vba_tests/datediff.vb @@ -0,0 +1,139 @@ +Option VBASupport 1 +Option Explicit +Dim passCount As Integer +Dim failCount As Integer +Dim result As String + +Function doUnitTest() As String +result = verify_testDateDiff() +If failCount <> 0 And passCount > 0 Then + doUnitTest = result +Else + doUnitTest = "OK" +End If +End Function + + + +Function verify_testDateDiff() As String + + passCount = 0 + failCount = 0 + + result = "Test Results" & Chr$(10) & "============" & Chr$(10) + + Dim testName As String + Dim TestDateTime As Date + Dim TestStr As String + Dim date1 + Dim date2 + testName = "Test DateDiff function" + On Error GoTo errorHandler + + date2 = 10 + date1 = DateDiff("yyyy", "22/11/2003", "22/11/2013") + TestLog_ASSERT date1 = date2, "the return DateDiff is: " & date1 + + date2 = 40 + date1 = DateDiff("q", "22/11/2003", "22/11/2013") + TestLog_ASSERT date1 = date2, "the return DateDiff is: " & date1 + + date2 = 120 + date1 = DateDiff("m", "22/11/2003", "22/11/2013") + TestLog_ASSERT date1 = date2, "the return DateDiff is: " & date1 + + date2 = 3653 + date1 = DateDiff("y", "22/11/2003", "22/11/2013") + TestLog_ASSERT date1 = date2, "the return DateDiff is: " & date1 + + date2 = 3653 + date1 = DateDiff("d", "22/11/2003", "22/11/2013") + TestLog_ASSERT date1 = date2, "the return DateDiff is: " & date1 + + date2 = 521 + date1 = DateDiff("w", "22/11/2003", "22/11/2013") + TestLog_ASSERT date1 = date2, "the return DateDiff is: " & date1 + + date2 = 522 + date1 = DateDiff("ww", "22/11/2003", "22/11/2013") + TestLog_ASSERT date1 = date2, "the return DateDiff is: " & date1 + + date2 = 87672 + date1 = DateDiff("h", "22/11/2003", "22/11/2013") + TestLog_ASSERT date1 = date2, "the return DateDiff is: " & date1 + + date2 = 525600 + date1 = DateDiff("n", "22/11/2012", "22/11/2013") + TestLog_ASSERT date1 = date2, "the return DateDiff is: " & date1 + + date2 = 2678400 + date1 = DateDiff("s", "22/10/2013", "22/11/2013") + TestLog_ASSERT date1 = date2, "the return DateDiff is: " & date1 + + date2 = 3653 + date1 = DateDiff("d", "22/11/2003", "22/11/2013", vbFriday) + TestLog_ASSERT date1 = date2, "the return DateDiff is: " & date1 + + date2 = 3653 + date1 = DateDiff("d", "22/11/2003", "22/11/2013", vbMonday) + TestLog_ASSERT date1 = date2, "the return DateDiff is: " & date1 + + date2 = 3623 + date1 = DateDiff("d", "22/12/2003", "22/11/2013", vbSaturday) + TestLog_ASSERT date1 = date2, "the return DateDiff is: " & date1 + + date2 = 3684 + date1 = DateDiff("d", "22/10/2003", "22/11/2013", vbSunday) + TestLog_ASSERT date1 = date2, "the return DateDiff is: " & date1 + + date2 = 3653 + date1 = DateDiff("d", "22/11/2003", "22/11/2013", vbThursday) + TestLog_ASSERT date1 = date2, "the return DateDiff is: " & date1 + + date2 = 3653 + date1 = DateDiff("d", "22/11/2003", "22/11/2013", vbTuesday) + TestLog_ASSERT date1 = date2, "the return DateDiff is: " & date1 + + date2 = 3653 + date1 = DateDiff("d", "22/11/2003", "22/11/2013", vbFriday, vbFirstJan1) + TestLog_ASSERT date1 = date2, "the return DateDiff is: " & date1 + + date2 = 3653 + date1 = DateDiff("d", "22/11/2003", "22/11/2013", vbThursday, vbFirstFourDays) + TestLog_ASSERT date1 = date2, "the return DateDiff is: " & date1 + + date2 = 3653 + date1 = DateDiff("d", "22/11/2003", "22/11/2013", vbSunday, vbFirstFullWeek) + TestLog_ASSERT date1 = date2, "the return DateDiff is: " & date1 + + date2 = 3653 + date1 = DateDiff("d", "22/11/2003", "22/11/2013", vbSaturday, vbFirstFullWeek) + TestLog_ASSERT date1 = date2, "the return DateDiff is: " & date1 + + result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) & "Tests failed: " & failCount & Chr$(10) + verify_testDateDiff = result + + Exit Function +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 + +End Sub + diff --git a/basic/qa/vba_tests/datepart.vb b/basic/qa/vba_tests/datepart.vb new file mode 100644 index 000000000000..9dff5a31dd69 --- /dev/null +++ b/basic/qa/vba_tests/datepart.vb @@ -0,0 +1,96 @@ +Option VBASupport 1 +Option Explicit +Dim passCount As Integer +Dim failCount As Integer +Dim result As String + +Function doUnitTest() As String +result = verify_testDatePart() +If failCount <> 0 And passCount > 0 Then + doUnitTest = result +Else + doUnitTest = "OK" +End If +End Function + + + +Function verify_testDatePart() As String + + passCount = 0 + failCount = 0 + + result = "Test Results" & Chr$(10) & "============" & Chr$(10) + + Dim testName As String + Dim TestDateTime As Date + Dim TestStr As String + Dim date1 'variables for test + Dim date2 + testName = "Test DatePart function" + On Error GoTo errorHandler + + date2 = 1969 + date1 = DatePart("yyyy", "12.2.1969") + TestLog_ASSERT date1 = date2, "the return DatePart is: " & date1 + + date2 = 1 + date1 = DatePart("q", "12.2.1969") + TestLog_ASSERT date1 = date2, "the return DatePart is: " & date1 + + date2 = 43 + date1 = DatePart("y", "12.2.1969") + TestLog_ASSERT date1 = date2, "the return DatePart is: " & date1 + + date2 = 12 + date1 = DatePart("d", "12.2.1969") + TestLog_ASSERT date1 = date2, "the return DatePart is: " & date1 + + date2 = 4 + date1 = DatePart("w", "12.2.1969") + TestLog_ASSERT date1 = date2, "the return DatePart is: " & date1 + + date2 = 7 + date1 = DatePart("ww", "12.2.1969") + TestLog_ASSERT date1 = date2, "the return DatePart is: " & date1 + + date2 = 16 + date1 = DatePart("h", "12.2.1969 16:32:00") + TestLog_ASSERT date1 = date2, "the return DatePart is: " & date1 + + date2 = 32 + date1 = DatePart("n", "12.2.1969 16:32:00") + TestLog_ASSERT date1 = date2, "the return DatePart is: " & date1 + + date2 = 0 + date1 = DatePart("s", "12.2.1969 16:32:00") + TestLog_ASSERT date1 = date2, "the return DatePart is: " & date1 + + + result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) & "Tests failed: " & failCount & Chr$(10) + verify_testDatePart = result + + Exit Function +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 + +End Sub + -- cgit