Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2010-04-01 23:26:59 +0000
committerStephan Herrmann2010-04-01 23:26:59 +0000
commit1bdfa7212104a5b97e6df46653802e9d19acb664 (patch)
tree8877dca7329f73b8e73d045c229bf021c011ccde /testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring
parentb1427fd4a32812eaa29b7c9204ce2c6af2dc9508 (diff)
downloadorg.eclipse.objectteams-1bdfa7212104a5b97e6df46653802e9d19acb664.tar.gz
org.eclipse.objectteams-1bdfa7212104a5b97e6df46653802e9d19acb664.tar.xz
org.eclipse.objectteams-1bdfa7212104a5b97e6df46653802e9d19acb664.zip
initial commit in accordance with CQ 3784
Diffstat (limited to 'testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring')
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/.classpath7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/.cvsignore1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/.project28
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/META-INF/MANIFEST.MF33
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/build.properties13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/plugin.xml4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/AllTests.java78
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/FileBasedRefactoringTest.java37
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/MySetup.java122
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/OTRefactoringTestPlugin.java83
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/OTRefactoringTestSetup.java42
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/RefactoringTest.java667
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractcallin/AllTests.java44
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractcallin/ExtractCallinTests.java140
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/AbstractSelectionTestCase.java200
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/AllTests.java50
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/ExtractMethodRefactoringUtilTests.java388
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/ExtractMethodTestSetup.java149
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/ExtractMethodTests.java480
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/ExtractTempTestSetup.java96
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/ExtractTempTests.java209
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/inlinecallin/AllTests.java44
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/inlinecallin/InlineCallinTests.java345
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/move/AllTests.java50
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/move/MoveInstanceMethodTests.java696
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/move/MoveMethodTests.java41
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/move/MoveStaticMethodTests.java563
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/pullup/AllTests.java50
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/pullup/PullUpTests.java330
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/pushdown/AllTests.java46
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/pushdown/PushDownTests.java265
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/rename/AllTests.java54
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/rename/RenameMethodInInterfaceTests.java257
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/rename/RenameMethodTests.java43
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/rename/RenamePrivateFieldTests.java418
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/rename/RenamePrivateMethodTests.java234
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/rename/RenameStaticMethodTests.java296
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/rename/RenameTypeTests.java463
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/rename/RenameVirtualMethodInClassTests.java283
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/reorg/AllTests.java53
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/reorg/MockReorgQueries.java70
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/reorg/OTCopyToClipboardTests.java573
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/reorg/OTDeleteTests.java195
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/reorg/OTPasteActionTest.java372
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/reorg/PasteActionTest.java454
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/requiredfeatures/AllTests.java56
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/util/AllTests.java49
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/util/RefactoringUtilTest.java192
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/test-old.xml61
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/test.xml166
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Delete/testDeleteCallinMapping/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Delete/testDeleteCallinMapping/in/T.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Delete/testDeleteCallinMapping/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Delete/testDeleteCallinMapping/out/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Delete/testDeleteCalloutMapping/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Delete/testDeleteCalloutMapping/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Delete/testDeleteCalloutMapping/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Delete/testDeleteCalloutMapping/out/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Delete/testDeleteCalloutToFieldMapping/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Delete/testDeleteCalloutToFieldMapping/in/T.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Delete/testDeleteCalloutToFieldMapping/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Delete/testDeleteCalloutToFieldMapping/out/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Delete/testDeleteNestedTeamclass/in/T.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Delete/testDeleteNestedTeamclass/out/T.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Delete/testDeleteRoleclass/in/T.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Delete/testDeleteRoleclass/out/T.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Delete/testDeleteTeamclass/in/T.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Delete/testDeleteTeamclass/out/T.java1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Delete/testGetRoleclassName/in/T.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractCallin/testExtractCallinWithParameter/in/B.java17
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractCallin/testExtractCallinWithParameter/in/T.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractCallin/testExtractCallinWithParameter/out/B.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractCallin/testExtractCallinWithParameter/out/T.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractCallin/testExtractCallinWithParameterMapping/in/B.java17
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractCallin/testExtractCallinWithParameterMapping/in/T.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractCallin/testExtractCallinWithParameterMapping/out/B.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractCallin/testExtractCallinWithParameterMapping/out/T.java15
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractCallin/testExtractSimpleAfterCallin/in/B.java17
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractCallin/testExtractSimpleAfterCallin/in/T.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractCallin/testExtractSimpleAfterCallin/out/B.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractCallin/testExtractSimpleAfterCallin/out/T.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractCallin/testExtractSimpleBeforeCallin/in/B.java17
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractCallin/testExtractSimpleBeforeCallin/in/T.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractCallin/testExtractSimpleBeforeCallin/out/B.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractCallin/testExtractSimpleBeforeCallin/out/T.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractCallin/testExtractSimpleReplaceCallin1/in/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractCallin/testExtractSimpleReplaceCallin1/in/T.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractCallin/testExtractSimpleReplaceCallin1/out/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractCallin/testExtractSimpleReplaceCallin1/out/T.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractCallin/testExtractSimpleReplaceCallin2/in/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractCallin/testExtractSimpleReplaceCallin2/in/T.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractCallin/testExtractSimpleReplaceCallin2/out/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractCallin/testExtractSimpleReplaceCallin2/out/T.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/focusType_in/A.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/focusType_in/B.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/focusType_in/C.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/focusType_in/FocusTeam1.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/focusType_in/FocusTeam2.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/focusType_in/FocusTeam3.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/focusType_in/T1.java19
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/focusType_in/T2.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/focusType_in/T3.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/nestedTeam_in/B_testNestedTeam3.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/nestedTeam_in/B_testNestedTeam4.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/nestedTeam_in/B_testNestedTeam5.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/nestedTeam_in/B_testNestedTeam6.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/nestedTeam_in/T1_testNestedTeam1.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/nestedTeam_in/T1_testNestedTeam2.java17
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/nestedTeam_in/T1_testNestedTeam3.java15
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/nestedTeam_in/T1_testNestedTeam4.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/nestedTeam_in/T1_testNestedTeam5.java18
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/nestedTeam_in/T1_testNestedTeam6.java19
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/nestedTeam_out/T1_testNestedTeam1.java19
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/nestedTeam_out/T1_testNestedTeam2.java22
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_in/A_test20.java19
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_in/A_test21.java19
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_in/A_test22.java19
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_in/A_test23.java19
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_in/A_test24.java19
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_in/A_test25.java19
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_in/B_test20.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_in/B_test21.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_in/B_test22.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_in/Base1_test20.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_in/Base1_test21.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_in/Base1_test22.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_in/Base1_test24.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_in/Base1_test25.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_in/Team1_test20.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_in/Team1_test21.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_in/Team1_test22.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_in/Team1_test23.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_in/Team1_test24.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_in/Team1_test25.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_in/Team2_test21.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_in/Team2_test22.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_out/A_test22.java24
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_out/A_test25.java24
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_out/B_test22.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_out/Base1_test22.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_out/Base1_test25.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_out/Team1_test22.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_out/Team1_test25.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/overloading_out/Team2_test22.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/roleFile_in/TeamWithRoleFile.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/roleFile_in/TeamWithRoleFile/R_testRoleFile1.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/roleFile_in/TeamWithRoleFile/R_testRoleFile2.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/roleFile_out/TeamWithRoleFile.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/roleFile_out/TeamWithRoleFile/R_testRoleFile1.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/roleFile_out/TeamWithRoleFile/R_testRoleFile2.java21
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/role_in/T_testRoleclass1.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/role_in/T_testRoleclass2.java19
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/role_out/T_testRoleclass1.java19
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/role_out/T_testRoleclass2.java24
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/team_in/T_testTeamclass1.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/team_in/T_testTeamclass2.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/team_out/T_testTeamclass1.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractMethod/team_out/T_testTeamclass2.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractTemp/statements_in/T_testTypeAnchor1.java17
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractTemp/statements_in/T_testTypeAnchor2.java23
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractTemp/statements_in/T_testTypeAnchor3.java21
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractTemp/statements_in/T_testWithin1.java15
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractTemp/statements_in/T_testWithin2.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractTemp/statements_out/T_testTypeAnchor1.java18
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractTemp/statements_out/T_testTypeAnchor2.java24
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractTemp/statements_out/T_testTypeAnchor3.java22
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractTemp/statements_out/T_testWithin1.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/ExtractTemp/statements_out/T_testWithin2.java15
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testAfterCallinWithReturn/in/B.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testAfterCallinWithReturn/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testAfterCallinWithReturn/out/B.java19
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testAfterCallinWithReturn/out/T.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testCallinMappingWithSignature/in/B.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testCallinMappingWithSignature/in/T.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testCallinMappingWithSignature/out/B.java18
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testCallinMappingWithSignature/out/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDeleteReferencedRoleMethod/in/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDeleteReferencedRoleMethod/in/T.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDeleteRoleMethod/in/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDeleteRoleMethod/in/T.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDeleteRoleMethod/out/B.java17
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDeleteRoleMethod/out/T.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDependencyToRole1/in/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDependencyToRole1/in/T.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDependencyToRole2/in/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDependencyToRole2/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamLength/in/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamLength/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamLength/out/B.java18
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamLength/out/T.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamNames/in/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamNames/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamNames/out/B.java18
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testDifferentParamNames/out/T.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineBoundCallin1/in/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineBoundCallin1/in/T1.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineBoundCallin1/in/T2.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineBoundCallin2/in/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineBoundCallin2/in/T1.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineBoundCallin2/in/T2.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineMultipleCallins/in/B.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineMultipleCallins/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineMultipleCallins/out/B.java23
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testInlineMultipleCallins/out/T.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testMultipleBaseMethodCallin/in/B.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testMultipleBaseMethodCallin/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testMultipleBaseMethodCallin/out/B.java18
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testMultipleBaseMethodCallin/out/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling1/in/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling1/in/T.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling1/out/B.java17
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling1/out/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling2/in/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling2/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling2/out/B.java18
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testParameterTunneling2/out/T.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling1/in/B.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling1/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling1/out/B.java21
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling1/out/T.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling2/in/B.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling2/in/T.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling2/out/B.java20
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinResultTunneling2/out/T.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithMultipleReturns/in/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithMultipleReturns/in/T.java17
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithMultipleReturns/out/B.java24
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithMultipleReturns/out/T.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithParameter/in/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithParameter/in/T.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithParameter/out/B.java17
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithParameter/out/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithReturn/in/B.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithReturn/in/T.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithReturn/out/B.java18
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceCallinWithReturn/out/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceWithParameterMapping/in/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceWithParameterMapping/in/T.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceWithParameterMapping/out/B.java17
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testReplaceWithParameterMapping/out/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCallout/in/B.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCallout/in/T.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCallout/out/B.java21
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCallout/out/T.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldGet/in/B.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldGet/in/T.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldGet/out/B.java21
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldGet/out/T.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldSet/in/B.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldSet/in/T.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldSet/out/B.java21
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testRoleMethodReferencesCalloutToFieldSet/out/T.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleAfterCallin/in/B.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleAfterCallin/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleAfterCallin/out/B.java18
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleAfterCallin/out/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleBeforeCallin/in/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleBeforeCallin/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleBeforeCallin/out/B.java17
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleBeforeCallin/out/T.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleParameterMapping/in/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleParameterMapping/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleParameterMapping/out/B.java17
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleParameterMapping/out/T.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleReplaceCallin/in/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleReplaceCallin/in/T.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleReplaceCallin/out/B.java17
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/InlineCallin/testSimpleReplaceCallin/out/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testExplicitlyInheritedRoleClassWithLongMethodSpecs/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testExplicitlyInheritedRoleClassWithLongMethodSpecs/in/O.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testExplicitlyInheritedRoleClassWithLongMethodSpecs/in/S.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testExplicitlyInheritedRoleClassWithLongMethodSpecs/in/T.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testExplicitlyInheritedRoleClassWithLongMethodSpecs/out/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testExplicitlyInheritedRoleClassWithLongMethodSpecs/out/O.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testExplicitlyInheritedRoleClassWithLongMethodSpecs/out/S.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testExplicitlyInheritedRoleClassWithLongMethodSpecs/out/T.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testFieldNewReceiver/in/A.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testFieldNewReceiver/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testFieldNewReceiver/out/A.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testFieldNewReceiver/out/B.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testImplicitlyInheritedRoleClassWithLongMethodSpecs/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testImplicitlyInheritedRoleClassWithLongMethodSpecs/in/O.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testImplicitlyInheritedRoleClassWithLongMethodSpecs/in/S.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testImplicitlyInheritedRoleClassWithLongMethodSpecs/in/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testImplicitlyInheritedRoleClassWithLongMethodSpecs/in/T2.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testImplicitlyInheritedRoleClassWithLongMethodSpecs/out/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testImplicitlyInheritedRoleClassWithLongMethodSpecs/out/O.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testImplicitlyInheritedRoleClassWithLongMethodSpecs/out/S.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testImplicitlyInheritedRoleClassWithLongMethodSpecs/out/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testImplicitlyInheritedRoleClassWithLongMethodSpecs/out/T2.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testNestedTeam1/in/O.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testNestedTeam1/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testNestedTeam1/out/O.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testNestedTeam1/out/T.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testNestedTeam2/in/O.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testNestedTeam2/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testNestedTeam2/out/O.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testNestedTeam2/out/T.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testParameterNewReceiver/in/A.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testParameterNewReceiver/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testParameterNewReceiver/out/A.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testParameterNewReceiver/out/B.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testRoleClassWithLongMethodSpecsInCallinBinding/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testRoleClassWithLongMethodSpecsInCallinBinding/in/O.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testRoleClassWithLongMethodSpecsInCallinBinding/in/S.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testRoleClassWithLongMethodSpecsInCallinBinding/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testRoleClassWithLongMethodSpecsInCallinBinding/out/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testRoleClassWithLongMethodSpecsInCallinBinding/out/O.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testRoleClassWithLongMethodSpecsInCallinBinding/out/S.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testRoleClassWithLongMethodSpecsInCallinBinding/out/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testRoleClassWithLongMethodSpecsInCalloutBinding/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testRoleClassWithLongMethodSpecsInCalloutBinding/in/O.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testRoleClassWithLongMethodSpecsInCalloutBinding/in/S.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testRoleClassWithLongMethodSpecsInCalloutBinding/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testRoleClassWithLongMethodSpecsInCalloutBinding/out/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testRoleClassWithLongMethodSpecsInCalloutBinding/out/O.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testRoleClassWithLongMethodSpecsInCalloutBinding/out/S.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testRoleClassWithLongMethodSpecsInCalloutBinding/out/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testRoleclass1/in/O.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testRoleclass1/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testRoleclass1/out/O.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testRoleclass1/out/T.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testRoleclass2/in/O.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testRoleclass2/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testRoleclass2/out/O.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testRoleclass2/out/T.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesPackageVisibleFeatureOfEnclosingType1/in/A.java15
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesPackageVisibleFeatureOfEnclosingType1/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesPackageVisibleFeatureOfEnclosingType1/in/C.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesPackageVisibleFeatureOfEnclosingType1/out/A.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesPackageVisibleFeatureOfEnclosingType1/out/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesPackageVisibleFeatureOfEnclosingType1/out/C.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesPackageVisibleFeatureOfEnclosingType2/in/A.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesPackageVisibleFeatureOfEnclosingType2/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesPackageVisibleFeatureOfEnclosingType2/in/C.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesPackageVisibleFeatureOfEnclosingType2/out/A.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesPackageVisibleFeatureOfEnclosingType2/out/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesPackageVisibleFeatureOfEnclosingType2/out/C.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesPrivateFeatureOfEnclosingType1/in/A.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesPrivateFeatureOfEnclosingType1/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesPrivateFeatureOfEnclosingType1/in/C.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesPrivateFeatureOfEnclosingType1/out/A.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesPrivateFeatureOfEnclosingType1/out/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesPrivateFeatureOfEnclosingType1/out/C.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesPrivateFeatureOfEnclosingType2/in/A.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesPrivateFeatureOfEnclosingType2/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesPrivateFeatureOfEnclosingType2/in/C.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesPrivateFeatureOfEnclosingType2/out/A.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesPrivateFeatureOfEnclosingType2/out/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesPrivateFeatureOfEnclosingType2/out/C.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesProtectedFeatureOfEnclosingType1/in/A.java15
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesProtectedFeatureOfEnclosingType1/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesProtectedFeatureOfEnclosingType1/in/C.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesProtectedFeatureOfEnclosingType1/out/A.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesProtectedFeatureOfEnclosingType1/out/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesProtectedFeatureOfEnclosingType1/out/C.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesProtectedFeatureOfEnclosingType2/in/A.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesProtectedFeatureOfEnclosingType2/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesProtectedFeatureOfEnclosingType2/in/C.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesProtectedFeatureOfEnclosingType2/out/A.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesProtectedFeatureOfEnclosingType2/out/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTargetMethodAccessesProtectedFeatureOfEnclosingType2/out/C.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTeamclass1/in/O.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTeamclass1/in/T.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTeamclass1/out/O.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTeamclass1/out/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTeamclass2/in/O.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTeamclass2/in/T.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTeamclass2/out/O.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/canMove/testTeamclass2/out/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousBaseMethodSpecifierInCallinBinding1/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousBaseMethodSpecifierInCallinBinding1/in/O.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousBaseMethodSpecifierInCallinBinding1/in/S.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousBaseMethodSpecifierInCallinBinding1/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousBaseMethodSpecifierInCallinBinding2/in/O.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousBaseMethodSpecifierInCallinBinding2/in/S.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousBaseMethodSpecifierInCallinBinding2/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousBaseMethodSpecifierInCalloutBinding1/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousBaseMethodSpecifierInCalloutBinding1/in/O.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousBaseMethodSpecifierInCalloutBinding1/in/S.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousBaseMethodSpecifierInCalloutBinding1/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousBaseMethodSpecifierInCalloutBinding2/in/O.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousBaseMethodSpecifierInCalloutBinding2/in/S.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousBaseMethodSpecifierInCalloutBinding2/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousRoleMethodSpecifierInCallinBinding1/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousRoleMethodSpecifierInCallinBinding1/in/O.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousRoleMethodSpecifierInCallinBinding1/in/S.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousRoleMethodSpecifierInCallinBinding1/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousRoleMethodSpecifierInCallinBinding2/in/O.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousRoleMethodSpecifierInCallinBinding2/in/S.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousRoleMethodSpecifierInCallinBinding2/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousRoleMethodSpecifierInCalloutBinding1/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousRoleMethodSpecifierInCalloutBinding1/in/O.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousRoleMethodSpecifierInCalloutBinding1/in/S.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousRoleMethodSpecifierInCalloutBinding1/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousRoleMethodSpecifierInCalloutBinding2/in/O.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousRoleMethodSpecifierInCalloutBinding2/in/S.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testAmbiguousRoleMethodSpecifierInCalloutBinding2/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testDuplicateMethodInBaseClassReceiver/in/O.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testDuplicateMethodInBaseClassReceiver/in/S.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testDuplicateMethodInBaseClassReceiver/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testDuplicateMethodInNewParameterReceiver1/in/A.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testDuplicateMethodInNewParameterReceiver1/in/B.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testDuplicateMethodInNewParameterReceiver2/in/A.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testDuplicateMethodInNewParameterReceiver2/in/B.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testDuplicateMethodInNewReceiver/in/O.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testDuplicateMethodInNewReceiver/in/S.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testMovedMethodIsOverriddenInBaseClass/in/O.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testMovedMethodIsOverriddenInBaseClass/in/S.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testMovedMethodIsOverriddenInBaseClass/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testMovedMethodIsOverriddenInExplicitlyInheritedRoleClass/in/O.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testMovedMethodIsOverriddenInExplicitlyInheritedRoleClass/in/S.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testMovedMethodIsOverriddenInExplicitlyInheritedRoleClass/in/T.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testMovedMethodIsOverriddenInImplicitlyInheritedRoleClass/in/O.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testMovedMethodIsOverriddenInImplicitlyInheritedRoleClass/in/S.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testMovedMethodIsOverriddenInImplicitlyInheritedRoleClass/in/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testMovedMethodIsOverriddenInImplicitlyInheritedRoleClass/in/T2.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testMovedMethodIsOverriddenInRoleClass/in/O.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testMovedMethodIsOverriddenInRoleClass/in/S.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testMovedMethodIsOverriddenInRoleClass/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testTargetMethodIsPrivate/in/A.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveInstanceMethod/cannotMove/testTargetMethodIsPrivate/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test0/in/A.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test0/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test0/out/A.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test0/out/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test1/in/A.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test1/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test1/out/A.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test1/out/B.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test10/in/A.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test10/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test10/out/A.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test10/out/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test11/in/A.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test11/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test11/out/A.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test11/out/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test12/in/A.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test12/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test12/out/A.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test12/out/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test13/in/A.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test13/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test13/out/A.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test13/out/B.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test14/in/A.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test14/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test14/out/A.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test14/out/B.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test15/in/A.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test15/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test15/out/A.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test15/out/B.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test16/in/A.java15
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test16/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test16/out/A.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test16/out/B.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test17/in/A.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test17/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test17/out/A.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test17/out/B.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test18/in/A.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test18/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test18/out/A.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test18/out/B.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test19/in/A.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test19/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test19/out/A.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test19/out/B.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test2/in/A.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test2/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test2/out/A.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test2/out/B.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test20/in/A.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test20/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test20/out/A.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test20/out/B.java15
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test28/in/A.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test28/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test28/out/A.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test28/out/B.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test29/in/A.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test29/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test29/out/A.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test29/out/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test3/in/A.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test3/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test3/out/A.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test3/out/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test4/in/A.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test4/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test4/out/A.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test4/out/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test41/in/A.java39
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test41/in/B.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test41/out/A.java23
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test41/out/B.java25
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test9/in/A.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test9/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test9/out/A.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/test9/out/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail0/in/A.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail0/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail1/in/A.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail1/in/B.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail10/in/A.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail10/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail13/in/A.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail13/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail15/in/A.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail15/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail17/in/A.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail17/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail18/in/A.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail18/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail19/in/A.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail19/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail2/in/A.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail2/in/B.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail21/in/A.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail21/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail24/in/A.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail24/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail3/in/A.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail3/in/B.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail4/in/A.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail4/in/B.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail5/in/A.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail5/in/B.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail9/in/A.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testFail9/in/B.java3
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testMoveToNestedTeamclass1/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testMoveToNestedTeamclass1/in/T.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testMoveToNestedTeamclass1/out/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testMoveToNestedTeamclass1/out/T.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testMoveToNestedTeamclass2/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testMoveToNestedTeamclass2/in/T.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testMoveToNestedTeamclass2/out/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testMoveToNestedTeamclass2/out/T.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testMoveToRoleclass/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testMoveToRoleclass/in/T.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testMoveToRoleclass/out/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testMoveToRoleclass/out/T.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testMoveToTeamclass/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testMoveToTeamclass/in/T.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testMoveToTeamclass/out/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/MoveStaticMethod/testMoveToTeamclass/out/T.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCallinMapping/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCallinMapping/in/TDest.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCallinMapping/in/TSource.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCallinMapping/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCallinMapping/out/TDest.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCallinMapping/out/TSource.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCallinMappingParam/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCallinMappingParam/in/TDest.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCallinMappingParam/in/TSource.java17
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCallinMappingParam/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCallinMappingParam/out/TDest.java17
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCallinMappingParam/out/TSource.java17
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCalloutMapping/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCalloutMapping/in/TDest.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCalloutMapping/in/TSource.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCalloutMapping/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCalloutMapping/out/TDest.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCalloutMapping/out/TSource.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCalloutMappingParam/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCalloutMappingParam/in/TDest.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCalloutMappingParam/in/TSource.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCalloutMappingParam/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCalloutMappingParam/out/TDest.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCalloutMappingParam/out/TSource.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCalloutToFieldMapping/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCalloutToFieldMapping/in/TDest.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCalloutToFieldMapping/in/TSource.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCalloutToFieldMapping/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCalloutToFieldMapping/out/TDest.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteCalloutToFieldMapping/out/TSource.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteNestedTeamclass/in/TDest.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteNestedTeamclass/in/TSource.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteNestedTeamclass/out/TDest.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteNestedTeamclass/out/TSource.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteRoleclass/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteRoleclass/in/TDest.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteRoleclass/in/TSource.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteRoleclass/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteRoleclass/out/TDest.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteRoleclass/out/TSource.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteTeamclassIntoTeamclass/in/TDest.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteTeamclassIntoTeamclass/in/TSource.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteTeamclassIntoTeamclass/out/TDest.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/Paste/testPasteTeamclassIntoTeamclass/out/TSource.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testAmbiguityInBase1/in/B1.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testAmbiguityInBase1/in/B2.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testAmbiguityInBase1/in/T.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testAmbiguityInBase2/in/B1.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testAmbiguityInBase2/in/B2.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testAmbiguityInBase2/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testAmbiguityInExplicitRelatedRole1/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testAmbiguityInExplicitRelatedRole1/in/T.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testAmbiguityInExplicitRelatedRole2/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testAmbiguityInExplicitRelatedRole2/in/T.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testAmbiguityInImplicitRelatedRole1/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testAmbiguityInImplicitRelatedRole1/in/T1.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testAmbiguityInImplicitRelatedRole1/in/T2.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testAmbiguityInImplicitRelatedRole1/in/TSuper.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testAmbiguityInImplicitRelatedRole2/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testAmbiguityInImplicitRelatedRole2/in/T1.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testAmbiguityInImplicitRelatedRole2/in/T2.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testAmbiguityInImplicitRelatedRole2/in/TSuper.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testDeletionOfMatchingMethods/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testDeletionOfMatchingMethods/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testDeletionOfMatchingMethods/in/T2.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testDeletionOfMatchingMethods/in/TSuper.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testDeletionOfMatchingMethods/out/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testDeletionOfMatchingMethods/out/T.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testDeletionOfMatchingMethods/out/T2.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testDeletionOfMatchingMethods/out/TSuper.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpAnchoredTypeField/in/T1.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpAnchoredTypeField/in/T2.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpAnchoredTypeField/in/T3.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpBoundMethod/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpBoundMethod/in/BSuper.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpBoundMethod/in/T.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpBoundMethod/out/B.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpBoundMethod/out/BSuper.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpBoundMethod/out/T.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpCallinIntoRegularClass/in/C.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpCallinIntoRegularClass/in/T.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpCallinMethod/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpCallinMethod/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpCallinMethod/in/TSuper.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpCallinMethod/out/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpCallinMethod/out/T.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpCallinMethod/out/TSuper.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpCalloutFieldInBase/in/B1.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpCalloutFieldInBase/in/B2.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpCalloutFieldInBase/in/T.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpCalloutFieldInBase/out/B1.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpCalloutFieldInBase/out/B2.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpCalloutFieldInBase/out/T.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpFieldToImplicitSuperclass/in/T.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpFieldToImplicitSuperclass/in/TSuper.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpFieldToImplicitSuperclass/out/T.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpFieldToImplicitSuperclass/out/TSuper.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpMethodToImplicitSuperclass/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpMethodToImplicitSuperclass/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpMethodToImplicitSuperclass/in/TSuper.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpMethodToImplicitSuperclass/out/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpMethodToImplicitSuperclass/out/T.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPullUpMethodToImplicitSuperclass/out/TSuper.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPulledUpFieldWillBeShadowed/in/T1.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPulledUpFieldWillBeShadowed/in/T2.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPulledUpFieldWillBeShadowed/in/T3.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPulledUpMethodIsOverriddenInImplicitSubRole/in/T1.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPulledUpMethodIsOverriddenInImplicitSubRole/in/T2.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testPulledUpMethodIsOverriddenInImplicitSubRole/in/TSuper.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testReferencingRoleInDeclaredLifting/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testReferencingRoleInDeclaredLifting/in/T.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PullUp/testReferencingRoleInDeclaredLifting/in/TSuper.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testDeclaringTypeHasADirectPhantomSubRole/in/T1.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testDeclaringTypeHasADirectPhantomSubRole/in/T2.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testDeclaringTypeHasADirectPhantomSubRole/in/TSuper.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testOverrideExplicitInheritedMethod/in/A.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testOverrideExplicitInheritedMethod/in/T1.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testOverrideExplicitInheritedMethod/in/T2.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testOverrideExplicitInheritedMethod/out/A.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testOverrideExplicitInheritedMethod/out/T1.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testOverrideExplicitInheritedMethod/out/T2.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testOverrideImplicitInheritedMethod/in/A.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testOverrideImplicitInheritedMethod/in/T1.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testOverrideImplicitInheritedMethod/in/T2.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushDownFieldToImplicitSubclass/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushDownFieldToImplicitSubclass/in/T.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushDownFieldToImplicitSubclass/in/TSuper.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushDownFieldToImplicitSubclass/out/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushDownFieldToImplicitSubclass/out/T.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushDownFieldToImplicitSubclass/out/TSuper.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushDownMethodToImplicitSubclass/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushDownMethodToImplicitSubclass/in/T.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushDownMethodToImplicitSubclass/in/TSuper.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushDownMethodToImplicitSubclass/out/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushDownMethodToImplicitSubclass/out/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushDownMethodToImplicitSubclass/out/TSuper.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushDownTypeAnchorInstance/in/T1.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushDownTypeAnchorInstance/in/T2.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushDownTypeAnchorInstance/in/T3.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownFieldIsReferencedInBaseGuard1/in/B1.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownFieldIsReferencedInBaseGuard1/in/B2.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownFieldIsReferencedInBaseGuard1/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownFieldIsReferencedInBaseGuard2/in/B1.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownFieldIsReferencedInBaseGuard2/in/B2.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownFieldIsReferencedInBaseGuard2/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownFieldIsReferencedInBaseGuard3/in/B1.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownFieldIsReferencedInBaseGuard3/in/B2.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownFieldIsReferencedInBaseGuard3/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownFieldIsReferencedInParameterMapping1/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownFieldIsReferencedInParameterMapping1/in/T.java15
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownFieldIsReferencedInParameterMapping2/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownFieldIsReferencedInParameterMapping2/in/T.java15
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownFieldIsReferencedInParameterMapping3/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownFieldIsReferencedInParameterMapping3/in/T.java17
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownFieldIsReferencedInRegularGuard1/in/B.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownFieldIsReferencedInRegularGuard1/in/T.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownFieldIsReferencedInRegularGuard2/in/B.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownFieldIsReferencedInRegularGuard2/in/T.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownFieldReferencedInCalloutToField/in/B1.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownFieldReferencedInCalloutToField/in/B2.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownFieldReferencedInCalloutToField/in/T.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownFieldWouldShadowAnInheritedField/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownFieldWouldShadowAnInheritedField/in/T1.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownFieldWouldShadowAnInheritedField/in/T2.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodIsReferencedInBaseGuard1/in/B1.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodIsReferencedInBaseGuard1/in/B2.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodIsReferencedInBaseGuard1/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodIsReferencedInBaseGuard2/in/B1.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodIsReferencedInBaseGuard2/in/B2.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodIsReferencedInBaseGuard2/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodIsReferencedInBaseGuard3/in/B1.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodIsReferencedInBaseGuard3/in/B2.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodIsReferencedInBaseGuard3/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodIsReferencedInParameterMapping1/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodIsReferencedInParameterMapping1/in/T.java17
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodIsReferencedInParameterMapping2/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodIsReferencedInParameterMapping2/in/T.java17
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodIsReferencedInParameterMapping3/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodIsReferencedInParameterMapping3/in/T.java19
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodIsReferencedInRegularGuard1/in/B.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodIsReferencedInRegularGuard1/in/T.java15
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodIsReferencedInRegularGuard2/in/B.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodIsReferencedInRegularGuard2/in/T.java15
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodReferencedInMethodBinding1/in/B1.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodReferencedInMethodBinding1/in/B2.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodReferencedInMethodBinding1/in/T.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodReferencedInMethodBinding2/in/B1.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodReferencedInMethodBinding2/in/B2.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodReferencedInMethodBinding2/in/T.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodReferencedInMethodBinding3/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodReferencedInMethodBinding3/in/T1.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/PushDown/testPushedDownMethodReferencedInMethodBinding3/in/T2.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameMethodInInterface/testMethodAlreadyExistsInExplicitlyInheritedRoleClass/in/I.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameMethodInInterface/testMethodAlreadyExistsInExplicitlyInheritedRoleClass/in/T.java15
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameMethodInInterface/testMethodAlreadyExistsInImplicitlyInheritedRoleClass/in/I.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameMethodInInterface/testMethodAlreadyExistsInImplicitlyInheritedRoleClass/in/T1.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameMethodInInterface/testMethodAlreadyExistsInImplicitlyInheritedRoleClass/in/T2.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameMethodInInterface/testMethodAlreadyExistsInRoleClass/in/I.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameMethodInInterface/testMethodAlreadyExistsInRoleClass/in/T.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameMethodInInterface/testUpdateImplementationInExplicitlyInheritedRoleClass/in/I.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameMethodInInterface/testUpdateImplementationInExplicitlyInheritedRoleClass/in/T.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameMethodInInterface/testUpdateImplementationInExplicitlyInheritedRoleClass/out/I.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameMethodInInterface/testUpdateImplementationInExplicitlyInheritedRoleClass/out/T.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameMethodInInterface/testUpdateImplementationInImplicitlyInheritedRoleClass/in/I.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameMethodInInterface/testUpdateImplementationInImplicitlyInheritedRoleClass/in/T1.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameMethodInInterface/testUpdateImplementationInImplicitlyInheritedRoleClass/in/T2.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameMethodInInterface/testUpdateImplementationInImplicitlyInheritedRoleClass/out/I.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameMethodInInterface/testUpdateImplementationInImplicitlyInheritedRoleClass/out/T1.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameMethodInInterface/testUpdateImplementationInImplicitlyInheritedRoleClass/out/T2.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameMethodInInterface/testUpdateImplementationInRoleClass/in/I.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameMethodInInterface/testUpdateImplementationInRoleClass/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameMethodInInterface/testUpdateImplementationInRoleClass/out/I.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameMethodInInterface/testUpdateImplementationInRoleClass/out/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testRenameFieldInRoleclass/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testRenameFieldInRoleclass/out/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testRenameFieldInTeamclass/in/T.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testRenameFieldInTeamclass/out/T.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testRenameGetterAndSetter1/in/T.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testRenameGetterAndSetter1/out/T.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testRenameGetterAndSetter2/in/T.java19
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testRenameGetterAndSetter2/out/T.java19
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testRenameGetterAndSetter3/in/T1.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testRenameGetterAndSetter3/in/T2.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testRenameGetterAndSetter4/in/T1.java19
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testRenameGetterAndSetter4/in/T2.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateFieldReferenceInLiftingMethod/in/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateFieldReferenceInLiftingMethod/in/T.java15
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateFieldReferenceInLiftingMethod/out/B.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateFieldReferenceInLiftingMethod/out/T.java15
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateFieldReferenceInRoleclass1/in/T.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateFieldReferenceInRoleclass1/out/T.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateFieldReferenceInRoleclass2/in/T.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateFieldReferenceInRoleclass2/out/T.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateFieldReferenceInRoleclass3/in/T.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateFieldReferenceInRoleclass3/out/T.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateFieldReferenceInTeamMethod/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateFieldReferenceInTeamMethod/out/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateReferenceInCalloutToField1/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateReferenceInCalloutToField1/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateReferenceInCalloutToField1/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateReferenceInCalloutToField1/out/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateReferenceInCalloutToField2/in/B1.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateReferenceInCalloutToField2/in/B2.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateReferenceInCalloutToField2/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateReferenceInCalloutToField2/out/B1.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateReferenceInCalloutToField2/out/B2.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateReferenceInCalloutToField2/out/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateReferenceInCalloutToField3/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateReferenceInCalloutToField3/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateReferenceInCalloutToField3/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateReferenceInCalloutToField3/out/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateReferenceInCalloutToField4/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateReferenceInCalloutToField4/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateReferenceInCalloutToField4/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateReferenceInCalloutToField4/out/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateTeamFieldReferenceInNestedTeam1/in/T.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateTeamFieldReferenceInNestedTeam1/out/T.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateTeamFieldReferenceInNestedTeam2/in/T.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateTeamFieldReferenceInNestedTeam2/out/T.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateTeamFieldReferenceInRoleclass1/in/T.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateTeamFieldReferenceInRoleclass1/out/T.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateTeamFieldReferenceInRoleclass2/in/T.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateField/testUpdateTeamFieldReferenceInRoleclass2/out/T.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test0/in/A.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test0/out/A.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test10/in/A.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test10/out/A.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test11/in/A.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test11/out/A.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test12/in/A.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test12/out/A.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test13/in/A.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test13/out/A.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test14/in/A.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test14/out/A.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test15/in/A.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test15/out/A.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test16/in/A.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test16/out/A.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test17/in/A.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test17/out/A.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test18/in/A.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test18/in/C.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test18/out/A.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test18/out/C.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test2/in/A.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test2/out/A.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test20/in/A.java23
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test20/out/A.java23
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test23/in/A.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test23/out/A.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test24/in/A.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test24/out/A.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test25/in/A.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test25/out/A.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test26/in/A.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test26/out/A.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test27/in/A.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/test27/out/A.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testAnon0/in/A.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testAnon0/out/A.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testFail0/in/A.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testFail1/in/A.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testFail2/in/A.java20
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testFail5/in/A.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testPrivateMethodInTeamclass/in/T.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testPrivateMethodInTeamclass/out/T.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testUpdatePrivateTeamMethodInvocation1/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testUpdatePrivateTeamMethodInvocation1/out/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testUpdatePrivateTeamMethodInvocation2/in/B1.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testUpdatePrivateTeamMethodInvocation2/in/T.java15
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testUpdatePrivateTeamMethodInvocation2/out/B1.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testUpdatePrivateTeamMethodInvocation2/out/T.java15
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testUpdateReferenceInCallinBinding1/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testUpdateReferenceInCallinBinding1/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testUpdateReferenceInCallinBinding1/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testUpdateReferenceInCallinBinding1/out/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testUpdateReferenceInCallinBinding2/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testUpdateReferenceInCallinBinding2/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testUpdateReferenceInCallinBinding2/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testUpdateReferenceInCallinBinding2/out/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testUpdateReferenceInCalloutBinding1/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testUpdateReferenceInCalloutBinding1/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testUpdateReferenceInCalloutBinding1/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testUpdateReferenceInCalloutBinding1/out/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testUpdateReferenceInCalloutBinding2/in/B.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testUpdateReferenceInCalloutBinding2/in/T.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testUpdateReferenceInCalloutBinding2/out/B.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenamePrivateMethod/testUpdateReferenceInCalloutBinding2/out/T.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test0/in/A.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test0/out/A.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test1/in/A.java18
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test1/out/A.java18
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test10/in/A.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test10/in/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test10/out/A.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test10/out/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test11/in/A.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test11/in/B.java19
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test11/out/A.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test11/out/B.java19
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test2/in/A.java39
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test2/out/A.java39
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test3/in/A.java15
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test3/out/A.java15
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test4/in/A.java15
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test4/out/A.java15
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test5/in/A.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test5/out/A.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test6/in/A.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test6/out/A.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test7/in/A.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test7/out/A.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test8/in/A.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test8/out/A.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test9/in/A.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/test9/out/A.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/testFail0/in/A.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/testFail1/in/A.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/testFail2/in/A.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/testFail4/in/A.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/testFail5/in/A.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/testFail6/in/A.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/testFail7/in/A.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameStaticMethod/testFail8/in/A.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testEnclosedNestedTeamHasNewName/in/B.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testEnclosedRoleHasNewName/in/B.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testEnclosedRoleInNestedTeamHasNewName/in/B.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testEnclosingNestedTeamHasNewName/in/B.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testEnclosingTeamHasNewName/in/B.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testImplicitOverridingInSubTeam/in/T.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testImplicitOverridingInSubTeam/in/TSub.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testImplicitOverridingInSuperTeam/in/T.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testImplicitOverridingInSuperTeam/in/TSuper.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testImplicitOverridingWithRoleFile1/in/R1.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testImplicitOverridingWithRoleFile1/in/T1.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testImplicitOverridingWithRoleFile1/in/T2.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testImplicitOverridingWithRoleFile2/in/R1.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testImplicitOverridingWithRoleFile2/in/T.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testImplicitOverridingWithRoleFile2/in/T1.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testNameClashInSameTeam/in/T.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testNameClashWithRoleFile/in/R2.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testNameClashWithRoleFile/in/T1.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testNameConflictInSubclass/in/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testNameConflictInSubclass/in/T2.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testNameConflictInSuperclass/in/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testNameConflictInSuperclass/in/T2.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testNameConflictWithRegularClass1/in/A.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testNameConflictWithRegularClass1/in/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testNameConflictWithRegularClass1/in/T2.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testNameConflictWithRegularClass2/in/A.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testNameConflictWithRegularClass2/in/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSubRoles1/in/T1.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSubRoles1/in/T2.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSubRoles1/in/T3.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSubRoles1/in/T4.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSubRoles1/in/T5.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSubRoles1/in/T6.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSubRoles1/in/T7.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSubRoles1/in/T8.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSubRoles1/out/T1.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSubRoles1/out/T2.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSubRoles1/out/T3.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSubRoles1/out/T4.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSubRoles1/out/T5.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSubRoles1/out/T6.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSubRoles1/out/T7.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSubRoles1/out/T8.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSubRoles2/in/T1.java18
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSubRoles2/in/T2.java32
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSubRoles2/out/T1.java18
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSubRoles2/out/T2.java32
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSuperRoles1/in/T1.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSuperRoles1/in/T2.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSuperRoles1/in/T3.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSuperRoles1/in/T4.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSuperRoles1/in/T5.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSuperRoles1/in/T6.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSuperRoles1/in/T7.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSuperRoles1/in/T8.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSuperRoles1/out/T1.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSuperRoles1/out/T2.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSuperRoles1/out/T3.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSuperRoles1/out/T4.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSuperRoles1/out/T5.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSuperRoles1/out/T6.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSuperRoles1/out/T7.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSuperRoles1/out/T8.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSuperRoles2/in/T1.java18
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSuperRoles2/in/T2.java32
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSuperRoles2/out/T1.java18
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameImplicitSuperRoles2/out/T2.java32
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameInnermostRole/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameInnermostRole/out/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameNestedTeamclass/in/T.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameNestedTeamclass/out/T.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameRoleclass/in/T.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameRoleclass/out/T.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameRoleclassLiteralInPredicate/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameRoleclassLiteralInPredicate/out/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameRoleclassPrecedence/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameRoleclassPrecedence/out/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameTeamclass/in/T1.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testRenameTeamclass/out/T2.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testShadowedName1/in/T.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testShadowedName2/in/T.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testShadowedNameOfSubType1/in/T1.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testShadowedNameOfSubType1/in/T2.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testShadowedNameOfSubType2/in/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testShadowedNameOfSubType2/in/T2.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testShadowedNameOfSuperType1/in/T1.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testShadowedNameOfSuperType1/in/T2.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testShadowedNameOfSuperType2/in/T1.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testShadowedNameOfSuperType2/in/T2.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testShadowedNameRoleFile1/in/R1.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testShadowedNameRoleFile1/in/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testShadowedNameRoleFile2/in/R2.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testShadowedNameRoleFile2/in/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testShadowedNameRoleFile3/in/R1.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testShadowedNameRoleFile3/in/T1.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testShadowedNameRoleFile3/in/T2.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testShadowedNameRoleFile4/in/RT.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testShadowedNameRoleFile4/in/T1.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testShadowedNameRoleFile4/in/T2.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testShadowedNameRoleFile5/in/RT.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testShadowedNameRoleFile5/in/T1.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testShadowedNameRoleFile5/in/T2.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testShadowedNameRoleFile6/in/R2.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testShadowedNameRoleFile6/in/T1.java4
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testShadowedNameRoleFile6/in/T2.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateImplicitSubRoles/in/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateImplicitSubRoles/in/T2.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateImplicitSubRoles/out/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateImplicitSubRoles/out/T2.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateImplicitSuperRoles/in/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateImplicitSuperRoles/in/T2.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateImplicitSuperRoles/out/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateImplicitSuperRoles/out/T2.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdatePhantomTypeReference/in/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdatePhantomTypeReference/in/T2.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdatePhantomTypeReference/in/T3.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdatePhantomTypeReference/out/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdatePhantomTypeReference/out/T2.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdatePhantomTypeReference/out/T3.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceInTeamPackage1/in/R1.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceInTeamPackage1/in/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceInTeamPackage1/out/R1.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceInTeamPackage1/out/T2.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceInTeamPackage2/in/R1.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceInTeamPackage2/in/R2.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceInTeamPackage2/in/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceInTeamPackage2/out/R1.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceInTeamPackage2/out/R2.java5
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceInTeamPackage2/out/T2.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceUsingTypeAnchor1/in/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceUsingTypeAnchor1/in/T2.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceUsingTypeAnchor1/out/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceUsingTypeAnchor1/out/T2.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceUsingTypeAnchor2/in/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceUsingTypeAnchor2/in/T2.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceUsingTypeAnchor2/out/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceUsingTypeAnchor2/out/T2.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceUsingTypeAnchor3/in/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceUsingTypeAnchor3/in/T2.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceUsingTypeAnchor3/out/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceUsingTypeAnchor3/out/T2.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceUsingTypeAnchor4/in/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceUsingTypeAnchor4/in/T2.java15
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceUsingTypeAnchor4/out/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceUsingTypeAnchor4/out/T2.java15
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceUsingTypeAnchor5/in/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceUsingTypeAnchor5/in/T2.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceUsingTypeAnchor5/out/T1.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferenceUsingTypeAnchor5/out/T2.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferencesToInnermostRole/in/T.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferencesToInnermostRole/out/T.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferencesToNestedTeamclass/in/T.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferencesToNestedTeamclass/out/T.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferencesToRoleclass/in/T.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferencesToRoleclass/out/T.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferencesToTeamclass/in/T1.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameType/testUpdateReferencesToTeamclass/out/T2.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testRenamePrivateAbstractMethodInRoleclass/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testRenamePrivateAbstractMethodInRoleclass/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testRenamePrivateAbstractMethodInRoleclass/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testRenamePrivateAbstractMethodInRoleclass/out/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testRenamePrivateMethodInNestedTeam/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testRenamePrivateMethodInNestedTeam/out/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testRenamePrivateMethodInRoleclass/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testRenamePrivateMethodInRoleclass/out/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateDeclarationOfOverridingRoleMethod/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateDeclarationOfOverridingRoleMethod/in/T.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateDeclarationOfOverridingRoleMethod/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateDeclarationOfOverridingRoleMethod/out/T.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateImplicitlyInheritedAndOverridingPrivateMethod1/in/T1.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateImplicitlyInheritedAndOverridingPrivateMethod1/in/T2.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateImplicitlyInheritedAndOverridingPrivateMethod1/out/T1.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateImplicitlyInheritedAndOverridingPrivateMethod1/out/T2.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateImplicitlyInheritedAndOverridingPrivateMethod2/in/T1.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateImplicitlyInheritedAndOverridingPrivateMethod2/in/T2.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateImplicitlyInheritedAndOverridingPrivateMethod2/out/T1.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateImplicitlyInheritedAndOverridingPrivateMethod2/out/T2.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateMethodToCauseAmbiguousCallinBinding1/in/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateMethodToCauseAmbiguousCallinBinding1/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateMethodToCauseAmbiguousCallinBinding2/in/B.java7
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateMethodToCauseAmbiguousCallinBinding2/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceInFieldInitializationInRole/in/B.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceInFieldInitializationInRole/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceInFieldInitializationInRole/out/B.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceInFieldInitializationInRole/out/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceInFieldInitializationInTeam/in/B.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceInFieldInitializationInTeam/in/T.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceInFieldInitializationInTeam/out/B.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceInFieldInitializationInTeam/out/T.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceInRoleMethod/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceInRoleMethod/in/T.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceInRoleMethod/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceInRoleMethod/out/T.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceInTeamMethod/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceInTeamMethod/in/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceInTeamMethod/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceInTeamMethod/out/T.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInCallinBinding/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInCallinBinding/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInCallinBinding/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInCallinBinding/out/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInCallinBindings1/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInCallinBindings1/in/T.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInCallinBindings1/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInCallinBindings1/out/T.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInCallinBindings2/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInCallinBindings2/in/T1.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInCallinBindings2/in/T2.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInCallinBindings2/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInCallinBindings2/out/T1.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInCallinBindings2/out/T2.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInCalloutBinding1/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInCalloutBinding1/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInCalloutBinding1/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInCalloutBinding1/out/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInCalloutBinding2/in/B.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInCalloutBinding2/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInCalloutBinding2/out/B.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInCalloutBinding2/out/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInExplicitlyOverriddenCalloutBinding/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInExplicitlyOverriddenCalloutBinding/in/T.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInExplicitlyOverriddenCalloutBinding/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInExplicitlyOverriddenCalloutBinding/out/T.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInImplicitlyOverriddenCalloutBinding/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInImplicitlyOverriddenCalloutBinding/in/T1.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInImplicitlyOverriddenCalloutBinding/in/T2.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInImplicitlyOverriddenCalloutBinding/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInImplicitlyOverriddenCalloutBinding/out/T1.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToBaseMethodInImplicitlyOverriddenCalloutBinding/out/T2.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethod/in/S.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethod/in/T.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethod/out/S.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethod/out/T.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBinding/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBinding/in/S.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBinding/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBinding/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBinding/out/S.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBinding/out/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBindingOfImplicitSubrole/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBindingOfImplicitSubrole/in/S.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBindingOfImplicitSubrole/in/T1.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBindingOfImplicitSubrole/in/T2.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBindingOfImplicitSubrole/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBindingOfImplicitSubrole/out/S.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBindingOfImplicitSubrole/out/T1.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBindingOfImplicitSubrole/out/T2.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBindings1/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBindings1/in/S.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBindings1/in/T.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBindings1/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBindings1/out/S.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBindings1/out/T.java16
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBindings2/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBindings2/in/S.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBindings2/in/T1.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBindings2/in/T2.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBindings2/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBindings2/out/S.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBindings2/out/T1.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCallinBindings2/out/T2.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCalloutBindingOfImplicitSubrole/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCalloutBindingOfImplicitSubrole/in/S.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCalloutBindingOfImplicitSubrole/in/T1.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCalloutBindingOfImplicitSubrole/in/T2.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCalloutBindingOfImplicitSubrole/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCalloutBindingOfImplicitSubrole/out/S.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCalloutBindingOfImplicitSubrole/out/T1.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInCalloutBindingOfImplicitSubrole/out/T2.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInExplicitlyOverriddenCalloutBinding/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInExplicitlyOverriddenCalloutBinding/in/S.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInExplicitlyOverriddenCalloutBinding/in/T.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInExplicitlyOverriddenCalloutBinding/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInExplicitlyOverriddenCalloutBinding/out/S.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInExplicitlyOverriddenCalloutBinding/out/T.java14
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInImplicitlyOverriddenCalloutBinding/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInImplicitlyOverriddenCalloutBinding/in/S.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInImplicitlyOverriddenCalloutBinding/in/T1.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInImplicitlyOverriddenCalloutBinding/in/T2.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInImplicitlyOverriddenCalloutBinding/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInImplicitlyOverriddenCalloutBinding/out/S.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInImplicitlyOverriddenCalloutBinding/out/T1.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInImplicitlyOverriddenCalloutBinding/out/T2.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInTsuperCall/in/S.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInTsuperCall/in/T1.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInTsuperCall/in/T2.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInTsuperCall/out/S.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInTsuperCall/out/T1.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToOverridingRoleMethodInTsuperCall/out/T2.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToPrivateRoleMethodInCallinBinding/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToPrivateRoleMethodInCallinBinding/in/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToPrivateRoleMethodInCallinBinding/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToPrivateRoleMethodInCallinBinding/out/T.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToPrivateRoleMethodInCalloutBinding/in/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToPrivateRoleMethodInCalloutBinding/in/T1.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToPrivateRoleMethodInCalloutBinding/in/T2.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToPrivateRoleMethodInCalloutBinding/out/B.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToPrivateRoleMethodInCalloutBinding/out/T1.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/testdata/RenameVirtualMethodInClass/testUpdateReferenceToPrivateRoleMethodInCalloutBinding/out/T2.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/ExtractMethodRefactoringUtil/.classpath11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/ExtractMethodRefactoringUtil/.project18
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/ExtractMethodRefactoringUtil/src/roleAndBaseHierarchy1/A.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/ExtractMethodRefactoringUtil/src/roleAndBaseHierarchy1/B.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/ExtractMethodRefactoringUtil/src/roleAndBaseHierarchy1/C.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/ExtractMethodRefactoringUtil/src/roleAndBaseHierarchy1/Q.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/ExtractMethodRefactoringUtil/src/roleAndBaseHierarchy1/S.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/ExtractMethodRefactoringUtil/src/roleAndBaseHierarchy1/T1.java11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/ExtractMethodRefactoringUtil/src/roleAndBaseHierarchy1/T2.java19
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/ExtractMethodRefactoringUtil/src/roleAndBaseHierarchy1/T3.java24
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/RefactoringUtil/.classpath11
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/RefactoringUtil/.project18
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/RefactoringUtil/src/rolehierarchy1/A.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/RefactoringUtil/src/rolehierarchy1/AA.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/RefactoringUtil/src/rolehierarchy1/B.java9
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/RefactoringUtil/src/rolehierarchy1/C.java13
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/RefactoringUtil/src/rolehierarchy1/ITest1.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/RefactoringUtil/src/rolehierarchy1/ITest2.java6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/RefactoringUtil/src/rolehierarchy1/Team1.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/RefactoringUtil/src/rolehierarchy1/Team2.java17
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/RefactoringUtil/src/rolehierarchy1/Team3.java12
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/workspace/RefactoringUtil/src/rolehierarchy1/Team4.java14
1234 files changed, 20591 insertions, 0 deletions
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/.classpath b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/.classpath
new file mode 100644
index 000000000..484824984
--- /dev/null
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/.cvsignore b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/.cvsignore
new file mode 100644
index 000000000..092357e47
--- /dev/null
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/.cvsignore
@@ -0,0 +1 @@
+bin
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/.project b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/.project
new file mode 100644
index 000000000..f658ae38d
--- /dev/null
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.objectteams.otdt.ui.tests.refactoring</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/META-INF/MANIFEST.MF b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..96a7953cf
--- /dev/null
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/META-INF/MANIFEST.MF
@@ -0,0 +1,33 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: OT Refactoring Test Plug-in
+Bundle-SymbolicName: org.eclipse.objectteams.otdt.ui.tests.refactoring;singleton:=true
+Bundle-Version: 1.3.0
+Bundle-ClassPath: otrefactoringtests.jar
+Bundle-Activator: org.eclipse.objectteams.otdt.ui.tests.refactoring.OTRefactoringTestPlugin
+Bundle-Vendor: The TOPPrax consortium
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.jdt.core,
+ org.eclipse.jdt.ui,
+ org.eclipse.ui,
+ org.eclipse.ui.ide,
+ org.eclipse.jface.text,
+ org.eclipse.ltk.core.refactoring,
+ org.junit,
+ org.eclipse.jdt.core.tests.compiler,
+ org.eclipse.jdt.ui.tests.refactoring,
+ org.eclipse.objectteams.otdt.ui.tests,
+ org.eclipse.objectteams.otdt.tests,
+ org.eclipse.test.performance,
+ org.eclipse.objectteams.otdt.refactoring,
+ org.eclipse.jdt.core.manipulation,
+ org.eclipse.jdt.ui.tests
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.objectteams.otdt.ui.tests.refactoring,
+ org.eclipse.objectteams.otdt.ui.tests.refactoring.extractmethod,
+ org.eclipse.objectteams.otdt.ui.tests.refactoring.move,
+ org.eclipse.objectteams.otdt.ui.tests.refactoring.rename,
+ org.eclipse.objectteams.otdt.ui.tests.refactoring.reorg,
+ org.eclipse.objectteams.otdt.ui.tests.refactoring.requiredfeatures,
+ org.eclipse.objectteams.otdt.ui.tests.refactoring.util
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/build.properties b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/build.properties
new file mode 100644
index 000000000..ba5e58018
--- /dev/null
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/build.properties
@@ -0,0 +1,13 @@
+source.otrefactoringtests.jar = src/
+output.otrefactoringtests.jar = bin/
+bin.includes = plugin.xml,\
+ otrefactoringtests.jar,\
+ testdata/,\
+ testresources/,\
+ test.xml,\
+ META-INF/,\
+ workspace/,\
+ JCL/
+src.includes = build.properties,\
+ .project,\
+ .classpath
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/plugin.xml b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/plugin.xml
new file mode 100644
index 000000000..66586ffa9
--- /dev/null
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/plugin.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+</plugin>
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/AllTests.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/AllTests.java
new file mode 100644
index 000000000..75062084a
--- /dev/null
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/AllTests.java
@@ -0,0 +1,78 @@
+/**********************************************************************
+ * This file is part of "Object Teams Development Tooling"-Software
+ *
+ * Copyright 2004, 2010 Fraunhofer Gesellschaft, Munich, Germany,
+ * for its Fraunhofer Institute and Computer Architecture and Software
+ * Technology (FIRST), Berlin, Germany and Technical University Berlin,
+ * Germany.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * $Id$
+ *
+ * Please visit http://www.eclipse.org/objectteams for updates and contact.
+ *
+ * Contributors:
+ * Fraunhofer FIRST - Initial API and implementation
+ * Technical University Berlin - Initial API and implementation
+ **********************************************************************/
+package org.eclipse.objectteams.otdt.ui.tests.refactoring;
+
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author brcan
+ *
+ * Runs all OT-specific refactoring tests and corresponding eclipse refactoring tests
+ */
+public class AllTests
+{
+
+ public static void main(String[] args)
+ {
+ junit.textui.TestRunner.run(AllTests.suite());
+ }
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite(
+ "All Refactoring Tests");
+
+ // OTDT refactoring tests
+ // rename
+ suite.addTest(org.eclipse.objectteams.otdt.ui.tests.refactoring.rename.RenameMethodInInterfaceTests.suite());
+ suite.addTest(org.eclipse.objectteams.otdt.ui.tests.refactoring.rename.RenamePrivateMethodTests.suite());
+ suite.addTest(org.eclipse.objectteams.otdt.ui.tests.refactoring.rename.RenameStaticMethodTests.suite());
+ suite.addTest(org.eclipse.objectteams.otdt.ui.tests.refactoring.rename.RenameVirtualMethodInClassTests.suite());
+ suite.addTest(org.eclipse.objectteams.otdt.ui.tests.refactoring.rename.RenamePrivateFieldTests.suite());
+ suite.addTest(org.eclipse.objectteams.otdt.ui.tests.refactoring.rename.RenameTypeTests.suite());
+
+ // move
+ suite.addTest(org.eclipse.objectteams.otdt.ui.tests.refactoring.move.MoveInstanceMethodTests.suite());
+ suite.addTest(org.eclipse.objectteams.otdt.ui.tests.refactoring.move.MoveStaticMethodTests.suite());
+
+ //extract
+ suite.addTest(org.eclipse.objectteams.otdt.ui.tests.refactoring.extractmethod.ExtractMethodTests.suite());
+ suite.addTest(org.eclipse.objectteams.otdt.ui.tests.refactoring.extractmethod.ExtractMethodRefactoringUtilTests.suite());
+ suite.addTest(org.eclipse.objectteams.otdt.ui.tests.refactoring.extractmethod.ExtractTempTests.suite());
+
+ //copy & paste, delete (cut)
+ suite.addTest(org.eclipse.objectteams.otdt.ui.tests.refactoring.reorg.OTCopyToClipboardTests.suite());
+ suite.addTest(org.eclipse.objectteams.otdt.ui.tests.refactoring.reorg.OTDeleteTests.suite());
+ suite.addTest(org.eclipse.objectteams.otdt.ui.tests.refactoring.reorg.OTPasteActionTest.suite());
+
+ // pull & push
+ suite.addTest(org.eclipse.objectteams.otdt.ui.tests.refactoring.pullup.PullUpTests.suite());
+ suite.addTest(org.eclipse.objectteams.otdt.ui.tests.refactoring.pushdown.PushDownTests.suite());
+
+ // ot refactorings
+ suite.addTest(org.eclipse.objectteams.otdt.ui.tests.refactoring.inlinecallin.InlineCallinTests.suite());
+ suite.addTest(org.eclipse.objectteams.otdt.ui.tests.refactoring.extractcallin.ExtractCallinTests.suite());
+
+ return suite;
+ }
+}
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/FileBasedRefactoringTest.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/FileBasedRefactoringTest.java
new file mode 100644
index 000000000..e17c59b10
--- /dev/null
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/FileBasedRefactoringTest.java
@@ -0,0 +1,37 @@
+/**********************************************************************
+ * This file is part of "Object Teams Development Tooling"-Software
+ *
+ * Copyright 2004, 2010 Fraunhofer Gesellschaft, Munich, Germany,
+ * for its Fraunhofer Institute and Computer Architecture and Software
+ * Technology (FIRST), Berlin, Germany and Technical University Berlin,
+ * Germany.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * $Id$
+ *
+ * Please visit http://www.eclipse.org/objectteams for updates and contact.
+ *
+ * Contributors:
+ * Fraunhofer FIRST - Initial API and implementation
+ * Technical University Berlin - Initial API and implementation
+ **********************************************************************/
+package org.eclipse.objectteams.otdt.ui.tests.refactoring;
+
+import org.eclipse.objectteams.otdt.tests.FileBasedTest;
+
+/**
+ * @author svacina
+ */
+public class FileBasedRefactoringTest extends FileBasedTest {
+
+ public FileBasedRefactoringTest(String name) {
+ super(name);
+ }
+
+ protected String getPluginID() {
+ return "org.eclipse.objectteams.otdt.ui.tests.refactoring";
+ }
+}
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/MySetup.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/MySetup.java
new file mode 100644
index 000000000..a7af2761b
--- /dev/null
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/MySetup.java
@@ -0,0 +1,122 @@
+/**********************************************************************
+ * This file is part of "Object Teams Development Tooling"-Software
+ *
+ * Copyright 2004, 2010 Fraunhofer Gesellschaft, Munich, Germany,
+ * for its Fraunhofer Institute and Computer Architecture and Software
+ * Technology (FIRST), Berlin, Germany and Technical University Berlin,
+ * Germany.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * $Id$
+ *
+ * Please visit http://www.eclipse.org/objectteams for updates and contact.
+ *
+ * Contributors:
+ * Fraunhofer FIRST - Initial API and implementation
+ * Technical University Berlin - Initial API and implementation
+ **********************************************************************/
+package org.eclipse.objectteams.otdt.ui.tests.refactoring;
+
+import java.util.Hashtable;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IPackageFragment;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
+import org.eclipse.jdt.internal.corext.codemanipulation.StubUtility;
+import org.eclipse.jdt.internal.corext.template.java.CodeTemplateContextType;
+import org.eclipse.jdt.internal.ui.JavaPlugin;
+import org.eclipse.objectteams.otdt.ui.tests.util.JavaProjectHelper;
+import org.eclipse.objectteams.otdt.ui.tests.util.TestOptions;
+
+public class MySetup extends TestSetup
+{
+ private static IPackageFragmentRoot _root;
+ private static IPackageFragment _packageP;
+ private static IJavaProject _javaTestProject;
+
+ public static final String CONTAINER = "src";
+
+
+ public MySetup(Test test)
+ {
+ super(test);
+ }
+
+ public static IPackageFragmentRoot getDefaultSourceFolder() throws Exception
+ {
+ if (_root != null)
+ {
+ return _root;
+ }
+ throw new Exception("MySetup not initialized");
+ }
+
+ public static IJavaProject getProject() throws Exception
+ {
+ if (_javaTestProject != null)
+ {
+ return _javaTestProject;
+ }
+ throw new Exception("MySetup not initialized");
+ }
+
+ public static IPackageFragment getPackageP() throws Exception
+ {
+ if (_packageP != null)
+ {
+ return _packageP;
+ }
+ throw new Exception("MySetup not initialized");
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ JavaProjectHelper.setAutoBuilding(false);
+ if (JavaPlugin.getActivePage() != null)
+ {
+ JavaPlugin.getActivePage().close();
+ }
+ _javaTestProject = JavaProjectHelper.createOTJavaProject("TestProject"
+ + System.currentTimeMillis(), "bin");
+ JavaProjectHelper.addRTJar(_javaTestProject);
+ _root = JavaProjectHelper.addSourceContainer(_javaTestProject,
+ CONTAINER);
+ _packageP = _root.createPackageFragment("p", true, null);
+
+ Hashtable options = TestOptions.getFormatterOptions();
+ options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.TAB);
+ options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "0");
+ options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
+ JavaCore.setOptions(options);
+ TestOptions.initializeCodeGenerationOptions();
+ JavaPlugin.getDefault().getCodeTemplateStore().load();
+
+ StringBuffer comment = new StringBuffer();
+ comment.append("/**\n");
+ comment.append(" * ${tags}\n");
+ comment.append(" */");
+ StubUtility.setCodeTemplate(CodeTemplateContextType.CONSTRUCTORCOMMENT_ID, comment.toString(), null);
+ }
+
+ protected void tearDown() throws Exception
+ {
+ if (_packageP.exists())
+ {
+ _packageP.delete(true, null);
+ }
+ JavaProjectHelper.removeSourceContainer(_javaTestProject, CONTAINER);
+ JavaProjectHelper.delete(_javaTestProject);
+ super.tearDown();
+ }
+
+}
+
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/OTRefactoringTestPlugin.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/OTRefactoringTestPlugin.java
new file mode 100644
index 000000000..ba5484a6b
--- /dev/null
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/OTRefactoringTestPlugin.java
@@ -0,0 +1,83 @@
+/**********************************************************************
+ * This file is part of "Object Teams Development Tooling"-Software
+ *
+ * Copyright 2004, 2010 Fraunhofer Gesellschaft, Munich, Germany,
+ * for its Fraunhofer Institute and Computer Architecture and Software
+ * Technology (FIRST), Berlin, Germany and Technical University Berlin,
+ * Germany.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * $Id$
+ *
+ * Please visit http://www.eclipse.org/objectteams for updates and contact.
+ *
+ * Contributors:
+ * Fraunhofer FIRST - Initial API and implementation
+ * Technical University Berlin - Initial API and implementation
+ **********************************************************************/
+package org.eclipse.objectteams.otdt.ui.tests.refactoring;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Plugin;
+
+/**
+ * The main plugin class to be used in the desktop.
+ */
+public class OTRefactoringTestPlugin extends Plugin
+{
+ //The shared instance.
+ private static OTRefactoringTestPlugin plugin;
+
+ public OTRefactoringTestPlugin()
+ {
+ super();
+ plugin = this;
+ }
+
+ /**
+ * Returns the shared instance.
+ */
+ public static OTRefactoringTestPlugin getDefault()
+ {
+ return plugin;
+ }
+
+ public static IWorkspace getWorkspace()
+ {
+ return ResourcesPlugin.getWorkspace();
+ }
+
+ public File getFileInPlugin(IPath path)
+ {
+ try
+ {
+ URL installURL = new URL(getDefault().getBundle().getEntry("/"), path.toString());
+ URL localURL = Platform.asLocalURL(installURL);
+ return new File(localURL.getFile());
+ }
+ catch (IOException ex)
+ {
+ return null;
+ }
+ }
+
+ public InputStream getTestResourceStream(String fileName)
+ throws IOException
+ {
+ IPath path = new Path("testdata").append(fileName);
+ URL url = new URL(getDefault().getBundle().getEntry("/"), path.toString());
+ return url.openStream();
+ }
+} \ No newline at end of file
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/OTRefactoringTestSetup.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/OTRefactoringTestSetup.java
new file mode 100644
index 000000000..98436ac2c
--- /dev/null
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/OTRefactoringTestSetup.java
@@ -0,0 +1,42 @@
+/**********************************************************************
+ * This file is part of "Object Teams Development Tooling"-Software
+ *
+ * Copyright 2004, 2010 Fraunhofer Gesellschaft, Munich, Germany,
+ * for its Fraunhofer Institute and Computer Architecture and Software
+ * Technology (FIRST), Berlin, Germany and Technical University Berlin,
+ * Germany.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * $Id$
+ *
+ * Please visit http://www.eclipse.org/objectteams for updates and contact.
+ *
+ * Contributors:
+ * Fraunhofer FIRST - Initial API and implementation
+ * Technical University Berlin - Initial API and implementation
+ **********************************************************************/
+package org.eclipse.objectteams.otdt.ui.tests.refactoring;
+
+import junit.framework.Test;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.ui.tests.refactoring.RefactoringTestSetup;
+import org.eclipse.objectteams.otdt.ui.tests.util.JavaProjectHelper;
+
+@SuppressWarnings("restriction")
+public class OTRefactoringTestSetup extends RefactoringTestSetup {
+
+ public OTRefactoringTestSetup(Test test) {
+ super(test);
+ }
+
+//{ObjectTeams: changed project creation:
+ protected IJavaProject createJavaProject(String string, String string2) throws CoreException {
+ return JavaProjectHelper.createOTJavaProject("TestProject"+System.currentTimeMillis(), "bin");
+// SH}
+ }
+}
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/RefactoringTest.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/RefactoringTest.java
new file mode 100644
index 000000000..1e169f339
--- /dev/null
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/RefactoringTest.java
@@ -0,0 +1,667 @@
+/**********************************************************************
+ * This file is part of "Object Teams Development Tooling"-Software
+ *
+ * Copyright 2004, 2010 Fraunhofer Gesellschaft, Munich, Germany,
+ * for its Fraunhofer Institute and Computer Architecture and Software
+ * Technology (FIRST), Berlin, Germany and Technical University Berlin,
+ * Germany.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * $Id$
+ *
+ * Please visit http://www.eclipse.org/objectteams for updates and contact.
+ *
+ * Contributors:
+ * Fraunhofer FIRST - Initial API and implementation
+ * Technical University Berlin - Initial API and implementation
+ **********************************************************************/
+package org.eclipse.objectteams.otdt.ui.tests.refactoring;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringBufferInputStream;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IField;
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IMember;
+import org.eclipse.jdt.core.IMethod;
+import org.eclipse.jdt.core.IPackageFragment;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.ISourceManipulation;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.core.search.IJavaSearchConstants;
+import org.eclipse.jdt.core.search.ITypeNameRequestor;
+import org.eclipse.jdt.core.search.SearchEngine;
+import org.eclipse.jdt.core.search.SearchPattern;
+import org.eclipse.jdt.internal.corext.refactoring.util.JavaElementUtil;
+import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
+import org.eclipse.jdt.internal.corext.util.Strings;
+import org.eclipse.ltk.core.refactoring.Change;
+import org.eclipse.ltk.core.refactoring.CheckConditionsOperation;
+import org.eclipse.ltk.core.refactoring.CreateChangeOperation;
+import org.eclipse.ltk.core.refactoring.IUndoManager;
+import org.eclipse.ltk.core.refactoring.PerformChangeOperation;
+import org.eclipse.ltk.core.refactoring.Refactoring;
+import org.eclipse.ltk.core.refactoring.RefactoringCore;
+import org.eclipse.ltk.core.refactoring.RefactoringStatus;
+
+public abstract class RefactoringTest extends TestCase
+{
+ private IPackageFragmentRoot _root;
+ private IPackageFragment _packageP;
+
+ public boolean _isVerbose = false;
+
+ public static final String TEST_PATH_PREFIX = "";
+
+ protected static final String TEST_INPUT_INFIX = "/in/";
+ protected static final String TEST_OUTPUT_INFIX = "/out/";
+ protected static final String CONTAINER = "src";
+
+ public RefactoringTest(String name)
+ {
+ super(name);
+ }
+
+ protected void setUp() throws Exception
+ {
+ _root = MySetup.getDefaultSourceFolder();
+ _packageP = MySetup.getPackageP();
+
+ if (_isVerbose)
+ {
+ System.out
+ .println("\n---------------------------------------------");
+ System.out.println("\nTest:" + getClass() + "." + getName());
+ }
+ RefactoringCore.getUndoManager().flush();
+ }
+
+ protected void tearDown() throws Exception
+ {
+ refreshFromLocal();
+ performDummySearch();
+
+ if (getPackageP().exists())
+ {
+ tryDeletingAllJavaChildren(getPackageP());
+ tryDeletingAllNonJavaChildResources(getPackageP());
+ }
+
+ if (getRoot().exists())
+ {
+ IJavaElement[] packages = getRoot().getChildren();
+ for (int i = 0; i < packages.length; i++)
+ {
+ try
+ {
+ IPackageFragment pack = (IPackageFragment)packages[i];
+ if (!pack.equals(getPackageP()) && pack.exists()
+ && !pack.isReadOnly())
+ pack.delete(true, null);
+ }
+ catch (JavaModelException ex)
+ {
+ //try to delete'em all
+ ex.printStackTrace();
+ }
+ }
+ }
+ }
+
+ private void refreshFromLocal() throws CoreException
+ {
+ if (getRoot().exists())
+ {
+ getRoot().getResource().
+ refreshLocal(IResource.DEPTH_INFINITE, null);
+ }
+ else if (getPackageP().exists())//don't refresh package if root already refreshed
+ {
+ getPackageP().getResource().
+ refreshLocal(IResource.DEPTH_INFINITE, null);
+ }
+ }
+
+ private static void tryDeletingAllNonJavaChildResources(
+ IPackageFragment pack) throws JavaModelException
+ {
+ Object[] nonJavaKids = pack.getNonJavaResources();
+ for (int i = 0; i < nonJavaKids.length; i++)
+ {
+ if (nonJavaKids[i] instanceof IResource)
+ {
+ IResource resource = (IResource)nonJavaKids[i];
+ try
+ {
+ resource.delete(true, null);
+ }
+ catch (CoreException ex)
+ {
+ //try to delete'em all
+ ex.printStackTrace();
+ }
+ }
+ }
+ }
+
+ private static void tryDeletingAllJavaChildren(IPackageFragment pack)
+ throws JavaModelException
+ {
+ IJavaElement[] kids = pack.getChildren();
+ for (int i = 0; i < kids.length; i++)
+ {
+ if (kids[i] instanceof ISourceManipulation)
+ {
+ try
+ {
+ if (kids[i].exists() && !kids[i].isReadOnly())
+ ((ISourceManipulation)kids[i]).delete(true, null);
+ }
+ catch (JavaModelException ex)
+ {
+ //try to delete'em all
+ ex.printStackTrace();
+ }
+ }
+ }
+ }
+
+ protected IPackageFragmentRoot getRoot()
+ {
+ return _root;
+ }
+
+ protected IPackageFragment getPackageP()
+ {
+ return _packageP;
+ }
+
+ protected final RefactoringStatus performRefactoring(Refactoring ref)
+ throws Exception
+ {
+ return performRefactoring(ref, true);
+ }
+
+ protected final RefactoringStatus performRefactoring(Refactoring ref,
+ boolean providesUndo) throws Exception
+ {
+ performDummySearch();
+ IUndoManager undoManager = getUndoManager();
+ CreateChangeOperation create = new CreateChangeOperation(
+ new CheckConditionsOperation(ref,
+ CheckConditionsOperation.ALL_CONDITIONS),
+ RefactoringStatus.FATAL);
+ PerformChangeOperation perform = new PerformChangeOperation(create);
+ perform.setUndoManager(undoManager, ref.getName());
+ ResourcesPlugin.getWorkspace().run(perform, new NullProgressMonitor());
+ RefactoringStatus status = create.getConditionCheckingStatus();
+ if (!status.isOK())
+ {
+ return status;
+ }
+ assertTrue("Change wasn't executed", perform.changeExecuted());
+ Change undo = perform.getUndoChange();
+ if (providesUndo)
+ {
+ assertNotNull("Undo doesn't exist", undo);
+ assertTrue("Undo manager is empty", undoManager.anythingToUndo());
+ }
+ else
+ {
+ assertNull("Undo manager contains undo but shouldn't", undo);
+ }
+ return null;
+ }
+
+ protected final RefactoringStatus performRefactoringWithStatus(
+ Refactoring ref) throws Exception
+ {
+ performDummySearch();
+ CreateChangeOperation create = new CreateChangeOperation(
+ new CheckConditionsOperation(ref,
+ CheckConditionsOperation.ALL_CONDITIONS),
+ RefactoringStatus.FATAL);
+ PerformChangeOperation perform = new PerformChangeOperation(create);
+ perform.setUndoManager(RefactoringCore.getUndoManager(), ref.getName());
+ ResourcesPlugin.getWorkspace().run(perform, new NullProgressMonitor());
+ RefactoringStatus status = create.getConditionCheckingStatus();
+ if (status.hasFatalError())
+ {
+ return status;
+ }
+ assertTrue("Change wasn't executed", perform.changeExecuted());
+ return status;
+ }
+
+ protected void performDummySearch() throws Exception
+ {
+ performDummySearch(getPackageP());
+ }
+
+ protected final Change performChange(final Refactoring refactoring,
+ boolean storeUndo) throws Exception
+ {
+ CreateChangeOperation create = new CreateChangeOperation(refactoring);
+ PerformChangeOperation perform = new PerformChangeOperation(create);
+ if (storeUndo)
+ {
+ perform.setUndoManager(getUndoManager(), refactoring.getName());
+ }
+ ResourcesPlugin.getWorkspace().run(perform, new NullProgressMonitor());
+ assertTrue("Change wasn't executed", perform.changeExecuted());
+ return perform.getUndoChange();
+ }
+
+ protected final Change performChange(final Change change) throws Exception
+ {
+ PerformChangeOperation perform = new PerformChangeOperation(change);
+ ResourcesPlugin.getWorkspace().run(perform, new NullProgressMonitor());
+ assertTrue("Change wasn't executed", perform.changeExecuted());
+ return perform.getUndoChange();
+ }
+
+ protected IUndoManager getUndoManager()
+ {
+ IUndoManager undoManager = RefactoringCore.getUndoManager();
+ undoManager.flush();
+ return undoManager;
+ }
+
+ /** ************** helpers ***************** */
+ /** ** mostly not general, just shortcuts **** */
+
+ protected IType getType(ICompilationUnit cu, String name)
+ throws JavaModelException
+ {
+ IType[] types = cu.getAllTypes();
+ for (int i = 0; i < types.length; i++)
+ {
+ if (types[i].getFullyQualifiedName().equals(name)
+ || types[i].getElementName().equals(name))
+ {
+ return types[i];
+ }
+ }
+ return null;
+ }
+
+ /**
+ * subclasses override to inform about the location of their test cases
+ */
+ protected String getRefactoringPath()
+ {
+ return "";
+ }
+
+ /**
+ * example "RenameType/"
+ */
+ protected String getTestPath()
+ {
+ return TEST_PATH_PREFIX + getRefactoringPath();
+ }
+
+ /**
+ * @param cuName
+ * @param infix
+ * example "RenameTest/test0 + infix + cuName.java"
+ */
+ protected String createTestFileName(String cuName, String infix)
+ {
+ return getTestPath() + getName() + infix + cuName + ".java";
+ }
+
+ protected String getInputTestFileName(String cuName)
+ {
+ return createTestFileName(cuName, TEST_INPUT_INFIX);
+ }
+
+ /**
+ * @param subDirName
+ * example "p/" or "org/eclipse/jdt/"
+ */
+ protected String getInputTestFileName(String cuName, String subDirName)
+ {
+ return createTestFileName(cuName, TEST_INPUT_INFIX + subDirName);
+ }
+
+ protected String getOutputTestFileName(String cuName)
+ {
+ return createTestFileName(cuName, TEST_OUTPUT_INFIX);
+ }
+
+ /**
+ * @param subDirName
+ * example "p/" or "org/eclipse/jdt/"
+ */
+ protected String getOutputTestFileName(String cuName, String subDirName)
+ {
+ return createTestFileName(cuName, TEST_OUTPUT_INFIX + subDirName);
+ }
+
+ protected ICompilationUnit createCUfromTestFile(IPackageFragment pack,
+ String cuName) throws Exception
+ {
+ return createCUfromTestFile(pack, cuName, true);
+ }
+
+ protected ICompilationUnit createCUfromTestFile(IPackageFragment pack,
+ String cuName, String subDirName) throws Exception
+ {
+ return createCUfromTestFile(pack, cuName, subDirName, true);
+ }
+
+ protected ICompilationUnit createCUfromTestFile(IPackageFragment pack,
+ String cuName, boolean input) throws Exception
+ {
+ String contents = input ? getFileContents(getInputTestFileName(cuName))
+ : getFileContents(getOutputTestFileName(cuName));
+ return createCU(pack, cuName + ".java", contents);
+ }
+
+ protected ICompilationUnit createCUfromTestFile(IPackageFragment pack,
+ String cuName, String subDirName, boolean input) throws Exception
+ {
+ String contents = input ? getFileContents(getInputTestFileName(cuName,
+ subDirName)) : getFileContents(getOutputTestFileName(cuName,
+ subDirName));
+
+ return createCU(pack, cuName + ".java", contents);
+ }
+
+ protected void printTestDisabledMessage(String explanation)
+ {
+ System.out.println("\n" + getClass().getName() + "::" + getName()
+ + " disabled (" + explanation + ")");
+ }
+
+ //-----------------------
+ public static InputStream getStream(String content)
+ {
+ return new StringBufferInputStream(content);
+ }
+
+ public static IPackageFragmentRoot getSourceFolder(
+ IJavaProject javaProject, String name) throws JavaModelException
+ {
+ IPackageFragmentRoot[] roots = javaProject.getPackageFragmentRoots();
+ for (int i = 0; i < roots.length; i++)
+ {
+ if (!roots[i].isArchive() && roots[i].getElementName().equals(name))
+ return roots[i];
+ }
+ return null;
+ }
+
+ public static String getFileContents(String fileName) throws IOException
+ {
+ return getContents(getFileInputStream(fileName));
+ }
+
+ public static String getContents(IFile file) throws IOException,
+ CoreException
+ {
+ return getContents(file.getContents());
+ }
+
+ public static ICompilationUnit createCU(IPackageFragment pack, String name,
+ String contents) throws Exception
+ {
+ if (pack.getCompilationUnit(name).exists())
+ {
+ return pack.getCompilationUnit(name);
+ }
+ ICompilationUnit cu = pack.createCompilationUnit(name, contents, true,
+ null);
+ cu.save(null, true);
+ return cu;
+ }
+
+ public static String getContents(InputStream in) throws IOException
+ {
+ BufferedReader br = new BufferedReader(new InputStreamReader(in));
+ StringBuffer sb = new StringBuffer(300);
+ try
+ {
+ int read = 0;
+ while ((read = br.read()) != -1)
+ {
+ sb.append((char)read);
+ }
+ }
+ finally
+ {
+ br.close();
+ }
+ return sb.toString();
+ }
+
+ public static InputStream getFileInputStream(String fileName)
+ throws IOException
+ {
+ return OTRefactoringTestPlugin.getDefault().getTestResourceStream(
+ fileName);
+ }
+
+ public static String removeExtension(String fileName)
+ {
+ return fileName.substring(0, fileName.lastIndexOf('.'));
+ }
+
+ public static void performDummySearch(IJavaElement element)
+ throws Exception
+ {
+ new SearchEngine().searchAllTypeNames(ResourcesPlugin.getWorkspace(),
+ null, null, SearchPattern.R_EXACT_MATCH, true,
+ IJavaSearchConstants.CLASS, SearchEngine
+ .createJavaSearchScope(new IJavaElement[] { element }),
+ new Requestor(),
+ IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH, null);
+ }
+
+ public static IMember[] merge(IMember[] a1, IMember[] a2, IMember[] a3)
+ {
+ return JavaElementUtil.merge(JavaElementUtil.merge(a1, a2), a3);
+ }
+
+ public static IMember[] merge(IMember[] a1, IMember[] a2)
+ {
+ return JavaElementUtil.merge(a1, a2);
+ }
+
+ public static IField[] getFields(IType type, String[] names)
+ throws JavaModelException
+ {
+ if (names == null)
+ {
+ return new IField[0];
+ }
+ Set fields = new HashSet();
+ for (int i = 0; i < names.length; i++)
+ {
+ IField field = type.getField(names[i]);
+ assertTrue("field " + field.getElementName() + " does not exist",
+ field.exists());
+ fields.add(field);
+ }
+ return (IField[])fields.toArray(new IField[fields.size()]);
+ }
+
+ public static IType[] getMemberTypes(IType type, String[] names)
+ throws JavaModelException
+ {
+ if (names == null)
+ {
+ return new IType[0];
+ }
+ Set memberTypes = new HashSet();
+ for (int i = 0; i < names.length; i++)
+ {
+ IType memberType = type.getType(names[i]);
+ assertTrue("member type " + memberType.getElementName()
+ + " does not exist", memberType.exists());
+ memberTypes.add(memberType);
+ }
+ return (IType[])memberTypes.toArray(new IType[memberTypes.size()]);
+ }
+
+ public static IMethod[] getMethods(IType type, String[] names,
+ String[][] signatures) throws JavaModelException
+ {
+ if (names == null || signatures == null)
+ {
+ return new IMethod[0];
+ }
+ List methods = new ArrayList(names.length);
+ for (int i = 0; i < names.length; i++)
+ {
+ IMethod method = type.getMethod(names[i], signatures[i]);
+ assertTrue("method " + method.getElementName() + " does not exist",
+ method.exists());
+ if (!methods.contains(method))
+ {
+ methods.add(method);
+ }
+ }
+ return (IMethod[])methods.toArray(new IMethod[methods.size()]);
+ }
+
+ public static IType[] findTypes(IType[] types, String[] namesOfTypesToPullUp)
+ {
+ List found = new ArrayList(types.length);
+ for (int i = 0; i < types.length; i++)
+ {
+ IType type = types[i];
+ for (int j = 0; j < namesOfTypesToPullUp.length; j++)
+ {
+ String name = namesOfTypesToPullUp[j];
+ if (type.getElementName().equals(name))
+ {
+ found.add(type);
+ }
+ }
+ }
+ return (IType[])found.toArray(new IType[found.size()]);
+ }
+
+ public static IField[] findFields(IField[] fields,
+ String[] namesOfFieldsToPullUp)
+ {
+ List found = new ArrayList(fields.length);
+ for (int i = 0; i < fields.length; i++)
+ {
+ IField field = fields[i];
+ for (int j = 0; j < namesOfFieldsToPullUp.length; j++)
+ {
+ String name = namesOfFieldsToPullUp[j];
+ if (field.getElementName().equals(name))
+ {
+ found.add(field);
+ }
+ }
+ }
+ return (IField[])found.toArray(new IField[found.size()]);
+ }
+
+ public static IMethod[] findMethods(IMethod[] selectedMethods,
+ String[] namesOfMethods, String[][] signaturesOfMethods)
+ {
+ List found = new ArrayList(selectedMethods.length);
+ for (int i = 0; i < selectedMethods.length; i++)
+ {
+ IMethod method = selectedMethods[i];
+ String[] paramTypes = method.getParameterTypes();
+ for (int j = 0; j < namesOfMethods.length; j++)
+ {
+ String methodName = namesOfMethods[j];
+ if (!methodName.equals(method.getElementName()))
+ {
+ continue;
+ }
+ String[] methodSig = signaturesOfMethods[j];
+ if (!areSameSignatures(paramTypes, methodSig))
+ {
+ continue;
+ }
+ found.add(method);
+ }
+ }
+ return (IMethod[])found.toArray(new IMethod[found.size()]);
+ }
+
+ private static boolean areSameSignatures(String[] s1, String[] s2)
+ {
+ if (s1.length != s2.length)
+ {
+ return false;
+ }
+ for (int i = 0; i < s1.length; i++)
+ {
+ if (!s1[i].equals(s2[i]))
+ {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Line-based version of junit.framework.Assert.assertEquals(String, String)
+ * without considering line delimiters.
+ */
+ public static void assertEqualLines(String expected, String actual)
+ {
+ assertEqualLines("", expected, actual);
+ }
+
+ /**
+ * Line-based version of junit.framework.Assert.assertEquals(String, String, String)
+ * without considering line delimiters.
+ */
+ public static void assertEqualLines(String message, String expected,
+ String actual)
+ {
+ String[] expectedLines = Strings.convertIntoLines(expected);
+ String[] actualLines = Strings.convertIntoLines(actual);
+
+ String expected2 = (expectedLines == null ? null : Strings.concatenate(
+ expectedLines, "\n"));
+ String actual2 = (actualLines == null ? null : Strings.concatenate(
+ actualLines, "\n"));
+ assertEquals(message, expected2, actual2);
+ }
+
+ private static class Requestor implements ITypeNameRequestor
+ {
+
+ public void acceptClass(char[] packageName, char[] simpleTypeName,
+ char[][] enclosingTypeNames, String path)
+ {
+ }
+
+ public void acceptInterface(char[] packageName, char[] simpleTypeName,
+ char[][] enclosingTypeNames, String path)
+ {
+ }
+ }
+}
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractcallin/AllTests.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractcallin/AllTests.java
new file mode 100644
index 000000000..182a5d0a0
--- /dev/null
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractcallin/AllTests.java
@@ -0,0 +1,44 @@
+/**********************************************************************
+ * This file is part of "Object Teams Development Tooling"-Software
+ *
+ * Copyright 2004, 2010 Fraunhofer Gesellschaft, Munich, Germany,
+ * for its Fraunhofer Institute and Computer Architecture and Software
+ * Technology (FIRST), Berlin, Germany and Technical University Berlin,
+ * Germany.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * $Id$
+ *
+ * Please visit http://www.eclipse.org/objectteams for updates and contact.
+ *
+ * Contributors:
+ * Fraunhofer FIRST - Initial API and implementation
+ * Technical University Berlin - Initial API and implementation
+ **********************************************************************/
+package org.eclipse.objectteams.otdt.ui.tests.refactoring.extractcallin;
+
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTests
+{
+
+ public static void main(String[] args)
+ {
+ junit.textui.TestRunner.run(AllTests.suite());
+ }
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite(
+ "All OT-ExtractCallin-Refactoring Tests");
+
+ suite.addTest(org.eclipse.objectteams.otdt.ui.tests.refactoring.extractcallin.ExtractCallinTests.suite());
+
+ return suite;
+ }
+}
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractcallin/ExtractCallinTests.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractcallin/ExtractCallinTests.java
new file mode 100644
index 000000000..084eeb7c5
--- /dev/null
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractcallin/ExtractCallinTests.java
@@ -0,0 +1,140 @@
+/**********************************************************************
+ * This file is part of "Object Teams Development Tooling"-Software
+ *
+ * Copyright 2004, 2010 Fraunhofer Gesellschaft, Munich, Germany,
+ * for its Fraunhofer Institute and Computer Architecture and Software
+ * Technology (FIRST), Berlin, Germany and Technical University Berlin,
+ * Germany.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * $Id$
+ *
+ * Please visit http://www.eclipse.org/objectteams for updates and contact.
+ *
+ * Contributors:
+ * Fraunhofer FIRST - Initial API and implementation
+ * Technical University Berlin - Initial API and implementation
+ **********************************************************************/
+package org.eclipse.objectteams.otdt.ui.tests.refactoring.extractcallin;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IMethod;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.ltk.core.refactoring.RefactoringStatus;
+import org.eclipse.objectteams.otdt.internal.core.CallinMapping;
+import org.eclipse.objectteams.otdt.internal.refactoring.otrefactorings.extractcallin.ExtractCallinRefactoring;
+import org.eclipse.objectteams.otdt.ui.tests.refactoring.MySetup;
+import org.eclipse.objectteams.otdt.ui.tests.refactoring.RefactoringTest;
+
+/**
+ * @author Johannes Gebauer
+ *
+ */
+@SuppressWarnings("restriction")
+public class ExtractCallinTests extends RefactoringTest {
+ private static final String REFACTORING_PATH = "ExtractCallin/";
+
+ public ExtractCallinTests(String name) {
+ super(name);
+ }
+
+ public static Test suite() {
+ return new MySetup(new TestSuite(ExtractCallinTests.class));
+ }
+
+ public static Test setUpTest(Test test) {
+ return new MySetup(test);
+ }
+
+ protected String getRefactoringPath() {
+ return REFACTORING_PATH;
+ }
+
+ private ICompilationUnit[] createCUs(String[] cuNames) throws Exception {
+ ICompilationUnit[] cus = new ICompilationUnit[cuNames.length];
+
+ for (int idx = 0; idx < cuNames.length; idx++) {
+ Assert.isNotNull(cuNames[idx]);
+ cus[idx] = createCUfromTestFile(getPackageP(), cuNames[idx]);
+ }
+ return cus;
+ }
+
+ private ExtractCallinRefactoring createExtractCallinRefactoring(IMethod baseMethod, IType role, int mappingKind) {
+ ExtractCallinRefactoring refactoring = new ExtractCallinRefactoring(baseMethod, role, mappingKind);
+ return refactoring;
+ }
+
+ private void performPullUp_pass(String[] cuNames, String baseMethodName, String[] baseMethodSignature, int mappingKind, boolean deleteRoleMethod,
+ String baseName, String roleName, boolean copyBaseMethod) throws Exception {
+ ICompilationUnit[] cus = createCUs(cuNames);
+ try {
+
+ IType baseType = getType(cus[0], baseName);
+ IType roleType = getType(cus[1], roleName);
+
+ IMethod baseMethod = baseType.getMethod(baseMethodName, baseMethodSignature);
+ assertTrue("base method " + baseMethod.getElementName() + " does not exist", baseMethod.exists());
+
+ ExtractCallinRefactoring ref = createExtractCallinRefactoring(baseMethod, roleType, mappingKind);
+
+ assertTrue("activation", ref.checkInitialConditions(new NullProgressMonitor()).isOK());
+
+ ref.setDeleteBaseMethod(deleteRoleMethod);
+
+ ref.setCopyBaseMethod(copyBaseMethod);
+
+ RefactoringStatus checkInputResult = ref.checkFinalConditions(new NullProgressMonitor());
+ assertTrue("precondition was supposed to pass", !checkInputResult.hasError());
+ performChange(ref, false);
+
+ for (int i = 0; i < cus.length; i++) {
+ String expected = getFileContents(getOutputTestFileName(cuNames[i]));
+ String actual = cus[i].getSource();
+ assertEqualLines(expected, actual);
+ }
+ } finally {
+ performDummySearch();
+ for (int i = 0; i < cus.length; i++) {
+ cus[i].delete(false, null);
+ }
+
+ }
+ }
+
+ /******* tests ******************/
+
+ /* Extract Callin Tests */
+
+ public void testExtractSimpleBeforeCallin() throws Exception {
+ performPullUp_pass(new String[] { "B", "T" }, "m", new String[0], CallinMapping.KIND_BEFORE, false, "B", "R", false);
+ }
+
+ public void testExtractSimpleReplaceCallin1() throws Exception {
+ performPullUp_pass(new String[] { "B", "T" }, "m", new String[0], CallinMapping.KIND_REPLACE, false, "B", "R", true);
+ }
+
+ public void testExtractSimpleAfterCallin() throws Exception {
+ performPullUp_pass(new String[] { "B", "T" }, "m", new String[0], CallinMapping.KIND_AFTER, false, "B", "R", false);
+ }
+
+ public void testExtractSimpleReplaceCallin2() throws Exception {
+ performPullUp_pass(new String[] { "B", "T" }, "m", new String[0], CallinMapping.KIND_REPLACE, false, "B", "R", false);
+ }
+
+ public void testExtractCallinWithParameter() throws Exception {
+ performPullUp_pass(new String[] { "B", "T" }, "m", new String[] { "I" }, CallinMapping.KIND_BEFORE, false, "B", "R", false);
+ }
+
+ public void testExtractCallinWithParameterMapping() throws Exception {
+ performPullUp_pass(new String[] { "B", "T" }, "m", new String[] { "I", "I" }, CallinMapping.KIND_BEFORE, false, "B", "R", false);
+ }
+}
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/AbstractSelectionTestCase.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/AbstractSelectionTestCase.java
new file mode 100644
index 000000000..91aaa55a7
--- /dev/null
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/AbstractSelectionTestCase.java
@@ -0,0 +1,200 @@
+/**********************************************************************
+ * This file is part of "Object Teams Development Tooling"-Software
+ *
+ * Copyright 2004, 2010 Fraunhofer Gesellschaft, Munich, Germany,
+ * for its Fraunhofer Institute and Computer Architecture and Software
+ * Technology (FIRST), Berlin, Germany and Technical University Berlin,
+ * Germany.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * $Id$
+ *
+ * Please visit http://www.eclipse.org/objectteams for updates and contact.
+ *
+ * Contributors:
+ * Fraunhofer FIRST - Initial API and implementation
+ * Technical University Berlin - Initial API and implementation
+ **********************************************************************/
+package org.eclipse.objectteams.otdt.ui.tests.refactoring.extractmethod;
+
+/**
+ * @author brcan
+ *
+ */
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IPackageFragment;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.ui.tests.refactoring.infra.AbstractCUTestCase;
+import org.eclipse.jface.text.ITextSelection;
+import org.eclipse.jface.text.TextSelection;
+import org.eclipse.ltk.core.refactoring.Change;
+import org.eclipse.ltk.core.refactoring.CheckConditionsOperation;
+import org.eclipse.ltk.core.refactoring.IUndoManager;
+import org.eclipse.ltk.core.refactoring.PerformRefactoringOperation;
+import org.eclipse.ltk.core.refactoring.Refactoring;
+import org.eclipse.ltk.core.refactoring.RefactoringCore;
+import org.eclipse.ltk.core.refactoring.RefactoringStatus;
+import org.eclipse.objectteams.otdt.ui.tests.refactoring.OTRefactoringTestPlugin;
+
+@SuppressWarnings({ "nls", "restriction" })
+public abstract class AbstractSelectionTestCase extends AbstractCUTestCase
+{
+ public static final String SQUARE_BRACKET_OPEN = "/*[*/";
+ public static final int SQUARE_BRACKET_OPEN_LENGTH = SQUARE_BRACKET_OPEN.length();
+ public static final String SQUARE_BRACKET_CLOSE = "/*]*/";
+ public static final int SQUARE_BRACKET_CLOSE_LENGTH = SQUARE_BRACKET_CLOSE.length();
+
+ protected static final int VALID_SELECTION = 1;
+ protected static final int INVALID_SELECTION = 2;
+ protected static final int COMPARE_WITH_OUTPUT = 3;
+
+ public AbstractSelectionTestCase(String name)
+ {
+ super(name);
+ }
+
+ protected int[] getSelection(String source)
+ {
+ int start = -1;
+ int end = -1;
+ int includingStart = source.indexOf(SQUARE_BRACKET_OPEN);
+ int excludingStart = source.indexOf(SQUARE_BRACKET_CLOSE);
+ int includingEnd = source.lastIndexOf(SQUARE_BRACKET_CLOSE);
+ int excludingEnd = source.lastIndexOf(SQUARE_BRACKET_OPEN);
+
+ if (includingStart > excludingStart && excludingStart != -1)
+ {
+ includingStart = -1;
+ }
+ else if (excludingStart > includingStart && includingStart != -1)
+ {
+ excludingStart = -1;
+ }
+
+ if (includingEnd < excludingEnd)
+ {
+ includingEnd = -1;
+ }
+ else if (excludingEnd < includingEnd)
+ {
+ excludingEnd = -1;
+ }
+
+ if (includingStart != -1)
+ {
+ start = includingStart;
+ }
+ else
+ {
+ start = excludingStart + SQUARE_BRACKET_CLOSE_LENGTH;
+ }
+
+ if (excludingEnd != -1)
+ {
+ end = excludingEnd;
+ }
+ else
+ {
+ end = includingEnd + SQUARE_BRACKET_CLOSE_LENGTH;
+ }
+
+ assertTrue("Selection invalid", start >= 0 && end >= 0 && end >= start);
+
+ int[] result = new int[] { start, end - start };
+ // System.out.println("|"+ source.substring(result[0], result[0] + result[1]) + "|");
+ return result;
+ }
+
+ protected ITextSelection getTextSelection(String source)
+ {
+ int[] s = getSelection(source);
+ return new TextSelection(s[0], s[1]);
+ }
+
+ protected InputStream getFileInputStream(String fileName) throws IOException
+ {
+ return OTRefactoringTestPlugin.getDefault().getTestResourceStream(fileName);
+ }
+
+//{ObjectTeams: fixing a JDT-problem: couldn't cope with package paths > 1
+ protected ICompilationUnit createCU(IPackageFragment pack, String name) throws Exception {
+ name= adaptName(name);
+ return createCU(pack, name, getFileInputStream(myGetFilePath(pack, name)));
+ }
+
+ protected String myGetFilePath(String path, String name) {
+ return getResourceLocation() + path + "/" + name;
+ }
+
+ protected String myGetFilePath(IPackageFragment pack, String name) {
+ return myGetFilePath(pack.getElementName().replace('.','/'), name); // <-- the patch: force the package path to use '/'
+ }
+// SH}
+
+ protected void performTest(
+ final ICompilationUnit unit,
+ final Refactoring refactoring,
+ int mode,
+ final String out,
+ boolean doUndo) throws Exception
+ {
+ IProgressMonitor pm = new NullProgressMonitor();
+ switch (mode)
+ {
+ case VALID_SELECTION:
+ assertTrue(checkPreconditions(refactoring, pm).isOK());
+ break;
+ case INVALID_SELECTION:
+ assertTrue(!checkPreconditions(refactoring, pm).isOK());
+ break;
+ case COMPARE_WITH_OUTPUT:
+ IUndoManager undoManager = RefactoringCore.getUndoManager();
+ undoManager.flush();
+ String original = unit.getSource();
+
+ PerformRefactoringOperation op = new PerformRefactoringOperation(
+ refactoring, getCheckingStyle());
+ JavaCore.run(op, new NullProgressMonitor());
+ assertTrue("Precondition check failed", !op.getConditionStatus().hasFatalError());
+ assertTrue("Validation check failed", !op.getValidationStatus().hasFatalError());
+ assertNotNull("No Undo", op.getUndoChange());
+ compareSource(unit.getSource(), out);
+ Change undo = op.getUndoChange();
+ assertNotNull("Undo doesn't exist", undo);
+ assertTrue("Undo manager is empty", undoManager.anythingToUndo());
+
+ if (doUndo)
+ {
+ undoManager.performUndo(null, new NullProgressMonitor());
+ assertTrue("Undo manager still has undo", !undoManager.anythingToUndo());
+ assertTrue("Undo manager is empty", undoManager.anythingToRedo());
+ compareSource(original, unit.getSource());
+ }
+ break;
+ }
+ }
+
+ protected RefactoringStatus checkPreconditions(
+ Refactoring refactoring,
+ IProgressMonitor pm) throws CoreException
+ {
+ CheckConditionsOperation op =
+ new CheckConditionsOperation(refactoring, getCheckingStyle());
+ op.run(new NullProgressMonitor());
+ return op.getStatus();
+ }
+
+ protected int getCheckingStyle()
+ {
+ return CheckConditionsOperation.ALL_CONDITIONS;
+ }
+}
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/AllTests.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/AllTests.java
new file mode 100644
index 000000000..44ac71b4e
--- /dev/null
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/AllTests.java
@@ -0,0 +1,50 @@
+/**********************************************************************
+ * This file is part of "Object Teams Development Tooling"-Software
+ *
+ * Copyright 2004, 2010 Fraunhofer Gesellschaft, Munich, Germany,
+ * for its Fraunhofer Institute and Computer Architecture and Software
+ * Technology (FIRST), Berlin, Germany and Technical University Berlin,
+ * Germany.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * $Id$
+ *
+ * Please visit http://www.eclipse.org/objectteams for updates and contact.
+ *
+ * Contributors:
+ * Fraunhofer FIRST - Initial API and implementation
+ * Technical University Berlin - Initial API and implementation
+ **********************************************************************/
+package org.eclipse.objectteams.otdt.ui.tests.refactoring.extractmethod;
+
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author brcan
+ *
+ * Runs all OT-specific refactoring tests and corresponding eclipse refactoring tests
+ */
+public class AllTests
+{
+
+ public static void main(String[] args)
+ {
+ junit.textui.TestRunner.run(AllTests.suite());
+ }
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite(
+ "All OT-Extract-Method-Refactoring Tests");
+
+ suite.addTest(org.eclipse.objectteams.otdt.ui.tests.refactoring.extractmethod.ExtractMethodTests.suite());
+ suite.addTest(org.eclipse.objectteams.otdt.ui.tests.refactoring.extractmethod.ExtractMethodRefactoringUtilTests.suite());
+ suite.addTest(org.eclipse.objectteams.otdt.ui.tests.refactoring.extractmethod.ExtractTempTests.suite());
+ return suite;
+ }
+}
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/ExtractMethodRefactoringUtilTests.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/ExtractMethodRefactoringUtilTests.java
new file mode 100644
index 000000000..720083b16
--- /dev/null
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/ExtractMethodRefactoringUtilTests.java
@@ -0,0 +1,388 @@
+/**********************************************************************
+ * This file is part of "Object Teams Development Tooling"-Software
+ *
+ * Copyright 2004, 2010 Fraunhofer Gesellschaft, Munich, Germany,
+ * for its Fraunhofer Institute and Computer Architecture and Software
+ * Technology (FIRST), Berlin, Germany and Technical University Berlin,
+ * Germany.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * $Id$
+ *
+ * Please visit http://www.eclipse.org/objectteams for updates and contact.
+ *
+ * Contributors:
+ * Fraunhofer FIRST - Initial API and implementation
+ * Technical University Berlin - Initial API and implementation
+ **********************************************************************/
+package org.eclipse.objectteams.otdt.ui.tests.refactoring.extractmethod;
+
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.Test;
+
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IMethod;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.internal.corext.Corext;
+import org.eclipse.jdt.internal.corext.refactoring.ParameterInfo;
+import org.eclipse.jdt.internal.corext.refactoring.code.ExtractMethodRefactoring;
+import org.eclipse.ltk.core.refactoring.RefactoringStatus;
+import org.eclipse.objectteams.otdt.core.IRoleType;
+import org.eclipse.objectteams.otdt.core.TypeHelper;
+import org.eclipse.objectteams.otdt.internal.refactoring.adaptor.extractmethod.ExtractMethodAmbuguityMsgCreator;
+import org.eclipse.objectteams.otdt.internal.refactoring.adaptor.extractmethod.ExtractMethodOverloadingMsgCreator;
+import org.eclipse.objectteams.otdt.internal.refactoring.corext.base.OTRefactoringStatusCodes;
+import org.eclipse.objectteams.otdt.internal.refactoring.util.RefactoringUtil;
+import org.eclipse.objectteams.otdt.ui.tests.refactoring.FileBasedRefactoringTest;
+
+/**
+ * @author brcan
+ *
+ */
+@SuppressWarnings( { "restriction", "nls" })
+public class ExtractMethodRefactoringUtilTests extends FileBasedRefactoringTest {
+ public static final String SQUARE_BRACKET_OPEN = "/*[*/";
+ public static final int SQUARE_BRACKET_OPEN_LENGTH = SQUARE_BRACKET_OPEN.length();
+ public static final String SQUARE_BRACKET_CLOSE = "/*]*/";
+ public static final int SQUARE_BRACKET_CLOSE_LENGTH = SQUARE_BRACKET_CLOSE.length();
+
+ // Regular classes
+ private IType _a;
+ private IType _b;
+ private IType _c;
+ private IType _q;
+ private IType _s;
+
+ // Team class
+ private IType _t1;
+
+ // Role classes
+ private IRoleType _t2r1;
+ private IRoleType _t3r1;
+ private IRoleType _t3r2;
+
+ private ExtractMethodRefactoring _refactoring;
+
+ public ExtractMethodRefactoringUtilTests(String name) {
+ super(name);
+ }
+
+ public static Test suite() {
+ return new Suite(ExtractMethodRefactoringUtilTests.class);
+ }
+
+ public void setUpSuite() throws Exception {
+ setTestProjectDir("ExtractMethodRefactoringUtil");
+ super.setUpSuite();
+
+ _a = getType(getTestProjectDir(), "src", "roleAndBaseHierarchy1", "A");
+
+ _b = getType(getTestProjectDir(), "src", "roleAndBaseHierarchy1", "B");
+
+ _c = getType(getTestProjectDir(), "src", "roleAndBaseHierarchy1", "C");
+
+ _q = getType(getTestProjectDir(), "src", "roleAndBaseHierarchy1", "Q");
+
+ _s = getType(getTestProjectDir(), "src", "roleAndBaseHierarchy1", "S");
+
+ _t1 = getType(getTestProjectDir(), "src", "roleAndBaseHierarchy1", "T1");
+
+ _t2r1 = getRole(getTestProjectDir(), "src", "roleAndBaseHierarchy1", "T2", "R1");
+
+ _t3r1 = getRole(getTestProjectDir(), "src", "roleAndBaseHierarchy1", "T3", "R1");
+
+ _t3r2 = getRole(getTestProjectDir(), "src", "roleAndBaseHierarchy1", "T3", "R2");
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ private int[] getSelection(String source) {
+ int start = -1;
+ int end = -1;
+ int includingStart = source.indexOf(SQUARE_BRACKET_OPEN);
+ int excludingStart = source.indexOf(SQUARE_BRACKET_CLOSE);
+ int includingEnd = source.lastIndexOf(SQUARE_BRACKET_CLOSE);
+ int excludingEnd = source.lastIndexOf(SQUARE_BRACKET_OPEN);
+
+ if (includingStart > excludingStart && excludingStart != -1) {
+ includingStart = -1;
+ } else if (excludingStart > includingStart && includingStart != -1) {
+ excludingStart = -1;
+ }
+
+ if (includingEnd < excludingEnd) {
+ includingEnd = -1;
+ } else if (excludingEnd < includingEnd) {
+ excludingEnd = -1;
+ }
+
+ if (includingStart != -1) {
+ start = includingStart;
+ } else {
+ start = excludingStart + SQUARE_BRACKET_CLOSE_LENGTH;
+ }
+
+ if (excludingEnd != -1) {
+ end = excludingEnd;
+ } else {
+ end = includingEnd + SQUARE_BRACKET_CLOSE_LENGTH;
+ }
+
+ assertTrue("Selection invalid", start >= 0 && end >= 0 && end >= start);
+
+ int[] result = new int[] { start, end - start };
+ // System.out.println("|"+ source.substring(result[0], result[0] +
+ // result[1]) + "|");
+ return result;
+ }
+
+ @SuppressWarnings("unchecked")
+ // raw List from ExtractMethodRefactoring.
+ private String[] fetchNewParameterTypes() {
+ List parameterInfos = _refactoring.getParameterInfos();
+ String[] parameterTypes = new String[parameterInfos.size()];
+ for (int i = 0; i < parameterTypes.length; i++)
+ parameterTypes[i] = ((ParameterInfo) parameterInfos.get(i)).getNewTypeName();
+ return parameterTypes;
+ }
+
+ /********** tests **********/
+ // =====================================================================================
+ // Testing overloading
+ // =====================================================================================
+ public void testCheckOverloading1() throws Exception {
+ // focus type -> A
+ ICompilationUnit cu = _a.getCompilationUnit();
+ int[] selection = getSelection(cu.getSource());
+ _refactoring = new ExtractMethodRefactoring(cu, selection[0], selection[1]);
+ _refactoring.setMethodName("f");
+ _refactoring.setVisibility(Modifier.PROTECTED);
+ _refactoring.checkInitialConditions(new NullProgressMonitor());
+ IMethod[] inheritedMethods = TypeHelper.getInheritedMethods(_a, true, true, true, null);
+ RefactoringStatus expected = RefactoringUtil.addOverloadingWarning(new ExtractMethodOverloadingMsgCreator());
+ RefactoringStatus actual = RefactoringUtil.checkOverloading(inheritedMethods, _refactoring.getMethodName(), fetchNewParameterTypes(),
+ new ExtractMethodOverloadingMsgCreator());
+ assertEquals(expected.getSeverity(), actual.getSeverity());
+ assertNotNull(expected.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.OVERLOADING));
+ assertNotNull(actual.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.OVERLOADING));
+ }
+
+ public void testCheckOverloading2() throws Exception {
+ // focus type -> B
+ ICompilationUnit cu = _b.getCompilationUnit();
+ int[] selection = getSelection(cu.getSource());
+ _refactoring = new ExtractMethodRefactoring(cu, selection[0], selection[1]);
+ _refactoring.setMethodName("g");
+ _refactoring.setVisibility(Modifier.PROTECTED);
+ _refactoring.checkInitialConditions(new NullProgressMonitor());
+ IMethod[] inheritedMethods = TypeHelper.getInheritedMethods(_b, true, true, true, null);
+ RefactoringStatus expected = RefactoringUtil.addOverloadingWarning(new ExtractMethodOverloadingMsgCreator());
+ RefactoringStatus actual = RefactoringUtil.checkOverloading(inheritedMethods, _refactoring.getMethodName(), fetchNewParameterTypes(),
+ new ExtractMethodOverloadingMsgCreator());
+ assertEquals(expected.getSeverity(), actual.getSeverity());
+ assertNotNull(expected.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.OVERLOADING));
+ assertNotNull(actual.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.OVERLOADING));
+ }
+
+ public void testCheckOverloading3() throws Exception {
+ // focus type -> C
+ ICompilationUnit cu = _c.getCompilationUnit();
+ int[] selection = getSelection(cu.getSource());
+ _refactoring = new ExtractMethodRefactoring(cu, selection[0], selection[1]);
+ _refactoring.setMethodName("g");
+ _refactoring.setVisibility(Modifier.PROTECTED);
+ _refactoring.checkInitialConditions(new NullProgressMonitor());
+ IMethod[] inheritedMethods = TypeHelper.getInheritedMethods(_c, true, true, true, null);
+ RefactoringStatus expected = RefactoringUtil.addOverloadingWarning(new ExtractMethodOverloadingMsgCreator());
+ RefactoringStatus actual = RefactoringUtil.checkOverloading(inheritedMethods, _refactoring.getMethodName(), fetchNewParameterTypes(),
+ new ExtractMethodOverloadingMsgCreator());
+ assertEquals(expected.getSeverity(), actual.getSeverity());
+ assertNotNull(expected.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.OVERLOADING));
+ assertNotNull(actual.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.OVERLOADING));
+ }
+
+ public void testCheckOverloading4() throws Exception {
+ // focus type -> Q
+ ICompilationUnit cu = _q.getCompilationUnit();
+ int[] selection = getSelection(cu.getSource());
+ _refactoring = new ExtractMethodRefactoring(cu, selection[0], selection[1]);
+ _refactoring.setMethodName("m");
+ _refactoring.setVisibility(Modifier.PROTECTED);
+ _refactoring.checkInitialConditions(new NullProgressMonitor());
+ IMethod[] inheritedMethods = TypeHelper.getInheritedMethods(_q, true, true, true, null);
+ RefactoringStatus expected = RefactoringUtil.addOverloadingWarning(new ExtractMethodOverloadingMsgCreator());
+ RefactoringStatus actual = RefactoringUtil.checkOverloading(inheritedMethods, _refactoring.getMethodName(), fetchNewParameterTypes(),
+ new ExtractMethodOverloadingMsgCreator());
+ assertEquals(expected.getSeverity(), actual.getSeverity());
+ assertNotNull(expected.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.OVERLOADING));
+ assertNotNull(actual.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.OVERLOADING));
+ }
+
+ public void testCheckOverloading5() throws Exception {
+ // focus type -> S
+ ICompilationUnit cu = _s.getCompilationUnit();
+ int[] selection = getSelection(cu.getSource());
+ _refactoring = new ExtractMethodRefactoring(cu, selection[0], selection[1]);
+ _refactoring.setMethodName("m");
+ _refactoring.setVisibility(Modifier.PROTECTED);
+ _refactoring.checkInitialConditions(new NullProgressMonitor());
+ IMethod[] inheritedMethods = TypeHelper.getInheritedMethods(_s, true, true, true, null);
+ RefactoringStatus expected = RefactoringUtil.addOverloadingWarning(new ExtractMethodOverloadingMsgCreator());
+ RefactoringStatus actual = RefactoringUtil.checkOverloading(inheritedMethods, _refactoring.getMethodName(), fetchNewParameterTypes(),
+ new ExtractMethodOverloadingMsgCreator());
+ assertEquals(expected.getSeverity(), actual.getSeverity());
+ assertNotNull(expected.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.OVERLOADING));
+ assertNotNull(actual.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.OVERLOADING));
+ }
+
+ public void testCheckOverloading6() throws Exception {
+ // focus type -> T1
+ ICompilationUnit cu = _t1.getCompilationUnit();
+ int[] selection = getSelection(cu.getSource());
+ _refactoring = new ExtractMethodRefactoring(cu, selection[0], selection[1]);
+ _refactoring.setMethodName("m");
+ _refactoring.setVisibility(Modifier.PROTECTED);
+ _refactoring.checkInitialConditions(new NullProgressMonitor());
+ IMethod[] inheritedMethods = TypeHelper.getInheritedMethods(_t1, true, true, true, null);
+ RefactoringStatus expected = RefactoringUtil.addOverloadingWarning(new ExtractMethodOverloadingMsgCreator());
+ RefactoringStatus actual = RefactoringUtil.checkOverloading(inheritedMethods, _refactoring.getMethodName(), fetchNewParameterTypes(),
+ new ExtractMethodOverloadingMsgCreator());
+ assertEquals(expected.getSeverity(), actual.getSeverity());
+ assertNotNull(expected.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.OVERLOADING));
+ assertNotNull(actual.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.OVERLOADING));
+ }
+
+ public void testCheckOverloading7() throws Exception {
+ // focus type -> T2.R1
+ ICompilationUnit cu = _t2r1.getCompilationUnit();
+ int[] selection = getSelection(cu.getSource());
+ _refactoring = new ExtractMethodRefactoring(cu, selection[0], selection[1]);
+ _refactoring.setMethodName("m");
+ _refactoring.setVisibility(Modifier.PROTECTED);
+ _refactoring.checkInitialConditions(new NullProgressMonitor());
+ IMethod[] inheritedMethods = TypeHelper.getInheritedMethods(_t2r1, true, true, true, null);
+ RefactoringStatus expected = RefactoringUtil.addOverloadingWarning(new ExtractMethodOverloadingMsgCreator());
+ RefactoringStatus actual = RefactoringUtil.checkOverloading(inheritedMethods, _refactoring.getMethodName(), fetchNewParameterTypes(),
+ new ExtractMethodOverloadingMsgCreator());
+ assertEquals(expected.getSeverity(), actual.getSeverity());
+ assertNotNull(expected.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.OVERLOADING));
+ assertNotNull(actual.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.OVERLOADING));
+ }
+
+ public void testCheckOverloading8() throws Exception {
+ // focus type -> T3.R2
+ ICompilationUnit cu = _t3r2.getCompilationUnit();
+ int[] selection = getSelection(cu.getSource());
+ _refactoring = new ExtractMethodRefactoring(cu, selection[0], selection[1]);
+ _refactoring.setMethodName("rm");
+ _refactoring.setVisibility(Modifier.PROTECTED);
+ _refactoring.checkInitialConditions(new NullProgressMonitor());
+ IMethod[] inheritedMethods = TypeHelper.getInheritedMethods(_t3r2, true, true, true, null);
+ RefactoringStatus expected = RefactoringUtil.addOverloadingWarning(new ExtractMethodOverloadingMsgCreator());
+ RefactoringStatus actual = RefactoringUtil.checkOverloading(inheritedMethods, _refactoring.getMethodName(), fetchNewParameterTypes(),
+ new ExtractMethodOverloadingMsgCreator());
+ assertEquals(expected.getSeverity(), actual.getSeverity());
+ assertNotNull(expected.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.OVERLOADING));
+ assertNotNull(actual.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.OVERLOADING));
+ }
+
+ // checking overloading including hidden (private) methods, because method
+ // bindings can refer to otherwise hidden base methods (decapsulation)
+ /* test overloading of private base method */
+ public void testCheckOverloading9() throws Exception {
+ // focus type -> C
+ ICompilationUnit cu = _c.getCompilationUnit();
+ int[] selection = getSelection(cu.getSource());
+ _refactoring = new ExtractMethodRefactoring(cu, selection[0], selection[1]);
+ _refactoring.setMethodName("n");
+ _refactoring.setVisibility(Modifier.PRIVATE);
+ _refactoring.checkInitialConditions(new NullProgressMonitor());
+ IMethod[] inheritedMethods = TypeHelper.getInheritedMethods(_c, true, true, false, null);
+ RefactoringStatus expected = RefactoringUtil.addOverloadingWarning(new ExtractMethodOverloadingMsgCreator());
+ RefactoringStatus actual = RefactoringUtil.checkOverloading(inheritedMethods, _refactoring.getMethodName(), fetchNewParameterTypes(),
+ new ExtractMethodOverloadingMsgCreator());
+ assertEquals(expected.getSeverity(), actual.getSeverity());
+ assertNotNull(expected.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.OVERLOADING));
+ assertNotNull(actual.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.OVERLOADING));
+ }
+
+ /* test overloading of private role method */
+ public void testCheckOverloading10() throws Exception {
+ // focus type -> T3.R2
+ ICompilationUnit cu = _t3r2.getCompilationUnit();
+ int[] selection = getSelection(cu.getSource());
+ _refactoring = new ExtractMethodRefactoring(cu, selection[0], selection[1]);
+ _refactoring.setMethodName("k");
+ _refactoring.setVisibility(Modifier.PRIVATE);
+ _refactoring.checkInitialConditions(new NullProgressMonitor());
+ IMethod[] inheritedMethods = TypeHelper.getInheritedMethods(_t3r2, true, true, false, null);
+ RefactoringStatus expected = RefactoringUtil.addOverloadingWarning(new ExtractMethodOverloadingMsgCreator());
+ RefactoringStatus actual = RefactoringUtil.checkOverloading(inheritedMethods, _refactoring.getMethodName(), fetchNewParameterTypes(),
+ new ExtractMethodOverloadingMsgCreator());
+ assertEquals(expected.getSeverity(), actual.getSeverity());
+ assertNotNull(expected.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.OVERLOADING));
+ assertNotNull(actual.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.OVERLOADING));
+ }
+
+ // =====================================================================================
+ // Testing ambiguity
+ // =====================================================================================
+
+ public void testCheckAmbiguityInRoleMethodSpec1() throws Exception {
+ // check ambiguous role method specifier in callin binding of T2.R1
+ RefactoringStatus expected = RefactoringUtil.addAmbiguityFatalError(null, new ExtractMethodAmbuguityMsgCreator());
+ RefactoringStatus actual = RefactoringUtil.checkForAmbiguousRoleMethodSpecs(_t2r1, "m", new ExtractMethodAmbuguityMsgCreator());
+ assertEquals(expected.getSeverity(), actual.getSeverity());
+ assertNotNull(expected.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.AMBIGUOUS_METHOD_SPECIFIER));
+ assertNotNull(actual.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.AMBIGUOUS_METHOD_SPECIFIER));
+ }
+
+ public void testCheckAmbiguityInRoleMethodSpec2() throws Exception {
+ // check ambiguous role method specifier in callin binding of T3.R1
+ RefactoringStatus expected = RefactoringUtil.addAmbiguityFatalError(null, new ExtractMethodAmbuguityMsgCreator());
+ RefactoringStatus actual = RefactoringUtil.checkForAmbiguousRoleMethodSpecs(_t3r1, "m", new ExtractMethodAmbuguityMsgCreator());
+ assertEquals(expected.getSeverity(), actual.getSeverity());
+ assertNotNull(expected.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.AMBIGUOUS_METHOD_SPECIFIER));
+ assertNotNull(actual.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.AMBIGUOUS_METHOD_SPECIFIER));
+ }
+
+ public void testCheckAmbiguityInRoleMethodSpec3() throws Exception {
+ // check ambiguous role method specifier in callout binding of T3.R2
+ RefactoringStatus expected = RefactoringUtil.addAmbiguityFatalError(null, new ExtractMethodAmbuguityMsgCreator());
+ RefactoringStatus actual = RefactoringUtil.checkForAmbiguousRoleMethodSpecs(_t3r2, "m", new ExtractMethodAmbuguityMsgCreator());
+ assertEquals(expected.getSeverity(), actual.getSeverity());
+ assertNotNull(expected.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.AMBIGUOUS_METHOD_SPECIFIER));
+ assertNotNull(actual.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.AMBIGUOUS_METHOD_SPECIFIER));
+ }
+
+ public void testCheckAmbiguityInBaseMethodSpec1() throws Exception {
+ // check ambiguous base method specifier in callin binding of T2.R1
+ RefactoringStatus expected = RefactoringUtil.addAmbiguityFatalError(null, new ExtractMethodAmbuguityMsgCreator());
+ ArrayList<IRoleType> boundRole = new ArrayList<IRoleType>();
+ boundRole.add(_t2r1);
+ RefactoringStatus actual = RefactoringUtil.checkForAmbiguousBaseMethodSpecs(boundRole, "f", "", new ExtractMethodAmbuguityMsgCreator());
+ assertEquals(expected.getSeverity(), actual.getSeverity());
+ assertNotNull(expected.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.AMBIGUOUS_METHOD_SPECIFIER));
+ assertNotNull(actual.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.AMBIGUOUS_METHOD_SPECIFIER));
+ }
+
+ public void testCheckAmbiguityInBaseMethodSpec2() throws Exception {
+ // check ambiguous base method specifier in callout binding of T3.R2
+ RefactoringStatus expected = RefactoringUtil.addAmbiguityFatalError(null, new ExtractMethodAmbuguityMsgCreator());
+ ArrayList<IRoleType> boundRole = new ArrayList<IRoleType>();
+ boundRole.add(_t3r2);
+ RefactoringStatus actual = RefactoringUtil.checkForAmbiguousBaseMethodSpecs(boundRole, "f", "", new ExtractMethodAmbuguityMsgCreator());
+ assertEquals(expected.getSeverity(), actual.getSeverity());
+ assertNotNull(expected.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.AMBIGUOUS_METHOD_SPECIFIER));
+ assertNotNull(actual.getEntryMatchingCode(Corext.getPluginId(), OTRefactoringStatusCodes.AMBIGUOUS_METHOD_SPECIFIER));
+ }
+}
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/ExtractMethodTestSetup.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/ExtractMethodTestSetup.java
new file mode 100644
index 000000000..0c6e9e3a6
--- /dev/null
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/ExtractMethodTestSetup.java
@@ -0,0 +1,149 @@
+/**********************************************************************
+ * This file is part of "Object Teams Development Tooling"-Software
+ *
+ * Copyright 2004, 2010 Fraunhofer Gesellschaft, Munich, Germany,
+ * for its Fraunhofer Institute and Computer Architecture and Software
+ * Technology (FIRST), Berlin, Germany and Technical University Berlin,
+ * Germany.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * $Id$
+ *
+ * Please visit http://www.eclipse.org/objectteams for updates and contact.
+ *
+ * Contributors:
+ * Fraunhofer FIRST - Initial API and implementation
+ * Technical University Berlin - Initial API and implementation
+ **********************************************************************/
+package org.eclipse.objectteams.otdt.ui.tests.refactoring.extractmethod;
+
+import java.util.Hashtable;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceDescription;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IPackageFragment;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
+import org.eclipse.jdt.internal.ui.JavaPlugin;
+import org.eclipse.jdt.ui.tests.refactoring.RefactoringTest;
+import org.eclipse.ltk.core.refactoring.RefactoringCore;
+import org.eclipse.objectteams.otdt.ui.tests.util.JavaProjectHelper;
+import org.eclipse.objectteams.otdt.ui.tests.util.TestOptions;
+
+/**
+ * @author brcan
+ */
+@SuppressWarnings({ "nls", "restriction" })
+public class ExtractMethodTestSetup extends TestSetup
+{
+ private IJavaProject _javaProject;
+ private IPackageFragmentRoot _root;
+ private static final String CONTAINER = "src";
+
+// private IPackageFragment _selectionPackage;
+
+ private IPackageFragment _teamClassPackage;
+ private IPackageFragment _roleClassPackage;
+ private IPackageFragment _nestedTeamPackage;
+ private IPackageFragment _rolefilePackage;
+ private IPackageFragment _rolefileParentPackage;
+ private IPackageFragment _focusTypePackage;
+ private IPackageFragment _overloadingPackage;
+
+ public ExtractMethodTestSetup(Test test)
+ {
+ super(test);
+ }
+
+ public IPackageFragmentRoot getRoot() {
+ return _root;
+ }
+
+ @SuppressWarnings("unchecked")
+ protected void setUp() throws Exception
+ {
+ Hashtable options = TestOptions.getFormatterOptions();
+ options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.TAB);
+ options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "0");
+ options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
+ JavaCore.setOptions(options);
+ TestOptions.initializeCodeGenerationOptions();
+ JavaPlugin.getDefault().getCodeTemplateStore().load();
+
+ _javaProject = JavaProjectHelper.createOTJavaProject("TestProject", "bin");
+ JavaProjectHelper.addRTJar(_javaProject);
+ _root = JavaProjectHelper.addSourceContainer(_javaProject, CONTAINER);
+
+ RefactoringCore.getUndoManager().flush();
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ IWorkspaceDescription description = workspace.getDescription();
+ description.setAutoBuilding(false);
+ workspace.setDescription(description);
+
+ //new packages for OT/J tests
+ _teamClassPackage = getRoot().createPackageFragment("team_in", true, null);
+ _roleClassPackage = getRoot().createPackageFragment("role_in", true, null);
+ _rolefilePackage = getRoot().createPackageFragment("roleFile_in.TeamWithRoleFile", true, null);
+ _rolefileParentPackage = getRoot().createPackageFragment("roleFile_in", true, null);
+ _nestedTeamPackage = getRoot().createPackageFragment("nestedTeam_in", true, null);
+ _focusTypePackage = getRoot().createPackageFragment("focusType_in", true, null);
+ _overloadingPackage = getRoot().createPackageFragment("overloading_in", true, null);
+
+// _selectionPackage = getRoot().createPackageFragment("selection", true, null);
+ }
+
+ protected void tearDown() throws Exception
+ {
+ RefactoringTest.performDummySearch(_javaProject);
+ JavaProjectHelper.delete(_javaProject);
+ }
+
+// public IPackageFragment getSelectionPackage()
+// {
+// return _selectionPackage;
+// }
+
+ public IPackageFragment getTeamClassPackage()
+ {
+ return _teamClassPackage;
+ }
+
+ public IPackageFragment getRoleClassPackage()
+ {
+ return _roleClassPackage;
+ }
+
+ public IPackageFragment getNestedTeamPackage()
+ {
+ return _nestedTeamPackage;
+ }
+
+ public IPackageFragment getRoleFilePackage()
+ {
+ return _rolefilePackage;
+ }
+
+ public IPackageFragment getRoleFileParentPackage()
+ {
+ return _rolefileParentPackage;
+ }
+
+ public IPackageFragment getFocusTypePackage()
+ {
+ return _focusTypePackage;
+ }
+
+ public IPackageFragment getOverloadingPackage()
+ {
+ return _overloadingPackage;
+ }
+}
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/ExtractMethodTests.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/ExtractMethodTests.java
new file mode 100644
index 000000000..c0eb561ab
--- /dev/null
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/ExtractMethodTests.java
@@ -0,0 +1,480 @@
+/**********************************************************************
+ * This file is part of "Object Teams Development Tooling"-Software
+ *
+ * Copyright 2004, 2010 Fraunhofer Gesellschaft, Munich, Germany,
+ * for its Fraunhofer Institute and Computer Architecture and Software
+ * Technology (FIRST), Berlin, Germany and Technical University Berlin,
+ * Germany.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * $Id$
+ *
+ * Please visit http://www.eclipse.org/objectteams for updates and contact.
+ *
+ * Contributors:
+ * Fraunhofer FIRST - Initial API and implementation
+ * Technical University Berlin - Initial API and implementation
+ **********************************************************************/
+package org.eclipse.objectteams.otdt.ui.tests.refactoring.extractmethod;
+
+import java.io.IOException;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IPackageFragment;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jdt.internal.corext.refactoring.ParameterInfo;
+import org.eclipse.ltk.core.refactoring.CheckConditionsOperation;
+import org.eclipse.ltk.core.refactoring.RefactoringStatus;
+import org.eclipse.jdt.internal.corext.refactoring.code.ExtractMethodRefactoring;
+
+/**
+ * @author brcan
+ *
+ */
+@SuppressWarnings({ "nls", "restriction" })
+public class ExtractMethodTests extends AbstractSelectionTestCase
+{
+ private static ExtractMethodTestSetup _testSetup;
+
+ public ExtractMethodTests(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ _testSetup = new ExtractMethodTestSetup(new TestSuite(ExtractMethodTests.class));
+ return _testSetup;
+ }
+
+ protected IPackageFragmentRoot getRoot()
+ {
+ return _testSetup.getRoot();
+ }
+
+ protected String getResourceLocation()
+ {
+ return "ExtractMethod/";
+ }
+
+ protected String adaptName(String name)
+ {
+ if (getName().startsWith("testFocusType"))
+ {
+ return super.adaptName(name);
+ }
+ return name + "_" + getName() + ".java";
+ }
+
+// protected void selectionTest(int startLine, int startColumn, int endLine, int endColumn)
+// throws Exception
+// {
+// ICompilationUnit unit = createCU(getSelectionPackage(), "A");
+// String source = unit.getSource();
+// int[] selection = getSelection(source);
+// ISourceRange expected =
+// TextRangeUtil.getSelection(unit, startLine, startColumn, endLine, endColumn);
+// assertEquals(expected.getOffset(), selection[0]);
+// assertEquals(expected.getLength(), selection[1]);
+// }
+//
+// private IPackageFragment getSelectionPackage() throws JavaModelException
+// {
+// return _testSetup.getSelectionPackage();
+// }
+
+ protected void performTest(
+ IPackageFragment packageFragment,
+ String[] ids,
+ int mode,
+ String outputFolder) throws Exception
+ {
+ performTest(packageFragment, ids, mode, outputFolder, null, null, 0);
+ }
+
+ @SuppressWarnings("unchecked")
+ protected void performTest(
+ IPackageFragment packageFragment,
+ String[] ids,
+ int mode,
+ String outputFolder,
+ String[] newNames,
+ int[] newOrder,
+ int destination) throws Exception
+ {
+ ICompilationUnit[] compUnits = createCUs(packageFragment, ids);
+ String source = compUnits[0].getSource();
+ int[] selection = getSelection(source);
+ ExtractMethodRefactoring refactoring = new ExtractMethodRefactoring(
+ compUnits[0],
+ selection[0],
+ selection[1]);
+ refactoring.setMethodName("extracted");
+ refactoring.setVisibility(Modifier.PROTECTED);
+ RefactoringStatus status =
+ refactoring.checkInitialConditions(new NullProgressMonitor());
+ switch (mode)
+ {
+ case VALID_SELECTION:
+ assertTrue(status.isOK());
+ break;
+ case INVALID_SELECTION:
+ if (!status.isOK())
+ return;
+ }
+ List parameters = refactoring.getParameterInfos();
+ if (newNames != null && newNames.length > 0)
+ {
+ for (int idx= 0; idx < newNames.length; idx++)
+ {
+ if (newNames[idx] != null)
+ {
+ ((ParameterInfo)parameters.get(idx)).setNewName(newNames[idx]);
+ }
+ }
+ }
+ if (newOrder != null && newOrder.length > 0)
+ {
+ assertTrue(newOrder.length == parameters.size());
+ List current = new ArrayList(parameters);
+ for (int idx= 0; idx < newOrder.length; idx++)
+ {
+ parameters.set(newOrder[idx], current.get(idx));
+ }
+ }
+ refactoring.setDestination(destination);
+
+ String out = null;
+ switch (mode)
+ {
+ case COMPARE_WITH_OUTPUT:
+ out = getProofedContent(outputFolder, ids[0]);
+ break;
+ }
+ performTest(compUnits[0], refactoring, mode, out, true);
+ }
+
+ private ICompilationUnit[] createCUs(
+ IPackageFragment packageFragment,
+ String[] ids)
+ throws Exception
+ {
+ ICompilationUnit[] cus = new ICompilationUnit[ids.length];
+
+ for (int idx = 0; idx < ids.length; idx++)
+ {
+ Assert.isNotNull(ids[idx]);
+ cus[idx] = createCU(packageFragment, ids[idx]);
+ }
+ return cus;
+ }
+
+ protected int getCheckingStyle()
+ {
+ return CheckConditionsOperation.FINAL_CONDITIONS;
+ }
+
+ /********** tests **********/
+ //=====================================================================================
+ // Testing team classes
+ //=====================================================================================
+
+ //extract method invocation in team
+ public void testTeamclass1() throws Exception
+ {
+ performTest(
+ _testSetup.getTeamClassPackage(),
+ new String[]{"T"},
+ COMPARE_WITH_OUTPUT,
+ "team_out");
+ }
+ //extract expression in team
+ public void testTeamclass2() throws Exception
+ {
+ performTest(
+ _testSetup.getTeamClassPackage(),
+ new String[]{"T"},
+ COMPARE_WITH_OUTPUT,
+ "team_out");
+ }
+
+ //=====================================================================================
+ // Testing role classes
+ //=====================================================================================
+
+ //extract method invocation in unbound role
+ public void testRoleclass1() throws Exception
+ {
+ performTest(
+ _testSetup.getRoleClassPackage(),
+ new String[]{"T"},
+ COMPARE_WITH_OUTPUT,
+ "role_out");
+ }
+ //extract expression in unbound role
+ public void testRoleclass2() throws Exception
+ {
+ performTest(
+ _testSetup.getRoleClassPackage(),
+ new String[]{"T"},
+ COMPARE_WITH_OUTPUT,
+ "role_out");
+ }
+
+ //=====================================================================================
+ // Testing nested teams
+ //=====================================================================================
+
+ /* passing */
+ //extract method invocation in unbound nested team
+ public void testNestedTeam1() throws Exception
+ {
+ performTest(
+ _testSetup.getNestedTeamPackage(),
+ new String[]{"T1"},
+ COMPARE_WITH_OUTPUT,
+ "nestedTeam_out");
+ }
+ //extract method invocation in inner role of unbound nested team
+ public void testNestedTeam2() throws Exception
+ {
+ performTest(
+ _testSetup.getNestedTeamPackage(),
+ new String[]{"T1"},
+ COMPARE_WITH_OUTPUT,
+ "nestedTeam_out");
+ }
+
+ /* failing */
+ //extract method invocation in bound nested team -> ambiguous base method spec
+ public void testNestedTeam3() throws Exception
+ {
+ performTest(
+ _testSetup.getNestedTeamPackage(),
+ new String[] {"B", "T1"},
+ INVALID_SELECTION,
+ "nestedTeam_out");
+ }
+ //extract method invocation in bound nested team -> ambiguous role method spec
+ public void testNestedTeam4() throws Exception
+ {
+ performTest(
+ _testSetup.getNestedTeamPackage(),
+ new String[] {"T1", "B"},
+ INVALID_SELECTION,
+ "nestedTeam_out");
+ }
+ //extract method invocation in bound inner role of nested team ->
+ //ambiguous base method spec
+ public void testNestedTeam5() throws Exception
+ {
+ performTest(
+ _testSetup.getNestedTeamPackage(),
+ new String[] {"B", "T1"},
+ INVALID_SELECTION,
+ "nestedTeam_out");
+ }
+ //extract method invocation in bound inner role of nested team ->
+ //ambiguous role method spec
+ public void testNestedTeam6() throws Exception
+ {
+ performTest(
+ _testSetup.getNestedTeamPackage(),
+ new String[] {"T1", "B"},
+ INVALID_SELECTION,
+ "nestedTeam_out");
+ }
+
+ //=====================================================================================
+ // Testing role files
+ //=====================================================================================
+
+ //extract method invocation in role file (unbound role)
+ public void testRoleFile1() throws Exception
+ {
+ establishTeamCU("TeamWithRoleFile.java");
+ performTest(
+ _testSetup.getRoleFilePackage(),
+ new String[]{"R"},
+ COMPARE_WITH_OUTPUT,
+ "roleFile_out/TeamWithRoleFile");
+
+ }
+
+ //extract expression in role file (unbound role)
+ public void testRoleFile2() throws Exception
+ {
+ establishTeamCU("TeamWithRoleFile.java");
+ performTest(
+ _testSetup.getRoleFilePackage(),
+ new String[]{"R"},
+ COMPARE_WITH_OUTPUT,
+ "roleFile_out/TeamWithRoleFile");
+ }
+
+ ICompilationUnit teamCU = null;
+
+ private void establishTeamCU(String teamFileName) throws Exception, IOException {
+ if (teamCU != null) return;
+ IPackageFragment pack = _testSetup.getRoleFileParentPackage();
+ teamCU = createCU(pack, teamFileName, getFileInputStream(myGetFilePath(pack, teamFileName)));
+ }
+ // =====================================================================================
+ // Testing overloading and/or ambiguity for different focus types
+ // =====================================================================================
+
+ //focus implicit role hierarchy
+ public void testFocusTypeIsSuperroleInRoleHierarchy() throws Exception
+ {
+ performTest(
+ _testSetup.getFocusTypePackage(),
+ new String[] {"T1", "A", "B", "C"},
+ INVALID_SELECTION,
+ "focusType_out");
+ }
+
+ public void testFocusTypeIsMiddleRoleInRoleHierarchy() throws Exception
+ {
+ performTest(
+ _testSetup.getFocusTypePackage(),
+ new String[] {"T2", "T1", "A", "B", "C"},
+ INVALID_SELECTION,
+ "focusType_out");
+ }
+
+ public void testFocusTypeIsLowestRoleInRoleHierarchy() throws Exception
+ {
+ performTest(
+ _testSetup.getFocusTypePackage(),
+ new String[] {"T3", "T2", "T1", "A", "B", "C"},
+ INVALID_SELECTION,
+ "focusType_out");
+ }
+
+ //focus base hierarchy
+ public void testFocusTypeIsSuperBasetypeInBaseHierarchy() throws Exception
+ {
+ performTest(
+ _testSetup.getFocusTypePackage(),
+ new String[] {"A", "B", "C", "T1", "T2", "T3"},
+ INVALID_SELECTION,
+ "focusType_out");
+ }
+
+ public void testFocusTypeIsMiddleBasetypeInBaseHierarchy() throws Exception
+ {
+ performTest(
+ _testSetup.getFocusTypePackage(),
+ new String[] {"B", "A", "C", "T1", "T2", "T3"},
+ INVALID_SELECTION,
+ "focusType_out");
+ }
+
+ public void testFocusTypeIsLowestBasetypeInBaseHierarchy() throws Exception
+ {
+ performTest(
+ _testSetup.getFocusTypePackage(),
+ new String[] {"C", "B", "A", "T1", "T2", "T3"},
+ INVALID_SELECTION,
+ "focusType_out");
+ }
+
+ //focus team hierarchy
+ public void testFocusTypeIsSuperteamInTeamHierachy() throws Exception
+ {
+ performTest(
+ _testSetup.getFocusTypePackage(),
+ new String[] {"FocusTeam1"},
+ INVALID_SELECTION,
+ "focusType_out");
+ }
+
+ public void testFocusTypeIsMiddleTeamInTeamHierachy() throws Exception
+ {
+ performTest(
+ _testSetup.getFocusTypePackage(),
+ new String[] {"FocusTeam2", "FocusTeam1"},
+ INVALID_SELECTION,
+ "focusType_out");
+ }
+
+ public void testFocusTypeIsLowestTeamInTeamHierarchy() throws Exception
+ {
+ performTest(
+ _testSetup.getFocusTypePackage(),
+ new String[] {"FocusTeam3", "FocusTeam2", "FocusTeam1"},
+ INVALID_SELECTION,
+ "focusType_out");
+ }
+
+ // role is a indirect subclass of target class, explicit inheritance only, short methodSpec
+ public void test20() throws Exception
+ {
+ performTest(
+ _testSetup.getOverloadingPackage(),
+ new String[] {"A", "B", "Base1", "Team1"},
+ INVALID_SELECTION,
+ "overloading_out");
+ }
+
+ // role is a indirect subclass of target class, explicit + implicit inheritance, short methodSpec
+ public void test21() throws Exception
+ {
+ performTest(
+ _testSetup.getOverloadingPackage(),
+ new String[] {"A", "B", "Base1", "Team1", "Team2"},
+ INVALID_SELECTION,
+ "overloading_out");
+ }
+
+ // role is a indirect subclass of target class, explicit + implicit inheritance, long methodSpec
+ public void test22() throws Exception
+ {
+ performTest(
+ _testSetup.getOverloadingPackage(),
+ new String[] {"A", "B", "Base1", "Team1", "Team2"},
+ COMPARE_WITH_OUTPUT,
+ "overloading_out");
+ }
+
+ // bound base class is target class, short methodSpec
+ public void test23() throws Exception
+ {
+ performTest(
+ _testSetup.getOverloadingPackage(),
+ new String[] {"A", "Team1"},
+ INVALID_SELECTION,
+ "overloading_out");
+ }
+
+ // bound base class is direct/indirect subclass of target class, short methodSpec
+ public void test24() throws Exception
+ {
+ performTest(
+ _testSetup.getOverloadingPackage(),
+ new String[] {"A", "Base1", "Team1"},
+ INVALID_SELECTION,
+ "overloading_out");
+ }
+
+ // base class is subclass of target class, long methodSpec
+ public void test25() throws Exception
+ {
+ performTest(
+ _testSetup.getOverloadingPackage(),
+ new String[] {"A", "Base1", "Team1"},
+ COMPARE_WITH_OUTPUT,
+ "overloading_out");
+ }
+}
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/ExtractTempTestSetup.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/ExtractTempTestSetup.java
new file mode 100644
index 000000000..0fe22a0e3
--- /dev/null
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/ExtractTempTestSetup.java
@@ -0,0 +1,96 @@
+/**********************************************************************
+ * This file is part of "Object Teams Development Tooling"-Software
+ *
+ * Copyright 2004, 2010 Fraunhofer Gesellschaft, Munich, Germany,
+ * for its Fraunhofer Institute and Computer Architecture and Software
+ * Technology (FIRST), Berlin, Germany and Technical University Berlin,
+ * Germany.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * $Id$
+ *
+ * Please visit http://www.eclipse.org/objectteams for updates and contact.
+ *
+ * Contributors:
+ * Fraunhofer FIRST - Initial API and implementation
+ * Technical University Berlin - Initial API and implementation
+ **********************************************************************/
+package org.eclipse.objectteams.otdt.ui.tests.refactoring.extractmethod;
+
+import java.util.Hashtable;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceDescription;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IPackageFragment;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
+import org.eclipse.jdt.internal.ui.JavaPlugin;
+import org.eclipse.jdt.ui.tests.refactoring.RefactoringTest;
+import org.eclipse.ltk.core.refactoring.RefactoringCore;
+import org.eclipse.objectteams.otdt.ui.tests.util.JavaProjectHelper;
+import org.eclipse.objectteams.otdt.ui.tests.util.TestOptions;
+
+/**
+ * @author stephan
+ */
+public class ExtractTempTestSetup extends TestSetup
+{
+ private IJavaProject _javaProject;
+ private IPackageFragmentRoot _root;
+ private static final String CONTAINER = "src";
+
+ private IPackageFragment _statementsPackage;
+
+ public ExtractTempTestSetup(Test test)
+ {
+ super(test);
+ }
+
+ public IPackageFragmentRoot getRoot() {
+ return _root;
+ }
+
+ protected void setUp() throws Exception
+ {
+ Hashtable options = TestOptions.getFormatterOptions();
+ options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.TAB);
+ options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "0");
+ options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
+ JavaCore.setOptions(options);
+ TestOptions.initializeCodeGenerationOptions();
+ JavaPlugin.getDefault().getCodeTemplateStore().load();
+
+ _javaProject = JavaProjectHelper.createOTJavaProject("TestProject", "bin");
+ JavaProjectHelper.addRTJar(_javaProject);
+ _root = JavaProjectHelper.addSourceContainer(_javaProject, CONTAINER);
+
+ RefactoringCore.getUndoManager().flush();
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ IWorkspaceDescription description = workspace.getDescription();
+ description.setAutoBuilding(false);
+ workspace.setDescription(description);
+
+ //new packages for OT/J tests
+ _statementsPackage = getRoot().createPackageFragment("statements_in", true, null);
+ }
+
+ protected void tearDown() throws Exception
+ {
+ RefactoringTest.performDummySearch(_javaProject);
+ JavaProjectHelper.delete(_javaProject);
+ }
+
+ public IPackageFragment getStatementsPackage()
+ {
+ return _statementsPackage;
+ }
+}
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/ExtractTempTests.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/ExtractTempTests.java
new file mode 100644
index 000000000..596ecb383
--- /dev/null
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/ExtractTempTests.java
@@ -0,0 +1,209 @@
+/**********************************************************************
+ * This file is part of "Object Teams Development Tooling"-Software
+ *
+ * Copyright 2004, 2010 Fraunhofer Gesellschaft, Munich, Germany,
+ * for its Fraunhofer Institute and Computer Architecture and Software
+ * Technology (FIRST), Berlin, Germany and Technical University Berlin,
+ * Germany.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * $Id$
+ *
+ * Please visit http://www.eclipse.org/objectteams for updates and contact.