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

[Xisco Fauli (via logerrit)]

 sc/qa/extras/vba-macro-test.cxx |   45 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

New commits:
commit bf195037e2e59c46a8b7d149aedb79357e5ea978
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri Jun 17 12:03:38 2022 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Jun 17 13:24:31 2022 +0200

    tdf#149579: sc_vba_macro_test: Add unittest
    
    Change-Id: I2cb673d9b42ea28b19fc408f2be86456258fcbe4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136013
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sc/qa/extras/vba-macro-test.cxx b/sc/qa/extras/vba-macro-test.cxx
index 456b57822566..71c3b9033da1 100644
--- a/sc/qa/extras/vba-macro-test.cxx
+++ b/sc/qa/extras/vba-macro-test.cxx
@@ -63,6 +63,7 @@ public:
     void testMacroKeyBinding();
 
     void testVba();
+    void testTdf149579();
     void testVbaRangeSort();
     void testTdf107885();
     void testTdf131562();
@@ -83,6 +84,7 @@ public:
     CPPUNIT_TEST(testMacroKeyBinding);
 
     CPPUNIT_TEST(testVba);
+    CPPUNIT_TEST(testTdf149579);
     CPPUNIT_TEST(testVbaRangeSort);
     CPPUNIT_TEST(testTdf107885);
     CPPUNIT_TEST(testTdf131562);
@@ -596,6 +598,49 @@ void VBAMacroTest::testVba()
     }
 }
 
+void VBAMacroTest::testTdf149579()
+{
+    auto xComponent = loadFromDesktop("private:factory/scalc");
+
+    css::uno::Reference<css::document::XEmbeddedScripts> xDocScr(xComponent, 
uno::UNO_QUERY_THROW);
+    auto xLibs = xDocScr->getBasicLibraries();
+    auto xLibrary = xLibs->createLibrary("TestLibrary");
+    xLibrary->insertByName("TestModule",
+                           uno::Any(OUString("Option VBASupport 1\n"
+                                             "Sub TestTdf149579\n"
+                                             "Range(\"A1\").Sort 
Key1:=Range(\"A1\")\n"
+                                             "End Sub\n")));
+
+    uno::Any aRet;
+    uno::Sequence<sal_Int16> aOutParamIndex;
+    uno::Sequence<uno::Any> aOutParam;
+
+    SfxObjectShell* pFoundShell = 
SfxObjectShell::GetShellFromComponent(xComponent);
+    ScDocShell* pDocSh = static_cast<ScDocShell*>(pFoundShell);
+    CPPUNIT_ASSERT(pDocSh);
+    ScDocument& rDoc = pDocSh->GetDocument();
+
+    rDoc.SetValue(ScAddress(0, 0, 0), 5.0);
+    rDoc.SetValue(ScAddress(0, 1, 0), 10.0);
+    rDoc.SetValue(ScAddress(0, 2, 0), 1.0);
+
+    // Without the fix in place, this call would have crashed in debug builds 
with failed assertion
+    ErrCode result = SfxObjectShell::CallXScript(
+        xComponent,
+        
"vnd.sun.Star.script:TestLibrary.TestModule.TestTdf149579?language=Basic&location=document",
+        {}, aRet, aOutParamIndex, aOutParam);
+    CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, result);
+
+    // Without the fix in place, this test would have failed with
+    // - Expected: 1
+    // - Actual  : 5
+    CPPUNIT_ASSERT_EQUAL(1.0, rDoc.GetValue(ScAddress(0, 0, 0)));
+    CPPUNIT_ASSERT_EQUAL(5.0, rDoc.GetValue(ScAddress(0, 1, 0)));
+    CPPUNIT_ASSERT_EQUAL(10.0, rDoc.GetValue(ScAddress(0, 2, 0)));
+
+    pDocSh->DoClose();
+}
+
 void VBAMacroTest::testVbaRangeSort()
 {
     auto xComponent = loadFromDesktop("private:factory/scalc");