mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: clang-format recently added xsheet tests

Browse Source 
Jens says he was unhappy with the 80 cols limit, so clang-format was
explicitly avoided for these new files, but now that the both the config
and TEMPLATE.SOURCECODE.HEADER says 100, it's fine to reformat these to
enforce consistency from now on.

Change-Id: Ia6f0a65920ad2c9d7b0834a0712356568c39624e
This commit is contained in:
Miklos Vajna
2017-11-07 10:19:32 +01:00
parent 9d2baccabe
commit 5946eedfb7
13 changed files with 97 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/test/cppunitasserthelper.hxx
View File

@@ -27,15 +27,11 @@ CPPUNIT_NS_BEGIN
* This specialization from @c struct @c assertion_traits<> helps to compare
* @see com::sun::star::table::CellAddress.
*/
template<>
struct assertion_traits<table::CellAddress>
template <> struct assertion_traits<table::CellAddress>
{
static bool equal(const table::CellAddress& x, const table::CellAddress& y)
{
return x == y;
}
static bool equal(const table::CellAddress& x, const table::CellAddress& y) { return x == y; }
static std::string toString( const table::CellAddress& x )
static std::string toString(const table::CellAddress& x)
{
OStringStream ost;
ost << "Sheet: " << x.Sheet << " Column: " << x.Column << " Row: " << x.Row;
@@ -48,19 +44,19 @@ struct assertion_traits<table::CellAddress>
* This specialization from @c struct @c assertion_traits<> helps to compare
* @see com::sun::star::table::CellRangeAddress.
*/
template<>
struct assertion_traits<table::CellRangeAddress>
template <> struct assertion_traits<table::CellRangeAddress>
{
static bool equal(const table::CellRangeAddress& x, const table::CellRangeAddress& y)
{
return x == y;
}
static std::string toString( const table::CellRangeAddress& x )
static std::string toString(const table::CellRangeAddress& x)
{
OStringStream ost;
ost << "Sheet: " << x.Sheet << " StartColumn: " << x.StartColumn << " StartRow: " << x.StartRow
<< " EndColumn: " << x.EndColumn << " EndRow: " << x.EndRow;
ost << "Sheet: " << x.Sheet << " StartColumn: " << x.StartColumn
<< " StartRow: " << x.StartRow << " EndColumn: " << x.EndColumn
<< " EndRow: " << x.EndRow;
return ost.str();
}
};

7
include/test/sheet/xsheetcellrange.hxx
View File

@@ -10,25 +10,24 @@
#ifndef INCLUDED_TEST_SHEET_XSHEETCELLRANGE_HXX
#define INCLUDED_TEST_SHEET_XSHEETCELLRANGE_HXX
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <test/testdllapi.hxx>
namespace apitest {
namespace apitest
{
class OOO_DLLPUBLIC_TEST XSheetCellRange
{
public:
virtual css::uno::Reference< css::uno::XInterface > init() =0;
virtual css::uno::Reference<css::uno::XInterface> init() = 0;
void testGetSpreadsheet();
protected:
~XSheetCellRange() {}
};
}
#endif // INCLUDED_TEST_SHEET_XSHEETCELLRANGE_HXX

8
include/test/sheet/xsheetcellrangecontainer.hxx
View File

@@ -18,21 +18,21 @@
#include <test/testdllapi.hxx>
namespace apitest {
namespace apitest
{
class OOO_DLLPUBLIC_TEST XSheetCellRangeContainer
{
public:
virtual css::uno::Reference< css::uno::XInterface > init() =0;
virtual css::uno::Reference<css::uno::XInterface> init() = 0;
void testAddRemoveRangeAddress();
void testAddRemoveRangeAddresses();
protected:
~XSheetCellRangeContainer() {}
css::uno::Sequence< com::sun::star::table::CellRangeAddress > createCellRangeAddresses();
css::uno::Sequence<com::sun::star::table::CellRangeAddress> createCellRangeAddresses();
};
}
#endif // INCLUDED_TEST_SHEET_XSHEETCELLRANGECONTAINER_HXX

7
include/test/sheet/xsheetcellranges.hxx
View File

@@ -10,18 +10,18 @@
#ifndef INCLUDED_TEST_SHEET_XSHEETCELLRANGES_HXX
#define INCLUDED_TEST_SHEET_XSHEETCELLRANGES_HXX
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <test/testdllapi.hxx>
namespace apitest {
namespace apitest
{
class OOO_DLLPUBLIC_TEST XSheetCellRanges
{
public:
virtual css::uno::Reference< css::uno::XInterface > init() =0;
virtual css::uno::Reference<css::uno::XInterface> init() = 0;
void testGetCells();
void testGetRangeAddresses();
@@ -30,7 +30,6 @@ public:
protected:
~XSheetCellRanges() {}
};
}
#endif // INCLUDED_TEST_SHEET_XSHEETCELLRANGES_HXX

7
include/test/sheet/xsheetcondition.hxx
View File

@@ -10,18 +10,18 @@
#ifndef INCLUDED_TEST_SHEET_XSHEETCONDITION_HXX
#define INCLUDED_TEST_SHEET_XSHEETCONDITION_HXX
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <test/testdllapi.hxx>
namespace apitest {
namespace apitest
{
class OOO_DLLPUBLIC_TEST XSheetCondition
{
public:
virtual css::uno::Reference< css::uno::XInterface > init() =0;
virtual css::uno::Reference<css::uno::XInterface> init() = 0;
void testGetSetFormula1();
void testGetSetFormula2();
@@ -31,7 +31,6 @@ public:
protected:
~XSheetCondition() {}
};
}
#endif // INCLUDED_TEST_SHEET_XSHEETCONDITION_HXX

10
include/test/sheet/xsheetconditionalentries.hxx
View File

@@ -10,7 +10,6 @@
#ifndef INCLUDED_TEST_SHEET_XSHEETCONDITIONALENTRIES_HXX
#define INCLUDED_TEST_SHEET_XSHEETCONDITIONALENTRIES_HXX
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/uno/XInterface.hpp>
@@ -19,13 +18,15 @@
#include <test/testdllapi.hxx>
namespace apitest {
namespace apitest
{
class OOO_DLLPUBLIC_TEST XSheetConditionalEntries
{
public:
virtual css::uno::Reference< css::uno::XInterface > init() =0;
virtual css::uno::Sequence< com::sun::star::beans::PropertyValue > createCondition(const sal_Int32 nr) =0;
virtual css::uno::Reference<css::uno::XInterface> init() = 0;
virtual css::uno::Sequence<com::sun::star::beans::PropertyValue>
createCondition(const sal_Int32 nr) = 0;
void testAddNew();
void testClear();
@@ -34,7 +35,6 @@ public:
protected:
~XSheetConditionalEntries() {}
};
}
#endif // INCLUDED_TEST_SHEET_XSHEETCONDITIONALENTRIES_HXX

7
include/test/sheet/xsheetconditionalentry.hxx
View File

@@ -10,25 +10,24 @@
#ifndef INCLUDED_TEST_SHEET_XSHEETCONDITIONALENTRY_HXX
#define INCLUDED_TEST_SHEET_XSHEETCONDITIONALENTRY_HXX
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <test/testdllapi.hxx>
namespace apitest {
namespace apitest
{
class OOO_DLLPUBLIC_TEST XSheetConditionalEntry
{
public:
virtual css::uno::Reference< css::uno::XInterface > init() =0;
virtual css::uno::Reference<css::uno::XInterface> init() = 0;
void testGetSetStyleName();
protected:
~XSheetConditionalEntry() {}
};
}
#endif // INCLUDED_TEST_SHEET_XSHEETCONDITIONALENTRY_HXX

8
test/source/sheet/xsheetcellrange.cxx
View File

@@ -19,16 +19,16 @@
using namespace com::sun::star;
using namespace com::sun::star::uno;
namespace apitest {
namespace apitest
{
void XSheetCellRange::testGetSpreadsheet()
{
uno::Reference< sheet::XSheetCellRange > xSheetCellRange(init(), UNO_QUERY_THROW);
uno::Reference< sheet::XSpreadsheet > xSheet = xSheetCellRange->getSpreadsheet();
uno::Reference<sheet::XSheetCellRange> xSheetCellRange(init(), UNO_QUERY_THROW);
uno::Reference<sheet::XSpreadsheet> xSheet = xSheetCellRange->getSpreadsheet();
CPPUNIT_ASSERT_MESSAGE("Unable to get spreadsheet", xSheet.is());
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */

61
test/source/sheet/xsheetcellrangecontainer.cxx
View File

@@ -20,60 +20,60 @@
using namespace com::sun::star;
using namespace com::sun::star::uno;
namespace apitest {
namespace apitest
{
void XSheetCellRangeContainer::testAddRemoveRangeAddress()
{
uno::Reference< sheet::XSheetCellRangeContainer > xSCRC(init(), UNO_QUERY_THROW);
uno::Reference<sheet::XSheetCellRangeContainer> xSCRC(init(), UNO_QUERY_THROW);
xSCRC->removeRangeAddresses(xSCRC->getRangeAddresses()); // prepare a clean slate
uno::Sequence< table::CellRangeAddress > aAddr = createCellRangeAddresses();
uno::Sequence<table::CellRangeAddress> aAddr = createCellRangeAddresses();
sal_Int32 cnt = xSCRC->getCount();
xSCRC->addRangeAddress(aAddr[0], false);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to add CellRangeAddress (count)",
cnt + 1, xSCRC->getCount());
CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to add CellRangeAddress (count)", cnt + 1,
xSCRC->getCount());
uno::Sequence< table::CellRangeAddress > aAfterAddAddr = xSCRC->getRangeAddresses();
uno::Sequence<table::CellRangeAddress> aAfterAddAddr = xSCRC->getRangeAddresses();
cnt = xSCRC->getCount();
CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to add CellRangeAddress (entry)",
aAddr[0], aAfterAddAddr[cnt - 1]);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to add CellRangeAddress (entry)", aAddr[0],
aAfterAddAddr[cnt - 1]);
xSCRC->removeRangeAddress(aAddr[0]);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to remove CellRangeAddress (count)",
cnt - 1, xSCRC->getCount());
CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to remove CellRangeAddress (count)", cnt - 1,
xSCRC->getCount());
uno::Sequence< table::CellRangeAddress > aAfterRemoveAddr = xSCRC->getRangeAddresses();
for ( auto const & addr : aAfterRemoveAddr )
uno::Sequence<table::CellRangeAddress> aAfterRemoveAddr = xSCRC->getRangeAddresses();
for (auto const& addr : aAfterRemoveAddr)
{
CPPUNIT_ASSERT_MESSAGE("Unable to remove CellRangeAddress (entry)",
aAddr[0] != addr);
CPPUNIT_ASSERT_MESSAGE("Unable to remove CellRangeAddress (entry)", aAddr[0] != addr);
}
}
void XSheetCellRangeContainer::testAddRemoveRangeAddresses()
{
uno::Reference< sheet::XSheetCellRangeContainer > xSCRC(init(), UNO_QUERY_THROW);
uno::Reference<sheet::XSheetCellRangeContainer> xSCRC(init(), UNO_QUERY_THROW);
xSCRC->removeRangeAddresses(xSCRC->getRangeAddresses()); // prepare a clean slate
uno::Sequence< table::CellRangeAddress > aAddr = createCellRangeAddresses();
uno::Sequence<table::CellRangeAddress> aAddr = createCellRangeAddresses();
sal_Int32 cnt = xSCRC->getCount();
xSCRC->addRangeAddresses(aAddr, false);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to add CellRangeAddress (count)",
cnt + 2, xSCRC->getCount());
CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to add CellRangeAddress (count)", cnt + 2,
xSCRC->getCount());
uno::Sequence< table::CellRangeAddress > aAfterAddAddr = xSCRC->getRangeAddresses();
uno::Sequence<table::CellRangeAddress> aAfterAddAddr = xSCRC->getRangeAddresses();
cnt = xSCRC->getCount();
CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to add CellRangeAddresses (entry: first)",
aAddr[0], aAfterAddAddr[cnt - 2]);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to add CellRangeAddresses (entry: second)",
aAddr[1], aAfterAddAddr[cnt - 1]);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to add CellRangeAddresses (entry: first)", aAddr[0],
aAfterAddAddr[cnt - 2]);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to add CellRangeAddresses (entry: second)", aAddr[1],
aAfterAddAddr[cnt - 1]);
xSCRC->removeRangeAddresses(aAddr);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to remove CellRangeAddresses (count)",
cnt - 2, xSCRC->getCount());
CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to remove CellRangeAddresses (count)", cnt - 2,
xSCRC->getCount());
uno::Sequence< table::CellRangeAddress > aAfterRemoveAddr = xSCRC->getRangeAddresses();
for ( auto const & addr : aAfterRemoveAddr )
uno::Sequence<table::CellRangeAddress> aAfterRemoveAddr = xSCRC->getRangeAddresses();
for (auto const& addr : aAfterRemoveAddr)
{
CPPUNIT_ASSERT_MESSAGE("Unable to remove CellRangeAddresses (entry: first)",
aAddr[0] != addr);
@@ -82,10 +82,10 @@ void XSheetCellRangeContainer::testAddRemoveRangeAddresses()
}
}
uno::Sequence< table::CellRangeAddress > XSheetCellRangeContainer::createCellRangeAddresses()
uno::Sequence<table::CellRangeAddress> XSheetCellRangeContainer::createCellRangeAddresses()
{
uno::Sequence< table::CellRangeAddress > aAddr(2);
for ( unsigned int i = 0; i < 2; i++ )
uno::Sequence<table::CellRangeAddress> aAddr(2);
for (unsigned int i = 0; i < 2; i++)
{
aAddr[i].Sheet = i;
aAddr[i].StartColumn = i;
@@ -96,7 +96,6 @@ uno::Sequence< table::CellRangeAddress > XSheetCellRangeContainer::createCellRan
return aAddr;
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */

18
test/source/sheet/xsheetcellranges.cxx
View File

@@ -22,31 +22,31 @@
using namespace com::sun::star;
using namespace com::sun::star::uno;
namespace apitest {
namespace apitest
{
void XSheetCellRanges::testGetCells()
{
uno::Reference< sheet::XSheetCellRanges > xSheetCellRanges(init(), UNO_QUERY_THROW);
uno::Reference< container::XEnumerationAccess > xEA = xSheetCellRanges->getCells();
uno::Reference<sheet::XSheetCellRanges> xSheetCellRanges(init(), UNO_QUERY_THROW);
uno::Reference<container::XEnumerationAccess> xEA = xSheetCellRanges->getCells();
CPPUNIT_ASSERT_MESSAGE("Unable to get cells", xEA->hasElements());
}
void XSheetCellRanges::testGetRangeAddresses()
{
uno::Reference< sheet::XSheetCellRanges > xSheetCellRanges(init(), UNO_QUERY_THROW);
uno::Sequence< table::CellRangeAddress > aCellRangeAddress = xSheetCellRanges->getRangeAddresses();
CPPUNIT_ASSERT_MESSAGE("Unable to get RangeAddresses",
aCellRangeAddress.getLength() > 2);
uno::Reference<sheet::XSheetCellRanges> xSheetCellRanges(init(), UNO_QUERY_THROW);
uno::Sequence<table::CellRangeAddress> aCellRangeAddress
= xSheetCellRanges->getRangeAddresses();
CPPUNIT_ASSERT_MESSAGE("Unable to get RangeAddresses", aCellRangeAddress.getLength() > 2);
}
void XSheetCellRanges::testGetRangeAddressesAsString()
{
uno::Reference< sheet::XSheetCellRanges > xSheetCellRanges(init(), UNO_QUERY_THROW);
uno::Reference<sheet::XSheetCellRanges> xSheetCellRanges(init(), UNO_QUERY_THROW);
CPPUNIT_ASSERT_MESSAGE("Unable to get RangeAddresses (string)",
xSheetCellRanges->getRangeAddressesAsString().indexOf("C1:D4") > 0);
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */

14
test/source/sheet/xsheetcondition.cxx
View File

@@ -20,11 +20,12 @@
using namespace com::sun::star;
using namespace com::sun::star::uno;
namespace apitest {
namespace apitest
{
void XSheetCondition::testGetSetFormula1()
{
uno::Reference< sheet::XSheetCondition > xSheetCondition(init(), UNO_QUERY_THROW);
uno::Reference<sheet::XSheetCondition> xSheetCondition(init(), UNO_QUERY_THROW);
OUString aFormula1;
CPPUNIT_ASSERT_NO_THROW_MESSAGE("Unable to get Formula1",
aFormula1 = xSheetCondition->getFormula1());
@@ -35,7 +36,7 @@ void XSheetCondition::testGetSetFormula1()
void XSheetCondition::testGetSetFormula2()
{
uno::Reference< sheet::XSheetCondition > xSheetCondition(init(), UNO_QUERY_THROW);
uno::Reference<sheet::XSheetCondition> xSheetCondition(init(), UNO_QUERY_THROW);
OUString aFormula2;
CPPUNIT_ASSERT_NO_THROW_MESSAGE("Unable to get Formula2",
aFormula2 = xSheetCondition->getFormula2());
@@ -46,19 +47,19 @@ void XSheetCondition::testGetSetFormula2()
void XSheetCondition::testGetSetOperator()
{
uno::Reference< sheet::XSheetCondition > xSheetCondition(init(), UNO_QUERY_THROW);
uno::Reference<sheet::XSheetCondition> xSheetCondition(init(), UNO_QUERY_THROW);
sheet::ConditionOperator aOperator = sheet::ConditionOperator_NONE;
CPPUNIT_ASSERT_NO_THROW_MESSAGE("Unable to get Operator",
aOperator = xSheetCondition->getOperator());
xSheetCondition->setOperator( sheet::ConditionOperator_BETWEEN );
xSheetCondition->setOperator(sheet::ConditionOperator_BETWEEN);
sheet::ConditionOperator aOperatorNew = xSheetCondition->getOperator();
CPPUNIT_ASSERT_MESSAGE("Unable to set Operator", aOperator != aOperatorNew);
}
void XSheetCondition::testGetSetSourcePosition()
{
uno::Reference< sheet::XSheetCondition > xSheetCondition(init(), UNO_QUERY_THROW);
uno::Reference<sheet::XSheetCondition> xSheetCondition(init(), UNO_QUERY_THROW);
table::CellAddress aSourcePosition(0, 0, 0);
CPPUNIT_ASSERT_NO_THROW_MESSAGE("Unable to get SourcePosition",
aSourcePosition = xSheetCondition->getSourcePosition());
@@ -68,7 +69,6 @@ void XSheetCondition::testGetSetSourcePosition()
CPPUNIT_ASSERT_MESSAGE("Unable to set SourcePosition",
aSourcePosition.Row != aSourcePositionNew.Row);
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */

26
test/source/sheet/xsheetconditionalentries.cxx
View File

@@ -21,39 +21,41 @@
using namespace com::sun::star;
using namespace com::sun::star::uno;
namespace apitest {
namespace apitest
{
void XSheetConditionalEntries::testAddNew()
{
uno::Reference< sheet::XSheetConditionalEntries > xSheetConditionalEntries(init(), UNO_QUERY_THROW);
uno::Reference<sheet::XSheetConditionalEntries> xSheetConditionalEntries(init(),
UNO_QUERY_THROW);
const sal_Int32 aCount = xSheetConditionalEntries->getCount();
xSheetConditionalEntries->addNew(createCondition(4));
CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to add new condition",
aCount + 1, xSheetConditionalEntries->getCount());
CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to add new condition", aCount + 1,
xSheetConditionalEntries->getCount());
}
void XSheetConditionalEntries::testClear()
{
uno::Reference< sheet::XSheetConditionalEntries > xSheetConditionalEntries(init(), UNO_QUERY_THROW);
uno::Reference<sheet::XSheetConditionalEntries> xSheetConditionalEntries(init(),
UNO_QUERY_THROW);
xSheetConditionalEntries->clear();
CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to clear conditions",
sal_Int32(0), xSheetConditionalEntries->getCount());
CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to clear conditions", sal_Int32(0),
xSheetConditionalEntries->getCount());
}
void XSheetConditionalEntries::testRemoveByIndex()
{
uno::Reference< sheet::XSheetConditionalEntries > xSheetConditionalEntries(init(), UNO_QUERY_THROW);
uno::Reference<sheet::XSheetConditionalEntries> xSheetConditionalEntries(init(),
UNO_QUERY_THROW);
const sal_Int32 aCount = xSheetConditionalEntries->getCount();
xSheetConditionalEntries->removeByIndex(0);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to remove condition",
aCount - 1, xSheetConditionalEntries->getCount());
CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to remove condition", aCount - 1,
xSheetConditionalEntries->getCount());
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */

9
test/source/sheet/xsheetconditionalentry.cxx
View File

@@ -18,20 +18,19 @@
using namespace com::sun::star;
using namespace com::sun::star::uno;
namespace apitest {
namespace apitest
{
void XSheetConditionalEntry::testGetSetStyleName()
{
uno::Reference< sheet::XSheetConditionalEntry > xSheetConditionalEntry(init(), UNO_QUERY_THROW);
uno::Reference<sheet::XSheetConditionalEntry> xSheetConditionalEntry(init(), UNO_QUERY_THROW);
OUString aStyleName = xSheetConditionalEntry->getStyleName();
CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to get StyleName",
OUString("Result2"), aStyleName);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to get StyleName", OUString("Result2"), aStyleName);
xSheetConditionalEntry->setStyleName("Heading");
CPPUNIT_ASSERT_MESSAGE("Unable to set StyleName",
aStyleName != xSheetConditionalEntry->getStyleName());
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */