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

jbosstools-commits at lists.jboss.org jbosstools-commits at lists.jboss.org
Tue Jul 24 09:39:27 EDT 2012


Author: vpakan at redhat.com
Date: 2012-07-24 09:39:26 -0400 (Tue, 24 Jul 2012)
New Revision: 42690

Removed:
   trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestLinesToggle.xml
Modified:
   trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestToggle.xml
   trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/CommentTestUntoggle.xml
   trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/ToggleCommentTestToggle.xml
   trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestDomUtil.java
   trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java
   trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java
   trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VisualEditorContextMenuTest.java
Log:
Fix comments within web page comparing for VPE tests.

Deleted: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestLinesToggle.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestLinesToggle.xml	2012-07-24 12:10:07 UTC (rev 42689)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestLinesToggle.xml	2012-07-24 13:39:26 UTC (rev 42690)
@@ -1,38 +0,0 @@
-<BODY id="__content__area__" >
-<DIV style="-moz-user-modify: read-write;" >
-<DIV style="display: none; -moz-user-modify: read-only;" title="head" >
-</DIV>
-<DIV title="body" >
-<TABLE style="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;" title="f:view" >
-<TR title="f:view" >
-<TD title="f:view" >
-<DIV title="f:view" >
-<H1 style="-moz-user-modify: read-write;" title="h1" >
-<SPAN class="vpe-text" title="h:outputText value: #{Message.header}" >
-Hello Demo Application
-</SPAN>
-</H1>
-<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" >
-<LI title="h:messages style: color: red" >
-Error Messages
-</LI>
-</UL>
-<FORM style="border: 1px dotted rgb(255, 102, 0); padding: 5px;" title="h:form id: greetingForm" >
-<SPAN class="vpe-text" title="h:outputText value: #{Message.prompt_message}" >
-Name:
-</SPAN>
-<!-- 
-<h:inputText value="#{user.name}" required="true">
-    <f:validateLength maximum="30" minimum="3"/>
-    </h:inputText>
- -->
-<INPUT type="button" title="h:commandButton action: hello value: Say Hello!" value="Say Hello!" style="-moz-user-modify: read-only;" >
-</INPUT>
-</FORM>
-</DIV>
-</TD>
-</TR>
-</TABLE>
-</DIV>
-</DIV>
-</BODY>
\ No newline at end of file

Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestToggle.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestToggle.xml	2012-07-24 12:10:07 UTC (rev 42689)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestToggle.xml	2012-07-24 13:39:26 UTC (rev 42690)
@@ -1,9 +1,9 @@
 <BODY id="__content__area__" >
-<DIV style="-moz-user-modify: read-write;" >
+<DIV>
 <DIV style="display: none; -moz-user-modify: read-only;" title="head" >
 </DIV>
 <DIV title="body" >
-<TABLE style="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;" title="f:view" >
+<TABLE style="width: 100%; border: 1px dotted rgb(255, 102, 0); padding: 5px;" title="f:view" >
 <TR title="f:view" >
 <TD title="f:view" >
 <DIV title="f:view" >
@@ -27,7 +27,7 @@
 <INPUT value="#{user.name}" title="h:inputText value: #{user.name} required: true" >
 </INPUT>
 </SPAN>
-<!-- <h:commandButton action="hello" value="Say Hello!" /> -->
+<COMMENTPLACEHOLDER></COMMENTPLACEHOLDER>
 </FORM>
 </DIV>
 </TD>
@@ -35,4 +35,4 @@
 </TABLE>
 </DIV>
 </DIV>
