[jbosstools-commits] JBoss Tools SVN: r42328 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring.

[jbosstools-commits at lists.jboss.org]

Author: dazarov
Date: 2012-06-29 17:56:30 -0400 (Fri, 29 Jun 2012)
New Revision: 42328

Modified:
   trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java
Log:
org.jboss.tools.seam.core.test.refactoring.SeamPropertyRefactoringTest failure https://issues.jboss.org/browse/JBIDE-12267

Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java	2012-06-29 20:27:46 UTC (rev 42327)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java	2012-06-29 21:56:30 UTC (rev 42328)
@@ -265,7 +265,12 @@
 		HashMap<String, String> preferences = new HashMap<String, String>();
 		preferences.put(ISeamFacetDataModelProperties.WEB_CONTENTS_FOLDER, "/RefactoringTestProject-war/"+viewFolderParentName+"/WebContent");
 		
-		moveFolder(viewFolderPath, "/" + warProjectName + "/" + viewFolderParentName, preferences);
+		try{
+			moveFolder(viewFolderPath, "/" + warProjectName + "/" + viewFolderParentName, preferences);
+		}finally{
+			viewFolderParentName = "webroot";
+			updateFields();
+		}
 	}
 
 	private void updateFields() {
@@ -380,18 +385,18 @@
 		checkRename(processor, project, newProjectName, participant, preferences);
 	}
 
-	private void performRename(RenameSupport support) throws CoreException {
-		Shell parent = WorkbenchUtils.getActiveShell();
-		IWorkbenchWindow context = WorkbenchUtils.getWorkbench().getActiveWorkbenchWindow();
-		try {
-			support.perform(parent, context);
-		} catch (InterruptedException e) {
-			JUnitUtils.fail("Rename failed", e);
-		} catch (InvocationTargetException e) {
-			JUnitUtils.fail("Rename failed", e);
-		}
-		JobUtils.waitForIdle();
-	}
+//	private void performRename(RenameSupport support) throws CoreException {
+//		Shell parent = WorkbenchUtils.getActiveShell();
+//		IWorkbenchWindow context = WorkbenchUtils.getWorkbench().getActiveWorkbenchWindow();
+//		try {
+//			support.perform(parent, context);
+//		} catch (InterruptedException e) {
+//			JUnitUtils.fail("Rename failed", e);
+//		} catch (InvocationTargetException e) {
+//			JUnitUtils.fail("Rename failed", e);
+//		}
+//		JobUtils.waitForIdle();
+//	}
 
 	private void moveFolder(String folderPath, String destinationFolderPath, HashMap<String, String> preferences) throws CoreException {
 		IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(folderPath);