[jbosstools-commits] JBoss Tools SVN: r39231 - in trunk: vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor and 2 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Thu Mar 1 13:41:16 EST 2012
Author: vpakan at redhat.com
Date: 2012-03-01 13:41:15 -0500 (Thu, 01 Mar 2012)
New Revision: 39231
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/OpenOnHelper.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/VerificationOfNameSpaces.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowNonVisualTags.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/EditingELValueTest.java
Log:
Fixes for 3.3.0.Beta1
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/OpenOnHelper.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/OpenOnHelper.java 2012-03-01 16:55:34 UTC (rev 39230)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/OpenOnHelper.java 2012-03-01 18:41:15 UTC (rev 39231)
@@ -20,6 +20,7 @@
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
import org.jboss.tools.ui.bot.ext.SWTBotExt;
import org.jboss.tools.ui.bot.ext.SWTJBTExt;
+import org.jboss.tools.ui.bot.ext.SWTUtilExt;
import org.jboss.tools.ui.bot.ext.Timing;
/**
@@ -57,7 +58,8 @@
KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_F3);
- bot.sleep(Timing.time3S());
+ bot.sleep(Timing.time1S());
+ new SWTUtilExt(bot).waitForNonIgnoredJobs();
openedEditor = bot.activeEditor();
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/VerificationOfNameSpaces.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/VerificationOfNameSpaces.xml 2012-03-01 16:55:34 UTC (rev 39230)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/VerificationOfNameSpaces.xml 2012-03-01 18:41:15 UTC (rev 39231)
@@ -1,6 +1,11 @@
-<BODY ID="__content__area__">
-<SPAN CLASS="vpe-text">
+<BODY id="__content__area__" >
+<SPAN class="vpe-text" >
+
...
-</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/>
+</SPAN>
+<BR vpe:pseudo-element="yes" style="-moz-user-modify: read-only;" >
+</BR>
+<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/eclipse/eclipsebeta1/eclipse/plugins/org.jboss.tools.vpe_3.3.0.v20120224-2339-H52-Beta1/ve/dragIcon.gif" style="display: none ! important; position: absolute; cursor: move;" >
+</IMG>
</BODY>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml 2012-03-01 16:55:34 UTC (rev 39230)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml 2012-03-01 18:41:15 UTC (rev 39231)
@@ -16,7 +16,7 @@
<DIV class="__any__tag__caption" style="" title="tagunknown" >
tagunknown
</DIV>
-<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+<BR vpe:pseudo-element="yes" style="-moz-user-modify: read-only;" >
</BR>
</DIV>
<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" >
@@ -43,6 +43,6 @@
</TABLE>
</DIV>
</DIV>
-<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio5.0.0.M3/studio/plugins/org.jboss.tools.vpe_3.3.0.v20110901-0136-H11-M3/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 17px ! important;" >
+<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/eclipse/eclipsebeta1/eclipse/plugins/org.jboss.tools.vpe_3.3.0.v20120224-2339-H52-Beta1/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 17px ! important;" >
</IMG>
</BODY>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml 2012-03-01 16:55:34 UTC (rev 39230)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml 2012-03-01 18:41:15 UTC (rev 39231)
@@ -16,7 +16,7 @@
<DIV class="__any__tag__caption" style="" title="tagunknown" >
tagunknown
</DIV>
-<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+<BR vpe:pseudo-element="yes" style="-moz-user-modify: read-only;" >
</BR>
</DIV>
<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" >
@@ -43,6 +43,6 @@
</TABLE>
</DIV>
</DIV>
-<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio5.0.0.M3/studio/plugins/org.jboss.tools.vpe_3.3.0.v20110901-0136-H11-M3/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 17px ! important;" >
+<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/eclipse/eclipsebeta1/eclipse/plugins/org.jboss.tools.vpe_3.3.0.v20120224-2339-H52-Beta1/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 17px ! important;" >
</IMG>
</BODY>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowNonVisualTags.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowNonVisualTags.xml 2012-03-01 16:55:34 UTC (rev 39230)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowNonVisualTags.xml 2012-03-01 18:41:15 UTC (rev 39231)
@@ -3,21 +3,21 @@
<SPAN style="border: 1px dashed GREY; color: GREY; font-size: 12px;" >
jsp:directive.taglib
</SPAN>
-<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+<BR vpe:pseudo-element="yes" style="-moz-user-modify: read-only;" >
</BR>
</SPAN>
<SPAN >
<SPAN style="border: 1px dashed GREY; color: GREY; font-size: 12px;" >
jsp:directive.taglib
</SPAN>
-<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+<BR vpe:pseudo-element="yes" style="-moz-user-modify: read-only;" >
</BR>
</SPAN>
<SPAN >
<SPAN style="border: 1px dashed GREY; color: GREY; font-size: 12px;" title="f:loadBundle var: Message basename: demo.Messages" >
f:loadBundle
</SPAN>
-<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+<BR vpe:pseudo-element="yes" style="-moz-user-modify: read-only;" >
</BR>
</SPAN>
<DIV >
@@ -47,7 +47,7 @@
Error Messages
</LI>
</UL>
-<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+<BR vpe:pseudo-element="yes" style="-moz-user-modify: read-only;" >
</BR>
</SPAN>
<FORM style="border: 1px dotted rgb(255, 102, 0); padding: 5px;" title="h:form id: greetingForm" >
@@ -57,7 +57,14 @@
<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 >
+<SPAN style="border: 1px dashed GREY; color: GREY; font-size: 12px;" title="f:validateLength maximum: 30 minimum: 3" >
+f:validateLength
</SPAN>
+<BR vpe:pseudo-element="yes" style="-moz-user-modify: read-only;" >
+</BR>
+</SPAN>
+</SPAN>
<INPUT value="#{user.name}" title="h:inputText value: #{user.name} required: true" >
</INPUT>
</SPAN>
@@ -65,14 +72,14 @@
<SPAN style="border: 1px dashed GREY; color: GREY; font-size: 12px;" title="f:validateLength maximum: 30 minimum: 3" >
f:validateLength
</SPAN>
-<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+<BR vpe:pseudo-element="yes" style="-moz-user-modify: read-only;" >
</BR>
</SPAN>
</SPAN>
<SPAN >
<INPUT type="button" title="h:commandButton action: hello value: Say Hello!" value="Say Hello!" style="-moz-user-modify: read-only;" >
</INPUT>
-<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+<BR vpe:pseudo-element="yes" style="-moz-user-modify: read-only;" >
</BR>
</SPAN>
</FORM>
@@ -82,6 +89,6 @@
</TABLE>
</DIV>
</DIV>
-<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio5.0.0.M3/studio/plugins/org.jboss.tools.vpe_3.3.0.v20110901-0136-H11-M3/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 7px ! important; top: -14px ! important;" >
+<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/eclipse/eclipsebeta1/eclipse/plugins/org.jboss.tools.vpe_3.3.0.v20120224-2339-H52-Beta1/ve/dragIcon.gif" style="display: none ! important; position: absolute; cursor: move;" >
</IMG>
</BODY>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/EditingELValueTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/EditingELValueTest.java 2012-03-01 16:55:34 UTC (rev 39230)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/EditingELValueTest.java 2012-03-01 18:41:15 UTC (rev 39231)
@@ -59,14 +59,14 @@
jspGreetingPageEditor.save();
bot.sleep(Timing.time2S());
assertVisualEditorContainsNodeWithValue(new SWTBotWebBrowser(EditingELValueTest.GREETING_PAGE_NAME,botExt),
- "Template file is not found: \"#{" + EditingELValueTest.EL_VARIABLE_NAME + "}templates/common.xhtml\"",
+ "Template file is not found: \"templates/common.xhtml\"",
EditingELValueTest.GREETING_PAGE_NAME);
jspInputNamePageEditor.setText(jspInputNamePageEditor.getText()
.replaceFirst("/templates/common.xhtml", "#{" + EditingELValueTest.EL_VARIABLE_NAME + "}templates/common.xhtml"));
jspInputNamePageEditor.save();
bot.sleep(Timing.time2S());
assertVisualEditorContainsNodeWithValue(new SWTBotWebBrowser(EditingELValueTest.INPUT_NAME_PAGE_NAME,botExt),
- "Template file is not found: \"#{" + EditingELValueTest.EL_VARIABLE_NAME + "}templates/common.xhtml\"",
+ "Template file is not found: \"templates/common.xhtml\"",
EditingELValueTest.INPUT_NAME_PAGE_NAME);
// Opens Page Design Options Dialog
bot.toolbarButtonWithTooltip(PAGE_DESIGN).click();
More information about the jbosstools-commits
mailing list