[Libreoffice-commits] core.git: 3 commits - sc/qa

[Markus Mohrhard]

 sc/qa/unit/data/contentCSV/database-functions.csv |   12 ++++++
 sc/qa/unit/data/contentCSV/text-functions.csv     |   38 +++++++++++++++++++++-
 sc/qa/unit/data/ods/database-functions.ods        |binary
 sc/qa/unit/data/ods/functions.ods                 |binary
 sc/qa/unit/subsequent_filters-test.cxx            |   12 +++++-
 5 files changed, 59 insertions(+), 3 deletions(-)

New commits:
commit 0b25aab6276612bf165ee670f5f84e8e88f3453b
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Fri Apr 4 01:50:36 2014 +0200

    integrate database function test
    
    Change-Id: Ieb21b0a26caabfd3976de0eb20049e8ac8ec8533

diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index 0ba507b..86699888 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -409,6 +409,14 @@ void ScFiltersTest::testFunctionsODS()
     testFile(aCSVFileName, pDoc, 6);
 
     xDocSh->DoClose();
+
+    xDocSh = loadDoc("database-functions.", ODS);
+    CPPUNIT_ASSERT_MESSAGE("Failed to load functions.*", xDocSh.Is());
+    xDocSh->DoHardRecalc(true);
+    pDoc = xDocSh->GetDocument();
+
+    createCSVPath("database-functions.", aCSVFileName);
+    testFile(aCSVFileName, pDoc, 0);
 }
 
 void ScFiltersTest::testFunctionsExcel2010()
commit dce1a07be479468ac6b6d4cba619313e38edeb69
Author: Ken Biondi <kenbiondi at hotmail.com>
Date:   Fri Apr 4 01:49:05 2014 +0200

    add tests for database functions
    
    Change-Id: I65f8087772318eb14adc0eb65ab896e57677cbe3

diff --git a/sc/qa/unit/data/contentCSV/database-functions.csv b/sc/qa/unit/data/contentCSV/database-functions.csv
new file mode 100644
index 0000000..df547d7
--- /dev/null
+++ b/sc/qa/unit/data/contentCSV/database-functions.csv
@@ -0,0 +1,12 @@
+44.25
+2
+5
+7
+51
+150
+89760
+6.36396103067893
+3
+1650
+27
+4
diff --git a/sc/qa/unit/data/ods/database-functions.ods b/sc/qa/unit/data/ods/database-functions.ods
new file mode 100644
index 0000000..0dde2f8
Binary files /dev/null and b/sc/qa/unit/data/ods/database-functions.ods differ
commit 8ed4cc64302415defd1838c4a3799583e602b545
Author: Ken Biondi <kenbiondi at hotmail.com>
Date:   Thu Apr 3 22:00:58 2014 +0200

    improve text function tests
    
    Change-Id: Ia84fc5fa460dd27955dfc843d29b213b3b40ea46

diff --git a/sc/qa/unit/data/contentCSV/text-functions.csv b/sc/qa/unit/data/contentCSV/text-functions.csv
index 8002212..7d68f02 100644
--- a/sc/qa/unit/data/contentCSV/text-functions.csv
+++ b/sc/qa/unit/data/contentCSV/text-functions.csv
@@ -1,2 +1,38 @@
-te,est,est
+1014,2002
+ABCDEFGHIJKLMNOPQRSTUVWXYZ
+"0017","10001","00FF"
+A,a,d
+dog
+72,104,97
+Good Morning Mrs. Doe
+17,64206,5
+$255.00,$367.46
+FALSE
+
+6,2
+1234567.890
+
 t,tes,testing
+
+6
+12
+happy,ape
+te,est,est
+
+1000000.35,4500.75
+Cat,Monkey
+output,outputce
+shoeshoeshoe
+day
+
+CMXCIX,CMXCIX,LMVLIV,XMIX,VMIV,IM
+onpba
+2
+12abc12abc12abc,12312abc123
+,12345
+12.35,012.35
+hello world
+
+169
+MAYBE
+4321
diff --git a/sc/qa/unit/data/ods/functions.ods b/sc/qa/unit/data/ods/functions.ods
index 97d3b16..7f0d2ec 100644
Binary files a/sc/qa/unit/data/ods/functions.ods and b/sc/qa/unit/data/ods/functions.ods differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index 92429ad..0ba507b 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -400,7 +400,7 @@ void ScFiltersTest::testFunctionsODS()
     testFile(aCSVFileName, pDoc, 3);
     // text functions
     createCSVPath(OUString("text-functions."), aCSVFileName);
-    testFile(aCSVFileName, pDoc, 4);
+    testFile(aCSVFileName, pDoc, 4, PureString);
     // statistical functions
     createCSVPath(OUString("statistical-functions."), aCSVFileName);
     testFile(aCSVFileName, pDoc, 5);
@@ -559,7 +559,7 @@ void ScFiltersTest::testCachedFormulaResultsODS()
         testFile(aCSVFileName, pDoc, 3);
         // text functions
         createCSVPath(OUString("text-functions."), aCSVFileName);
-        testFile(aCSVFileName, pDoc, 4);
+        testFile(aCSVFileName, pDoc, 4, PureString);
 
         xDocSh->DoClose();
     }