summaryrefslogtreecommitdiff
path: root/sw/qa/core
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-07-02 22:28:23 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-07-02 22:28:23 +0200
commit798e8c5eec97e67dd6bdf0f370073914b709045e (patch)
tree6a8010697c66038cc72ef7efe25b60f4dd71dc7f /sw/qa/core
parent85c6f985cec440d7b81c5918d47cef289068e224 (diff)
loplugin:casttovoid: sw
Change-Id: I224e9995962901e8740bfaed06d57f7c0389236c
Diffstat (limited to 'sw/qa/core')
-rw-r--r--sw/qa/core/Test-BigPtrArray.cxx70
-rw-r--r--sw/qa/core/test_ToxTextGenerator.cxx11
2 files changed, 4 insertions, 77 deletions
diff --git a/sw/qa/core/Test-BigPtrArray.cxx b/sw/qa/core/Test-BigPtrArray.cxx
index b4be867771fd..263adae27501 100644
--- a/sw/qa/core/Test-BigPtrArray.cxx
+++ b/sw/qa/core/Test-BigPtrArray.cxx
@@ -59,22 +59,12 @@ namespace /* private */
sal_uLong count_;
};
- void dumpBigPtrArray(const BigPtrArray& bparr)
- {
- (void)bparr;
- }
-
void fillBigPtrArray(BigPtrArray& bparr, sal_uLong numEntries)
{
for (sal_uLong i = 0; i < numEntries; i++)
bparr.Insert(new BigPtrEntryMock(i), bparr.Count());
}
- void printMethodName(const char* name)
- {
- (void)name;
- }
-
bool checkElementPositions(const BigPtrArray& bparr)
{
for (sal_uLong i = 0; i < bparr.Count(); i++)
@@ -107,8 +97,6 @@ public:
*/
void test_ctor()
{
- printMethodName("test_ctor\n");
-
BigPtrArray bparr;
CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -120,8 +108,6 @@ public:
void test_insert_entries_at_front()
{
- printMethodName("test_insert_entries_at_front\n");
-
BigPtrArray bparr;
for (sal_uLong i = 0; i < NUM_ENTRIES; i++)
@@ -151,17 +137,13 @@ public:
);
releaseBigPtrArrayContent(bparr);
- dumpBigPtrArray(bparr);
}
void test_insert_entries_in_the_middle()
{
- printMethodName("test_insert_entries_in_the_middle\n");
-
BigPtrArray bparr;
fillBigPtrArray(bparr, NUM_ENTRIES);
- dumpBigPtrArray(bparr);
sal_uLong oldCount = bparr.Count();
@@ -180,17 +162,13 @@ public:
);
releaseBigPtrArrayContent(bparr);
- dumpBigPtrArray(bparr);
}
void test_insert_at_already_used_index()
{
- printMethodName("test_insert_at_already_used_index\n");
-
BigPtrArray bparr;
fillBigPtrArray(bparr, NUM_ENTRIES);
- dumpBigPtrArray(bparr);
const sal_uLong oldCount = bparr.Count();
@@ -222,17 +200,13 @@ public:
);
releaseBigPtrArrayContent(bparr);
- dumpBigPtrArray(bparr);
}
void test_insert_at_end()
{
- printMethodName("test_insert_at_end\n");
-
BigPtrArray bparr;
fillBigPtrArray(bparr, NUM_ENTRIES);
- dumpBigPtrArray(bparr);
sal_uLong oldCount = bparr.Count();
bparr.Insert(new BigPtrEntryMock(NUM_ENTRIES), bparr.Count());
@@ -250,17 +224,13 @@ public:
);
releaseBigPtrArrayContent(bparr);
- dumpBigPtrArray(bparr);
}
void test_remove_at_front()
{
- printMethodName("test_remove_at_front\n");
-
BigPtrArray bparr;
fillBigPtrArray(bparr, NUM_ENTRIES);
- dumpBigPtrArray(bparr);
for (sal_uLong i = 0; i < NUM_ENTRIES; i++)
{
@@ -289,19 +259,14 @@ public:
"test_remove_at_front failed",
checkElementPositions(bparr)
);
-
- dumpBigPtrArray(bparr);
}
}
void test_remove_at_back()
{
- printMethodName("test_remove_at_back\n");
-
BigPtrArray bparr;
fillBigPtrArray(bparr, NUM_ENTRIES);
- dumpBigPtrArray(bparr);
for (int i = NUM_ENTRIES - 1; i >= 0; i--)
{
@@ -329,19 +294,14 @@ public:
"test_remove_at_back failed",
checkElementPositions(bparr)
);
-
- dumpBigPtrArray(bparr);
}
}
void test_remove_in_the_middle()
{
- printMethodName("test_remove_in_the_middle\n");
-
BigPtrArray bparr;
fillBigPtrArray(bparr, NUM_ENTRIES);
- dumpBigPtrArray(bparr);
while (bparr.Count())
{
@@ -371,19 +331,14 @@ public:
"test_remove_in_the_middle failed",
checkElementPositions(bparr)
);
-
- dumpBigPtrArray(bparr);
}
}
void test_remove_multiple_elements_at_once()
{
- printMethodName("test_remove_multiple_elements_at_once\n");
-
BigPtrArray bparr;
fillBigPtrArray(bparr, NUM_ENTRIES);
- dumpBigPtrArray(bparr);
while(bparr.Count())
{
@@ -406,19 +361,14 @@ public:
"test_remove_multiple_elements_at_once failed",
checkElementPositions(bparr)
);
-
- dumpBigPtrArray(bparr);
}
}
void test_remove_all_elements_at_once()
{
- printMethodName("test_remove_all_elements_at_once\n");
-
BigPtrArray bparr;
fillBigPtrArray(bparr, NUM_ENTRIES);
- dumpBigPtrArray(bparr);
releaseBigPtrArrayContent(bparr);
bparr.Remove(0, bparr.Count());
@@ -428,23 +378,17 @@ public:
"test_remove_all_elements_at_once failed",
static_cast<sal_uLong>(0), bparr.Count()
);
-
- dumpBigPtrArray(bparr);
}
void test_move_elements_from_lower_to_higher_pos()
{
- printMethodName("test_move_elements_from_lower_to_higher_pos\n");
-
BigPtrArray bparr;
fillBigPtrArray(bparr, NUM_ENTRIES);
- dumpBigPtrArray(bparr);
for (sal_uLong i = 0; i < NUM_ENTRIES - 1; i++)
{
bparr.Move(i, i + 2);
- dumpBigPtrArray(bparr);
}
for (sal_uLong i = 0; i < (NUM_ENTRIES - 1); i++)
@@ -473,17 +417,13 @@ public:
void test_move_elements_from_higher_to_lower_pos()
{
- printMethodName("test_move_elements_from_higher_to_lower_pos\n");
-
BigPtrArray bparr;
fillBigPtrArray(bparr, NUM_ENTRIES);
- dumpBigPtrArray(bparr);
for (int i = NUM_ENTRIES - 1; i >= 1; i--)
{
bparr.Move(i, i - 1);
- dumpBigPtrArray(bparr);
}
CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -512,20 +452,15 @@ public:
void test_move_to_same_position()
{
- printMethodName("test_move_to_same_position\n");
-
BigPtrArray bparr;
fillBigPtrArray(bparr, NUM_ENTRIES);
- dumpBigPtrArray(bparr);
for (sal_uLong i = 0; i < NUM_ENTRIES; i++)
{
bparr.Move(i, i);
}
- dumpBigPtrArray(bparr);
-
for (sal_uLong i = 0; i < NUM_ENTRIES; i++)
{
CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -542,23 +477,18 @@ public:
);
releaseBigPtrArrayContent(bparr);
- dumpBigPtrArray(bparr);
}
void test_replace_elements()
{
- printMethodName("test_replace_elements\n");
-
BigPtrArray bparr;
fillBigPtrArray(bparr, NUM_ENTRIES);
- dumpBigPtrArray(bparr);
for (sal_uLong i = 0, j = NUM_ENTRIES - 1; i < NUM_ENTRIES; i++, j--)
{
delete bparr[i];
bparr.Replace(i, new BigPtrEntryMock(j));
- dumpBigPtrArray(bparr);
}
for (sal_uLong i = 0; i < NUM_ENTRIES; i++)
diff --git a/sw/qa/core/test_ToxTextGenerator.cxx b/sw/qa/core/test_ToxTextGenerator.cxx
index a9b280f59994..9df7b50d1a21 100644
--- a/sw/qa/core/test_ToxTextGenerator.cxx
+++ b/sw/qa/core/test_ToxTextGenerator.cxx
@@ -107,9 +107,8 @@ ToxTextGeneratorTest::EmptyStringIsReturnedAsNumStringIfToxSourcesIsEmpty()
class MockedToxTabStopTokenHandler : public ToxTabStopTokenHandler {
public:
virtual HandledTabStopToken
- HandleTabStopToken(const SwFormToken& aToken, const SwTextNode& targetNode,
- const SwRootFrame *currentLayout) const override {
- (void)(aToken); (void)(targetNode); (void)(currentLayout); // avoid unused warnings.
+ HandleTabStopToken(const SwFormToken&, const SwTextNode&,
+ const SwRootFrame *) const override {
return HandledTabStopToken();
}
};
@@ -127,10 +126,8 @@ public:
private:
SwChapterField
- ObtainChapterField(SwChapterFieldType* chapterFieldType, const SwFormToken* chapterToken,
- const SwContentFrame* contentFrame, const SwContentNode *contentNode) const override {
- // get rid of 'unused-parameters' warnings
- (void)(chapterFieldType);(void)(chapterToken);(void)(contentFrame);(void)(contentNode);
+ ObtainChapterField(SwChapterFieldType*, const SwFormToken*,
+ const SwContentFrame*, const SwContentNode *) const override {
return mChapterField;
}