emfio/CppunitTest_emfio_emf.mk | 1
emfio/qa/cppunit/emf/EmfImportTest.cxx | 33 +++----------
lotuswordpro/CppunitTest_lotuswordpro_import_test.mk | 1
lotuswordpro/qa/cppunit/import_test.cxx | 48 ++++---------------
4 files changed, 22 insertions(+), 61 deletions(-)
New commits:
commit 8c018651a0667ecdb0f9b31d2b0c53c646f990cd
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Tue Nov 1 11:09:11 2022 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Nov 1 12:33:55 2022 +0100
CppunitTest_lotuswordpro_import_test: inherit from UnoApiTest
Change-Id: I6287ea3b0ed24a8dca002b95d59120ce302fc2c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142100
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/lotuswordpro/CppunitTest_lotuswordpro_import_test.mk
b/lotuswordpro/CppunitTest_lotuswordpro_import_test.mk
index 315fea09a04d..31492dd6cd57 100644
--- a/lotuswordpro/CppunitTest_lotuswordpro_import_test.mk
+++ b/lotuswordpro/CppunitTest_lotuswordpro_import_test.mk
@@ -20,6 +20,7 @@ $(eval $(call
gb_CppunitTest_use_libraries,lotuswordpro_import_test, \
cppu \
cppuhelper \
sal \
+ subsequenttest \
test \
tl \
unotest \
diff --git a/lotuswordpro/qa/cppunit/import_test.cxx
b/lotuswordpro/qa/cppunit/import_test.cxx
index f691d778ecca..8fe223e4277f 100644
--- a/lotuswordpro/qa/cppunit/import_test.cxx
+++ b/lotuswordpro/qa/cppunit/import_test.cxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <test/bootstrapfixture.hxx>
-#include <unotest/macros_test.hxx>
+#include <test/unoapi_test.hxx>
#include <com/sun/star/awt/FontWeight.hpp>
#include <com/sun/star/awt/FontSlant.hpp>
@@ -24,35 +23,15 @@
using namespace ::com::sun::star;
-class LotusWordProTest : public test::BootstrapFixture, public
unotest::MacrosTest
+class LotusWordProTest : public UnoApiTest
{
public:
- virtual void setUp() override;
-
- virtual void tearDown() override;
- uno::Reference<lang::XComponent>& getComponent() { return mxComponent; }
-
-private:
- uno::Reference<lang::XComponent> mxComponent;
+ LotusWordProTest()
+ : UnoApiTest("/lotuswordpro/qa/cppunit/data/")
+ {
+ }
};
-void LotusWordProTest::setUp()
-{
- test::BootstrapFixture::setUp();
-
- mxDesktop.set(frame::Desktop::create(mxComponentContext));
-}
-
-void LotusWordProTest::tearDown()
-{
- if (mxComponent.is())
- mxComponent->dispose();
-
- test::BootstrapFixture::tearDown();
-}
-
-constexpr OUStringLiteral DATA_DIRECTORY = u"/lotuswordpro/qa/cppunit/data/";
-
CPPUNIT_TEST_FIXTURE(LotusWordProTest, testtdf33787OrderedBullets)
{
// Test if ordered bullets are incrementing correctly:
@@ -65,9 +44,8 @@ CPPUNIT_TEST_FIXTURE(LotusWordProTest,
testtdf33787OrderedBullets)
// 2) Numbered bullet w/ bracket two (2))
// a) Lettered bullet w/ bracket lowercase 1 (a))
// b) Lettered bullet w/ bracket lowercase 2 (b))
- OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) +
"tdf33787-ordered-bullets.lwp";
- getComponent() = loadFromDesktop(aURL);
- uno::Reference<text::XTextDocument> textDocument(getComponent(),
uno::UNO_QUERY);
+ loadFromURL(u"tdf33787-ordered-bullets.lwp");
+ uno::Reference<text::XTextDocument> textDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(textDocument->getText(),
uno::UNO_QUERY);
uno::Reference<container::XEnumeration> xParaEnum =
xParaEnumAccess->createEnumeration();
@@ -157,9 +135,8 @@ CPPUNIT_TEST_FIXTURE(LotusWordProTest,
testtdf33787OrderedBullets)
CPPUNIT_TEST_FIXTURE(LotusWordProTest, testTdf129993)
{
- OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) +
"tdf129993.lwp";
- getComponent() = loadFromDesktop(aURL);
- uno::Reference<text::XTextDocument> textDocument(getComponent(),
uno::UNO_QUERY);
+ loadFromURL(u"tdf129993.lwp");
+ uno::Reference<text::XTextDocument> textDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(textDocument->getText(),
uno::UNO_QUERY);
uno::Reference<container::XEnumeration> xParaEnum =
xParaEnumAccess->createEnumeration();
@@ -172,9 +149,8 @@ CPPUNIT_TEST_FIXTURE(LotusWordProTest, testTdf129993)
CPPUNIT_TEST_FIXTURE(LotusWordProTest, paragraphProperties)
{
- OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) +
"paragraphProperties.lwp";
- getComponent() = loadFromDesktop(aURL);
- uno::Reference<text::XTextDocument> textDocument(getComponent(),
uno::UNO_QUERY);
+ loadFromURL(u"paragraphProperties.lwp");
+ uno::Reference<text::XTextDocument> textDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(textDocument->getText(),
uno::UNO_QUERY);
uno::Reference<container::XEnumeration> xParaEnum =
xParaEnumAccess->createEnumeration();
commit 39ed6101c95368697bfaedf73f070129b24d03c9
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Tue Nov 1 11:04:34 2022 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Nov 1 12:33:41 2022 +0100
CppunitTest_emfio_emf: inherit from UnoApiTest
Change-Id: If1278f336aaff56a4378dcc1f0f95e0a749b629d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142099
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/emfio/CppunitTest_emfio_emf.mk b/emfio/CppunitTest_emfio_emf.mk
index 38a1c98250f7..4b7d55292485 100644
--- a/emfio/CppunitTest_emfio_emf.mk
+++ b/emfio/CppunitTest_emfio_emf.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_CppunitTest_use_libraries,emfio_emf,\
cppuhelper \
comphelper \
sal \
+ subsequenttest \
svt \
test \
unotest \
diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx
b/emfio/qa/cppunit/emf/EmfImportTest.cxx
index fd89ade0c899..6c1e30d57ca4 100644
--- a/emfio/qa/cppunit/emf/EmfImportTest.cxx
+++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx
@@ -10,9 +10,8 @@
#include <sal/config.h>
#include <config_fonts.h>
-#include <test/bootstrapfixture.hxx>
+#include <test/unoapi_test.hxx>
#include <test/xmltesttools.hxx>
-#include <unotest/macros_test.hxx>
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
@@ -39,9 +38,8 @@ using namespace css::graphic;
using drawinglayer::primitive2d::Primitive2DSequence;
using drawinglayer::primitive2d::Primitive2DContainer;
-class Test : public test::BootstrapFixture, public XmlTestTools, public
unotest::MacrosTest
+class Test : public UnoApiTest, public XmlTestTools
{
- uno::Reference<lang::XComponent> mxComponent;
const OString aXPathPrefix = "/primitive2D/metafile/transform/";
void testPolyPolygon();
@@ -91,9 +89,10 @@ class Test : public test::BootstrapFixture, public
XmlTestTools, public unotest:
Primitive2DSequence parseEmf(std::u16string_view aSource);
public:
- void setUp() override;
- void tearDown() override;
- uno::Reference<lang::XComponent>& getComponent() { return mxComponent; }
+ Test()
+ : UnoApiTest("/emfio/qa/cppunit/emf/data/")
+ {
+ }
CPPUNIT_TEST_SUITE(Test);
CPPUNIT_TEST(testPolyPolygon);
@@ -141,21 +140,6 @@ public:
CPPUNIT_TEST_SUITE_END();
};
-void Test::setUp()
-{
- test::BootstrapFixture::setUp();
-
- mxDesktop.set(frame::Desktop::create(mxComponentContext));
-}
-
-void Test::tearDown()
-{
- if (mxComponent.is())
- mxComponent->dispose();
-
- test::BootstrapFixture::tearDown();
-}
-
Primitive2DSequence Test::parseEmf(std::u16string_view aSource)
{
const Reference<XEmfParser> xEmfParser = EmfTools::create(m_xContext);
@@ -1604,11 +1588,10 @@ void Test::TestPdfInEmf()
}
// Load a PPTX file, which has a shape, with a bitmap fill, which is an
EMF, containing a PDF.
- OUString aURL =
m_directories.getURLFromSrc(u"emfio/qa/cppunit/emf/data/pdf-in-emf.pptx");
- getComponent() = loadFromDesktop(aURL);
+ loadFromURL(u"pdf-in-emf.pptx");
// Get the EMF.
- uno::Reference<drawing::XDrawPagesSupplier>
xDrawPagesSupplier(getComponent(), uno::UNO_QUERY);
+ uno::Reference<drawing::XDrawPagesSupplier>
xDrawPagesSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage>
xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0),
uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xShape(xDrawPage->getByIndex(0),
uno::UNO_QUERY);
