Author: rawagner Date: 2012-02-09 05:32:18 -0500 (Thu, 09 Feb 2012) New Revision: 38540 Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/Configurators.java trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedJSFProjectTest.java Log: longer timeout for JSF project Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/Configurators.java =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/Configurators.java 2012-02-09 10:30:57 UTC (rev 38539) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/Configurators.java 2012-02-09 10:32:18 UTC (rev 38540) @@ -263,11 +263,11 @@ } private void addServlet(String projectName, String servletName, String servletClass, String load) throws Exception{ - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); + IProject facade = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); DocumentBuilder docBuilder = factory.newDocumentBuilder(); - Document docPom = docBuilder.parse(project.getProject().getFile("web.xml").getContents()); + Document docPom = docBuilder.parse(facade.getProject().getFile("web.xml").getContents()); Element servletElement = docPom.createElement("servlet"); Element servletNameElement = docPom.createElement("servlet-name"); Element servletClassElement = docPom.createElement("servlet-class"); @@ -288,7 +288,7 @@ StreamResult result = new StreamResult(xmlAsWriter); DOMSource source = new DOMSource(docPom); trans.transform(source, result); - project.getProject().getFile("web.xml").setContents(new ByteArrayInputStream(xmlAsWriter.toString().getBytes("UTF-8")), 0, null); + facade.getProject().getFile("web.xml").setContents(new ByteArrayInputStream(xmlAsWriter.toString().getBytes("UTF-8")), 0, null); botUtil.waitForAll(); updateConf(projectName); } Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedJSFProjectTest.java =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedJSFProjectTest.java 2012-02-09 10:30:57 UTC (rev 38539) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedJSFProjectTest.java 2012-02-09 10:32:18 UTC (rev 38540) @@ -29,6 +29,7 @@ import org.eclipse.swtbot.swt.finder.keyboard.Keystrokes; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.ui.bot.ext.SWTBotExt; +import org.jboss.tools.ui.bot.ext.SWTUtilExt; import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.junit.BeforeClass; import org.junit.Test; @@ -58,6 +59,7 @@ public static final String JSF_VERSION_2 ="2.0"; protected static SWTWorkbenchBot bot; + private SWTUtilExt botUtil = new SWTUtilExt(bot); @BeforeClass @@ -134,9 +136,9 @@ shellRuntime = bot.shell("New Server").activate().bot(); shellRuntime.tree().expandNode("JBoss Community").select(server); shellRuntime.button("Finish").click(); - waitForIdle(); + botUtil.waitForAll(Long.MAX_VALUE); shell.button("Finish").click();; - waitForIdle(); + botUtil.waitForAll(Long.MAX_VALUE); }