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

coverity#1373441 Side effect in assertion

Browse Source 
Change-Id: I10a8298e5379fa93a5d3616202a7802c0eda1cbb
This commit is contained in:
Caolán McNamara
2016-10-06 16:39:43 +01:00
parent 8e61b0150b
commit 7543399f72
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
i18npool/qa/cppunit/test_breakiterator.cxx
View File

@@ -364,7 +364,8 @@ void TestBreakIterator::testWordBoundaries()
{ {
CPPUNIT_ASSERT(i < SAL_N_ELEMENTS(aSinglePositions)); CPPUNIT_ASSERT(i < SAL_N_ELEMENTS(aSinglePositions));
nPos = m_xBreak->nextWord(aTest, nPos, aLocale, i18n::WordType::ANYWORD_IGNOREWHITESPACES).startPos; nPos = m_xBreak->nextWord(aTest, nPos, aLocale, i18n::WordType::ANYWORD_IGNOREWHITESPACES).startPos;
CPPUNIT_ASSERT_EQUAL(aSinglePositions[i++], nPos); CPPUNIT_ASSERT_EQUAL(aSinglePositions[i], nPos);
++i;
} }
while (nPos < aTest.getLength()); while (nPos < aTest.getLength());
nPos = aTest.getLength(); nPos = aTest.getLength();
@@ -372,7 +373,8 @@ void TestBreakIterator::testWordBoundaries()
do do
{ {
nPos = m_xBreak->previousWord(aTest, nPos, aLocale, i18n::WordType::ANYWORD_IGNOREWHITESPACES).startPos; nPos = m_xBreak->previousWord(aTest, nPos, aLocale, i18n::WordType::ANYWORD_IGNOREWHITESPACES).startPos;
CPPUNIT_ASSERT_EQUAL(aSinglePositions[--i], nPos); --i;
CPPUNIT_ASSERT_EQUAL(aSinglePositions[i], nPos);
} }
while (nPos > 0); while (nPos > 0);
} }
@@ -387,7 +389,8 @@ void TestBreakIterator::testWordBoundaries()
{ {
CPPUNIT_ASSERT(i < SAL_N_ELEMENTS(aSingleQuotePositions)); CPPUNIT_ASSERT(i < SAL_N_ELEMENTS(aSingleQuotePositions));
nPos = m_xBreak->nextWord(aTest, nPos, aLocale, i18n::WordType::ANYWORD_IGNOREWHITESPACES).startPos; nPos = m_xBreak->nextWord(aTest, nPos, aLocale, i18n::WordType::ANYWORD_IGNOREWHITESPACES).startPos;
CPPUNIT_ASSERT_EQUAL(aSingleQuotePositions[i++], nPos); CPPUNIT_ASSERT_EQUAL(aSingleQuotePositions[i], nPos);
++i;
} }
while (nPos < aTest.getLength()); while (nPos < aTest.getLength());
nPos = aTest.getLength(); nPos = aTest.getLength();
@@ -395,7 +398,8 @@ void TestBreakIterator::testWordBoundaries()
do do
{ {
nPos = m_xBreak->previousWord(aTest, nPos, aLocale, i18n::WordType::ANYWORD_IGNOREWHITESPACES).startPos; nPos = m_xBreak->previousWord(aTest, nPos, aLocale, i18n::WordType::ANYWORD_IGNOREWHITESPACES).startPos;
CPPUNIT_ASSERT_EQUAL(aSingleQuotePositions[--i], nPos); --i;
CPPUNIT_ASSERT_EQUAL(aSingleQuotePositions[i], nPos);
} }
while (nPos > 0); while (nPos > 0);
} }
@@ -416,7 +420,8 @@ void TestBreakIterator::testWordBoundaries()
CPPUNIT_ASSERT(i < SAL_N_ELEMENTS(aExpected)); CPPUNIT_ASSERT(i < SAL_N_ELEMENTS(aExpected));
nPos = m_xBreak->getWordBoundary(aTest, nPos, aLocale, nPos = m_xBreak->getWordBoundary(aTest, nPos, aLocale,
i18n::WordType::DICTIONARY_WORD, true).endPos; i18n::WordType::DICTIONARY_WORD, true).endPos;
CPPUNIT_ASSERT_EQUAL(aExpected[i++], nPos); CPPUNIT_ASSERT_EQUAL(aExpected[i], nPos);
++i;
} }
while (nPos++ < aTest.getLength()); while (nPos++ < aTest.getLength());
CPPUNIT_ASSERT_EQUAL(SAL_N_ELEMENTS(aExpected), i); CPPUNIT_ASSERT_EQUAL(SAL_N_ELEMENTS(aExpected), i);
@@ -458,7 +463,8 @@ void TestBreakIterator::testWordBoundaries()
CPPUNIT_ASSERT(i < SAL_N_ELEMENTS(aExpected)); CPPUNIT_ASSERT(i < SAL_N_ELEMENTS(aExpected));
nPos = m_xBreak->getWordBoundary(aTest, nPos, aLocale, nPos = m_xBreak->getWordBoundary(aTest, nPos, aLocale,
i18n::WordType::DICTIONARY_WORD, true).endPos; i18n::WordType::DICTIONARY_WORD, true).endPos;
CPPUNIT_ASSERT_EQUAL(aExpected[i++], nPos); CPPUNIT_ASSERT_EQUAL(aExpected[i], nPos);
++i;
} }
while (nPos++ < aTest.getLength()); while (nPos++ < aTest.getLength());
CPPUNIT_ASSERT_EQUAL(SAL_N_ELEMENTS(aExpected), i); CPPUNIT_ASSERT_EQUAL(SAL_N_ELEMENTS(aExpected), i);
@@ -499,7 +505,8 @@ void TestBreakIterator::testWordBoundaries()
CPPUNIT_ASSERT(i < SAL_N_ELEMENTS(aExpected)); CPPUNIT_ASSERT(i < SAL_N_ELEMENTS(aExpected));
nPos = m_xBreak->getWordBoundary(aTest, nPos, aLocale, nPos = m_xBreak->getWordBoundary(aTest, nPos, aLocale,
i18n::WordType::DICTIONARY_WORD, true).endPos; i18n::WordType::DICTIONARY_WORD, true).endPos;
CPPUNIT_ASSERT_EQUAL(aExpected[i++], nPos); CPPUNIT_ASSERT_EQUAL(aExpected[i], nPos);
++i;
} }
while (nPos++ < aTest.getLength()); while (nPos++ < aTest.getLength());
CPPUNIT_ASSERT_EQUAL(SAL_N_ELEMENTS(aExpected), i); CPPUNIT_ASSERT_EQUAL(SAL_N_ELEMENTS(aExpected), i);
@@ -522,7 +529,8 @@ void TestBreakIterator::testWordBoundaries()
CPPUNIT_ASSERT(i < SAL_N_ELEMENTS(aExpected)); CPPUNIT_ASSERT(i < SAL_N_ELEMENTS(aExpected));
nPos = m_xBreak->getWordBoundary(aTest, nPos, aLocale, nPos = m_xBreak->getWordBoundary(aTest, nPos, aLocale,
i18n::WordType::WORD_COUNT, true).endPos; i18n::WordType::WORD_COUNT, true).endPos;
CPPUNIT_ASSERT_EQUAL(aExpected[i++], nPos); CPPUNIT_ASSERT_EQUAL(aExpected[i], nPos);
++i;
} }
while (nPos++ < aTest.getLength()); while (nPos++ < aTest.getLength());
CPPUNIT_ASSERT_EQUAL(SAL_N_ELEMENTS(aExpected), i); CPPUNIT_ASSERT_EQUAL(SAL_N_ELEMENTS(aExpected), i);
@@ -538,8 +546,10 @@ void TestBreakIterator::testWordBoundaries()
CPPUNIT_ASSERT(i < SAL_N_ELEMENTS(aExpected)); CPPUNIT_ASSERT(i < SAL_N_ELEMENTS(aExpected));
aBounds = m_xBreak->getWordBoundary(aTest, nPos, aLocale, aBounds = m_xBreak->getWordBoundary(aTest, nPos, aLocale,
i18n::WordType::DICTIONARY_WORD, true); i18n::WordType::DICTIONARY_WORD, true);
CPPUNIT_ASSERT_EQUAL(aExpected[i++], aBounds.startPos); CPPUNIT_ASSERT_EQUAL(aExpected[i], aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(aExpected[i++], aBounds.endPos); ++i;
CPPUNIT_ASSERT_EQUAL(aExpected[i], aBounds.endPos);
++i;
nPos = aBounds.endPos; nPos = aBounds.endPos;
} }
while (nPos++ < aTest.getLength()); while (nPos++ < aTest.getLength());