diff options
-rw-r--r-- | sc/qa/unit/data/xls/opencl/database/dmin.xls | bin | 0 -> 31232 bytes | |||
-rw-r--r-- | sc/qa/unit/opencl-test.cxx | 28 | ||||
-rw-r--r-- | sc/source/core/tool/token.cxx | 1 |
3 files changed, 29 insertions, 0 deletions
diff --git a/sc/qa/unit/data/xls/opencl/database/dmin.xls b/sc/qa/unit/data/xls/opencl/database/dmin.xls Binary files differnew file mode 100644 index 000000000000..8de12d1f0488 --- /dev/null +++ b/sc/qa/unit/data/xls/opencl/database/dmin.xls diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx index 44434b7fb54d..211dc3ee8824 100644 --- a/sc/qa/unit/opencl-test.cxx +++ b/sc/qa/unit/opencl-test.cxx @@ -249,6 +249,7 @@ public: void testLogicalFormulaNot(); void testLogicalFormulaXor(); void testDatabaseFormulaDmax(); + void testDatabaseFormulaDmin(); CPPUNIT_TEST_SUITE(ScOpenclTest); CPPUNIT_TEST(testSharedFormulaXLS); CPPUNIT_TEST(testFinacialFormula); @@ -429,6 +430,7 @@ public: CPPUNIT_TEST(testLogicalFormulaNot); CPPUNIT_TEST(testLogicalFormulaXor); CPPUNIT_TEST(testDatabaseFormulaDmax); + CPPUNIT_TEST(testDatabaseFormulaDmin); CPPUNIT_TEST_SUITE_END(); private: @@ -4998,6 +5000,32 @@ void ScOpenclTest::testDatabaseFormulaDmax() xDocSh->DoClose(); xDocShRes->DoClose(); } + +//[AMLOEXT-336] +void ScOpenclTest::testDatabaseFormulaDmin() +{ + if (!detectOpenCLDevice()) + return; + ScDocShellRef xDocSh = loadDoc("opencl/database/dmin.", XLS); + ScDocument* pDoc = xDocSh->GetDocument(); + CPPUNIT_ASSERT(pDoc); + enableOpenCL(); + pDoc->CalcAll(); + ScDocShellRef xDocShRes = loadDoc("opencl/database/dmin.", 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 4f529edfa1be..9ec701271e4a 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1477,6 +1477,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r ) case ocNot: case ocXor: case ocDBMax: + case ocDBMin: // Don't change the state. break; default: |