basic/qa/cppunit/test_vba.cxx | 1 basic/qa/vba_tests/formatnumber.vb | 64 +++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+)
New commits: commit 6c34c5ff469b4bee0aa165d660e6db4431ff0fe7 Author: ZdenÄk Crhonek <zcrho...@gmail.com> Date: Thu Apr 6 20:39:39 2017 +0200 VBA tests - FORMATNUMBER function Change-Id: Ibfb00e5be9a32e3767ec4e73cdbf81f53f07b42e Reviewed-on: https://gerrit.libreoffice.org/36229 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Zdenek Crhonek <zcrho...@gmail.com> diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx index 5df8c0eb76f5..5ea598a3b50a 100644 --- a/basic/qa/cppunit/test_vba.cxx +++ b/basic/qa/cppunit/test_vba.cxx @@ -78,6 +78,7 @@ void VBATest::testMiscVBAFunctions() "error.vb", "exp.vb", "fix.vb", + "formatnumber.vb", #ifndef WIN32 // missing 64bit Currency marshalling. "win32compat.vb", // windows compatibility hooks. #endif diff --git a/basic/qa/vba_tests/formatnumber.vb b/basic/qa/vba_tests/formatnumber.vb new file mode 100644 index 000000000000..0f4c7be5a5d3 --- /dev/null +++ b/basic/qa/vba_tests/formatnumber.vb @@ -0,0 +1,64 @@ +Rem Attribute VBA_ModuleType=VBAModule +Option VBASupport 1 +Rem Option VBASupport 1 'unREM in .vb file +Option Explicit +Dim passCount As Integer +Dim failCount As Integer +Dim result As String + +Function doUnitTest() As String +result = verify_testFormatNumber() +If failCount <> 0 And passCount > 0 Then + doUnitTest = result +Else + doUnitTest = "OK" +End If +End Function + + + +Function verify_testFormatNumber() 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 + testName = "Test FormatNumber function" + On Error GoTo errorHandler + + date2 = "42778.00" + date1 = FormatNumber("12.2", 2, vbFalse, vbFalse, vbFalse) + TestLog_ASSERT date1 = date2, "the return FormatNumber is: " & date1 + + result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) & "Tests failed: " & failCount & Chr$(10) + verify_testFormatNumber = 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 +
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits