[Cpptool-cvs] rfta/src/rftaparser EnumeratorTest.cpp,1.2,1.3 EnumeratorTest.h,1.2,1.3 rftaparser.dsp,1.44,1.45

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

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

Modified Files:
	EnumeratorTest.cpp EnumeratorTest.h rftaparser.dsp 
Log Message:
* added test for GetAtEnumerator

Index: EnumeratorTest.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftaparser/EnumeratorTest.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EnumeratorTest.cpp	28 Apr 2003 08:45:09 -0000	1.2
--- EnumeratorTest.cpp	28 Apr 2003 22:18:02 -0000	1.3
***************
*** 198,200 ****
--- 198,239 ----
  
  
+ namespace {
+    template<typename ValueType>
+    struct SimpleContainer
+    {
+       ValueType getAt( int index ) const
+       {
+          return values_.at( index );
+       }
+    
+       std::deque<ValueType> values_;
+    };
+ }
+ 
+ 
+ void 
+ EnumeratorTest::testGetAtEnumerator()
+ {
+    SimpleContainer<std::string> container;
+    fillStringSequence( container.values_ );
+ 
+    StringEnum e = Xtl::enumGetAt( container, &SimpleContainer<std::string>::getAt, 0, 3 );
+    RFTA_ASSERT_EQUAL( "abc", e.getNext() );
+    RFTA_ASSERT_EQUAL( "def", e.getNext() );
+    RFTA_ASSERT_EQUAL( "ghi", e.getNext() );
+    checkHasNoMoreElements( e );
+ 
+    SimpleContainer<const char *> container2;
+    fillStringSequence( container2.values_ );
+ 
+    StringEnum e2 = Xtl::enumGetAt( container2, &SimpleContainer<const char *>::getAt, 
+                                   0, 3, Xtl::Type<std::string>() );
+    RFTA_ASSERT_EQUAL( "abc", e2.getNext() );
+    RFTA_ASSERT_EQUAL( "def", e2.getNext() );
+    RFTA_ASSERT_EQUAL( "ghi", e2.getNext() );
+    checkHasNoMoreElements( e2 );
+ }
+ 
+ 
+ 
  } // namespace Refactoring

Index: EnumeratorTest.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftaparser/EnumeratorTest.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EnumeratorTest.h	28 Apr 2003 08:45:11 -0000	1.2
--- EnumeratorTest.h	28 Apr 2003 22:18:05 -0000	1.3
***************
*** 10,13 ****
--- 10,14 ----
  #include <xtl/Enumerator.h>
  #include <xtl/StlEnumerator.h>
+ #include <xtl/GetAtEnumerator.h>
  #include <deque>
  #include <map>
***************
*** 30,33 ****
--- 31,35 ----
     CPPUNIT_TEST( testStlMapKeysEnumerator );
     CPPUNIT_TEST( testStlMapValuesEnumerator );
+    CPPUNIT_TEST( testGetAtEnumerator );
     CPPUNIT_TEST_SUITE_END();
  
***************
*** 53,56 ****
--- 55,60 ----
     void testStlMapValuesEnumerator();
  
+    void testGetAtEnumerator();
+ 
  private:
     typedef Xtl::Enumerator<int> IntEnum;
***************
*** 83,86 ****
--- 87,98 ----
        RFTA_ASSERT_EQUAL( 34, e2.getNext() );
        checkHasNoMoreElements( e2 );
+    }
+ 
+    template<typename SequenceContainer>
+    void fillStringSequence( SequenceContainer &sequence )
+    {
+       sequence.push_back( "abc" );
+       sequence.push_back( "def" );
+       sequence.push_back( "ghi" );
     }
  

Index: rftaparser.dsp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftaparser/rftaparser.dsp,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** rftaparser.dsp	28 Apr 2003 11:13:16 -0000	1.44
--- rftaparser.dsp	28 Apr 2003 22:18:06 -0000	1.45
***************
*** 56,61 ****
  # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\build\rftaparser\Release/rftaparser_mdr.ext" /libpath:"../../deplib/cppunit/lib"
  # Begin Special Build Tool
! TargetDir=\Projects\Cpptool\rfta\build\rftaparser\Release
! TargetPath=\Projects\Cpptool\rfta\build\rftaparser\Release\rftaparser_mdr.ext
  TargetName=rftaparser_mdr
  SOURCE="$(InputPath)"
--- 56,61 ----
  # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\build\rftaparser\Release/rftaparser_mdr.ext" /libpath:"../../deplib/cppunit/lib"
  # Begin Special Build Tool
! TargetDir=\prg\vc\Rfta\build\rftaparser\Release
! TargetPath=\prg\vc\Rfta\build\rftaparser\Release\rftaparser_mdr.ext
  TargetName=rftaparser_mdr
  SOURCE="$(InputPath)"
***************
*** 90,95 ****
  # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd_dll.lib /nologo /dll /debug /machine:I386 /out:"..\..\build\rftaparser\Debug/rftaparser_mdd.ext" /pdbtype:sept /libpath:"../../deplib/cppunit/lib"
  # Begin Special Build Tool
! TargetDir=\Projects\Cpptool\rfta\build\rftaparser\Debug
! TargetPath=\Projects\Cpptool\rfta\build\rftaparser\Debug\rftaparser_mdd.ext
  TargetName=rftaparser_mdd
  SOURCE="$(InputPath)"
--- 90,95 ----
  # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd_dll.lib /nologo /dll /debug /machine:I386 /out:"..\..\build\rftaparser\Debug/rftaparser_mdd.ext" /pdbtype:sept /libpath:"../../deplib/cppunit/lib"
  # Begin Special Build Tool
! TargetDir=\prg\vc\Rfta\build\rftaparser\Debug
! TargetPath=\prg\vc\Rfta\build\rftaparser\Debug\rftaparser_mdd.ext
  TargetName=rftaparser_mdd
  SOURCE="$(InputPath)"
***************
*** 1211,1214 ****
--- 1211,1227 ----
  SOURCE=.\KeyedString.h
  # End Source File
+ # Begin Source File
+ 
+ SOURCE=.\UnitTesting.h
+ 
+ !IF  "$(CFG)" == "rftaparser - Win32 Release"
+ 
+ # PROP Exclude_From_Build 1
+ 
+ !ELSEIF  "$(CFG)" == "rftaparser - Win32 Debug"
+ 
+ !ENDIF 
+ 
+ # End Source File
  # End Group
  # Begin Source File
***************
*** 1288,1304 ****
  
  SOURCE=.\SourceRangeTest.h
- 
- !IF  "$(CFG)" == "rftaparser - Win32 Release"
- 
- # PROP Exclude_From_Build 1
- 
- !ELSEIF  "$(CFG)" == "rftaparser - Win32 Debug"
- 
- !ENDIF 
- 
- # End Source File
- # Begin Source File
- 
- SOURCE=.\UnitTesting.h
  
  !IF  "$(CFG)" == "rftaparser - Win32 Release"
--- 1301,1304 ----