Author: akazakov Date: 2010-12-28 10:20:13 -0500 (Tue, 28 Dec 2010) New Revision: 27763 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/hello2.jsp trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/refactoring/ELReferencesRenameTest.java Log: https://issues.jboss.org/browse/JBIDE-8010 fixed jsf ui tests Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/hello2.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/hello2.jsp 2010-12-28 14:15:14 UTC (rev 27762) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/hello2.jsp 2010-12-28 15:20:13 UTC (rev 27763) @@ -13,7 +13,7 @@ <f:view> <h3> <h:outputText value="#{Message.hello_message}" />, - <h:outputText value="#{user.name}" />! + <h:outputText value=" user.name " />! </h3> </f:view> </body> Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/refactoring/ELReferencesRenameTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/refactoring/ELReferencesRenameTest.java 2010-12-28 14:15:14 UTC (rev 27762) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/refactoring/ELReferencesRenameTest.java 2010-12-28 15:20:13 UTC (rev 27763) @@ -19,18 +19,14 @@ import org.jboss.tools.test.util.JobUtils; public class ELReferencesRenameTest extends ELRefactoringTest { - public ELReferencesRenameTest(){ super("Rename Method Refactoring Test"); } - - public void testRenameMethod() throws CoreException { ArrayList<TestChangeStructure> list = new ArrayList<TestChangeStructure>(); - TestChangeStructure structure = new TestChangeStructure(jsfProject, "/WebContent/pages/hello.jsp"); TestTextChange change = new TestTextChange(353, 4, "name"); structure.addTextChange(change); @@ -40,34 +36,33 @@ change = new TestTextChange(499, 4, "name"); structure.addTextChange(change); list.add(structure); - + IMethod method = getJavaMethod(jsfProject, "demo.User", "getName"); renameELReferences(method, "alias", list); } - + private void renameELReferences(IJavaElement element, String newName, List<TestChangeStructure> changeList) throws CoreException{ JobUtils.waitForIdle(); - // Rename EL references RenameMethodParticipant participant = new RenameMethodParticipant(); participant.initialize(element, newName); RefactoringStatus status = participant.checkConditions(new NullProgressMonitor(), null); - + assertNotNull("Rename participant returned null status", status); - + assertFalse("There is fatal errors in rename participant", status.hasFatalError()); - + CompositeChange rootChange = (CompositeChange)participant.createChange(new NullProgressMonitor()); - + assertEquals("There is unexpected number of changes",changeList.size(), rootChange.getChildren().length); for(int i = 0; i < rootChange.getChildren().length;i++){ TextFileChange fileChange = (TextFileChange)rootChange.getChildren()[i]; MultiTextEdit edit = (MultiTextEdit)fileChange.getEdit(); - + TestChangeStructure change = findChange(changeList, fileChange.getFile()); if(change != null){ assertEquals(change.size(), edit.getChildrenSize());