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

Extend current database range unit test to also check xls and xlsx

Browse Source 
Since Excel doesn't support named database ranges, I also added tests for
unnamed database ranges for ods, xls, and xlsx.

Change-Id: I491324883c95cf2edb13c0561e975a13d13ba7d7
This commit is contained in:
Daniel Bankston
2012-06-11 02:42:30 -05:00
committed by Fridrich Štrba
parent 6799962a4b
commit 47e4a33a64
4 changed files with 58 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
sc/qa/unit/data/ods/database.ods
View File

Binary file not shown.

BIN
sc/qa/unit/data/xls/database.xls Normal file
View File

Binary file not shown.

BIN
sc/qa/unit/data/xlsx/database.xlsx Normal file
View File

Binary file not shown.

71
sc/qa/unit/subsequent_filters-test.cxx
View File

@@ -101,6 +101,8 @@ public:
void testRangeNameXLSX(); void testRangeNameXLSX();
void testFunctionsODS(); void testFunctionsODS();
void testDatabaseRangesODS(); void testDatabaseRangesODS();
void testDatabaseRangesXLS();
void testDatabaseRangesXLSX();
void testFormatsODS(); void testFormatsODS();
void testFormatsXLS(); void testFormatsXLS();
void testFormatsXLSX(); void testFormatsXLSX();
@@ -127,6 +129,8 @@ public:
CPPUNIT_TEST(testRangeNameXLSX); CPPUNIT_TEST(testRangeNameXLSX);
CPPUNIT_TEST(testFunctionsODS); CPPUNIT_TEST(testFunctionsODS);
CPPUNIT_TEST(testDatabaseRangesODS); CPPUNIT_TEST(testDatabaseRangesODS);
CPPUNIT_TEST(testDatabaseRangesXLS);
CPPUNIT_TEST(testDatabaseRangesXLSX);
CPPUNIT_TEST(testFormatsODS); CPPUNIT_TEST(testFormatsODS);
CPPUNIT_TEST(testFormatsXLS); CPPUNIT_TEST(testFormatsXLS);
CPPUNIT_TEST(testFormatsXLSX); CPPUNIT_TEST(testFormatsXLSX);
@@ -318,13 +322,10 @@ void ScFiltersTest::testFunctionsODS()
xDocSh->DoClose(); xDocSh->DoClose();
} }
void ScFiltersTest::testDatabaseRangesODS() namespace {
{
const rtl::OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("database."));
ScDocShellRef xDocSh = loadDoc(aFileNameBase, 0);
xDocSh->DoHardRecalc(true);
ScDocument* pDoc = xDocSh->GetDocument(); void testDBRanges_Impl(ScDocument* pDoc, sal_Int32 nFormat)
{
ScDBCollection* pDBCollection = pDoc->GetDBCollection(); ScDBCollection* pDBCollection = pDoc->GetDBCollection();
CPPUNIT_ASSERT_MESSAGE("no database collection", pDBCollection); CPPUNIT_ASSERT_MESSAGE("no database collection", pDBCollection);
@@ -343,15 +344,59 @@ void ScFiltersTest::testDatabaseRangesODS()
CPPUNIT_ASSERT_MESSAGE("Sheet1: row 4-5 should be hidden", bHidden && nRow1 == 4 && nRow2 == 5); CPPUNIT_ASSERT_MESSAGE("Sheet1: row 4-5 should be hidden", bHidden && nRow1 == 4 && nRow2 == 5);
bHidden = pDoc->RowHidden(6, 0, &nRow1, &nRow2); bHidden = pDoc->RowHidden(6, 0, &nRow1, &nRow2);
CPPUNIT_ASSERT_MESSAGE("Sheet1: row 6-end should be visible", !bHidden && nRow1 == 6 && nRow2 == MAXROW); CPPUNIT_ASSERT_MESSAGE("Sheet1: row 6-end should be visible", !bHidden && nRow1 == 6 && nRow2 == MAXROW);
if(nFormat == ODS) //excel doesn't support named db ranges
{
double aValue;
pDoc->GetValue(0,10,1, aValue);
rtl::OUString aString;
CPPUNIT_ASSERT_MESSAGE("Sheet2: A11: formula result is incorrect", aValue == 4);
pDoc->GetValue(1, 10, 1, aValue);
CPPUNIT_ASSERT_MESSAGE("Sheet2: B11: formula result is incorrect", aValue == 2);
}
double aValue; double aValue;
pDoc->GetValue(0,10,1, aValue); pDoc->GetValue(3,10,1, aValue);
rtl::OUString aString; rtl::OUString aString;
pDoc->GetFormula(0,10,1,aString); CPPUNIT_ASSERT_MESSAGE("Sheet2: D11: formula result is incorrect", aValue == 4);
rtl::OString aOString; pDoc->GetValue(4, 10, 1, aValue);
aOString = rtl::OUStringToOString(aString, RTL_TEXTENCODING_UTF8); CPPUNIT_ASSERT_MESSAGE("Sheet2: E11: formula result is incorrect", aValue == 2);
CPPUNIT_ASSERT_MESSAGE("Sheet2: A11: formula result is incorrect", aValue == 4);
pDoc->GetValue(1, 10, 1, aValue); }
CPPUNIT_ASSERT_MESSAGE("Sheet2: B11: formula result is incorrect", aValue == 2);
}
void ScFiltersTest::testDatabaseRangesODS()
{
const rtl::OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("database."));
ScDocShellRef xDocSh = loadDoc(aFileNameBase, 0);
xDocSh->DoHardRecalc(true);
ScDocument* pDoc = xDocSh->GetDocument();
testDBRanges_Impl(pDoc, ODS);
xDocSh->DoClose();
}
void ScFiltersTest::testDatabaseRangesXLS()
{
const rtl::OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("database."));
ScDocShellRef xDocSh = loadDoc(aFileNameBase, 1);
xDocSh->DoHardRecalc(true);
ScDocument* pDoc = xDocSh->GetDocument();
testDBRanges_Impl(pDoc, XLS);
xDocSh->DoClose();
}
void ScFiltersTest::testDatabaseRangesXLSX()
{
const rtl::OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("database."));
ScDocShellRef xDocSh = loadDoc(aFileNameBase, 2);
xDocSh->DoHardRecalc(true);
ScDocument* pDoc = xDocSh->GetDocument();
testDBRanges_Impl(pDoc, XLSX);
xDocSh->DoClose(); xDocSh->DoClose();
} }