[Cpptool-cvs] rfta/src/rfta CodeRewriter.cpp,1.22,1.23 CodeWriterTest.cpp,1.24,1.25 CodeWriterTest.h,1.20,1.21

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

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

Modified Files:
	CodeRewriter.cpp CodeWriterTest.cpp CodeWriterTest.h 
Log Message:
* added tests for ReturnStatement.

Index: CodeRewriter.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/CodeRewriter.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** CodeRewriter.cpp	16 Mar 2003 15:33:10 -0000	1.22
--- CodeRewriter.cpp	16 Mar 2003 15:43:09 -0000	1.23
***************
*** 412,415 ****
--- 412,418 ----
           currentInsertionPos_ = statement.getSourceRange().getEndIndex() -1;
  
+       if ( change.type_ == Change::added )
+          insertText( " " );
+ 
        statement.getValue()->accept( *this );
     }

Index: CodeWriterTest.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/CodeWriterTest.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** CodeWriterTest.cpp	16 Mar 2003 13:15:22 -0000	1.24
--- CodeWriterTest.cpp	16 Mar 2003 15:43:09 -0000	1.25
***************
*** 233,235 ****
--- 233,287 ----
  
  
+ void 
+ CodeWriterTest::testModifyReturnValue()
+ {
+    source_ = "{\n"
+              "  return 1234;\n"
+              "}";
+    generateCompound();
+ 
+    CodeModel::ReturnStatement &returnStatement = 
+       dynamic_cast<CodeModel::ReturnStatement &>( *compound_->getStatementAt(0) );
+    returnStatement.setValue( makeExpression( "x * y" ) );
+    generateAndCheckSource( "{\n"
+                            "  return x * y;\n"
+                            "}" );
+ }
+ 
+ 
+ void 
+ CodeWriterTest::testRemoveReturnValue()
+ {
+    source_ = "{\n"
+              "  return 1234;\n"
+              "}";
+    generateCompound();
+ 
+    CodeModel::ReturnStatement &returnStatement = 
+       dynamic_cast<CodeModel::ReturnStatement &>( *compound_->getStatementAt(0) );
+    returnStatement.setValue( CodeModel::ExpressionPtr() );
+    generateAndCheckSource( "{\n"
+                            "  return ;\n"
+                            "}" );
+ }
+ 
+ 
+ void 
+ CodeWriterTest::testAddReturnValue()
+ {
+    source_ = "{\n"
+              "  return;\n"
+              "}";
+    generateCompound();
+ 
+    CodeModel::ReturnStatement &returnStatement = 
+       dynamic_cast<CodeModel::ReturnStatement &>( *compound_->getStatementAt(0) );
+    returnStatement.setValue( makeExpression( "1234" ) );
+    generateAndCheckSource( "{\n"
+                            "  return 1234;\n"
+                            "}" );
+ }
+ 
+ 
+ 
  } // namespace Refactoring

Index: CodeWriterTest.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/CodeWriterTest.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** CodeWriterTest.h	16 Mar 2003 12:24:47 -0000	1.20
--- CodeWriterTest.h	16 Mar 2003 15:43:09 -0000	1.21
***************
*** 25,28 ****
--- 25,31 ----
     CPPUNIT_TEST( testRemoveElseFromIfThenStatement );
     CPPUNIT_TEST( testModifyElseFromIfThenStatement );
+    CPPUNIT_TEST( testModifyReturnValue );
+    CPPUNIT_TEST( testRemoveReturnValue );
+    CPPUNIT_TEST( testAddReturnValue );
     CPPUNIT_TEST_SUITE_END();
  
***************
*** 42,49 ****
--- 45,57 ----
     void testRemoveStatement();
     void testMoveSubExpression();
+ 
     void testModifyIfThenStatement();
     void testAddElseToIfThenStatement();
     void testRemoveElseFromIfThenStatement();
     void testModifyElseFromIfThenStatement();
+ 
+    void testModifyReturnValue();
+    void testRemoveReturnValue();
+    void testAddReturnValue();
  
  private: