summaryrefslogtreecommitdiff
path: root/comphelper/qa
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-10-28 14:31:16 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-10-28 14:31:34 +0100
commit2c6b6ba446868dc549f39b12c27cbd73f7eff572 (patch)
tree05f9ec7e8e724a2cba08182439bd02c97d5c8230 /comphelper/qa
parent033830b3b020d63a1b77459ab30497aeecc856bb (diff)
Disambiguate CPPUNIT_ASSERT_EQUAL arguments
Change-Id: Ib32d59522f33bcd2608401b4f3d3529d9dee5642
Diffstat (limited to 'comphelper/qa')
-rw-r--r--comphelper/qa/unit/syntaxhighlighttest.cxx28
1 files changed, 14 insertions, 14 deletions
diff --git a/comphelper/qa/unit/syntaxhighlighttest.cxx b/comphelper/qa/unit/syntaxhighlighttest.cxx
index cf13cbbb8545..61449f90dd54 100644
--- a/comphelper/qa/unit/syntaxhighlighttest.cxx
+++ b/comphelper/qa/unit/syntaxhighlighttest.cxx
@@ -43,8 +43,8 @@ void SyntaxHighlightTest::testBasicString() {
SyntaxHighlighter(HIGHLIGHT_BASIC).getHighlightPortions(s, ps);
CPPUNIT_ASSERT_EQUAL(
static_cast<std::vector<HighlightPortion>::size_type>(1), ps.size());
- CPPUNIT_ASSERT_EQUAL(0, ps[0].nBegin);
- CPPUNIT_ASSERT_EQUAL(5, ps[0].nEnd);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(0), ps[0].nBegin);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(5), ps[0].nEnd);
CPPUNIT_ASSERT_EQUAL(TT_STRING, ps[0].tokenType);
}
@@ -54,8 +54,8 @@ void SyntaxHighlightTest::testBasicComment() {
SyntaxHighlighter(HIGHLIGHT_BASIC).getHighlightPortions(s, ps);
CPPUNIT_ASSERT_EQUAL(
static_cast<std::vector<HighlightPortion>::size_type>(1), ps.size());
- CPPUNIT_ASSERT_EQUAL(0, ps[0].nBegin);
- CPPUNIT_ASSERT_EQUAL(5, ps[0].nEnd);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(0), ps[0].nBegin);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(5), ps[0].nEnd);
CPPUNIT_ASSERT_EQUAL(TT_COMMENT, ps[0].tokenType);
}
@@ -65,11 +65,11 @@ void SyntaxHighlightTest::testBasicCommentNewline() {
SyntaxHighlighter(HIGHLIGHT_BASIC).getHighlightPortions(s, ps);
CPPUNIT_ASSERT_EQUAL(
static_cast<std::vector<HighlightPortion>::size_type>(2), ps.size());
- CPPUNIT_ASSERT_EQUAL(0, ps[0].nBegin);
- CPPUNIT_ASSERT_EQUAL(5, ps[0].nEnd);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(0), ps[0].nBegin);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(5), ps[0].nEnd);
CPPUNIT_ASSERT_EQUAL(TT_COMMENT, ps[0].tokenType);
- CPPUNIT_ASSERT_EQUAL(5, ps[1].nBegin);
- CPPUNIT_ASSERT_EQUAL(6, ps[1].nEnd);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(5), ps[1].nBegin);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(6), ps[1].nEnd);
CPPUNIT_ASSERT_EQUAL(TT_EOL, ps[1].tokenType);
}
@@ -79,8 +79,8 @@ void SyntaxHighlightTest::testBasicEmptyComment() {
SyntaxHighlighter(HIGHLIGHT_BASIC).getHighlightPortions(s, ps);
CPPUNIT_ASSERT_EQUAL(
static_cast<std::vector<HighlightPortion>::size_type>(1), ps.size());
- CPPUNIT_ASSERT_EQUAL(0, ps[0].nBegin);
- CPPUNIT_ASSERT_EQUAL(1, ps[0].nEnd);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(0), ps[0].nBegin);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1), ps[0].nEnd);
CPPUNIT_ASSERT_EQUAL(TT_COMMENT, ps[0].tokenType);
}
@@ -90,11 +90,11 @@ void SyntaxHighlightTest::testBasicEmptyCommentNewline() {
SyntaxHighlighter(HIGHLIGHT_BASIC).getHighlightPortions(s, ps);
CPPUNIT_ASSERT_EQUAL(
static_cast<std::vector<HighlightPortion>::size_type>(2), ps.size());
- CPPUNIT_ASSERT_EQUAL(0, ps[0].nBegin);
- CPPUNIT_ASSERT_EQUAL(1, ps[0].nEnd);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(0), ps[0].nBegin);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1), ps[0].nEnd);
CPPUNIT_ASSERT_EQUAL(TT_COMMENT, ps[0].tokenType);
- CPPUNIT_ASSERT_EQUAL(1, ps[1].nBegin);
- CPPUNIT_ASSERT_EQUAL(2, ps[1].nEnd);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1), ps[1].nBegin);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(2), ps[1].nEnd);
CPPUNIT_ASSERT_EQUAL(TT_EOL, ps[1].tokenType);
}