[Cpptool-cvs] rfta/src/rftaparser CStringEnumeratorTest.cpp,1.2,1.3 CStringEnumeratorTest.h,1.2,1.3

[<bl...@us...>]

Update of /cvsroot/cpptool/rfta/src/rftaparser
In directory sc8-pr-cvs1:/tmp/cvs-serv31339/src/rftaparser

Modified Files:
	CStringEnumeratorTest.cpp CStringEnumeratorTest.h 
Log Message:
* fixed bug for enumerator construction with an empty string

Index: CStringEnumeratorTest.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftaparser/CStringEnumeratorTest.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CStringEnumeratorTest.cpp	26 Apr 2003 13:13:37 -0000	1.2
--- CStringEnumeratorTest.cpp	3 May 2003 17:34:01 -0000	1.3
***************
*** 61,64 ****
--- 61,74 ----
  
  void 
+ CStringEnumeratorTest::testStartEndConstructor()
+ {
+    Xtl::CStringEnumerator e( string_.getStart(), string_.getEnd() );
+    CPPUNIT_ASSERT( e.getString() == string_ );
+    CPPUNIT_ASSERT( e.getCurrentPos() == string_.getStart() );
+    RFTA_ASSERT_EQUAL( '1', *e );
+ }
+ 
+ 
+ void 
  CStringEnumeratorTest::testIncrement()
  {
***************
*** 171,174 ****
--- 181,196 ----
     CPPUNIT_ASSERT( enumEnd > enumText_);
     CPPUNIT_ASSERT( enumEnd > enum2);
+ }
+ 
+ 
+ void 
+ CStringEnumeratorTest::testHasNext()
+ {
+    Xtl::CStringView empty( string_.getSlice(0, 0) );
+    Xtl::CStringEnumerator enumEmpty( empty );
+    CPPUNIT_ASSERT( !enumEmpty.hasNext() );
+ 
+    Xtl::CStringEnumerator enumEmpty2( empty.getStart(), empty.getEnd() );
+    CPPUNIT_ASSERT( !enumEmpty2.hasNext() );
  }
  

Index: CStringEnumeratorTest.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftaparser/CStringEnumeratorTest.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CStringEnumeratorTest.h	26 Apr 2003 13:13:37 -0000	1.2
--- CStringEnumeratorTest.h	3 May 2003 17:34:01 -0000	1.3
***************
*** 20,23 ****
--- 20,24 ----
     CPPUNIT_TEST( testDefaultConstructor );
     CPPUNIT_TEST( testStringConstructor );
+    CPPUNIT_TEST( testStartEndConstructor );
     CPPUNIT_TEST( testIncrement );
     CPPUNIT_TEST( testIndex );
***************
*** 28,31 ****
--- 29,33 ----
     CPPUNIT_TEST( testEquality );
     CPPUNIT_TEST( testComparable );
+    CPPUNIT_TEST( testHasNext );
     CPPUNIT_TEST( testBackEnumerator );
     CPPUNIT_TEST_SUITE_END();
***************
*** 44,47 ****
--- 46,50 ----
     void testDefaultConstructor();
     void testStringConstructor();
+    void testStartEndConstructor();
  
     void testIncrement();
***************
*** 55,58 ****
--- 58,63 ----
     void testEquality();
     void testComparable();
+ 
+    void testHasNext();
  
     void testBackEnumerator();