summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZdeněk Crhonek <zcrhonek@gmail.com>2017-03-03 15:54:01 +0100
committerZdenek Crhonek <zcrhonek@gmail.com>2017-03-04 09:20:02 +0000
commited0e8f970ff552e75222dc92ed2879aa3b3e5851 (patch)
treef0cd8a7f08136a6b7e1bceb144707a725d2af8a1
parent33ac4636c054773baba58256329d35579c9f99e3 (diff)
VBA test CDATE, CDBL function
Change-Id: Id45930e6d329a0b1142bfde612c1a089390e4817 Reviewed-on: https://gerrit.libreoffice.org/34868 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Zdenek Crhonek <zcrhonek@gmail.com>
-rw-r--r--basic/qa/cppunit/test_vba.cxx2
-rw-r--r--basic/qa/vba_tests/cdate.vb70
-rw-r--r--basic/qa/vba_tests/cdbl.vb75
3 files changed, 147 insertions, 0 deletions
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index 94371ffb2c0a..5a44f9c032a4 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -61,6 +61,8 @@ void VBATest::testMiscVBAFunctions()
"asc.vb",
"atn.vb",
"cbool.vb",
+ "cdate.vb",
+ "cdbl.vb",
#ifndef WIN32 // missing 64bit Currency marshalling.
"win32compat.vb", // windows compatibility hooks.
#endif
diff --git a/basic/qa/vba_tests/cdate.vb b/basic/qa/vba_tests/cdate.vb
new file mode 100644
index 000000000000..d3af4db692a6
--- /dev/null
+++ b/basic/qa/vba_tests/cdate.vb
@@ -0,0 +1,70 @@
+Option VBASupport 1
+Option Explicit
+Dim passCount As Integer
+Dim failCount As Integer
+Dim result As String
+
+Function doUnitTest() As String
+result = verify_testCDate()
+If failCount <> 0 And passCount > 0 Then
+ doUnitTest = result
+Else
+ doUnitTest = "OK"
+End If
+End Function
+
+
+
+Function verify_testCDate() 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, date2 As Date 'variables for test
+ testName = "Test CDate function"
+ On Error GoTo errorHandler
+
+ date2 = 25246
+ date1 = CDate("12.2.1969") '2/12/1969
+ TestLog_ASSERT date1 = date2, "the return CDate is: " & date1
+
+ date2 = 28313
+ date1 = CDate("07/07/1977")
+ TestLog_ASSERT date1 = date2, "the return CDate is: " & date1
+
+ date2 = 28313
+ date1 = CDate(#7/7/1977#)
+ TestLog_ASSERT date1 = date2, "the return CDate is: " & date1
+
+ result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) & "Tests failed: " & failCount & Chr$(10)
+ verify_testCDate = 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/cdbl.vb b/basic/qa/vba_tests/cdbl.vb
new file mode 100644
index 000000000000..34cb10a691a1
--- /dev/null
+++ b/basic/qa/vba_tests/cdbl.vb
@@ -0,0 +1,75 @@
+Option VBASupport 1
+Option Explicit
+Dim passCount As Integer
+Dim failCount As Integer
+Dim result As String
+
+Function doUnitTest() As String
+result = verify_testCdbl()
+If failCount <> 0 And passCount > 0 Then
+ doUnitTest = result
+Else
+ doUnitTest = "OK"
+End If
+End Function
+
+
+
+Function verify_testCdbl() 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 nr1, nr2 As Double 'variables for test
+ testName = "Test Cdbl function"
+ On Error GoTo errorHandler
+
+ nr2 = 0
+ nr1 = CDbl(0)
+ TestLog_ASSERT nr1 = nr2, "the return Cdbl is: " & nr1
+
+ nr2 = 10.1234567890123
+ nr1 = CDbl(10.1234567890123)
+ TestLog_ASSERT nr1 = nr2, "the return Cdbl is: " & nr1
+
+ nr2 = 0.00005
+ nr1 = CDbl(0.005 * 0.01)
+ TestLog_ASSERT nr1 = nr2, "the return Cdbl is: " & nr1
+
+ nr2 = 20
+ nr1 = CDbl("20")
+ TestLog_ASSERT nr1 = nr2, "the return Cdbl is: " & nr1
+
+
+ result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) & "Tests failed: " & failCount & Chr$(10)
+ verify_testCdbl = 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
+