[Cpptool-cvs] rfta/src/rfta CodeRewriter.cpp,1.5,1.6 CodeWriterTest.cpp,1.6,1.7 CodeWriterTest.h,1.4,1.5

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

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

Modified Files:
	CodeRewriter.cpp CodeWriterTest.cpp CodeWriterTest.h 
Log Message:
* added test for statement removal

Index: CodeRewriter.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/CodeRewriter.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CodeRewriter.cpp	7 Mar 2003 09:41:11 -0000	1.5
--- CodeRewriter.cpp	7 Mar 2003 20:12:39 -0000	1.6
***************
*** 107,111 ****
        if ( change.type_ == Change::removed )
        {
!          deleteText( change.statement_->getText().getOriginalSourceRange() );
           continue;
        }
--- 107,111 ----
        if ( change.type_ == Change::removed )
        {
!          deleteText( change.oldRange_ );
           continue;
        }

Index: CodeWriterTest.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/CodeWriterTest.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CodeWriterTest.cpp	7 Mar 2003 09:41:11 -0000	1.6
--- CodeWriterTest.cpp	7 Mar 2003 20:12:40 -0000	1.7
***************
*** 135,138 ****
--- 135,161 ----
  
  
+ void 
+ CodeWriterTest::testRemoveStatement()
+ {
+    source_ = "{\n"
+              "  int x = 3;\n"
+              "  return 6;\n"
+              "}";
+    
+    generateCompound();
+ 
+    RFTA_ASSERT_EQUAL( 2, compound_->getStatementCount() );
+    compound_->removeStatementAt( 0 );
+ 
+    rewriteSource();
+ 
+    std::string expectedSource = "{\n"
+                                 "  \n"
+                                 "  return 6;\n"
+                                 "}";
+    RFTA_ASSERT_EQUAL( expectedSource, document_->getAllText() );
+ }
+ 
+ 
  CodeModel::ExpressionPtr 
  CodeWriterTest::makeTrueExpression()

Index: CodeWriterTest.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/CodeWriterTest.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CodeWriterTest.h	7 Mar 2003 09:41:11 -0000	1.4
--- CodeWriterTest.h	7 Mar 2003 20:12:40 -0000	1.5
***************
*** 24,27 ****
--- 24,28 ----
     CPPUNIT_TEST( testInsertStatement );
     CPPUNIT_TEST( testInsertReturnValueStatement );
+    CPPUNIT_TEST( testRemoveStatement );
     CPPUNIT_TEST_SUITE_END();
  
***************
*** 40,43 ****
--- 41,45 ----
     void testInsertStatement();
     void testInsertReturnValueStatement();
+    void testRemoveStatement();
  
  private: