[Libreoffice-commits] core.git: cui/source

[Caolán McNamara (via logerrit)]

 cui/source/dialogs/AdditionsDialog.cxx |   10 ++++++++--
 cui/source/inc/AdditionsDialog.hxx     |    1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 5296b0ffe3ce031cab29d64d62e1bdc3fb2595fe
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Aug 18 11:07:07 2023 +0100
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Aug 18 19:22:53 2023 +0200

    don't access network during a UITest
    
    Change-Id: If6cc3da3e75ad7689a0de35784c2d29d5b01b96e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155833
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/cui/source/dialogs/AdditionsDialog.cxx 
b/cui/source/dialogs/AdditionsDialog.cxx
index 73b16ed06e90..f0dedf626acf 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -275,6 +275,11 @@ 
SearchAndParseThread::SearchAndParseThread(AdditionsDialog* pDialog, const bool
     , m_bExecute(true)
     , m_bIsFirstLoading(isFirstLoading)
 {
+    // if we are running a UITest, e.g. UITest_sw_options then
+    // don't attempt to downloading anything
+    static const bool bUITest = getenv("LIBO_TEST_UNIT");
+
+    m_bUITest = bUITest;
 }
 
 SearchAndParseThread::~SearchAndParseThread() {}
@@ -284,7 +289,8 @@ void SearchAndParseThread::Append(AdditionInfo& 
additionInfo)
     if (!m_bExecute)
         return;
     OUString aPreviewFile;
-    bool bResult = getPreviewFile(additionInfo, aPreviewFile); // info vector 
json data
+    bool bResult
+        = !m_bUITest && getPreviewFile(additionInfo, aPreviewFile); // info 
vector json data
 
     if (!bResult)
     {
@@ -398,7 +404,7 @@ void SearchAndParseThread::execute()
 
     if (m_bIsFirstLoading)
     {
-        std::string sResponse = ucbGet(m_pAdditionsDialog->m_sURL);
+        std::string sResponse = !m_bUITest ? 
ucbGet(m_pAdditionsDialog->m_sURL) : "";
         parseResponse(sResponse, m_pAdditionsDialog->m_aAllExtensionsVector);
         std::sort(m_pAdditionsDialog->m_aAllExtensionsVector.begin(),
                   m_pAdditionsDialog->m_aAllExtensionsVector.end(),
diff --git a/cui/source/inc/AdditionsDialog.hxx 
b/cui/source/inc/AdditionsDialog.hxx
index 302d11bbc6ea..559a4ca911ff 100644
--- a/cui/source/inc/AdditionsDialog.hxx
+++ b/cui/source/inc/AdditionsDialog.hxx
@@ -138,6 +138,7 @@ private:
     AdditionsDialog* m_pAdditionsDialog;
     std::atomic<bool> m_bExecute;
     bool m_bIsFirstLoading;
+    bool m_bUITest;
 
     void Search();
     void Append(AdditionInfo& additionInfo);