From kde-commits Sat Oct 16 20:53:18 2010 From: Johannes Simon Date: Sat, 16 Oct 2010 20:53:18 +0000 To: kde-commits Subject: koffice/plugins/chartshape/tests Message-Id: <20101016205318.18F11AC89E () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=128726243819356 SVN commit 1186558 by jsimon: Adjust ChartProxyModel test to new behaviour for bubble chart data M +6 -7 TestProxyModel.cpp --- trunk/koffice/plugins/chartshape/tests/TestProxyModel.cpp #1186557:1186558 @@ -588,16 +588,15 @@ QCOMPARE( dataSets[0]->size(), 5 ); QCOMPARE( dataSets[1]->size(), 5 ); - QCOMPARE( dataSets[0]->xDataRegion(), CellRegion( m_table, QRect( 1, 1, 5, 1 ) ) ); - QCOMPARE( dataSets[0]->yDataRegion(), CellRegion( m_table, QRect( 1, 2, 5, 1 ) ) ); - QCOMPARE( dataSets[0]->customDataRegion(), CellRegion( m_table, QRect( 1, 3, 5, 1 ) ) ); + QCOMPARE( dataSets[0]->xDataRegion(), CellRegion() ); + QCOMPARE( dataSets[0]->yDataRegion(), CellRegion( &m_source, "Table1.$A$1:$E$1" ) ); + QCOMPARE( dataSets[0]->customDataRegion(), CellRegion( &m_source, "Table1.$A$2:$E$2" ) ); QCOMPARE( dataSets[0]->labelDataRegion(), CellRegion() ); QCOMPARE( dataSets[0]->categoryDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->xDataRegion(), CellRegion( m_table, QRect( 1, 1, 5, 1 ) ) ); - QCOMPARE( dataSets[1]->yDataRegion(), CellRegion( m_table, QRect( 1, 4, 5, 1 ) ) ); - // Since there's only four rows, not the necessary five, this region must be empty - QCOMPARE( dataSets[1]->customDataRegion(), CellRegion() ); + QCOMPARE( dataSets[1]->xDataRegion(), CellRegion() ); + QCOMPARE( dataSets[1]->yDataRegion(), CellRegion( &m_source, "Table1.$A$3:$E$3" ) ); + QCOMPARE( dataSets[1]->customDataRegion(), CellRegion( &m_source, "Table1.$A$4:$E$4" ) ); QCOMPARE( dataSets[1]->labelDataRegion(), CellRegion() ); QCOMPARE( dataSets[1]->categoryDataRegion(), CellRegion() ); }