[jbosstools-commits] JBoss Tools SVN: r39848 - in trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test: editor/tags and 1 other directories.

[jbosstools-commits at lists.jboss.org]

Author: vpakan at redhat.com
Date: 2012-03-27 09:44:07 -0400 (Tue, 27 Mar 2012)
New Revision: 39848

Modified:
   trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/EditingActionsTest.java
   trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ExternalEditingTest.java
   trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/TextEditingActionsTest.java
   trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/UnicodeCharacterDisplayingTest.java
   trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/JSFTagsTest.java
   trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/CodeCompletionTest.java
Log:
Fixes for JBT 3.3.0.Beta2.

Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/EditingActionsTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/EditingActionsTest.java	2012-03-27 13:43:41 UTC (rev 39847)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/EditingActionsTest.java	2012-03-27 13:44:07 UTC (rev 39848)
@@ -63,6 +63,7 @@
 	  super.setUp();
     eclipse.maximizeActiveShell();
     createJspPage(EditingActionsTest.TEST_PAGE_NAME);
+    util.waitForNonIgnoredJobs();
     jspEditor = botExt.editorByTitle(EditingActionsTest.TEST_PAGE_NAME).toTextEditor();
     webBrowser = new SWTBotWebBrowser(EditingActionsTest.TEST_PAGE_NAME,botExt);	  
     

Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ExternalEditingTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ExternalEditingTest.java	2012-03-27 13:43:41 UTC (rev 39847)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ExternalEditingTest.java	2012-03-27 13:44:07 UTC (rev 39848)
@@ -155,10 +155,8 @@
     }
     public void run() {
       try {
-        System.out.println("**-- start thread");
         sleep(Timing.time5S());
         for (int keyCode : keyCodes){
-          System.out.println("**--Type: " + keyCode);
           KeyboardHelper.typeKeyCodeUsingAWT(keyCode);
           sleep(Timing.time2S());
         }

Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/TextEditingActionsTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/TextEditingActionsTest.java	2012-03-27 13:43:41 UTC (rev 39847)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/TextEditingActionsTest.java	2012-03-27 13:44:07 UTC (rev 39848)
@@ -64,6 +64,7 @@
 	  super.setUp();
     eclipse.maximizeActiveShell();
     createJspPage(TextEditingActionsTest.TEST_PAGE_NAME);
+    util.waitForNonIgnoredJobs();
     jspEditor = botExt.swtBotEditorExtByTitle(TextEditingActionsTest.TEST_PAGE_NAME);
     webBrowser = new SWTBotWebBrowser(TextEditingActionsTest.TEST_PAGE_NAME,botExt);	  
     

Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/UnicodeCharacterDisplayingTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/UnicodeCharacterDisplayingTest.java	2012-03-27 13:43:41 UTC (rev 39847)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/UnicodeCharacterDisplayingTest.java	2012-03-27 13:44:07 UTC (rev 39848)
@@ -50,12 +50,14 @@
     createHtmlPage(UnicodeCharacterDisplayingTest.TEST_PAGE_NAME);
     htmlEditor = botExt.swtBotEditorExtByTitle(UnicodeCharacterDisplayingTest.TEST_PAGE_NAME);
     htmlEditor.setText(UnicodeCharacterDisplayingTest.PAGE_TEXT);
+    htmlEditor.save();
+    util.waitForNonIgnoredJobs();
     webBrowser = new SWTBotWebBrowser(UnicodeCharacterDisplayingTest.TEST_PAGE_NAME,botExt);	 
 	}
 	/**
    * Check if Unicode Characters are properly displayed within Visual Editor
    */
-  public void testUnicodeCharacterDislpaying(){
+  public void testUnicodeCharacterDisplaying(){
     assertVisualEditorContainsNodeWithValue(webBrowser,
         UnicodeCharacterDisplayingTest.UNICODE_TEXT, 
         UnicodeCharacterDisplayingTest.TEST_PAGE_NAME);

Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/JSFTagsTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/JSFTagsTest.java	2012-03-27 13:43:41 UTC (rev 39847)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/JSFTagsTest.java	2012-03-27 13:44:07 UTC (rev 39848)
@@ -15,6 +15,7 @@
 
 import org.jboss.tools.ui.bot.ext.Assertions;
 import org.jboss.tools.ui.bot.ext.SWTBotExt;
+import org.jboss.tools.ui.bot.ext.SWTJBTExt;
 import org.jboss.tools.ui.bot.ext.Timing;
 import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper;
 import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt;
@@ -229,8 +230,14 @@
         normalText, 
         JSFTagsTest.TEST_PAGE_NAME);
     // check editing via Visual Pane
-    webBrowser.selectDomNode(webBrowser.getDomNodeByTagName("SPAN"), 0);
+    SWTJBTExt.selectTextInSourcePane(botExt,
+        JSFTagsTest.TEST_PAGE_NAME, 
+        outputText, 
+        0,
+        0,
+        0);
     webBrowser.setFocus();
+    bot.sleep(Timing.time3S());
     final String insertText = "inserted";
     KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_RIGHT);
     KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_LEFT);

Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/CodeCompletionTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/CodeCompletionTest.java	2012-03-27 13:43:41 UTC (rev 39847)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/CodeCompletionTest.java	2012-03-27 13:44:07 UTC (rev 39848)
@@ -263,8 +263,7 @@
     result.add("hello");
     result.add("Message");
     result.add("user : User");
-    result.add("hello: goto /pages/hello.jsp ");
-    
+        
     return result;
   } 
   /**