summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2023-11-27 11:21:57 +0100
committerThorsten Behrens <thorsten.behrens@allotropia.de>2023-12-06 14:19:03 +0100
commit94b5b16cfa8847e50e30d724aea35764eae5c3c6 (patch)
treef2aa2d2afae0d3cfd7e8a2c5e7d861a1e057bc78
parent95e1347cb2d4144ce97431a33b6d4ecda4d679aa (diff)
CppunitTest_desktop_lib: adjust asserts so this works againcib-6.4-22
Change-Id: Id6aba3d9203e3fe4e95771a895d1de50a2030908 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159990 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit ececb678b8362e3be8e02768ddd5e4197d87dc2a)
-rw-r--r--desktop/qa/desktop_lib/test_desktop_lib.cxx6
1 files 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 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()