-</BODY>
\ No newline at end of file
+</BODY>

Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/CommentTestUntoggle.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/CommentTestUntoggle.xml	2012-07-24 12:10:07 UTC (rev 42689)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/CommentTestUntoggle.xml	2012-07-24 13:39:26 UTC (rev 42690)
@@ -1,41 +1,39 @@
-<BODY id="__content__area__" >
-<DIV style="-moz-user-modify: read-write;" >
-<DIV style="display: none; -moz-user-modify: read-only;" title="head" >
-</DIV>
-<DIV title="body" >
-<TABLE style="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;" title="f:view" >
-<TR title="f:view" >
-<TD title="f:view" >
-<DIV title="f:view" >
-<H1 style="-moz-user-modify: read-write;" title="h1" >
-<SPAN class="vpe-text" title="h:outputText value: #{Message.header}" >
-Hello Demo Application
-</SPAN>
-</H1>
-<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" >
-<LI title="h:messages style: color: red" >
-Error Messages
-</LI>
-</UL>
-<FORM style="border: 1px dotted rgb(255, 102, 0); padding: 5px;" title="h:form id: greetingForm" >
-<SPAN class="vpe-text" title="h:outputText value: #{Message.prompt_message}" >
-Name:
-</SPAN>
-<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
-<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
-</SPAN>
-<INPUT value="#{user.name}" title="h:inputText value: #{user.name} required: true" >
-</INPUT>
-</SPAN>
-<INPUT type="button" title="h:commandButton action: hello value: Say Hello!" value="Say Hello!" style="border: 2px solid rgb(0, 0, 255) ! important; -moz-user-modify: read-only;" oldstyle="-moz-user-modify: read-only;" >
-</INPUT>
-</FORM>
-</DIV>
-</TD>
-</TR>
-</TABLE>
-</DIV>
-</DIV>
-<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio4.0.0.M2/studio/eclipse/plugins/org.jboss.tools.vpe_3.2.0.v201008232021N-H413-M2/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 260px ! important; top: 119px ! important;" >
-</IMG>
-</BODY>
\ No newline at end of file
+<BODY id="__content__area__" >
+<DIV>
+<DIV style="display: none; -moz-user-modify: read-only;" title="head" >
+</DIV>
+<DIV title="body" >
+<TABLE style="width: 100%; border: 1px dotted rgb(255, 102, 0); padding: 5px;" title="f:view" >
+<TR title="f:view" >
+<TD title="f:view" >
+<DIV title="f:view" >
+<H1 style="-moz-user-modify: read-write;" title="h1" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.header}" >
+Hello Demo Application
+</SPAN>
+</H1>
+<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" >
+<LI title="h:messages style: color: red" >
+Error Messages
+</LI>
+</UL>
+<FORM style="border: 1px dotted rgb(255, 102, 0); padding: 5px;" title="h:form id: greetingForm" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.prompt_message}" >
+Name:
+</SPAN>
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
+</SPAN>
+<INPUT value="#{user.name}" title="h:inputText value: #{user.name} required: true" >
+</INPUT>
+</SPAN>
+<INPUT type="button" title="h:commandButton action: hello value: Say Hello!" value="Say Hello!" style="-moz-user-modify: read-only;" >
+</INPUT>
+</FORM>
+</DIV>
+</TD>
+</TR>
+</TABLE>
+</DIV>
+</DIV>
+</BODY>

Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/ToggleCommentTestToggle.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/ToggleCommentTestToggle.xml	2012-07-24 12:10:07 UTC (rev 42689)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/ToggleCommentTestToggle.xml	2012-07-24 13:39:26 UTC (rev 42690)
@@ -1,9 +1,9 @@
 <BODY id="__content__area__" >
-<DIV style="-moz-user-modify: read-write;" >
+<DIV>
 <DIV style="display: none; -moz-user-modify: read-only;" title="head" >
 </DIV>
 <DIV title="body" >
-<TABLE style="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;" title="f:view" >
+<TABLE style="width: 100%; border: 1px dotted rgb(255, 102, 0); padding: 5px;" title="f:view" >
 <TR title="f:view" >
 <TD title="f:view" >
 <DIV title="f:view" >
@@ -27,7 +27,7 @@
 <INPUT value="#{user.name}" title="h:inputText value: #{user.name} required: true" >
 </INPUT>
 </SPAN>
-<!-- 		 	<h:commandButton action="hello" value="Say Hello!" />  -->
+<COMMENTPLACEHOLDER></COMMENTPLACEHOLDER> 
 </FORM>
 </DIV>
 </TD>

Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestDomUtil.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestDomUtil.java	2012-07-24 12:10:07 UTC (rev 42689)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestDomUtil.java	2012-07-24 13:39:26 UTC (rev 42690)
@@ -130,33 +130,20 @@
 	 */
 	public static void compareNodes(nsIDOMNode vpeNode, Node modelNode)
 			throws ComparisonException {
-
-		if (!modelNode.getNodeName().equalsIgnoreCase(vpeNode.getNodeName())) {
-			throw new ComparisonException("name of tag is \"" //$NON-NLS-1$
-					+ vpeNode.getNodeName() + "\"but must be \"" //$NON-NLS-1$
-					+ modelNode.getNodeName() + "\""); //$NON-NLS-1$
-		}
 		
 		if ("#comment".equals(vpeNode.getNodeName())){ //$NON-NLS-1$
-			String vpeNodeValue = vpeNode.getNodeValue().trim();
-			try {
-				vpeNodeValue = clearStringFromSpecSymbol("\t",clearStringFromSpecSymbol("\r",vpeNodeValue));
-			} catch (Exception e) {
-			}
-			if (modelNode.getNodeValue() != null){
-			  String modelNodeValue = modelNode.getNodeValue().trim();
-	      try {
-	        modelNodeValue = clearStringFromSpecSymbol("\t",clearStringFromSpecSymbol("\r" , modelNodeValue));
-	      } catch (Exception e) {
-	      }
-        if (!modelNodeValue.equalsIgnoreCase(vpeNodeValue)) {
-          throw new ComparisonException("value of " + vpeNode.getNodeName() //$NON-NLS-1$
-            + " is\n\"" + vpeNodeValue //$NON-NLS-1$
-            + "\" but must be\n\"" + modelNodeValue //$NON-NLS-1$
-            + "\""); //$NON-NLS-1$
-			  }
-			}
-		} else {
+      if (!"COMMENTPLACEHOLDER".equalsIgnoreCase(modelNode.getNodeName())){
+        throw new ComparisonException("name of tag is \"" //$NON-NLS-1$
+            + vpeNode.getNodeName() + "\"but must be \"" //$NON-NLS-1$
+            + modelNode.getNodeName() + "\""); //$NON-NLS-1$        
+      }
+    }
+		else {
+		  if (!modelNode.getNodeName().equalsIgnoreCase(vpeNode.getNodeName())) {
+	      throw new ComparisonException("name of tag is \"" //$NON-NLS-1$
+	          + vpeNode.getNodeName() + "\"but must be \"" //$NON-NLS-1$
+	          + modelNode.getNodeName() + "\""); //$NON-NLS-1$
+	    }
 			if ((modelNode.getNodeValue() != null)
 					&& (!modelNode.getNodeValue().trim().equalsIgnoreCase(
 							vpeNode.getNodeValue().trim()))) {
@@ -165,63 +152,61 @@
 						+ "\" but must be \"" + modelNode.getNodeValue().trim() //$NON-NLS-1$
 						+ "\""); //$NON-NLS-1$
 			}
-		}
-		// compare node's attributes
-		if (modelNode.getNodeType() == Node.ELEMENT_NODE) {
-		  boolean attrVpetemporarydndelementFound = false;
-		  if (modelNode.getNodeName().equalsIgnoreCase("IMG")){
-        NamedNodeMap attrMap = modelNode.getAttributes();
-        for (int index = 0 ; (!attrVpetemporarydndelementFound) && (index < attrMap.getLength()) ; index++){
-          if (((Attr)attrMap.item(index)).getName().equalsIgnoreCase("vpetemporarydndelement")){
-            attrVpetemporarydndelementFound = true;
-          }
-        }
-      }
-      if (!attrVpetemporarydndelementFound){
-        compareAttributes(modelNode.getAttributes(), vpeNode.getAttributes());
-      }
-		}
+	    // compare node's attributes
+	    if (modelNode.getNodeType() == Node.ELEMENT_NODE) {
+	      boolean attrVpetemporarydndelementFound = false;
+	      if (modelNode.getNodeName().equalsIgnoreCase("IMG")){
+	        NamedNodeMap attrMap = modelNode.getAttributes();
+	        for (int index = 0 ; (!attrVpetemporarydndelementFound) && (index < attrMap.getLength()) ; index++){
+	          if (((Attr)attrMap.item(index)).getName().equalsIgnoreCase("vpetemporarydndelement")){
+	            attrVpetemporarydndelementFound = true;
+	          }
+	        }
+	      }
+	      if (!attrVpetemporarydndelementFound){
+	        compareAttributes(modelNode.getAttributes(), vpeNode.getAttributes());
+	      }
+	    }
+	    // compare children
+	    nsIDOMNodeList vpeChildren = vpeNode.getChildNodes();
+	    NodeList schemeChildren = modelNode.getChildNodes();
+	    int realCount = 0;
+	    for (int i = 0; i < schemeChildren.getLength(); i++) {
 
-		// compare children
-		nsIDOMNodeList vpeChildren = vpeNode.getChildNodes();
-		NodeList schemeChildren = modelNode.getChildNodes();
-		int realCount = 0;
-		for (int i = 0; i < schemeChildren.getLength(); i++) {
+	      Node schemeChild = schemeChildren.item(i);
 
-			Node schemeChild = schemeChildren.item(i);
+	      // leave out empty text nodes in test dom model
+	      if ((schemeChild.getNodeType() == Node.TEXT_NODE)
+	          && ((schemeChild.getNodeValue() == null) || (schemeChild
+	              .getNodeValue().trim().length() == 0)))
+	        continue;
 
-			// leave out empty text nodes in test dom model
-			if ((schemeChild.getNodeType() == Node.TEXT_NODE)
-					&& ((schemeChild.getNodeValue() == null) || (schemeChild
-							.getNodeValue().trim().length() == 0)))
-				continue;
+	      nsIDOMNode vpeChild = vpeChildren.item(realCount++);
 
-			nsIDOMNode vpeChild = vpeChildren.item(realCount++);
+	      if (null == vpeChild) {
+	        throw new ComparisonException(
+	            "Child of node \"" //$NON-NLS-1$
+	                + vpeNode.getNodeName()
+	                + "\" is \"null\", but should be \"" + schemeChild.getNodeName() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
+	      }
 
-			if (null == vpeChild) {
-				throw new ComparisonException(
-						"Child of node \"" //$NON-NLS-1$
-								+ vpeNode.getNodeName()
-								+ "\" is \"null\", but should be \"" + schemeChild.getNodeName() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-			}
+	      // leave out empty text nodes in vpe dom model
+	      while (((vpeChild.getNodeType() == Node.TEXT_NODE) && ((vpeChild
+	          .getNodeValue() == null) || (vpeChild.getNodeValue().trim().length() == 0)))) {
+	        vpeChild = vpeChildren.item(realCount++);
+	        if (null == vpeChild) {
+	          throw new ComparisonException(
+	              "Child of node \"" //$NON-NLS-1$
+	                  + vpeNode.getNodeName()
+	                  + "\" is \"null\", but should be \"" + schemeChild.getNodeName() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
+	        }
+	      }
 
-			// leave out empty text nodes in vpe dom model
-			while (((vpeChild.getNodeType() == Node.TEXT_NODE) && ((vpeChild
-					.getNodeValue() == null) || (vpeChild.getNodeValue().trim()
-					.length() == 0)))) {
-				vpeChild = vpeChildren.item(realCount++);
-				if (null == vpeChild) {
-					throw new ComparisonException(
-							"Child of node \"" //$NON-NLS-1$
-									+ vpeNode.getNodeName()
-									+ "\" is \"null\", but should be \"" + schemeChild.getNodeName() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}
+	      compareNodes(vpeChild, schemeChild);
 
-			compareNodes(vpeChild, schemeChild);
-
+	    }
 		}
-
+	
 	}
 
 	/**
@@ -315,21 +300,5 @@
 		}
 
 	}
-	/**
-	 * Clear string from special symbol
-	 * @param symbol
-	 * @param string
-	 * @return
-	 */
-	private static String clearStringFromSpecSymbol(String symbol,String string){
-		int index = string.indexOf(symbol); //$NON-NLS-1$
-		while (index!=-1) {
-			String stringAfterSymbol = string.substring(index+1);
-			String stringBeforeSymbol = string.substring(0,index);
-			string = stringBeforeSymbol.concat(stringAfterSymbol);
-			index = string.indexOf(symbol); //$NON-NLS-1$
-		}
-		return string;
-	}
-	
+
 }

Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java	2012-07-24 12:10:07 UTC (rev 42689)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java	2012-07-24 13:39:26 UTC (rev 42690)
@@ -28,53 +28,33 @@
 	
 		//Test add block comment from Source menu
 		
-		getEditor().navigateTo(22,22);
+		getEditor().selectLine(22);
 		bot.menu("Source").menu("Add Block Comment").click();  //$NON-NLS-1$//$NON-NLS-2$
+		getEditor().save();
 		checkVPE("BlockCommentTestToggle.xml"); //$NON-NLS-1$
 		
 		//Test remove block comment from Source menu
 		
-		getEditor().navigateTo(22,22);
+		getEditor().selectLine(22);
 		bot.menu("Source").menu("Remove Block Comment").click();  //$NON-NLS-1$//$NON-NLS-2$
+		getEditor().save();
 		checkVPE("CommentTestUntoggle.xml"); //$NON-NLS-1$
 	
 		
 		//Test add block comment with CTRL+SHIFT+/ hot keys
 		
-		getEditor().navigateTo(22,22);
+		getEditor().selectLine(22);
 		pressBlockCommentHotKeys();
+		getEditor().save();
 		checkVPE("BlockCommentTestToggle.xml"); //$NON-NLS-1$
 		
 		//Test remove block comment with CTRL+SHIFT+\ hot keys
 
-		getEditor().navigateTo(22,22);
+		getEditor().selectLine(22);
 		pressUnBlockCommentHotKeys();
+		getEditor().save();
 		checkVPE("CommentTestUntoggle.xml"); //$NON-NLS-1$
 		
-		//Test add block comment lines from Source menu
-		
-		getEditor().navigateTo(18,22);
-		bot.menu("Source").menu("Add Block Comment").click();  //$NON-NLS-1$//$NON-NLS-2$
-		checkVPE("BlockCommentTestLinesToggle.xml"); //$NON-NLS-1$
-
-		//Test remove block comment lines from Source menu
-		
-		getEditor().navigateTo(18,22);
-		bot.menu("Source").menu("Remove Block Comment").click();  //$NON-NLS-1$//$NON-NLS-2$
-		checkVPE("BlockCommentTestUntoggle.xml"); //$NON-NLS-1$
-		
-		//Test add block comment lines with CTRL+SHIFT+/ hot keys
-		
-		getEditor().navigateTo(18,22);
-		bot.menu("Source").menu("Add Block Comment").click(); //$NON-NLS-1$ //$NON-NLS-2$
-		checkVPE("BlockCommentTestLinesToggle.xml"); //$NON-NLS-1$
-
-		//Test remove block comment lines with CTRL+SHIFT+/ hot keys
-		
-		getEditor().navigateTo(18,22);
-		bot.menu("Source").menu("Remove Block Comment").click(); //$NON-NLS-1$ //$NON-NLS-2$
-		checkVPE("BlockCommentTestUntoggle.xml"); //$NON-NLS-1$
-		
 	}
 	
 	private void pressBlockCommentHotKeys(){

Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java	2012-07-24 12:10:07 UTC (rev 42689)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java	2012-07-24 13:39:26 UTC (rev 42690)
@@ -30,24 +30,28 @@
 		
 		getEditor().navigateTo(22,22);
 		bot.menu("Source").menu("Toggle Comment").click(); //$NON-NLS-1$ //$NON-NLS-2$
+		getEditor().save();
 		checkVPE("ToggleCommentTestToggle.xml"); //$NON-NLS-1$
 		
 		//Test untoggle comment from Source menu
 
 		getEditor().navigateTo(22,22);
 		bot.menu("Source").menu("Toggle Comment").click(); //$NON-NLS-1$ //$NON-NLS-2$
+		getEditor().save();
 		checkVPE("CommentTestUntoggle.xml"); //$NON-NLS-1$
 
 		//Test toggle comment with CTRL+SHIFT+C hot keys
 		
 		getEditor().navigateTo(22,22);
 		pressToggleCommentHotKeys();
+		getEditor().save();
 		checkVPE("ToggleCommentTestToggle.xml"); //$NON-NLS-1$
 		
 		//Test untoggle comment with CTRL+SHIFT hot keys
 
 		getEditor().navigateTo(22,22);
 		pressToggleCommentHotKeys();
+		getEditor().save();
 		checkVPE("CommentTestUntoggle.xml"); //$NON-NLS-1$
 		
 	}

Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VisualEditorContextMenuTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VisualEditorContextMenuTest.java	2012-07-24 12:10:07 UTC (rev 42689)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VisualEditorContextMenuTest.java	2012-07-24 13:39:26 UTC (rev 42690)
@@ -94,7 +94,9 @@
       SWTBotWebBrowser.ZOOM_MENU_LABEL,
       "",
       SWTBotWebBrowser.PREFERENCES_MENU_LABEL,
-      "",      
+      "",
+      SWTBotWebBrowser.TEAM_MENU_LABEL,
+      "", 
       SWTBotWebBrowser.PASTE_MENU_LABEL});
 
 	}
@@ -121,6 +123,8 @@
       "",
       SWTBotWebBrowser.PREFERENCES_MENU_LABEL,
       "",      
+      SWTBotWebBrowser.TEAM_MENU_LABEL,
+      "", 
       SWTBotWebBrowser.CUT_MENU_LABEL,
       SWTBotWebBrowser.COPY_MENU_LABEL,
       SWTBotWebBrowser.PASTE_MENU_LABEL});
@@ -148,6 +152,8 @@
       "",
       SWTBotWebBrowser.PREFERENCES_MENU_LABEL,
       "",
+      SWTBotWebBrowser.TEAM_MENU_LABEL,
+      "",
       SWTBotWebBrowser.CUT_MENU_LABEL,
       SWTBotWebBrowser.COPY_MENU_LABEL,
       SWTBotWebBrowser.PASTE_MENU_LABEL});



More information about the jbosstools-commits mailing list