[jbosstools-commits] JBoss Tools SVN: r12997 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test: resources/jsfTest/WebContent/pages/JBIDE/3144 and 2 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Mon Jan 12 12:06:22 EST 2009
Author: yradtsevich
Date: 2009-01-12 12:06:21 -0500 (Mon, 12 Jan 2009)
New Revision: 12997
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1718/JBIDE-1718-format.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3376/jbide3376.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2582Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1718Test.java
Log:
CODING IN PROGRESS - issue JBIDE-3511: Text body of h:outputText and h:outputFormat is rendered in incorrect sequence.
https://jira.jboss.org/jira/browse/JBIDE-3511
- JUnit tests have been fixed partially.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1718/JBIDE-1718-format.jsp
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1718/JBIDE-1718-format.jsp 2009-01-12 17:02:37 UTC (rev 12996)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1718/JBIDE-1718-format.jsp 2009-01-12 17:06:21 UTC (rev 12997)
@@ -5,9 +5,11 @@
</head>
<body>
<f:view>
- <b><h:outputFormat value="{0}"
- ><f:param value="paramValue"
- /></h:outputFormat></b>
+ <b>
+ <h:outputFormat value="{0}">
+ <f:param value="paramValue" />
+ </h:outputFormat>
+ </b>
</f:view>
</body>
</html>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml 2009-01-12 17:02:37 UTC (rev 12996)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml 2009-01-12 17:06:21 UTC (rev 12997)
@@ -1,12 +1,11 @@
<tests>
<test id="body_test">
-
<DIV ID="body_test" STYLE="-moz-user-modify: read-write;" >
- <TABLE STYLE="" CLASS="dr-table rich-table">
+ <TABLE STYLE="background-color: red;" CLASS="dr-table rich-table">
<COLGROUP SPAN="1">
</COLGROUP>
<TR CLASS="dr-table-firstrow rich-table-firstrow">
- <TD STYLE="" CLASS="dr-table-cell rich-table-cell">
+ <TD STYLE="background-color: green;" CLASS="dr-table-cell rich-table-cell">
<SPAN CLASS="vpe-text">
#{test.color}
</SPAN>
@@ -17,34 +16,34 @@
<TABLE CLASS="dr-table rich-sdt">
<COLGROUP SPAN="1">
</COLGROUP>
- <TBODY HEIGHT="100" STYLE="" WIDTH="100px;">
+ <TBODY HEIGHT="100" STYLE="background-color: blue;" WIDTH="100px;">
</TBODY>
<TR CLASS="dr-table-firstrow rich-table-firstrow">
- <TD STYLE="" CLASS="dr-table-cell rich-table-cell">
+ <TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell">
<BR _MOZ_DIRTY="" TYPE="_moz" />
</TD>
</TR>
<TR CLASS="dr-table-firstrow rich-table-firstrow">
- <TD STYLE="" CLASS="dr-table-cell rich-table-cell">
+ <TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell">
<BR _MOZ_DIRTY="" TYPE="_moz" />
</TD>
</TR>
<TR CLASS="dr-table-firstrow rich-table-firstrow">
- <TD STYLE="" CLASS="dr-table-cell rich-table-cell">
+ <TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell">
<BR _MOZ_DIRTY="" TYPE="_moz" />
</TD>
</TR>
<TR CLASS="dr-table-firstrow rich-table-firstrow">
- <TD STYLE="" CLASS="dr-table-cell rich-table-cell">
+ <TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell">
<BR _MOZ_DIRTY="" TYPE="_moz" />
</TD>
</TR>
<TR CLASS="dr-table-firstrow rich-table-firstrow">
- <TD STYLE="" CLASS="dr-table-cell rich-table-cell">
+ <TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell">
<BR _MOZ_DIRTY="" TYPE="_moz" />
</TD>
@@ -54,7 +53,7 @@
<SPAN CLASS="vpe-text">
<SPAN CLASS="vpe-text">
</SPAN>
- <SPAN CLASS="vpe-text" STYLE="">
+ <SPAN CLASS="vpe-text" STYLE="background-color: pink;">
ssssssssss
</SPAN>
</SPAN>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml.xml 2009-01-12 17:02:37 UTC (rev 12996)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml.xml 2009-01-12 17:06:21 UTC (rev 12997)
@@ -1,21 +1,19 @@
<tests>
<test id="test_el">
- <FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"
- >
+ <FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
<SPAN CLASS="message" STYLE="-moz-user-modify: read-only;">
Error Messages
</SPAN>
<DIV CLASS="dr-pnl rich-panel" STYLE="">
<DIV CLASS="dr-pnl-b rich-panel-body">
<SPAN CLASS="vpe-text">
- 123456789 #{test.scope} #{test.scope} #{test.scope}
+ 123456789 Test El expression Test El expression Test El expression
</SPAN>
<DIV
STYLE="width: 109px; height: 106px; background-color: green; -moz-user-modify: read-write;">
<BR VPE:PSEUDO-ELEMENT="yes"
STYLE="font-style: italic; color: green; -moz-user-modify: read-only;" />
-
</DIV>
<SPAN CLASS="vpe-text">
<SPAN CLASS="vpe-text">
@@ -25,7 +23,7 @@
</SPAN>
</SPAN>
<SPAN CLASS="vpe-text">
- Name: #{test.scope}
+ Name: Test El expression
</SPAN>
</DIV>
</DIV>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3376/jbide3376.jsp.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3376/jbide3376.jsp.xml 2009-01-12 17:02:37 UTC (rev 12996)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3376/jbide3376.jsp.xml 2009-01-12 17:06:21 UTC (rev 12997)
@@ -1,6 +1,7 @@
<tests>
<test id="jbide3376">
- <DIV ID="jbide3376" CLASS="null">
+
+ <DIV ID="jbide3376" >
<TABLE
STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
<TR>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2582Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2582Test.java 2009-01-12 17:02:37 UTC (rev 12996)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2582Test.java 2009-01-12 17:06:21 UTC (rev 12997)
@@ -170,7 +170,7 @@
nsIDOMNode node = SelectionUtil.getLastSelectedNode(controller.getPageContext());
- assertEquals("Node names should be equals", "Hello", node.getFirstChild().getNodeValue()); //$NON-NLS-1$ //$NON-NLS-2$
+ assertEquals("Node names should be equals.", "Hello", node.getLastChild().getFirstChild().getNodeValue()); //$NON-NLS-1$ //$NON-NLS-2$
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1718Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1718Test.java 2009-01-12 17:02:37 UTC (rev 12996)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1718Test.java 2009-01-12 17:06:21 UTC (rev 12997)
@@ -282,25 +282,22 @@
// disabled="true", so number of "a" tags must be one
assertEquals(1, spanElements.size());
- nsIDOMNode span = spanElements.get(0);
+ nsIDOMNode outputFormat = spanElements.get(0);
- nsIDOMNodeList children = span.getChildNodes();
- assertNotNull(children);
+ nsIDOMNodeList outputFormatChildren = outputFormat.getChildNodes();
+ assertNotNull(outputFormatChildren);
+ assertEquals(outputFormatChildren.getLength(), 2);
+
+ nsIDOMNode fParamContainer = outputFormatChildren.item(1);
+ assertNotNull(fParamContainer);
+
+ nsIDOMNodeList fParamContainerChildren = fParamContainer.getChildNodes();
+ assertNotNull(fParamContainerChildren);
+ assertTrue(fParamContainerChildren.getLength() > 0);
+
+ nsIDOMNode text = fParamContainerChildren.item(0);
+ assertEquals("paramValue", text.getNodeValue());
- boolean isFind = false;
- for (int i = 0; i < children.getLength(); i++) {
-
- nsIDOMNode text = children.item(i);
-
- if ("paramValue".equals(text.getNodeValue())) { //$NON-NLS-1$
- isFind = true;
- break;
- }
-
- assertEquals(true, isFind);
-
- }
-
// check exception
if (getException() != null) {
throw getException();
More information about the jbosstools-commits
mailing list