diff options
| author | dechuang <dechuang@multicorewareinc.com> | 2013-12-12 10:18:30 +0800 |
|---|---|---|
| committer | I-Jui (Ray) Sung <ray@multicorewareinc.com> | 2013-12-19 17:53:51 -0600 |
| commit | 7dbb68e296a7b8b4b6d72df4fe0f4f961594d87c (patch) | |
| tree | 44afdcab4ac8a943477754535a0c085aed2582e9 | |
| parent | 867e7fc2274f942fcc83dc1e4a6846ef23a444b4 (diff) | |
GPU Calc: unit test cases for DCOUNTA
Need turn NO_FALLBACK_TO_SWINTERP on in formulagroupcl.cxx for test
AMLOEXT-334 BUG
Change-Id: I70cb875ba8a262b09a8b35add0510e1681ec1c21
Signed-off-by: haochen <haochen@multicorewareinc.com>
Signed-off-by: Wei Wei <weiwei@multicorewareinc.com>
Signed-off-by: I-Jui (Ray) Sung <ray@multicorewareinc.com>
| -rw-r--r-- | sc/qa/unit/data/xls/opencl/database/dcountA.xls | bin | 0 -> 31232 bytes | |||
| -rw-r--r-- | sc/qa/unit/opencl-test.cxx | 25 | ||||
| -rw-r--r-- | sc/source/core/tool/token.cxx | 1 |
3 files changed, 26 insertions, 0 deletions
diff --git a/sc/qa/unit/data/xls/opencl/database/dcountA.xls b/sc/qa/unit/data/xls/opencl/database/dcountA.xls Binary files differnew file mode 100644 index 000000000000..2b93a145ea66 --- /dev/null +++ b/sc/qa/unit/data/xls/opencl/database/dcountA.xls diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx index 500250b0bd82..7ad57dc77611 100644 --- a/sc/qa/unit/opencl-test.cxx +++ b/sc/qa/unit/opencl-test.cxx @@ -259,6 +259,7 @@ public: void testDatabaseFormulaDvarp(); void testMathFormulaAverageIf(); void testDatabaseFormulaDcount(); + void testDatabaseFormulaDcountA(); CPPUNIT_TEST_SUITE(ScOpenclTest); CPPUNIT_TEST(testSharedFormulaXLS); CPPUNIT_TEST(testFinacialFormula); @@ -449,6 +450,7 @@ public: CPPUNIT_TEST(testDatabaseFormulaDvarp); CPPUNIT_TEST(testMathFormulaAverageIf); CPPUNIT_TEST(testDatabaseFormulaDcount); + CPPUNIT_TEST(testDatabaseFormulaDcountA); CPPUNIT_TEST_SUITE_END(); private: @@ -5040,6 +5042,29 @@ void ScOpenclTest::testDatabaseFormulaDcount() xDocSh->DoClose(); xDocShRes->DoClose(); } +//[AMLOEXT-334] +void ScOpenclTest::testDatabaseFormulaDcountA() +{ + if (!detectOpenCLDevice()) + return; + ScDocShellRef xDocSh = loadDoc("opencl/database/dcountA.", XLS); + ScDocument* pDoc = xDocSh->GetDocument(); + CPPUNIT_ASSERT(pDoc); + enableOpenCL(); + pDoc->CalcAll(); + ScDocShellRef xDocShRes = loadDoc("opencl/database/dcountA.", XLS); + ScDocument* pDocRes = xDocShRes->GetDocument(); + CPPUNIT_ASSERT(pDocRes); + // Check the results of formula cells in the shared formula range. + for (SCROW i = 1; i <= 32; ++i) + { + double fLibre = pDoc->GetValue(ScAddress(9,i,0)); + double fExcel = pDocRes->GetValue(ScAddress(10,i,0)); + CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.00000000001)); + } + xDocSh->DoClose(); + xDocShRes->DoClose(); +} //[AMLOEXT-335] void ScOpenclTest::testDatabaseFormulaDmax() { diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 13d16fd12014..c564708b7ef7 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1487,6 +1487,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r ) case ocDBVarP: case ocAverageIf: case ocDBCount: + case ocDBCount2: // Don't change the state. break; default: |