diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-11-07 10:19:32 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-11-07 10:47:35 +0100 |
commit | 5946eedfb78e250a40f14ae1e5b709e827b2504c (patch) | |
tree | 53e224bc8277264156034d22854b2967c17673ca /test | |
parent | 9d2baccabec7f0e04469a715da613886999b6e0e (diff) |
test: clang-format recently added xsheet tests
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
Diffstat (limited to 'test')
-rw-r--r-- | test/source/sheet/xsheetcellrange.cxx | 8 | ||||
-rw-r--r-- | test/source/sheet/xsheetcellrangecontainer.cxx | 61 | ||||
-rw-r--r-- | test/source/sheet/xsheetcellranges.cxx | 18 | ||||
-rw-r--r-- | test/source/sheet/xsheetcondition.cxx | 14 | ||||
-rw-r--r-- | test/source/sheet/xsheetconditionalentries.cxx | 26 | ||||
-rw-r--r-- | test/source/sheet/xsheetconditionalentry.cxx | 9 |
6 files changed, 68 insertions, 68 deletions
diff --git a/test/source/sheet/xsheetcellrange.cxx b/test/source/sheet/xsheetcellrange.cxx index c3adc74e32ce..46f0e64b0e8e 100644 --- a/test/source/sheet/xsheetcellrange.cxx +++ b/test/source/sheet/xsheetcellrange.cxx @@ -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: */ diff --git a/test/source/sheet/xsheetcellrangecontainer.cxx b/test/source/sheet/xsheetcellrangecontainer.cxx index b68e09a7ffe2..05e630ab3f6e 100644 --- a/test/source/sheet/xsheetcellrangecontainer.cxx +++ b/test/source/sheet/xsheetcellrangecontainer.cxx @@ -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: */ diff --git a/test/source/sheet/xsheetcellranges.cxx b/test/source/sheet/xsheetcellranges.cxx index 0b590ad249a8..046541d02c23 100644 --- a/test/source/sheet/xsheetcellranges.cxx +++ b/test/source/sheet/xsheetcellranges.cxx @@ -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: */ diff --git a/test/source/sheet/xsheetcondition.cxx b/test/source/sheet/xsheetcondition.cxx index ba7c22ecc436..402902700a79 100644 --- a/test/source/sheet/xsheetcondition.cxx +++ b/test/source/sheet/xsheetcondition.cxx @@ -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: */ diff --git a/test/source/sheet/xsheetconditionalentries.cxx b/test/source/sheet/xsheetconditionalentries.cxx index e22f3b8195e9..b464303310cc 100644 --- a/test/source/sheet/xsheetconditionalentries.cxx +++ b/test/source/sheet/xsheetconditionalentries.cxx @@ -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: */ diff --git a/test/source/sheet/xsheetconditionalentry.cxx b/test/source/sheet/xsheetconditionalentry.cxx index e6d3afcde020..e72c95a12129 100644 --- a/test/source/sheet/xsheetconditionalentry.cxx +++ b/test/source/sheet/xsheetconditionalentry.cxx @@ -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: */ |