ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

chart2: qa: cover histogram bin count property roundtrip

Browse Source 
The test verifies that FrequencyType=2 and BinCount=3 survive ODS and
XLSX save/reload. The generated bin labels are intentionally not asserted
here, because fixed bin-count calculation is not implemented yet and still
falls back to the current automatic/bin-width result.

Signed-off-by: Devansh Varshney <varshney.devansh614@gmail.com>
Change-Id: Iaf1f0f89d82423eee057e8e480a559604b0b1a70
Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/4074
Reviewed-by: Tomaž Vajngerl <tomaz.vajngerl@collabora.com>
Tested-by: Tomaž Vajngerl <tomaz.vajngerl@collabora.com>
(cherry picked from commit 0300d06dcc060c6ac060cfd1dfe989acb3d960d7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/206713
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
Devansh Varshney
2026-06-17 21:50:59 +02:00
committed by Xisco Fauli
parent 6616275590
commit f78fcd8973
1 changed files with 85 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chart2/qa/extras/chart2import2.cxx
+85
View File
@@ -1108,6 +1108,91 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testHistogramXLSXRoundtrip)
CPPUNIT_ASSERT_EQUAL(2.5, fBinWidth);
}
CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testHistogramBinCountRoundtrip_ODS)
{
// ODF: fixed number of bins survives export/reload at the model level.
loadFromFile(u"fods/tdf163727_histogram_roundtrip.fods");
uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0);
CPPUNIT_ASSERT(xChartDoc.is());
Reference<chart2::XChartType> xChartType = getChartTypeFromDoc(xChartDoc, 0, 0);
CPPUNIT_ASSERT(xChartType.is());
Reference<beans::XPropertySet> xProps(xChartType, uno::UNO_QUERY_THROW);
xProps->setPropertyValue(u"FrequencyType"_ustr, uno::Any(sal_Int32(2)));
xProps->setPropertyValue(u"BinCount"_ustr, uno::Any(sal_Int32(3)));
saveAndReload(TestFilter::ODS);
xmlDocUniquePtr pXmlDoc = parseExport(u"Object 1/content.xml"_ustr);
CPPUNIT_ASSERT(pXmlDoc);
static constexpr char sHistogramProps[]
= "/office:document-content/office:automatic-styles/style:style[@style:family='chart']/"
"style:chart-properties[@loext:frequency-type]";
assertXPath(pXmlDoc, sHistogramProps, "frequency-type", u"2");
assertXPath(pXmlDoc, sHistogramProps, "bin-count", u"3");
xChartDoc = getChartDocFromSheet(0);
CPPUNIT_ASSERT(xChartDoc.is());
xChartType = getChartTypeFromDoc(xChartDoc, 0, 0);
CPPUNIT_ASSERT(xChartType.is());
Reference<beans::XPropertySet> xReloadedProps(xChartType, uno::UNO_QUERY_THROW);
sal_Int32 nFrequencyType = -1;
CPPUNIT_ASSERT(xReloadedProps->getPropertyValue(u"FrequencyType"_ustr) >>= nFrequencyType);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), nFrequencyType);
sal_Int32 nBinCount = -1;
CPPUNIT_ASSERT(xReloadedProps->getPropertyValue(u"BinCount"_ustr) >>= nBinCount);
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), nBinCount);
}
CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testHistogramBinCountRoundtrip_XLSX)
{
// XLSX: fixed number of bins is written as cx:binCount and survives reload.
loadFromFile(u"xlsx/SimpleHistogram.xlsx");
uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0);
CPPUNIT_ASSERT(xChartDoc.is());
Reference<chart2::XChartType> xChartType = getChartTypeFromDoc(xChartDoc, 0, 0);
CPPUNIT_ASSERT(xChartType.is());
Reference<beans::XPropertySet> xXlsxProps(xChartType, uno::UNO_QUERY_THROW);
xXlsxProps->setPropertyValue(u"FrequencyType"_ustr, uno::Any(sal_Int32(2)));
xXlsxProps->setPropertyValue(u"BinCount"_ustr, uno::Any(sal_Int32(3)));
saveAndReload(TestFilter::XLSX);
xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chartEx1.xml"_ustr);
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc,
"/cx:chartSpace/cx:chart/cx:plotArea/cx:plotAreaRegion/cx:series/cx:layoutPr/"
"cx:binning/cx:binCount",
"val", u"3");
xChartDoc = getChartDocFromSheet(0);
CPPUNIT_ASSERT(xChartDoc.is());
xChartType = getChartTypeFromDoc(xChartDoc, 0, 0);
CPPUNIT_ASSERT(xChartType.is());
Reference<beans::XPropertySet> xReloadedXlsxProps(xChartType, uno::UNO_QUERY_THROW);
sal_Int32 nFrequencyType = -1;
CPPUNIT_ASSERT(xReloadedXlsxProps->getPropertyValue(u"FrequencyType"_ustr) >>= nFrequencyType);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), nFrequencyType);
sal_Int32 nBinCount = -1;
CPPUNIT_ASSERT(xReloadedXlsxProps->getPropertyValue(u"BinCount"_ustr) >>= nBinCount);
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), nBinCount);
}
CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testHistogramODSToXLSXExport)
{
// Exporting an ODF-origin histogram to XLSX must write the raw