From 25ffe7988fab62f4e60899401c7b0876f73a31e5 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 27 Nov 2023 11:21:57 +0100 Subject: CppunitTest_desktop_lib: adjust asserts so this works again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id6aba3d9203e3fe4e95771a895d1de50a2030908 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159990 Tested-by: Jenkins CollaboraOffice Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara (cherry picked from commit ececb678b8362e3be8e02768ddd5e4197d87dc2a) --- desktop/qa/desktop_lib/test_desktop_lib.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index 5c17f880e2de..014e64f86fff 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -2669,7 +2669,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() @@ -2726,7 +2727,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() -- cgit