summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2023-11-27 11:21:57 +0100
committerJaume Pujantell <jaume.pujantell@collabora.com>2024-01-05 11:09:02 +0100
commit5c66708c65228a321ae610b8e6146c8fda985f11 (patch)
tree59341f1efc65957586176049d3e0da8a4e1111e2
parentccbe835d2391087d67a41c0baf67b309d852a17d (diff)
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 <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) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161639
-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 81f54be5553e..d2fde219137b 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -2828,7 +2828,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()
@@ -2885,7 +2886,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()