[jbosstools-commits] JBoss Tools SVN: r10464 - in trunk: seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/hyperlink and 3 other directories.

Author: dgolovin Date: 2008-09-24 18:46:50 -0400 (Wed, 24 Sep 2008) New Revision: 10464 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/hyperlink/SeamViewHyperlinkPartitionerTest.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTestSetup.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/OpenSeamComponentDialogTest.java trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ProjectImportTestSetup.java trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java Log: fix tearDown() methods for Seam UI tests. They are now disable Build Automatically, then delete projects, then restore Build Automatically Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2008-09-24 18:59:20 UTC (rev 10463) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2008-09-24 22:46:50 UTC (rev 10464) @@ -27,6 +27,7 @@ import org.jboss.tools.seam.core.project.facet.SeamVersion; import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties; import org.jboss.tools.seam.internal.core.project.facet.SeamFacetInstallDataModelProvider; +import org.jboss.tools.test.util.ResourcesUtils; import org.jboss.tools.test.util.xpl.EditorTestHelper; /** @@ -106,7 +107,7 @@ boolean oldAutoBuilding = true; Exception last = null; try { - oldAutoBuilding = setAutoBuilding(false); + oldAutoBuilding = ResourcesUtils.setBuildAutomatically(false); for (IResource r : this.resourcesToCleanup) { try { System.out.println("Deleting " + r); @@ -122,7 +123,7 @@ runnable.run(); } } finally { - setAutoBuilding(oldAutoBuilding); + ResourcesUtils.setBuildAutomatically(oldAutoBuilding); } if(last!=null) throw last; @@ -262,18 +263,6 @@ } } - - protected boolean setAutoBuilding(boolean state) throws CoreException { - boolean oldAutoBuilding; - IWorkspace workspace = ResourcesPlugin.getWorkspace(); - IWorkspaceDescription description = workspace.getDescription(); - oldAutoBuilding = description.isAutoBuilding(); - if (state != oldAutoBuilding) { - description.setAutoBuilding(state); - workspace.setDescription(description); - } - return oldAutoBuilding; - } public static void delay(long waitTimeMillis) { Display display = Display.getCurrent(); Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/hyperlink/SeamViewHyperlinkPartitionerTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/hyperlink/SeamViewHyperlinkPartitionerTest.java 2008-09-24 18:59:20 UTC (rev 10463) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/hyperlink/SeamViewHyperlinkPartitionerTest.java 2008-09-24 22:46:50 UTC (rev 10464) @@ -52,7 +52,12 @@ protected void tearDown() throws Exception { if(project != null) { - project.delete(true, true, null); + boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); + try { + project.delete(true,true, null); + } finally { + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + } } } Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTestSetup.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTestSetup.java 2008-09-24 18:59:20 UTC (rev 10463) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTestSetup.java 2008-09-24 22:46:50 UTC (rev 10464) @@ -10,8 +10,10 @@ ******************************************************************************/ package org.jboss.tools.seam.ui.test.view; +import junit.extensions.TestSetup; +import junit.framework.Test; + import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Platform; import org.jboss.tools.jst.web.ui.WebDevelopmentPerspectiveFactory; @@ -19,9 +21,6 @@ import org.jboss.tools.test.util.WorkbenchUtils; import org.jboss.tools.test.util.xpl.EditorTestHelper; -import junit.extensions.TestSetup; -import junit.framework.Test; - /** * @author eskimo * @@ -56,7 +55,12 @@ */ protected void tearDown() throws Exception { EditorTestHelper.joinBackgroundActivities(); - project.delete(true,true, null); + boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); + try { + project.delete(true,true, null); + } finally { + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + } } } Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/OpenSeamComponentDialogTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/OpenSeamComponentDialogTest.java 2008-09-24 18:59:20 UTC (rev 10463) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/OpenSeamComponentDialogTest.java 2008-09-24 22:46:50 UTC (rev 10464) @@ -23,6 +23,7 @@ import org.jboss.tools.seam.ui.wizard.OpenSeamComponentDialog; import org.jboss.tools.seam.ui.wizard.OpenSeamComponentDialog.SeamComponentWrapper; import org.jboss.tools.test.util.ProjectImportTestSetup; +import org.jboss.tools.test.util.ResourcesUtils; import org.jboss.tools.test.util.xpl.EditorTestHelper; /** @@ -54,12 +55,17 @@ @Override protected void tearDown() throws Exception { - EditorTestHelper.joinBackgroundActivities(); - if(project != null){ - project.close(new NullProgressMonitor()); - project.delete(true, new NullProgressMonitor()); - project = null; + boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); + try { EditorTestHelper.joinBackgroundActivities(); + if(project != null){ + project.close(new NullProgressMonitor()); + project.delete(true, new NullProgressMonitor()); + project = null; + EditorTestHelper.joinBackgroundActivities(); + } + } finally { + ResourcesUtils.setBuildAutomatically(saveAutoBuild); } } @@ -88,7 +94,7 @@ dialog.setInitialPattern(pattern); dialog.beginTest(); if(wait){ - try{ + try { EditorTestHelper.joinBackgroundActivities(); }catch(Exception ex){ ex.printStackTrace(); Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ProjectImportTestSetup.java =================================================================== --- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ProjectImportTestSetup.java 2008-09-24 18:59:20 UTC (rev 10463) +++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ProjectImportTestSetup.java 2008-09-24 22:46:50 UTC (rev 10464) @@ -19,6 +19,7 @@ import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; +import org.eclipse.ui.ide.ResourceUtil; import org.jboss.tools.test.util.xpl.EditorTestHelper; /** @@ -82,9 +83,11 @@ @Override protected void tearDown() throws Exception { + boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); for (int i = 0; i < projectNames.length; i++) { ResourcesUtils.deleteProject(projectNames[i]); EditorTestHelper.joinBackgroundActivities(); } + ResourcesUtils.setBuildAutomatically(saveAutoBuild); } } \ No newline at end of file Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java =================================================================== --- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java 2008-09-24 18:59:20 UTC (rev 10463) +++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java 2008-09-24 22:46:50 UTC (rev 10464) @@ -23,6 +23,7 @@ import org.eclipse.core.resources.IProjectDescription; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.resources.IWorkspaceDescription; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.FileLocator; @@ -165,4 +166,16 @@ member.getProject().delete(true, true, null); } } + + public static boolean setBuildAutomatically(boolean state) throws CoreException { + boolean oldAutoBuilding; + IWorkspace workspace = ResourcesPlugin.getWorkspace(); + IWorkspaceDescription description = workspace.getDescription(); + oldAutoBuilding = description.isAutoBuilding(); + if (state != oldAutoBuilding) { + description.setAutoBuilding(state); + workspace.setDescription(description); + } + return oldAutoBuilding; + } }