[richfaces-svn-commits] JBoss Rich Faces SVN: r18663 - in trunk/ui/output/ui/src: test/java/org/richfaces/renderkit/html and 1 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Mon Aug 16 10:12:05 EDT 2010
Author: amarkhel
Date: 2010-08-16 10:12:05 -0400 (Mon, 16 Aug 2010)
New Revision: 18663
Modified:
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPopupPanel.java
trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/PanelRendererTest.java
trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/PopupRendererTest.java
trunk/ui/output/ui/src/test/resources/popupPanelTest.xhtml
Log:
RF-8948 and fix some tests
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPopupPanel.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPopupPanel.java 2010-08-16 14:11:11 UTC (rev 18662)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPopupPanel.java 2010-08-16 14:12:05 UTC (rev 18663)
@@ -24,6 +24,7 @@
import javax.faces.component.UIComponentBase;
import org.richfaces.cdk.annotations.Attribute;
+import org.richfaces.cdk.annotations.EventName;
import org.richfaces.cdk.annotations.JsfComponent;
import org.richfaces.cdk.annotations.JsfRenderer;
import org.richfaces.cdk.annotations.Tag;
@@ -33,66 +34,132 @@
* JSF component class
*
*/
- at JsfComponent(tag = @Tag(type = TagType.Facelets),
- renderer = @JsfRenderer(type = "org.richfaces.PopupPanelRenderer")
- )
+ at JsfComponent(tag = @Tag(type = TagType.Facelets), renderer = @JsfRenderer(type = "org.richfaces.PopupPanelRenderer"))
public abstract class AbstractPopupPanel extends UIComponentBase {
public static final String COMPONENT_TYPE = "org.richfaces.PopupPanel";
public static final String COMPONENT_FAMILY = "org.richfaces.PopupPanel";
+
@Attribute
public abstract String getVisualOptions();
- @Attribute(defaultValue="100")
+
+ @Attribute(defaultValue = "100")
public abstract int getZIndex();
- @Attribute(defaultValue="-1")
+
+ @Attribute(defaultValue = "-1")
public abstract int getHeight();
- @Attribute(defaultValue="-1")
+
+ @Attribute(defaultValue = "-1")
public abstract int getWidth();
- @Attribute(defaultValue="-1")
+
+ @Attribute(defaultValue = "-1")
public abstract int getMinHeight();
- @Attribute(defaultValue="-1")
+
+ @Attribute(defaultValue = "-1")
public abstract int getMinWidth();
- @Attribute(defaultValue=""+Integer.MAX_VALUE)
+
+ @Attribute(defaultValue = "" + Integer.MAX_VALUE)
public abstract int getMaxHeight();
- @Attribute(defaultValue=""+Integer.MAX_VALUE)
+
+ @Attribute(defaultValue = "" + Integer.MAX_VALUE)
public abstract int getMaxWidth();
- @Attribute(defaultValue="auto")
+
+ @Attribute(defaultValue = "auto")
public abstract String getTop();
- @Attribute(defaultValue="auto")
+
+ @Attribute(defaultValue = "auto")
public abstract String getLeft();
- @Attribute(defaultValue="false")
+
+ @Attribute(defaultValue = "false")
public abstract boolean isShow();
+
public abstract void setShow(boolean show);
- @Attribute(defaultValue="true")
+
+ @Attribute(defaultValue = "true")
public abstract boolean isMoveable();
- @Attribute(defaultValue="false")
+
+ @Attribute(defaultValue = "false")
public abstract boolean isAutosized();
- @Attribute(defaultValue="true")
+
+ @Attribute(defaultValue = "true")
public abstract boolean isModal();
- @Attribute(defaultValue="false")
+
+ @Attribute(defaultValue = "false")
public abstract boolean isKeepVisualState();
- @Attribute(defaultValue="false")
+
+ @Attribute(defaultValue = "false")
public abstract boolean isOverlapEmbedObjects();
- @Attribute(defaultValue="false")
+
+ @Attribute(defaultValue = "false")
public abstract boolean isResizeable();
- @Attribute(defaultValue="false")
+
+ @Attribute(defaultValue = "false")
public abstract boolean isTrimOverlayedElements();
+
@Attribute
public abstract String getDomElementAttachment();
+
@Attribute
public abstract String getControlsClass();
+
@Attribute
public abstract String getHeader();
+
@Attribute
public abstract String getHeaderClass();
+
@Attribute
public abstract String getShadowDepth();
+
@Attribute
public abstract String getShadowOpacity();
- @Attribute(defaultValue="true")
+
+ @Attribute(defaultValue = "true")
public abstract boolean isFollowByScroll();
+ @Attribute(events = @EventName("maskclick"))
+ public abstract String getOnmaskclick();
+
+ @Attribute(events = @EventName("maskdblclick"))
+ public abstract String getOnmaskdblclick();
+
+ @Attribute(events = @EventName("maskmousedown"))
+ public abstract String getOnmaskmousedown();
+
+ @Attribute(events = @EventName("maskmouseup"))
+ public abstract String getOnmaskmouseup();
+
+ @Attribute(events = @EventName("maskmouseover"))
+ public abstract String getOnmaskmouseover();
+
+ @Attribute(events = @EventName("maskmousemove"))
+ public abstract String getOnmaskmousemove();
+
+ @Attribute(events = @EventName("maskcontextmenu"))
+ public abstract String getOnmaskcontextmenu();
+
+ @Attribute(events = @EventName("maskmouseout"))
+ public abstract String getOnmaskmouseout();
+
+ @Attribute(events = @EventName("resize"))
+ public abstract String getOnresize();
+
+ @Attribute(events = @EventName("show"))
+ public abstract String getOnshow();
+
+ @Attribute(events = @EventName("hide"))
+ public abstract String getOnhide();
+
+ @Attribute(events = @EventName("move"))
+ public abstract String getOnmove();
+
+ @Attribute(events = @EventName("beforeshow"))
+ public abstract String getOnbeforeshow();
+
+ @Attribute(events = @EventName("beforehide"))
+ public abstract String getOnbeforehide();
+
@Override
public String getFamily() {
return COMPONENT_FAMILY;
Modified: trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/PanelRendererTest.java
===================================================================
--- trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/PanelRendererTest.java 2010-08-16 14:11:11 UTC (rev 18662)
+++ trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/PanelRendererTest.java 2010-08-16 14:12:05 UTC (rev 18663)
@@ -97,16 +97,16 @@
*
* @throws IOException
*/
- /*@Test
+ @Test
public final void testDoEncode() throws IOException {
HtmlPage page = environment.getPage("/panelTest.jsf");
HtmlElement panelWithFacet = page.getElementById("panelWithFacet");
- assertEquals("rf-panel panel", panelWithFacet.getAttribute("class"));
+ assertEquals("rf-p panel", panelWithFacet.getAttribute("class"));
assertEquals("Write your own custom rich components with built-in AJAX support", panelWithFacet.getElementById("panelWithFacet_header").getTextContent().trim());
assertEquals("The CDK includes", panelWithFacet.getElementById("panelWithFacet_body")
.getTextContent().trim().substring(0, 16));
HtmlElement simplePanel = page.getElementById("simplePanel");
- assertEquals("rf-panel ", simplePanel.getAttribute("class"));
+ assertEquals("rf-p ", simplePanel.getAttribute("class"));
try{
simplePanel.getElementById("simplePanel_header");
}catch(Exception e){
@@ -116,9 +116,9 @@
.getElementById("simplePanel_body")
.getTextContent().trim().substring(0, 16));
HtmlElement simplePanelBody = page.getElementById("simplePanel_body");
- assertEquals("rf-panel-body rich-laguna-panel-no-header", simplePanelBody.getAttribute("class"));
+ assertEquals("rf-p-b rich-laguna-panel-no-header", simplePanelBody.getAttribute("class"));
HtmlElement simplePanel2 = page.getElementById("simplePanelWithTextHeader");
- assertEquals("rf-panel ", simplePanel2.getAttribute("class"));
+ assertEquals("rf-p ", simplePanel2.getAttribute("class"));
assertNotNull(simplePanel2.getElementById("simplePanelWithTextHeader_header"));
assertEquals("rich-laguna-panel-no-header", simplePanel2.getElementById("simplePanelWithTextHeader_header").getTextContent().trim());
assertEquals("RichFaces is a l", simplePanel2
@@ -126,32 +126,32 @@
.getTextContent().trim().substring(0, 16));
HtmlElement nestedPanelContainer = page.getElementById("nestedPanelContainer");
- assertEquals("rf-panel ", nestedPanelContainer.getAttribute("class"));
+ assertEquals("rf-p ", nestedPanelContainer.getAttribute("class"));
assertNotNull(nestedPanelContainer.getElementById("nestedPanelContainer_header"));
assertEquals("||||", nestedPanelContainer.getElementById("nestedPanelContainer_header").getTextContent().trim());
HtmlElement nestedPanelContainerHeader = page.getElementById("nestedPanelContainer_header");
- assertEquals("rf-panel-header outpanelHeader", nestedPanelContainerHeader.getAttribute("class"));
+ assertEquals("rf-p-hr outpanelHeader", nestedPanelContainerHeader.getAttribute("class"));
assertEquals("Benefits of Usin", nestedPanelContainer
.getElementById("nestedPanelContainer_body")
.getTextContent().trim().substring(0, 16));
HtmlElement nestedPanel1 = nestedPanelContainer.getElementById("nestedPanel1");
- assertEquals("rf-panel ", nestedPanel1.getAttribute("class"));
+ assertEquals("rf-p ", nestedPanel1.getAttribute("class"));
HtmlElement nestedPanel1Body = page.getElementById("nestedPanel1_body");
- assertEquals("rf-panel-body inpanelBody", nestedPanel1Body.getAttribute("class"));
+ assertEquals("rf-p-b inpanelBody", nestedPanel1Body.getAttribute("class"));
assertNotNull(nestedPanel1.getElementById("nestedPanel1_header"));
assertEquals("For Application Developers", nestedPanel1.getElementById("nestedPanel1_header").getTextContent().trim());
assertEquals("Production quali", nestedPanel1
.getElementById("nestedPanel1_body")
.getTextContent().trim().substring(0, 16));
HtmlElement nestedPanel2 = nestedPanelContainer.getElementById("nestedPanel2");
- assertEquals("rf-panel ", nestedPanel2.getAttribute("class"));
+ assertEquals("rf-p ", nestedPanel2.getAttribute("class"));
HtmlElement nestedPanel2Body = page.getElementById("nestedPanel2_body");
- assertEquals("rf-panel-body inpanelBody", nestedPanel2Body.getAttribute("class"));
+ assertEquals("rf-p-b inpanelBody", nestedPanel2Body.getAttribute("class"));
assertNotNull(nestedPanel2.getElementById("nestedPanel2_header"));
assertEquals("For Component Developers", nestedPanel2.getElementById("nestedPanel2_header").getTextContent().trim());
assertEquals("Ajax4jsf is Open", nestedPanel2
.getElementById("nestedPanel2_body")
.getTextContent().trim().substring(0, 16));
- }*/
+ }
}
Modified: trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/PopupRendererTest.java
===================================================================
--- trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/PopupRendererTest.java 2010-08-16 14:11:11 UTC (rev 18662)
+++ trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/PopupRendererTest.java 2010-08-16 14:12:05 UTC (rev 18663)
@@ -74,22 +74,6 @@
vdl.buildView(facesContext, facesContext.getViewRoot());
return facesRequest;
}
- /**
- * Test method for {@link org.richfaces.renderkit.ExtendedDataTableRenderer#getComponentClass()}.
- *
- * @throws IOException
- */
- /* @Test
- public final void testGetComponentClass() throws IOException {
- FacesRequest facesRequest = startFacesRequest();
- FacesContext facesContext = FacesContext.getCurrentInstance();
- UIPopupPanel component = (UIPopupPanel) facesContext.getViewRoot().findComponent("panel");
- PopupPanelRenderer renderer = (PopupPanelRenderer) FacesContext.getCurrentInstance()
- .getRenderKit().getRenderer(component.getFamily(), component.getRendererType());
- assertEquals(UIPopupPanel.class, renderer.getComponentClass());
- facesRequest.release();
- return ;
- }*/
/**
* Test method for
@@ -99,7 +83,6 @@
* @throws IOException
*/
@Test
- @Ignore
public final void testDoEncode() throws IOException {
HtmlPage page = environment.getPage("/popupPanelTest.jsf");
HtmlElement panelWithFacet = page.getElementById("panel");
@@ -109,29 +92,34 @@
assertEquals("rf-pp-sh", panelShade.getAttribute("class"));
assertNotNull(panelShade);
HtmlElement panelShadow = panelWithFacet.getElementById("panel_shadow");
- assertEquals("mp_shadow", panelShadow.getAttribute("class"));
+ assertEquals("rf-pp-shw", panelShadow.getAttribute("class"));
assertNotNull(panelShadow);
HtmlElement panelContainer = panelWithFacet.getElementById("panel_container");
assertNotNull(panelContainer);
- assertEquals("mp_container panelStyle", panelContainer.getAttribute("class"));
+ assertEquals("rf-pp-cr panelStyle", panelContainer.getAttribute("class"));
HtmlElement panelScroller = panelWithFacet.getElementById("panel_content_scroller");
assertNotNull(panelScroller);
- assertEquals("mp_content_scroller", panelScroller.getAttribute("class"));
+ assertEquals("rf-pp-ct-sr", panelScroller.getAttribute("class"));
HtmlElement panelContent = panelWithFacet.getElementById("panel_content");
assertNotNull(panelContent);
- assertEquals("mp_content", panelContent.getAttribute("class"));
+ assertEquals("rf-pp-ct", panelContent.getAttribute("class"));
assertEquals("The CDK includes", panelContent
.getTextContent().trim().substring(0, 16));
HtmlElement panelHeader = panelWithFacet.getElementById("panel_header");
assertNotNull(panelHeader);
- assertEquals("mp_header header", panelHeader.getAttribute("class"));
+ assertEquals("rf-pp-h header", panelHeader.getAttribute("class"));
assertEquals("cursor: move;", panelHeader.getAttribute("style"));
assertEquals("Write your own custom rich components with built-in AJAX", panelHeader.getTextContent().trim());
HtmlElement panelResizer = panelWithFacet.getElementById("panelResizerN");
assertNotNull(panelResizer);
- assertEquals("mp_handler mp_handler_top", panelResizer.getAttribute("class"));
+ assertEquals("rf-pp-hr rf-pp-hr-t", panelResizer.getAttribute("class"));
assertEquals("cursor: N-resize;", panelResizer.getAttribute("style"));
List<HtmlElement> result = page.getElementsByName("script");
+ HtmlElement button = panelWithFacet.getElementById("button");
+ button.click();
+ HtmlElement sizeButton = panelWithFacet.getElementById("size");
+ sizeButton.click();
+ String width = panelContainer.getAttribute("width");
}
}
\ No newline at end of file
Modified: trunk/ui/output/ui/src/test/resources/popupPanelTest.xhtml
===================================================================
--- trunk/ui/output/ui/src/test/resources/popupPanelTest.xhtml 2010-08-16 14:11:11 UTC (rev 18662)
+++ trunk/ui/output/ui/src/test/resources/popupPanelTest.xhtml 2010-08-16 14:12:05 UTC (rev 18663)
@@ -5,6 +5,7 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:rich2="http://richfaces.org/rich"
xmlns:rich="http://richfaces.org/output">
<h:head>
@@ -12,7 +13,10 @@
</h:head>
<h:body>
- <rich:popupPanel styleClass="panelStyle" headerClass="header" controlsClass="control"
+ <h:commandButton id="button" value="Call the popup">
+ <rich2:componentControl target="panel" operation="show" />
+ </h:commandButton>
+ <rich:popupPanel resizeable="true" styleClass="panelStyle" headerClass="header" controlsClass="control"
id="panel"
@@ -35,20 +39,20 @@
<h:inputText value="aaa" />
- <a href="#"
+ <a href="#" id="size"
onclick="RichFaces.$('panel').setSize(500, 300)" tabindex="0">
setSize
</a>
- <a href="#"
+ <a href="#" id="resize"
onclick="RichFaces.$('panel').resize(20, 50)" tabindex="0">
resize
</a>
- <a href="#"
+ <a href="#" id="move"
onclick="RichFaces.$('panel').move(20, 50)" tabindex="0">
move
</a>
- <a href="#"
+ <a href="#" id="moveto"
onclick="RichFaces.$('panel').moveTo(20, 50)" tabindex="0">
moveTo
</a>
More information about the richfaces-svn-commits
mailing list