[jbosstools-commits] JBoss Tools SVN: r22285 - trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard.

Author: vpakan(a)redhat.com Date: 2010-05-24 10:46:12 -0400 (Mon, 24 May 2010) New Revision: 22285 Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/NewXHTMLPageWizardTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java Log: Reflect changes in UI for JBT 3.1. version Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/NewXHTMLPageWizardTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/NewXHTMLPageWizardTest.java 2010-05-24 14:18:08 UTC (rev 22284) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/NewXHTMLPageWizardTest.java 2010-05-24 14:46:12 UTC (rev 22285) @@ -39,14 +39,11 @@ this.bot.menu("File").menu("New").menu("Other...").click(); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ this.bot.shell("New").activate(); //$NON-NLS-1$ SWTBotTree importTree = this.bot.tree(); - importTree.expandNode("JBoss Tools Web").select("XHTML Page"); //$NON-NLS-1$//$NON-NLS-2$ + importTree.expandNode("JBoss Tools Web").select("XHTML File"); //$NON-NLS-1$//$NON-NLS-2$ this.bot.button(WidgetVariables.NEXT_BUTTON).click(); - this.bot.shell("New XHTML Page"); //$NON-NLS-1$ -// this.bot.textWithMessage("File name:").setText("test.xhtml"); //$NON-NLS-1$ - this.bot.textWithLabel("File name:").setText("test"); //$NON-NLS-1$ //$NON-NLS-2$ + this.bot.shell("New File XHTML"); //$NON-NLS-1$ + this.bot.textWithLabel("Name*").setText("test"); //$NON-NLS-1$ //$NON-NLS-2$ this.bot.button(WidgetVariables.NEXT_BUTTON).click(); - this.bot.checkBox("Use XHTML Template").click(); //$NON-NLS-1$ - this.bot.button(WidgetVariables.NEXT_BUTTON).click(); this.bot.button(WidgetVariables.FINISH_BUTTON).click(); assertEquals("Active Editor Title should be" ,"test.xhtml", this.bot.activeEditor().getTitle()); //$NON-NLS-1$ //$NON-NLS-2$ } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java 2010-05-24 14:18:08 UTC (rev 22284) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java 2010-05-24 14:46:12 UTC (rev 22285) @@ -32,10 +32,10 @@ .expandNode("JBoss Tools") //$NON-NLS-1$ .expandNode("Web") //$NON-NLS-1$ .expandNode("Editors") //$NON-NLS-1$ - .expandNode("Visual Page Editor") //$NON-NLS-1$ - .select("Templates").click(); //$NON-NLS-1$ + .expandNode("Visual Page Editor").select(); //$NON-NLS-1$ + bot.tabItem("Templates").activate(); //$NON-NLS-1$ try{ - this.bot.button("New...").click(); //$NON-NLS-1$ + this.bot.button("Add").click(); //$NON-NLS-1$ this.bot.button("Cancel").click(); //$NON-NLS-1$ } catch(WidgetNotFoundException ex){ fail("Preference Page has not been created"+ex);//$NON-NLS-1$