Skip to content

C
core
Kaydet (Commit) 27785300 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

More sc CppunitTest fixes 

...similar to 01d9f3fb "The ScOutlineObj test
still requires the fugdge."

Change-Id: I61d7024edbbade5eaf950752967ceac71306d6cb
üst 92727ebb
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 50 deletions
sc/qa/extras/sccellrangeobj.cxx
Dosyayı görüntüle @ 27785300
......@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <test/unoapi_test.hxx>
#include <test/calc_unoapi_test.hxx>
#include <test/sheet/xcellrangesquery.hxx>
#include <test/sheet/cellproperties.hxx>
#include <test/util/xreplaceable.hxx>
......@@ -25,7 +25,7 @@ namespace sc_apitest {
#define NUMBER_OF_TESTS 14
class ScCellRangeObj : public UnoApiTest, apitest::XCellRangesQuery, apitest::CellProperties,
class ScCellRangeObj : public CalcUnoApiTest, apitest::XCellRangesQuery, apitest::CellProperties,
apitest::XSearchable, apitest::XReplaceable, apitest::XCellRangeData
{
public:
......@@ -63,7 +63,7 @@ sal_Int32 ScCellRangeObj::nTest = 0;
uno::Reference< lang::XComponent > ScCellRangeObj::mxComponent;
ScCellRangeObj::ScCellRangeObj():
UnoApiTest("/sc/qa/extras/testdocuments"),
CalcUnoApiTest("/sc/qa/extras/testdocuments"),
apitest::XSearchable(OUString("15"), 1),
apitest::XReplaceable(OUString("15"), OUString("35"))
{
......@@ -113,7 +113,7 @@ void ScCellRangeObj::setUp()
{
nTest++;
CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS);
UnoApiTest::setUp();
CalcUnoApiTest::setUp();
}
void ScCellRangeObj::tearDown()
......@@ -121,7 +121,7 @@ void ScCellRangeObj::tearDown()
if (nTest == NUMBER_OF_TESTS)
closeDocument(mxComponent);
UnoApiTest::tearDown();
CalcUnoApiTest::tearDown();
}
CPPUNIT_TEST_SUITE_REGISTRATION(ScCellRangeObj);
......
sc/qa/extras/scdatabaserangeobj.cxx
Dosyayı görüntüle @ 27785300
......@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <test/unoapi_test.hxx>
#include <test/calc_unoapi_test.hxx>
#include <test/sheet/xdatabaserange.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
......@@ -22,7 +22,7 @@ namespace sc_apitest {
#define NUMBER_OF_TESTS 6
class ScDatabaseRangeObj : public UnoApiTest, apitest::XDatabaseRange
class ScDatabaseRangeObj : public CalcUnoApiTest, apitest::XDatabaseRange
{
public:
virtual void setUp();
......@@ -49,7 +49,7 @@ sal_Int32 ScDatabaseRangeObj::nTest = 0;
uno::Reference< lang::XComponent > ScDatabaseRangeObj::mxComponent;
ScDatabaseRangeObj::ScDatabaseRangeObj()
: UnoApiTest("/sc/qa/extras/testdocuments")
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
{
}
......@@ -72,7 +72,7 @@ uno::Reference< uno::XInterface > ScDatabaseRangeObj::init( const OUString& rDBN
void ScDatabaseRangeObj::setUp()
{
nTest++;
UnoApiTest::setUp();
CalcUnoApiTest::setUp();
}
void ScDatabaseRangeObj::tearDown()
......@@ -80,7 +80,7 @@ void ScDatabaseRangeObj::tearDown()
if (nTest == NUMBER_OF_TESTS)
closeDocument(mxComponent);
UnoApiTest::tearDown();
CalcUnoApiTest::tearDown();
}
CPPUNIT_TEST_SUITE_REGISTRATION(ScDatabaseRangeObj);
......
sc/qa/extras/scdatapilotfieldobj.cxx
Dosyayı görüntüle @ 27785300
......@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <test/unoapi_test.hxx>
#include <test/calc_unoapi_test.hxx>
#include <test/sheet/xdatapilotfieldgrouping.hxx>
#include <test/sheet/datapilotfield.hxx>
......@@ -24,7 +24,7 @@ namespace sc_apitest {
#define NUMBER_OF_TESTS 6
class ScDataPilotFieldObj : public UnoApiTest, apitest::XDataPilotFieldGrouping,
class ScDataPilotFieldObj : public CalcUnoApiTest, apitest::XDataPilotFieldGrouping,
apitest::DataPilotField
{
public:
......@@ -53,7 +53,7 @@ sal_Int32 ScDataPilotFieldObj::nTest = 0;
uno::Reference< lang::XComponent > ScDataPilotFieldObj::mxComponent;
ScDataPilotFieldObj::ScDataPilotFieldObj()
: UnoApiTest("/sc/qa/extras/testdocuments")
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
{
}
......@@ -88,7 +88,7 @@ uno::Reference< uno::XInterface > ScDataPilotFieldObj::init()
void ScDataPilotFieldObj::setUp()
{
nTest++;
UnoApiTest::setUp();
CalcUnoApiTest::setUp();
}
void ScDataPilotFieldObj::tearDown()
......@@ -96,7 +96,7 @@ void ScDataPilotFieldObj::tearDown()
if (nTest == NUMBER_OF_TESTS)
closeDocument(mxComponent);
UnoApiTest::tearDown();
CalcUnoApiTest::tearDown();
}
CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotFieldObj);
......
sc/qa/extras/scdatapilottableobj.cxx
Dosyayı görüntüle @ 27785300
......@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <test/unoapi_test.hxx>
#include <test/calc_unoapi_test.hxx>
#include <test/sheet/xdatapilottable.hxx>
#include <test/sheet/xdatapilottable2.hxx>
#include <test/sheet/xdatapilotdescriptor.hxx>
......@@ -26,7 +26,7 @@ namespace sc_apitest {
#define NUMBER_OF_TESTS 16
class ScDataPilotTableObj : public UnoApiTest, apitest::XDataPilotDescriptor, apitest::XDataPilotTable,
class ScDataPilotTableObj : public CalcUnoApiTest, apitest::XDataPilotDescriptor, apitest::XDataPilotTable,
apitest::XNamed, apitest::XDataPilotTable2
{
public:
......@@ -67,7 +67,7 @@ sal_Int32 ScDataPilotTableObj::nTest = 0;
uno::Reference< lang::XComponent > ScDataPilotTableObj::mxComponent;
ScDataPilotTableObj::ScDataPilotTableObj()
: UnoApiTest("/sc/qa/extras/testdocuments"),
: CalcUnoApiTest("/sc/qa/extras/testdocuments"),
apitest::XNamed(OUString("DataPilotTable"))
{
}
......@@ -142,7 +142,7 @@ uno::Reference< uno::XInterface > ScDataPilotTableObj::initDP2()
void ScDataPilotTableObj::setUp()
{
nTest++;
UnoApiTest::setUp();
CalcUnoApiTest::setUp();
}
void ScDataPilotTableObj::tearDown()
......@@ -150,7 +150,7 @@ void ScDataPilotTableObj::tearDown()
if (nTest == NUMBER_OF_TESTS)
closeDocument(mxComponent);
UnoApiTest::tearDown();
CalcUnoApiTest::tearDown();
}
CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotTableObj);
......
sc/qa/extras/sceditfieldobj-cell.cxx
Dosyayı görüntüle @ 27785300
......@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <test/unoapi_test.hxx>
#include <test/calc_unoapi_test.hxx>
#include <test/beans/xpropertyset.hxx>
#include <test/text/xtextfield.hxx>
#include <test/text/xtextcontent.hxx>
......@@ -27,7 +27,7 @@ using namespace css::uno;
namespace sc_apitest {
class ScEditFieldObj_Cell : public UnoApiTest, apitest::XTextField, apitest::XTextContent, apitest::XPropertySet
class ScEditFieldObj_Cell : public CalcUnoApiTest, apitest::XTextField, apitest::XTextContent, apitest::XPropertySet
{
public:
ScEditFieldObj_Cell();
......@@ -71,14 +71,14 @@ uno::Reference<lang::XComponent> ScEditFieldObj_Cell::mxComponent;
uno::Reference<text::XTextField> ScEditFieldObj_Cell::mxField;
ScEditFieldObj_Cell::ScEditFieldObj_Cell()
: UnoApiTest("/sc/qa/extras/testdocuments")
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
{
}
void ScEditFieldObj_Cell::setUp()
{
++nTest;
UnoApiTest::setUp();
CalcUnoApiTest::setUp();
}
void ScEditFieldObj_Cell::tearDown()
......@@ -89,7 +89,7 @@ void ScEditFieldObj_Cell::tearDown()
closeDocument(mxComponent);
}
UnoApiTest::tearDown();
CalcUnoApiTest::tearDown();
}
namespace {
......
sc/qa/extras/sceditfieldobj-header.cxx
Dosyayı görüntüle @ 27785300
......@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <test/unoapi_test.hxx>
#include <test/calc_unoapi_test.hxx>
#include <test/beans/xpropertyset.hxx>
#include <test/text/xtextfield.hxx>
#include <test/text/xtextcontent.hxx>
......@@ -30,7 +30,7 @@ using namespace css::uno;
namespace sc_apitest {
class ScEditFieldObj_Header : public UnoApiTest, apitest::XTextContent, apitest::XPropertySet
class ScEditFieldObj_Header : public CalcUnoApiTest, apitest::XTextContent, apitest::XPropertySet
{
public:
ScEditFieldObj_Header();
......@@ -67,14 +67,14 @@ uno::Reference<text::XTextField> ScEditFieldObj_Header::mxField;
uno::Reference<text::XText> ScEditFieldObj_Header::mxRightText;
ScEditFieldObj_Header::ScEditFieldObj_Header()
: UnoApiTest("/sc/qa/extras/testdocuments")
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
{
}
void ScEditFieldObj_Header::setUp()
{
++nTest;
UnoApiTest::setUp();
CalcUnoApiTest::setUp();
}
void ScEditFieldObj_Header::tearDown()
......@@ -87,7 +87,7 @@ void ScEditFieldObj_Header::tearDown()
closeDocument(mxComponent);
}
UnoApiTest::tearDown();
CalcUnoApiTest::tearDown();
}
uno::Reference<uno::XInterface> ScEditFieldObj_Header::init()
......
sc/qa/extras/scnamedrangeobj.cxx
Dosyayı görüntüle @ 27785300
......@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <test/unoapi_test.hxx>
#include <test/calc_unoapi_test.hxx>
#include <test/sheet/xnamedrange.hxx>
#include <test/container/xnamed.hxx>
#include <test/sheet/xcellrangereferrer.hxx>
......@@ -24,7 +24,7 @@ namespace sc_apitest {
#define NUMBER_OF_TESTS 9
class ScNamedRangeObj : public UnoApiTest, apitest::XNamedRange, apitest::XNamed, apitest::XCellRangeReferrer
class ScNamedRangeObj : public CalcUnoApiTest, apitest::XNamedRange, apitest::XNamed, apitest::XCellRangeReferrer
{
public:
ScNamedRangeObj();
......@@ -57,7 +57,7 @@ sal_Int32 ScNamedRangeObj::nTest = 0;
uno::Reference< lang::XComponent > ScNamedRangeObj::mxComponent;
ScNamedRangeObj::ScNamedRangeObj():
UnoApiTest("/sc/qa/extras/testdocuments"),
CalcUnoApiTest("/sc/qa/extras/testdocuments"),
apitest::XNamed(OUString("NamedRange")),
apitest::XCellRangeReferrer(table::CellRangeAddress(0,1,7,1,7))
{
......@@ -96,7 +96,7 @@ uno::Reference< uno::XInterface > ScNamedRangeObj::init()
void ScNamedRangeObj::setUp()
{
nTest++;
UnoApiTest::setUp();
CalcUnoApiTest::setUp();
}
void ScNamedRangeObj::tearDown()
......@@ -104,7 +104,7 @@ void ScNamedRangeObj::tearDown()
if (nTest == NUMBER_OF_TESTS)
closeDocument(mxComponent);
UnoApiTest::tearDown();
CalcUnoApiTest::tearDown();
}
CPPUNIT_TEST_SUITE_REGISTRATION(ScNamedRangeObj);
......
sc/qa/extras/scnamedrangesobj.cxx
Dosyayı görüntüle @ 27785300
......@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <test/unoapi_test.hxx>
#include <test/calc_unoapi_test.hxx>
#include <test/sheet/xnamedranges.hxx>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
......@@ -21,7 +21,7 @@ namespace sc_apitest {
#define NUMBER_OF_TESTS 3
class ScNamedRangesObj : public UnoApiTest, apitest::XNamedRanges
class ScNamedRangesObj : public CalcUnoApiTest, apitest::XNamedRanges
{
public:
virtual void setUp();
......@@ -47,7 +47,7 @@ sal_Int32 ScNamedRangesObj::nTest = 0;
uno::Reference< lang::XComponent > ScNamedRangesObj::mxComponent;
ScNamedRangesObj::ScNamedRangesObj()
: UnoApiTest("/sc/qa/extras/testdocuments")
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
{
}
......@@ -74,7 +74,7 @@ uno::Reference< uno::XInterface > ScNamedRangesObj::init(sal_Int32 nSheet)
void ScNamedRangesObj::setUp()
{
nTest++;
UnoApiTest::setUp();
CalcUnoApiTest::setUp();
}
void ScNamedRangesObj::tearDown()
......@@ -82,7 +82,7 @@ void ScNamedRangesObj::tearDown()
if (nTest == NUMBER_OF_TESTS)
closeDocument(mxComponent);
UnoApiTest::tearDown();
CalcUnoApiTest::tearDown();
}
CPPUNIT_TEST_SUITE_REGISTRATION(ScNamedRangesObj);
......
sc/qa/extras/sctablesheetobj.cxx
Dosyayı görüntüle @ 27785300
......@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <test/unoapi_test.hxx>
#include <test/calc_unoapi_test.hxx>
#include <test/util/xreplaceable.hxx>
#include <test/util/xsearchable.hxx>
#include <test/sheet/xprintareas.hxx>
......@@ -21,7 +21,7 @@ using namespace css::uno;
namespace sc_apitest
{
class ScTableSheetObj : public UnoApiTest, apitest::XSearchable, apitest::XReplaceable, apitest::XPrintAreas
class ScTableSheetObj : public CalcUnoApiTest, apitest::XSearchable, apitest::XReplaceable, apitest::XPrintAreas
{
public:
ScTableSheetObj();
......@@ -48,7 +48,7 @@ sal_Int32 ScTableSheetObj::nTest = 0;
uno::Reference< lang::XComponent > ScTableSheetObj::mxComponent;
ScTableSheetObj::ScTableSheetObj():
UnoApiTest("/sc/qa/extras/testdocuments"),
CalcUnoApiTest("/sc/qa/extras/testdocuments"),
apitest::XSearchable(OUString("test"), 4),
apitest::XReplaceable(OUString("searchReplaceString"), OUString("replaceReplaceString"))
{
......
sc/qa/extras/sctablesheetsobj.cxx
Dosyayı görüntüle @ 27785300
......@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <test/unoapi_test.hxx>
#include <test/calc_unoapi_test.hxx>
#include <test/sheet/xspreadsheets2.hxx>
#include <test/container/xnamecontainer.hxx>
......@@ -21,7 +21,7 @@ namespace sc_apitest {
#define NUMBER_OF_TESTS 13
class ScTableSheetsObj : public UnoApiTest, public ::apitest::XSpreadsheets2, apitest::XNameContainer
class ScTableSheetsObj : public CalcUnoApiTest, public ::apitest::XSpreadsheets2, apitest::XNameContainer
{
public:
ScTableSheetsObj();
......@@ -58,7 +58,7 @@ uno::Reference< lang::XComponent > ScTableSheetsObj::mxComponent;
sal_Int32 ScTableSheetsObj::nTest = 0;
ScTableSheetsObj::ScTableSheetsObj():
UnoApiTest("/sc/qa/extras/testdocuments"),
CalcUnoApiTest("/sc/qa/extras/testdocuments"),
apitest::XNameContainer(OUString("Sheet2"))
{
......@@ -71,12 +71,12 @@ uno::Reference< lang::XComponent > ScTableSheetsObj::getComponent()
void ScTableSheetsObj::createFileURL(const OUString& rFileBase, OUString& rFileURL)
{
UnoApiTest::createFileURL(rFileBase, rFileURL);
CalcUnoApiTest::createFileURL(rFileBase, rFileURL);
}
uno::Reference< lang::XComponent > ScTableSheetsObj::loadFromDesktop(const OUString& rString)
{
return UnoApiTest::loadFromDesktop(rString);
return CalcUnoApiTest::loadFromDesktop(rString);
}
uno::Reference< uno::XInterface > ScTableSheetsObj::init()
......@@ -96,7 +96,7 @@ void ScTableSheetsObj::setUp()
{
nTest++;
CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS);
UnoApiTest::setUp();
CalcUnoApiTest::setUp();
}
void ScTableSheetsObj::tearDown()
......@@ -104,7 +104,7 @@ void ScTableSheetsObj::tearDown()
if (nTest == NUMBER_OF_TESTS)
closeDocument(mxComponent);
UnoApiTest::tearDown();
CalcUnoApiTest::tearDown();
}
CPPUNIT_TEST_SUITE_REGISTRATION(ScTableSheetsObj);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment