JBoss Tools SVN: r34527 - in trunk: jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke and 1 other directories.
9:58 a.m.
Author: vpakan(a)redhat.com
Date: 2011-09-05 10:58:23 -0400 (Mon, 05 Sep 2011)
New Revision: 34527
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/EditedTemplateForUnknownTag.xml
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/RemoveUnknownTemplate.xml
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/SetTemplateForUnknownTag.xml
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/UnknownTemplate.xml
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
Log:
Fixes for JBDS 5.0.0.M3
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/EditedTemplateForUnknownTag.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/EditedTemplateForUnknownTag.xml 2011-09-05
14:42:41 UTC (rev 34526)
+++
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/EditedTemplateForUnknownTag.xml 2011-09-05
14:58:23 UTC (rev 34527)
@@ -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" >
@@ -12,7 +12,7 @@
Hello Demo Application
</SPAN>
</H1>
-<B style="border: 2px solid rgb(0, 0, 255) ! important; -moz-user-modify:
read-only;" title="h:unknowntag" oldstyle="border: 1px solid green;
-moz-user-modify: read-only;" >
+<B style="-moz-user-modify: read-only; border: 1px solid green;"
title="h:unknowntag" >
<B class="__any__tag__caption" style=""
title="h:unknowntag" >
</B>
</B>
@@ -40,6 +40,6 @@
</TABLE>
</DIV>
</DIV>
-<IMG vpetemporarydndelement="true" id="dragIcon"
src="file:////opt/jbdevstudio4.0.0.Beta2/studio/eclipse/plugins/org.jboss.tools.vpe_3.2.0.v201012050623R-H30-Beta2/ve/dragIcon.gif"
style="position: absolute; cursor: move; left: 16px ! important; top: 77px !
important;" >
+<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: 77px !
important;" >
</IMG>
</BODY>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/RemoveUnknownTemplate.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/RemoveUnknownTemplate.xml 2011-09-05
14:42:41 UTC (rev 34526)
+++
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/RemoveUnknownTemplate.xml 2011-09-05
14:58:23 UTC (rev 34527)
@@ -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" >
@@ -12,11 +12,11 @@
Hello Demo Application
</SPAN>
</H1>
-<DIV style="border: 2px solid rgb(0, 0, 255) ! important; -moz-user-modify:
read-only;" title="h:unknowntag" oldstyle="border: 1px solid green;
-moz-user-modify: read-only;" >
+<DIV style="-moz-user-modify: read-only; border: 1px solid green;"
title="h:unknowntag" >
<DIV class="__any__tag__caption" style=""
title="h:unknowntag" >
h:unknowntag
</DIV>
-<BR vpe:pseudo-element="yes" style="font-style: italic; color: green;
-moz-user-modify: read-only;" >
+<BR style="font-style: italic; color: green; -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/jbdevstudio4.0.0.CR4/studio/plugins/org.jboss.tools.vpe_3.2.0.v20110211-1322-H26-CR3/ve/dragIcon.gif"
style="position: absolute; cursor: move; left: 16px ! important; top: 78px !
important;" >
+<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: 78px !
important;" >
</IMG>
</BODY>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/SetTemplateForUnknownTag.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/SetTemplateForUnknownTag.xml 2011-09-05
14:42:41 UTC (rev 34526)
+++
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/SetTemplateForUnknownTag.xml 2011-09-05
14:58:23 UTC (rev 34527)
@@ -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" >
@@ -12,11 +12,11 @@
Hello Demo Application
</SPAN>
</H1>
-<B style="border: 2px solid rgb(0, 0, 255) ! important; -moz-user-modify:
read-only;" title="h:unknowntag" oldstyle="border: 1px solid green;
-moz-user-modify: read-only;" >
+<B style="-moz-user-modify: read-only; border: 1px solid green;"
title="h:unknowntag" >
<B class="__any__tag__caption" style="color: black; font-family:
Arial;" title="h:unknowntag" >
myValue
</B>
-<BR vpe:pseudo-element="yes" style="font-style: italic; color: green;
-moz-user-modify: read-only;" >
+<BR style="font-style: italic; color: green; -moz-user-modify: read-only;"
>
</BR>
</B>
<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/jbdevstudio4.0.0.Beta2/studio/eclipse/plugins/org.jboss.tools.vpe_3.2.0.v201012050623R-H30-Beta2/ve/dragIcon.gif"
style="position: absolute; cursor: move; left: 16px ! important; top: 77px !
important;" >
+<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: 77px !
important;" >
</IMG>
</BODY>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/UnknownTemplate.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/UnknownTemplate.xml 2011-09-05
14:42:41 UTC (rev 34526)
+++
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/UnknownTemplate.xml 2011-09-05
14:58:23 UTC (rev 34527)
@@ -1,23 +1,22 @@
-<BODY id="__content__area__">
-<DIV style="-moz-user-modify: read-write;">
-<DIV style="display: none; -moz-user-modify: read-only;"
title="head">
+<BODY id="__content__area__" >
+<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">
-<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
+<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>
-<DIV style="border: 1px solid green; -moz-user-modify: read-only;"
title="h:unknowntag" >
+<DIV style="-moz-user-modify: read-only; border: 1px solid green;"
title="h:unknowntag" >
<DIV class="__any__tag__caption" style=""
title="h:unknowntag" >
h:unknowntag
</DIV>
-<BR vpe:pseudo-element="yes" style="font-style: italic; color: green;
-moz-user-modify: read-only;" >
+<BR style="font-style: italic; color: green; -moz-user-modify: read-only;"
>
</BR>
</DIV>
<UL style="color: red; -moz-user-modify: read-only;" title="h:messages
style: color: red" >
@@ -44,6 +43,6 @@
</TABLE>
</DIV>
</DIV>
-<IMG vpetemporarydndelement="true" id="dragIcon"
src="file:////opt/jbdevstudio4.0.0.Beta2/studio/eclipse/plugins/org.jboss.tools.vpe_3.2.0.v201012050623R-H30-Beta2/ve/dragIcon.gif"
style="position: absolute; cursor: move; left: 16px ! important; top: 17px !
important;" >
+<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>
</BODY>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java 2011-09-05
14:42:41 UTC (rev 34526)
+++
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java 2011-09-05
14:58:23 UTC (rev 34527)
@@ -200,10 +200,6 @@
IDELabel.Menu.ADD_JSF_CAPABILITIES).click();
}
- bot.shell("Add JSF Capabilities").activate();
- bot.button(WidgetVariables.NEXT_BUTTON).click();
- bot.button(WidgetVariables.FINISH_BUTTON).click();
-
delay();
assertTrue("JSF Capabilities were not added to project "
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2011-09-05
14:42:41 UTC (rev 34526)
+++
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2011-09-05
14:58:23 UTC (rev 34527)
@@ -239,7 +239,7 @@
bot.sleep(Timing.time2S());
compositeComponentDefEditor.save();
currentLineText = compositeComponentDefEditor.getTextOnCurrentLine();
- expectedInsertedText = "#{cc.attrs}";
+ expectedInsertedText = "${cc.attrs}";
assertTrue("Inserted text should be " + expectedInsertedText + " but
is not.\n"
+ "Current line text is " + currentLineText,
currentLineText.toLowerCase().contains(expectedInsertedText.toLowerCase()));
@@ -248,14 +248,14 @@
// Check content assist menu content for Composite Components attributes
ContentAssistHelper.checkContentAssistContent(SWTTestExt.bot,
compositeComponentFileName,
- "#{cc.attrs.}",
+ "${cc.attrs.}",
11,
0,
getCompositeComponentsAttributeDefProposalList());
// check inserting of "submitlabel" content assist
String contentAssistToUse = "submitlabel";
contentAssist.checkContentAssist(contentAssistToUse, true);
- expectedInsertedText = "<h:commandButton action=\"#{cc.attrs." +
contentAssistToUse + "}\"";
+ expectedInsertedText = "<h:commandButton action=\"${cc.attrs." +
contentAssistToUse + "}\"";
assertTrue("Editor has to contain text '" + expectedInsertedText +
"' but it doesn't\n" +
"Editor Text is\n" + compositeComponentDefEditor.getText(),
compositeComponentDefEditor.getText().toLowerCase().contains(expectedInsertedText.toLowerCase()));
@@ -501,7 +501,7 @@
result.add("onmouseup");
result.add("submitlabel");
result.add("value");
- result.add("\"#{cc.attrs.}\"");
+ result.add("\"${cc.attrs.}\"");
return result;
}
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
===================================================================
---
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2011-09-05
14:42:41 UTC (rev 34526)
+++
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2011-09-05
14:58:23 UTC (rev 34527)
@@ -411,7 +411,7 @@
public static final String JBOSS_EAP_5_0 = "JBoss Enterprise Application
Platform 5.0 Runtime";
public static final String JBOSS_EAP_5_x = "JBoss Enterprise Application
Platform 5.x Runtime";
public static final String JBOSS_AS_5_1 = "JBoss 5.1 Runtime";
- public static final String JBOSS_AS_6_0 = "JBoss 6.0 Runtime";
+ public static final String JBOSS_AS_6_0 = "JBoss 6.x Runtime";
}
public static final class ServerType {
5335
days inactive
5335
days old
jbosstools-commits@lists.jboss.org
0 comments
1 participants
participants (1)
-
jbosstools-commits＠lists.jboss.org