Author: ldimaggio Date: 2012-05-14 23:15:41 -0400 (Mon, 14 May 2012) New Revision: 41013 Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorld.java trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLSimple.java trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceConsumer1.java Log: /* Close the open, but empty "Quick Fix" dialog if it is open. * Temporary fix to workaround https://issues.jboss.org/browse/JBIDE-11781 */ Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java 2012-05-15 00:32:15 UTC (rev 41012) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java 2012-05-15 03:15:41 UTC (rev 41013) @@ -47,7 +47,17 @@ fixExampleLibs(); if (getExampleClientProjectName()!=null) { fixExampleClientLibs(); + } + + /* Close the open, but empty "Quick Fix" dialog if it is open. + * Temporary fix to workaround https://issues.jboss.org/browse/JBIDE-11781 */ + try { + SWTTestExt.bot.shell("Quick Fix").close(); } + catch (Exception E) { + log.error("Condition from https://issues.jboss.org/browse/JBIDE-11781 not found " + E.getMessage()); + } + openESBConfig(); /* Temporary fix to workaround JBDS-2011 */ @@ -104,7 +114,7 @@ //console.switchConsole(configuredState.getServer().name); //String text2 = console.getConsoleText(TIME_5S, TIME_20S, false); - String text2 = console.getConsoleText(TIME_5S, TIME_60S, false); /* https://issues.jboss.org/browse/JBQA-5838 - ldimaggi */ + String text2 = console.getConsoleText(TIME_5S, TIME_30S, false); /* https://issues.jboss.org/browse/JBQA-5838 - ldimaggi */ log.info("text2 = " + text2); //console.clearConsole(); @@ -177,9 +187,6 @@ protected void assertProblemsView() { //bot.sleep(60000l); SWTBotTreeItem errors = ProblemsView.getErrorsNode(bot); - - - assertNull("Project still contain problems :"+SWTEclipseExt.getFormattedTreeNode(errors),errors); } protected void fixLibrary(String project, String lib) { Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorld.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorld.java 2012-05-15 00:32:15 UTC (rev 41012) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorld.java 2012-05-15 03:15:41 UTC (rev 41013) @@ -38,6 +38,5 @@ assertTrue("Calling ESB Send message failed, unexpected server output :"+text,text.contains("hello world esb")); SWTTestExt.servers.removeAllProjectsFromServer(); - } } Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLSimple.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLSimple.java 2012-05-15 00:32:15 UTC (rev 41012) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLSimple.java 2012-05-15 03:15:41 UTC (rev 41013) @@ -1,5 +1,6 @@ package org.jboss.tools.esb.ui.bot.tests.examples; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.ui.bot.ext.config.Annotations.Require; @@ -25,6 +26,16 @@ assertFalse ("Test fails due to ESB deployment error: NNNN", text.contains("ERROR [org.apache.juddi.v3.client.transport.wrapper.RequestHandler]")); assertNotNull("Calling Send message failed, nothing appened to server log",text); assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("<Order")); - SWTTestExt.servers.removeAllProjectsFromServer(); + + SWTTestExt.servers.removeAllProjectsFromServer(); + + /* Close the open, but empty "Quick Fix" dialog - https://issues.jboss.org/browse/JBIDE-11781 */ + try { + SWTTestExt.bot.shell("Quick Fix").close(); + } + catch (Exception E) { + System.out.println("Condition from https://issues.jboss.org/browse/JBIDE-11781 not found " + E.getMessage()); + } + //SWTTestExt.bot.closeAllShells(); // https://issues.jboss.org/browse/JBIDE-11781 } } Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceConsumer1.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceConsumer1.java 2012-05-15 00:32:15 UTC (rev 41012) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceConsumer1.java 2012-05-15 03:15:41 UTC (rev 41013) @@ -25,6 +25,14 @@ text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.webservice_consumer1.test","SendEsbMessage.java"); assertNotNull("Calling ESB Send message failed, nothing appened to server log",text); assertTrue("Calling ESB Send message failed, unexpected server output :"+text,text.contains("Hello World Greeting for")); - SWTTestExt.servers.removeAllProjectsFromServer(); + SWTTestExt.servers.removeAllProjectsFromServer(); + + /* Close the open, but empty "Quick Fix" dialog - https://issues.jboss.org/browse/JBIDE-11781 */ + try { + SWTTestExt.bot.shell("Quick Fix").close(); + } + catch (Exception E) { + System.out.println("Condition from https://issues.jboss.org/browse/JBIDE-11781 not found " + E.getMessage()); + } } }