summaryrefslogtreecommitdiff
path: root/sc/qa
diff options
context:
space:
mode:
Diffstat (limited to 'sc/qa')
-rw-r--r--sc/qa/extras/macros-test.cxx50
-rw-r--r--sc/qa/extras/scannotationobj.cxx1
-rw-r--r--sc/qa/extras/scannotationsobj.cxx1
-rw-r--r--sc/qa/extras/sccellrangeobj.cxx2
-rw-r--r--sc/qa/extras/scdatabaserangeobj.cxx9
-rw-r--r--sc/qa/extras/scdatapilotfieldobj.cxx7
-rw-r--r--sc/qa/extras/scdatapilottableobj.cxx6
-rw-r--r--sc/qa/extras/sceditfieldobj-cell.cxx5
-rw-r--r--sc/qa/extras/sceditfieldobj-header.cxx5
-rw-r--r--sc/qa/extras/scmodelobj.cxx6
-rw-r--r--sc/qa/extras/scnamedrangeobj.cxx2
-rw-r--r--sc/qa/extras/scnamedrangesobj.cxx7
-rw-r--r--sc/qa/extras/sctablesheetobj.cxx2
-rw-r--r--sc/qa/extras/sctablesheetsobj.cxx1
-rw-r--r--sc/qa/extras/testdocuments/StarBasic.ods (renamed from sc/qa/unit/data/ods/StarBasic.ods)bin9780 -> 9780 bytes
-rw-r--r--sc/qa/extras/testdocuments/TestAddress.xls (renamed from sc/qa/unit/data/xls/TestAddress.xls)bin40448 -> 40448 bytes
-rw-r--r--sc/qa/extras/testdocuments/vba.xls (renamed from sc/qa/unit/data/xls/vba.xls)bin33280 -> 33280 bytes
17 files changed, 51 insertions, 53 deletions
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 364ca1b6207e..96da0e241267 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -29,7 +29,7 @@
*/
#include <sal/config.h>
-#include <test/bootstrapfixture.hxx>
+#include <test/unoapi_test.hxx>
#include <unotest/macros_test.hxx>
#include <rtl/strbuf.hxx>
#include <osl/file.hxx>
@@ -53,16 +53,11 @@ using namespace ::com::sun::star::uno;
/* Implementation of Macros test */
-class ScMacrosTest : public test::BootstrapFixture, public unotest::MacrosTest
+class ScMacrosTest : public UnoApiTest
{
public:
ScMacrosTest();
- void createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath);
-
- virtual void setUp();
- virtual void tearDown();
-
void testStarBasic();
void testVba();
CPPUNIT_TEST_SUITE(ScMacrosTest);
@@ -77,25 +72,13 @@ public:
private:
uno::Reference<uno::XInterface> m_xCalcComponent;
- rtl::OUString m_aBaseString;
};
-
-void ScMacrosTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath)
-{
- rtl::OUString aSep(RTL_CONSTASCII_USTRINGPARAM("/"));
- rtl::OUStringBuffer aBuffer( getSrcRootURL() );
- aBuffer.append(m_aBaseString).append(aSep).append(aFileExtension);
- aBuffer.append(aSep).append(aFileBase).append(aFileExtension);
- rFilePath = aBuffer.makeStringAndClear();
-}
-
void ScMacrosTest::testStarBasic()
{
- const rtl::OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("StarBasic."));
- rtl::OUString aFileExtension("ods");
+ const OUString aFileNameBase("StarBasic.ods");
rtl::OUString aFileName;
- createFileURL(aFileNameBase, aFileExtension, aFileName);
+ createFileURL(aFileNameBase, aFileName);
std::cout << "StarBasic test" << std::endl;
uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop(aFileName);
@@ -122,7 +105,6 @@ void ScMacrosTest::testStarBasic()
xDocSh->DoClose();
}
-
void ScMacrosTest::testVba()
{
TestMacroInfo testInfo[] = {
@@ -136,11 +118,10 @@ void ScMacrosTest::testVba()
}
};
- rtl::OUString aFileExtension("xls");
for ( sal_uInt32 i=0; i<SAL_N_ELEMENTS( testInfo ); ++i )
{
rtl::OUString aFileName;
- createFileURL(testInfo[i].sFileBaseName, aFileExtension, aFileName);
+ createFileURL(testInfo[i].sFileBaseName + "xls", aFileName);
uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop(aFileName);
rtl::OUString sMsg( "Failed to load " + aFileName );
CPPUNIT_ASSERT_MESSAGE( rtl::OUStringToOString( sMsg, RTL_TEXTENCODING_UTF8 ).getStr(), xComponent.is() );
@@ -164,27 +145,8 @@ void ScMacrosTest::testVba()
}
ScMacrosTest::ScMacrosTest()
- : m_aBaseString(RTL_CONSTASCII_USTRINGPARAM("/sc/qa/unit/data"))
-{
-}
-
-void ScMacrosTest::setUp()
-{
- test::BootstrapFixture::setUp();
-
- // This is a bit of a fudge, we do this to ensure that ScGlobals::ensure,
- // which is a private symbol to us, gets called
- m_xCalcComponent =
- getMultiServiceFactory()->createInstance(rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.SpreadsheetDocument")));
- CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is());
- mxDesktop = com::sun::star::frame::Desktop::create( comphelper::getComponentContext(getMultiServiceFactory()) );
-}
-
-void ScMacrosTest::tearDown()
+ : UnoApiTest("/sc/qa/extras/testdocuments")
{
- uno::Reference< lang::XComponent >( m_xCalcComponent, UNO_QUERY_THROW )->dispose();
- test::BootstrapFixture::tearDown();
}
CPPUNIT_TEST_SUITE_REGISTRATION(ScMacrosTest);
diff --git a/sc/qa/extras/scannotationobj.cxx b/sc/qa/extras/scannotationobj.cxx
index 29d9cbfe7e9a..fdbd7486eef6 100644
--- a/sc/qa/extras/scannotationobj.cxx
+++ b/sc/qa/extras/scannotationobj.cxx
@@ -70,6 +70,7 @@ sal_Int32 ScAnnontationObj::nTest = 0;
uno::Reference< lang::XComponent > ScAnnontationObj::mxComponent;
ScAnnontationObj::ScAnnontationObj()
+ : UnoApiTest("/sc/qa/extras/testdocuments")
{
}
diff --git a/sc/qa/extras/scannotationsobj.cxx b/sc/qa/extras/scannotationsobj.cxx
index ac6e84154645..2c3694aa520a 100644
--- a/sc/qa/extras/scannotationsobj.cxx
+++ b/sc/qa/extras/scannotationsobj.cxx
@@ -63,6 +63,7 @@ sal_Int32 ScAnnontationsObj::nTest = 0;
uno::Reference< lang::XComponent > ScAnnontationsObj::mxComponent;
ScAnnontationsObj::ScAnnontationsObj()
+ : UnoApiTest("/sc/qa/extras/testdocuments")
{
}
diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx
index 20a5c3aabd35..2d58459218c9 100644
--- a/sc/qa/extras/sccellrangeobj.cxx
+++ b/sc/qa/extras/sccellrangeobj.cxx
@@ -79,10 +79,10 @@ sal_Int32 ScCellRangeObj::nTest = 0;
uno::Reference< lang::XComponent > ScCellRangeObj::mxComponent;
ScCellRangeObj::ScCellRangeObj():
+ UnoApiTest("/sc/qa/extras/testdocuments"),
apitest::XSearchable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("15")), 1),
apitest::XReplaceable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("15")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("35")))
{
-
}
uno::Reference< uno::XInterface > ScCellRangeObj::init()
diff --git a/sc/qa/extras/scdatabaserangeobj.cxx b/sc/qa/extras/scdatabaserangeobj.cxx
index 1f66f50a3f75..bd358853b8f7 100644
--- a/sc/qa/extras/scdatabaserangeobj.cxx
+++ b/sc/qa/extras/scdatabaserangeobj.cxx
@@ -47,6 +47,8 @@ public:
virtual uno::Reference< uno::XInterface > init( const rtl::OUString& rDBName );
+ ScDatabaseRangeObj();
+
CPPUNIT_TEST_SUITE(ScDatabaseRangeObj);
CPPUNIT_TEST(testDataArea);
CPPUNIT_TEST(testGetSortDescriptor);
@@ -63,10 +65,15 @@ private:
sal_Int32 ScDatabaseRangeObj::nTest = 0;
uno::Reference< lang::XComponent > ScDatabaseRangeObj::mxComponent;
+ScDatabaseRangeObj::ScDatabaseRangeObj()
+ : UnoApiTest("/sc/qa/extras/testdocuments")
+{
+}
+
uno::Reference< uno::XInterface > ScDatabaseRangeObj::init( const rtl::OUString& rDBName )
{
rtl::OUString aFileURL;
- createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScDatabaseRangeObj.ods")), aFileURL);
+ createFileURL("ScDatabaseRangeObj.ods", aFileURL);
if(!mxComponent.is())
mxComponent = loadFromDesktop(aFileURL);
CPPUNIT_ASSERT(mxComponent.is());
diff --git a/sc/qa/extras/scdatapilotfieldobj.cxx b/sc/qa/extras/scdatapilotfieldobj.cxx
index 8e10a16a4f51..df4128815d6e 100644
--- a/sc/qa/extras/scdatapilotfieldobj.cxx
+++ b/sc/qa/extras/scdatapilotfieldobj.cxx
@@ -48,6 +48,8 @@ public:
virtual void tearDown();
virtual uno::Reference< uno::XInterface > init();
+ ScDataPilotFieldObj();
+
CPPUNIT_TEST_SUITE(ScDataPilotFieldObj);
CPPUNIT_TEST(testSortInfo);
CPPUNIT_TEST(testLayoutInfo);
@@ -66,6 +68,11 @@ private:
sal_Int32 ScDataPilotFieldObj::nTest = 0;
uno::Reference< lang::XComponent > ScDataPilotFieldObj::mxComponent;
+ScDataPilotFieldObj::ScDataPilotFieldObj()
+ : UnoApiTest("/sc/qa/extras/testdocuments")
+{
+}
+
uno::Reference< uno::XInterface > ScDataPilotFieldObj::init()
{
rtl::OUString aFileURL;
diff --git a/sc/qa/extras/scdatapilottableobj.cxx b/sc/qa/extras/scdatapilottableobj.cxx
index 6ab1c33846a0..34128ba9c126 100644
--- a/sc/qa/extras/scdatapilottableobj.cxx
+++ b/sc/qa/extras/scdatapilottableobj.cxx
@@ -83,15 +83,15 @@ sal_Int32 ScDataPilotTableObj::nTest = 0;
uno::Reference< lang::XComponent > ScDataPilotTableObj::mxComponent;
ScDataPilotTableObj::ScDataPilotTableObj()
- : apitest::XNamed(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataPilotTable")))
+ : UnoApiTest("/sc/qa/extras/testdocuments"),
+ apitest::XNamed(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataPilotTable")))
{
-
}
uno::Reference< uno::XInterface > ScDataPilotTableObj::init()
{
rtl::OUString aFileURL;
- createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScDataPilotTableObj.ods")), aFileURL);
+ createFileURL("ScDataPilotTableObj.ods", aFileURL);
if(!mxComponent.is())
mxComponent = loadFromDesktop(aFileURL);
CPPUNIT_ASSERT(mxComponent.is());
diff --git a/sc/qa/extras/sceditfieldobj-cell.cxx b/sc/qa/extras/sceditfieldobj-cell.cxx
index da5fb4fd9918..78d0ac1e46da 100644
--- a/sc/qa/extras/sceditfieldobj-cell.cxx
+++ b/sc/qa/extras/sceditfieldobj-cell.cxx
@@ -86,7 +86,10 @@ sal_Int32 ScEditFieldObj_Cell::nTest = 0;
uno::Reference<lang::XComponent> ScEditFieldObj_Cell::mxComponent;
uno::Reference<text::XTextField> ScEditFieldObj_Cell::mxField;
-ScEditFieldObj_Cell::ScEditFieldObj_Cell() {}
+ScEditFieldObj_Cell::ScEditFieldObj_Cell()
+ : UnoApiTest("/sc/qa/extras/testdocuments")
+{
+}
void ScEditFieldObj_Cell::setUp()
{
diff --git a/sc/qa/extras/sceditfieldobj-header.cxx b/sc/qa/extras/sceditfieldobj-header.cxx
index 69a62b811a90..a3f376564983 100644
--- a/sc/qa/extras/sceditfieldobj-header.cxx
+++ b/sc/qa/extras/sceditfieldobj-header.cxx
@@ -82,7 +82,10 @@ uno::Reference<lang::XComponent> ScEditFieldObj_Header::mxComponent;
uno::Reference<text::XTextField> ScEditFieldObj_Header::mxField;
uno::Reference<text::XText> ScEditFieldObj_Header::mxRightText;
-ScEditFieldObj_Header::ScEditFieldObj_Header() {}
+ScEditFieldObj_Header::ScEditFieldObj_Header()
+ : UnoApiTest("/sc/qa/extras/testdocuments")
+{
+}
void ScEditFieldObj_Header::setUp()
{
diff --git a/sc/qa/extras/scmodelobj.cxx b/sc/qa/extras/scmodelobj.cxx
index 93bb0ca1d442..e41f7ddce932 100644
--- a/sc/qa/extras/scmodelobj.cxx
+++ b/sc/qa/extras/scmodelobj.cxx
@@ -22,6 +22,8 @@ public:
virtual uno::Reference< uno::XInterface > init();
+ ScModelObj();
+
CPPUNIT_TEST_SUITE(ScModelObj);
CPPUNIT_TEST(testSeekGoal);
CPPUNIT_TEST_SUITE_END();
@@ -31,6 +33,10 @@ private:
static uno::Reference< lang::XComponent > mxComponent;
};
+ScModelObj::ScModelObj()
+ : UnoApiTest("/sc/qa/extras/testdocuments")
+{
+}
sal_Int32 ScModelObj::nTest = 0;
uno::Reference< lang::XComponent > ScModelObj::mxComponent;
diff --git a/sc/qa/extras/scnamedrangeobj.cxx b/sc/qa/extras/scnamedrangeobj.cxx
index a9f971ff3b5c..81882e54ebc5 100644
--- a/sc/qa/extras/scnamedrangeobj.cxx
+++ b/sc/qa/extras/scnamedrangeobj.cxx
@@ -73,10 +73,10 @@ sal_Int32 ScNamedRangeObj::nTest = 0;
uno::Reference< lang::XComponent > ScNamedRangeObj::mxComponent;
ScNamedRangeObj::ScNamedRangeObj():
+ UnoApiTest("/sc/qa/extras/testdocuments"),
apitest::XNamed(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NamedRange"))),
apitest::XCellRangeReferrer(table::CellRangeAddress(0,1,7,1,7))
{
-
}
uno::Reference< sheet::XNamedRanges > ScNamedRangeObj::init_impl()
diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx
index c118d08df6b0..1d1599e634de 100644
--- a/sc/qa/extras/scnamedrangesobj.cxx
+++ b/sc/qa/extras/scnamedrangesobj.cxx
@@ -45,6 +45,8 @@ public:
virtual uno::Reference< uno::XInterface > init(sal_Int32 nSheet);
+ ScNamedRangesObj();
+
CPPUNIT_TEST_SUITE(ScNamedRangesObj);
CPPUNIT_TEST(testAddNewByName);
CPPUNIT_TEST(testAddNewFromTitles);
@@ -60,6 +62,11 @@ private:
sal_Int32 ScNamedRangesObj::nTest = 0;
uno::Reference< lang::XComponent > ScNamedRangesObj::mxComponent;
+ScNamedRangesObj::ScNamedRangesObj()
+ : UnoApiTest("/sc/qa/extras/testdocuments")
+{
+}
+
uno::Reference< uno::XInterface > ScNamedRangesObj::init(sal_Int32 nSheet)
{
rtl::OUString aFileURL;
diff --git a/sc/qa/extras/sctablesheetobj.cxx b/sc/qa/extras/sctablesheetobj.cxx
index 28b4d2b3f24c..aff6a46638b6 100644
--- a/sc/qa/extras/sctablesheetobj.cxx
+++ b/sc/qa/extras/sctablesheetobj.cxx
@@ -64,10 +64,10 @@ sal_Int32 ScTableSheetObj::nTest = 0;
uno::Reference< lang::XComponent > ScTableSheetObj::mxComponent;
ScTableSheetObj::ScTableSheetObj():
+ UnoApiTest("/sc/qa/extras/testdocuments"),
apitest::XSearchable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test")), 4),
apitest::XReplaceable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("searchReplaceString")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("replaceReplaceString")))
{
-
}
diff --git a/sc/qa/extras/sctablesheetsobj.cxx b/sc/qa/extras/sctablesheetsobj.cxx
index 2d7de745d3b1..a1e97d5a73e8 100644
--- a/sc/qa/extras/sctablesheetsobj.cxx
+++ b/sc/qa/extras/sctablesheetsobj.cxx
@@ -74,6 +74,7 @@ uno::Reference< lang::XComponent > ScTableSheetsObj::mxComponent;
sal_Int32 ScTableSheetsObj::nTest = 0;
ScTableSheetsObj::ScTableSheetsObj():
+ UnoApiTest("/sc/qa/extras/testdocuments"),
apitest::XNameContainer(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Sheet2")))
{
diff --git a/sc/qa/unit/data/ods/StarBasic.ods b/sc/qa/extras/testdocuments/StarBasic.ods
index a4b74b350364..a4b74b350364 100644
--- a/sc/qa/unit/data/ods/StarBasic.ods
+++ b/sc/qa/extras/testdocuments/StarBasic.ods
Binary files differ
diff --git a/sc/qa/unit/data/xls/TestAddress.xls b/sc/qa/extras/testdocuments/TestAddress.xls
index 629645c41ca8..629645c41ca8 100644
--- a/sc/qa/unit/data/xls/TestAddress.xls
+++ b/sc/qa/extras/testdocuments/TestAddress.xls
Binary files differ
diff --git a/sc/qa/unit/data/xls/vba.xls b/sc/qa/extras/testdocuments/vba.xls
index 399b1ec20675..399b1ec20675 100644
--- a/sc/qa/unit/data/xls/vba.xls
+++ b/sc/qa/extras/testdocuments/vba.xls
Binary files differ
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-24 17:13:27 +0000