JBoss Rich Faces SVN: r10905 - trunk/test-applications/jsp/src/main/java/util/parser.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-10-25 09:48:24 -0400 (Sat, 25 Oct 2008)
New Revision: 10905
Added:
trunk/test-applications/jsp/src/main/java/util/parser/Attribute.java
Modified:
trunk/test-applications/jsp/src/main/java/util/parser/TLDParser.java
Log:
Added: trunk/test-applications/jsp/src/main/java/util/parser/Attribute.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/util/parser/Attribute.java (rev 0)
+++ trunk/test-applications/jsp/src/main/java/util/parser/Attribute.java 2008-10-25 13:48:24 UTC (rev 10905)
@@ -0,0 +1,64 @@
+package util.parser;
+
+public class Attribute {
+ private String name;
+ private String type;
+ private String description;
+ private Status status;
+
+ public Attribute(){
+ this.description = "";
+ }
+
+ public Attribute(String name){
+ this.name = name;
+ this.description = "";
+ }
+
+ public Attribute(String name, String type, String desc, Status status){
+ this.name = name;
+ this.type = type;
+ this.description = desc;
+ this.status = status;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public Status getStatus() {
+ return status;
+ }
+
+ public void setStatus(Status status) {
+ this.status = status;
+ }
+
+ @Override
+ public String toString(){
+ return "[" + "Name: " + name + "\r\n" + "Description: " + description + "\r\n" +
+ "Type: " + type + "\r\n" + "Status: " + status + "]";
+ }
+}
+
+ enum Status {NOT_READY, IMPLEMENTED, FAILED, PASSED}
Modified: trunk/test-applications/jsp/src/main/java/util/parser/TLDParser.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/util/parser/TLDParser.java 2008-10-25 07:52:44 UTC (rev 10904)
+++ trunk/test-applications/jsp/src/main/java/util/parser/TLDParser.java 2008-10-25 13:48:24 UTC (rev 10905)
@@ -13,14 +13,14 @@
protected String component;
protected JarEntry tld;
protected JarFile richfacesUI;
- protected ArrayList<String> allAttributes;
+ protected ArrayList<Attribute> allAttributes;
public TLDParser(String str) {
this.component = str;
- allAttributes = new ArrayList<String>();
+ allAttributes = new ArrayList<Attribute>();
}
- public ArrayList<String> getAllAttributes() {
+ public ArrayList<Attribute> getAllAttributes() {
tld = getRichfacesUI().getJarEntry("META-INF/richfaces.tld");
InputStream input = null;
@@ -29,20 +29,61 @@
InputStreamReader isr = new InputStreamReader(input);
BufferedReader reader = new BufferedReader(isr);
- String line, attribute;
+ String line, attr;
+ Attribute attribute = new Attribute();
int position, end;
boolean flag = true;
while (((line = reader.readLine()) != null) && flag) {
if ((position = line.indexOf("<name>")) != -1) {
end = line.indexOf("</name>");
- attribute = line.substring(position + 6, end).trim();
- if (attribute.equalsIgnoreCase(component)) {
+ attr = line.substring(position + 6, end).trim();
+ if (attr.equalsIgnoreCase(component)) {
while (!(line = reader.readLine()).contains("</tag>")) {
- if ((position = line.indexOf("<name>")) != -1) {
- end = line.indexOf("</name>");
- attribute = line.substring(position + 6, end)
- .trim();
+ if (line.contains("<attribute>")) {
+ do {
+ // find attribute name
+ if ((position = line.indexOf("<name>")) != -1) {
+ end = line.indexOf("</name>");
+ attribute.setName(line.substring(
+ position + 6, end).trim());
+ }
+ // find attribute description
+ if ((position = line
+ .indexOf("<description>")) != -1) {
+
+ if((end = line.indexOf("</description>")) != -1){
+ attribute.setDescription(line.substring(position + 13, line.length()-14));
+ }else{
+ attribute.setDescription(attribute.getDescription()
+ + line.substring(position + 13, line.length()));
+ line = reader.readLine();
+ while ((end = line.indexOf("</description>")) == -1) {
+ attribute.setDescription(attribute.getDescription() + " "
+ + line.substring(0, line.length()).trim());
+ }
+ attribute.setDescription(attribute.getDescription()
+ + line.substring(0, line.length() - 14));
+ }
+ }
+ // find attribute type
+ if ((position = line.indexOf("<type>")) != -1) {
+ end = line.indexOf("</type>");
+
+ /*try {
+ Class<?> cl = Class.forName(line
+ .substring(position + 6,
+ end).trim());*/
+ attribute.setType(line.substring(position + 6, end).trim());
+ /*} catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ }*/
+ }
+ } while (!((line = reader.readLine())
+ .contains("</attribute>")));
+ // define attribute status
+ attribute.setStatus(Status.NOT_READY);
allAttributes.add(attribute);
+ attribute = new Attribute();
}
}
flag = false;
17 years, 2 months
JBoss Rich Faces SVN: r10904 - in trunk/test-applications/regressionArea: regressionArea-ear and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-10-25 03:52:44 -0400 (Sat, 25 Oct 2008)
New Revision: 10904
Added:
trunk/test-applications/regressionArea/regressionArea-ear/
trunk/test-applications/regressionArea/regressionArea-ejb/
trunk/test-applications/regressionArea/regressionArea-web/
Removed:
trunk/test-applications/regressionArea/Seam-ear/
trunk/test-applications/regressionArea/Seam-ejb/
trunk/test-applications/regressionArea/Seam-web/
Modified:
trunk/test-applications/regressionArea/Test.bat
trunk/test-applications/regressionArea/pom.xml
trunk/test-applications/regressionArea/regressionArea-ear/pom.xml
trunk/test-applications/regressionArea/regressionArea-ejb/pom.xml
trunk/test-applications/regressionArea/regressionArea-web/pom.xml
Log:
Rename modules names, put facelets dependency to web module.
Modified: trunk/test-applications/regressionArea/Test.bat
===================================================================
--- trunk/test-applications/regressionArea/Test.bat 2008-10-24 17:59:09 UTC (rev 10903)
+++ trunk/test-applications/regressionArea/Test.bat 2008-10-25 07:52:44 UTC (rev 10904)
@@ -1,2 +1,2 @@
-cd /Seam-web
+cd /regressionArea-web
mvn integration-test -P Test
\ No newline at end of file
Modified: trunk/test-applications/regressionArea/pom.xml
===================================================================
--- trunk/test-applications/regressionArea/pom.xml 2008-10-24 17:59:09 UTC (rev 10903)
+++ trunk/test-applications/regressionArea/pom.xml 2008-10-25 07:52:44 UTC (rev 10904)
@@ -60,8 +60,8 @@
</repositories>
<properties>
- <contextroot>Seam</contextroot>
- <earname>Seam-ear-${version}</earname>
+ <contextroot>regressionArea</contextroot>
+ <earname>regressionArea-ear</earname>
<richversion>3.3.0-SNAPSHOT</richversion>
<seamversion>2.0.2.SP1</seamversion>
<jsfversion>1.2_09</jsfversion>
@@ -72,9 +72,9 @@
<modules>
- <module>Seam-ejb</module>
- <module>Seam-web</module>
- <module>Seam-ear</module>
+ <module>regressionArea-ejb</module>
+ <module>regressionArea-web</module>
+ <module>regressionArea-ear</module>
</modules>
<build>
<plugins>
Copied: trunk/test-applications/regressionArea/regressionArea-ear (from rev 10903, trunk/test-applications/regressionArea/Seam-ear)
Modified: trunk/test-applications/regressionArea/regressionArea-ear/pom.xml
===================================================================
--- trunk/test-applications/regressionArea/Seam-ear/pom.xml 2008-10-24 17:59:09 UTC (rev 10903)
+++ trunk/test-applications/regressionArea/regressionArea-ear/pom.xml 2008-10-25 07:52:44 UTC (rev 10904)
@@ -10,16 +10,22 @@
</parent>
<version>3.3.0-SNAPSHOT</version>
<groupId>org.richfaces.test-applications.regressionArea</groupId>
- <artifactId>Seam-ear</artifactId>
- <name>Seam App Ear Module</name>
+ <artifactId>regressionArea-ear</artifactId>
+ <name>Regression Area Ear Module</name>
<packaging>ear</packaging>
<dependencies>
<dependency>
<groupId>org.richfaces.test-applications.regressionArea</groupId>
- <artifactId>Seam-web</artifactId>
+ <artifactId>regressionArea-web</artifactId>
<version>${project.version}</version>
<type>war</type>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
@@ -55,7 +61,7 @@
</dependency>
<dependency>
<groupId>org.richfaces.test-applications.regressionArea</groupId>
- <artifactId>Seam-ejb</artifactId>
+ <artifactId>regressionArea-ejb</artifactId>
<version>${project.version}</version>
<type>ejb</type>
<exclusions>
@@ -99,6 +105,10 @@
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
@@ -119,12 +129,12 @@
seam.jboss.org:loader=${earname}.ear
</loader-repository>
</jboss>
- <displayName>Regression Test Seam App</displayName>
+ <displayName>Regression Area Seam App</displayName>
<defaultLibBundleDir>lib</defaultLibBundleDir>
<modules>
<webModule>
<groupId>org.richfaces.test-applications.regressionArea</groupId>
- <artifactId>Seam-web</artifactId>
+ <artifactId>regressionArea-web</artifactId>
<contextRoot>/${contextroot}</contextRoot>
</webModule>
</modules>
Copied: trunk/test-applications/regressionArea/regressionArea-ejb (from rev 10903, trunk/test-applications/regressionArea/Seam-ejb)
Modified: trunk/test-applications/regressionArea/regressionArea-ejb/pom.xml
===================================================================
--- trunk/test-applications/regressionArea/Seam-ejb/pom.xml 2008-10-24 17:59:09 UTC (rev 10903)
+++ trunk/test-applications/regressionArea/regressionArea-ejb/pom.xml 2008-10-25 07:52:44 UTC (rev 10904)
@@ -7,8 +7,8 @@
<version>3.3.0-SNAPSHOT</version>
</parent>
<groupId>org.richfaces.test-applications.regressionArea</groupId>
- <artifactId>Seam-ejb</artifactId>
- <name>Seam App EJB Module</name>
+ <artifactId>regressionArea-ejb</artifactId>
+ <name>Regression Area EJB Module</name>
<packaging>ejb</packaging>
<dependencies>
<dependency>
@@ -57,13 +57,8 @@
<artifactId>jboss-seam-debug</artifactId>
<version>${seamversion}</version>
</dependency>
+
<dependency>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- <version>1.1.14</version>
- </dependency>
-
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
@@ -153,7 +148,7 @@
</dependencies>
<build>
- <finalName>Seam-ejb</finalName>
+ <finalName>regressionArea-ejb</finalName>
<plugins>
<plugin>
<artifactId>maven-ejb-plugin</artifactId>
Copied: trunk/test-applications/regressionArea/regressionArea-web (from rev 10903, trunk/test-applications/regressionArea/Seam-web)
Modified: trunk/test-applications/regressionArea/regressionArea-web/pom.xml
===================================================================
--- trunk/test-applications/regressionArea/Seam-web/pom.xml 2008-10-24 17:59:09 UTC (rev 10903)
+++ trunk/test-applications/regressionArea/regressionArea-web/pom.xml 2008-10-25 07:52:44 UTC (rev 10904)
@@ -7,8 +7,8 @@
<version>3.3.0-SNAPSHOT</version>
</parent>
<groupId>org.richfaces.test-applications.regressionArea</groupId>
- <artifactId>Seam-web</artifactId>
- <name>Seam App Web Module</name>
+ <artifactId>regressionArea-web</artifactId>
+ <name>Regression Area Web Module</name>
<packaging>war</packaging>
<dependencies>
@@ -41,7 +41,7 @@
</dependency>
<dependency>
<groupId>org.richfaces.test-applications.regressionArea</groupId>
- <artifactId>Seam-ejb</artifactId>
+ <artifactId>regressionArea-ejb</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -77,11 +77,16 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ <version>1.1.14</version>
+ </dependency>
</dependencies>
<build>
- <finalName>Seam-web</finalName>
+ <finalName>regressionArea-web</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -138,7 +143,7 @@
</goals>
<configuration>
<tasks>
- <copy file="../Seam-ear/resources/seam-ds.xml" toDir="${jbosshome}/server/${jbosscontext}/deploy"/>
+ <copy file="../regressionArea-ear/resources/seam-ds.xml" toDir="${jbosshome}/server/${jbosscontext}/deploy"/>
</tasks>
</configuration>
</execution>
@@ -185,7 +190,7 @@
<type>installed</type>
<deployables>
<deployable>
- <location>${settings.localRepository}/org/richfaces/test-applications/regressionArea/Seam-ear/${version}/Seam-ear-${version}.ear</location>
+ <location>${settings.localRepository}/org/richfaces/test-applications/regressionArea/regressionArea-ear/${version}/regressionArea-ear-${version}.ear</location>
<type>ear</type>
</deployable>
</deployables>
17 years, 2 months
JBoss Rich Faces SVN: r10903 - trunk/framework/impl/src/main/java/org/ajax4jsf/application.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-10-24 13:59:09 -0400 (Fri, 24 Oct 2008)
New Revision: 10903
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java
Log:
https://jira.jboss.org/jira/browse/RF-4713
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java 2008-10-24 15:55:55 UTC (rev 10902)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java 2008-10-24 17:59:09 UTC (rev 10903)
@@ -39,7 +39,6 @@
import javax.faces.FacesException;
import javax.faces.FactoryFinder;
import javax.faces.application.StateManager;
-import javax.faces.application.StateManager.SerializedView;
import javax.faces.component.UIComponentBase;
import javax.faces.component.UIViewRoot;
import javax.faces.context.ExternalContext;
@@ -455,6 +454,11 @@
String id = restoreLogicalViewId(context, viewId, renderKitId);
StateHolder stateHolder = getStateHolder(context);
Object[] restoredState = stateHolder.getState(viewId, id);
+
+ if (restoredState != null && id != null) {
+ context.getExternalContext().getRequestMap().put(AJAX_VIEW_SEQUENCE, id);
+ }
+
return restoredState;
}
@@ -569,9 +573,6 @@
String id = (String) getRenderKit(context, renderKitId)
.getResponseStateManager().getTreeStructureToRestore(context,
viewId);
- if (null != id) {
- context.getExternalContext().getRequestMap().put(AJAX_VIEW_SEQUENCE, id);
- }
return id;
}
17 years, 2 months
JBoss Rich Faces SVN: r10902 - in trunk/test-applications/regressionArea: Seam-web/src/main/webapp/pages and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-10-24 11:55:55 -0400 (Fri, 24 Oct 2008)
New Revision: 10902
Added:
trunk/test-applications/regressionArea/Seam-ejb/src/main/java/org/richfaces/regressionarea/seam/beans/ActionBean.java
trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/rf4709.xhtml
trunk/test-applications/regressionArea/Seam-web/src/test/java/org/richfaces/testng/rf4709/
trunk/test-applications/regressionArea/Seam-web/src/test/java/org/richfaces/testng/rf4709/Test.java
Modified:
trunk/test-applications/regressionArea/Seam-web/src/test/java/org/richfaces/testng/rf4507/Test.java
trunk/test-applications/regressionArea/Seam-web/src/test/resources/testng.xml
Log:
https://jira.jboss.org/jira/browse/RF-4709
Added: trunk/test-applications/regressionArea/Seam-ejb/src/main/java/org/richfaces/regressionarea/seam/beans/ActionBean.java
===================================================================
--- trunk/test-applications/regressionArea/Seam-ejb/src/main/java/org/richfaces/regressionarea/seam/beans/ActionBean.java (rev 0)
+++ trunk/test-applications/regressionArea/Seam-ejb/src/main/java/org/richfaces/regressionarea/seam/beans/ActionBean.java 2008-10-24 15:55:55 UTC (rev 10902)
@@ -0,0 +1,66 @@
+/**
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+package org.richfaces.regressionarea.seam.beans;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.application.FacesMessage.Severity;
+import javax.faces.context.FacesContext;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+
+/**
+ * @author Nick Belaevski
+ */
+
+@Name("actionBean")
+(a)Scope(ScopeType.APPLICATION)
+public class ActionBean {
+
+ private void addMessage(Severity severity, String messageText) {
+ FacesMessage message = new FacesMessage(severity, messageText, messageText);
+ FacesContext.getCurrentInstance().addMessage(null, message);
+ }
+
+ public void addMessage(String messageText) {
+ addMessage(FacesMessage.SEVERITY_INFO, messageText);
+ }
+
+ public void addInfoMessage(String messageText) {
+ addMessage(FacesMessage.SEVERITY_INFO, messageText);
+ }
+
+ public void addWarnMessage(String messageText) {
+ addMessage(FacesMessage.SEVERITY_WARN, messageText);
+ }
+
+ public void addErrorMessage(String messageText) {
+ addMessage(FacesMessage.SEVERITY_ERROR, messageText);
+ }
+
+ public void addFatalMessage(String messageText) {
+ addMessage(FacesMessage.SEVERITY_FATAL, messageText);
+ }
+
+}
Added: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/rf4709.xhtml
===================================================================
--- trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/rf4709.xhtml (rev 0)
+++ trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/rf4709.xhtml 2008-10-24 15:55:55 UTC (rev 10902)
@@ -0,0 +1,51 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+<ui:composition template="#{templateBean.template}">
+ <ui:define name="style">
+
+ </ui:define>
+ <ui:define name="component">
+ <rich:messages id="messages"/>
+
+ <h:form id="form">
+ <rich:tabPanel switchType="client" id="tabPanel">
+ <rich:tab label="First" id="firstTab">First tab</rich:tab>
+ <rich:tab label="Second" id="secondTab">Second tab</rich:tab>
+
+ <a4j:support event="ontabchange" action="#{actionBean.addMessage('tabPanel')}" />
+ </rich:tabPanel>
+
+ <rich:togglePanel label="Toggle panel" id="togglePanel" initialState="first" stateOrder="first,second"
+ switchType="client">
+
+ <f:facet name="first">
+ <h:panelGroup>
+ <rich:toggleControl id="firstControl" switchToState="second" value="To second"/>
+ </h:panelGroup>
+ </f:facet>
+ <f:facet name="second">
+ <h:panelGroup>
+ <rich:toggleControl id="secondControl" switchToState="first" panelId="togglePanel" value="To first"/>
+ </h:panelGroup>
+ </f:facet>
+
+ <a4j:support event="onclick" action="#{actionBean.addMessage('togglePanel')}" />
+ </rich:togglePanel>
+
+ <rich:panelBar id="panelBar">
+ <rich:panelBarItem label="First" id="firstPanelBarItem">First item</rich:panelBarItem>
+ <rich:panelBarItem label="Second" id="secondPanelBarItem">Second item</rich:panelBarItem>
+
+ <a4j:support event="onitemchange" action="#{actionBean.addMessage('panelBar')}" />
+ </rich:panelBar>
+
+ </h:form>
+ </ui:define>
+</ui:composition>
+</html>
\ No newline at end of file
Modified: trunk/test-applications/regressionArea/Seam-web/src/test/java/org/richfaces/testng/rf4507/Test.java
===================================================================
--- trunk/test-applications/regressionArea/Seam-web/src/test/java/org/richfaces/testng/rf4507/Test.java 2008-10-24 15:55:05 UTC (rev 10901)
+++ trunk/test-applications/regressionArea/Seam-web/src/test/java/org/richfaces/testng/rf4507/Test.java 2008-10-24 15:55:55 UTC (rev 10902)
@@ -53,7 +53,7 @@
}
public String getTestUrl() {
- return "pages/4500-4600/rf4507.xhtml";
+ return "pages/rf4507.xhtml";
}
}
Added: trunk/test-applications/regressionArea/Seam-web/src/test/java/org/richfaces/testng/rf4709/Test.java
===================================================================
--- trunk/test-applications/regressionArea/Seam-web/src/test/java/org/richfaces/testng/rf4709/Test.java (rev 0)
+++ trunk/test-applications/regressionArea/Seam-web/src/test/java/org/richfaces/testng/rf4709/Test.java 2008-10-24 15:55:55 UTC (rev 10902)
@@ -0,0 +1,54 @@
+package org.richfaces.testng.rf4709;
+
+import org.ajax4jsf.template.Template;
+import org.richfaces.SeleniumTestBase;
+
+public class Test extends SeleniumTestBase {
+
+ private String getMessagesLocator(Template template) {
+ return "//*[@id='" + template.getPrefix() + "messages']";
+ }
+
+ @org.testng.annotations.Test
+ public void testTabPanel(Template template) throws Exception {
+ renderPage(template);
+
+ AssertTextEquals(getMessagesLocator(template), "");
+
+ selenium.assignId("//*[@id='" + (template.getPrefix() + "form:secondTab_lbl") + "']", "testElement");
+ fireMouseEvent("testElement", "click", 0, 0, false);
+ waitForAjaxCompletion();
+
+ AssertTextEquals(getMessagesLocator(template), "tabPanel");
+ }
+
+ @org.testng.annotations.Test
+ public void testTogglePanel(Template template) throws Exception {
+ renderPage(template);
+
+ AssertTextEquals(getMessagesLocator(template), "");
+
+ selenium.click("//*[@id='" + template.getPrefix() + "form:firstControl']");
+ waitForAjaxCompletion();
+
+ AssertTextEquals(getMessagesLocator(template), "togglePanel");
+ }
+
+ @org.testng.annotations.Test
+ public void testPanelBar(Template template) throws Exception {
+ renderPage(template);
+
+ AssertTextEquals(getMessagesLocator(template), "");
+ selenium.assignId("//*[@id='" + (template.getPrefix() + "form:secondPanelBarItem") + "']/div[1]", "testElement");
+ fireMouseEvent("testElement", "click", 0, 0, false);
+ waitForAjaxCompletion();
+
+ AssertTextEquals(getMessagesLocator(template), "panelBar");
+ }
+
+ @Override
+ public String getTestUrl() {
+ return "pages/rf4709.xhtml";
+ }
+
+}
Modified: trunk/test-applications/regressionArea/Seam-web/src/test/resources/testng.xml
===================================================================
--- trunk/test-applications/regressionArea/Seam-web/src/test/resources/testng.xml 2008-10-24 15:55:05 UTC (rev 10901)
+++ trunk/test-applications/regressionArea/Seam-web/src/test/resources/testng.xml 2008-10-24 15:55:55 UTC (rev 10902)
@@ -8,6 +8,7 @@
<packages>
<package name="org.richfaces.testng" />
<package name="org.richfaces.testng.rf4507" />
+ <package name="org.richfaces.testng.rf4709" />
</packages>
</test-->
<test name="FireFoxFunctionalTestsDANe">
@@ -18,6 +19,7 @@
<packages>
<package name="org.richfaces.testng" />
<package name="org.richfaces.testng.rf4507" />
+ <package name="org.richfaces.testng.rf4709" />
</packages>
</test>
</suite>
17 years, 2 months
JBoss Rich Faces SVN: r10901 - in trunk/test-applications/regressionArea/Seam-web/src/main: webapp/pages and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-10-24 11:55:05 -0400 (Fri, 24 Oct 2008)
New Revision: 10901
Added:
trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/rf4507.xhtml
Removed:
trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/4500-4600/
Modified:
trunk/test-applications/regressionArea/Seam-web/src/main/java/org/ajax4jsf/bean/TemplateBean.java
Log:
Test pages moved level up
Modified: trunk/test-applications/regressionArea/Seam-web/src/main/java/org/ajax4jsf/bean/TemplateBean.java
===================================================================
--- trunk/test-applications/regressionArea/Seam-web/src/main/java/org/ajax4jsf/bean/TemplateBean.java 2008-10-24 15:52:08 UTC (rev 10900)
+++ trunk/test-applications/regressionArea/Seam-web/src/main/java/org/ajax4jsf/bean/TemplateBean.java 2008-10-24 15:55:05 UTC (rev 10901)
@@ -58,7 +58,7 @@
* @return the template
*/
public String getTemplate() {
- return "../../template/" + template.getName() + ".xhtml";
+ return "/template/" + template.getName() + ".xhtml";
}
/**
Copied: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/rf4507.xhtml (from rev 10884, trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/4500-4600/rf4507.xhtml)
===================================================================
--- trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/rf4507.xhtml (rev 0)
+++ trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/rf4507.xhtml 2008-10-24 15:55:05 UTC (rev 10901)
@@ -0,0 +1,26 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+<ui:composition template="#{templateBean.template}">
+ <ui:define name="style">
+
+ </ui:define>
+ <ui:define name="component">
+ <h:form id="form">
+ <a4j:commandLink value="First Link" id="link1" data="#{'firstLink'}" oncomplete="window.receivedData = data" />
+
+ <rich:calendar value="22-10-2008" id="calendar" popup="false" mode="ajax" dataModel="#{rf4507}">
+ <h:outputText value="{data}" />
+ <f:convertDateTime pattern="dd-MM-yyyy"/>
+ </rich:calendar>
+
+ <a4j:commandLink value="Second Link" id="link2" data="#{'secondLink'}" oncomplete="window.receivedData = data" />
+ </h:form>
+ </ui:define>
+</ui:composition>
+</html>
\ No newline at end of file
Property changes on: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/rf4507.xhtml
___________________________________________________________________
Name: svn:mergeinfo
+
17 years, 2 months
JBoss Rich Faces SVN: r10900 - in trunk/ui/tabPanel/src: test/java/org/richfaces/component and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-10-24 11:52:08 -0400 (Fri, 24 Oct 2008)
New Revision: 10900
Modified:
trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java
trunk/ui/tabPanel/src/test/java/org/richfaces/component/UITabPanelTest.java
Log:
https://jira.jboss.org/jira/browse/RF-4709
Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java
===================================================================
--- trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java 2008-10-24 15:01:44 UTC (rev 10899)
+++ trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java 2008-10-24 15:52:08 UTC (rev 10900)
@@ -33,6 +33,7 @@
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.Predicate;
import org.apache.commons.collections.iterators.FilterIterator;
+import org.apache.commons.collections.iterators.IteratorChain;
import org.richfaces.event.SwitchablePanelSwitchEvent;
/**
@@ -53,7 +54,7 @@
final Object renderedValue = this.restoredRenderedValue;
- return new FilterIterator(getRenderedTabs(), new Predicate() {
+ return new IteratorChain(new FilterIterator(getRenderedTabs(), new Predicate() {
public boolean evaluate(Object object) {
UITab tab = (UITab) object;
@@ -69,7 +70,7 @@
return renderedValue != null && renderedValue.equals(tab.getName());
}
- });
+ }), getFacets().values().iterator());
}
public boolean isImmediate() {
Modified: trunk/ui/tabPanel/src/test/java/org/richfaces/component/UITabPanelTest.java
===================================================================
--- trunk/ui/tabPanel/src/test/java/org/richfaces/component/UITabPanelTest.java 2008-10-24 15:01:44 UTC (rev 10899)
+++ trunk/ui/tabPanel/src/test/java/org/richfaces/component/UITabPanelTest.java 2008-10-24 15:52:08 UTC (rev 10900)
@@ -7,6 +7,7 @@
import javax.faces.component.html.HtmlForm;
import javax.faces.component.html.HtmlOutputText;
import java.util.Iterator;
+import java.util.Map;
/**
* Unit test for UITabPanel.
@@ -107,6 +108,8 @@
Iterator it = tabPanel.getSwitchedFacetsAndChildren();
assertEquals(tab3.getId(), ((UITab)it.next()).getId());
+
+ assertFalse(it.hasNext());
}
public void testGetSwitchedFacetsAndChildren2() throws Exception {
@@ -118,5 +121,27 @@
assertEquals(tab1.getId(), ((UITab)it.next()).getId());
assertEquals(tab2.getId(), ((UITab)it.next()).getId());
assertEquals(tab3.getId(), ((UITab)it.next()).getId());
+
+ assertFalse(it.hasNext());
}
+
+ public void testGetSwitchedFacetsAndChildrenFacets() throws Exception {
+ Map<String, UIComponent> facets = tabPanel.getFacets();
+
+ UIComponent testFacet = new HtmlOutputText();
+ facets.put("testFacet", testFacet);
+
+ tab1.setSwitchType(UISwitchablePanel.CLIENT_METHOD);
+ tab2.setSwitchType(UISwitchablePanel.CLIENT_METHOD);
+ tab3.setSwitchType(UISwitchablePanel.CLIENT_METHOD);
+
+ Iterator it = tabPanel.getSwitchedFacetsAndChildren();
+ assertEquals(tab1.getId(), ((UITab)it.next()).getId());
+ assertEquals(tab2.getId(), ((UITab)it.next()).getId());
+ assertEquals(tab3.getId(), ((UITab)it.next()).getId());
+
+ assertSame(testFacet, it.next());
+
+ assertFalse(it.hasNext());
+ }
}
17 years, 2 months
JBoss Rich Faces SVN: r10899 - trunk/ui/togglePanel/src/main/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-10-24 11:01:44 -0400 (Fri, 24 Oct 2008)
New Revision: 10899
Modified:
trunk/ui/togglePanel/src/main/templates/togglePanel.jspx
Log:
https://jira.jboss.org/jira/browse/RF-4728
Modified: trunk/ui/togglePanel/src/main/templates/togglePanel.jspx
===================================================================
--- trunk/ui/togglePanel/src/main/templates/togglePanel.jspx 2008-10-24 13:47:41 UTC (rev 10898)
+++ trunk/ui/togglePanel/src/main/templates/togglePanel.jspx 2008-10-24 15:01:44 UTC (rev 10899)
@@ -17,8 +17,8 @@
<![CDATA[org.richfaces.component.util.FormUtil.throwEnclFormReqExceptionIfNeed(context,component);]]>
</jsp:scriptlet>
- <div id="#{clientId}" style="#{component.attributes['style']}"
- class="rich-toggle-panel #{component.attributes['styleClass']}" >
+ <div id="#{clientId}" style="#{component.attributes['style']}" class="rich-toggle-panel #{component.attributes['styleClass']}"
+ x:passThruWithExclusions="id,style,class,styleClass">
<vcp:body/>
<f:call name="handleFacets"/>
</div>
17 years, 2 months
JBoss Rich Faces SVN: r10898 - branches/3.2.x.SR/ui/orderingList/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-10-24 09:47:41 -0400 (Fri, 24 Oct 2008)
New Revision: 10898
Modified:
branches/3.2.x.SR/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java
Log:
https://jira.jboss.org/jira/browse/RF-3852
Modified: branches/3.2.x.SR/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java
===================================================================
--- branches/3.2.x.SR/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java 2008-10-24 13:10:59 UTC (rev 10897)
+++ branches/3.2.x.SR/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java 2008-10-24 13:47:41 UTC (rev 10898)
@@ -528,11 +528,6 @@
// Submitted value == null means "the component was not submitted
// at all"; validation should not continue
-// http://jira.jboss.com/jira/browse/RF-3852
-// if (submittedValueHolder == null) {
-// return;
-// }
-
Object previousValue = getValue();
Object newValue = null;
@@ -572,6 +567,10 @@
}
validateValue(context, newValue);
+
+ if (submittedValueHolder == null) {
+ return;
+ }
// If our value is valid, store the new value, erase the
// "submitted" value, and emit a ValueChangeEvent if appropriate
17 years, 2 months
JBoss Rich Faces SVN: r10897 - branches.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-10-24 09:10:59 -0400 (Fri, 24 Oct 2008)
New Revision: 10897
Added:
branches/3.2.x.SR/
Log:
Branch for service fixes created
Copied: branches/3.2.x.SR (from rev 10896, branches/3.2.x)
17 years, 2 months
JBoss Rich Faces SVN: r10896 - in trunk/test-applications/seleniumTest/richfaces/src: test/java/org/richfaces/testng and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2008-10-24 08:53:20 -0400 (Fri, 24 Oct 2008)
New Revision: 10896
Added:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/ajaxPoll/ajaxPollAutoTest.xhtml
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxPollTest.java
Log:
https://jira.jboss.org/jira/browse/RF-4688
https://jira.jboss.org/jira/browse/RF-4689
https://jira.jboss.org/jira/browse/RF-4690
Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/ajaxPoll/ajaxPollAutoTest.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/ajaxPoll/ajaxPollAutoTest.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxPollTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxPollTest.java 2008-10-24 11:58:24 UTC (rev 10895)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxPollTest.java 2008-10-24 12:53:20 UTC (rev 10896)
@@ -3,7 +3,11 @@
*/
package org.richfaces.testng;
+import java.util.HashMap;
+import java.util.Map;
+
import org.ajax4jsf.template.Template;
+import org.richfaces.AutoTester;
import org.richfaces.SeleniumTestBase;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -14,6 +18,14 @@
*/
public class AjaxPollTest extends SeleniumTestBase {
+ private static Map<String, String> params = new HashMap<String, String>();
+
+ static {
+ params.put("parameter1", "value1");
+ params.put("parameter2", "value2");
+ params.put("parameter3", "value3");
+ }
+
@Test
public void testAjaxPollComponent(Template template) {
renderPage(template);
@@ -40,6 +52,27 @@
}
+ @Test
+ public void testRenderedAttribute(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, null);
+ writeStatus("Test component with rendered = false is not present on the page");
+ tester.testRendered();
+ }
+
+ @Test
+ public void testNestedParams(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, null);
+ writeStatus("Test component encodes nested f:param tags and their values are present as request parameters");
+ tester.testRequestParameters(params);
+ }
+
+ @Override
+ public void sendAjax() {
+ delay(2000);
+ }
+
private void enablePoll(String id) {
writeStatus("Enable polling...");
try {
@@ -59,4 +92,8 @@
return "pages/ajaxPoll/ajaxPollTest.xhtml";
}
+ @Override
+ public String getAutoTestUrl() {
+ return "pages/ajaxPoll/ajaxPollAutoTest.xhtml";
+ }
}
17 years, 2 months