From a9a350c13d8fb454c3f1db7ca6a7f10c1e7a19bb Mon Sep 17 00:00:00 2001 From: Moaz Date: Sun, 21 Feb 2021 20:22:40 +0200 Subject: tdf#139734 Remove redundant asserts after MacrosTest::loadFromDesktop MacrosTest::loadFromDesktop itself asserts on its return value. Thus, the additional checks in unit tests are redundant, and only create noise unrelated to the tested functionality. Change-Id: If616001b296afdde38f5a23ececee3d44b4a395d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111290 Tested-by: Jenkins Reviewed-by: Mike Kaganski --- dbaccess/qa/extras/dialog-save.cxx | 1 - dbaccess/qa/extras/empty-stdlib-save.cxx | 1 - dbaccess/qa/extras/macros-test.cxx | 1 - dbaccess/qa/extras/nolib-save.cxx | 1 - dbaccess/qa/extras/rowsetclones.cxx | 2 -- dbaccess/qa/unit/dbtest_base.cxx | 2 -- 6 files changed, 8 deletions(-) (limited to 'dbaccess/qa') diff --git a/dbaccess/qa/extras/dialog-save.cxx b/dbaccess/qa/extras/dialog-save.cxx index 5eac41e67041..fc34768bd10f 100644 --- a/dbaccess/qa/extras/dialog-save.cxx +++ b/dbaccess/qa/extras/dialog-save.cxx @@ -58,7 +58,6 @@ void DialogSaveTest::test() const OUString aFileName(m_directories.getURLFromWorkdir(u"CppunitTest/testDialogSave.odb")); { uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFileName); - CPPUNIT_ASSERT(xComponent.is()); uno::Reference< frame::XStorable > xDocStorable(xComponent, UNO_QUERY_THROW); uno::Reference< document::XEmbeddedScripts > xDocScr(xComponent, UNO_QUERY_THROW); uno::Reference< script::XStorageBasedLibraryContainer > xStorBasLib(xDocScr->getBasicLibraries()); diff --git a/dbaccess/qa/extras/empty-stdlib-save.cxx b/dbaccess/qa/extras/empty-stdlib-save.cxx index aa7dd293004f..978045a2e2e1 100644 --- a/dbaccess/qa/extras/empty-stdlib-save.cxx +++ b/dbaccess/qa/extras/empty-stdlib-save.cxx @@ -56,7 +56,6 @@ void DialogSaveTest::test() const OUString aFileName(m_directories.getURLFromWorkdir(u"CppunitTest/testEmptyStdlibSave.odb")); { uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFileName); - CPPUNIT_ASSERT(xComponent.is()); uno::Reference< frame::XStorable > xDocStorable(xComponent, UNO_QUERY_THROW); uno::Reference< document::XEmbeddedScripts > xDocScr(xComponent, UNO_QUERY_THROW); uno::Reference< script::XStorageBasedLibraryContainer > xStorBasLib(xDocScr->getBasicLibraries()); diff --git a/dbaccess/qa/extras/macros-test.cxx b/dbaccess/qa/extras/macros-test.cxx index e102c75896b3..6e165ac640ff 100644 --- a/dbaccess/qa/extras/macros-test.cxx +++ b/dbaccess/qa/extras/macros-test.cxx @@ -37,7 +37,6 @@ void DBAccessTest::test() OUString aFileName; createFileURL(u"testdb.odb", aFileName); uno::Reference xComponent = loadFromDesktop(aFileName); - CPPUNIT_ASSERT(xComponent.is()); xComponent->dispose(); } diff --git a/dbaccess/qa/extras/nolib-save.cxx b/dbaccess/qa/extras/nolib-save.cxx index e191402425f9..4443bfd4e2b7 100644 --- a/dbaccess/qa/extras/nolib-save.cxx +++ b/dbaccess/qa/extras/nolib-save.cxx @@ -56,7 +56,6 @@ void DialogSaveTest::test() const OUString aFileName(m_directories.getURLFromWorkdir(u"CppunitTest/testNolibSave.odb")); { uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFileName); - CPPUNIT_ASSERT(xComponent.is()); uno::Reference< frame::XStorable > xDocStorable(xComponent, UNO_QUERY_THROW); uno::Reference< document::XEmbeddedScripts > xDocScr(xComponent, UNO_QUERY_THROW); uno::Reference< script::XStorageBasedLibraryContainer > xStorBasLib(xDocScr->getBasicLibraries()); diff --git a/dbaccess/qa/extras/rowsetclones.cxx b/dbaccess/qa/extras/rowsetclones.cxx index d4637c5d8ae6..21a30636961b 100644 --- a/dbaccess/qa/extras/rowsetclones.cxx +++ b/dbaccess/qa/extras/rowsetclones.cxx @@ -51,8 +51,6 @@ void RowSetClones::test() const OUString sFilePath(m_directories.getURLFromWorkdir(u"CppunitTest/RowSetClones.odb")); uno::Reference< lang::XComponent > xComponent (loadFromDesktop(sFilePath)); - CPPUNIT_ASSERT(xComponent.is()); - uno::Reference< XOfficeDatabaseDocument > xDocument(xComponent, UNO_QUERY); CPPUNIT_ASSERT(xDocument.is()); diff --git a/dbaccess/qa/unit/dbtest_base.cxx b/dbaccess/qa/unit/dbtest_base.cxx index caee25fa70ac..c7992288cdbd 100644 --- a/dbaccess/qa/unit/dbtest_base.cxx +++ b/dbaccess/qa/unit/dbtest_base.cxx @@ -67,8 +67,6 @@ uno::Reference< XOfficeDatabaseDocument > uno::Reference DBTestBase::getDocumentForUrl(OUString const & url) { uno::Reference< lang::XComponent > xComponent (loadFromDesktop(url)); - CPPUNIT_ASSERT(xComponent.is()); - uno::Reference< XOfficeDatabaseDocument > xDocument(xComponent, UNO_QUERY); CPPUNIT_ASSERT(xDocument.is()); -- cgit