cpptool-cvs

[<net...@us...>]

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

Modified Files:
	IdentifierResolverTest.h IdentifierResolverTest.cpp 
Log Message:
corrected the test routine

Index: IdentifierResolverTest.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/IdentifierResolverTest.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** IdentifierResolverTest.h	31 Jan 2003 21:37:54 -0000	1.4
--- IdentifierResolverTest.h	5 Apr 2003 12:12:57 -0000	1.5
***************
*** 27,31 ****
     CPPUNIT_TEST( testForScope );
     CPPUNIT_TEST( testSwitchScope );
! //   CPPUNIT_TEST( testBug1 );
     CPPUNIT_TEST_SUITE_END();
  
--- 27,31 ----
     CPPUNIT_TEST( testForScope );
     CPPUNIT_TEST( testSwitchScope );
!    CPPUNIT_TEST( testBug1 );
     CPPUNIT_TEST_SUITE_END();
  

Index: IdentifierResolverTest.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/IdentifierResolverTest.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** IdentifierResolverTest.cpp	31 Jan 2003 21:37:54 -0000	1.5
--- IdentifierResolverTest.cpp	5 Apr 2003 12:13:00 -0000	1.6
***************
*** 258,263 ****
     builder_->addKeyingMid( "std::vector<int> ", "bigBuffer", ";", "bigBuffer.0" );
     builder_->add( "{" );
!    builder_->addKeyingMid( "  KTEST_ASSERT_EQUAL( ", "index", ", ", "index.1" );
!    builder_->addKeyingMid( "", "bigBuffer", "[index] );", "bigBuffer.1" );
     builder_->add( "}" );
  
--- 258,265 ----
     builder_->addKeyingMid( "std::vector<int> ", "bigBuffer", ";", "bigBuffer.0" );
     builder_->add( "{" );
!    builder_->addKeyingMid( "  ","KTEST_ASSERT_EQUAL","( ", "ktest.0" );
!    builder_->addKeyingMid( "", "index", ", ", "index.1" );
!    builder_->addKeyingMid( "", "bigBuffer", "", "bigBuffer.1" );
!    builder_->addKeyingMid( "[", "index", "] );", "index.2" );
     builder_->add( "}" );
  
***************
*** 267,272 ****
--- 269,276 ----
  
     strategy_->enterNewLocalVariableScope();
+    strategy_->resolveUnqualifiedIdentifier( getIdentifierNode( "ktest.0" ) );
     strategy_->resolveUnqualifiedIdentifier( getIdentifierNode( "index.1" ) );
     strategy_->resolveUnqualifiedIdentifier( getIdentifierNode( "bigBuffer.1" ) );
+    strategy_->resolveUnqualifiedIdentifier( getIdentifierNode( "index.2" ) );
     strategy_->exitLocalVariableScope();