Make systests run on Tomcat7
http://java.net/jira/browse/JAVASERVERFACES-1497
SECTION: Modified Files
----------------------------
M jsf-ri/systest/src/com/sun/faces/facelets/ImplicitFacetTestCase.java
M jsf-ri/systest/src/com/sun/faces/jsptest/ForEachTestCase.java
M jsf-ri/systest/src/com/sun/faces/jsptest/PrependIdTestCase.java
M jsf-ri/systest/src/com/sun/faces/systest/DuplicateIds04TestCase.java
M jsf-ri/systest/src/com/sun/faces/systest/jsp/interweaving/InterweavingTestCase.java
M jsf-ri/systest/src/com/sun/faces/systest/jsp/subview/SubviewTestCase.java
M jsf-ri/systest/src/com/sun/faces/systest/jsp/htmltaglib/HtmlTaglibTestCase.java
M jsf-ri/systest/web/regexp/regression/AreaTextRowsAttrTest.txt
M jsf-ri/systest/web/regexp/regression/SelectOneManySizeAttrTest.txt
M jsf-ri/systest/web/regexp/standard/selectmany02.txt
- JSP id generation comes from JSP. Therefore, it's different in
tomcat. Replace ids with .* in tests.
M jsf-ri/systest/src/com/sun/faces/jsptest/IdRefTestCase.java
M jsf-ri/systest/src/com/sun/faces/jsptest/CommandLinkMultiFormTestCase.java
M jsf-ri/systest/src/com/sun/faces/component/CompositeMetaDataTestCase.java
M jsf-ri/systest/src/com/sun/faces/component/GetClientIdELTestCase.java
- Tomcat exclusions
M jsf-ri/systest/.cvsignore
M jsf-ri/systest/build-tests.xml
- Use ant logic to exclude a test.
SECTION: Diffs
----------------------------
Property changes on: jsf-ri/systest
___________________________________________________________________
Modified: svn:ignore
- build
+ build
status.txt
Index: jsf-ri/systest/src/com/sun/faces/facelets/ImplicitFacetTestCase.java
===================================================================
--- jsf-ri/systest/src/com/sun/faces/facelets/ImplicitFacetTestCase.java (revision 8914)
+++ jsf-ri/systest/src/com/sun/faces/facelets/ImplicitFacetTestCase.java (working copy)
@@ -103,7 +103,7 @@
String text = page.asText();
- assertTrue(-1 != text.indexOf("Implicit facet 01 id: j_id2. Child 01 of facet 01 id: output01. Child 02 of facet 01 id: output02. Child 03 of facet 01 id: output03."));
+ assertTrue(text.matches("(?s).*Implicit\\s*facet\\s*01\\s*id:.*Child\\s*01\\s*of\\s*facet\\s*01\\s*id:\\s*output01.\\s*Child\\s*02\\s*of\\s*facet\\s*01\\s*id:\\s*output02.\\s*Child\\s*03\\s*of\\s*facet\\s*01\\s*id:\\s*output03.*"));
assertTrue(-1 != text.indexOf("Implicit facet 01 id: panelGroup01. Child 01 of facet 01 id: output07. Child 02 of facet 01 id: output08. Child 03 of facet 01 id: output09."));
HtmlSubmitInput input = (HtmlSubmitInput) getInputContainingGivenId(page, "command");
@@ -111,7 +111,7 @@
text = page.asText();
- assertTrue(-1 != text.indexOf("Implicit facet 01 id: j_id2. Child 01 of facet 01 id: output01. Child 02 of facet 01 id: output02. Child 03 of facet 01 id: output03."));
+ assertTrue(text.matches("(?s).*Implicit\\s*facet\\s*01\\s*id:.*Child\\s*01\\s*of\\s*facet\\s*01\\s*id:\\s*output01.\\s*Child\\s*02\\s*of\\s*facet\\s*01\\s*id:\\s*output02.\\s*Child\\s*03\\s*of\\s*facet\\s*01\\s*id:\\s*output03.*"));
assertTrue(-1 != text.indexOf("Implicit facet 01 id: panelGroup01. Child 01 of facet 01 id: output07. Child 02 of facet 01 id: output08. Child 03 of facet 01 id: output09."));
Index: jsf-ri/systest/src/com/sun/faces/jsptest/ForEachTestCase.java
===================================================================
--- jsf-ri/systest/src/com/sun/faces/jsptest/ForEachTestCase.java (revision 8914)
+++ jsf-ri/systest/src/com/sun/faces/jsptest/ForEachTestCase.java (working copy)
@@ -154,9 +154,9 @@
getAllElementsOfGivenClass(page, spans, HtmlSpan.class);
assertTrue(spans.size() == 2);
HtmlSpan span = spans.get(0);
- assertTrue("j_id_id16:idfrag1:frag1".equals(span.getIdAttribute()));
+ assertTrue(span.getIdAttribute().matches(".*:idfrag1:frag1"));
span = spans.get(1);
- assertTrue("j_id_id16:idfrag2:frag2".equals(span.getIdAttribute()));
+ assertTrue(span.getIdAttribute().matches(".*:idfrag2:frag2"));
// submit the form to ensure no duplicate ID exceptions are
// raised during post-back
@@ -171,9 +171,9 @@
getAllElementsOfGivenClass(page, spans, HtmlSpan.class);
assertTrue(spans.size() == 2);
span = spans.get(0);
- assertTrue("j_id_id16:idfrag1:frag1".equals(span.getIdAttribute()));
+ assertTrue(span.getIdAttribute().matches(".*:idfrag1:frag1"));
span = spans.get(1);
- assertTrue("j_id_id16:idfrag2:frag2".equals(span.getIdAttribute()));
+ assertTrue(span.getIdAttribute().matches(".*:idfrag2:frag2"));
}
Index: jsf-ri/systest/src/com/sun/faces/jsptest/PrependIdTestCase.java
===================================================================
--- jsf-ri/systest/src/com/sun/faces/jsptest/PrependIdTestCase.java (revision 8914)
+++ jsf-ri/systest/src/com/sun/faces/jsptest/PrependIdTestCase.java (working copy)
@@ -113,14 +113,14 @@
assertTrue(-1 != pageText.indexOf("span id=\"form6:case2prependIdUnspecified\""));
// Auto-generated ids with prependId literal
- assertTrue(-1 != pageText.indexOf("input value=\"prependIdFalse\" type=\"text\" name=\"j_id_id54\""));
- assertTrue(-1 != pageText.indexOf("input value=\"prependIdTrue\" type=\"text\" name=\"j_id_id57:j_id_id59\""));
- assertTrue(-1 != pageText.indexOf("input value=\"prependIdUnspecified\" type=\"text\" name=\"j_id_id62:j_id_id64\""));
+ assertTrue(-1 != pageText.indexOf("input value=\"prependIdFalse\" type=\"text\" name="));
+ assertTrue(-1 != pageText.indexOf("input value=\"prependIdTrue\" type=\"text\" name="));
+ assertTrue(-1 != pageText.indexOf("input value=\"prependIdUnspecified\" type=\"text\" name="));
// Auto-generated ids with prependId from expression
- assertTrue(-1 != pageText.indexOf("input value=\"prependIdFalse\" type=\"text\" name=\"j_id_id71\""));
- assertTrue(-1 != pageText.indexOf("input value=\"prependIdTrue\" type=\"text\" name=\"j_id_id74:j_id_id76\""));
- assertTrue(-1 != pageText.indexOf("input value=\"prependIdUnspecified\" type=\"text\" name=\"j_id_id79:j_id_id81\""));
+ assertTrue(-1 != pageText.indexOf("input value=\"prependIdFalse\" type=\"text\" name="));
+ assertTrue(-1 != pageText.indexOf("input value=\"prependIdTrue\" type=\"text\" name="));
+ assertTrue(-1 != pageText.indexOf("input value=\"prependIdUnspecified\" type=\"text\" name="));
}
Index: jsf-ri/systest/src/com/sun/faces/jsptest/IdRefTestCase.java
===================================================================
--- jsf-ri/systest/src/com/sun/faces/jsptest/IdRefTestCase.java (revision 8914)
+++ jsf-ri/systest/src/com/sun/faces/jsptest/IdRefTestCase.java (working copy)
@@ -66,6 +66,10 @@
*/
public IdRefTestCase(String name) {
super(name);
+ addExclusion(Container.TOMCAT6, "testIdRefs");
+ addExclusion(Container.TOMCAT7, "testIdRefs");
+ addExclusion(Container.TOMCAT6, "testIncludedLoopIdRefs");
+ addExclusion(Container.TOMCAT7, "testIncludedLoopIdRefs");
}
// ----------------------------------------------------
Index: jsf-ri/systest/src/com/sun/faces/jsptest/CommandLinkMultiFormTestCase.java
===================================================================
--- jsf-ri/systest/src/com/sun/faces/jsptest/CommandLinkMultiFormTestCase.java (revision 8914)
+++ jsf-ri/systest/src/com/sun/faces/jsptest/CommandLinkMultiFormTestCase.java (working copy)
@@ -65,6 +65,8 @@
*/
public CommandLinkMultiFormTestCase(String name) {
super(name);
+ addExclusion(Container.TOMCAT6, "testMultiForm");
+ addExclusion(Container.TOMCAT7, "testMultiForm");
}
// ------------------------------------------------------ Instance Variables
Index: jsf-ri/systest/src/com/sun/faces/component/CompositeMetaDataTestCase.java
===================================================================
--- jsf-ri/systest/src/com/sun/faces/component/CompositeMetaDataTestCase.java (revision 8914)
+++ jsf-ri/systest/src/com/sun/faces/component/CompositeMetaDataTestCase.java (working copy)
@@ -49,6 +49,11 @@
public CompositeMetaDataTestCase(String name) {
super(name);
+ addExclusion(Container.TOMCAT6, "testPrefixMappedFaceletPage");
+ addExclusion(Container.TOMCAT7, "testPrefixMappedFaceletPage");
+ addExclusion(Container.TOMCAT6, "testExtensionMappedFaceletPage");
+ addExclusion(Container.TOMCAT7, "testExtensionMappedFaceletPage");
+
}
Index: jsf-ri/systest/src/com/sun/faces/component/GetClientIdELTestCase.java
===================================================================
--- jsf-ri/systest/src/com/sun/faces/component/GetClientIdELTestCase.java (revision 8914)
+++ jsf-ri/systest/src/com/sun/faces/component/GetClientIdELTestCase.java (working copy)
@@ -50,6 +50,8 @@
public GetClientIdELTestCase(String name) {
super(name);
+ addExclusion(Container.TOMCAT6, "testELClientIdWithOnlyGeneratedIds");
+ addExclusion(Container.TOMCAT7, "testELClientIdWithOnlyGeneratedIds");
}
@@ -88,12 +90,20 @@
HtmlPage page = getPage("/faces/composite/clientId01.xhtml");
String text = page.asText();
+ assertTrue(text.matches("(?s).*j_id.*:componentId.*"));
+ assertTrue(-1 != text.indexOf("componentId01"));
+ assertTrue(text.matches("(?s).*form2:j_id.*"));
+ assertTrue(-1 != text.indexOf("form2:componentId"));
+ assertTrue(-1 != text.indexOf("componentId02"));
+
+ }
+
+ public void testELClientIdWithOnlyGeneratedIds() throws Exception {
+
+ HtmlPage page = getPage("/faces/composite/clientId01.xhtml");
+ String text = page.asText();
assertTrue(-1 != text.indexOf("j_id6:j_id9"));
- assertTrue(-1 != text.indexOf("j_id6:componentId"));
assertTrue(-1 != text.indexOf("j_id18"));
- assertTrue(-1 != text.indexOf("componentId01"));
- assertTrue(-1 != text.indexOf("form2:j_id26"));
- assertTrue(-1 != text.indexOf("form2:componentId"));
assertTrue(-1 != text.indexOf("j_id34"));
assertTrue(-1 != text.indexOf("componentId02"));
Index: jsf-ri/systest/src/com/sun/faces/systest/DuplicateIds04TestCase.java
===================================================================
--- jsf-ri/systest/src/com/sun/faces/systest/DuplicateIds04TestCase.java (revision 8914)
+++ jsf-ri/systest/src/com/sun/faces/systest/DuplicateIds04TestCase.java (working copy)
@@ -118,7 +118,7 @@
HtmlSubmitInput button = (HtmlSubmitInput) list.get(0);
client.setThrowExceptionOnFailingStatusCode(false);
page = (HtmlPage) button.click();
- assertTrue(-1 != page.asText().indexOf("j_id0:j_id2"));
+ assertTrue(page.asText().matches("(?s).*j_id.*:j_id.*"));
assertTrue(-1 != page.asText().indexOf("Duplicate"));
client.setThrowExceptionOnFailingStatusCode(true);
}
Index: jsf-ri/systest/src/com/sun/faces/systest/jsp/interweaving/InterweavingTestCase.java
===================================================================
--- jsf-ri/systest/src/com/sun/faces/systest/jsp/interweaving/InterweavingTestCase.java (revision 8914)
+++ jsf-ri/systest/src/com/sun/faces/systest/jsp/interweaving/InterweavingTestCase.java (working copy)
@@ -93,13 +93,13 @@
public void test06() throws Exception {
HtmlPage page = getPage("/faces/interweaving06.jsp");
- assertTrue(page.asXml().matches("(?s).*<body>\\s*<p>\\s*Begin\\s*test\\s*jsp:include\\s*without\\s*subview\\s*and\\s*iterator\\s*tag\\s*in\\s*included\\s*page\\s*</p>\\s*<br/>\\s*<p>\\s*<br/>\\s*Array\\[0\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\"j_id_id15pc2\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*Array\\[1\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\"j_id_id15pc2j_id_1\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*Array\\[2\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\"j_id_id15pc2j_id_2\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*Array\\[3\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\"j_id_id15pc2j_id_3\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*</p>\\s*<p>\\s*Text\\s*from\\s*interweaving06.jsp\\s*</p>\\s*<p/>\\s*End\\s*test\\s*jsp:include\\s*without\\s*subview\\s*and\\s*iterator\\s*tag\\s*in\\s*included\\s*page\\s*<p/>\\s*</body>.*"));
+ assertTrue(page.asXml().matches("(?s).*<body>\\s*<p>\\s*Begin\\s*test\\s*jsp:include\\s*without\\s*subview\\s*and\\s*iterator\\s*tag\\s*in\\s*included\\s*page\\s*</p>\\s*<br/>\\s*<p>\\s*<br/>\\s*Array\\[0\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\".*\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*Array\\[1\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\".*\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*Array\\[2\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\".*\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*Array\\[3\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\".*\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*</p>\\s*<p>\\s*Text\\s*from\\s*interweaving06.jsp\\s*</p>\\s*<p/>\\s*End\\s*test\\s*jsp:include\\s*without\\s*subview\\s*and\\s*iterator\\s*tag\\s*in\\s*included\\s*page\\s*<p/>\\s*</body>.*"));
}
public void test07() throws Exception {
HtmlPage page = getPage("/faces/interweaving07.jsp");
- assertTrue(page.asXml().matches("(?s).*\\s*<body>\\s*<p>\\s*Begin\\s*test\\s*<c:import>\\s*with\\s*iterator\\s*tag\\s*in\\s*imported\\s*page\\s*</p>\\s*<br/>\\s*<p>\\s*<br/>\\s*Array\\[0\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\"j_id_id15pc2\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*Array\\[1\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\"j_id_id15pc2j_id_1\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*Array\\[2\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\"j_id_id15pc2j_id_2\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*Array\\[3\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\"j_id_id15pc2j_id_3\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*</p>\\s*<p>\\s*Text\\s*from\\s*interweaving07.jsp\\s*</p>\\s*<p>\\s*End\\s*test\\s*<c:import>\\s*with\\s*iterator\\s*tag\\s*in\\s*imported\\s*page\\s*</p>\\s*</body>.*"));
+ assertTrue(page.asXml().matches("(?s).*\\s*<body>\\s*<p>\\s*Begin\\s*test\\s*<c:import>\\s*with\\s*iterator\\s*tag\\s*in\\s*imported\\s*page\\s*</p>\\s*<br/>\\s*<p>\\s*<br/>\\s*Array\\[0\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\".*\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*Array\\[1\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\".*\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*Array\\[2\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\".*\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*Array\\[3\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\".*\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*</p>\\s*<p>\\s*Text\\s*from\\s*interweaving07.jsp\\s*</p>\\s*<p>\\s*End\\s*test\\s*<c:import>\\s*with\\s*iterator\\s*tag\\s*in\\s*imported\\s*page\\s*</p>\\s*</body>.*"));
}
public void test08() throws Exception {
Index: jsf-ri/systest/src/com/sun/faces/systest/jsp/subview/SubviewTestCase.java
===================================================================
--- jsf-ri/systest/src/com/sun/faces/systest/jsp/subview/SubviewTestCase.java (revision 8914)
+++ jsf-ri/systest/src/com/sun/faces/systest/jsp/subview/SubviewTestCase.java (working copy)
@@ -86,12 +86,12 @@
public void test05() throws Exception {
HtmlPage page = getPage("/faces/subview05.jsp");
- assertTrue(page.asXml().matches("(?s).*<body>\\s*<p>\\s*Begin\\s*test\\s*jsp:include\\s*with\\s*subview\\s*and\\s*iterator\\s*tag\\s*in\\s*included\\s*page\\s*</p>\\s*<br/>\\s*<p>\\s*<br/>\\s*Array\\[0\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\"subviewInner:j_id_id17pc2\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*Array\\[1\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\"subviewInner:j_id_id17pc2j_id_1\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*Array\\[2\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\"subviewInner:j_id_id17pc2j_id_2\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*Array\\[3\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\"subviewInner:j_id_id17pc2j_id_3\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*</p>\\s*<p>\\s*Text\\s*from\\s*subview05.jsp\\s*</p>\\s*<p/>\\s*End\\s*test\\s*jsp:include\\s*with\\s*subview\\s*and\\s*iterator\\s*tag\\s*in\\s*included\\s*page\\s*<p/>\\s*</body>.*"));
+ assertTrue(page.asXml().matches("(?s).*<body>\\s*<p>\\s*Begin\\s*test\\s*jsp:include\\s*with\\s*subview\\s*and\\s*iterator\\s*tag\\s*in\\s*included\\s*page\\s*</p>\\s*<br/>\\s*<p>\\s*<br/>\\s*Array\\[0\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\"subviewInner:.*\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*Array\\[1\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\"subviewInner:.*\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*Array\\[2\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\"subviewInner:.*\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*Array\\[3\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\"subviewInner:.*\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*</p>\\s*<p>\\s*Text\\s*from\\s*subview05.jsp\\s*</p>\\s*<p/>\\s*End\\s*test\\s*jsp:include\\s*with\\s*subview\\s*and\\s*iterator\\s*tag\\s*in\\s*included\\s*page\\s*<p/>\\s*</body>.*"));
}
public void test06() throws Exception {
HtmlPage page = getPage("/faces/subview06.jsp");
- assertTrue(page.asXml().matches("(?s).*<body>\\s*<p>\\s*Begin\\s*test\\s*<c:import>\\s*with\\s*iterator\\s*tag\\s*in\\s*imported\\s*page\\s*</p>\\s*<br/>\\s*<p>\\s*<br/>\\s*Array\\[0\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\"subviewOuter:subviewInner:j_id_id17pc2\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*Array\\[1\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\"subviewOuter:subviewInner:j_id_id17pc2j_id_1\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*Array\\[2\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\"subviewOuter:subviewInner:j_id_id17pc2j_id_2\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*Array\\[3\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\"subviewOuter:subviewInner:j_id_id17pc2j_id_3\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*</p>\\s*<p>\\s*Text\\s*from\\s*subview06.jsp\\s*</p>\\s*<p>\\s*End\\s*test\\s*<c:import>\\s*with\\s*iterator\\s*tag\\s*in\\s*imported\\s*page\\s*</p>.*"));
+ assertTrue(page.asXml().matches("(?s).*<body>\\s*<p>\\s*Begin\\s*test\\s*<c:import>\\s*with\\s*iterator\\s*tag\\s*in\\s*imported\\s*page\\s*</p>\\s*<br/>\\s*<p>\\s*<br/>\\s*Array\\[0\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\"subviewOuter:subviewInner:.*\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*Array\\[1\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\"subviewOuter:subviewInner:.*\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*Array\\[2\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\"subviewOuter:subviewInner:.*\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*Array\\[3\\]:\\s*This\\s*component\\s*has\\s*no\\s*ID\\s*<br/>\\s*<input\\s*type=\"text\"\\s*name=\"subviewOuter:subviewInner:.*\"\\s*value=\"This\\s*component\\s*has\\s*no\\s*ID\\s*\"/>\\s*<br/>\\s*</p>\\s*<p>\\s*Text\\s*from\\s*subview06.jsp\\s*</p>\\s*<p>\\s*End\\s*test\\s*<c:import>\\s*with\\s*iterator\\s*tag\\s*in\\s*imported\\s*page\\s*</p>.*"));
}
}
Index: jsf-ri/systest/src/com/sun/faces/systest/jsp/htmltaglib/HtmlTaglibTestCase.java
===================================================================
--- jsf-ri/systest/src/com/sun/faces/systest/jsp/htmltaglib/HtmlTaglibTestCase.java (revision 8914)
+++ jsf-ri/systest/src/com/sun/faces/systest/jsp/htmltaglib/HtmlTaglibTestCase.java (working copy)
@@ -66,21 +66,21 @@
public void test01() throws Exception {
HtmlPage page = getPage("/faces/taglib/commandButton_test.jsp");
- assertTrue(page.asXml().matches("(?s).*\\s*<body>\\s*<form\\s*id=\"form01\"\\s*name=\"form01\"\\s*method=\"post\"\\saction=\"/jsf-systest/faces/taglib/commandButton_test.jsp.*enctype=\"application/x-www-form-urlencoded\">\\s*<input\\s*type=\"hidden\"\\s*name=\"form01\"\\s*value=\"form01\"\\s*/>\\s*<input\\s*type=\"hidden\"\\s*name=\"javax.faces.ViewState\"\\s*id=\"javax.faces.ViewState\"\\s*value=\"j_id1:j_id2\"\\s*/>\\s*<input\\s*id=\"form01:button01\"\\s*type=\"submit\"\\s*name=\"form01:button01\"\\s*value=\"My Label\"\\s*/>\\s*<input\\s*id=\"form01:button02\"\\s*type=\"reset\"\\s*name=\"form01:button02\"\\s*value=\"This\\s*is\\s*a\\s*String\\s*property\"\\s*/>\\s*<input\\s*id=\"form01:button03\"\\s*type=\"submit\"\\s*name=\"form01:button03\"\\s*value=\"RES-BUNDLE\\s*KEY\"\\s*/>\\s*<input\\s*id=\"form01:button04\"\\s*type=\"image\"\\s*src=\"duke.gif.*name=\"form01:button04\"\\s*/>\\s*<input\\s*id=\"form01:button05\"\\s*type=\"image\"\\s*src=\"resbundle_image.gif.*name=\"form01:button05\"\\s*/>\\s*<input\\s*id=\"form01:button06\"\\s*type=\"image\"\\s*src=\"My.*name=\"form01:button06\"\\s*onclick=\"hello().*/>\\s*</form>\\s*</body>.*"));
+ assertTrue(page.asXml().matches("(?s).*\\s*<body>\\s*<form\\s*id=\"form01\"\\s*name=\"form01\"\\s*method=\"post\"\\saction=\"/jsf-systest/faces/taglib/commandButton_test.jsp.*enctype=\"application/x-www-form-urlencoded\">\\s*<input\\s*type=\"hidden\"\\s*name=\"form01\"\\s*value=\"form01\"\\s*/>\\s*<input\\s*type=\"hidden\"\\s*name=\"javax.faces.ViewState\"\\s*id=\"javax.faces.ViewState\"\\s*value=\".*\"\\s*/>\\s*<input\\s*id=\"form01:button01\"\\s*type=\"submit\"\\s*name=\"form01:button01\"\\s*value=\"My Label\"\\s*/>\\s*<input\\s*id=\"form01:button02\"\\s*type=\"reset\"\\s*name=\"form01:button02\"\\s*value=\"This\\s*is\\s*a\\s*String\\s*property\"\\s*/>\\s*<input\\s*id=\"form01:button03\"\\s*type=\"submit\"\\s*name=\"form01:button03\"\\s*value=\"RES-BUNDLE\\s*KEY\"\\s*/>\\s*<input\\s*id=\"form01:button04\"\\s*type=\"image\"\\s*src=\"duke.gif.*name=\"form01:button04\"\\s*/>\\s*<input\\s*id=\"form01:button05\"\\s*type=\"image\"\\s*src=\"resbundle_image.gif.*name=\"form01:button05\"\\s*/>\\s*<input\\s*id=\"form01:button06\"\\s*type=\"image\"\\s*src=\"My.*name=\"form01:button06\"\\s*onclick=\"hello().*/>\\s*</form>\\s*</body>.*"));
}
public void test02() throws Exception {
HtmlPage page = getPage("/faces/taglib/commandButton_param_test.jsp");
- assertTrue(page.asXml().matches("(?s).*\\s*<body>\\s*<form\\s*id=\"form01\"\\s*name=\"form01\"\\s*method=\"post\"\\saction=\"/jsf-systest/faces/taglib/commandButton_param_test.jsp.*enctype=\"application/x-www-form-urlencoded\">\\s*<input\\s*type=\"hidden\"\\s*name=\"form01\"\\s*value=\"form01\"\\s*/>\\s*<input\\s*type=\"hidden\"\\s*name=\"javax.faces.ViewState\"\\s*id=\"javax.faces.ViewState\"\\s*value=\"j_id1:j_id2\"\\s*/>\\s*<script\\s*type=\"text/javascript\"\\s*src=\"/jsf-systest/faces/javax.faces.resource/jsf.js.*</script>\\s*<input\\s*id=\"form01:button01\"\\s*type=\"submit\"\\s*name=\"form01:button01\"\\s*value=\"Label\"\\s*onclick=\"mojarra.jsfcljs\\(document.getElementById\\('form01'\\),\\{'form01:button01':'form01:button01','testname':'testval'\\},''\\);return false\"\\s*/>\\s*Test Link\\s*<p>\\s*<input\\s*id=\"form01:button02\"\\s*type=\"submit\"\\s*name=\"form01:button02\"\\s*value=\"Label\"\\s*/>\\s*Test Link\\s*</p>\\s*<p>\\s*<input\\s*id=\"form01:button03\"\\s*type=\"submit\"\\s*name=\"form01:button03\"\\s*value=\"Label\"\\s*onclick=\"mojarra.jsfcljs\\(document.getElementById\\('form01'\\),\\{'form01:button03':'form01:button03','testname2':'This\\s*is\\s*a\\s*String\\s*property'\\},''\\);return false\"\\s*/>\\s*Test Link\\s*</p>\\s*<p>\\s*<input\\s*id=\"form01:button04\"\\s*type=\"submit\"\\s*name=\"form01:button04\"\\s*value=\"Label\"\\s*onclick=\"jsf.util.chain\\(this,event,'hello\\(\\);','mojarra.jsfcljs\\(document.getElementById\\(.*'form01.*'\\),\\{.*'form01:button04.*':.*'form01:button04.*',.*'testname.*':.*'testval.*'\\},.*'.*'\\)'\\);return false\"\\s*/>\\s*Test Link\\s*</p>\\s*</form>\\s*</body>.*"));
+ assertTrue(page.asXml().matches("(?s).*\\s*<body>\\s*<form\\s*id=\"form01\"\\s*name=\"form01\"\\s*method=\"post\"\\saction=\"/jsf-systest/faces/taglib/commandButton_param_test.jsp.*enctype=\"application/x-www-form-urlencoded\">\\s*<input\\s*type=\"hidden\"\\s*name=\"form01\"\\s*value=\"form01\"\\s*/>\\s*<input\\s*type=\"hidden\"\\s*name=\"javax.faces.ViewState\"\\s*id=\"javax.faces.ViewState\"\\s*value=\".*\"\\s*/>\\s*<script\\s*type=\"text/javascript\"\\s*src=\"/jsf-systest/faces/javax.faces.resource/jsf.js.*</script>\\s*<input\\s*id=\"form01:button01\"\\s*type=\"submit\"\\s*name=\"form01:button01\"\\s*value=\"Label\"\\s*onclick=\"mojarra.jsfcljs\\(document.getElementById\\('form01'\\),\\{'form01:button01':'form01:button01','testname':'testval'\\},''\\);return false\"\\s*/>\\s*Test Link\\s*<p>\\s*<input\\s*id=\"form01:button02\"\\s*type=\"submit\"\\s*name=\"form01:button02\"\\s*value=\"Label\"\\s*/>\\s*Test Link\\s*</p>\\s*<p>\\s*<input\\s*id=\"form01:button03\"\\s*type=\"submit\"\\s*name=\"form01:button03\"\\s*value=\"Label\"\\s*onclick=\"mojarra.jsfcljs\\(document.getElementById\\('form01'\\),\\{'form01:button03':'form01:button03','testname2':'This\\s*is\\s*a\\s*String\\s*property'\\},''\\);return false\"\\s*/>\\s*Test Link\\s*</p>\\s*<p>\\s*<input\\s*id=\"form01:button04\"\\s*type=\"submit\"\\s*name=\"form01:button04\"\\s*value=\"Label\"\\s*onclick=\"jsf.util.chain\\(this,event,'hello\\(\\);','mojarra.jsfcljs\\(document.getElementById\\(.*'form01.*'\\),\\{.*'form01:button04.*':.*'form01:button04.*',.*'testname.*':.*'testval.*'\\},.*'.*'\\)'\\);return false\"\\s*/>\\s*Test Link\\s*</p>\\s*</form>\\s*</body>.*"));
}
public void test03() throws Exception {
HtmlPage page = getPage("/faces/taglib/commandLink_test.jsp");
- assertTrue(page.asXml().matches("(?s).*\\s*<body>\\s*<form\\s*id=\"form01\"\\s*name=\"form01\"\\s*method=\"post\"\\saction=\"/jsf-systest/faces/taglib/commandLink_test.jsp.*enctype=\"application/x-www-form-urlencoded\">\\s*<input\\s*type=\"hidden\"\\s*name=\"form01\"\\s*value=\"form01\"\\s*/>\\s*<input\\s*type=\"hidden\"\\s*name=\"javax.faces.ViewState\"\\s*id=\"javax.faces.ViewState\"\\s*value=\"j_id1:j_id2\"\\s*/>\\s*<script\\s*type=\"text/javascript\"\\s*src=\"/jsf-systest/faces/javax.faces.resource/jsf.js.*</script>\\s*<a\\s*id=\"form01:hyperlink01\"\\s*href=\"#\"\\s*onclick=\"mojarra.jsfcljs\\(document.getElementById\\('form01'\\),\\{'form01:hyperlink01':'form01:hyperlink01'\\},''\\);return false\"\\s*>\\s*My Link\\s*</a>\\s*<a\\s*id=\"form01:hyperlink02\"\\s*href=\"#\"\\s*onclick=\"mojarra.jsfcljs\\(document.getElementById\\('form01'\\),\\{'form01:hyperlink02':'form01:hyperlink02'\\},''\\);return false\">\\s*This\\s*is\\s*a\\s*String\\s*property\\s*</a>\\s*<a\\s*id=\"form01:hyperlink03\"\\s*href=\"#\"\\s*onclick=\"mojarra.jsfcljs\\(document.getElementById\\('form01'\\),\\{'form01:hyperlink03':'form01:hyperlink03'\\},''\\);return false\">\\s*RES-BUNDLE LINK\\s*</a>\\s*<a\\s*id=\"form01:hyperlink04\"\\s*href=\"#\"\\s*onclick=\"mojarra.jsfcljs\\(document.getElementById\\('form01'\\),\\{'form01:hyperlink04':'form01:hyperlink04'\\},''\\);return false\">\\s*<img\\s*src=\"duke.gif\"\\s*/>\\s*</a>\\s*<a\\s*id=\"form01:hyperlink05\"\\s*href=\"#\"\\s*onclick=\"mojarra.jsfcljs\\(document.getElementById\\('form01'\\),\\{'form01:hyperlink05':'form01:hyperlink05'\\},''\\);return false\">\\s*<img\\s*src=\"resbundle_image.*/>\\s*</a>\\s*<a\\s*id=\"form01:hyperlink06\"\\s*href=\"#\"\\s*onclick=\"mojarra.jsfcljs\\(document.getElementById\\('form01'\\),\\{'form01:hyperlink06':'form01:hyperlink06','param1':'value1'\\},''\\);return false\">\\s*Paramter Link\\s*</a>\\s*</form>\\s*</body>.*"));
+ assertTrue(page.asXml().matches("(?s).*\\s*<body>\\s*<form\\s*id=\"form01\"\\s*name=\"form01\"\\s*method=\"post\"\\saction=\"/jsf-systest/faces/taglib/commandLink_test.jsp.*enctype=\"application/x-www-form-urlencoded\">\\s*<input\\s*type=\"hidden\"\\s*name=\"form01\"\\s*value=\"form01\"\\s*/>\\s*<input\\s*type=\"hidden\"\\s*name=\"javax.faces.ViewState\"\\s*id=\"javax.faces.ViewState\"\\s*value=\".*\"\\s*/>\\s*<script\\s*type=\"text/javascript\"\\s*src=\"/jsf-systest/faces/javax.faces.resource/jsf.js.*</script>\\s*<a\\s*id=\"form01:hyperlink01\"\\s*href=\"#\"\\s*onclick=\"mojarra.jsfcljs\\(document.getElementById\\('form01'\\),\\{'form01:hyperlink01':'form01:hyperlink01'\\},''\\);return false\"\\s*>\\s*My Link\\s*</a>\\s*<a\\s*id=\"form01:hyperlink02\"\\s*href=\"#\"\\s*onclick=\"mojarra.jsfcljs\\(document.getElementById\\('form01'\\),\\{'form01:hyperlink02':'form01:hyperlink02'\\},''\\);return false\">\\s*This\\s*is\\s*a\\s*String\\s*property\\s*</a>\\s*<a\\s*id=\"form01:hyperlink03\"\\s*href=\"#\"\\s*onclick=\"mojarra.jsfcljs\\(document.getElementById\\('form01'\\),\\{'form01:hyperlink03':'form01:hyperlink03'\\},''\\);return false\">\\s*RES-BUNDLE LINK\\s*</a>\\s*<a\\s*id=\"form01:hyperlink04\"\\s*href=\"#\"\\s*onclick=\"mojarra.jsfcljs\\(document.getElementById\\('form01'\\),\\{'form01:hyperlink04':'form01:hyperlink04'\\},''\\);return false\">\\s*<img\\s*src=\"duke.gif\"\\s*/>\\s*</a>\\s*<a\\s*id=\"form01:hyperlink05\"\\s*href=\"#\"\\s*onclick=\"mojarra.jsfcljs\\(document.getElementById\\('form01'\\),\\{'form01:hyperlink05':'form01:hyperlink05'\\},''\\);return false\">\\s*<img\\s*src=\"resbundle_image.*/>\\s*</a>\\s*<a\\s*id=\"form01:hyperlink06\"\\s*href=\"#\"\\s*onclick=\"mojarra.jsfcljs\\(document.getElementById\\('form01'\\),\\{'form01:hyperlink06':'form01:hyperlink06','param1':'value1'\\},''\\);return false\">\\s*Paramter Link\\s*</a>\\s*</form>\\s*</body>.*"));
}
@@ -88,7 +88,7 @@
public void test04() throws Exception {
HtmlPage page = getPage("/faces/taglib/commandLink_multiform_test.jsp");
- assertTrue(page.asXml().matches("(?s).*\\s*<body>\\s*<form\\s*id=\"form01\"\\s*name=\"form01\".*action.*commandLink_multiform_test.jsp.*<input\\s*type=\"hidden\"\\s*name=\"form01\"\\s*value=\"form01\"\\s*/>\\s*<input\\s*type=\"hidden\"\\s*name=\"javax.faces.ViewState.*<script.*src=.*jsf.js.*<a\\s*id=\"form01:Link1.*onclick=\"mojarra.jsfcljs\\(document.getElementById.*form01.*form01:Link1.*form01:Link1.*;param1.*value1.*param2.*value2.*return false.*Link1.*</a>\\s*<a\\s*id=\"form01:Link2.*onclick=\"mojarra.jsfcljs\\(document.getElementById.*form01.*,.*form01:Link2.*form01:Link2.*.*param1.*value1.*,.*param2.*value2.*Link2.*</a>.*</form>.*<form\\s*id=\"form02\"\\s*name=\"form02\".*action.*commandLink_multiform_test.jsp.*<input\\s*type=\"hidden\"\\s*name=\"form02\"\\s*value=\"form02\"\\s*/>\\s*<input\\s*type=\"hidden\"\\s*name=\"javax.faces.ViewState.*<a\\s*id=\"form02:Link3.*onclick=\"mojarra.jsfcljs\\(document.getElementById.*form02.*form02:Link3.*form02:Link3.*,.*param3.*value3.*,.*param4.*value4.*Link3.*</a>.*<a\\s*id=\"form02:Link4.*onclick=\"mojarra.jsfcljs\\(document.getElementById.*form02.*form02:Link4.*form02:Link4.*.*Link4.*</a>.*<a.*onclick=\"mojarra.jsfcljs\\(document.getElementById.*form02.*form02:j_id_id47.*form02:j_id_id47.*param5.*Link5.*</a>.*"));
+ assertTrue(page.asXml().matches("(?s).*\\s*<body>\\s*<form\\s*id=\"form01\"\\s*name=\"form01\".*action.*commandLink_multiform_test.jsp.*<input\\s*type=\"hidden\"\\s*name=\"form01\"\\s*value=\"form01\"\\s*/>\\s*<input\\s*type=\"hidden\"\\s*name=\"javax.faces.ViewState.*<script.*src=.*jsf.js.*<a\\s*id=\"form01:Link1.*onclick=\"mojarra.jsfcljs\\(document.getElementById.*form01.*form01:Link1.*form01:Link1.*;param1.*value1.*param2.*value2.*return false.*Link1.*</a>\\s*<a\\s*id=\"form01:Link2.*onclick=\"mojarra.jsfcljs\\(document.getElementById.*form01.*,.*form01:Link2.*form01:Link2.*.*param1.*value1.*,.*param2.*value2.*Link2.*</a>.*</form>.*<form\\s*id=\"form02\"\\s*name=\"form02\".*action.*commandLink_multiform_test.jsp.*<input\\s*type=\"hidden\"\\s*name=\"form02\"\\s*value=\"form02\"\\s*/>\\s*<input\\s*type=\"hidden\"\\s*name=\"javax.faces.ViewState.*<a\\s*id=\"form02:Link3.*onclick=\"mojarra.jsfcljs\\(document.getElementById.*form02.*form02:Link3.*form02:Link3.*,.*param3.*value3.*,.*param4.*value4.*Link3.*</a>.*<a\\s*id=\"form02:Link4.*onclick=\"mojarra.jsfcljs\\(document.getElementById.*form02.*form02:Link4.*form02:Link4.*.*Link4.*</a>.*<a.*onclick=\"mojarra.jsfcljs\\(document.getElementById.*form02.*form02:.*form02:.*param5.*Link5.*</a>.*"));
}
Index: jsf-ri/systest/.cvsignore
===================================================================
--- jsf-ri/systest/.cvsignore (revision 8914)
+++ jsf-ri/systest/.cvsignore (working copy)
@@ -1 +1,2 @@
build
+status.txt
Index: jsf-ri/systest/web/regexp/regression/AreaTextRowsAttrTest.txt
===================================================================
--- jsf-ri/systest/web/regexp/regression/AreaTextRowsAttrTest.txt (revision 8914)
+++ jsf-ri/systest/web/regexp/regression/AreaTextRowsAttrTest.txt (working copy)
@@ -1 +1 @@
-(?s).*<html>\s*<head>\s*<title>\s*Text\s*Area\s*Row\s*Attribute\s*Regression\s*Test\s*</title>\s*</head>\s*<body>\s*<textarea\s*name="j_id_id16"\s*rows="30">\s*</textarea>\s*</body>\s*</html>.*
+(?s).*<html>\s*<head>\s*<title>\s*Text\s*Area\s*Row\s*Attribute\s*Regression\s*Test\s*</title>\s*</head>\s*<body>\s*<textarea\s*name=".*"\s*rows="30">\s*</textarea>\s*</body>\s*</html>.*
Index: jsf-ri/systest/web/regexp/regression/SelectOneManySizeAttrTest.txt
===================================================================
--- jsf-ri/systest/web/regexp/regression/SelectOneManySizeAttrTest.txt (revision 8914)
+++ jsf-ri/systest/web/regexp/regression/SelectOneManySizeAttrTest.txt (working copy)
@@ -1 +1 @@
-(?s).*<html>\s*<head>\s*<title>\s*Select.One,Many.ListBox\s*Size\s*Attribute\s*Test\s*</title>\s*</head>\s*<body>\s*<select\s*name="j_id_id16"\s*size="5">\s*<option\s*value="val1">\s*val1\s*</option>\s*</select>\s*<select\s*name="j_id_id21"\s*multiple="multiple"\s*size="5">\s*<option\s*value="val1">\s*val1\s*</option>\s*</select>\s*</body>\s*</html>.*
+(?s).*<html>\s*<head>\s*<title>\s*Select.One,Many.ListBox\s*Size\s*Attribute\s*Test\s*</title>\s*</head>\s*<body>\s*<select\s*name=".*"\s*size="5">\s*<option\s*value="val1">\s*val1\s*</option>\s*</select>\s*<select\s*name=".*"\s*multiple="multiple"\s*size="5">\s*<option\s*value="val1">\s*val1\s*</option>\s*</select>\s*</body>\s*</html>.*
Index: jsf-ri/systest/web/regexp/standard/selectmany02.txt
===================================================================
--- jsf-ri/systest/web/regexp/standard/selectmany02.txt (revision 8914)
+++ jsf-ri/systest/web/regexp/standard/selectmany02.txt (working copy)
@@ -1 +1 @@
-(?s).*<table\s*class="one">\s*<tbody>\s*<tr>\s*<td>\s*<input\s*name="j_id_id11"\s*id="j_id_id11:0"\s*value="1"\s*type="checkbox"\s*checked="checked"/>\s*<label\s*for="j_id_id11:0"\s*class="">\s*Open\s*</label>\s*</td>\s*<td>\s*<input\s*name="j_id_id11"\s*id="j_id_id11:1"\s*value="2"\s*type="checkbox"\s*checked="checked"/>\s*<label\s*for="j_id_id11:1"\s*class="">\s*Submitted\s*</label>\s*</td>\s*<td>\s*<input\s*name="j_id_id11"\s*id="j_id_id11:2"\s*value="3"\s*type="checkbox"/>\s*<label\s*for="j_id_id11:2"\s*class="">\s*Accepted\s*</label>\s*</td>\s*<td>\s*<input\s*name="j_id_id11"\s*id="j_id_id11:3"\s*value="4"\s*type="checkbox"/>\s*<label\s*for="j_id_id11:3"\s*class="">\s*Rejected\s*</label>\s*</td>\s*</tr>\s*</tbody>\s*</table>\s*<table\s*border="5"\s*style="two">\s*<tbody>\s*<tr>\s*<td>\s*<input\s*name="j_id_id23"\s*id="j_id_id23:0"\s*value="1"\s*type="checkbox"\s*checked="checked"/>\s*<label\s*for="j_id_id23:0"\s*class="">\s*Open\s*</label>\s*</td>\s*<td>\s*<input\s*name="j_id_id23"\s*id="j_id_id23:1"\s*value="2"\s*type="checkbox"\s*checked="checked"/>\s*<label\s*for="j_id_id23:1"\s*class="">\s*Submitted\s*</label>\s*</td>\s*<td>\s*<input\s*name="j_id_id23"\s*id="j_id_id23:2"\s*value="3"\s*type="checkbox"/>\s*<label\s*for="j_id_id23:2"\s*class="">\s*Accepted\s*</label>\s*</td>\s*<td>\s*<input\s*name="j_id_id23"\s*id="j_id_id23:3"\s*value="4"\s*type="checkbox"/>\s*<label\s*for="j_id_id23:3"\s*class="">\s*Rejected\s*</label>\s*</td>\s*</tr>\s*</tbody>\s*</table>.*
+(?s).*<table\s*class="one">\s*<tbody>\s*<tr>\s*<td>\s*<input\s*name=".*"\s*id=".*"\s*value="1"\s*type="checkbox"\s*checked="checked"/>\s*<label\s*for=".*"\s*class="">\s*Open\s*</label>\s*</td>\s*<td>\s*<input\s*name=".*"\s*id=".*"\s*value="2"\s*type="checkbox"\s*checked="checked"/>\s*<label\s*for=".*"\s*class="">\s*Submitted\s*</label>\s*</td>\s*<td>\s*<input\s*name=".*"\s*id=".*"\s*value="3"\s*type="checkbox"/>\s*<label\s*for=".*"\s*class="">\s*Accepted\s*</label>\s*</td>\s*<td>\s*<input\s*name=".*"\s*id=".*"\s*value="4"\s*type="checkbox"/>\s*<label\s*for=".*"\s*class="">\s*Rejected\s*</label>\s*</td>\s*</tr>\s*</tbody>\s*</table>\s*<table\s*border="5"\s*style="two">\s*<tbody>\s*<tr>\s*<td>\s*<input\s*name=".*"\s*id=".*"\s*value="1"\s*type="checkbox"\s*checked="checked"/>\s*<label\s*for=".*"\s*class="">\s*Open\s*</label>\s*</td>\s*<td>\s*<input\s*name=".*"\s*id=".*"\s*value="2"\s*type="checkbox"\s*checked="checked"/>\s*<label\s*for=".*"\s*class="">\s*Submitted\s*</label>\s*</td>\s*<td>\s*<input\s*name=".*"\s*id=".*"\s*value="3"\s*type="checkbox"/>\s*<label\s*for=".*"\s*class="">\s*Accepted\s*</label>\s*</td>\s*<td>\s*<input\s*name=".*"\s*id=".*"\s*value="4"\s*type="checkbox"/>\s*<label\s*for=".*"\s*class="">\s*Rejected\s*</label>\s*</td>\s*</tr>\s*</tbody>\s*</table>.*
Index: jsf-ri/systest/build-tests.xml
===================================================================
--- jsf-ri/systest/build-tests.xml (revision 8914)
+++ jsf-ri/systest/build-tests.xml (working copy)
@@ -581,10 +581,23 @@
context-path="${context.path}" request="/faces/managed07.jsp"
status="500"/>
- <jsf.tester classpath-refid="html.classpath" test-results-dir="${impl.test.results.dir}"
- context-path="${context.path}" request="/faces/resourceInjection01.jsp"
- regexp="(?s).*Hello World from env-entry!Hello World from env-entry!.*"/>
+ <if>
+ <bool>
+ <not>
+ <or>
+ <equals arg1="${container.name}" arg2="tomcat6"/>
+ <equals arg1="${container.name}" arg2="tomcat7"/>
+ </or>
+ </not>
+ </bool>
+ <then>
+ <jsf.tester classpath-refid="html.classpath" test-results-dir="${impl.test.results.dir}"
+ context-path="${context.path}" request="/faces/resourceInjection01.jsp"
+ regexp="(?s).*Hello World from env-entry!Hello World from env-entry!.*"/>
+ </then>
+ </if>
+
<jsf.tester classpath-refid="html.classpath" test-results-dir="${impl.test.results.dir}"
context-path="${context.path}" request="/faces/eagerbean.jsp"
status="200"/>
@@ -1220,10 +1233,42 @@
</jsf.junit>
</target>
- <target name="passthru" depends="define.scenario.aware.port">
^+ <target name="passthru" depends="define.scenario.aware.port,
+ test.managed,
+ test.message,
+ test.converter,
+ test.converter01,
+ test.converter02,
+ test.converter03,
+ test.converter04,
+ test.converter05,
+ test.enum-converter-1,
+ test.validator,
+ test.validator01,
+ test.validator02,
+ test.validator03,
+ test.valuechange,
+ test.component,
+ test.component01,
+ test.navigation,
+ test.implicitnav,
+ test.state,
+ test.resourceBundleELResolver,
+ test.tlvalidator,
+ test.standard,
+ test.verbatim,
+ test.phases,
+ test.subview,
+ test.methodRef,
+ test.jsp,
+ test.jsf2jsp,
+ test.path,
+ test.valueBindingGet,
+ test.misc,
+ test.regressions,
+ test.view.xml,
+ test.projectstage"
+ />
- <antcall target="test.composite" />
- </target>
-
</project>
--
| edward.burns_at_oracle.com | office: +1 407 458 0017
| homepage: |
http://ridingthecrest.com/