embeddedobj/qa/cppunit/general.cxx |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

New commits:
commit a12b4d548cd4173d87d8736ec6a484becb44d943
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Tue Mar 1 20:17:41 2022 +0100
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Wed Mar 2 08:14:21 2022 +0100

    CppunitTest_embeddedobj_general: put the base class into an anon namespace
    
    Which reduces the probability that the base class name collides with a
    symbol from non-test code.
    
    Change-Id: I7df17a76602b12da7b10cb77f6e44466676d15a3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130811
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/embeddedobj/qa/cppunit/general.cxx 
b/embeddedobj/qa/cppunit/general.cxx
index 815656519c83..c7824fe87eaf 100644
--- a/embeddedobj/qa/cppunit/general.cxx
+++ b/embeddedobj/qa/cppunit/general.cxx
@@ -21,8 +21,10 @@
 
 using namespace ::com::sun::star;
 
-/// embeddedobj general tests.
-class EmbeddedobjGeneralTest : public test::BootstrapFixture, public 
unotest::MacrosTest
+namespace
+{
+/// Covers embeddedobj/source/general/ fixes.
+class Test : public test::BootstrapFixture, public unotest::MacrosTest
 {
 private:
     uno::Reference<lang::XComponent> mxComponent;
@@ -33,22 +35,23 @@ public:
     uno::Reference<lang::XComponent>& getComponent() { return mxComponent; }
 };
 
-void EmbeddedobjGeneralTest::setUp()
+void Test::setUp()
 {
     test::BootstrapFixture::setUp();
 
     mxDesktop.set(frame::Desktop::create(mxComponentContext));
 }
 
-void EmbeddedobjGeneralTest::tearDown()
+void Test::tearDown()
 {
     if (mxComponent.is())
         mxComponent->dispose();
 
     test::BootstrapFixture::tearDown();
 }
+}
 
-CPPUNIT_TEST_FIXTURE(EmbeddedobjGeneralTest, testInsertFileConfig)
+CPPUNIT_TEST_FIXTURE(Test, testInsertFileConfig)
 {
     // Explicitly disable Word->Writer mapping for this test.
     std::shared_ptr<comphelper::ConfigurationChanges> pBatch(
@@ -82,7 +85,7 @@ CPPUNIT_TEST_FIXTURE(EmbeddedobjGeneralTest, 
testInsertFileConfig)
     CPPUNIT_ASSERT(!xObject.is());
 }
 
-CPPUNIT_TEST_FIXTURE(EmbeddedobjGeneralTest, testInsertFileConfigVsdx)
+CPPUNIT_TEST_FIXTURE(Test, testInsertFileConfigVsdx)
 {
     // Explicitly disable Word->Writer mapping for this test.
     std::shared_ptr<comphelper::ConfigurationChanges> pBatch(
@@ -115,7 +118,7 @@ CPPUNIT_TEST_FIXTURE(EmbeddedobjGeneralTest, 
testInsertFileConfigVsdx)
     CPPUNIT_ASSERT(!xObject.is());
 }
 
-CPPUNIT_TEST_FIXTURE(EmbeddedobjGeneralTest, testInsertFileConfigPdf)
+CPPUNIT_TEST_FIXTURE(Test, testInsertFileConfigPdf)
 {
     // Explicitly disable Word->Writer mapping for this test.
     std::shared_ptr<comphelper::ConfigurationChanges> pBatch(

Reply via email to