Author: vpakan(a)redhat.com Date: 2011-12-07 07:10:42 -0500 (Wed, 07 Dec 2011) New Revision: 37047 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/ContentAssistBot.java Log: Fixes for CodeComletionTest. Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2011-12-07 12:01:10 UTC (rev 37046) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2011-12-07 12:10:42 UTC (rev 37047) @@ -340,10 +340,12 @@ contentAssist.checkContentAssist(useCodeAssist, false); useCodeAssist = "prompt"; contentAssist.checkContentAssist(useCodeAssist, true); - final String textToInsertAtEnd = "\"/>"; + final String textToInsertAtEnd = "/>"; editor.insertText(editor.cursorPosition().line, - editor.cursorPosition().column + 2, + editor.cursorPosition().column + 3, textToInsertAtEnd); + editor.save(); + bot.sleep(Timing.time1S()); Assertions.assertSourceEditorContains(editor.getText(), textToInsert + "'" + useCodeAssist + "']}" + textToInsertAtEnd, FACELETS_TEST_PAGE); @@ -667,7 +669,7 @@ private void removeRichFacesFromJSF2ProjectClassPath(){ if (addedVariableRichfacesUiLocation != null){ BuildPathHelper.removeVariable(JSF2_TEST_PROJECT_NAME, addedVariableRichfacesUiLocation, true); + eclipse.cleanAllProjects(); } - eclipse.cleanAllProjects(); } } \ No newline at end of file Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/ContentAssistBot.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/ContentAssistBot.java 2011-12-07 12:01:10 UTC (rev 37046) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/ContentAssistBot.java 2011-12-07 12:10:42 UTC (rev 37047) @@ -15,6 +15,7 @@ import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Table; import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable; import org.eclipse.swtbot.swt.finder.results.VoidResult; import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; @@ -292,8 +293,15 @@ } } if (found == false) { - ccShell = bs2; - break; + // New Shell has to contain table + try{ + bs2.bot().table(); + ccShell = bs2; + break; + } + catch (WidgetNotFoundException wnfe){ + // do nothing + } } } return ccShell;