From 3004ba81597d75fd4253cb86f3455c4ae1c6acdb Mon Sep 17 00:00:00 2001 From: Jens Carl Date: Sun, 10 Dec 2017 00:53:43 +0000 Subject: Improve set up of test objects Improve the set up of the test objects by either adding an assert that a valid uno::Reference exists or adding a message to existing asserts. Change-Id: I21af3a168eeae232edc8ef6787c439279e52d266 Reviewed-on: https://gerrit.libreoffice.org/46176 Tested-by: Jenkins Reviewed-by: Jens Carl --- sc/qa/extras/scannotationshapeobj.cxx | 2 ++ sc/qa/extras/sccellcursorobj.cxx | 3 ++- sc/qa/extras/sccellrangeobj.cxx | 3 +++ sc/qa/extras/scdatabaserangeobj.cxx | 3 ++- sc/qa/extras/scdatabaserangesobj.cxx | 4 ++-- sc/qa/extras/scdatapilotfieldobj.cxx | 3 ++- sc/qa/extras/scdatapilottableobj.cxx | 2 ++ sc/qa/extras/scmodelobj.cxx | 2 +- sc/qa/extras/scnamedrangeobj.cxx | 2 +- sc/qa/extras/scnamedrangesobj.cxx | 2 +- sc/qa/extras/scoutlineobj.cxx | 4 +++- sc/qa/extras/sctablesheetobj.cxx | 14 +++++++++----- sc/qa/extras/sctablesheetsobj.cxx | 3 ++- 13 files changed, 32 insertions(+), 15 deletions(-) (limited to 'sc/qa') diff --git a/sc/qa/extras/scannotationshapeobj.cxx b/sc/qa/extras/scannotationshapeobj.cxx index 805fe1f940a4..361c26a90525 100644 --- a/sc/qa/extras/scannotationshapeobj.cxx +++ b/sc/qa/extras/scannotationshapeobj.cxx @@ -82,6 +82,8 @@ uno::Reference ScAnnotationShapeObj::init() mxComponent = loadFromDesktop("private:factory/scalc"); uno::Reference xDoc(mxComponent, UNO_QUERY_THROW); + CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); + uno::Reference xIA(xDoc->getSheets(), UNO_QUERY_THROW); uno::Reference xSheet(xIA->getByIndex(0), UNO_QUERY_THROW); diff --git a/sc/qa/extras/sccellcursorobj.cxx b/sc/qa/extras/sccellcursorobj.cxx index 543b32123ba9..43d0113d777e 100644 --- a/sc/qa/extras/sccellcursorobj.cxx +++ b/sc/qa/extras/sccellcursorobj.cxx @@ -103,9 +103,10 @@ uno::Reference< uno::XInterface > ScCellCursorObj::init() createFileURL("ScCellCursorObj.ods", aFileURL); if (!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); - CPPUNIT_ASSERT_MESSAGE("no calc document", mxComponent.is()); uno::Reference xDoc(mxComponent, UNO_QUERY_THROW); + CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); + uno::Reference xIndex (xDoc->getSheets(), UNO_QUERY_THROW); uno::Reference xSheet(xIndex->getByIndex(0), UNO_QUERY_THROW); diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx index 8732137d447a..fa14458872ee 100644 --- a/sc/qa/extras/sccellrangeobj.cxx +++ b/sc/qa/extras/sccellrangeobj.cxx @@ -153,6 +153,7 @@ uno::Reference< uno::XInterface > ScCellRangeObj::init() std::cout << OUStringToOString(aFileURL, RTL_TEXTENCODING_UTF8).getStr() << std::endl; if (!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); + uno::Reference< sheet::XSpreadsheetDocument> xDoc (mxComponent, UNO_QUERY_THROW); CPPUNIT_ASSERT_MESSAGE("no calc document!", xDoc.is()); @@ -175,6 +176,7 @@ uno::Reference< uno::XInterface > ScCellRangeObj::getXSpreadsheet() std::cout << OUStringToOString(aFileURL, RTL_TEXTENCODING_UTF8).getStr() << std::endl; if (!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); + uno::Reference< sheet::XSpreadsheetDocument> xDoc (mxComponent, UNO_QUERY_THROW); CPPUNIT_ASSERT_MESSAGE("no calc document!", xDoc.is()); @@ -192,6 +194,7 @@ uno::Reference< uno::XInterface > ScCellRangeObj::getXCellRangeData() std::cout << OUStringToOString(aFileURL, RTL_TEXTENCODING_UTF8).getStr() << std::endl; if (!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); + uno::Reference< sheet::XSpreadsheetDocument> xDoc (mxComponent, UNO_QUERY_THROW); CPPUNIT_ASSERT_MESSAGE("no calc document!", xDoc.is()); diff --git a/sc/qa/extras/scdatabaserangeobj.cxx b/sc/qa/extras/scdatabaserangeobj.cxx index a2a17f5e335a..818fe033ba0e 100644 --- a/sc/qa/extras/scdatabaserangeobj.cxx +++ b/sc/qa/extras/scdatabaserangeobj.cxx @@ -76,9 +76,10 @@ uno::Reference< uno::XInterface > ScDatabaseRangeObj::init( const OUString& rDBN createFileURL("ScDatabaseRangeObj.ods", aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); - CPPUNIT_ASSERT(mxComponent.is()); uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, UNO_QUERY_THROW); + CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); + uno::Reference< beans::XPropertySet > xPropSet(xDoc, UNO_QUERY_THROW); uno::Reference< container::XNameAccess > xNameAccess( xPropSet->getPropertyValue("DatabaseRanges"), UNO_QUERY_THROW); uno::Reference< sheet::XDatabaseRange > xDBRange( xNameAccess->getByName(rDBName), UNO_QUERY_THROW); diff --git a/sc/qa/extras/scdatabaserangesobj.cxx b/sc/qa/extras/scdatabaserangesobj.cxx index 8c7f14890927..170663774d37 100644 --- a/sc/qa/extras/scdatabaserangesobj.cxx +++ b/sc/qa/extras/scdatabaserangesobj.cxx @@ -61,11 +61,11 @@ uno::Reference ScDatabaseRangesObj::init() // create a calc document if (!mxComponent.is()) mxComponent = loadFromDesktop("private:factory/scalc"); - CPPUNIT_ASSERT_MESSAGE("no calc document", mxComponent.is()); uno::Reference xDoc(mxComponent, UNO_QUERY_THROW); - uno::Reference xPropSet(xDoc, UNO_QUERY_THROW); + CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); + uno::Reference xPropSet(xDoc, UNO_QUERY_THROW); uno::Reference xDbRanges(xPropSet->getPropertyValue("DatabaseRanges"), UNO_QUERY_THROW); diff --git a/sc/qa/extras/scdatapilotfieldobj.cxx b/sc/qa/extras/scdatapilotfieldobj.cxx index 6c4fce2cbbae..d2bf03b74b8e 100644 --- a/sc/qa/extras/scdatapilotfieldobj.cxx +++ b/sc/qa/extras/scdatapilotfieldobj.cxx @@ -75,9 +75,10 @@ uno::Reference< uno::XInterface > ScDataPilotFieldObj::init() createFileURL("scdatapilotfieldobj.ods", aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); - CPPUNIT_ASSERT(mxComponent.is()); uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, UNO_QUERY_THROW); + CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); + uno::Reference< container::XIndexAccess > xIndex (xDoc->getSheets(), UNO_QUERY_THROW); uno::Reference< sheet::XSpreadsheet > xSheet( xIndex->getByIndex(1), UNO_QUERY_THROW); diff --git a/sc/qa/extras/scdatapilottableobj.cxx b/sc/qa/extras/scdatapilottableobj.cxx index beaaeae7f4a1..b7919b6890c6 100644 --- a/sc/qa/extras/scdatapilottableobj.cxx +++ b/sc/qa/extras/scdatapilottableobj.cxx @@ -81,6 +81,8 @@ uno::Reference< uno::XInterface > ScDataPilotTableObj::init() CPPUNIT_ASSERT(mxComponent.is()); uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, UNO_QUERY_THROW); + CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); + uno::Reference< container::XIndexAccess > xIndex (xDoc->getSheets(), UNO_QUERY_THROW); uno::Reference< sheet::XSpreadsheet > xSheet( xIndex->getByIndex(0), UNO_QUERY_THROW); diff --git a/sc/qa/extras/scmodelobj.cxx b/sc/qa/extras/scmodelobj.cxx index f81c49bfef45..0299fb81890a 100644 --- a/sc/qa/extras/scmodelobj.cxx +++ b/sc/qa/extras/scmodelobj.cxx @@ -50,7 +50,7 @@ uno::Reference< uno::XInterface > ScModelObj::init() createFileURL("ScModelObj.ods", aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); - CPPUNIT_ASSERT(mxComponent.is()); + CPPUNIT_ASSERT_MESSAGE("no componet loaded", mxComponent.is()); return mxComponent; } diff --git a/sc/qa/extras/scnamedrangeobj.cxx b/sc/qa/extras/scnamedrangeobj.cxx index 0ed8fee62830..dc0e03f26796 100644 --- a/sc/qa/extras/scnamedrangeobj.cxx +++ b/sc/qa/extras/scnamedrangeobj.cxx @@ -69,7 +69,7 @@ uno::Reference< sheet::XNamedRanges > ScNamedRangeObj::init_impl() createFileURL("ScNamedRangeObj.ods", aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); - CPPUNIT_ASSERT(mxComponent.is()); + CPPUNIT_ASSERT_MESSAGE("no componet loaded", mxComponent.is()); uno::Reference< beans::XPropertySet > xPropSet (mxComponent, UNO_QUERY_THROW); uno::Reference< sheet::XNamedRanges > xNamedRanges(xPropSet->getPropertyValue("NamedRanges"), UNO_QUERY_THROW); diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx index 15e02cfd066d..94a21695f0c9 100644 --- a/sc/qa/extras/scnamedrangesobj.cxx +++ b/sc/qa/extras/scnamedrangesobj.cxx @@ -57,7 +57,7 @@ uno::Reference< uno::XInterface > ScNamedRangesObj::init(sal_Int32 nSheet) createFileURL("ScNamedRangeObj.ods", aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); - CPPUNIT_ASSERT(mxComponent.is()); + CPPUNIT_ASSERT_MESSAGE("no componet loaded", mxComponent.is()); uno::Reference< beans::XPropertySet > xPropSet (mxComponent, UNO_QUERY_THROW); uno::Reference< sheet::XNamedRanges > xNamedRanges(xPropSet->getPropertyValue("NamedRanges"), UNO_QUERY_THROW); diff --git a/sc/qa/extras/scoutlineobj.cxx b/sc/qa/extras/scoutlineobj.cxx index 2b32e62a9788..de14185e2db5 100644 --- a/sc/qa/extras/scoutlineobj.cxx +++ b/sc/qa/extras/scoutlineobj.cxx @@ -60,10 +60,12 @@ uno::Reference< uno::XInterface > ScOutlineObj::init() createFileURL("ScOutlineObj.ods", aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL); - CPPUNIT_ASSERT_MESSAGE("Component not loaded",mxComponent.is()); + CPPUNIT_ASSERT_MESSAGE("Component not loaded", mxComponent.is()); // get the first sheet uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, UNO_QUERY_THROW); + CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); + uno::Reference< container::XIndexAccess > xIndex (xDoc->getSheets(), UNO_QUERY_THROW); uno::Reference< sheet::XSpreadsheet > xSheet( xIndex->getByIndex(0), UNO_QUERY_THROW); diff --git a/sc/qa/extras/sctablesheetobj.cxx b/sc/qa/extras/sctablesheetobj.cxx index 2ecd583ee5e9..b0e546058a33 100644 --- a/sc/qa/extras/sctablesheetobj.cxx +++ b/sc/qa/extras/sctablesheetobj.cxx @@ -175,9 +175,11 @@ uno::Reference< uno::XInterface > ScTableSheetObj::init() createFileURL("ScTableSheetObj.ods", maFileURL); if (!mxComponent.is()) mxComponent = loadFromDesktop(maFileURL, "com.sun.star.sheet.SpreadsheetDocument"); - CPPUNIT_ASSERT_MESSAGE("no calc document", mxComponent.is()); + CPPUNIT_ASSERT_MESSAGE("no component loaded", mxComponent.is()); uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, UNO_QUERY_THROW); + CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); + uno::Reference xSheets(xDoc->getSheets(), UNO_QUERY_THROW); uno::Reference< container::XIndexAccess > xIndex (xDoc->getSheets(), UNO_QUERY_THROW); uno::Reference< sheet::XSpreadsheet > xSheet( xIndex->getByIndex(0), UNO_QUERY_THROW); @@ -205,11 +207,12 @@ uno::Reference ScTableSheetObj::getScenarioSpreadsheet() createFileURL("ScTableSheetObj.ods", maFileURL); if (!mxComponent.is()) mxComponent = loadFromDesktop(maFileURL, "com.sun.star.sheet.SpreadsheetDocument"); - CPPUNIT_ASSERT_MESSAGE("no calc document", mxComponent.is()); + CPPUNIT_ASSERT_MESSAGE("no component loaded", mxComponent.is()); uno::Reference xDoc(mxComponent, UNO_QUERY_THROW); - uno::Reference xSheets(xDoc->getSheets(), UNO_QUERY_THROW); + CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); + uno::Reference xSheets(xDoc->getSheets(), UNO_QUERY_THROW); uno::Reference xIndex (xDoc->getSheets(), UNO_QUERY_THROW); uno::Reference xSheet(xIndex->getByIndex(0), UNO_QUERY_THROW); @@ -237,11 +240,12 @@ uno::Reference< uno::XInterface > ScTableSheetObj::getXSpreadsheet() createFileURL("ScTableSheetObj.ods", maFileURL); if (!mxComponent.is()) mxComponent = loadFromDesktop(maFileURL, "com.sun.star.sheet.SpreadsheetDocument"); - CPPUNIT_ASSERT_MESSAGE("no calc document", mxComponent.is()); + CPPUNIT_ASSERT_MESSAGE("no component loaded", mxComponent.is()); uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, UNO_QUERY_THROW); - uno::Reference xSheets(xDoc->getSheets(), UNO_QUERY_THROW); + CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); + uno::Reference xSheets(xDoc->getSheets(), UNO_QUERY_THROW); uno::Reference< container::XIndexAccess > xIndex (xDoc->getSheets(), UNO_QUERY_THROW); uno::Reference< sheet::XSpreadsheet > xSheet( xIndex->getByIndex(0), UNO_QUERY_THROW); diff --git a/sc/qa/extras/sctablesheetsobj.cxx b/sc/qa/extras/sctablesheetsobj.cxx index 8bc3010c06af..597f1ac6e270 100644 --- a/sc/qa/extras/sctablesheetsobj.cxx +++ b/sc/qa/extras/sctablesheetsobj.cxx @@ -90,7 +90,8 @@ uno::Reference< uno::XInterface > ScTableSheetsObj::init() createFileURL("rangenamessrc.ods", aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL); - CPPUNIT_ASSERT(mxComponent.is()); + CPPUNIT_ASSERT_MESSAGE("no component loaded", mxComponent.is()); + xDocument.set(mxComponent, UNO_QUERY_THROW); uno::Reference< uno::XInterface > xReturn( xDocument->getSheets(), UNO_QUERY_THROW); -- cgit