Author: yzhishko
Date: 2009-07-28 12:06:26 -0400 (Tue, 28 Jul 2009)
New Revision: 16845
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java
Log:
Test was completed
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java 2009-07-28
14:36:29 UTC (rev 16844)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java 2009-07-28
16:06:26 UTC (rev 16845)
@@ -1,12 +1,15 @@
package org.jboss.tools.vpe.ui.bot.test.editor;
import java.util.List;
+
+import org.eclipse.jface.bindings.keys.KeyStroke;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.keyboard.Keystrokes;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.jboss.tools.ui.bot.test.WidgetVariables;
import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
@@ -43,6 +46,7 @@
editor.navigateTo(22,22);
bot.menu("Source").menu("Toggle Comment").click();
waitForJobs();
+ checkSelectionBar("#comment");
checkVPE("ToggleCommentTestToggle.xml");
//Test untoggle comment from Source menu
@@ -50,6 +54,7 @@
editor.navigateTo(22,22);
bot.menu("Source").menu("Toggle Comment").click();
waitForJobs();
+ checkSelectionBar("h:commandButton");
checkVPE("ToggleCommentTestUntoggle.xml");
//Test toggle comment with CTRL+SHIFT+C hot keys
@@ -57,6 +62,7 @@
editor.navigateTo(22,22);
pressToggleCommentHotKeys();
waitForJobs();
+ checkSelectionBar("#comment");
checkVPE("ToggleCommentTestToggle.xml");
//Test untoggle comment with CTRL+SHIFT hot keys
@@ -64,8 +70,52 @@
editor.navigateTo(22,22);
pressToggleCommentHotKeys();
waitForJobs();
+ checkSelectionBar("h:commandButton");
checkVPE("ToggleCommentTestUntoggle.xml");
+ //Test toggle comment with three lines from Source menu
+
+ editor.selectLine(18);
+ editor.pressShortcut(Keystrokes.SHIFT, KeyStroke.getInstance(SWT.ARROW_DOWN));
+ shortDelay();
+ editor.pressShortcut(Keystrokes.SHIFT, KeyStroke.getInstance(SWT.ARROW_DOWN));
+ bot.menu("Source").menu("Toggle Comment").click();
+ editor.navigateTo(19, 22);
+ waitForJobs();
+ checkSelectionBar("#comment");
+ checkVPE("ToggleCommentTestLinesToggle.xml");
+
+ //Test untoggle comment with three lines from Source menu
+
+ editor.selectLine(18);
+ editor.pressShortcut(Keystrokes.SHIFT, KeyStroke.getInstance(SWT.ARROW_DOWN));
+ shortDelay();
+ editor.pressShortcut(Keystrokes.SHIFT, KeyStroke.getInstance(SWT.ARROW_DOWN));
+ bot.menu("Source").menu("Toggle Comment").click();
+ waitForJobs();
+ checkVPE("ToggleCommentTestLinesUntoggle.xml");
+
+ //Test toggle comment with three lines using hot keys
+
+ editor.selectLine(18);
+ editor.pressShortcut(Keystrokes.SHIFT, KeyStroke.getInstance(SWT.ARROW_DOWN));
+ shortDelay();
+ editor.pressShortcut(Keystrokes.SHIFT, KeyStroke.getInstance(SWT.ARROW_DOWN));
+ pressToggleCommentHotKeys();
+ waitForJobs();
+ checkSelectionBar("#comment");
+ checkVPE("ToggleCommentTestLinesToggle.xml");
+
+ //Test untoggle comment with three lines using hot keys
+
+ editor.selectLine(18);
+ editor.pressShortcut(Keystrokes.SHIFT, KeyStroke.getInstance(SWT.ARROW_DOWN));
+ shortDelay();
+ editor.pressShortcut(Keystrokes.SHIFT, KeyStroke.getInstance(SWT.ARROW_DOWN));
+ pressToggleCommentHotKeys();
+ waitForJobs();
+ checkVPE("ToggleCommentTestLinesUntoggle.xml");
+
}
private void checkVPE(String testPage) throws Throwable{
@@ -134,5 +184,16 @@
editor.close();
super.tearDown();
}
+
+ @Override
+ protected void shortDelay() {
+ bot.sleep(500);
+ }
+
+ private void checkSelectionBar (String... args){
+ for (int i = 0; i < args.length; i++) {
+ bot.toolbarButton(args[i]).click();
+ }
+ }
}
Show replies by date