Skip to content

C
core
Kaydet (Commit) 3004ba81 authored tarafından Jens Carl's avatar Jens Carl
Dosyalara gözat
Seçenekler

Improve set up of test objects 

Improve the set up of the test objects by either adding an assert that a
valid uno::Reference<sheet::XSpreadsheetDocument> exists or adding a
message to existing asserts.

Change-Id: I21af3a168eeae232edc8ef6787c439279e52d266
Reviewed-on: https://gerrit.libreoffice.org/46176Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJens Carl <j.carl43@gmx.de>
üst 225115af
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 15 deletions
sc/qa/extras/scannotationshapeobj.cxx
Dosyayı görüntüle @ 3004ba81
......@@ -82,6 +82,8 @@ uno::Reference<uno::XInterface> ScAnnotationShapeObj::init()
mxComponent = loadFromDesktop("private:factory/scalc");
uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, UNO_QUERY_THROW);
CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
uno::Reference<container::XIndexAccess> xIA(xDoc->getSheets(), UNO_QUERY_THROW);
uno::Reference<sheet::XSpreadsheet> xSheet(xIA->getByIndex(0), UNO_QUERY_THROW);
......
sc/qa/extras/sccellcursorobj.cxx
Dosyayı görüntüle @ 3004ba81
......@@ -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<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);
......
sc/qa/extras/sccellrangeobj.cxx
Dosyayı görüntüle @ 3004ba81
......@@ -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());
......
sc/qa/extras/scdatabaserangeobj.cxx
Dosyayı görüntüle @ 3004ba81
......@@ -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);
......
sc/qa/extras/scdatabaserangesobj.cxx
Dosyayı görüntüle @ 3004ba81
......@@ -61,11 +61,11 @@ uno::Reference<uno::XInterface> ScDatabaseRangesObj::init()
// create a calc document
if (!mxComponent.is())
mxComponent = loadFromDesktop("private:factory/scalc");
CPPUNIT_ASSERT_MESSAGE("no calc document", mxComponent.is());
uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, UNO_QUERY_THROW);
uno::Reference<beans::XPropertySet> xPropSet(xDoc, UNO_QUERY_THROW);
CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
uno::Reference<beans::XPropertySet> xPropSet(xDoc, UNO_QUERY_THROW);
uno::Reference<sheet::XDatabaseRanges> xDbRanges(xPropSet->getPropertyValue("DatabaseRanges"),
UNO_QUERY_THROW);
......
sc/qa/extras/scdatapilotfieldobj.cxx
Dosyayı görüntüle @ 3004ba81
......@@ -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);
......
sc/qa/extras/scdatapilottableobj.cxx
Dosyayı görüntüle @ 3004ba81
......@@ -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);
......
sc/qa/extras/scmodelobj.cxx
Dosyayı görüntüle @ 3004ba81
......@@ -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;
}
......
sc/qa/extras/scnamedrangeobj.cxx
Dosyayı görüntüle @ 3004ba81
......@@ -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);
......
sc/qa/extras/scnamedrangesobj.cxx
Dosyayı görüntüle @ 3004ba81
......@@ -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);
......
sc/qa/extras/scoutlineobj.cxx
Dosyayı görüntüle @ 3004ba81
......@@ -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);
......
sc/qa/extras/sctablesheetobj.cxx
Dosyayı görüntüle @ 3004ba81
......@@ -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<sheet::XSpreadsheets> 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<uno::XInterface> 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<sheet::XSpreadsheetDocument> xDoc(mxComponent, UNO_QUERY_THROW);
uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), UNO_QUERY_THROW);
CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
uno::Reference<sheet::XSpreadsheets> 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);
......@@ -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<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), UNO_QUERY_THROW);
CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
uno::Reference<sheet::XSpreadsheets> 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);
......
sc/qa/extras/sctablesheetsobj.cxx
Dosyayı görüntüle @ 3004ba81
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment