Author: vpakan(a)redhat.com Date: 2012-04-13 08:51:38 -0400 (Fri, 13 Apr 2012) New Revision: 40174 Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/FormatUtils.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/QuickFixHelper.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/QuickFixBot.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/MarkersTest.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContentAssistHelper.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/SWTBotEditorExt.java Log: Added Quick Fix Testing Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/MarkersTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/MarkersTest.java 2012-04-13 10:59:41 UTC (rev 40173) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/MarkersTest.java 2012-04-13 12:51:38 UTC (rev 40174) @@ -10,12 +10,18 @@ ******************************************************************************/ package org.jboss.tools.jsf.ui.bot.test.smoke; +import java.util.LinkedList; + +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase; import org.jboss.tools.ui.bot.ext.SWTJBTExt; import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.ui.bot.ext.helper.MarkerHelper; +import org.jboss.tools.ui.bot.ext.helper.QuickFixHelper; import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt; +import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase; /** * Test Markers position and attributes regarding to JSF components within jsp page @@ -71,17 +77,58 @@ markerHelper.checkForMarker(String.valueOf(expectedMarkerLines[index] + 1), expectedMarkerDesc[index]); } + // check quick fix + LinkedList<String> expectedQuickFixes = new LinkedList<String>(); + expectedQuickFixes.add("Configure Problem Severity for preference 'Property cannot be resolved'"); + QuickFixHelper.checkQuickFixContent(SWTTestExt.bot, + TEST_PAGE, + textToSelect, + textToSelect.length(), + insertText.length(), + expectedQuickFixes); + editor.quickFix().useQuickFix(0); + final SWTBot botProperties = bot.shell(IDELabel.Shell.PREFERENCES_FILTERED).activate().bot(); + String selectedTreeItemLabel = botProperties.tree().selection().get(0,0); + boolean isFilterValueOK = false; + final String expectedFilterValue = "Property cannot be resolved:"; + try{ + botProperties.text(expectedFilterValue); + isFilterValueOK = true; + } catch (WidgetNotFoundException wnfe){ + // do nothing + } + boolean isValidationOptionPresent = false; + final String expectedValidationOption = "Property cannot be resolved:"; + try{ + botProperties.label(expectedValidationOption); + isValidationOptionPresent = true; + } catch (WidgetNotFoundException wnfe){ + // do nothing + } + bot.button(IDELabel.Button.CANCEL).click(); + final String expectedSelectedTreeItem = "Validation"; + assertTrue("Selected tree item within Preferences Dialog has to have label " + + expectedSelectedTreeItem + + " but is " + selectedTreeItemLabel, + selectedTreeItemLabel.equals(expectedSelectedTreeItem)); + assertTrue("Validation Filter has to have value " + expectedFilterValue + + " but it does not", + isFilterValueOK); + assertTrue("Validation Option has to have label " + expectedValidationOption + + " but it does not", + isValidationOptionPresent); } @Override -public void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); openPage(TEST_PAGE); editor = SWTTestExt.bot.swtBotEditorExtByTitle(TEST_PAGE); originalEditorText = editor.getText(); } + @Override -public void tearDown() throws Exception { - if (editor != null){ + public void tearDown() throws Exception { + if (editor != null) { editor.setText(originalEditorText); editor.saveAndClose(); } Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/FormatUtils.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/FormatUtils.java (rev 0) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/FormatUtils.java 2012-04-13 12:51:38 UTC (rev 40174) @@ -0,0 +1,69 @@ +/******************************************************************************* + * Copyright (c) 2007-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.ui.bot.ext; + +import java.util.Iterator; +import java.util.List; + +/** + * Utils for Formating + * @author Vladimir Pakan + */ +public class FormatUtils { + /** + * Get formatted difference between list0 and list1 + * @param list0 + * @param list1 + * @return + */ + public static String getListsDiffFormatted (List<String> list0 , List<String> list1){ + StringBuffer sb = new StringBuffer(""); + if (list0 == null && list1 == null){ + sb.append("<null> == <null>"); + }else if (list0 == null){ + sb.append("<null> != <not null>"); + }else if (list1 == null){ + sb.append("<null> != <not null>"); + } else{ + Iterator<String> iterator0 = list0.iterator(); + Iterator<String> iterator1 = list1.iterator(); + boolean continueIteration = iterator0.hasNext() || iterator1.hasNext(); + while (continueIteration){ + String item0 = "<null>"; + String item1 = "<null>"; + sb.append(" "); + if (iterator0.hasNext()){ + item0 = iterator0.next(); + } + if (iterator1.hasNext()){ + item1 = iterator1.next(); + } + sb.append(" "); + sb.append(item0); + sb.append(item0.equals(item1) ? " == " : " != "); + sb.append(item1); + continueIteration = iterator0.hasNext() || iterator1.hasNext(); + if (continueIteration){ + sb.append("\n"); + } + } + } + System.out.println(sb.toString()); + for (String item : list1){ + System.out.println("result.add(\"" + item.replaceAll("\"", "\\\"") + "\");"); + } + + return sb.toString(); + } + + +} Property changes on: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/FormatUtils.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContentAssistHelper.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContentAssistHelper.java 2012-04-13 10:59:41 UTC (rev 40173) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContentAssistHelper.java 2012-04-13 12:51:38 UTC (rev 40174) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007-2011 Red Hat, Inc. + * Copyright (c) 2007-2012 Red Hat, Inc. * Distributed under license by Red Hat, Inc. All rights reserved. * This program is made available under the terms of the * Eclipse Public License v1.0 which accompanies this distribution, @@ -13,10 +13,10 @@ import static org.junit.Assert.assertTrue; -import java.util.Iterator; import java.util.List; import org.apache.log4j.Logger; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; +import org.jboss.tools.ui.bot.ext.FormatUtils; import org.jboss.tools.ui.bot.ext.SWTBotExt; import org.jboss.tools.ui.bot.ext.SWTJBTExt; import org.jboss.tools.ui.bot.ext.SWTTestExt; @@ -56,7 +56,7 @@ List<String> currentProposalList = contentAssist.getProposalList(); assertTrue("Code Assist menu has incorrect menu items.\n" + "Expected Proposal Menu Labels vs. Current Proposal Menu Labels :\n" + - ContentAssistHelper.getListsDiffFormatted(expectedProposalList,currentProposalList), + FormatUtils.getListsDiffFormatted(expectedProposalList,currentProposalList), expectedProposalList.equals(currentProposalList)); return editor; @@ -86,50 +86,5 @@ expectedProposalList); } - /** - * Get formatted difference between list0 and list1 - * @param list0 - * @param list1 - * @return - */ - private static String getListsDiffFormatted (List<String> list0 , List<String> list1){ - StringBuffer sb = new StringBuffer(""); - if (list0 == null && list1 == null){ - sb.append("<null> == <null>"); - }else if (list0 == null){ - sb.append("<null> != <not null>"); - }else if (list1 == null){ - sb.append("<null> != <not null>"); - } else{ - Iterator<String> iterator0 = list0.iterator(); - Iterator<String> iterator1 = list1.iterator(); - boolean continueIteration = iterator0.hasNext() || iterator1.hasNext(); - while (continueIteration){ - String item0 = "<null>"; - String item1 = "<null>"; - sb.append(" "); - if (iterator0.hasNext()){ - item0 = iterator0.next(); - } - if (iterator1.hasNext()){ - item1 = iterator1.next(); - } - sb.append(" "); - sb.append(item0); - sb.append(item0.equals(item1) ? " == " : " != "); - sb.append(item1); - continueIteration = iterator0.hasNext() || iterator1.hasNext(); - if (continueIteration){ - sb.append("\n"); - } - } - } - System.out.println(sb.toString()); - for (String item : list1){ - System.out.println("result.add(\"" + item.replaceAll("\"", "\\\"") + "\");"); - } - - return sb.toString(); - } } Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/QuickFixHelper.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/QuickFixHelper.java (rev 0) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/QuickFixHelper.java 2012-04-13 12:51:38 UTC (rev 40174) @@ -0,0 +1,90 @@ + /******************************************************************************* + * Copyright (c) 2007-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.ui.bot.ext.helper; + +import static org.junit.Assert.assertTrue; + +import java.util.List; +import org.apache.log4j.Logger; +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; +import org.jboss.tools.ui.bot.ext.FormatUtils; +import org.jboss.tools.ui.bot.ext.SWTBotExt; +import org.jboss.tools.ui.bot.ext.SWTJBTExt; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.Timing; +import org.jboss.tools.ui.bot.ext.parts.QuickFixBot; +import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt; + +/** + * Helper for Quick Fix functionality testing + * @author Vladimir Pakan + * + */ +public class QuickFixHelper { + protected static final Logger log = Logger.getLogger(QuickFixHelper.class); + /** + * Checks Quick Fix content on specified position within editor with editorTitle + * and checks if expectedQuickFixList is equal to current Quick Fix List + * @param editorTitle + * @param textToSelect + * @param selectionOffset + * @param selectionLength + * @param textToSelectIndex + * @param expectedQuickFixsList + */ + public static SWTBotEditor checkQuickFixContent(SWTBotExt bot, + String editorTitle, String textToSelect, int selectionOffset, + int selectionLength, int textToSelectIndex, List<String> expectedQuickFixsList) { + + SWTJBTExt.selectTextInSourcePane(bot, + editorTitle, textToSelect, selectionOffset, selectionLength, + textToSelectIndex); + + bot.sleep(Timing.time1S()); + + SWTBotEditorExt editor = SWTTestExt.bot.swtBotEditorExtByTitle(editorTitle); + QuickFixBot quickFix = editor.quickFix(); + List<String> currentQuickFixsList = quickFix.getQuickFixList(); + assertTrue("Quick Fix menu has incorrect menu items.\n" + + "Expected Qucik Fix Menu Labels vs. Current Quick Fix Menu Labels :\n" + + FormatUtils.getListsDiffFormatted(expectedQuickFixsList,currentQuickFixsList), + expectedQuickFixsList.equals(currentQuickFixsList)); + + return editor; + + } + + /** + * Checks Quick Fix content on specified position within editor with editorTitle + * and checks if expectedQuickFixsList is equal to current Quick Fix List + * @param editorTitle + * @param textToSelect + * @param selectionOffset + * @param selectionLength + * @param textToSelectIndex + * @param expectedQuickFixsList + */ + public static SWTBotEditor checkQuickFixContent(SWTBotExt bot, + String editorTitle, String textToSelect, int selectionOffset, + int selectionLength, List<String> expectedQuickFixsList) { + + return QuickFixHelper.checkQuickFixContent(bot, + editorTitle, + textToSelect, + selectionOffset, + selectionLength, + 0, + expectedQuickFixsList); + + } + +} Property changes on: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/QuickFixHelper.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/QuickFixBot.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/QuickFixBot.java (rev 0) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/QuickFixBot.java 2012-04-13 12:51:38 UTC (rev 40174) @@ -0,0 +1,256 @@ + /******************************************************************************* + * Copyright (c) 2007-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.ui.bot.ext.parts; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.log4j.Logger; +import org.eclipse.swt.SWT; +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; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; +import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; +import org.jboss.tools.ui.bot.ext.types.IDELabel; + +/** + * This provides working Content assist functionality. + * SWTBot (2.0.0#467) functionality provided in SWTEclipseEditor doesn't work (at least on GTK linux) + * @author jpeterka + * + */ +public class QuickFixBot { + /** + * Performs content assist for given editor and string + * + * @param editor + * @param text + */ + + Logger log = Logger.getLogger(QuickFixBot.class); + SWTBotEditorExt editor; + SWTBot bot; + + // ------------------------------------------------------------ + // Constructor + // ------------------------------------------------------------ + + /** + * Basic constructor + */ + public QuickFixBot(SWTBotEditorExt editor) { + this.editor = editor; + this.bot = editor.bot(); + } + + + // ------------------------------------------------------------ + // Public + // ------------------------------------------------------------ + /** + * Use selected Quick Fix with given Quick Fix text + */ + public void useQuickFix(String text) { + SWTBotTable table = getQuickFixTable(openQuickFixList()); + List<String> items = getTableItems(table); + if (items.contains(text)) { + final int index = items.indexOf(text); + seletctQFTableItem(table, index); + } else { + fail("Quick Fix doens't contain Quick Fix text"); + } + } + /** + * Use selected Quick Fix with given Quick Fix index + */ + public void useQuickFix(int index) { + SWTBotTable table = getQuickFixTable(openQuickFixList()); + seletctQFTableItem(table, index); + } + + /** + * Logs Quick Fix list contents, usual for debug purposes + * + * @param text + */ + public void logQuickFixList() { + List<String> list = getQuickFixList(); + log.info("Quick Fix item list: " + list.size() + " item(s)"); + for (int i = 0; i < list.size(); i++) { + log.info("Item i:" + list.get(i)); + } + } + /** + * Returns Quick Fix list + * @return + */ + public List<String>getQuickFixList() { + List<String> result = null; + SWTBotShell shell = openQuickFixList(); + SWTBotTable table = getQuickFixTable(shell); + result = getTableItems(table); + shell.close(); + + return result; + } + /** + * Logs Quick Fix list contents, when Quick Fixt window is already opened + * @param shellsBefore - list of shells before Content Assist was invoked + * @param shellsAfter - list of shells after Content Assist was invoked + * @param closeShell + * @return + */ + public List<String>getQuickFixList(SWTBotShell[] shellsBefore, SWTBotShell[] shellsAfter, boolean closeShell) { + List<String> result = null; + SWTBotShell caShell = getQuickFixShell(shellsBefore, shellsAfter); + SWTBotTable caTable = getQuickFixTable(caShell); + result = getTableItems(caTable); + if (closeShell) { + caShell.close(); + } + + return result; + } + // ------------------------------------------------------------ + // Private + // ------------------------------------------------------------ + /* + * Invokes QuickFix shell action + */ + private void invokeQuickFix() { + ContextMenuHelper.clickContextMenu(editor, + IDELabel.Menu.QUICK_FIX); + } + + /** + * Return list of table items. Requires activated proposal table + * @param table + * @return + */ + private List<String> getTableItems(SWTBotTable table) { + int rows = table.rowCount(); + List<String> list = new ArrayList<String>(); + for (int i = 0; i < rows; i++) { + list.add(table.cell(i, 0)); + } + return list; + } + + /** + * Returns Quick fix table from Quick Fix shell + * @param qfShell + * @return + */ + private SWTBotTable getQuickFixTable(SWTBotShell qfShell) { + SWTBot qfBot = new SWTBot(qfShell.widget); + return qfBot.table(); + } + + /** + * Opens Quick Fix table + * @return Quick Fix bot shell + */ + private SWTBotShell openQuickFixList() { + SWTBotShell[] shells1 = bot.shells(); + invokeQuickFix(); + SWTBotShell[] shells2 = bot.shells(); + SWTBotShell qfShell = getQuickFixShell(shells1, shells2); + return qfShell; + + } + + /** + * Select table item from code completion table. It's workaround because + * SWTBotTable methods doesn't work property for this case + * + * @param botTable + * @param index + */ + private void seletctQFTableItem(final SWTBotTable botTable, final int index) { + UIThreadRunnable.asyncExec(new VoidResult() { + public void run() { + Table table = botTable.widget; + table.setSelection(index); + Event event = new Event(); + event.type = SWT.Selection; + event.widget = table; + event.item = table.getItem(index); + table.notifyListeners(SWT.Selection, event); + table.notifyListeners(SWT.DefaultSelection, event); + } + }); + } + + /** + * Return Quick Fix shell as new shell from two collections of shells + * + * @param s1 + * @param s2 + * @return + */ + private SWTBotShell getQuickFixShell(SWTBotShell[] s1, SWTBotShell[] s2) { + SWTBotShell ccShell = null; + for (SWTBotShell bs2 : s2) { + boolean found = false; + for (SWTBotShell bs1 : s1) { + if (bs2.widget.equals(bs1.widget)) { + found = true; + break; + } + } + if (found == false) { + // New Shell has to contain table + try{ + bs2.bot().table(); + ccShell = bs2; + break; + } + catch (WidgetNotFoundException wnfe){ + // do nothing + } + } + } + return ccShell; + } + /** + * Check if quickFixItemLabel is present within Content Assist and + * choose it when applyQuickFix is true + * @param quickFixItemLabel + * @param applyQuickFix + */ + public void checkQuickFix(String quickFixItemLabel,boolean applyQuickFix){ + List<String> quickFixList = getQuickFixList(); + + assertNotNull("Editor Quick Fix doesn't containt item with label: " + quickFixItemLabel + + ". It's null", + quickFixList); + + int itemIndex = quickFixList.indexOf(quickFixItemLabel); + + assertTrue("Editor Quick Fix doesn't containt item with label: " + quickFixItemLabel, + itemIndex > -1); + + if (applyQuickFix){ + useQuickFix(itemIndex); + } + + } +} Property changes on: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/QuickFixBot.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/SWTBotEditorExt.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/SWTBotEditorExt.java 2012-04-13 10:59:41 UTC (rev 40173) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/SWTBotEditorExt.java 2012-04-13 12:51:38 UTC (rev 40174) @@ -38,6 +38,11 @@ return caBot; } + public QuickFixBot quickFix() { + QuickFixBot qfBot = new QuickFixBot(this); + return qfBot; + } + public void selectPage(int pageIndex){ try{ final CTabFolder tabFolder = this.findWidget(widgetOfType(CTabFolder.class));