diff options
| -rw-r--r-- | sc/qa/unit/data/xls/opencl/database/dproduct.xls | bin | 0 -> 39936 bytes | |||
| -rw-r--r-- | sc/qa/unit/opencl-test.cxx | 27 | ||||
| -rw-r--r-- | sc/source/core/tool/token.cxx | 1 |
3 files changed, 28 insertions, 0 deletions
diff --git a/sc/qa/unit/data/xls/opencl/database/dproduct.xls b/sc/qa/unit/data/xls/opencl/database/dproduct.xls Binary files differnew file mode 100644 index 000000000000..fa1ea256e4b0 --- /dev/null +++ b/sc/qa/unit/data/xls/opencl/database/dproduct.xls diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx index 211dc3ee8824..077b966f0478 100644 --- a/sc/qa/unit/opencl-test.cxx +++ b/sc/qa/unit/opencl-test.cxx @@ -250,6 +250,7 @@ public: void testLogicalFormulaXor(); void testDatabaseFormulaDmax(); void testDatabaseFormulaDmin(); + void testDatabaseFormulaDproduct(); CPPUNIT_TEST_SUITE(ScOpenclTest); CPPUNIT_TEST(testSharedFormulaXLS); CPPUNIT_TEST(testFinacialFormula); @@ -431,6 +432,7 @@ public: CPPUNIT_TEST(testLogicalFormulaXor); CPPUNIT_TEST(testDatabaseFormulaDmax); CPPUNIT_TEST(testDatabaseFormulaDmin); + CPPUNIT_TEST(testDatabaseFormulaDproduct); CPPUNIT_TEST_SUITE_END(); private: @@ -5025,6 +5027,31 @@ void ScOpenclTest::testDatabaseFormulaDmin() xDocShRes->DoClose(); } +//[AMLOEXT-337] +void ScOpenclTest::testDatabaseFormulaDproduct() +{ + if (!detectOpenCLDevice()) + return; + ScDocShellRef xDocSh = loadDoc("opencl/database/dproduct.", XLS); + ScDocument* pDoc = xDocSh->GetDocument(); + CPPUNIT_ASSERT(pDoc); + enableOpenCL(); + pDoc->CalcAll(); + ScDocShellRef xDocShRes = loadDoc("opencl/database/dproduct.", 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(); +} + + ScOpenclTest::ScOpenclTest() : ScBootstrapFixture( "/sc/qa/unit/data" ) diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 74c5812f0f3a..251f9b73ed0a 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1478,6 +1478,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r ) case ocXor: case ocDBMax: case ocDBMin: + case ocDBProduct: // Don't change the state. break; default: |