From 6d23c9db771718eeb6d19da094662c86de39621f Mon Sep 17 00:00:00 2001 From: Daniel Bankston Date: Wed, 6 Jun 2012 16:13:19 -0500 Subject: Extend repeated columns unit test to check both text and numbers Change-Id: I7d261958f81f73dfce44f27c0130f68c5c4b233f --- sc/qa/unit/data/contentCSV/repeatedColumns.csv | 1 - sc/qa/unit/data/contentCSV/repeatedColumns1.csv | 1 + sc/qa/unit/data/contentCSV/repeatedColumns2.csv | 1 + sc/qa/unit/data/ods/repeatedColumns.ods | Bin 7425 -> 7475 bytes sc/qa/unit/subsequent_filters-test.cxx | 12 +++++++++--- 5 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 sc/qa/unit/data/contentCSV/repeatedColumns.csv create mode 100644 sc/qa/unit/data/contentCSV/repeatedColumns1.csv create mode 100644 sc/qa/unit/data/contentCSV/repeatedColumns2.csv (limited to 'sc') diff --git a/sc/qa/unit/data/contentCSV/repeatedColumns.csv b/sc/qa/unit/data/contentCSV/repeatedColumns.csv deleted file mode 100644 index ffcf6c2ddc2d..000000000000 --- a/sc/qa/unit/data/contentCSV/repeatedColumns.csv +++ /dev/null @@ -1 +0,0 @@ -test,test,test,test,test,test diff --git a/sc/qa/unit/data/contentCSV/repeatedColumns1.csv b/sc/qa/unit/data/contentCSV/repeatedColumns1.csv new file mode 100644 index 000000000000..ffcf6c2ddc2d --- /dev/null +++ b/sc/qa/unit/data/contentCSV/repeatedColumns1.csv @@ -0,0 +1 @@ +test,test,test,test,test,test diff --git a/sc/qa/unit/data/contentCSV/repeatedColumns2.csv b/sc/qa/unit/data/contentCSV/repeatedColumns2.csv new file mode 100644 index 000000000000..e0020ad0a7cf --- /dev/null +++ b/sc/qa/unit/data/contentCSV/repeatedColumns2.csv @@ -0,0 +1 @@ +5,5,5,5,5 diff --git a/sc/qa/unit/data/ods/repeatedColumns.ods b/sc/qa/unit/data/ods/repeatedColumns.ods index f1e7b69f7a6c..3b550578ca3d 100644 Binary files a/sc/qa/unit/data/ods/repeatedColumns.ods and b/sc/qa/unit/data/ods/repeatedColumns.ods differ diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 178dd9db51ca..763383228503 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -683,9 +683,15 @@ void ScFiltersTest::testRepeatedColumnsODS() ScDocument* pDoc = xDocSh->GetDocument(); - rtl::OUString aCSVFileName; - createCSVPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("repeatedColumns.")), aCSVFileName); - testFile(aCSVFileName, pDoc, 0); + //text + rtl::OUString aCSVFileName1; + createCSVPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("repeatedColumns1.")), aCSVFileName1); + testFile(aCSVFileName1, pDoc, 0); + + //numbers + rtl::OUString aCSVFileName2; + createCSVPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("repeatedColumns2.")), aCSVFileName2); + testFile(aCSVFileName2, pDoc, 1); xDocSh->DoClose(); } -- cgit v1.2.3