diff options
author | Jens Carl <j.carl43@gmx.de> | 2019-03-08 22:48:04 +0000 |
---|---|---|
committer | Jens Carl <j.carl43@gmx.de> | 2019-03-09 02:52:05 +0100 |
commit | fe632c86aa250bb355a59ce6acf4dd75eae7afe0 (patch) | |
tree | ff65bda88c7d37e1db9b93c1b22741f64c8c8382 /test | |
parent | e1a42835d948b21f9d99d23feef5ae0f56ae3563 (diff) |
tdf#45904 Move XRefreshable Java tests to C++
Move XRefreshable Java tests to C++ for ScAreaLinkObj.
To make this test work, had to provide parameter aSourceArea (in this
case file sc/qa/extras/testdocuments/scarealinkobj.ods). All the other
depended tests of ScAreaLinkObj had to adjusted to the new test
environment.
Also fixes i84711, because the XRefreshable test runs independent from
the other tests, as mentioned in the bug description.
Change-Id: I8847813431e2fdd60ed95be0f7d115bcaeafe500
Reviewed-on: https://gerrit.libreoffice.org/68949
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43@gmx.de>
Diffstat (limited to 'test')
-rw-r--r-- | test/source/sheet/cellarealink.cxx | 44 | ||||
-rw-r--r-- | test/source/sheet/xarealink.cxx | 13 |
2 files changed, 33 insertions, 24 deletions
diff --git a/test/source/sheet/cellarealink.cxx b/test/source/sheet/cellarealink.cxx index 80ece911e122..7e64561ab3fc 100644 --- a/test/source/sheet/cellarealink.cxx +++ b/test/source/sheet/cellarealink.cxx @@ -8,6 +8,7 @@ */ #include <test/sheet/cellarealink.hxx> +#include <sfx2/app.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sheet/XAreaLink.hpp> @@ -15,22 +16,19 @@ #include <cppunit/extensions/HelperMacros.h> -using namespace com::sun::star; -using namespace com::sun::star::uno; - -namespace apitest { +using namespace css; +namespace apitest +{ void CellAreaLink::testUrl() { - uno::Reference< beans::XPropertySet > xCellAreaLink(init(), UNO_QUERY_THROW); + uno::Reference<beans::XPropertySet> xCellAreaLink(init(), uno::UNO_QUERY_THROW); const OUString propName("Url"); OUString aUrl; CPPUNIT_ASSERT(xCellAreaLink->getPropertyValue(propName) >>= aUrl); - // FIXME: set a value in ScAreaLinkObj (if nothing is used it points to the home directory - // of the user) - //CPPUNIT_ASSERT_EQUAL_MESSAGE("Default Url already changed", OUString("file:///home/"), aUrl); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Default Url already changed", m_aFileURL, aUrl); uno::Any aNewUrl; aNewUrl <<= OUString("file:///tmp"); @@ -41,13 +39,13 @@ void CellAreaLink::testUrl() void CellAreaLink::testFilter() { - uno::Reference< beans::XPropertySet > xCellAreaLink(init(), UNO_QUERY_THROW); + uno::Reference<beans::XPropertySet> xCellAreaLink(init(), uno::UNO_QUERY_THROW); const OUString propName("Filter"); OUString aFilter; CPPUNIT_ASSERT(xCellAreaLink->getPropertyValue(propName) >>= aFilter); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Default Filter already changed", OUString(""), aFilter); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Default Filter already changed", OUString("calc8"), aFilter); uno::Any aNewFilter; aNewFilter <<= OUString("UnitTest"); @@ -58,55 +56,61 @@ void CellAreaLink::testFilter() void CellAreaLink::testFilterOptions() { - uno::Reference< beans::XPropertySet > xCellAreaLink(init(), UNO_QUERY_THROW); + uno::Reference<beans::XPropertySet> xCellAreaLink(init(), uno::UNO_QUERY_THROW); const OUString propName("FilterOptions"); OUString aFilterOptions; CPPUNIT_ASSERT(xCellAreaLink->getPropertyValue(propName) >>= aFilterOptions); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Default FilterOptions already changed", OUString(""), aFilterOptions); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Default FilterOptions already changed", OUString(""), + aFilterOptions); uno::Any aNewFilterOptions; aNewFilterOptions <<= OUString("UnitTest"); xCellAreaLink->setPropertyValue(propName, aNewFilterOptions); CPPUNIT_ASSERT(xCellAreaLink->getPropertyValue(propName) >>= aFilterOptions); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Value of FilterOptions wasn't changed", OUString("UnitTest"), aFilterOptions); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Value of FilterOptions wasn't changed", OUString("UnitTest"), + aFilterOptions); } void CellAreaLink::testRefreshDelay() { - uno::Reference< beans::XPropertySet > xCellAreaLink(init(), UNO_QUERY_THROW); + uno::Reference<beans::XPropertySet> xCellAreaLink(init(), uno::UNO_QUERY_THROW); const OUString propName("RefreshDelay"); sal_Int32 aRefreshDelay = 0; CPPUNIT_ASSERT(xCellAreaLink->getPropertyValue(propName) >>= aRefreshDelay); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Default RefreshDelay already changed", sal_Int32(0), aRefreshDelay); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Default RefreshDelay already changed", sal_Int32(0), + aRefreshDelay); uno::Any aNewRefreshDelay; aNewRefreshDelay <<= static_cast<sal_Int32>(42); xCellAreaLink->setPropertyValue(propName, aNewRefreshDelay); CPPUNIT_ASSERT(xCellAreaLink->getPropertyValue(propName) >>= aRefreshDelay); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Value of RefreshDelay wasn't changed", sal_Int32(42), aRefreshDelay); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Value of RefreshDelay wasn't changed", sal_Int32(42), + aRefreshDelay); } void CellAreaLink::testRefreshPeriod() { - uno::Reference< beans::XPropertySet > xCellAreaLink(init(), UNO_QUERY_THROW); + uno::Reference<beans::XPropertySet> xCellAreaLink(init(), uno::UNO_QUERY_THROW); const OUString propName("RefreshPeriod"); sal_Int32 aRefreshPeriod = 0; CPPUNIT_ASSERT(xCellAreaLink->getPropertyValue(propName) >>= aRefreshPeriod); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Default RefreshPeriod already changed", sal_Int32(0), aRefreshPeriod); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Default RefreshPeriod already changed", sal_Int32(0), + aRefreshPeriod); uno::Any aNewRefreshPeriod; aNewRefreshPeriod <<= static_cast<sal_Int32>(42); xCellAreaLink->setPropertyValue(propName, aNewRefreshPeriod); CPPUNIT_ASSERT(xCellAreaLink->getPropertyValue(propName) >>= aRefreshPeriod); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Value of RefreshPeriod wasn't changed", sal_Int32(42), aRefreshPeriod); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Value of RefreshPeriod wasn't changed", sal_Int32(42), + aRefreshPeriod); } -} +} // namespace apitest /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/test/source/sheet/xarealink.cxx b/test/source/sheet/xarealink.cxx index ec7ce49a01f8..18c15e725bdb 100644 --- a/test/source/sheet/xarealink.cxx +++ b/test/source/sheet/xarealink.cxx @@ -26,8 +26,13 @@ void XAreaLink::testSetDestArea() uno::Reference< sheet::XAreaLink > xAreaLink(init(), UNO_QUERY_THROW); xAreaLink->setDestArea(table::CellRangeAddress(1,3,4,5,8)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Couldn't set new dest area", - table::CellRangeAddress(1,3,4,5,8), xAreaLink->getDestArea()); + // After setting the the destination area, the link is refreshed and the area + // is adjusted to the size of the source data. + // Only test the 'Sheet', 'StartCol', and 'StartRow' + table::CellRangeAddress aDestArea = xAreaLink->getDestArea(); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Couldn't set new DestArea (Sheet)", sal_Int16(1), aDestArea.Sheet); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Couldn't set new DestArea (StartCol)", sal_Int32(3), aDestArea.StartColumn); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Couldn't set new DestArea (StartRow)", sal_Int32(4), aDestArea.StartRow); } void XAreaLink::testSetSourceArea() @@ -44,7 +49,7 @@ void XAreaLink::testGetDestArea() uno::Reference< sheet::XAreaLink > xAreaLink(init(), UNO_QUERY_THROW); CPPUNIT_ASSERT_EQUAL_MESSAGE("Couldn't get dest area", - table::CellRangeAddress(1,2,3,2,3), xAreaLink->getDestArea()); + table::CellRangeAddress(1,2,3,3,6), xAreaLink->getDestArea()); } void XAreaLink::testGetSourceArea() @@ -52,7 +57,7 @@ void XAreaLink::testGetSourceArea() uno::Reference< sheet::XAreaLink > xAreaLink(init(), UNO_QUERY_THROW); CPPUNIT_ASSERT_EQUAL_MESSAGE("Couldn't get source area", - OUString("a1:c1"), xAreaLink->getSourceArea()); + OUString("a2:b5"), xAreaLink->getSourceArea()); } } |