diff options
Diffstat (limited to 'dbaccess/qa/extras/macros-test.cxx')
-rw-r--r-- | dbaccess/qa/extras/macros-test.cxx | 40 |
1 files changed, 5 insertions, 35 deletions
diff --git a/dbaccess/qa/extras/macros-test.cxx b/dbaccess/qa/extras/macros-test.cxx index bcff5342f3d1..761f24120422 100644 --- a/dbaccess/qa/extras/macros-test.cxx +++ b/dbaccess/qa/extras/macros-test.cxx @@ -8,11 +8,9 @@ */ #include <sal/config.h> -#include <test/bootstrapfixture.hxx> -#include <unotest/macros_test.hxx> +#include <test/unoapi_test.hxx> #include <rtl/strbuf.hxx> #include <osl/file.hxx> -#include <com/sun/star/frame/Desktop.hpp> #include <sfx2/app.hxx> #include <sfx2/docfilt.hxx> @@ -26,16 +24,11 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -class DBAccessTest : public test::BootstrapFixture, public unotest::MacrosTest +class DBAccessTest : public UnoApiTest { public: DBAccessTest(); - void createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath); - - virtual void setUp(); - virtual void tearDown(); - void test(); CPPUNIT_TEST_SUITE(DBAccessTest); @@ -44,46 +37,23 @@ public: #endif CPPUNIT_TEST_SUITE_END(); -private: - OUString m_aBaseString; }; -void DBAccessTest::createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath) -{ - rFilePath = getSrcRootURL() + m_aBaseString + "/" + aFileBase + aFileExtension; -} - DBAccessTest::DBAccessTest() - : m_aBaseString(RTL_CONSTASCII_USTRINGPARAM("/dbaccess/qa/extras/testdocuments")) + : UnoApiTest("/dbaccess/qa/extras/testdocuments") { } void DBAccessTest::test() { - const OUString aFileNameBase("testdb."); - const OUString aFileExtension("odb"); + const OUString aFileNameBase("testdb.odb"); OUString aFileName; - createFileURL(aFileNameBase, aFileExtension, aFileName); + createFileURL(aFileNameBase, aFileName); uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFileName); CPPUNIT_ASSERT(xComponent.is()); } -void DBAccessTest::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 - mxDesktop = com::sun::star::frame::Desktop::create( comphelper::getComponentContext(getMultiServiceFactory()) ); - CPPUNIT_ASSERT(mxDesktop.is()); -} - -void DBAccessTest::tearDown() -{ - test::BootstrapFixture::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(DBAccessTest); CPPUNIT_PLUGIN_IMPLEMENT(); |