move terminate to fixture decorator
This commit is contained in:
@@ -135,16 +135,9 @@ void ScCellRangeObj::setUp()
|
|||||||
void ScCellRangeObj::tearDown()
|
void ScCellRangeObj::tearDown()
|
||||||
{
|
{
|
||||||
if (nTest == NUMBER_OF_TESTS)
|
if (nTest == NUMBER_OF_TESTS)
|
||||||
{
|
|
||||||
closeDocument(mxComponent);
|
closeDocument(mxComponent);
|
||||||
}
|
|
||||||
|
|
||||||
UnoApiTest::tearDown();
|
UnoApiTest::tearDown();
|
||||||
|
|
||||||
if (nTest == NUMBER_OF_TESTS)
|
|
||||||
{
|
|
||||||
mxDesktop->terminate();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
CPPUNIT_TEST_SUITE_REGISTRATION(ScCellRangeObj);
|
CPPUNIT_TEST_SUITE_REGISTRATION(ScCellRangeObj);
|
||||||
|
@@ -88,16 +88,9 @@ void ScDatabaseRangeObj::setUp()
|
|||||||
void ScDatabaseRangeObj::tearDown()
|
void ScDatabaseRangeObj::tearDown()
|
||||||
{
|
{
|
||||||
if (nTest == NUMBER_OF_TESTS)
|
if (nTest == NUMBER_OF_TESTS)
|
||||||
{
|
|
||||||
closeDocument(mxComponent);
|
closeDocument(mxComponent);
|
||||||
}
|
|
||||||
|
|
||||||
UnoApiTest::tearDown();
|
UnoApiTest::tearDown();
|
||||||
|
|
||||||
if (nTest == NUMBER_OF_TESTS)
|
|
||||||
{
|
|
||||||
mxDesktop->terminate();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
CPPUNIT_TEST_SUITE_REGISTRATION(ScDatabaseRangeObj);
|
CPPUNIT_TEST_SUITE_REGISTRATION(ScDatabaseRangeObj);
|
||||||
|
@@ -102,16 +102,9 @@ void ScDataPilotFieldObj::setUp()
|
|||||||
void ScDataPilotFieldObj::tearDown()
|
void ScDataPilotFieldObj::tearDown()
|
||||||
{
|
{
|
||||||
if (nTest == NUMBER_OF_TESTS)
|
if (nTest == NUMBER_OF_TESTS)
|
||||||
{
|
|
||||||
closeDocument(mxComponent);
|
closeDocument(mxComponent);
|
||||||
}
|
|
||||||
|
|
||||||
UnoApiTest::tearDown();
|
UnoApiTest::tearDown();
|
||||||
|
|
||||||
if (nTest == NUMBER_OF_TESTS)
|
|
||||||
{
|
|
||||||
mxDesktop->terminate();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotFieldObj);
|
CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotFieldObj);
|
||||||
|
@@ -164,16 +164,9 @@ void ScDataPilotTableObj::setUp()
|
|||||||
void ScDataPilotTableObj::tearDown()
|
void ScDataPilotTableObj::tearDown()
|
||||||
{
|
{
|
||||||
if (nTest == NUMBER_OF_TESTS)
|
if (nTest == NUMBER_OF_TESTS)
|
||||||
{
|
|
||||||
closeDocument(mxComponent);
|
closeDocument(mxComponent);
|
||||||
}
|
|
||||||
|
|
||||||
UnoApiTest::tearDown();
|
UnoApiTest::tearDown();
|
||||||
|
|
||||||
if (nTest == NUMBER_OF_TESTS)
|
|
||||||
{
|
|
||||||
mxDesktop->terminate();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotTableObj);
|
CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotTableObj);
|
||||||
|
@@ -118,16 +118,9 @@ void ScNamedRangeObj::setUp()
|
|||||||
void ScNamedRangeObj::tearDown()
|
void ScNamedRangeObj::tearDown()
|
||||||
{
|
{
|
||||||
if (nTest == NUMBER_OF_TESTS)
|
if (nTest == NUMBER_OF_TESTS)
|
||||||
{
|
|
||||||
closeDocument(mxComponent);
|
closeDocument(mxComponent);
|
||||||
}
|
|
||||||
|
|
||||||
UnoApiTest::tearDown();
|
UnoApiTest::tearDown();
|
||||||
|
|
||||||
if (nTest == NUMBER_OF_TESTS)
|
|
||||||
{
|
|
||||||
mxDesktop->terminate();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
CPPUNIT_TEST_SUITE_REGISTRATION(ScNamedRangeObj);
|
CPPUNIT_TEST_SUITE_REGISTRATION(ScNamedRangeObj);
|
||||||
|
@@ -89,16 +89,9 @@ void ScNamedRangesObj::setUp()
|
|||||||
void ScNamedRangesObj::tearDown()
|
void ScNamedRangesObj::tearDown()
|
||||||
{
|
{
|
||||||
if (nTest == NUMBER_OF_TESTS)
|
if (nTest == NUMBER_OF_TESTS)
|
||||||
{
|
|
||||||
closeDocument(mxComponent);
|
closeDocument(mxComponent);
|
||||||
}
|
|
||||||
|
|
||||||
UnoApiTest::tearDown();
|
UnoApiTest::tearDown();
|
||||||
|
|
||||||
if (nTest == NUMBER_OF_TESTS)
|
|
||||||
{
|
|
||||||
mxDesktop->terminate();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
CPPUNIT_TEST_SUITE_REGISTRATION(ScNamedRangesObj);
|
CPPUNIT_TEST_SUITE_REGISTRATION(ScNamedRangesObj);
|
||||||
|
@@ -117,16 +117,9 @@ void ScTableSheetsObj::setUp()
|
|||||||
void ScTableSheetsObj::tearDown()
|
void ScTableSheetsObj::tearDown()
|
||||||
{
|
{
|
||||||
if (nTest == NUMBER_OF_TESTS)
|
if (nTest == NUMBER_OF_TESTS)
|
||||||
{
|
|
||||||
closeDocument(mxComponent);
|
closeDocument(mxComponent);
|
||||||
}
|
|
||||||
|
|
||||||
UnoApiTest::tearDown();
|
UnoApiTest::tearDown();
|
||||||
|
|
||||||
if (nTest == NUMBER_OF_TESTS)
|
|
||||||
{
|
|
||||||
mxDesktop->terminate();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
CPPUNIT_TEST_SUITE_REGISTRATION(ScTableSheetsObj);
|
CPPUNIT_TEST_SUITE_REGISTRATION(ScTableSheetsObj);
|
||||||
|
Reference in New Issue
Block a user