[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - desktop/qa

[Miklos Vajna (via logerrit)]

 desktop/qa/desktop_lib/test_desktop_lib.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 94b5b16cfa8847e50e30d724aea35764eae5c3c6
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Nov 27 11:21:57 2023 +0100
Commit:     Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Wed Dec 6 14:19:03 2023 +0100

    CppunitTest_desktop_lib: adjust asserts so this works again
    
    Change-Id: Id6aba3d9203e3fe4e95771a895d1de50a2030908
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159990
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    (cherry picked from commit ececb678b8362e3be8e02768ddd5e4197d87dc2a)

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 1bb185dd5b9e..f32fb09d9270 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -2396,7 +2396,8 @@ void DesktopLOKTest::testInsertCertificate_PEM_ODT()
     }
 
     int nState = pDocument->m_pDocumentClass->getSignatureState(pDocument);
-    CPPUNIT_ASSERT_EQUAL(int(1), nState);
+    // OK or NOTVALIDATED (signature is OK, but certificate could not be 
validated)
+    CPPUNIT_ASSERT(nState == 1 || nState == 4);
 }
 
 void DesktopLOKTest::testInsertCertificate_PEM_DOCX()
@@ -2454,7 +2455,8 @@ void DesktopLOKTest::testInsertCertificate_PEM_DOCX()
     }
 
     int nState = pDocument->m_pDocumentClass->getSignatureState(pDocument);
-    CPPUNIT_ASSERT_EQUAL(int(5), nState);
+    // PARTIAL_OK or NOTVALIDATED_PARTIAL_OK
+    CPPUNIT_ASSERT(nState == 5 || nState == 6);
 }
 
 void DesktopLOKTest::testSignDocument_PEM_PDF()