diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-12-26 20:44:57 +0100 |
---|---|---|
committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2019-01-03 07:34:19 +0100 |
commit | e41179f81ba8e8fd5b44e5d1dc0484a120f1e401 (patch) | |
tree | 8f2e66bf7867385eba41fab8d56a25efba484027 /desktop | |
parent | 540f4c06a025ede65addf3b894feab7b9ffece12 (diff) |
lok: simplify and cleanup testInsertCertificate_{PEM,DER}_ODT
Change-Id: I61891d1295a342e546cab56ef80315c9f5018f90
Reviewed-on: https://gerrit.libreoffice.org/65629
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit 5cd86cacc1ea69bcf94d298a385e4f711e9bce3c)
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/qa/desktop_lib/test_desktop_lib.cxx | 118 |
1 files changed, 36 insertions, 82 deletions
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index e7858c625106..18e20c8fd4d7 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -60,6 +60,8 @@ public: { } + void readFileIntoByteVector(OUString const & sFilename, std::vector<sal_uInt8> & rByteVector); + virtual void setUp() override { UnoApiTest::setUp(); @@ -120,8 +122,8 @@ public: void testExtractParameter(); void testGetSignatureState_NonSigned(); void testGetSignatureState_Signed(); - void testInsertCertificate(); - void testInsertCertificatePEM(); + void testInsertCertificate_DER_ODT(); + void testInsertCertificate_PEM_ODT(); void testABI(); CPPUNIT_TEST_SUITE(DesktopLOKTest); @@ -167,8 +169,8 @@ public: CPPUNIT_TEST(testExtractParameter); CPPUNIT_TEST(testGetSignatureState_Signed); CPPUNIT_TEST(testGetSignatureState_NonSigned); - CPPUNIT_TEST(testInsertCertificate); - CPPUNIT_TEST(testInsertCertificatePEM); + CPPUNIT_TEST(testInsertCertificate_DER_ODT); + CPPUNIT_TEST(testInsertCertificate_PEM_ODT); CPPUNIT_TEST(testABI); CPPUNIT_TEST_SUITE_END(); @@ -2250,6 +2252,16 @@ void DesktopLOKTest::testExtractParameter() comphelper::LibreOfficeKit::setActive(false); } +void DesktopLOKTest::readFileIntoByteVector(OUString const & sFilename, std::vector<unsigned char> & rByteVector) +{ + rByteVector.clear(); + OUString aURL; + createFileURL(sFilename, aURL); + SvFileStream aStream(aURL, StreamMode::READ); + rByteVector.resize(aStream.remainingSize()); + aStream.ReadBytes(rByteVector.data(), aStream.remainingSize()); +} + void DesktopLOKTest::testGetSignatureState_Signed() { comphelper::LibreOfficeKit::setActive(); @@ -2259,28 +2271,16 @@ void DesktopLOKTest::testGetSignatureState_Signed() int nState = pDocument->m_pDocumentClass->getSignatureState(pDocument); CPPUNIT_ASSERT_EQUAL(int(4), nState); + std::vector<unsigned char> aCertificate; { - 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()); - + readFileIntoByteVector("rootCA.der", aCertificate); 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()); - - + readFileIntoByteVector("intermediateRootCA.der", aCertificate); bool bResult = pDocument->m_pDocumentClass->addCertificate( pDocument, aCertificate.data(), int(aCertificate.size())); CPPUNIT_ASSERT(bResult); @@ -2303,7 +2303,7 @@ void DesktopLOKTest::testGetSignatureState_NonSigned() comphelper::LibreOfficeKit::setActive(false); } -void DesktopLOKTest::testInsertCertificate() +void DesktopLOKTest::testInsertCertificate_DER_ODT() { comphelper::LibreOfficeKit::setActive(); @@ -2322,13 +2322,11 @@ void DesktopLOKTest::testInsertCertificate() pDocument->m_pDocumentClass->initializeForRendering(pDocument, "{}"); Scheduler::ProcessEventsToIdle(); + std::vector<unsigned char> aCertificate; + std::vector<unsigned char> aPrivateKey; + { - 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()); + readFileIntoByteVector("rootCA.der", aCertificate); bool bResult = pDocument->m_pDocumentClass->addCertificate( pDocument, aCertificate.data(), int(aCertificate.size())); @@ -2336,13 +2334,7 @@ void DesktopLOKTest::testInsertCertificate() } { - 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()); - + readFileIntoByteVector("intermediateRootCA.der", aCertificate); bool bResult = pDocument->m_pDocumentClass->addCertificate( pDocument, aCertificate.data(), int(aCertificate.size())); @@ -2350,20 +2342,8 @@ void DesktopLOKTest::testInsertCertificate() } { - 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()); + readFileIntoByteVector("certificate.der", aCertificate); + readFileIntoByteVector("certificatePrivateKey.der", aPrivateKey); bool bResult = pDocument->m_pDocumentClass->insertCertificate(pDocument, aCertificate.data(), int(aCertificate.size()), @@ -2378,7 +2358,7 @@ void DesktopLOKTest::testInsertCertificate() } -void DesktopLOKTest::testInsertCertificatePEM() +void DesktopLOKTest::testInsertCertificate_PEM_ODT() { comphelper::LibreOfficeKit::setActive(); @@ -2397,13 +2377,11 @@ void DesktopLOKTest::testInsertCertificatePEM() pDocument->m_pDocumentClass->initializeForRendering(pDocument, "{}"); Scheduler::ProcessEventsToIdle(); + std::vector<unsigned char> aCertificate; + std::vector<unsigned char> aPrivateKey; + { - OUString aCertificateURL; - createFileURL("test-cert-chain-1.pem", aCertificateURL); - SvFileStream aCertificateStream(aCertificateURL, StreamMode::READ); - std::vector<unsigned char> aCertificate; - aCertificate.resize(aCertificateStream.remainingSize()); - aCertificateStream.ReadBytes(aCertificate.data(), aCertificateStream.remainingSize()); + readFileIntoByteVector("test-cert-chain-1.pem", aCertificate); bool bResult = pDocument->m_pDocumentClass->addCertificate( pDocument, aCertificate.data(), int(aCertificate.size())); @@ -2411,13 +2389,7 @@ void DesktopLOKTest::testInsertCertificatePEM() } { - OUString aCertificateURL; - createFileURL("test-cert-chain-2.pem", aCertificateURL); - SvFileStream aCertificateStream(aCertificateURL, StreamMode::READ); - std::vector<unsigned char> aCertificate; - aCertificate.resize(aCertificateStream.remainingSize()); - aCertificateStream.ReadBytes(aCertificate.data(), aCertificateStream.remainingSize()); - + readFileIntoByteVector("test-cert-chain-2.pem", aCertificate); bool bResult = pDocument->m_pDocumentClass->addCertificate( pDocument, aCertificate.data(), int(aCertificate.size())); @@ -2425,13 +2397,7 @@ void DesktopLOKTest::testInsertCertificatePEM() } { - OUString aCertificateURL; - createFileURL("test-cert-chain-3.pem", aCertificateURL); - SvFileStream aCertificateStream(aCertificateURL, StreamMode::READ); - std::vector<unsigned char> aCertificate; - aCertificate.resize(aCertificateStream.remainingSize()); - aCertificateStream.ReadBytes(aCertificate.data(), aCertificateStream.remainingSize()); - + readFileIntoByteVector("test-cert-chain-3.pem", aCertificate); bool bResult = pDocument->m_pDocumentClass->addCertificate( pDocument, aCertificate.data(), int(aCertificate.size())); @@ -2439,20 +2405,8 @@ void DesktopLOKTest::testInsertCertificatePEM() } { - OUString aCertificateURL; - createFileURL("test-cert-signing.pem", aCertificateURL); - SvFileStream aCertificateStream(aCertificateURL, StreamMode::READ); - std::vector<unsigned char> aCertificate; - aCertificate.resize(aCertificateStream.remainingSize()); - aCertificateStream.ReadBytes(aCertificate.data(), aCertificateStream.remainingSize()); - - - OUString aPrivateKeyURL; - createFileURL("test-PK-signing.pem", aPrivateKeyURL); - SvFileStream aPrivateKeyStream(aPrivateKeyURL, StreamMode::READ); - std::vector<unsigned char> aPrivateKey; - aPrivateKey.resize(aPrivateKeyStream.remainingSize()); - aPrivateKeyStream.ReadBytes(aPrivateKey.data(), aPrivateKeyStream.remainingSize()); + readFileIntoByteVector("test-cert-signing.pem", aCertificate); + readFileIntoByteVector("test-PK-signing.pem", aPrivateKey); bool bResult = pDocument->m_pDocumentClass->insertCertificate(pDocument, aCertificate.data(), int(aCertificate.size()), |