diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-10-24 11:19:32 +0200 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2018-11-05 08:58:54 +0100 |
commit | ab7fabd8b116d16def53772720f19fad4dbd6366 (patch) | |
tree | 30702eaa4888abae088908a4d68aa7ef75e33a66 /desktop | |
parent | ea6537b455634f785de6482cc01a21a90bcf0ce5 (diff) |
lok: update the test for singing the document from LOK
Change-Id: Ie34d8c26bfbf4192cd2067c8315030903edb3fb3
Reviewed-on: https://gerrit.libreoffice.org/62274
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/qa/data/certificate.der | bin | 1306 -> 1308 bytes | |||
-rw-r--r-- | desktop/qa/data/certificatePrivateKey.der | bin | 0 -> 1218 bytes | |||
-rw-r--r-- | desktop/qa/data/intermediateRootCA.der | bin | 0 -> 1462 bytes | |||
-rw-r--r-- | desktop/qa/data/rootCA.der | bin | 0 -> 1462 bytes | |||
-rw-r--r-- | desktop/qa/desktop_lib/test_desktop_lib.cxx | 66 |
5 files changed, 49 insertions, 17 deletions
diff --git a/desktop/qa/data/certificate.der b/desktop/qa/data/certificate.der Binary files differindex 2a750ab281af..10e3ade13e3e 100644 --- a/desktop/qa/data/certificate.der +++ b/desktop/qa/data/certificate.der diff --git a/desktop/qa/data/certificatePrivateKey.der b/desktop/qa/data/certificatePrivateKey.der Binary files differnew file mode 100644 index 000000000000..7a5599c82521 --- /dev/null +++ b/desktop/qa/data/certificatePrivateKey.der diff --git a/desktop/qa/data/intermediateRootCA.der b/desktop/qa/data/intermediateRootCA.der Binary files differnew file mode 100644 index 000000000000..9adf7f82e5f6 --- /dev/null +++ b/desktop/qa/data/intermediateRootCA.der diff --git a/desktop/qa/data/rootCA.der b/desktop/qa/data/rootCA.der Binary files differnew file mode 100644 index 000000000000..30fc66e26f79 --- /dev/null +++ b/desktop/qa/data/rootCA.der diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index a225fb6ad85d..ab0e98033b55 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -2274,24 +2274,56 @@ void DesktopLOKTest::testInsertCertificate() Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT(mxComponent.is()); pDocument->m_pDocumentClass->initializeForRendering(pDocument, "{}"); + Scheduler::ProcessEventsToIdle(); + + { + OUString aCertificateURL; + createFileURL("rootCA.der", aCertificateURL); + SvFileStream aCertificateStream(aCertificateURL, StreamMode::READ); + std::vector<unsigned char> aCertificate; + aCertificate.resize(aCertificateStream.remainingSize()); + aCertificateStream.ReadBytes(aCertificate.data(), aCertificateStream.remainingSize()); + + bool bResult = pDocument->m_pDocumentClass->addCertificate( + pDocument, aCertificate.data(), int(aCertificate.size())); + CPPUNIT_ASSERT(bResult); + } + + { + OUString aCertificateURL; + createFileURL("intermediateRootCA.der", aCertificateURL); + SvFileStream aCertificateStream(aCertificateURL, StreamMode::READ); + std::vector<unsigned char> aCertificate; + aCertificate.resize(aCertificateStream.remainingSize()); + aCertificateStream.ReadBytes(aCertificate.data(), aCertificateStream.remainingSize()); - OUString aCertificateURL; - createFileURL("certificate.der", aCertificateURL); - SvFileStream aCertificateStream(aCertificateURL, StreamMode::READ); - std::vector<unsigned char> aCertificate; - aCertificate.resize(aCertificateStream.remainingSize()); - aCertificateStream.ReadBytes(aCertificate.data(), aCertificateStream.remainingSize()); - - OUString aPrivateKeyURL; - createFileURL("pkey.der", aPrivateKeyURL); - SvFileStream aPrivateKeyStream(aPrivateKeyURL, StreamMode::READ); - std::vector<unsigned char> aPrivateKey; - aPrivateKey.resize(aPrivateKeyStream.remainingSize()); - aPrivateKeyStream.ReadBytes(aPrivateKey.data(), aPrivateKeyStream.remainingSize()); - - pDocument->m_pDocumentClass->insertCertificate(pDocument, - aCertificate.data(), int(aCertificate.size()), - aPrivateKey.data(), int(aPrivateKey.size())); + + bool bResult = pDocument->m_pDocumentClass->addCertificate( + pDocument, aCertificate.data(), int(aCertificate.size())); + CPPUNIT_ASSERT(bResult); + } + + { + OUString aCertificateURL; + createFileURL("certificate.der", aCertificateURL); + SvFileStream aCertificateStream(aCertificateURL, StreamMode::READ); + std::vector<unsigned char> aCertificate; + aCertificate.resize(aCertificateStream.remainingSize()); + aCertificateStream.ReadBytes(aCertificate.data(), aCertificateStream.remainingSize()); + + + OUString aPrivateKeyURL; + createFileURL("certificatePrivateKey.der", aPrivateKeyURL); + SvFileStream aPrivateKeyStream(aPrivateKeyURL, StreamMode::READ); + std::vector<unsigned char> aPrivateKey; + aPrivateKey.resize(aPrivateKeyStream.remainingSize()); + aPrivateKeyStream.ReadBytes(aPrivateKey.data(), aPrivateKeyStream.remainingSize()); + + bool bResult = pDocument->m_pDocumentClass->insertCertificate(pDocument, + aCertificate.data(), int(aCertificate.size()), + aPrivateKey.data(), int(aPrivateKey.size())); + CPPUNIT_ASSERT(bResult); + } comphelper::LibreOfficeKit::setActive(false); } |