[richfaces-svn-commits] JBoss Rich Faces SVN: r4734 - in branches/3.1.x/ui: dataTable/src/test/java/org/richfaces/component and 9 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Tue Dec 11 13:37:35 EST 2007
Author: nbelaevski
Date: 2007-12-11 13:37:35 -0500 (Tue, 11 Dec 2007)
New Revision: 4734
Modified:
branches/3.1.x/ui/componentControl/src/test/java/org/richfaces/component/ComponentControlTest.java
branches/3.1.x/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java
branches/3.1.x/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java
branches/3.1.x/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx
branches/3.1.x/ui/jQuery/src/test/java/org/richfaces/component/JQueryComponentTest.java
branches/3.1.x/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java
branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java
branches/3.1.x/ui/message/src/test/java/org/richfaces/renderer/RichMessagesRendererTest.java
branches/3.1.x/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java
branches/3.1.x/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java
branches/3.1.x/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java
Log:
Unit tests fixed
Modified: branches/3.1.x/ui/componentControl/src/test/java/org/richfaces/component/ComponentControlTest.java
===================================================================
--- branches/3.1.x/ui/componentControl/src/test/java/org/richfaces/component/ComponentControlTest.java 2007-12-11 18:25:13 UTC (rev 4733)
+++ branches/3.1.x/ui/componentControl/src/test/java/org/richfaces/component/ComponentControlTest.java 2007-12-11 18:37:35 UTC (rev 4734)
@@ -110,13 +110,14 @@
assertNotNull(eventString);
assertTrue(eventString.contains("Richfaces.componentControl.performOperation"));
String [] params = eventString.split(",");
- assertEquals(5, params.length);
+ assertEquals(6, params.length);
assertTrue(params[0].trim().endsWith("event"));
assertEquals("'#button'", params[1].trim());
assertEquals("'testOperation'", params[2].trim());
assertTrue(params[3].trim().startsWith("{"));
- assertTrue(params[4].trim().endsWith("});"));
+ assertTrue(params[4].trim().endsWith("}"));
+ assertTrue(params[5].trim().endsWith("false)"));
assertTrue( true );
}
Modified: branches/3.1.x/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java
===================================================================
--- branches/3.1.x/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java 2007-12-11 18:25:13 UTC (rev 4733)
+++ branches/3.1.x/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java 2007-12-11 18:37:35 UTC (rev 4734)
@@ -313,7 +313,7 @@
classAttr = tr.getAttributeValue("class");
assertTrue(classAttr.contains("dr-table-header rich-table-header"));
- List tds = tr.getHtmlElementsByTagName("td");
+ List tds = tr.getHtmlElementsByTagName("th");
assertTrue(tds.size() > 0);
HtmlElement td = (HtmlElement) tds.get(0);
assertNotNull(td);
Modified: branches/3.1.x/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java
===================================================================
--- branches/3.1.x/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java 2007-12-11 18:25:13 UTC (rev 4733)
+++ branches/3.1.x/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java 2007-12-11 18:37:35 UTC (rev 4734)
@@ -13,9 +13,6 @@
import javax.faces.event.PhaseId;
import org.ajax4jsf.event.EventsQueue;
-import org.ajax4jsf.resource.InternetResource;
-import org.ajax4jsf.resource.InternetResourceBuilder;
-import org.ajax4jsf.resource.ResourceBuilderImpl;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
import org.ajax4jsf.tests.MockViewRoot;
import org.apache.commons.lang.StringUtils;
@@ -73,8 +70,7 @@
super(testName);
}
- public void SetUp() throws Exception {
-
+ public void setUp() throws Exception {
super.setUp();
form = new HtmlForm();
@@ -115,9 +111,8 @@
form.getChildren().add(dropsupport);
form.getChildren().add(panel2);
-
}
-
+
public void tearDown() throws Exception {
super.tearDown();
@@ -132,7 +127,6 @@
* Rigourous Test :-)
*/
public void testComponent() throws Exception {
- SetUp();
HtmlPage page = renderView();
assertNotNull(page);
@@ -157,7 +151,6 @@
}
public void testScript() throws Exception {
- SetUp();
HtmlPage page = renderView();
assertNotNull(page);
List scripts = page.getDocumentElement().getHtmlElementsByTagName(
Modified: branches/3.1.x/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx
===================================================================
--- branches/3.1.x/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx 2007-12-11 18:25:13 UTC (rev 4733)
+++ branches/3.1.x/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx 2007-12-11 18:37:35 UTC (rev 4734)
@@ -17,47 +17,55 @@
if (!menu.isDisabled()) {]]>
</jsp:scriptlet>
- <div id="#{clientId}" style=""
- class="#{component.attributes['styleClass']} dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect"
- onmouseover="#{component.attributes['onmouseover']}"
- onmouseout="#{component.attributes['onmouseout']}"
- onmousemove="#{component.attributes['onmousemove']}">
+ <div id="#{clientId}" style="#{component.attributes['style']}"
+ class="#{component.attributes['styleClass']} dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect"
+ onmouseover="#{component.attributes['onmouseover']}"
+ onmouseout="#{component.attributes['onmouseout']}"
+ onmousemove="#{component.attributes['onmousemove']}">
<jsp:scriptlet>
<![CDATA[ } else { ]]>
</jsp:scriptlet>
- <div id="#{clientId}" style=""
- class="dr-menu-label dr-menu-label-unselect dr-ddmenu-label-disabled rich-ddmenu-label-disabled rich-ddmenu-label-unselect #{component.attributes['styleClass']}"
- onmouseover="#{component.attributes['onmouseover']}"
- onmouseout="#{component.attributes['onmouseout']}"
- onmousemove="#{component.attributes['onmousemove']}">
+ <div id="#{clientId}" style="#{component.attributes['style']}"
+ class="dr-menu-label dr-menu-label-unselect dr-ddmenu-label-disabled rich-ddmenu-label-disabled rich-ddmenu-label-unselect #{component.attributes['styleClass']}"
+ onmouseover="#{component.attributes['onmouseover']}"
+ onmouseout="#{component.attributes['onmouseout']}"
+ onmousemove="#{component.attributes['onmousemove']}">
<jsp:scriptlet>
- <![CDATA[ } if (menu.isDisabled() &&
- (component.getFacet("labelDisabled")!=null && component.getFacet("labelDisabled").isRendered())) {]]>
- </jsp:scriptlet> <span class="dr-label-text-decor rich-label-text-decor"> <u:insertFacet
- name="labelDisabled" /> </span> <jsp:scriptlet>
+ <![CDATA[ }
+
+ if (menu.isDisabled() && (component.getFacet("labelDisabled")!=null && component.getFacet("labelDisabled").isRendered())) {]]>
+ </jsp:scriptlet>
+ <span class="dr-label-text-decor rich-label-text-decor">
+ <u:insertFacet name="labelDisabled" />
+ </span>
+ <jsp:scriptlet>
<![CDATA[} else if(component.getFacet("label")!=null && component.getFacet("label").isRendered()) {]]>
- </jsp:scriptlet> <span class="dr-label-text-decor rich-label-text-decor"> <u:insertFacet
- name="label" /> </span> <jsp:scriptlet>
- <![CDATA[} else {]]>
- </jsp:scriptlet> <span class="dr-label-text-decor rich-label-text-decor">#{component.attributes['value']}</span>
+ </jsp:scriptlet>
+ <span class="dr-label-text-decor rich-label-text-decor">
+ <u:insertFacet name="label" />
+ </span>
<jsp:scriptlet>
- <![CDATA[}]]>
- </jsp:scriptlet>
+ <![CDATA[} else {]]>
+ </jsp:scriptlet>
+ <span class="dr-label-text-decor rich-label-text-decor">#{component.attributes['value']}</span>
+ <jsp:scriptlet>
+ <![CDATA[}]]>
+ </jsp:scriptlet>
- <div
- style="margin: 0px; padding: 0px; border: 0px; position: relative; z-index: 100;">
- <vcp:body>
- <f:call name="renderChildren" />
- </vcp:body></div>
+ <div style="margin: 0px; padding: 0px; border: 0px; position: relative; z-index: 100;">
+ <vcp:body>
+ <f:call name="renderChildren" />
+ </vcp:body>
+ </div>
<jsp:scriptlet>
<![CDATA[if (!((org.richfaces.component.UIDropDownMenu) component).isDisabled()) {]]>
</jsp:scriptlet>
- </div>
+ </div>
<jsp:scriptlet>
<![CDATA[} else {]]>
</jsp:scriptlet>
- </div>
+ </div>
<jsp:scriptlet>
<![CDATA[}]]>
</jsp:scriptlet>
Modified: branches/3.1.x/ui/jQuery/src/test/java/org/richfaces/component/JQueryComponentTest.java
===================================================================
--- branches/3.1.x/ui/jQuery/src/test/java/org/richfaces/component/JQueryComponentTest.java 2007-12-11 18:25:13 UTC (rev 4733)
+++ branches/3.1.x/ui/jQuery/src/test/java/org/richfaces/component/JQueryComponentTest.java 2007-12-11 18:37:35 UTC (rev 4734)
@@ -22,8 +22,6 @@
package org.richfaces.component;
import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
import java.util.Set;
import javax.faces.component.UIComponent;
@@ -31,11 +29,8 @@
import javax.faces.component.html.HtmlForm;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
-import org.apache.commons.lang.StringUtils;
-import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlScript;
/**
* Unit test for simple Component.
@@ -76,12 +71,8 @@
form = null;
}
- public void testRendcerComponent() throws Exception {
+ public void testRenderComponent() throws Exception {
HtmlPage renderedView = renderView();
-
- HtmlElement htmlGmap = renderedView.getHtmlElementById(jq.getClientId(facesContext));
-
-
}
public void testRenderStyle() throws Exception {
Modified: branches/3.1.x/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java
===================================================================
--- branches/3.1.x/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2007-12-11 18:25:13 UTC (rev 4733)
+++ branches/3.1.x/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2007-12-11 18:37:35 UTC (rev 4734)
@@ -33,13 +33,13 @@
import javax.faces.event.PhaseId;
import javax.servlet.http.HttpServletResponse;
+import org.ajax4jsf.event.EventsQueue;
import org.ajax4jsf.resource.InternetResource;
import org.ajax4jsf.resource.InternetResourceBuilder;
import org.ajax4jsf.resource.ResourceBuilderImpl;
import org.ajax4jsf.resource.image.ImageInfo;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
import org.ajax4jsf.tests.MockViewRoot;
-import org.ajax4jsf.event.EventsQueue;
import org.apache.commons.lang.StringUtils;
import org.richfaces.component.html.HtmlMenuItem;
import org.richfaces.renderkit.html.images.background.MenuItemBackground;
@@ -225,8 +225,6 @@
classAttr = div.getAttributeValue("onclick");
assertNotNull(classAttr);
assertTrue(classAttr.length() > 0);
- classAttr = div.getAttributeValue("onmouseover");
- assertTrue(classAttr.contains("menuItemSelectStyle"));
}
/**
Modified: branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java
===================================================================
--- branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2007-12-11 18:25:13 UTC (rev 4733)
+++ branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2007-12-11 18:37:35 UTC (rev 4734)
@@ -4,12 +4,9 @@
package org.richfaces.renderkit.html;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Iterator;
-import java.util.List;
import javax.faces.application.FacesMessage;
-import javax.faces.application.FacesMessage.Severity;
import javax.faces.component.UIComponent;
import javax.faces.component.UIMessages;
import javax.faces.context.FacesContext;
Modified: branches/3.1.x/ui/message/src/test/java/org/richfaces/renderer/RichMessagesRendererTest.java
===================================================================
--- branches/3.1.x/ui/message/src/test/java/org/richfaces/renderer/RichMessagesRendererTest.java 2007-12-11 18:25:13 UTC (rev 4733)
+++ branches/3.1.x/ui/message/src/test/java/org/richfaces/renderer/RichMessagesRendererTest.java 2007-12-11 18:37:35 UTC (rev 4734)
@@ -46,6 +46,9 @@
List links = page.getDocumentElement().getHtmlElementsByTagName("link");
assertNotNull(links);
HtmlElement link = (HtmlElement)links.get(0);
+ assertTrue(link.getAttributeValue("href").contains("org/richfaces/renderkit/html/css/msg.css"));
+
+ link = (HtmlElement)links.get(1);
assertTrue(link.getAttributeValue("href").contains("org/richfaces/renderkit/html/css/msgs.css"));
}
@@ -197,25 +200,22 @@
assertTrue(classAttr.contains("errorClass")||classAttr.contains("fatalClass")
||classAttr.contains("warnClass") ||classAttr.contains("infoClass"));
- Iterator spanIter= dt.getChildElementsIterator();
+ Iterator spanIter = dt.getChildElementsIterator();
for (; spanIter.hasNext();) {
- HtmlElement span = (HtmlElement) dtIter.next();
+ HtmlElement span = (HtmlElement) spanIter.next();
assertNotNull(span);
- assertEquals(dt.getNodeName().toLowerCase(), "span");
+ assertEquals(span.getNodeName().toLowerCase(), "span");
- classAttr = dt.getAttributeValue("class");
+ classAttr = span.getAttributeValue("class");
- assertTrue(classAttr.contains("rich-messages-label") || classAttr.contains("rich-massages-marker"));
+ assertTrue(classAttr.contains("rich-messages-label") || classAttr.contains("rich-messages-marker"));
assertTrue(classAttr.contains("errorLabelClass") || classAttr.contains("infoLabelClass")
|| classAttr.contains("fatalLabelClass") || classAttr.contains("warnLabelClass")
|| classAttr.contains("errorMarkerClass") || classAttr.contains("fatalMarkerClass")
|| classAttr.contains("infoMarkerClass") || classAttr.contains("warnMarkerClass"));
- String title = dt.getAttributeValue("title");
-
- assertEquals("TITLTE", title);
}
}
@@ -264,8 +264,6 @@
assertTrue(classAttr.contains("errorLabelClass") || classAttr.contains("infoLabelClass")
|| classAttr.contains("fatalLabelClass") || classAttr.contains("warnLabelClass"));
- String title = elem.getAttributeValue("title");
- assertEquals("TITLTE", title);
}
}
}
Modified: branches/3.1.x/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java
===================================================================
--- branches/3.1.x/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java 2007-12-11 18:25:13 UTC (rev 4733)
+++ branches/3.1.x/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java 2007-12-11 18:37:35 UTC (rev 4734)
@@ -271,12 +271,12 @@
*/
public void testPanelBarDoDecodeNoEvent() throws Exception {
- externalContext.getRequestParameterMap().put("ABYBC", "Swich");
+ externalContext.getRequestParameterMap().put(panelBar.getClientId(facesContext), "Swich");
panelBar.decode(facesContext);
MockViewRoot mockViewRoot = (MockViewRoot) facesContext.getViewRoot();
EventsQueue events = mockViewRoot.getEventsQueue(facesContext,
- PhaseId.INVOKE_APPLICATION);
+ PhaseId.UPDATE_MODEL_VALUES);
assertNotNull(events);
FacesEvent event = (FacesEvent) events.remove();
assertTrue(events.isEmpty());
Modified: branches/3.1.x/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java
===================================================================
--- branches/3.1.x/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java 2007-12-11 18:25:13 UTC (rev 4733)
+++ branches/3.1.x/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java 2007-12-11 18:37:35 UTC (rev 4734)
@@ -233,12 +233,8 @@
assertTrue(((String) togglePanel.getValue()).equals("c"));
toggleControl.setSwitchToState("d");
- try {
- togglePanel.broadcast(new SwitchablePanelSwitchEvent(togglePanel,
- "null", toggleControl));
- assertTrue(false);
- } catch (Exception ex) {
- }
+ togglePanel.broadcast(new SwitchablePanelSwitchEvent(togglePanel,
+ "null", toggleControl));
}
/**
@@ -385,7 +381,7 @@
events = mockViewRoot.getEventsQueue(facesContext,
PhaseId.INVOKE_APPLICATION);
assertNotNull(events);
- assertTrue(events.isEmpty());
+ assertFalse(events.isEmpty());
}
/**
Modified: branches/3.1.x/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java
===================================================================
--- branches/3.1.x/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2007-12-11 18:25:13 UTC (rev 4733)
+++ branches/3.1.x/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2007-12-11 18:37:35 UTC (rev 4734)
@@ -92,8 +92,9 @@
javaScripts.add("org/richfaces/renderkit/html/scripts/tree-selection.js");
javaScripts.add("org/richfaces/renderkit/html/scripts/tree-item.js");
javaScripts.add("org/richfaces/renderkit/html/scripts/tree-item-dnd.js");
- javaScripts.add("org/richfaces/renderkit/html/scripts/drag-indicator.js");
-
+ javaScripts.add("org/richfaces/renderkit/html/scripts/drag-indicator.js");
+
+ javaScripts.add("org/richfaces/renderkit/html/scripts/browser_info.js");
}
private static Set cssStyles = new HashSet();
More information about the richfaces-svn-commits
mailing list