Author: dazarov Date: 2010-05-17 04:53:42 -0400 (Mon, 17 May 2010) New Revision: 22112 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java Log: https://jira.jboss.org/browse/JBIDE-5833 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java 2010-05-17 08:29:53 UTC (rev 22111) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java 2010-05-17 08:53:42 UTC (rev 22112) @@ -78,22 +78,22 @@ structure.addTextChange(change); list.add(structure); - renameComponent(seamEjbProject, "test", "best", list, false); + renameComponent(seamEjbProject, "test", "best", list, 0); } -// public void testRemaningMailSessionDeclarationInComponentsXml_JBIDE4447() throws CoreException { -// ArrayList<TestChangeStructure> list = new ArrayList<TestChangeStructure>(); -// -// TestChangeStructure structure = new TestChangeStructure(warProject, "/WebContent/WEB-INF/components.xml"); -// TestTextChange change = new TestTextChange(2345, 41, "name=\"org.jboss.seam.mail.newMailSession\""); -// structure.addTextChange(change); -// -// list.add(structure); -// -// renameComponent(seamWarProject, "org.jboss.seam.mail.mailSession", "org.jboss.seam.mail.newMailSession", list, true); -// } + public void testRemaningMailSessionDeclarationInComponentsXml_JBIDE4447() throws CoreException { + ArrayList<TestChangeStructure> list = new ArrayList<TestChangeStructure>(); - private void renameComponent(ISeamProject seamProject, String componentName, String newName, List<TestChangeStructure> changeList, boolean fromJar) throws CoreException{ + TestChangeStructure structure = new TestChangeStructure(warProject, "/WebContent/WEB-INF/components.xml"); + TestTextChange change = new TestTextChange(2345, 41, "name=\"org.jboss.seam.mail.newMailSession\""); + structure.addTextChange(change); + + list.add(structure); + + renameComponent(seamWarProject, "org.jboss.seam.mail.mailSession", "org.jboss.seam.mail.newMailSession", list, 8000); + } + + private void renameComponent(ISeamProject seamProject, String componentName, String newName, List<TestChangeStructure> changeList, long delay) throws CoreException{ JobUtils.waitForIdle(); // Test before renaming @@ -123,10 +123,13 @@ } rootChange.perform(new NullProgressMonitor()); - JobUtils.waitForIdle(); + + if(delay > 0) + JobUtils.waitForIdle(delay); + else + JobUtils.waitForIdle(); + // Test results - //if(!fromJar) - //assertNull("There is unexpected component in seam project: " + componentName, seamProject.getComponent(componentName)); assertNotNull("Can't load component " + newName, seamProject.getComponent(newName)); for(TestChangeStructure changeStructure : changeList){ IFile file = changeStructure.getProject().getFile(changeStructure.getFileName());