From: <bl...@us...> - 2003-04-26 13:13:40
|
Update of /cvsroot/cpptool/rfta/src/rftaparser In directory sc8-pr-cvs1:/tmp/cvs-serv32663/src/rftaparser Modified Files: CStringEnumeratorTest.cpp CStringEnumeratorTest.h rftaparser.dsp Log Message: * added reverse iterator for CStringEnumerator * fixed release configuration Index: CStringEnumeratorTest.cpp =================================================================== RCS file: /cvsroot/cpptool/rfta/src/rftaparser/CStringEnumeratorTest.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CStringEnumeratorTest.cpp 26 Apr 2003 12:09:45 -0000 1.1 --- CStringEnumeratorTest.cpp 26 Apr 2003 13:13:37 -0000 1.2 *************** *** 29,32 **** --- 29,33 ---- CStringEnumeratorTest::setUp() { + RFTA_ASSERT_EQUAL( 5, text_.length() ); enumText_ = Xtl::CStringEnumerator( string_ ); } *************** *** 44,47 **** --- 45,49 ---- Xtl::CStringEnumerator enumEmpty; CPPUNIT_ASSERT( !enumEmpty.hasNext() ); + CPPUNIT_ASSERT( !enumEmpty.hasPrevious() ); CPPUNIT_ASSERT( enumEmpty.getCurrentPos() == 0 ); CPPUNIT_ASSERT( enumEmpty.getString().isEmpty() ); *************** *** 54,58 **** CPPUNIT_ASSERT( enumText_.getString() == string_ ); CPPUNIT_ASSERT( enumText_.getCurrentPos() == string_.getStart() ); - RFTA_ASSERT_EQUAL( '1', enumText_.getCurrent() ); RFTA_ASSERT_EQUAL( '1', *enumText_ ); } --- 56,59 ---- *************** *** 62,65 **** --- 63,67 ---- CStringEnumeratorTest::testIncrement() { + CPPUNIT_ASSERT( enumText_.hasNext() ); RFTA_ASSERT_EQUAL( '1', *enumText_++ ); RFTA_ASSERT_EQUAL( '2', *enumText_++ ); *************** *** 68,71 **** --- 70,74 ---- RFTA_ASSERT_EQUAL( '5', *enumText_++ ); RFTA_ASSERT_EQUAL( 0, *enumText_ ); + CPPUNIT_ASSERT( enumText_.hasPrevious() ); } *************** *** 168,171 **** --- 171,190 ---- CPPUNIT_ASSERT( enumEnd > enumText_); CPPUNIT_ASSERT( enumEnd > enum2); + } + + + void + CStringEnumeratorTest::testBackEnumerator() + { + Xtl::CStringBackEnumerator backEnum( enumText_ + 5 ); + CPPUNIT_ASSERT( backEnum.hasNext() ); + CPPUNIT_ASSERT( !backEnum.hasPrevious() ); + RFTA_ASSERT_EQUAL( '5', *backEnum++ ); + RFTA_ASSERT_EQUAL( '4', *backEnum++ ); + RFTA_ASSERT_EQUAL( '3', *backEnum++ ); + RFTA_ASSERT_EQUAL( '2', *backEnum++ ); + RFTA_ASSERT_EQUAL( '1', *backEnum++ ); + CPPUNIT_ASSERT( !backEnum.hasNext() ); + CPPUNIT_ASSERT( backEnum.hasPrevious() ); } Index: CStringEnumeratorTest.h =================================================================== RCS file: /cvsroot/cpptool/rfta/src/rftaparser/CStringEnumeratorTest.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CStringEnumeratorTest.h 26 Apr 2003 12:09:45 -0000 1.1 --- CStringEnumeratorTest.h 26 Apr 2003 13:13:37 -0000 1.2 *************** *** 28,31 **** --- 28,32 ---- CPPUNIT_TEST( testEquality ); CPPUNIT_TEST( testComparable ); + CPPUNIT_TEST( testBackEnumerator ); CPPUNIT_TEST_SUITE_END(); *************** *** 54,57 **** --- 55,60 ---- void testEquality(); void testComparable(); + + void testBackEnumerator(); private: Index: rftaparser.dsp =================================================================== RCS file: /cvsroot/cpptool/rfta/src/rftaparser/rftaparser.dsp,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** rftaparser.dsp 26 Apr 2003 12:08:24 -0000 1.38 --- rftaparser.dsp 26 Apr 2003 13:13:37 -0000 1.39 *************** *** 538,553 **** --- 538,589 ---- SOURCE=.\CStringEnumeratorTest.cpp + + !IF "$(CFG)" == "rftaparser - Win32 Release" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "rftaparser - Win32 Debug" + + !ENDIF + # End Source File # Begin Source File SOURCE=.\CStringEnumeratorTest.h + + !IF "$(CFG)" == "rftaparser - Win32 Release" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "rftaparser - Win32 Debug" + + !ENDIF + # End Source File # Begin Source File SOURCE=.\CStringViewTest.cpp + + !IF "$(CFG)" == "rftaparser - Win32 Release" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "rftaparser - Win32 Debug" + + !ENDIF + # End Source File # Begin Source File SOURCE=.\CStringViewTest.h + + !IF "$(CFG)" == "rftaparser - Win32 Release" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "rftaparser - Win32 Debug" + + !ENDIF + # End Source File # End Group *************** *** 1140,1147 **** --- 1176,1201 ---- SOURCE=.\UnparsedDeclarationMutatorTest.cpp + + !IF "$(CFG)" == "rftaparser - Win32 Release" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "rftaparser - Win32 Debug" + + !ENDIF + # End Source File # Begin Source File SOURCE=.\UnparsedDeclarationMutatorTest.h + + !IF "$(CFG)" == "rftaparser - Win32 Release" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "rftaparser - Win32 Debug" + + !ENDIF + # End Source File # Begin Source File |