JBoss Tools SVN: r24458 - in trunk: jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test and 4 other directories.
4:24 a.m.
Author: vpakan(a)redhat.com
Date: 2010-08-26 05:24:53 -0400 (Thu, 26 Aug 2010)
New Revision: 24458
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/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/UnknownTagDialogVariables.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/templates/SetTemplateForUnknownTagTest.java
trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestDomUtil.java
Log:
Fixes for JBT 3.2.0.M2
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 2010-08-26
06:29:45 UTC (rev 24457)
+++
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/EditedTemplateForUnknownTag.xml 2010-08-26
09:24:53 UTC (rev 24458)
@@ -1,39 +1,36 @@
-<BODY ID="__content__area__">
-<DIV STYLE="-moz-user-modify: read-write;">
-<DIV STYLE="display: none; -moz-user-modify: read-only;">
-<H1 STYLE="-moz-user-modify: read-write;">
-Input User Name Page
-</H1>
+<BODY id="__content__area__" >
+<DIV style="-moz-user-modify: read-write;" >
+<DIV style="display: none; -moz-user-modify: read-only;"
title="head" >
</DIV>
-<DIV>
-<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width:
100%;">
-<TR>
-<TD>
-<DIV>
-<H1 STYLE="-moz-user-modify: read-write;">
-<SPAN CLASS="vpe-text">
+<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>
-<B CLASS="__any__tag__caption" STYLE="border: 1px solid green;
-moz-user-modify: read-only;">
+<B class="__any__tag__caption" style="border: 1px solid green;
-moz-user-modify: read-only;" title="h:unknowntag" >
</B>
-<UL STYLE="color: red; -moz-user-modify: read-only;">
-<LI>
+<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;">
-<SPAN CLASS="vpe-text">
+<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">
-<SPAN CLASS="vpe-text">
+<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}"/>
-
+<INPUT value="#{user.name}" title="h:inputText value: #{user.name}
required: true" >
+</INPUT>
</SPAN>
-<INPUT TYPE="button" VALUE="Say Hello!"
STYLE="-moz-user-modify: read-only;"/>
-
+<INPUT type="button" title="h:commandButton action: hello value: Say
Hello!" value="Say Hello!" style="-moz-user-modify: read-only;"
>
+</INPUT>
</FORM>
</DIV>
</TD>
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 2010-08-26
06:29:45 UTC (rev 24457)
+++
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/SetTemplateForUnknownTag.xml 2010-08-26
09:24:53 UTC (rev 24458)
@@ -1,41 +1,39 @@
-<BODY ID="__content__area__">
-<DIV STYLE="-moz-user-modify: read-write;">
-<DIV STYLE="display: none; -moz-user-modify: read-only;">
-<H1 STYLE="-moz-user-modify: read-write;">
-Input User Name Page
-</H1>
+<BODY id="__content__area__" >
+<DIV style="-moz-user-modify: read-write;" >
+<DIV style="display: none; -moz-user-modify: read-only;"
title="head" >
</DIV>
-<DIV>
-<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width:
100%;">
-<TR>
-<TD>
-<DIV>
-<H1 STYLE="-moz-user-modify: read-write;">
-<SPAN CLASS="vpe-text">
+<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>
-<B CLASS="__any__tag__caption" STYLE="border: 1px solid green;
font-family: Arial; color: black; -moz-user-modify: read-only;">
-myValue<BR STYLE="font-style: italic; color: green; -moz-user-modify:
read-only;"/>
-
+<B class="__any__tag__caption" style="border: 1px solid green; color:
black; font-family: Arial; -moz-user-modify: read-only;"
title="h:unknowntag" >
+myValue
+<BR style="font-style: italic; color: green; -moz-user-modify: read-only;"
>
+</BR>
</B>
-<UL STYLE="color: red; -moz-user-modify: read-only;">
-<LI>
+<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;">
-<SPAN CLASS="vpe-text">
+<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">
-<SPAN CLASS="vpe-text">
+<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}"/>
-
+<INPUT value="#{user.name}" title="h:inputText value: #{user.name}
required: true" >
+</INPUT>
</SPAN>
-<INPUT TYPE="button" VALUE="Say Hello!"
STYLE="-moz-user-modify: read-only;"/>
-
+<INPUT type="button" title="h:commandButton action: hello value: Say
Hello!" value="Say Hello!" style="-moz-user-modify: read-only;"
>
+</INPUT>
</FORM>
</DIV>
</TD>
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 2010-08-26
06:29:45 UTC (rev 24457)
+++
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/UnknownTemplate.xml 2010-08-26
09:24:53 UTC (rev 24458)
@@ -1,41 +1,40 @@
-<BODY ID="__content__area__">
-<DIV STYLE="-moz-user-modify: read-write;">
-<DIV STYLE="display: none; -moz-user-modify: read-only;">
-<H1 STYLE="-moz-user-modify: read-write;">
-Input User Name Page
-</H1>
+<BODY id="__content__area__">
+<DIV style="-moz-user-modify: read-write;">
+<DIV style="display: none; -moz-user-modify: read-only;"
title="head">
</DIV>
-<DIV>
-<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width:
100%;">
-<TR>
-<TD>
-<DIV>
-<H1 STYLE="-moz-user-modify: read-write;">
-<SPAN CLASS="vpe-text">
+<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>
-<DIV CLASS="__any__tag__caption" STYLE="border: 1px solid green;
-moz-user-modify: read-only;">
-h:unknowntag<BR STYLE="font-style: italic; color: green; -moz-user-modify:
read-only;"/>
-
+<DIV class="__any__tag__caption" style="border: 1px solid green;
-moz-user-modify: read-only;" title="h:unknowntag">
+h:unknowntag
+<BR style="font-style: italic; color: green; -moz-user-modify:
read-only;">
+</BR>
</DIV>
-<UL STYLE="color: red; -moz-user-modify: read-only;">
-<LI>
+<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;">
-<SPAN CLASS="vpe-text">
+<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">
-<SPAN CLASS="vpe-text">
+<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}"/>
-
+<INPUT value="#{user.name}" title="h:inputText value: #{user.name}
required: true">
+</INPUT>
</SPAN>
-<INPUT TYPE="button" VALUE="Say Hello!"
STYLE="-moz-user-modify: read-only;"/>
-
+<INPUT type="button" title="h:commandButton action: hello value: Say
Hello!" value="Say Hello!" style="-moz-user-modify:
read-only;">
+</INPUT>
</FORM>
</DIV>
</TD>
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/UnknownTagDialogVariables.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/UnknownTagDialogVariables.java 2010-08-26
06:29:45 UTC (rev 24457)
+++
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/UnknownTagDialogVariables.java 2010-08-26
09:24:53 UTC (rev 24458)
@@ -2,10 +2,10 @@
public class UnknownTagDialogVariables {
- public static final String DIALOG_TITLE = "Unknown tag template";
//$NON-NLS-1$
- public static final String TAG_NAME_FIELD = "Tag Name:"; //$NON-NLS-1$
+ public static final String DIALOG_TITLE = "User specified tag template";
//$NON-NLS-1$
+ public static final String TAG_NAME_FIELD = "Tag name:"; //$NON-NLS-1$
public static final String TAG_URI_FIELD = "Tag URI:"; //$NON-NLS-1$
- public static final String DISPLAY_TAG = "Tag For Display:"; //$NON-NLS-1$
+ public static final String DISPLAY_TAG = "Tag for display:"; //$NON-NLS-1$
public static final String ALLOW_CHILDREN_CHECKBOX = "Allow tag children:";
//$NON-NLS-1$
public static final String VALUE_FIELD = "Value:"; //$NON-NLS-1$
public static final String TAG_STYLE_FIELD = "Tag style:"; //$NON-NLS-1$
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java 2010-08-26
06:29:45 UTC (rev 24457)
+++
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java 2010-08-26
09:24:53 UTC (rev 24458)
@@ -47,7 +47,7 @@
bot.button("Clear").click(); //$NON-NLS-1$
bot.button("Apply").click(); //$NON-NLS-1$
bot.button("OK").click(); //$NON-NLS-1$
- assertEquals("cssclass{\r\t\r}@CHARSET \"UTF-8\";\n}",
bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor().getText()); //$NON-NLS-1$
//$NON-NLS-2$
+ assertEquals("cssclass{\r\t\r}@CHARSET \"UTF-8\";",
bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor().getText()); //$NON-NLS-1$
//$NON-NLS-2$
bot.editorByTitle(CSS_FILE_NAME+".css").close(); //$NON-NLS-1$
}
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/templates/SetTemplateForUnknownTagTest.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/templates/SetTemplateForUnknownTagTest.java 2010-08-26
06:29:45 UTC (rev 24457)
+++
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/templates/SetTemplateForUnknownTagTest.java 2010-08-26
09:24:53 UTC (rev 24458)
@@ -6,6 +6,7 @@
import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase;
import org.jboss.tools.jsf.ui.bot.test.UnknownTagDialogVariables;
import org.jboss.tools.ui.bot.ext.CompareUtils;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.jboss.tools.ui.bot.test.WidgetVariables;
public class SetTemplateForUnknownTagTest extends JSFAutoTestCase {
@@ -31,7 +32,7 @@
bot.toolbarButtonWithTooltip(WidgetVariables.PREFERENCES).click();
bot.shell(WidgetVariables.PREF_FILTER_SHELL_TITLE).activate();
bot.tabItem(WidgetVariables.VPE_TEMPLATES_TAB).activate();
- bot.button(WidgetVariables.ADD_BUTTON).click();
+ bot.button(IDELabel.Button.ADD).click();
bot.shell(UnknownTagDialogVariables.DIALOG_TITLE).activate();
bot.textWithLabel(UnknownTagDialogVariables.TAG_NAME_FIELD).setText(TAG_NAME);
bot.textWithLabel(UnknownTagDialogVariables.TAG_URI_FIELD).setText(TAG_URI);
@@ -58,7 +59,7 @@
bot.table().select(0);
try {
checkTable(bot.table());
- bot.button(WidgetVariables.EDIT_BUTTON).click();
+ bot.button(IDELabel.Button.EDIT).click();
bot.shell(UnknownTagDialogVariables.DIALOG_TITLE).activate();
bot.textWithLabel(UnknownTagDialogVariables.TAG_URI_FIELD).setText("");
//$NON-NLS-1$
bot.checkBoxWithLabel(UnknownTagDialogVariables.ALLOW_CHILDREN_CHECKBOX)
Modified:
trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java
===================================================================
---
trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2010-08-26
06:29:45 UTC (rev 24457)
+++
trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2010-08-26
09:24:53 UTC (rev 24458)
@@ -133,6 +133,8 @@
@Override
protected void setUp() throws Exception {
+ // close Report Usage Window
+ jbt.closeReportUsageWindowIfOpened(false);
activePerspective();
try {
bot.viewByTitle(WidgetVariables.WELCOME).close();
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 2010-08-26
06:29:45 UTC (rev 24457)
+++
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestDomUtil.java 2010-08-26
09:24:53 UTC (rev 24458)
@@ -295,8 +295,8 @@
+ "\" but pattern is \"" + regex + "\"");
//$NON-NLS-1$ //$NON-NLS-2$
}
- } else if (!modelString.equals(vpeString)) {
- throw new ComparisonException("string is\"" + vpeString //$NON-NLS-1$
+ } else if (!modelString.equals(vpeString.replaceAll("\n", " "))) {
+ throw new ComparisonException("string is\"" +
vpeString.replaceAll("\n", " ") //$NON-NLS-1$
+ "\" but must be \"" + modelString + "\"");
//$NON-NLS-1$ //$NON-NLS-2$
}
5616
days inactive
5616
days old
jbosstools-commits@lists.jboss.org
0 comments
1 participants
participants (1)
-
jbosstools-commits＠lists.jboss.org