Author: vpakan(a)redhat.com Date: 2012-10-10 06:58:19 -0400 (Wed, 10 Oct 2012) New Revision: 44408 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AttributeRenameTest.java trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2MoveParticipantTest.java trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java Log: Refactor deleting of project items within tearDown() method. Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AttributeRenameTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AttributeRenameTest.java 2012-10-10 10:55:22 UTC (rev 44407) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AttributeRenameTest.java 2012-10-10 10:58:19 UTC (rev 44408) @@ -6,7 +6,6 @@ import org.eclipse.swtbot.swt.finder.SWTBot; import org.eclipse.swtbot.swt.finder.widgets.SWTBotStyledText; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; -import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.jboss.tools.ui.bot.test.WidgetVariables; public class JSF2AttributeRenameTest extends JSF2AbstractRefactorTest { @@ -74,18 +73,8 @@ @Override public void tearDown() throws Exception { - SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER) - .bot(); - SWTBotTree tree = innerBot.tree(); - tree.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ - bot.button("OK").click(); //$NON-NLS-1$ - delay(); - tree.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode("resources").expandNode("mycomp").expandNode("echo.xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ - bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ - bot.shell(IDELabel.Shell.CONFIRM_DELETE).activate(); - bot.button("OK").click(); //$NON-NLS-1$ - delay(); + eclipse.deleteFile(JBT_TEST_PROJECT_NAME,"WebContent",JSF2_Test_Page_Name + ".xhtml"); + eclipse.deleteFile(JBT_TEST_PROJECT_NAME,"WebContent","resources","mycomp","echo.xhtml"); super.tearDown(); } Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2MoveParticipantTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2MoveParticipantTest.java 2012-10-10 10:55:22 UTC (rev 44407) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2MoveParticipantTest.java 2012-10-10 10:58:19 UTC (rev 44408) @@ -69,20 +69,8 @@ @Override public void tearDown() throws Exception { - SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER) - .bot(); - SWTBotTree tree = innerBot.tree(); - delay(); - tree - .expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ - bot.button("OK").click(); //$NON-NLS-1$ - delay(); - tree - .expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode("resources").expandNode("mycomp1").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ - bot.button("OK").click(); //$NON-NLS-1$ - delay(); + eclipse.deleteFile(JBT_TEST_PROJECT_NAME,"WebContent",JSF2_Test_Page_Name + ".xhtml"); + eclipse.deleteFile(JBT_TEST_PROJECT_NAME,"WebContent","resources","mycomp1"); super.tearDown(); } Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java 2012-10-10 10:55:22 UTC (rev 44407) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java 2012-10-10 10:58:19 UTC (rev 44408) @@ -45,19 +45,8 @@ @Override public void tearDown() throws Exception { - SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER) - .bot(); - SWTBotTree tree = innerBot.tree(); - tree - .expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ - bot.button("OK").click(); //$NON-NLS-1$ - delay(); - tree - .expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode("resources").expandNode("mycomp").expandNode("echo1.xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ - bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ - bot.button("OK").click(); //$NON-NLS-1$ - delay(); + eclipse.deleteFile(JBT_TEST_PROJECT_NAME, "WebContent",JSF2_Test_Page_Name + ".xhtml"); + eclipse.deleteFile(JBT_TEST_PROJECT_NAME,"WebContent","resources","mycomp","echo1.xhtml"); super.tearDown(); }