JBoss Rich Faces SVN: r440 - in trunk/richfaces: dropdown-menu/src/main/config/component and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: A.Skokov
Date: 2007-04-18 10:46:37 -0400 (Wed, 18 Apr 2007)
New Revision: 440
Modified:
trunk/richfaces/dataTable/src/main/config/component/colgroup.xml
trunk/richfaces/dataTable/src/main/config/component/column.xml
trunk/richfaces/dataTable/src/main/config/component/dataGrid.xml
trunk/richfaces/dataTable/src/main/config/component/dataList.xml
trunk/richfaces/dataTable/src/main/config/component/dataTable.xml
trunk/richfaces/dataTable/src/main/config/component/subTable.xml
trunk/richfaces/dropdown-menu/src/main/config/component/dropdownmenu.xml
trunk/richfaces/menu-components/src/main/config/component/menucomponents.xml
Log:
<test/> added in config XML
Modified: trunk/richfaces/dataTable/src/main/config/component/colgroup.xml
===================================================================
--- trunk/richfaces/dataTable/src/main/config/component/colgroup.xml 2007-04-18 14:25:39 UTC (rev 439)
+++ trunk/richfaces/dataTable/src/main/config/component/colgroup.xml 2007-04-18 14:46:37 UTC (rev 440)
@@ -20,6 +20,7 @@
<superclass>
org.ajax4jsf.framework.taglib.HtmlComponentTagBase
</superclass>
+ <test/>
</tag>
<!--
<taghandler>
Modified: trunk/richfaces/dataTable/src/main/config/component/column.xml
===================================================================
--- trunk/richfaces/dataTable/src/main/config/component/column.xml 2007-04-18 14:25:39 UTC (rev 439)
+++ trunk/richfaces/dataTable/src/main/config/component/column.xml 2007-04-18 14:46:37 UTC (rev 440)
@@ -20,6 +20,7 @@
<superclass>
org.ajax4jsf.framework.taglib.HtmlComponentTagBase
</superclass>
+ <test/>
</tag>
<!--
<taghandler>
Modified: trunk/richfaces/dataTable/src/main/config/component/dataGrid.xml
===================================================================
--- trunk/richfaces/dataTable/src/main/config/component/dataGrid.xml 2007-04-18 14:25:39 UTC (rev 439)
+++ trunk/richfaces/dataTable/src/main/config/component/dataGrid.xml 2007-04-18 14:46:37 UTC (rev 440)
@@ -20,6 +20,7 @@
<superclass>
org.ajax4jsf.framework.taglib.HtmlComponentTagBase
</superclass>
+ <test/>
</tag>
<!--
<taghandler>
Modified: trunk/richfaces/dataTable/src/main/config/component/dataList.xml
===================================================================
--- trunk/richfaces/dataTable/src/main/config/component/dataList.xml 2007-04-18 14:25:39 UTC (rev 439)
+++ trunk/richfaces/dataTable/src/main/config/component/dataList.xml 2007-04-18 14:46:37 UTC (rev 440)
@@ -20,6 +20,7 @@
<superclass>
org.ajax4jsf.framework.taglib.HtmlComponentTagBase
</superclass>
+ <test/>
</tag>
<!--
<taghandler>
Modified: trunk/richfaces/dataTable/src/main/config/component/dataTable.xml
===================================================================
--- trunk/richfaces/dataTable/src/main/config/component/dataTable.xml 2007-04-18 14:25:39 UTC (rev 439)
+++ trunk/richfaces/dataTable/src/main/config/component/dataTable.xml 2007-04-18 14:46:37 UTC (rev 440)
@@ -20,6 +20,7 @@
<superclass>
org.ajax4jsf.framework.taglib.HtmlComponentTagBase
</superclass>
+ <test/>
</tag>
<!--
<taghandler>
Modified: trunk/richfaces/dataTable/src/main/config/component/subTable.xml
===================================================================
--- trunk/richfaces/dataTable/src/main/config/component/subTable.xml 2007-04-18 14:25:39 UTC (rev 439)
+++ trunk/richfaces/dataTable/src/main/config/component/subTable.xml 2007-04-18 14:46:37 UTC (rev 440)
@@ -21,6 +21,7 @@
<superclass>
org.ajax4jsf.framework.taglib.HtmlComponentTagBase
</superclass>
+ <test/>
</tag>
<!--
<taghandler>
Modified: trunk/richfaces/dropdown-menu/src/main/config/component/dropdownmenu.xml
===================================================================
--- trunk/richfaces/dropdown-menu/src/main/config/component/dropdownmenu.xml 2007-04-18 14:25:39 UTC (rev 439)
+++ trunk/richfaces/dropdown-menu/src/main/config/component/dropdownmenu.xml 2007-04-18 14:46:37 UTC (rev 440)
@@ -21,6 +21,7 @@
<superclass>
org.ajax4jsf.framework.taglib.HtmlComponentTagBase
</superclass>
+ <test/>
</tag>
<taghandler generate="true">
Modified: trunk/richfaces/menu-components/src/main/config/component/menucomponents.xml
===================================================================
--- trunk/richfaces/menu-components/src/main/config/component/menucomponents.xml 2007-04-18 14:25:39 UTC (rev 439)
+++ trunk/richfaces/menu-components/src/main/config/component/menucomponents.xml 2007-04-18 14:46:37 UTC (rev 440)
@@ -23,6 +23,7 @@
<superclass>
org.ajax4jsf.framework.taglib.HtmlComponentTagBase
</superclass>
+ <test/>
</tag>
<property>
19 years
JBoss Rich Faces SVN: r439 - trunk/richfaces/datascroller/src/test/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: d.bulahov
Date: 2007-04-18 10:25:39 -0400 (Wed, 18 Apr 2007)
New Revision: 439
Modified:
trunk/richfaces/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java
Log:
Unit tests development
Modified: trunk/richfaces/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java
===================================================================
--- trunk/richfaces/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java 2007-04-18 14:24:51 UTC (rev 438)
+++ trunk/richfaces/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java 2007-04-18 14:25:39 UTC (rev 439)
@@ -21,17 +21,28 @@
package org.richfaces.component;
+import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlScript;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
import org.apache.commons.lang.StringUtils;
+import org.richfaces.event.DataScrollerAdapter;
+import org.richfaces.event.DataScrollerEvent;
+import javax.faces.application.FacesMessage;
+import javax.faces.component.UICommand;
import javax.faces.component.UIComponent;
import javax.faces.component.UIData;
import javax.faces.component.UIOutput;
+import javax.faces.component.html.HtmlCommandLink;
import javax.faces.component.html.HtmlDataTable;
import javax.faces.component.html.HtmlForm;
+import javax.faces.context.FacesContext;
+import javax.faces.el.EvaluationException;
+import javax.faces.el.MethodBinding;
+import javax.faces.el.MethodNotFoundException;
+
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -58,6 +69,7 @@
private UIOutput fastforward;
private UIOutput next;
private UIOutput last;
+ private UICommand command = null;
/**
* Create the test case
@@ -75,7 +87,7 @@
super.setUp();
form = new HtmlForm();
- form.setId("form");
+ form.setId("form");
facesContext.getViewRoot().getChildren().add(form);
ArrayList dat = new ArrayList();
for (int i=0;i<20;i++){
@@ -84,7 +96,7 @@
data = (UIData) application.createComponent(HtmlDataTable.COMPONENT_TYPE);
data.setValue(dat);
data.setId("data");
- data.setRows(5);
+ data.setRows(5);
form.getChildren().add(data);
scroller = (UIDatascroller) application.createComponent("org.richfaces.Datascroller");
@@ -118,6 +130,11 @@
scroller.getFacets().put(last.getId(), last);
form.getChildren().add(scroller);
+
+ command = new HtmlCommandLink();
+ command.setId("command");
+ form.getChildren().add(command);
+
}
/* (non-Javadoc)
@@ -206,6 +223,16 @@
}
}
+
+ public void testNotFor() throws Exception {
+ scroller.setFor(null);
+ try {
+ HtmlPage page = renderView();
+ assertTrue(false);
+ } catch(Exception ex) {
+ }
+
+ }
/**
@@ -378,4 +405,28 @@
data.setRows(0);
}
+
+ public void testListener() throws Exception{
+ HtmlPage renderedView = renderView();
+
+ HtmlAnchor htmlLink = (HtmlAnchor) renderedView.getHtmlElementById(command.getClientId(facesContext));
+ htmlLink.click();
+
+ MethodBinding binding = new MethodBinding(){
+ public Object invoke(FacesContext context, Object[] params) throws EvaluationException, MethodNotFoundException {
+ facesContext.addMessage(scroller.getClientId(facesContext), new FacesMessage("Method invoked!"));
+ return "invoked";
+ }
+ public Class getType(FacesContext context) throws MethodNotFoundException {
+ return String.class;
+ }
+ };
+
+ DataScrollerEvent event = new DataScrollerEvent( ((UIComponent) scroller), "1", "2" );
+ new DataScrollerAdapter(binding).processScroller(event);
+
+ assertTrue(facesContext.getMessages().hasNext());
+ }
+
+
}
19 years
JBoss Rich Faces SVN: r438 - in trunk/richfaces/datascroller/src/main/java/org/richfaces: renderkit/html and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: d.bulahov
Date: 2007-04-18 10:24:51 -0400 (Wed, 18 Apr 2007)
New Revision: 438
Modified:
trunk/richfaces/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java
trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java
Log:
http://jira.jboss.com/jira/browse/RF-91 fixed
Modified: trunk/richfaces/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java
===================================================================
--- trunk/richfaces/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java 2007-04-18 14:01:35 UTC (rev 437)
+++ trunk/richfaces/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java 2007-04-18 14:24:51 UTC (rev 438)
@@ -21,19 +21,25 @@
package org.richfaces.component;
+import org.ajax4jsf.framework.ajax.AjaxComponent;
+import org.ajax4jsf.framework.ajax.AjaxSource;
import org.richfaces.event.DataScrollerAdapter;
import org.richfaces.event.DataScrollerEvent;
import org.richfaces.event.DataScrollerListener;
import org.richfaces.event.DataScrollerSource;
import javax.faces.FacesException;
+import javax.faces.component.ActionSource;
+
import javax.faces.component.UIComponent;
+import javax.faces.component.UICommand;
import javax.faces.component.UIComponentBase;
import javax.faces.component.UIData;
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
import javax.faces.event.AbortProcessingException;
import javax.faces.event.FacesEvent;
+import javax.faces.event.ActionListener;
/**
@@ -41,7 +47,8 @@
*/
//xxxx nick -> alex - extend UIComponentBase and
//create event listener & event classes to define PageSwitchEvent
-public abstract class UIDatascroller extends UIComponentBase implements DataScrollerSource {
+//public abstract class UIDatascroller extends UIComponentBase implements DataScrollerSource{
+public abstract class UIDatascroller extends UICommand implements DataScrollerSource,ActionSource{
public static final String COMPONENT_TYPE = "org.richfaces.Datascroller";
public static final String COMPONENT_FAMILY = "org.richfaces.Datascroller";
Modified: trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java
===================================================================
--- trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2007-04-18 14:01:35 UTC (rev 437)
+++ trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2007-04-18 14:24:51 UTC (rev 438)
@@ -30,6 +30,9 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.PhaseId;
+
import java.io.IOException;
import java.util.Map;
@@ -101,6 +104,8 @@
DataScrollerEvent event = new DataScrollerEvent(scroller, oldScrolVal, newScrolVal);
event.queue();
+ ActionEvent actionEvent = new ActionEvent(scroller);
+ scroller.queueEvent(actionEvent);
AjaxRendererUtils.addRegionByName(context, component, component.getId());
AjaxRendererUtils.addRegionByName(context, component, scroller.getFor());
19 years
JBoss Rich Faces SVN: r437 - trunk/richfaces/menu-components/src/test/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: F.antonov
Date: 2007-04-18 10:01:35 -0400 (Wed, 18 Apr 2007)
New Revision: 437
Modified:
trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java
trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java
Log:
MenuComponents test cases modernisation.
Modified: trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java
===================================================================
--- trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java 2007-04-18 13:58:41 UTC (rev 436)
+++ trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java 2007-04-18 14:01:35 UTC (rev 437)
@@ -32,7 +32,6 @@
import javax.faces.component.html.HtmlOutputText;
import org.richfaces.component.html.HtmlMenuGroup;
-import org.richfaces.component.html.HtmlMenuItem;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
@@ -42,82 +41,81 @@
import org.apache.commons.lang.StringUtils;
-
/**
* Unit test for MenuGroup Component.
*/
-public class MenuGroupComponentTest
- extends AbstractAjax4JsfTestCase
-{
-
- private static Set javaScripts = new HashSet();
-
- static {
- javaScripts.add("prototype.js");
+public class MenuGroupComponentTest extends AbstractAjax4JsfTestCase {
+
+ private static Set javaScripts = new HashSet();
+
+ static {
+ javaScripts.add("prototype.js");
javaScripts.add("AjaxScript");
}
-
- private UIMenuGroup menuGroup;
- private UIForm form;
-
+
+ private UIMenuGroup menuGroup;
+
+ private UIForm form;
+
/**
* Create the test case
- *
- * @param testName name of the test case
+ *
+ * @param testName
+ * name of the test case
*/
- public MenuGroupComponentTest( String testName )
- {
- super( testName );
+ public MenuGroupComponentTest(String testName) {
+ super(testName);
}
-
+
public void setUp() throws Exception {
- super.setUp();
-
- form = new HtmlForm();
+ super.setUp();
+
+ form = new HtmlForm();
form.setId("form");
facesContext.getViewRoot().getChildren().add(form);
- menuGroup = (HtmlMenuGroup) application.createComponent(HtmlMenuGroup.COMPONENT_TYPE);
+ menuGroup = (HtmlMenuGroup) application
+ .createComponent(HtmlMenuGroup.COMPONENT_TYPE);
menuGroup.setId("menuGroup");
menuGroup.setValue("Menu Group");
-
+
form.getChildren().add(menuGroup);
}
public void tearDown() throws Exception {
- super.tearDown();
- menuGroup = null;
- form = null;
+ super.tearDown();
+ menuGroup = null;
+ form = null;
}
/**
* Rigourous Test :-)
*/
- public void testMenuGroupRender() throws Exception
- {
- HtmlPage page = renderView();
+ public void testMenuGroupRender() throws Exception {
+ HtmlPage page = renderView();
assertNotNull(page);
- System.out.println(page.asXml());
- HtmlElement div = page.getHtmlElementById("ref" + menuGroup.getClientId(facesContext));
+ // System.out.println(page.asXml());
+ HtmlElement div = page.getHtmlElementById("ref"
+ + menuGroup.getClientId(facesContext));
assertNotNull(div);
assertEquals("div", div.getNodeName());
-
+
}
/**
* MenuGroup icon test.
*/
public void testMenuGroupIcon() throws Exception {
- menuGroup.setDisabled(false);
+ menuGroup.setDisabled(false);
menuGroup.getFacets().clear();
menuGroup.getAttributes().put("icon", "menuGroupIcon");
HtmlPage page = renderView();
+ // System.out.println(page.asXml());
assertNotNull(page);
- HtmlElement span = page.getHtmlElementById(menuGroup
- .getClientId(facesContext)
- + ":icon");
+ HtmlElement span = page.getHtmlElementById("ref"
+ + menuGroup.getClientId(facesContext) + ":icon");
+ assertNotNull(span);
assertEquals("span", span.getNodeName());
- assertNotNull(span);
List images = span.getHtmlElementsByTagName("img");
assertNotNull(images);
assertEquals(1, images.size());
@@ -127,13 +125,13 @@
* MenuGroup icon test.
*/
public void testMenuGroupIconDisabled() throws Exception {
- menuGroup.setDisabled(true);
+ menuGroup.setDisabled(true);
menuGroup.getAttributes().put("iconDisabled", "menuGroupIcon");
HtmlPage page = renderView();
+ // System.out.println(page.asXml());
assertNotNull(page);
- HtmlElement span = page.getHtmlElementById(menuGroup
- .getClientId(facesContext)
- + ":icon");
+ HtmlElement span = page.getHtmlElementById("ref"
+ + menuGroup.getClientId(facesContext) + ":icon");
assertEquals("span", span.getNodeName());
assertNotNull(span);
List images = span.getHtmlElementsByTagName("img");
@@ -141,108 +139,116 @@
assertEquals(1, images.size());
}
-
- public void testMenuGroupIconFacet() throws Exception
- {
- menuGroup.setDisabled(false);
- UIComponent facet = createComponent(HtmlOutputText.COMPONENT_TYPE, HtmlOutputText.class.getName(), null, null , null);
- menuGroup.getFacets().put("icon", facet);
- HtmlPage page = renderView();
+ public void testMenuGroupIconFacet() throws Exception {
+ menuGroup.setDisabled(false);
+ UIComponent facet = createComponent(HtmlOutputText.COMPONENT_TYPE,
+ HtmlOutputText.class.getName(), null, null, null);
+ menuGroup.getFacets().put("icon", facet);
+ HtmlPage page = renderView();
assertNotNull(page);
- //System.out.println(page.asXml());
- HtmlElement span = page.getHtmlElementById("ref" + menuGroup.getClientId(facesContext) + ":icon");
+ // System.out.println(page.asXml());
+ HtmlElement span = page.getHtmlElementById("ref"
+ + menuGroup.getClientId(facesContext) + ":icon");
assertEquals("span", span.getNodeName());
assertNotNull(span);
}
-
- public void testMenuGroupIconFacetDisabled() throws Exception
- {
- menuGroup.setDisabled(true);
- UIComponent facet = createComponent(HtmlOutputText.COMPONENT_TYPE, HtmlOutputText.class.getName(), null, null , null);
+
+ public void testMenuGroupIconFacetDisabled() throws Exception {
+ menuGroup.setDisabled(true);
+ UIComponent facet = createComponent(HtmlOutputText.COMPONENT_TYPE,
+ HtmlOutputText.class.getName(), null, null, null);
menuGroup.getFacets().put("iconDisabled", facet);
HtmlPage page = renderView();
assertNotNull(page);
- //System.out.println(page.asXml());
- HtmlElement span = page.getHtmlElementById("ref" + menuGroup.getClientId(facesContext) + ":icon");
+ // System.out.println(page.asXml());
+ HtmlElement span = page.getHtmlElementById("ref"
+ + menuGroup.getClientId(facesContext) + ":icon");
assertEquals("span", span.getNodeName());
assertNotNull(span);
}
- public void testDisabledMenuItem() throws Exception
- {
- menuGroup.setDisabled(true);
- HtmlPage page = renderView();
+ public void testDisabledMenuItem() throws Exception {
+ menuGroup.setDisabled(true);
+ HtmlPage page = renderView();
assertNotNull(page);
- //System.out.println(page.asXml());
-
- HtmlElement span = page.getHtmlElementById("ref" + menuGroup.getClientId(facesContext) + ":icon");
+ // System.out.println(page.asXml());
+ HtmlElement span = page.getHtmlElementById("ref"
+ + menuGroup.getClientId(facesContext) + ":icon");
assertNotNull(span);
- assertEquals("span", span.getNodeName());
+ assertEquals("span", span.getNodeName());
String classAttr = span.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-menu-icon rich-menu-item-icon-disabled"));
-
- HtmlElement div = page.getHtmlElementById("ref" + menuGroup.getClientId(facesContext));
+ assertTrue(classAttr
+ .contains("dr-menu-icon rich-menu-item-icon-disabled"));
+
+ HtmlElement div = page.getHtmlElementById("ref"
+ + menuGroup.getClientId(facesContext));
assertNotNull(div);
- assertEquals("div", div.getNodeName());
+ assertEquals("div", div.getNodeName());
classAttr = div.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-menu-item dr-menu-item-disabled rich-menu-group rich-menu-group-disabled"));
-
+ assertTrue(classAttr
+ .contains("dr-menu-item dr-menu-item-disabled rich-menu-group rich-menu-group-disabled"));
+
}
-
- public void testEnabledMenuItem() throws Exception
- {
- assertEquals(false, menuGroup.isDisabled());
- menuGroup.getAttributes().put("iconClass", "iconClass");
- HtmlPage page = renderView();
+
+ public void testEnabledMenuItem() throws Exception {
+ assertEquals(false, menuGroup.isDisabled());
+ menuGroup.getAttributes().put("iconClass", "iconClass");
+ HtmlPage page = renderView();
assertNotNull(page);
- //System.out.println(page.asXml());
-
- HtmlElement anchor = page.getHtmlElementById("ref" + menuGroup.getClientId(facesContext) + ":anchor");
+ // System.out.println(page.asXml());
+ HtmlElement anchor = page.getHtmlElementById("ref"
+ + menuGroup.getClientId(facesContext) + ":anchor");
assertNotNull(anchor);
- assertEquals("a", anchor.getNodeName());
+ assertEquals("a", anchor.getNodeName());
String classAttr = anchor.getAttributeValue("class");
assertTrue(classAttr.contains("dr-menu-label rich-menu-item-label"));
-
- HtmlElement span = page.getHtmlElementById("ref" + menuGroup.getClientId(facesContext) + ":icon");
+
+ HtmlElement span = page.getHtmlElementById("ref"
+ + menuGroup.getClientId(facesContext) + ":icon");
assertNotNull(span);
- assertEquals("span", span.getNodeName());
+ assertEquals("span", span.getNodeName());
classAttr = span.getAttributeValue("class");
assertTrue(classAttr.contains("dr-menu-icon rich-menu-item-icon"));
- assertTrue(classAttr.contains((String) menuGroup.getAttributes().get("iconClass")));
-
- HtmlElement div = page.getHtmlElementById("ref" + menuGroup.getClientId(facesContext));
+ assertTrue(classAttr.contains((String) menuGroup.getAttributes().get(
+ "iconClass")));
+
+ HtmlElement div = page.getHtmlElementById("ref"
+ + menuGroup.getClientId(facesContext));
assertNotNull(div);
- assertEquals("div", div.getNodeName());
+ assertEquals("div", div.getNodeName());
classAttr = div.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-menu-item dr-menu-item-enabled rich-menu-group"));
-
- div = page.getHtmlElementById(menuGroup.getClientId(facesContext));
+ assertTrue(classAttr
+ .contains("dr-menu-item dr-menu-item-enabled rich-menu-group"));
+
+ div = page.getHtmlElementById("ref"
+ + menuGroup.getClientId(facesContext) + ":folder");
assertNotNull(div);
- assertEquals("div", div.getNodeName());
+ assertEquals("div", div.getNodeName());
classAttr = div.getAttributeValue("class");
assertTrue(classAttr.contains("dr-menu-node rich-menu-item-folder"));
-
+
}
-
+
public void testRenderStyle() throws Exception {
HtmlPage page = renderView();
assertNotNull(page);
List links = page.getDocumentElement().getHtmlElementsByTagName("link");
- //Assert.assertEquals(1, links.size());
+ // Assert.assertEquals(1, links.size());
assertNotNull(links);
HtmlElement link = (HtmlElement) links.get(0);
- assertTrue(link.getAttributeValue("href").contains("org/richfaces/renderkit/html/css/menucomponents.xcss"));
+ assertTrue(link.getAttributeValue("href").contains(
+ "org/richfaces/renderkit/html/css/menucomponents.xcss"));
}
-
- /**
- * Scripts link test.
- */
- public void testRenderScript() throws Exception {
+
+ /**
+ * Scripts link test.
+ */
+ public void testRenderScript() throws Exception {
HtmlPage page = renderView();
assertNotNull(page);
- System.out.println(page.asXml());
-
- List scripts = page.getDocumentElement().getHtmlElementsByTagName("script");
+ // System.out.println(page.asXml());
+ List scripts = page.getDocumentElement().getHtmlElementsByTagName(
+ "script");
for (Iterator it = scripts.iterator(); it.hasNext();) {
HtmlScript item = (HtmlScript) it.next();
String srcAttr = item.getSrcAttribute();
Modified: trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java
===================================================================
--- trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2007-04-18 13:58:41 UTC (rev 436)
+++ trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2007-04-18 14:01:35 UTC (rev 437)
@@ -154,7 +154,6 @@
HtmlPage page = renderView();
assertNotNull(page);
// System.out.println(page.asXml());
-
HtmlElement span = page.getHtmlElementById(menuItem
.getClientId(facesContext)
+ ":disabled");
@@ -197,7 +196,6 @@
HtmlPage page = renderView();
assertNotNull(page);
// System.out.println(page.asXml());
-
HtmlElement anchor = page.getHtmlElementById(menuItem
.getClientId(facesContext)
+ ":anchor");
@@ -239,7 +237,6 @@
HtmlPage page = renderView();
assertNotNull(page);
// System.out.println(page.asXml());
-
HtmlElement div = page.getHtmlElementById(menuItem
.getClientId(facesContext));
assertNotNull(div);
@@ -257,7 +254,6 @@
HtmlPage page = renderView();
assertNotNull(page);
// System.out.println(page.asXml());
-
HtmlElement div = page.getHtmlElementById(menuItem
.getClientId(facesContext));
assertNotNull(div);
@@ -287,7 +283,6 @@
HtmlPage page = renderView();
assertNotNull(page);
// System.out.println(page.asXml());
-
List scripts = page.getDocumentElement().getHtmlElementsByTagName(
"script");
for (Iterator it = scripts.iterator(); it.hasNext();) {
19 years
JBoss Rich Faces SVN: r436 - in trunk/richfaces/togglePanel/src/test/java/org/richfaces: renderkit/html and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: F.antonov
Date: 2007-04-18 09:58:41 -0400 (Wed, 18 Apr 2007)
New Revision: 436
Modified:
trunk/richfaces/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java
trunk/richfaces/togglePanel/src/test/java/org/richfaces/renderkit/html/TogglePanelRenderersTest.java
Log:
Toggle panel component test cases development.
Modified: trunk/richfaces/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java
===================================================================
--- trunk/richfaces/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java 2007-04-18 12:53:17 UTC (rev 435)
+++ trunk/richfaces/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java 2007-04-18 13:58:41 UTC (rev 436)
@@ -25,7 +25,6 @@
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlScript;
import org.richfaces.event.SwitchablePanelSwitchEvent;
-import org.richfaces.component.UISwitchablePanel;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
import org.ajax4jsf.tests.MockViewRoot;
import org.apache.commons.collections.Buffer;
@@ -33,7 +32,6 @@
import javax.faces.FacesException;
import javax.faces.component.UIComponent;
-import javax.faces.component.UIComponentBase;
import javax.faces.component.UIOutput;
import javax.faces.component.html.HtmlForm;
import javax.faces.event.ActionEvent;
@@ -53,7 +51,7 @@
static {
javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript");
- javaScripts.add("PrototypeScript");
+ javaScripts.add("prototype.js");
javaScripts.add("scripts/togglePanel.js");
}
@@ -180,6 +178,8 @@
public void testRenderScript() throws Exception {
HtmlPage page = renderView();
assertNotNull(page);
+ // System.out.println(page.asXml());
+
List scripts = page.getDocumentElement().getHtmlElementsByTagName(
"script");
@@ -319,7 +319,7 @@
*/
public void testDoDecodeClientMode() throws Exception {
- togglePanel.setImmediate(true);
+ togglePanel.setImmediate(true);
togglePanel.setSwitchType(UITogglePanel.CLIENT_METHOD);
externalContext.getRequestParameterMap().put(
@@ -340,7 +340,7 @@
assertTrue(event instanceof SwitchablePanelSwitchEvent);
SwitchablePanelSwitchEvent switchEvent = (SwitchablePanelSwitchEvent) event;
assertEquals(switchEvent.getValue(), "ABYBC");
-
+
events = mockViewRoot.getEventsQueue(facesContext,
PhaseId.INVOKE_APPLICATION);
assertNotNull(events);
Modified: trunk/richfaces/togglePanel/src/test/java/org/richfaces/renderkit/html/TogglePanelRenderersTest.java
===================================================================
--- trunk/richfaces/togglePanel/src/test/java/org/richfaces/renderkit/html/TogglePanelRenderersTest.java 2007-04-18 12:53:17 UTC (rev 435)
+++ trunk/richfaces/togglePanel/src/test/java/org/richfaces/renderkit/html/TogglePanelRenderersTest.java 2007-04-18 13:58:41 UTC (rev 436)
@@ -23,10 +23,8 @@
import javax.faces.FacesException;
import javax.faces.component.UIComponent;
-import javax.faces.component.UIComponentBase;
import javax.faces.component.UIOutput;
import javax.faces.component.html.HtmlForm;
-import javax.faces.context.FacesContext;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
import org.richfaces.component.UIToggleControl;
19 years
JBoss Rich Faces SVN: r435 - in trunk/richfaces/tree/src/main: templates and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-04-18 08:53:17 -0400 (Wed, 18 Apr 2007)
New Revision: 435
Modified:
trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss
trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx
Log:
Correct style definition for images inside nodes.
Modified: trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss
===================================================================
--- trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss 2007-04-18 11:28:30 UTC (rev 434)
+++ trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss 2007-04-18 12:53:17 UTC (rev 435)
@@ -12,7 +12,7 @@
padding : 1px
}
-.dr-tree-h-ic img{
+.dr-tree-h-ic-img{
margin: 0px;
display: block;
wigth : 16px;
Modified: trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx
===================================================================
--- trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx 2007-04-18 11:28:30 UTC (rev 434)
+++ trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx 2007-04-18 12:53:17 UTC (rev 435)
@@ -40,7 +40,7 @@
<![CDATA[
if (component.getUITree().isLeaf()) {
]]>
- </jsp:scriptlet> <img id="#{clientId}:handle:img" src="#{spacer}" alt="" /> <jsp:scriptlet>
+ </jsp:scriptlet> <img id="#{clientId}:handle:img" src="#{spacer}" alt="" class="dr-tree-h-ic-img" /> <jsp:scriptlet>
<![CDATA[
} else {
]]>
@@ -48,14 +48,14 @@
onclick="#{this:getToggleScript(context, component)} return false;"> <jsp:scriptlet>
<![CDATA[if (component.getUITree().isExpanded()) {]]>
</jsp:scriptlet> <img border="0" id="#{clientId}:handle:img:collapsed"
- src="#{collapsed}" class="dr-tree-pointer-cursor" style="display: none;" alt="" />
+ src="#{collapsed}" class="dr-tree-pointer-cursor dr-tree-h-ic-img" style="display: none;" alt="" />
<img border="0" id="#{clientId}:handle:img:expanded" src="#{expanded}"
- class="dr-tree-pointer-cursor" alt="" /> <jsp:scriptlet>
+ class="dr-tree-pointer-cursor dr-tree-h-ic-img" alt="" /> <jsp:scriptlet>
<![CDATA[} else {]]>
</jsp:scriptlet> <img border="0" id="#{clientId}:handle:img:collapsed"
- src="#{collapsed}" class="dr-tree-pointer-cursor" alt="" /> <img border="0"
+ src="#{collapsed}" class="dr-tree-pointer-cursor dr-tree-h-ic-img" alt="" /> <img border="0"
id="#{clientId}:handle:img:expanded" src="#{expanded}"
- class="dr-tree-pointer-cursor" style="display: none;" alt="" /> <jsp:scriptlet>
+ class="dr-tree-pointer-cursor dr-tree-h-ic-img" style="display: none;" alt="" /> <jsp:scriptlet>
<![CDATA[}]]>
</jsp:scriptlet> </a> <jsp:scriptlet>
<![CDATA[
@@ -75,13 +75,13 @@
if (component.getUITree().isLeaf()) {
]]>
</jsp:scriptlet>
- <img src="#{leaf}" alt="" />
+ <img src="#{leaf}" alt="" class="dr-tree-h-ic-img" />
<jsp:scriptlet>
<![CDATA[
} else {
]]>
</jsp:scriptlet>
- <img src="#{folder}" alt="" />
+ <img src="#{folder}" alt="" class="dr-tree-h-ic-img" />
<jsp:scriptlet>
<![CDATA[
}
19 years
JBoss Rich Faces SVN: r434 - in trunk/richfaces/dataTable: src/main/resources/org/richfaces/renderkit/html/css and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-04-18 07:28:30 -0400 (Wed, 18 Apr 2007)
New Revision: 434
Modified:
trunk/richfaces/dataTable/skin/dataTable/dataTable.html
trunk/richfaces/dataTable/skin/dataTable/dataTable_example.html
trunk/richfaces/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss
trunk/richfaces/dataTable/src/main/templates/org/richfaces/datatable/css/table.xcss
Log:
Replace wrong CSS ctyle "font-color" with "color".
Modified: trunk/richfaces/dataTable/skin/dataTable/dataTable.html
===================================================================
--- trunk/richfaces/dataTable/skin/dataTable/dataTable.html 2007-04-18 11:12:28 UTC (rev 433)
+++ trunk/richfaces/dataTable/skin/dataTable/dataTable.html 2007-04-18 11:28:30 UTC (rev 434)
@@ -32,7 +32,7 @@
font-size : 11px; /*generalSizeFont*/
- font-color : #000000; /*generalTextColor*/
+ color : #000000; /*generalTextColor*/
font-family : verdana; /*generalFamilyFont*/
Modified: trunk/richfaces/dataTable/skin/dataTable/dataTable_example.html
===================================================================
--- trunk/richfaces/dataTable/skin/dataTable/dataTable_example.html 2007-04-18 11:12:28 UTC (rev 433)
+++ trunk/richfaces/dataTable/skin/dataTable/dataTable_example.html 2007-04-18 11:28:30 UTC (rev 434)
@@ -32,7 +32,7 @@
font-size : 11px; /*generalSizeFont*/
- font-color : #000000; /*generalTextColor*/
+ color : #000000; /*generalTextColor*/
font-family : verdana; /*generalFamilyFont*/
Modified: trunk/richfaces/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss
===================================================================
--- trunk/richfaces/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss 2007-04-18 11:12:28 UTC (rev 433)
+++ trunk/richfaces/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss 2007-04-18 11:28:30 UTC (rev 434)
@@ -80,7 +80,7 @@
<u:style name="padding" value="4px 4px 4px 4px"/>
<u:style name="text-align" value="center"/>
<u:style name="font-size" skin="generalSizeFont"/> <!--generalSizeFont-->
- <u:style name="font-color" skin="generalTextColor"/> <!--generalTextColor-->
+ <u:style name="color" skin="generalTextColor"/> <!--generalTextColor-->
<u:style name="font-family" skin="generalFamilyFont"/> <!--generalFamilyFont-->
</u:selector>
Modified: trunk/richfaces/dataTable/src/main/templates/org/richfaces/datatable/css/table.xcss
===================================================================
--- trunk/richfaces/dataTable/src/main/templates/org/richfaces/datatable/css/table.xcss 2007-04-18 11:12:28 UTC (rev 433)
+++ trunk/richfaces/dataTable/src/main/templates/org/richfaces/datatable/css/table.xcss 2007-04-18 11:28:30 UTC (rev 434)
@@ -14,7 +14,7 @@
border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
padding : 4px 4px 4px 4px;
font-size : 11px; /*generalSizeFont*/
- font-color : #000000; /*generalTextColor*/
+ color : #000000; /*generalTextColor*/
font-family : verdana; /*generalFamilyFont*/
}
@@ -23,7 +23,7 @@
border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
padding : 4px 4px 4px 4px;
font-size : 11px; /*generalSizeFont*/
- font-color : #000000; /*generalTextColor*/
+ color : #000000; /*generalTextColor*/
font-family : verdana; /*generalFamilyFont*/
}
19 years
JBoss Rich Faces SVN: r433 - in trunk/richfaces/togglePanel/src/test/java/org/richfaces: component and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: F.antonov
Date: 2007-04-18 07:12:28 -0400 (Wed, 18 Apr 2007)
New Revision: 433
Added:
trunk/richfaces/togglePanel/src/test/java/org/richfaces/renderkit/
trunk/richfaces/togglePanel/src/test/java/org/richfaces/renderkit/html/
trunk/richfaces/togglePanel/src/test/java/org/richfaces/renderkit/html/TogglePanelRenderersTest.java
Modified:
trunk/richfaces/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java
Log:
TogglePanel test cases development.
Modified: trunk/richfaces/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java
===================================================================
--- trunk/richfaces/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java 2007-04-16 22:42:15 UTC (rev 432)
+++ trunk/richfaces/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java 2007-04-18 11:12:28 UTC (rev 433)
@@ -53,7 +53,7 @@
static {
javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript");
- javaScripts.add("prototype.js");
+ javaScripts.add("PrototypeScript");
javaScripts.add("scripts/togglePanel.js");
}
@@ -241,22 +241,6 @@
}
}
- public void testgetPanel() throws Exception {
- assertTrue(toggleControl.getPanel().getId().equals(togglePanel.getId()));
- toggleControl.setFor("xxx");
- try {
- toggleControl.getPanel();
- assertTrue(false);
- } catch (Exception ex) {
- }
- toggleControl.setFor(null);
- try {
- toggleControl.getPanel();
- assertTrue(false);
- } catch (Exception ex) {
- }
- }
-
/**
* Test for UITogglePanel & UIToggleControl classes methods.
*
@@ -304,7 +288,7 @@
HtmlPage page = renderView();
assertNotNull(page);
- System.out.println(page.asXml());
+ // System.out.println(page.asXml());
HtmlElement div = page.getHtmlElementById(togglePanel
.getClientId(facesContext));
@@ -331,28 +315,105 @@
}
/**
- * Test "doDecode" method of TogglePanel. Component in "client" mode.
- * Immediate is true.
+ * Test for TogglePanel components "doDecode" method.
*/
- public void testTogglePanelDoDecodeClientMode() throws Exception {
+ public void testDoDecodeClientMode() throws Exception {
- togglePanel.setImmediate(true);
+ togglePanel.setImmediate(true);
togglePanel.setSwitchType(UITogglePanel.CLIENT_METHOD);
externalContext.getRequestParameterMap().put(
togglePanel.getClientId(facesContext), "ABYBC");
togglePanel.decode(facesContext);
+ externalContext.getRequestParameterMap().put(
+ toggleControl.getClientId(facesContext), "ABYBC");
+ toggleControl.decode(facesContext);
+
MockViewRoot mockViewRoot = (MockViewRoot) facesContext.getViewRoot();
Buffer events = mockViewRoot.getEventsQueue(facesContext,
PhaseId.APPLY_REQUEST_VALUES);
assertNotNull(events);
- assertEquals(1, events.size());
+ assertEquals(2, events.size());
FacesEvent event = (FacesEvent) events.iterator().next();
assertTrue(event instanceof SwitchablePanelSwitchEvent);
SwitchablePanelSwitchEvent switchEvent = (SwitchablePanelSwitchEvent) event;
assertEquals(switchEvent.getValue(), "ABYBC");
+
+ events = mockViewRoot.getEventsQueue(facesContext,
+ PhaseId.INVOKE_APPLICATION);
+ assertNotNull(events);
+ assertEquals(1, events.size());
+
+ event = (FacesEvent) events.iterator().next();
+
+ assertTrue(event instanceof ActionEvent);
+ ActionEvent actionEvent = (ActionEvent) event;
+ assertEquals(actionEvent.getSource(), toggleControl);
+
}
+ /**
+ * Test "doDecode" method. No events must be generated.
+ */
+ public void testDoDecodeNoEvents() throws Exception {
+
+ togglePanel.setSwitchType(UITogglePanel.CLIENT_METHOD);
+
+ externalContext.getRequestParameterMap().put("ABYBC", "ABYBC");
+ toggleControl.decode(facesContext);
+ togglePanel.decode(facesContext);
+
+ MockViewRoot mockViewRoot = (MockViewRoot) facesContext.getViewRoot();
+ Buffer events = mockViewRoot.getEventsQueue(facesContext,
+ PhaseId.INVOKE_APPLICATION);
+ assertNotNull(events);
+ assertEquals(0, events.size());
+
+ togglePanel.setSwitchType(UITogglePanel.AJAX_METHOD);
+ externalContext.getRequestParameterMap().put(
+ togglePanel.getClientId(facesContext), "ABYBC");
+ externalContext.getRequestParameterMap().put(
+ toggleControl.getClientId(facesContext), "ABYBC");
+ toggleControl.decode(facesContext);
+ togglePanel.decode(facesContext);
+
+ mockViewRoot = (MockViewRoot) facesContext.getViewRoot();
+ events = mockViewRoot.getEventsQueue(facesContext,
+ PhaseId.INVOKE_APPLICATION);
+ assertNotNull(events);
+ assertEquals(0, events.size());
+ }
+
+ /**
+ * Test for UIToggleControl getPanel method.
+ */
+ public void testUIToggleControlGetPanelMethod() throws Exception {
+
+ assertEquals(toggleControl.getPanel(), togglePanel);
+
+ toggleControl.setFor("ABYBC");
+ try {
+ UIComponent targetComponent = toggleControl.getPanel();
+ assertTrue(false);
+ } catch (Exception e) {
+ assertTrue(e instanceof FacesException);
+ }
+
+ toggleControl.setFor(null);
+ togglePanel.getChildren().add(a);
+ a.getChildren().add(b);
+ b.getChildren().add(toggleControl);
+ assertEquals(toggleControl.getPanel(), togglePanel);
+
+ togglePanel.getChildren().remove(a);
+ try {
+ UIComponent targetComponent = toggleControl.getPanel();
+ assertTrue(false);
+ } catch (Exception e) {
+ assertTrue(e instanceof FacesException);
+ }
+ }
+
}
Added: trunk/richfaces/togglePanel/src/test/java/org/richfaces/renderkit/html/TogglePanelRenderersTest.java
===================================================================
--- trunk/richfaces/togglePanel/src/test/java/org/richfaces/renderkit/html/TogglePanelRenderersTest.java (rev 0)
+++ trunk/richfaces/togglePanel/src/test/java/org/richfaces/renderkit/html/TogglePanelRenderersTest.java 2007-04-18 11:12:28 UTC (rev 433)
@@ -0,0 +1,152 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces 3.0 - Ajax4jsf Component Library
+ *
+ * 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.renderkit.html;
+
+import javax.faces.FacesException;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIComponentBase;
+import javax.faces.component.UIOutput;
+import javax.faces.component.html.HtmlForm;
+import javax.faces.context.FacesContext;
+
+import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
+import org.richfaces.component.UIToggleControl;
+import org.richfaces.component.UITogglePanel;
+
+/**
+ * Unit test for TogglePanel renderers.
+ */
+public class TogglePanelRenderersTest extends AbstractAjax4JsfTestCase {
+
+ private UITogglePanel togglePanel;
+
+ private UIToggleControl toggleControl;
+
+ private UIComponent form;
+
+ private UIOutput a;
+
+ private UIOutput b;
+
+ private static ToggleControlRenderer controlRenderer = new ToggleControlRenderer();
+
+ private static TogglePanelRenderer panelRenderer = new TogglePanelRenderer();
+
+ /**
+ * Create the test case
+ *
+ * @param testName
+ * name of the test case
+ */
+ public TogglePanelRenderersTest(String testName) {
+ super(testName);
+ }
+
+ public void setUp() throws Exception {
+ super.setUp();
+
+ a = (UIOutput) application.createComponent(UIOutput.COMPONENT_TYPE);
+ a.setId("a_output");
+ a.setValue("a");
+
+ b = (UIOutput) application.createComponent(UIOutput.COMPONENT_TYPE);
+ b.setId("b_output");
+ b.setValue("b");
+
+ form = new HtmlForm();
+ form.setId("form");
+ facesContext.getViewRoot().getChildren().add(form);
+
+ togglePanel = (UITogglePanel) application
+ .createComponent("org.richfaces.TogglePanel");
+ togglePanel.setId("TogglePanel");
+ togglePanel.getFacets().put("a", a);
+ togglePanel.getFacets().put("b", b);
+ togglePanel.setStateOrder("a,b");
+ togglePanel.setInitialState("a");
+
+ form.getChildren().add(togglePanel);
+
+ toggleControl = (UIToggleControl) application
+ .createComponent("org.richfaces.ToggleControl");
+ toggleControl.setId("ToggleControl");
+ toggleControl.setFor(togglePanel.getId());
+ form.getChildren().add(toggleControl);
+ }
+
+ public void tearDown() throws Exception {
+ super.tearDown();
+ togglePanel = null;
+ toggleControl = null;
+ form = null;
+ }
+
+ /**
+ * Test for some ToggleControl renderer methods.
+ */
+ public void testToggleControlRendererMethods() throws Exception {
+
+ assertEquals(controlRenderer.getComponentClass(), UIToggleControl.class);
+
+ toggleControl.getAttributes().put("onclick", "toggleControlOnClick");
+ String result = controlRenderer.getOnClick(facesContext, toggleControl);
+ assertTrue(result.contains("toggleControlOnClick;"));
+ assertTrue(result.contains("TogglePanelManager.toggleOnServer"));
+
+ togglePanel.setSwitchType(UITogglePanel.AJAX_METHOD);
+ toggleControl.getAttributes().put("onclick", "toggleControlOnClick;");
+ result = controlRenderer.getOnClick(facesContext, toggleControl);
+ assertTrue(result.contains("toggleControlOnClick;"));
+ assertTrue(result.contains("A4J.AJAX.Submit"));
+ toggleControl.getAttributes().put("disabled", "true");
+ result = controlRenderer.getOnClick(facesContext, toggleControl);
+ assertEquals("return false;", result);
+ toggleControl.getAttributes().put("disabled", "false");
+
+ togglePanel.setSwitchType(UITogglePanel.CLIENT_METHOD);
+ toggleControl.setSwitchToState("b");
+ result = controlRenderer.getOnClick(facesContext, toggleControl);
+ assertTrue(result.contains("toggleControlOnClick;"));
+ assertTrue(result.contains("TogglePanelManager.toggleOnClient"));
+
+ toggleControl.setSwitchToState(null);
+ String result2 = controlRenderer
+ .getOnClick(facesContext, toggleControl);
+ assertTrue(!result.equalsIgnoreCase(result2));
+ }
+
+ /**
+ * Test for some TogglePanel renderer methods..
+ */
+ public void testTogglePanelRendererMethods() throws Exception {
+
+ assertEquals(panelRenderer.getComponentClass(), UITogglePanel.class);
+
+ togglePanel.setStateOrder(null);
+ try {
+ panelRenderer.handleFacets(facesContext, togglePanel);
+ assertTrue(false);
+ } catch (Exception e) {
+ assertTrue(e instanceof FacesException);
+ }
+ }
+}
19 years
JBoss Rich Faces SVN: r432 - trunk/richfaces/tree/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-04-16 18:42:15 -0400 (Mon, 16 Apr 2007)
New Revision: 432
Modified:
trunk/richfaces/tree/src/main/config/component/tree.xml
trunk/richfaces/tree/src/main/config/component/treeNode.xml
Log:
RF-77 fixed
Modified: trunk/richfaces/tree/src/main/config/component/tree.xml
===================================================================
--- trunk/richfaces/tree/src/main/config/component/tree.xml 2007-04-16 21:08:21 UTC (rev 431)
+++ trunk/richfaces/tree/src/main/config/component/tree.xml 2007-04-16 22:42:15 UTC (rev 432)
@@ -152,6 +152,16 @@
<property hidden="true">
<name>rowKey</name>
</property>
+
+
+ <property hidden="true">
+ <name>dragValue</name>
+ </property>
+
+ <property hidden="true">
+ <name>dropValue</name>
+ </property>
+
</component>
&listeners;
Modified: trunk/richfaces/tree/src/main/config/component/treeNode.xml
===================================================================
--- trunk/richfaces/tree/src/main/config/component/treeNode.xml 2007-04-16 21:08:21 UTC (rev 431)
+++ trunk/richfaces/tree/src/main/config/component/treeNode.xml 2007-04-16 22:42:15 UTC (rev 432)
@@ -69,6 +69,14 @@
<description>Name of node CSS class</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
+
+ <property hidden="true">
+ <name>dragValue</name>
+ </property>
+
+ <property hidden="true">
+ <name>dropValue</name>
+ </property>
</component>
&listeners;
</components>
19 years
JBoss Rich Faces SVN: r430 - trunk/richfaces/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/script.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-04-14 13:49:02 -0400 (Sat, 14 Apr 2007)
New Revision: 430
Modified:
trunk/richfaces/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/script/SpinnerScript.js
Log:
Fix input style for various values enableManualInput and disabled attributes.
Modified: trunk/richfaces/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/script/SpinnerScript.js
===================================================================
--- trunk/richfaces/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/script/SpinnerScript.js 2007-04-14 16:52:43 UTC (rev 429)
+++ trunk/richfaces/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/script/SpinnerScript.js 2007-04-14 17:49:02 UTC (rev 430)
@@ -90,16 +90,12 @@
},
_load: function(){
- if (this.edited){
- if (this.options.disabled){
- this.controls.edit.disabled = "disabled";
- this.controls.edit.style.color = "gray";
- } else {
- this.controls.edit.readOnly = "";
- this.controls.edit.style.color = this.controls.originalColor;
- }
- } else{
- this.controls.edit.readOnly = "readOnly";
+ this.controls.edit.readOnly = this.edited ? "" : "readOnly";
+ if (this.options.disabled) {
+ this.controls.edit.readOnly = "readOnly";
+ Element.setStyle(this.controls.edit, {color: "gray"});
+ } else {
+ Element.setStyle(this.controls.edit, {color: ""});
}
},
19 years