diff options
author | Jens Carl <j.carl43@gmx.de> | 2017-11-01 20:58:09 +0000 |
---|---|---|
committer | Jens Carl <j.carl43@gmx.de> | 2017-11-03 04:08:41 +0100 |
commit | 6bddeb4de19685c1ce1a3c1f9bd32cffb6b14bc6 (patch) | |
tree | 55be13f2e5d6932a88582b1f453f9efb3b518f8c /sc | |
parent | 2416d69ad4fa26b65d5b05a8575ac96af6b2c9a9 (diff) |
tdf#45904 Move Java _XSheetConditionalEntry tests to C++
Change-Id: I51924e69183260ba0eba94c3a14bde252c24cc18
Reviewed-on: https://gerrit.libreoffice.org/44182
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jens Carl <j.carl43@gmx.de>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/qa/extras/sctableconditionalentryobj.cxx | 10 | ||||
-rw-r--r-- | sc/qa/unoapi/sc_7.sce | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sc/qa/extras/sctableconditionalentryobj.cxx b/sc/qa/extras/sctableconditionalentryobj.cxx index be7432416cf4..4895d03dc9e1 100644 --- a/sc/qa/extras/sctableconditionalentryobj.cxx +++ b/sc/qa/extras/sctableconditionalentryobj.cxx @@ -8,6 +8,7 @@ */ #include <test/calc_unoapi_test.hxx> +#include <test/sheet/xsheetconditionalentry.hxx> #include <test/sheet/xsheetcondition.hxx> #include <com/sun/star/beans/PropertyValue.hpp> @@ -34,9 +35,11 @@ using namespace com::sun::star; namespace sc_apitest { -#define NUMBER_OF_TESTS 4 +#define NUMBER_OF_TESTS 5 -class ScTableConditionalEntryObj : public CalcUnoApiTest, public apitest::XSheetCondition +class ScTableConditionalEntryObj : public CalcUnoApiTest, + public apitest::XSheetConditionalEntry, + public apitest::XSheetCondition { public: ScTableConditionalEntryObj(); @@ -47,6 +50,9 @@ public: CPPUNIT_TEST_SUITE(ScTableConditionalEntryObj); + // XSheetConditionalEntry + CPPUNIT_TEST(testGetSetStyleName); + // XSheetCondition CPPUNIT_TEST(testGetSetFormula1); CPPUNIT_TEST(testGetSetFormula2); diff --git a/sc/qa/unoapi/sc_7.sce b/sc/qa/unoapi/sc_7.sce index 46d35f29d4cd..67dfcf739b30 100644 --- a/sc/qa/unoapi/sc_7.sce +++ b/sc/qa/unoapi/sc_7.sce @@ -20,7 +20,6 @@ # # i84656 -o sc.ScTabViewObj # -o sc.ScTableColumnObj -o sc.ScTableColumnsObj --o sc.ScTableConditionalEntry -o sc.ScTableConditionalFormat # -o sc.ScTableRowObj -o sc.ScTableRowsObj |