From 478cb6a6361fef033bb104eca9b322945d6c1209 Mon Sep 17 00:00:00 2001 From: Daniel Azarov Date: Fri, 24 Apr 2015 11:17:48 -0700 Subject: [PATCH] JBIDE-19696 Rename of an exception class does not work properly --- .../src/META-INF/batch-jobs/job-refactor.xml | 4 +- .../src/batch/SecondRenamableException.java | 6 +++ .../ui/itest/BatchRenameParticipantTest.java | 27 ++++++++---- .../BatchArtifactRenameParticipant.java | 4 +- .../test/tck/NamedBeanRefactoringTest.java | 18 ++++---- .../ELVariableRefactoringTest.java | 3 +- .../test/refactoring/JSF2RefactoringTest.java | 15 +++---- .../MessagePropertyRefactoringTest.java | 3 +- .../refactoring/ELReferencesRenameTest.java | 9 ++-- .../SeamComponentRefactoringTest.java | 24 ++++++++++- .../SeamContextVariableRefactoringTest.java | 41 ++++++++++--------- 11 files changed, 100 insertions(+), 54 deletions(-) create mode 100644 batch/itests/org.jboss.tools.batch.core.itest/projects/BatchTestProject/src/batch/SecondRenamableException.java diff --git a/batch/itests/org.jboss.tools.batch.core.itest/projects/BatchTestProject/src/META-INF/batch-jobs/job-refactor.xml b/batch/itests/org.jboss.tools.batch.core.itest/projects/BatchTestProject/src/META-INF/batch-jobs/job-refactor.xml index 14988bff80..cc2517c979 100644 --- a/batch/itests/org.jboss.tools.batch.core.itest/projects/BatchTestProject/src/META-INF/batch-jobs/job-refactor.xml +++ b/batch/itests/org.jboss.tools.batch.core.itest/projects/BatchTestProject/src/META-INF/batch-jobs/job-refactor.xml @@ -16,10 +16,10 @@ - + - + diff --git a/batch/itests/org.jboss.tools.batch.core.itest/projects/BatchTestProject/src/batch/SecondRenamableException.java b/batch/itests/org.jboss.tools.batch.core.itest/projects/BatchTestProject/src/batch/SecondRenamableException.java new file mode 100644 index 0000000000..41eff9d629 --- /dev/null +++ b/batch/itests/org.jboss.tools.batch.core.itest/projects/BatchTestProject/src/batch/SecondRenamableException.java @@ -0,0 +1,6 @@ +package batch; + +public class SecondRenamableException extends Exception{ + private static final long serialVersionUID = 2L; + +} diff --git a/batch/itests/org.jboss.tools.batch.ui.itest/src/org/jboss/tools/batch/ui/itest/BatchRenameParticipantTest.java b/batch/itests/org.jboss.tools.batch.ui.itest/src/org/jboss/tools/batch/ui/itest/BatchRenameParticipantTest.java index 009b27bc3e..2b57560873 100644 --- a/batch/itests/org.jboss.tools.batch.ui.itest/src/org/jboss/tools/batch/ui/itest/BatchRenameParticipantTest.java +++ b/batch/itests/org.jboss.tools.batch.ui.itest/src/org/jboss/tools/batch/ui/itest/BatchRenameParticipantTest.java @@ -19,6 +19,7 @@ import org.eclipse.jdt.core.IType; import org.eclipse.jdt.internal.corext.refactoring.rename.RenameFieldProcessor; import org.eclipse.jdt.internal.corext.refactoring.rename.RenameTypeProcessor; +import org.eclipse.jface.text.BadLocationException; import org.eclipse.ui.PlatformUI; import org.jboss.tools.batch.ui.participants.BatchArtifactRenameParticipant; import org.jboss.tools.common.base.test.AbstractRefactorTest; @@ -45,7 +46,7 @@ public BatchRenameParticipantTest() { super("Batch Rename Participants Test"); } - public void testBatchArtifactRename() throws CoreException{ + public void testBatchArtifactRename() throws CoreException, BadLocationException{ ArrayList list = new ArrayList(); TestChangeStructure structure = new TestChangeStructure(project, "/src/META-INF/batch-jobs/job-refactor.xml"); @@ -59,7 +60,7 @@ public void testBatchArtifactRename() throws CoreException{ RenameParticipantTestUtil.checkRenameParticipant(type, renameProcessor, new BatchArtifactRenameParticipant(), "abcdmableBatchlet", list); } - public void testBatchPropertyRename() throws CoreException{ + public void testBatchPropertyRename() throws CoreException, BadLocationException{ ArrayList list = new ArrayList(); TestChangeStructure structure = new TestChangeStructure(project, "/src/META-INF/batch-jobs/job-refactor.xml"); @@ -73,25 +74,35 @@ public void testBatchPropertyRename() throws CoreException{ RenameParticipantTestUtil.checkRenameParticipant(field, renameProcessor, new BatchArtifactRenameParticipant(), "abcdeName", list); } - public void testClassRename() throws CoreException{ + public void testClassRename() throws CoreException, BadLocationException{ ArrayList list = new ArrayList(); TestChangeStructure structure = new TestChangeStructure(project, "/src/META-INF/batch-jobs/job-refactor.xml"); - TestTextChange change = new TestTextChange("batch.RenamableException", 24, "batch.AbcdmableException"); + TestTextChange change = new TestTextChange("batch.SecondRenamableException", 30, "batch.AbcdefRenamableException"); structure.addTextChange(change); list.add(structure); - change = new TestTextChange("batch.RenamableException", 24, "batch.AbcdmableException"); + change = new TestTextChange("batch.SecondRenamableException", 30, "batch.AbcdefRenamableException"); structure.addTextChange(change); - change = new TestTextChange("batch.RenamableException", 24, "batch.AbcdmableException"); + IType type = RenameParticipantTestUtil.getJavaType(project, "batch.SecondRenamableException"); + RenameTypeProcessor renameProcessor = new RenameTypeProcessor(type); + + RenameParticipantTestUtil.checkRenameParticipant(type, renameProcessor, new BatchArtifactRenameParticipant(), "AbcdefRenamableException", list); + } + + public void testClassRename2() throws CoreException, BadLocationException{ + ArrayList list = new ArrayList(); + + TestChangeStructure structure = new TestChangeStructure(project, "/src/META-INF/batch-jobs/job-refactor.xml"); + TestTextChange change = new TestTextChange("batch.RenamableException", 24, "batch.RenamableExceptio2"); structure.addTextChange(change); + list.add(structure); IType type = RenameParticipantTestUtil.getJavaType(project, "batch.RenamableException"); RenameTypeProcessor renameProcessor = new RenameTypeProcessor(type); - RenameParticipantTestUtil.checkRenameParticipant(type, renameProcessor, new BatchArtifactRenameParticipant(), "AbcdmableException", list); - + RenameParticipantTestUtil.checkRenameParticipant(type, renameProcessor, new BatchArtifactRenameParticipant(), "RenamableExceptio2", list); } } diff --git a/batch/plugins/org.jboss.tools.batch.ui/src/org/jboss/tools/batch/ui/participants/BatchArtifactRenameParticipant.java b/batch/plugins/org.jboss.tools.batch.ui/src/org/jboss/tools/batch/ui/participants/BatchArtifactRenameParticipant.java index 54b316becf..0c8fd2ffcb 100644 --- a/batch/plugins/org.jboss.tools.batch.ui/src/org/jboss/tools/batch/ui/participants/BatchArtifactRenameParticipant.java +++ b/batch/plugins/org.jboss.tools.batch.ui/src/org/jboss/tools/batch/ui/participants/BatchArtifactRenameParticipant.java @@ -114,9 +114,9 @@ public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsCon newName = BeanUtil.getDefaultBeanName(getArguments().getNewName()); } } else { // rename exception - String fullyQualifiedName = type.getFullyQualifiedName(); + String fullyQualifiedName = type.getFullyQualifiedName(); StringBuilder b = new StringBuilder(fullyQualifiedName); - b.replace(fullyQualifiedName.lastIndexOf(type.getElementName()), fullyQualifiedName.lastIndexOf(type.getElementName()) + 1, getArguments().getNewName() ); + b.replace(fullyQualifiedName.lastIndexOf(type.getElementName()), fullyQualifiedName.lastIndexOf(type.getElementName()) + type.getElementName().length(), getArguments().getNewName() ); newName = b.toString(); } searchInProject(batchProject, artifact, property, pm); diff --git a/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NamedBeanRefactoringTest.java b/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NamedBeanRefactoringTest.java index 24ceefdb3f..4b4eb851ba 100644 --- a/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NamedBeanRefactoringTest.java +++ b/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NamedBeanRefactoringTest.java @@ -13,8 +13,11 @@ import java.util.ArrayList; import java.util.Collection; +import javax.inject.Named; + import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.text.BadLocationException; import org.jboss.tools.cdi.core.CDICoreNature; import org.jboss.tools.cdi.core.CDICorePlugin; import org.jboss.tools.cdi.core.IBean; @@ -23,7 +26,6 @@ import org.jboss.tools.common.base.test.AbstractRefactorTest; import org.jboss.tools.common.base.test.RenameParticipantTestUtil.TestChangeStructure; import org.jboss.tools.common.base.test.RenameParticipantTestUtil.TestTextChange; -import org.jboss.tools.common.util.FileUtil; public class NamedBeanRefactoringTest extends TCKTest { private static final String FILE_NAME1 = "JavaSource/org/jboss/jsr299/tck/tests/jbt/refactoring/Gamme.java"; @@ -34,15 +36,13 @@ public class NamedBeanRefactoringTest extends TCKTest { private static final String newName = "abcde"; private static final int NUM_OF_CHAR = 5; - public void testNamedBeanClassRename() throws CoreException { + public void testNamedBeanClassRename() throws CoreException, BadLocationException { ArrayList list = new ArrayList(); IFile sourceFile = tckProject.getProject().getFile(FILE_NAME1); - String sourceFileContent = FileUtil.getContentFromEditorOrFile(sourceFile); - int position = sourceFileContent.indexOf("@Named") + 8; TestChangeStructure structure = new TestChangeStructure(tckProject, FILE_NAME1); - TestTextChange change = new TestTextChange(/*328*/position, NUM_OF_CHAR, newName); + TestTextChange change = new TestTextChange("@Named", 15, "@Named(\"abcde\")"); structure.addTextChange(change); list.add(structure); @@ -72,11 +72,11 @@ public void testNamedBeanClassRename() throws CoreException { AbstractRefactorTest.checkRename(processor, list); } - public void testNamedBeanProducerFieldRename() throws CoreException { + public void testNamedBeanProducerFieldRename() throws CoreException, BadLocationException { ArrayList list = new ArrayList(); TestChangeStructure structure = new TestChangeStructure(tckProject, "JavaSource/org/jboss/jsr299/tck/tests/jbt/refactoring/ProducerFieldBean.java"); - TestTextChange change = new TestTextChange("sField\")", 6, "uField"); + TestTextChange change = new TestTextChange("@Named(\"sField\")", 16, "@Named(\"uField\")"); structure.addTextChange(change); change = new TestTextChange("sField.charAt(0)}", 6, "uField"); structure.addTextChange(change); @@ -93,11 +93,11 @@ public void testNamedBeanProducerFieldRename() throws CoreException { AbstractRefactorTest.checkRename(processor, list); } - public void testNamedBeanProducerMethodRename() throws CoreException { + public void testNamedBeanProducerMethodRename() throws CoreException, BadLocationException { ArrayList list = new ArrayList(); TestChangeStructure structure = new TestChangeStructure(tckProject, "JavaSource/org/jboss/jsr299/tck/tests/jbt/refactoring/ProducerMethodBean.java"); - TestTextChange change = new TestTextChange("infoMethod\")", 10, "memoMethod"); + TestTextChange change = new TestTextChange("@Named(\"infoMethod\")", 20, "@Named(\"memoMethod\")"); structure.addTextChange(change); change = new TestTextChange("infoMethod.charAt(0)}", 10, "memoMethod"); structure.addTextChange(change); diff --git a/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/ELVariableRefactoringTest.java b/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/ELVariableRefactoringTest.java index 3127f69fcf..33c3fa8031 100644 --- a/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/ELVariableRefactoringTest.java +++ b/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/ELVariableRefactoringTest.java @@ -15,6 +15,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.text.BadLocationException; import org.jboss.tools.common.base.test.AbstractRefactorTest; import org.jboss.tools.common.base.test.RenameParticipantTestUtil.TestChangeStructure; import org.jboss.tools.common.base.test.RenameParticipantTestUtil.TestTextChange; @@ -37,7 +38,7 @@ protected void setUp() throws Exception { project = ProjectImportTestSetup.loadProject(projectName); } - public void testELVariableRename() throws CoreException { + public void testELVariableRename() throws CoreException, BadLocationException { ArrayList list = new ArrayList(); diff --git a/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/JSF2RefactoringTest.java b/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/JSF2RefactoringTest.java index f18c21e709..fbe0c1b076 100644 --- a/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/JSF2RefactoringTest.java +++ b/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/JSF2RefactoringTest.java @@ -17,6 +17,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.text.BadLocationException; import org.eclipse.ltk.internal.core.refactoring.resource.MoveResourcesProcessor; import org.eclipse.ltk.internal.core.refactoring.resource.RenameResourceProcessor; import org.jboss.tools.common.base.test.AbstractRefactorTest; @@ -39,7 +40,7 @@ protected void setUp() throws Exception { project = ProjectImportTestSetup.loadProject(PROJECT_NAME); } - public void testRenameCompositeComponentFile() throws CoreException { + public void testRenameCompositeComponentFile() throws CoreException, BadLocationException { ArrayList list = new ArrayList(); TestChangeStructure structure = new TestChangeStructure(project.getProject(), "/WebContent/pages/inputname.xhtml"); @@ -57,11 +58,11 @@ public void testRenameCompositeComponentFile() throws CoreException { checkRename(processor, sourceFile, "input2.xhtml", participant, list); } - public void testRenameCompositeComponentFolder() throws CoreException { + public void testRenameCompositeComponentFolder() throws CoreException, BadLocationException { ArrayList list = new ArrayList(); TestChangeStructure structure = new TestChangeStructure(project.getProject(), "/WebContent/pages/inputtype.xhtml"); - TestTextChange change = new TestTextChange(382, 5, "type2"); + TestTextChange change = new TestTextChange("http://java.sun.com/jsf/composite/type"/*382*/, 39, "http://java.sun.com/jsf/composite/type2"); structure.addTextChange(change); list.add(structure); @@ -75,11 +76,11 @@ public void testRenameCompositeComponentFolder() throws CoreException { checkRename(processor, sourceFolder, "type2", participant, list); } - public void testMoveCompositeComponentFile() throws CoreException { + public void testMoveCompositeComponentFile() throws CoreException, BadLocationException { ArrayList list = new ArrayList(); TestChangeStructure structure = new TestChangeStructure(project.getProject(), "/WebContent/pages/inputdata.xhtml"); - TestTextChange change = new TestTextChange(382, 3, "new"); + TestTextChange change = new TestTextChange("http://java.sun.com/jsf/composite/data"/*382*/, 37, "http://java.sun.com/jsf/composite/new"); structure.addTextChange(change); list.add(structure); @@ -94,11 +95,11 @@ public void testMoveCompositeComponentFile() throws CoreException { checkMove(processor, sourceFile, destinationFolder, participant, list); } - public void testMoveCompositeComponentFolder() throws CoreException { + public void testMoveCompositeComponentFolder() throws CoreException, BadLocationException { ArrayList list = new ArrayList(); TestChangeStructure structure = new TestChangeStructure(project.getProject(), "/WebContent/pages/inputnmbr.xhtml"); - TestTextChange change = new TestTextChange(382, 8, "new/nmbr"); + TestTextChange change = new TestTextChange("http://java.sun.com/jsf/composite/nmbr"/*382*/, 42, "http://java.sun.com/jsf/composite/new/nmbr"); structure.addTextChange(change); list.add(structure); diff --git a/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/MessagePropertyRefactoringTest.java b/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/MessagePropertyRefactoringTest.java index f3f4a24aa3..565aaac4d2 100644 --- a/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/MessagePropertyRefactoringTest.java +++ b/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/MessagePropertyRefactoringTest.java @@ -15,6 +15,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.TextSelection; import org.jboss.tools.common.base.test.AbstractRefactorTest; import org.jboss.tools.common.base.test.RenameParticipantTestUtil.TestChangeStructure; @@ -41,7 +42,7 @@ protected void setUp() throws Exception { project = ProjectImportTestSetup.loadProject(projectName); } - public void testMessagePropertyRename() throws CoreException { + public void testMessagePropertyRename() throws CoreException, BadLocationException { ArrayList list = new ArrayList(); IFile sourceFile = project.getProject().getFile("/WebContent/pages/hello.jsp"); diff --git a/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/refactoring/ELReferencesRenameTest.java b/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/refactoring/ELReferencesRenameTest.java index d01bfe7e78..e5c1a27920 100644 --- a/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/refactoring/ELReferencesRenameTest.java +++ b/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/refactoring/ELReferencesRenameTest.java @@ -5,6 +5,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.internal.corext.refactoring.rename.RenameNonVirtualMethodProcessor; +import org.eclipse.jface.text.BadLocationException; import org.jboss.tools.common.base.test.RenameParticipantTestUtil; import org.jboss.tools.common.base.test.RenameParticipantTestUtil.TestChangeStructure; import org.jboss.tools.common.base.test.RenameParticipantTestUtil.TestTextChange; @@ -16,16 +17,18 @@ public ELReferencesRenameTest(){ super("Rename Method Refactoring Test"); } - public void testRenameMethod() throws CoreException { + public void testRenameMethod() throws CoreException, BadLocationException { ArrayList list = new ArrayList(); TestChangeStructure structure = new TestChangeStructure(jsfProject, "/WebContent/pages/hello.jsp"); - TestTextChange change = new TestTextChange(353, 5, "alias"); + TestTextChange change = new TestTextChange("name", 5, "alias"); + change.setOffset(353); structure.addTextChange(change); list.add(structure); structure = new TestChangeStructure(jsfProject, "/WebContent/pages/inputUserName.jsp"); - change = new TestTextChange(499, 5, "alias"); + change = new TestTextChange("name", 5, "alias"); + change.setOffset(499); structure.addTextChange(change); list.add(structure); diff --git a/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java b/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java index 365b669518..a8eea153b7 100644 --- a/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java +++ b/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java @@ -8,6 +8,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.ltk.core.refactoring.CompositeChange; +import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import org.eclipse.ltk.core.refactoring.RefactoringStatusEntry; import org.eclipse.ltk.core.refactoring.TextFileChange; import org.eclipse.text.edits.MultiTextEdit; import org.jboss.tools.common.base.test.RenameParticipantTestUtil; @@ -18,6 +20,7 @@ import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.internal.core.refactoring.RenameComponentProcessor; import org.jboss.tools.test.util.ResourcesUtils; +import org.junit.Assert; public class SeamComponentRefactoringTest extends SeamRefactoringTest { @@ -114,7 +117,26 @@ private void renameComponent(ISeamProject seamProject, String componentName, Str // Rename Seam Component RenameComponentProcessor processor = new RenameComponentProcessor(component); processor.setNewName(newName); - processor.checkFinalConditions(new NullProgressMonitor(), null); + RefactoringStatus status = processor.checkInitialConditions(new NullProgressMonitor()); + + RefactoringStatusEntry[] entries = status.getEntries(); + for (RefactoringStatusEntry entry : entries) { + System.out.println("Refactor status - " + entry.getMessage()); + } + + Assert.assertNull("Rename processor returns fatal error", + status.getEntryMatchingSeverity(RefactoringStatus.FATAL)); + + status = processor.checkFinalConditions(new NullProgressMonitor(), null); + + entries = status.getEntries(); + for (RefactoringStatusEntry entry : entries) { + System.out.println("Refactor status - " + entry.getMessage()); + } + + Assert.assertNull("Rename processor returns fatal error", + status.getEntryMatchingSeverity(RefactoringStatus.FATAL)); + CompositeChange rootChange = (CompositeChange)processor.createChange(new NullProgressMonitor()); assertEquals("There is unexpected number of changes",changeList.size(), rootChange.getChildren().length); diff --git a/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamContextVariableRefactoringTest.java b/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamContextVariableRefactoringTest.java index 0364cc53d8..d9ef20a3ed 100644 --- a/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamContextVariableRefactoringTest.java +++ b/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamContextVariableRefactoringTest.java @@ -4,6 +4,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.text.BadLocationException; import org.jboss.tools.common.base.test.RenameParticipantTestUtil.TestChangeStructure; import org.jboss.tools.common.base.test.RenameParticipantTestUtil.TestTextChange; import org.jboss.tools.seam.internal.core.refactoring.RenameSeamContextVariableProcessor; @@ -13,7 +14,7 @@ public SeamContextVariableRefactoringTest(){ super("Seam Context Variable Refactoring Test"); } - public void testSeamContextVariable_Component_Rename() throws CoreException { + public void testSeamContextVariable_Component_Rename() throws CoreException, BadLocationException { ArrayList list = new ArrayList(); TestChangeStructure structure = new TestChangeStructure(ejbProject.getProject(), "/ejbModule/org/domain/"+warProjectName+"/session/TestComponent.java"); @@ -30,40 +31,40 @@ public void testSeamContextVariable_Component_Rename() throws CoreException { list.add(structure); structure = new TestChangeStructure(ejbProject, "/ejbModule/org/domain/"+warProjectName+"/session/TestSeamComponent.java"); - change = new TestTextChange(420, 11, "@In(\"best\")"); + change = new TestTextChange("@In(\"test\")"/*420*/, 11, "@In(\"best\")"); structure.addTextChange(change); change = new TestTextChange(389, 8, "(\"best\")"); structure.addTextChange(change); - change = new TestTextChange(455, 16, "@Factory(\"best\")"); + change = new TestTextChange("@Factory"/*455*/, 16, "@Factory(\"best\")"); structure.addTextChange(change); - change = new TestTextChange(529, 8, "(\"best\")"); + change = new TestTextChange(521, 8, "(\"best\")"); structure.addTextChange(change); - change = new TestTextChange(589, 4, "best"); + change = new TestTextChange(573, 4, "best"); structure.addTextChange(change); list.add(structure); structure = new TestChangeStructure(ejbProject, "/ejbModule/seam.properties"); - change = new TestTextChange(0, 4, "best"); + change = new TestTextChange("test", 4, "best"); structure.addTextChange(change); list.add(structure); structure = new TestChangeStructure(warProject, "/WebContent/test.xhtml"); - change = new TestTextChange(1088, 4, "best"); + change = new TestTextChange("test", 4, "best"); structure.addTextChange(change); list.add(structure); structure = new TestChangeStructure(warProject, "/WebContent/test.jsp"); - change = new TestTextChange(227, 4, "best"); + change = new TestTextChange("test", 4, "best"); structure.addTextChange(change); list.add(structure); structure = new TestChangeStructure(warProject, "/src/test.properties"); - change = new TestTextChange(29, 4, "best"); + change = new TestTextChange("test", 4, "best"); structure.addTextChange(change); list.add(structure); @@ -75,11 +76,11 @@ public void testSeamContextVariable_Component_Rename() throws CoreException { checkRename(processor, list); } - public void testSeamContextVariable_Factory1_Rename() throws CoreException { + public void testSeamContextVariable_Factory1_Rename() throws CoreException, BadLocationException { ArrayList list = new ArrayList(); TestChangeStructure structure = new TestChangeStructure(ejbProject.getProject(), "/ejbModule/org/domain/"+warProjectName+"/session/TestContextVariableFactory.java"); - TestTextChange change = new TestTextChange(464, 5, "\"bbc\""); + TestTextChange change = new TestTextChange("@Factory(\"abc\")", 15, "@Factory(\"bbc\")"); structure.addTextChange(change); list.add(structure); @@ -96,7 +97,7 @@ public void testSeamContextVariable_Factory1_Rename() throws CoreException { checkRename(processor, list); } - public void testSeamContextVariable_Factory2_Rename() throws CoreException { + public void testSeamContextVariable_Factory2_Rename() throws CoreException, BadLocationException { ArrayList list = new ArrayList(); TestChangeStructure structure = new TestChangeStructure(ejbProject.getProject(), "/ejbModule/org/domain/"+warProjectName+"/session/TestContextVariableFactory.java"); @@ -117,11 +118,11 @@ public void testSeamContextVariable_Factory2_Rename() throws CoreException { checkRename(processor, list); } - public void testSeamContextVariable_Out1_Rename() throws CoreException { + public void testSeamContextVariable_Out1_Rename() throws CoreException, BadLocationException { ArrayList list = new ArrayList(); TestChangeStructure structure = new TestChangeStructure(ejbProject.getProject(), "/ejbModule/org/domain/"+warProjectName+"/session/TestContextVariableOut.java"); - TestTextChange change = new TestTextChange(455, 5, "\"bbb\""); + TestTextChange change = new TestTextChange("@Out(\"aaa\")", 11, "@Out(\"bbb\")"); structure.addTextChange(change); list.add(structure); @@ -138,11 +139,11 @@ public void testSeamContextVariable_Out1_Rename() throws CoreException { checkRename(processor, list); } - public void testSeamContextVariable_Out2_Rename() throws CoreException { + public void testSeamContextVariable_Out2_Rename() throws CoreException, BadLocationException { ArrayList list = new ArrayList(); TestChangeStructure structure = new TestChangeStructure(ejbProject.getProject(), "/ejbModule/org/domain/"+warProjectName+"/session/TestContextVariableOut.java"); - TestTextChange change = new TestTextChange(516, 5, "\"eee\""); + TestTextChange change = new TestTextChange(515, 7, "(\"eee\")"); structure.addTextChange(change); list.add(structure); @@ -159,11 +160,11 @@ public void testSeamContextVariable_Out2_Rename() throws CoreException { checkRename(processor, list); } - public void testSeamContextVariable_DataModel1_Rename() throws CoreException { + public void testSeamContextVariable_DataModel1_Rename() throws CoreException, BadLocationException { ArrayList list = new ArrayList(); TestChangeStructure structure = new TestChangeStructure(ejbProject.getProject(), "/ejbModule/org/domain/"+warProjectName+"/session/TestContextVariableDataModel.java"); - TestTextChange change = new TestTextChange(483, 6, "\"dada\""); + TestTextChange change = new TestTextChange("@DataModel(\"data\")", 18, "@DataModel(\"dada\")"); structure.addTextChange(change); list.add(structure); @@ -180,11 +181,11 @@ public void testSeamContextVariable_DataModel1_Rename() throws CoreException { checkRename(processor, list); } - public void testSeamContextVariable_DataModel2_Rename() throws CoreException { + public void testSeamContextVariable_DataModel2_Rename() throws CoreException, BadLocationException { ArrayList list = new ArrayList(); TestChangeStructure structure = new TestChangeStructure(ejbProject.getProject(), "/ejbModule/org/domain/"+warProjectName+"/session/TestContextVariableDataModel.java"); - TestTextChange change = new TestTextChange(551, 7, "\"modal\""); + TestTextChange change = new TestTextChange(550, 9, "(\"modal\")"); structure.addTextChange(change); list.add(structure);