diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2008-03-09 15:03:47 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2008-03-09 15:03:47 +0000 |
| commit | 68b84574ae5f3a46b0157799783cf51b1a8f4676 (patch) | |
| tree | 095178c499ab1e406eb9264ca478f51b269727a8 /test/ParameterizedStringParserTest.cc | |
| parent | 7f40794931cdc04c497f35d555474b04f05de80b (diff) | |
2008-03-09 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
* src/Util.{h, cc}
(parseUInt): New function.
(alphaToNum): Now returns unsigned int and 0 when overflow
detected.
The actual range is uint32_t.
* test/UtilTest.cc
* src/ParameterizedStringParser.cc:
Use Util::parseUInt() for loop variables.
* test/ParameterizedStringParserTest.cc
* src/PStringNumLoop.h: Make _startValue and _endValue unsigned
int.
Diffstat (limited to 'test/ParameterizedStringParserTest.cc')
| -rw-r--r-- | test/ParameterizedStringParserTest.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/test/ParameterizedStringParserTest.cc b/test/ParameterizedStringParserTest.cc index 99f20131..f89e350f 100644 --- a/test/ParameterizedStringParserTest.cc +++ b/test/ParameterizedStringParserTest.cc @@ -126,9 +126,9 @@ void ParameterizedStringParserTest::testParse_loop() SharedHandle<PStringNumLoop> loop1 = ls; CPPUNIT_ASSERT(!loop1.isNull()); - CPPUNIT_ASSERT_EQUAL(1, loop1->getStartValue()); - CPPUNIT_ASSERT_EQUAL(10, loop1->getEndValue()); - CPPUNIT_ASSERT_EQUAL((unsigned int)2, loop1->getStep()); + CPPUNIT_ASSERT_EQUAL(1U, loop1->getStartValue()); + CPPUNIT_ASSERT_EQUAL(10U, loop1->getEndValue()); + CPPUNIT_ASSERT_EQUAL(2U, loop1->getStep()); } void ParameterizedStringParserTest::testParse_loop_empty() @@ -189,9 +189,9 @@ void ParameterizedStringParserTest::testParse_alphaLoop() SharedHandle<PStringNumLoop> loop1 = ls; CPPUNIT_ASSERT(!loop1.isNull()); - CPPUNIT_ASSERT_EQUAL(0, loop1->getStartValue()); - CPPUNIT_ASSERT_EQUAL(25, loop1->getEndValue()); - CPPUNIT_ASSERT_EQUAL((unsigned int)2, loop1->getStep()); + CPPUNIT_ASSERT_EQUAL(0U, loop1->getStartValue()); + CPPUNIT_ASSERT_EQUAL(25U, loop1->getEndValue()); + CPPUNIT_ASSERT_EQUAL(2U, loop1->getStep()); } void ParameterizedStringParserTest::testParse_loop_mixedChar() @@ -230,9 +230,9 @@ void ParameterizedStringParserTest::testParse_segment_loop() SharedHandle<PStringNumLoop> loop1 = segment1->getNext(); CPPUNIT_ASSERT(!loop1.isNull()); - CPPUNIT_ASSERT_EQUAL(1, loop1->getStartValue()); - CPPUNIT_ASSERT_EQUAL(3, loop1->getEndValue()); - CPPUNIT_ASSERT_EQUAL((unsigned int)1, loop1->getStep()); + CPPUNIT_ASSERT_EQUAL(1U, loop1->getStartValue()); + CPPUNIT_ASSERT_EQUAL(3U, loop1->getEndValue()); + CPPUNIT_ASSERT_EQUAL(1U, loop1->getStep()); SharedHandle<PStringSegment> segment2 = loop1->getNext(); CPPUNIT_ASSERT(!segment2.isNull()); |