[Libreoffice-commits] core.git: basic/qa

Zdeněk Crhonek zcrhonek at gmail.com
Mon Mar 6 05:44:06 UTC 2017


 basic/qa/cppunit/test_vba.cxx |    1 
 basic/qa/vba_tests/choose.vb  |   81 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+)

New commits:
commit 8528712b6e81c67002667305d4d5311f66929e60
Author: Zdeněk Crhonek <zcrhonek at gmail.com>
Date:   Sun Mar 5 23:57:15 2017 +0100

    VBA test CHOOSE  function
    
    Change-Id: Ieb76595199ea1f6c23924d4860228fe5f4d30df1
    Reviewed-on: https://gerrit.libreoffice.org/34909
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Zdenek Crhonek <zcrhonek at gmail.com>

diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index 5a44f9c..df33224 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -63,6 +63,7 @@ void VBATest::testMiscVBAFunctions()
         "cbool.vb",
         "cdate.vb",
         "cdbl.vb",
+        "choose.vb",
 #ifndef WIN32 // missing 64bit Currency marshalling.
         "win32compat.vb", // windows compatibility hooks.
 #endif
diff --git a/basic/qa/vba_tests/choose.vb b/basic/qa/vba_tests/choose.vb
new file mode 100644
index 0000000..09ce64a
--- /dev/null
+++ b/basic/qa/vba_tests/choose.vb
@@ -0,0 +1,81 @@
+Option VBASupport 1
+Option Explicit
+Dim passCount As Integer
+Dim failCount As Integer
+Dim result As String
+
+Function doUnitTest() As String
+result = verify_testChoose()
+If failCount <> 0 And passCount > 0 Then
+    doUnitTest = result
+Else
+    doUnitTest = "OK"
+End If
+End Function
+
+
+
+Function verify_testChoose() As String
+
+    passCount = 0
+    failCount = 0
+
+    result = "Test Results" & Chr$(10) & "============" & Chr$(10)
+
+    Dim testName As String
+    Dim TestDateTime As Date
+    Dim var1, var2
+    testName = "Test Choose function"
+
+
+    On Error GoTo errorHandler
+
+    var2 = "Libre"
+    var1 = Choose(1, "Libre", "Office", "Suite")
+    TestLog_ASSERT var1 = var2, "the return Choose is: " & var1
+
+    var2 = "Office"
+    var1 = Choose(2, "Libre", "Office", "Suite")
+    TestLog_ASSERT var1 = var2, "the return Choose is: " & var1
+
+    var2 = "Suite"
+    var1 = Choose(3, "Libre", "Office", "Suite")
+    TestLog_ASSERT var1 = var2, "the return Choose is: " & var1
+
+
+    var1 = Choose(4, "Libre", "Office", "Suite")
+    TestLog_ASSERT IsNull(var1), "the return Choose is: Null4 "  
+
+    var1 = Choose(0, "Libre", "Office", "Suite")
+    TestLog_ASSERT IsNull(var1), "the return Choose is: Null0 " 
+
+    var1 = Choose(-1, "Libre", "Office", "Suite")
+    TestLog_ASSERT IsNull(var1), "the return Choose is: Null-1"
+
+    result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) & "Tests failed: " & failCount & Chr$(10)
+    verify_testChoose = 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
+


More information about the Libreoffice-commits mailing list