summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorDaniel Bankston <daniel.e.bankston@gmail.com>2012-06-06 16:13:19 -0500
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-06-17 17:04:02 +0200
commit6d23c9db771718eeb6d19da094662c86de39621f (patch)
treeeadc4a6ccf3bafcb9b75eef55195309ebc2b1beb /sc
parente427f658195e9765e5eaad6c71a9f449cc83060c (diff)
Extend repeated columns unit test to check both text and numbers
Change-Id: I7d261958f81f73dfce44f27c0130f68c5c4b233f
Diffstat (limited to 'sc')
-rw-r--r--sc/qa/unit/data/contentCSV/repeatedColumns1.csv (renamed from sc/qa/unit/data/contentCSV/repeatedColumns.csv)0
-rw-r--r--sc/qa/unit/data/contentCSV/repeatedColumns2.csv1
-rw-r--r--sc/qa/unit/data/ods/repeatedColumns.odsbin7425 -> 7475 bytes
-rw-r--r--sc/qa/unit/subsequent_filters-test.cxx12
4 files changed, 10 insertions, 3 deletions
diff --git a/sc/qa/unit/data/contentCSV/repeatedColumns.csv b/sc/qa/unit/data/contentCSV/repeatedColumns1.csv
index ffcf6c2ddc2d..ffcf6c2ddc2d 100644
--- a/sc/qa/unit/data/contentCSV/repeatedColumns.csv
+++ b/sc/qa/unit/data/contentCSV/repeatedColumns1.csv
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
--- a/sc/qa/unit/data/ods/repeatedColumns.ods
+++ b/sc/qa/unit/data/ods/repeatedColumns.ods
Binary files 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();
}