ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

UnoApiTest: merge loadFromURL and loadWithParams into one

Browse Source 
Change-Id: Ib58c211542018f07303cadacda86e3419062401e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199297
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
Xisco Fauli
2026-02-12 20:58:05 +01:00
parent 5a0d14eb62
commit 6577d2a942
27 changed files with 99 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xmlsecurity/qa/unit/signing/signing.cxx
+16 -18
View File
@@ -751,7 +751,7 @@ CPPUNIT_TEST_FIXTURE(SigningTest, testPDFAddVisibleSignature)
// Open it.
uno::Sequence<beans::PropertyValue> aArgs
= { comphelper::makePropertyValue(u"ReadOnly"_ustr, true) };
loadWithParams(maTempFile.GetURL(), aArgs);
loadFromURL(maTempFile.GetURL(), aArgs);
SfxBaseModel* pBaseModel = dynamic_cast<SfxBaseModel*>(mxComponent.get());
CPPUNIT_ASSERT(pBaseModel);
SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
@@ -1297,7 +1297,7 @@ CPPUNIT_TEST_FIXTURE(SigningTest, testInvalidZIP)
uno::Sequence<beans::PropertyValue> args = { comphelper::makePropertyValue(
u"InteractionHandler"_ustr, uno::Reference<task::XInteractionHandler>(pIH)) };
loadWithParams(createFileURL(u"signature-forgery-cdh-lfh.docx"), args);
loadFromFile(u"signature-forgery-cdh-lfh.docx", args);
SfxBaseModel* pBaseModel = dynamic_cast<SfxBaseModel*>(mxComponent.get());
CPPUNIT_ASSERT(pBaseModel);
SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
@@ -1402,8 +1402,7 @@ CPPUNIT_TEST_FIXTURE(SigningTest, testPreserveMacroTemplateSignature12_ODF)
const OUString sLoadMessage = "loading failed: " + aURL;
// load the template as-is to validate signatures
loadWithParams(aURL,
comphelper::InitPropertySequence({ { "AsTemplate", uno::Any(false) } }));
loadFromURL(aURL, comphelper::InitPropertySequence({ { "AsTemplate", uno::Any(false) } }));
// we are a template, and have a valid document and macro signature
assertDocument(CPPUNIT_SOURCELINE(), TestFilter::OTT, SignatureState::OK,
@@ -1430,8 +1429,8 @@ CPPUNIT_TEST_FIXTURE(SigningTest, testPreserveMacroTemplateSignature12_ODF)
save(eFormat);
// load the saved OTT template as-is to validate signatures
loadWithParams(maTempFile.GetURL(),
comphelper::InitPropertySequence({ { "AsTemplate", uno::Any(false) } }));
loadFromURL(maTempFile.GetURL(),
comphelper::InitPropertySequence({ { "AsTemplate", uno::Any(false) } }));
}
// the loaded document is a OTT/ODT with a macro signature
@@ -1442,8 +1441,8 @@ CPPUNIT_TEST_FIXTURE(SigningTest, testPreserveMacroTemplateSignature12_ODF)
save(TestFilter::OTT);
// load the template as-is to validate signatures
loadWithParams(maTempFile.GetURL(),
comphelper::InitPropertySequence({ { "AsTemplate", uno::Any(false) } }));
loadFromURL(maTempFile.GetURL(),
comphelper::InitPropertySequence({ { "AsTemplate", uno::Any(false) } }));
// the loaded document is a OTT with a valid macro signature
assertDocument(CPPUNIT_SOURCELINE(), TestFilter::OTT, SignatureState::NOSIGNATURES,
@@ -1458,7 +1457,7 @@ CPPUNIT_TEST_FIXTURE(SigningTest, testDropMacroTemplateSignature)
const OUString sLoadMessage = "loading failed: " + aURL;
// load the template as-is to validate signatures
loadWithParams(aURL, comphelper::InitPropertySequence({ { "AsTemplate", uno::Any(false) } }));
loadFromURL(aURL, comphelper::InitPropertySequence({ { "AsTemplate", uno::Any(false) } }));
// we are a template, and have a non-invalid macro signature
assertDocument(CPPUNIT_SOURCELINE(), TestFilter::OTT, SignatureState::NOSIGNATURES,
@@ -1481,7 +1480,7 @@ CPPUNIT_TEST_FIXTURE(SigningTest, testDropMacroTemplateSignature)
SignatureState::NOSIGNATURES, ODFVER_014_TEXT);
// load the template as-is to validate signatures
loadWithParams(aURL, comphelper::InitPropertySequence({ { "AsTemplate", uno::Any(false) } }));
loadFromURL(aURL, comphelper::InitPropertySequence({ { "AsTemplate", uno::Any(false) } }));
// we are a template, and have a non-invalid macro signature
assertDocument(CPPUNIT_SOURCELINE(), TestFilter::OTT, SignatureState::NOSIGNATURES,
@@ -1491,8 +1490,8 @@ CPPUNIT_TEST_FIXTURE(SigningTest, testDropMacroTemplateSignature)
save(TestFilter::OTT);
// load the template as-is to validate signatures
loadWithParams(maTempFile.GetURL(),
comphelper::InitPropertySequence({ { "AsTemplate", uno::Any(false) } }));
loadFromURL(maTempFile.GetURL(),
comphelper::InitPropertySequence({ { "AsTemplate", uno::Any(false) } }));
// the loaded document is a 1.2 OTT without any signatures
assertDocument(CPPUNIT_SOURCELINE(), TestFilter::OTT, SignatureState::NOSIGNATURES,
@@ -1514,8 +1513,7 @@ CPPUNIT_TEST_FIXTURE(SigningTest, testPreserveMacroTemplateSignature10)
const OUString sLoadMessage = "loading failed: " + aURL;
// load the template as-is to validate signatures
loadWithParams(aURL,
comphelper::InitPropertySequence({ { "AsTemplate", uno::Any(false) } }));
loadFromURL(aURL, comphelper::InitPropertySequence({ { "AsTemplate", uno::Any(false) } }));
// we are a template, and have a non-invalid macro signature
assertDocument(CPPUNIT_SOURCELINE(), TestFilter::OTT, SignatureState::NOSIGNATURES,
@@ -1542,8 +1540,8 @@ CPPUNIT_TEST_FIXTURE(SigningTest, testPreserveMacroTemplateSignature10)
save(TestFilter::OTT);
// load the saved OTT template as-is to validate signatures
loadWithParams(maTempFile.GetURL(),
comphelper::InitPropertySequence({ { "AsTemplate", uno::Any(false) } }));
loadFromURL(maTempFile.GetURL(),
comphelper::InitPropertySequence({ { "AsTemplate", uno::Any(false) } }));
}
assertDocument(CPPUNIT_SOURCELINE(), eFormat, SignatureState::NOSIGNATURES,
@@ -1552,8 +1550,8 @@ CPPUNIT_TEST_FIXTURE(SigningTest, testPreserveMacroTemplateSignature10)
save(TestFilter::OTT);
// load the template as-is to validate signatures
loadWithParams(maTempFile.GetURL(),
comphelper::InitPropertySequence({ { "AsTemplate", uno::Any(false) } }));
loadFromURL(maTempFile.GetURL(),
comphelper::InitPropertySequence({ { "AsTemplate", uno::Any(false) } }));
// the loaded document is a OTT with a non-invalid macro signature
assertDocument(CPPUNIT_SOURCELINE(), TestFilter::OTT, SignatureState::NOSIGNATURES,
xmlsecurity/qa/unit/signing/signing2.cxx
+2 -2
View File
@@ -112,7 +112,7 @@ CPPUNIT_TEST_FIXTURE(SigningTest2, testPreserveMacroSignatureODB)
CPPUNIT_TEST_FIXTURE(SigningTest2, testPasswordPreserveMacroSignatureODF13)
{
// load ODF 1.3 encrypted document
loadFromFile(u"encrypted_scriptsig_odf13.odt", "password");
loadFromFile(u"encrypted_scriptsig_odf13.odt", /*rParams*/ {}, "password");
{
uno::Reference<text::XTextDocument> xTextDoc(mxComponent, uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_EQUAL(u"secret"_ustr, xTextDoc->getText()->getString());
@@ -235,7 +235,7 @@ CPPUNIT_TEST_FIXTURE(SigningTest2, testPasswordPreserveMacroSignatureODF13)
CPPUNIT_TEST_FIXTURE(SigningTest2, testPasswordPreserveMacroSignatureODFWholesomeLO242)
{
// load wholesome ODF (extended) encrypted document
loadFromFile(u"encrypted_scriptsig_lo242.odt", "password");
loadFromFile(u"encrypted_scriptsig_lo242.odt", /*rParams*/ {}, "password");
{
uno::Reference<text::XTextDocument> xTextDoc(mxComponent, uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_EQUAL(u"secret"_ustr, xTextDoc->getText()->getString());