diff options
author | Eike Rathke <erack@redhat.com> | 2018-04-13 17:56:57 +0100 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2018-04-13 18:57:11 +0200 |
commit | f762607ae0f1ea02323401de387318b7b0f09a36 (patch) | |
tree | ccca2bcf9a77c4cf5cfa8c3c671831fabbecf13d /sc/qa | |
parent | c1084f6d791b69e612acfe7484f4f38b41662c80 (diff) |
Revert "calc: unit tests for data validation"
This reverts commit 78d774381b09fc244de162211e9c3fbfe891cbea.
Makes unit tests fail, see comment in https://gerrit.libreoffice.org/50381
Change-Id: I16d00540e12482c47e9a300958746730f12c008a
Reviewed-on: https://gerrit.libreoffice.org/52849
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc/qa')
-rw-r--r-- | sc/qa/unit/data/contentCSV/dataValidity3.csv | 4 | ||||
-rw-r--r-- | sc/qa/unit/data/ods/dataValidity.ods | bin | 9493 -> 8425 bytes | |||
-rw-r--r-- | sc/qa/unit/data/xlsx/dataValidity.xlsx | bin | 11268 -> 0 bytes | |||
-rw-r--r-- | sc/qa/unit/subsequent_filters-test.cxx | 39 |
4 files changed, 0 insertions, 43 deletions
diff --git a/sc/qa/unit/data/contentCSV/dataValidity3.csv b/sc/qa/unit/data/contentCSV/dataValidity3.csv deleted file mode 100644 index a8c82cecabdf..000000000000 --- a/sc/qa/unit/data/contentCSV/dataValidity3.csv +++ /dev/null @@ -1,4 +0,0 @@ -"",, -"",,Enter text not a numeric value. -"",,AAAA -"",,AAA12 diff --git a/sc/qa/unit/data/ods/dataValidity.ods b/sc/qa/unit/data/ods/dataValidity.ods Binary files differindex 9daf01ce7798..008cea5561fc 100644 --- a/sc/qa/unit/data/ods/dataValidity.ods +++ b/sc/qa/unit/data/ods/dataValidity.ods diff --git a/sc/qa/unit/data/xlsx/dataValidity.xlsx b/sc/qa/unit/data/xlsx/dataValidity.xlsx Binary files differdeleted file mode 100644 index da4d3ab41133..000000000000 --- a/sc/qa/unit/data/xlsx/dataValidity.xlsx +++ /dev/null diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 6d7d2496aa2e..2e876434ce49 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -137,7 +137,6 @@ public: void testMergedCellsODS(); void testRepeatedColumnsODS(); void testDataValidityODS(); - void testDataValidityXLSX(); void testDataTableMortgageXLS(); void testDataTableOneVarXLSX(); void testDataTableMultiTableXLSX(); @@ -279,7 +278,6 @@ public: CPPUNIT_TEST(testMergedCellsODS); CPPUNIT_TEST(testRepeatedColumnsODS); CPPUNIT_TEST(testDataValidityODS); - CPPUNIT_TEST(testDataValidityXLSX); CPPUNIT_TEST(testDataTableMortgageXLS); CPPUNIT_TEST(testDataTableOneVarXLSX); CPPUNIT_TEST(testDataTableMultiTableXLSX); @@ -1334,7 +1332,6 @@ void ScFiltersTest::testDataValidityODS() ScAddress aValBaseAddr1( 2,6,0 ); //sheet1 ScAddress aValBaseAddr2( 2,3,1 ); //sheet2 - ScAddress aValBaseAddr3( 2,2,2 ); //sheet3 //sheet1's expected Data Validation Entry values ValDataTestParams aVDTParams1( @@ -1350,27 +1347,17 @@ void ScFiltersTest::testDataValidityODS() "Must be a whole number between 1 and 10.", SC_VALERR_STOP, 2 ); - //sheet3's expected Data Validation Entry values - ValDataTestParams aVDTParams3( - SC_VALID_CUSTOM, ScConditionMode::Direct, "ISTEXT(C3)", EMPTY_OUSTRING, rDoc, - aValBaseAddr3, "Error sheet 3", - "Must not be a numerical value.", - SC_VALERR_STOP, 3 - ); //check each sheet's Data Validation Entries checkValiditationEntries( aVDTParams1 ); checkValiditationEntries( aVDTParams2 ); - checkValiditationEntries( aVDTParams3 ); //expected ranges to be associated with data validity ScRange aRange1( 2,2,0, 2,6,0 ); //sheet1 ScRange aRange2( 2,3,1, 6,7,1 ); //sheet2 - ScRange aRange3( 2,2,2, 2,6,2 ); //sheet3 //check each sheet's cells for data validity checkCellValidity( aValBaseAddr1, aRange1, rDoc ); checkCellValidity( aValBaseAddr2, aRange2, rDoc ); - checkCellValidity( aValBaseAddr3, aRange3, rDoc ); //check each sheet's content OUString aCSVFileName1; @@ -1381,32 +1368,6 @@ void ScFiltersTest::testDataValidityODS() createCSVPath("dataValidity2.", aCSVFileName2); testFile(aCSVFileName2, rDoc, 1); - OUString aCSVFileName3; - createCSVPath("dataValidity3.", aCSVFileName3); - testFile(aCSVFileName3, rDoc, 2); - - xDocSh->DoClose(); -} - -void ScFiltersTest::testDataValidityXLSX() -{ - ScDocShellRef xDocSh = loadDoc("dataValidity.", FORMAT_XLSX); - ScDocument& rDoc = xDocSh->GetDocument(); - - ScAddress aValBaseAddr1( 2,6,0 ); //sheet1 - ScAddress aValBaseAddr2( 2,3,1 ); //sheet2 - ScAddress aValBaseAddr3( 2,2,2 ); //sheet3 - - //expected ranges to be associated with data validity - ScRange aRange1( 2,2,0, 2,6,0 ); //sheet1 - ScRange aRange2( 2,3,1, 6,7,1 ); //sheet2 - ScRange aRange3( 2,2,2, 2,6,2 ); //sheet3 - - //check each sheet's cells for data validity - checkCellValidity( aValBaseAddr1, aRange1, rDoc ); - checkCellValidity( aValBaseAddr2, aRange2, rDoc ); - checkCellValidity( aValBaseAddr3, aRange3, rDoc ); - xDocSh->DoClose(); } |