mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CppunitTest_xmloff_draw: simplify a bit

Browse Source 
Change-Id: Ic36e2c50953e99d7509c1d16ffef2f9f5f3a7bf4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173992
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Jenkins
This commit is contained in:
Xisco Fauli 2024-09-26 15:56:50 +02:00
parent b617ac7322
commit fc9155f8cd
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
xmloff/qa/unit/draw.cxx
View File

@ -288,7 +288,7 @@ CPPUNIT_TEST_FIXTURE(XmloffDrawTest, testTextAndFillThemeColorExportImport)
{ {
// Given a document that refers to a theme color: // Given a document that refers to a theme color:
loadFromFile(u"Reference-ThemeColors-TextAndFill.pptx"); loadFromFile(u"Reference-ThemeColors-TextAndFill.pptx");
save(u"impress8"_ustr); saveAndReload(u"impress8"_ustr);
// Make sure the export result has the theme reference: // Make sure the export result has the theme reference:
xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr); xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr);
@ -345,9 +345,6 @@ CPPUNIT_TEST_FIXTURE(XmloffDrawTest, testTextAndFillThemeColorExportImport)
assertXPath(pXmlDoc, aShape3 + "/loext:transformation[1]", "type"_ostr, u"lummod"_ustr); assertXPath(pXmlDoc, aShape3 + "/loext:transformation[1]", "type"_ostr, u"lummod"_ustr);
assertXPath(pXmlDoc, aShape3 + "/loext:transformation[1]", "value"_ostr, u"5000"_ustr); assertXPath(pXmlDoc, aShape3 + "/loext:transformation[1]", "value"_ostr, u"5000"_ustr);
// reload
load(maTempFile.GetURL());
// check fill color theme // check fill color theme
{ {
uno::Reference<drawing::XShape> xShape(getShape(0)); uno::Reference<drawing::XShape> xShape(getShape(0));
@ -463,9 +460,7 @@ CPPUNIT_TEST_FIXTURE(XmloffDrawTest, testTextAndFillThemeColorExportImport)
CPPUNIT_TEST_FIXTURE(XmloffDrawTest, testThemeColor_ShapeFill) CPPUNIT_TEST_FIXTURE(XmloffDrawTest, testThemeColor_ShapeFill)
{ {
loadFromFile(u"ReferenceShapeFill.pptx"); loadFromFile(u"ReferenceShapeFill.pptx");
save(u"impress8"_ustr); saveAndReload(u"impress8"_ustr);
// reload
load(maTempFile.GetURL());
// check fill color theme // check fill color theme
uno::Reference<drawing::XShape> xShape(getShape(0)); uno::Reference<drawing::XShape> xShape(getShape(0));
@ -535,7 +530,7 @@ CPPUNIT_TEST_FIXTURE(XmloffDrawTest, testExtrusionMetalTypeExtended)
lcl_assertMetalProperties("from doc", xShape); lcl_assertMetalProperties("from doc", xShape);
// Test, that new attribute is written with loext namespace. Adapt when attribute is added to ODF. // Test, that new attribute is written with loext namespace. Adapt when attribute is added to ODF.
save(u"writer8"_ustr); saveAndReload(u"writer8"_ustr);
// assert XML. // assert XML.
xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr); xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr);
@ -544,8 +539,6 @@ CPPUNIT_TEST_FIXTURE(XmloffDrawTest, testExtrusionMetalTypeExtended)
pXmlDoc, pXmlDoc,
"//draw:enhanced-geometry[@loext:extrusion-metal-type='loext:MetalMSCompatible']"_ostr); "//draw:enhanced-geometry[@loext:extrusion-metal-type='loext:MetalMSCompatible']"_ostr);
// reload
mxComponent = loadFromDesktop(maTempFile.GetURL(), u"com.sun.star.text.TextDocument"_ustr);
// verify properties // verify properties
uno::Reference<drawing::XShape> xShapeReload(getShape(0)); uno::Reference<drawing::XShape> xShapeReload(getShape(0));
lcl_assertMetalProperties("from ODF 1.3 extended", xShapeReload); lcl_assertMetalProperties("from ODF 1.3 extended", xShapeReload);
@ -596,7 +589,7 @@ CPPUNIT_TEST_FIXTURE(XmloffDrawTest, testExtrusionSpecularityExtended)
// Test, that attribute is written in draw namespace with value 100% and in loext namespace with // Test, that attribute is written in draw namespace with value 100% and in loext namespace with
// value 122.0703125%. // value 122.0703125%.
save(u"writer8"_ustr); saveAndReload(u"writer8"_ustr);
// assert XML. // assert XML.
xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr); xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr);
@ -604,8 +597,6 @@ CPPUNIT_TEST_FIXTURE(XmloffDrawTest, testExtrusionSpecularityExtended)
assertXPath(pXmlDoc, assertXPath(pXmlDoc,
"//draw:enhanced-geometry[@loext:extrusion-specularity-loext='122.0703125%']"_ostr); "//draw:enhanced-geometry[@loext:extrusion-specularity-loext='122.0703125%']"_ostr);
// reload and verify, that the loext value is used
mxComponent = loadFromDesktop(maTempFile.GetURL(), u"com.sun.star.text.TextDocument"_ustr);
// verify properties // verify properties
uno::Reference<drawing::XShape> xShapeReload(getShape(0)); uno::Reference<drawing::XShape> xShapeReload(getShape(0));
lcl_assertSpecularityProperty("from ODF 1.3 extended", xShapeReload); lcl_assertSpecularityProperty("from ODF 1.3 extended", xShapeReload);