Author: abelevich Date: 2010-10-27 08:17:48 -0400 (Wed, 27 Oct 2010) New Revision: 19682 Added: trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceRendererTestBase.java trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceSelectRendererTest.java trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/InputBean.java trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/SelectBean.java trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/html/ trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/html/IgnoreScriptsContent.java trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/html/RendererTestBase.java trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestDefault.xmlunit.xml trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestEdit.xmlunit.xml trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestWithControls.xmlunit.xml trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTest.xhtml trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestDefault.xmlunit.xml trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml Modified: trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceInputRendererTest.java trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/faces-config.xml trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTest.xhtml Log: add test for inplaceSelect, rewrtite inplacesTest using htmlunit Modified: trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceInputRendererTest.java =================================================================== --- trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceInputRendererTest.java 2010-10-27 09:56:19 UTC (rev 19681) +++ trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceInputRendererTest.java 2010-10-27 12:17:48 UTC (rev 19682) @@ -1,190 +1,112 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - package org.richfaces.renderkit; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; -import java.io.File; -import java.util.List; +import java.io.IOException; -import org.jboss.test.faces.htmlunit.HtmlUnitEnvironment; -import org.junit.After; -import org.junit.Before; import org.junit.Test; +import org.xml.sax.SAXException; -import com.gargoylesoftware.htmlunit.html.DomNode; import com.gargoylesoftware.htmlunit.html.DomText; import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlPage; -/** - * @author Anton Belevich - * - */ -public class InplaceInputRendererTest { - - private HtmlUnitEnvironment environment; - - @Before - public void setUp() { - environment = new HtmlUnitEnvironment(); - environment.withWebRoot(new File("src/test/resources")); - environment.withResource("/WEB-INF/faces-config.xml", "org/richfaces/renderkit/faces-config.xml"); - environment.withResource("/test.xhtml", "org/richfaces/renderkit/inplaceInputTest.xhtml"); - environment.start(); - } +public class InplaceInputRendererTest extends InplaceRendererTestBase { + public static final String PAGE_NAME = "inplaceInputTest"; + + public static final String BASE_ID = "form:inplaceInput"; + + @Test - public void testRenderDefaultState() throws Exception { - HtmlPage page = environment.getPage("/test.jsf"); - HtmlElement span = page.getFirstByXPath("//*[@id = 'form:input_default']"); - assertEquals("span", span.getNodeName()); - assertEquals("rf-ii-d-s", span.getAttribute(HtmlConstants.CLASS_ATTRIBUTE)); - - HtmlElement label = (HtmlElement)span.getFirstChild(); - assertEquals("span", label.getNodeName()); - assertEquals("rf-ii-lbl", label.getAttribute(HtmlConstants.CLASS_ATTRIBUTE)); - DomNode text = label.getFirstChild(); - assertEquals(DomNode.TEXT_NODE, text.getNodeType()); - - HtmlElement edit = page.getFirstByXPath("//*[@id = 'form:input_defaultEdit']"); - assertEquals("span", edit.getNodeName()); - assertEquals("rf-ii-edit rf-ii-none", edit.getAttribute(HtmlConstants.CLASS_ATTRIBUTE)); - - HtmlElement input = (HtmlElement)edit.getFirstChild(); - assertEquals("input", input.getNodeName()); - assertEquals("rf-ii-fld", input.getAttribute(HtmlConstants.CLASS_ATTRIBUTE)); - assertEquals(text.getNodeValue(), input.getAttribute(HtmlConstants.VALUE_ATTRIBUTE)); - - List<?> buttons = page.getByXPath("//*[@id = 'form:input_defaultBtn']"); - assertEquals(true, buttons.isEmpty()); + public void testDefaultEncode() throws IOException, SAXException { + doTestDefaultEncode(PAGE_NAME, BASE_ID); } @Test - public void testRenderEditState() throws Exception { - - HtmlPage page = environment.getPage("/test.jsf"); - - HtmlElement span = page.getFirstByXPath("//*[@id = 'form:input_edit']"); - assertEquals("span", span.getNodeName()); - assertEquals("rf-ii-d-s rf-ii-e-s", span.getAttribute(HtmlConstants.CLASS_ATTRIBUTE)); + public void testDefaultWithControlsEncode() throws IOException, SAXException { + doTestDefaultWithControlsEncode(PAGE_NAME, BASE_ID); + } - HtmlElement label = (HtmlElement)span.getFirstChild(); - assertEquals("span", label.getNodeName()); - assertEquals("rf-ii-lbl", label.getAttribute(HtmlConstants.CLASS_ATTRIBUTE)); - DomNode text = label.getFirstChild(); - assertEquals(DomNode.TEXT_NODE, text.getNodeType()); - - HtmlElement edit = page.getFirstByXPath("//*[@id = 'form:input_editEdit']"); - assertEquals("span", edit.getNodeName()); - assertEquals("rf-ii-edit", edit.getAttribute(HtmlConstants.CLASS_ATTRIBUTE)); - - HtmlElement input = (HtmlElement)edit.getFirstChild(); - assertEquals("input", input.getNodeName()); - assertEquals("rf-ii-fld", input.getAttribute(HtmlConstants.CLASS_ATTRIBUTE)); - assertEquals(text.getNodeValue(), input.getAttribute(HtmlConstants.VALUE_ATTRIBUTE)); - - HtmlElement button = page.getFirstByXPath("//*[@id = 'form:input_editBtn']"); - assertEquals("span", button.getNodeName()); - - HtmlElement okButton = page.getFirstByXPath("//*[@id = 'form:input_editOkbtn']"); - assertEquals("input", okButton.getNodeName()); - assertEquals("rf-ii-btn", okButton.getAttribute(HtmlConstants.CLASS_ATTRIBUTE)); - assertEquals("image", okButton.getAttribute(HtmlConstants.TYPE_ATTR)); - - HtmlElement cancelButton = page.getFirstByXPath("//*[@id = 'form:input_editCancelbtn']"); - assertEquals("input", cancelButton.getNodeName()); - assertEquals("rf-ii-btn", cancelButton.getAttribute(HtmlConstants.CLASS_ATTRIBUTE)); - assertEquals("image", cancelButton.getAttribute(HtmlConstants.TYPE_ATTR)); - + @Test + public void testEditEncode() throws IOException, SAXException { + doTestEditEncode(PAGE_NAME, BASE_ID); } + @Test public void testEdit() throws Exception { - HtmlPage page = environment.getPage("/test.jsf"); - edit(page, "input_default", "Another Test String"); + HtmlPage page = environment.getPage("/inplaceInputTest.jsf"); + edit(page, BASE_ID + DEFAULT, "Another Test String"); blur(page); - DomText text = page.getFirstByXPath("//*[@id = 'form:input_defaultLabel']/text()"); + DomText text = page.getFirstByXPath("//*[@id = '" + BASE_ID + "DefaultLabel']/text()"); assertEquals("Another Test String", text.getTextContent()); - HtmlElement span = page.getFirstByXPath("//*[@id = 'form:input_default']"); + HtmlElement span = page.getFirstByXPath("//*[@id = '"+ BASE_ID + DEFAULT +"']"); assertEquals("rf-ii-d-s rf-ii-c-s", span.getAttribute(HtmlConstants.CLASS_ATTRIBUTE)); } - private void blur(HtmlPage page) throws Exception { - HtmlElement panel = page.getFirstByXPath("//*[@id = 'form:panel']"); - panel.click(); - } - - private void typeNewValue(HtmlPage page, String inplaceInputId, String value) throws Exception { - HtmlElement input = page.getFirstByXPath("//*[@id = 'form:" + inplaceInputId + "Input']"); - input.setAttribute(HtmlConstants.VALUE_ATTRIBUTE, ""); - input.type(value); - } - - private void edit(HtmlPage page, String inplaceInputId, String value) throws Exception { - HtmlElement span = page.getFirstByXPath("//*[@id = 'form:" + inplaceInputId + "']"); - span.click(); - HtmlElement edit = page.getFirstByXPath("//*[@id = 'form:" + inplaceInputId + "Edit']"); - assertEquals("rf-ii-edit", edit.getAttribute(HtmlConstants.CLASS_ATTRIBUTE)); - typeNewValue(page, inplaceInputId, value); - } - @Test public void testEditWithControls() throws Exception { - HtmlPage page = environment.getPage("/test.jsf"); - edit(page, "input_controls", "Another Test String"); - - HtmlElement cancel = page.getFirstByXPath("//*[@id = 'form:input_controlsCancelbtn']"); + HtmlPage page = environment.getPage("//inplaceInputTest.jsf"); + String withControlsComponentId = BASE_ID + WITH_CONTROLS; + edit(page, withControlsComponentId, "Another Test String"); + + HtmlElement cancel = page.getFirstByXPath("//*[@id = '" + withControlsComponentId + "Cancelbtn']"); + assertNotNull(cancel); cancel.mouseDown(); - DomText text = page.getFirstByXPath("//*[@id = 'form:input_controlsLabel']/text()"); - assertEquals("Test String", text.getTextContent()); + DomText text = page.getFirstByXPath("//*[@id = '"+ withControlsComponentId + "Label']/text()"); + assertNotNull(text); + assertEquals("Edit Text", text.getTextContent()); - HtmlElement span = page.getFirstByXPath("//*[@id = 'form:input_controls']"); + HtmlElement span = page.getFirstByXPath("//*[@id = '"+ withControlsComponentId +"']"); + assertNotNull(span); assertEquals("rf-ii-d-s", span.getAttribute(HtmlConstants.CLASS_ATTRIBUTE)); - edit(page, "input_controls", "Another Test String"); + edit(page, withControlsComponentId, "Another Test String"); - HtmlElement ok = page.getFirstByXPath("//*[@id = 'form:input_controlsOkbtn']"); + HtmlElement ok = page.getFirstByXPath("//*[@id = '"+ withControlsComponentId + "Okbtn']"); + assertNotNull(ok); ok.mouseDown(); - text = page.getFirstByXPath("//*[@id = 'form:input_controlsLabel']/text()"); + text = page.getFirstByXPath("//*[@id = '"+ withControlsComponentId +"Label']/text()"); + assertNotNull(text); assertEquals("Another Test String", text.getTextContent()); - span = page.getFirstByXPath("//*[@id = 'form:input_controls']"); + span = page.getFirstByXPath("//*[@id = '"+ withControlsComponentId +"']"); + assertNotNull(span); assertEquals("rf-ii-d-s rf-ii-c-s", span.getAttribute(HtmlConstants.CLASS_ATTRIBUTE)); - edit(page, "input_controls", "Test String"); + edit(page, withControlsComponentId, "Test String"); blur(page); - text = page.getFirstByXPath("//*[@id = 'form:input_controlsLabel']/text()"); + text = page.getFirstByXPath("//*[@id = '"+ withControlsComponentId +"Label']/text()"); + assertNotNull(text); assertEquals("Test String", text.getTextContent()); } + + private void edit(HtmlPage page, String inplaceInputId, String value) throws Exception { + HtmlElement span = page.getFirstByXPath("//*[@id = '" + inplaceInputId + "']"); + assertNotNull(span); + span.click(); + HtmlElement edit = page.getFirstByXPath("//*[@id = '" + inplaceInputId + "Edit']"); + assertNotNull(edit); + assertEquals("rf-ii-edit", edit.getAttribute(HtmlConstants.CLASS_ATTRIBUTE)); + typeNewValue(page, inplaceInputId, value); + } - @After - public void tearDown() { - environment.release(); - environment = null; + private void typeNewValue(HtmlPage page, String inplaceInputId, String value) throws Exception { + HtmlElement input = page.getFirstByXPath("//*[@id = '" + inplaceInputId + "Input']"); + assertNotNull(input); + input.setAttribute(HtmlConstants.VALUE_ATTRIBUTE, ""); + input.type(value); } + + private void blur(HtmlPage page) throws Exception { + HtmlElement panel = page.getFirstByXPath("//*[@id = 'form:panel']"); + panel.click(); + } + } Added: trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceRendererTestBase.java =================================================================== --- trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceRendererTestBase.java (rev 0) +++ trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceRendererTestBase.java 2010-10-27 12:17:48 UTC (rev 19682) @@ -0,0 +1,38 @@ +package org.richfaces.renderkit; + +import java.io.File; +import java.io.IOException; +import java.net.URISyntaxException; + +import org.jboss.test.faces.htmlunit.HtmlUnitEnvironment; +import org.richfaces.renderkit.html.RendererTestBase; +import org.xml.sax.SAXException; + +public abstract class InplaceRendererTestBase extends RendererTestBase { + + public static String EDIT = "Edit"; + + public static String WITH_CONTROLS = "WithControls"; + + public static String DEFAULT = "Default"; + + @Override + public void setUp() throws URISyntaxException { + environment = new HtmlUnitEnvironment(); + environment.withWebRoot(new File(this.getClass().getResource(".").toURI())); + environment.withResource("/WEB-INF/faces-config.xml", "org/richfaces/renderkit/faces-config.xml"); + environment.start(); + } + + public void doTestDefaultEncode(String pageName, String baseId) throws IOException, SAXException { + doTest(pageName,(pageName + DEFAULT), (baseId + DEFAULT)); + } + + public void doTestDefaultWithControlsEncode(String pageName, String baseId) throws IOException, SAXException { + doTest(pageName, (pageName + WITH_CONTROLS), (baseId + WITH_CONTROLS)); + } + + public void doTestEditEncode(String pageName, String baseId) throws IOException, SAXException { + doTest(pageName, (pageName + EDIT), (baseId + EDIT)); + } +} Added: trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceSelectRendererTest.java =================================================================== --- trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceSelectRendererTest.java (rev 0) +++ trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceSelectRendererTest.java 2010-10-27 12:17:48 UTC (rev 19682) @@ -0,0 +1,95 @@ +package org.richfaces.renderkit; + + + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + + + +import java.io.IOException; + +import org.junit.Test; +import org.xml.sax.SAXException; + +import com.gargoylesoftware.htmlunit.html.HtmlElement; +import com.gargoylesoftware.htmlunit.html.HtmlForm; +import com.gargoylesoftware.htmlunit.html.HtmlPage; + + +/** + * @author abelevich + * + */ +public class InplaceSelectRendererTest extends InplaceRendererTestBase { + + + public static final String PAGE_NAME = "inplaceSelectTest"; + + public static final String BASE_ID = "form:inplaceSelect"; + + + @Test + public void testDefaultEncode() throws IOException, SAXException { + doTestDefaultEncode(PAGE_NAME, BASE_ID); + } + + @Test + public void testDefaultWithControlsEncode() throws IOException, SAXException { + doTestDefaultWithControlsEncode(PAGE_NAME, BASE_ID); + } + + @Test + public void testEditEncode() throws IOException, SAXException { + doTestEditEncode(PAGE_NAME, BASE_ID); + } + + @Test + public void testEdit() throws Exception { + HtmlPage page = environment.getPage("/inplaceSelectTest.jsf"); + String defaultComponentId = BASE_ID + DEFAULT; + edit(page, defaultComponentId, 2); + + HtmlElement input = page.getFirstByXPath("//*[@id = '" + defaultComponentId + "Input']"); + assertNotNull(input); + + String label = input.getAttribute(HtmlConstants.VALUE_ATTRIBUTE); + assertTrue("Label#3".equals(label)); + } + + private void edit(HtmlPage page, String inplaceSelectId, int selectIndex) throws Exception { + HtmlElement span = page.getFirstByXPath("//*[@id = '" + inplaceSelectId + "']"); + assertNotNull(span); + span.click(); + + HtmlElement edit = page.getFirstByXPath("//*[@id = '" + inplaceSelectId + "Edit']"); + assertNotNull(edit); + assertEquals("rf-is-edit", edit.getAttribute(HtmlConstants.CLASS_ATTRIBUTE)); + + HtmlElement list = page.getFirstByXPath("//*[@id = '" + inplaceSelectId + "List']"); + assertNotNull(list); + assertFalse(list.isDisplayed()); + + span = page.getFirstByXPath("//*[@id = '" + inplaceSelectId + "']"); + assertNotNull(span); + span.click(); + + list = page.getFirstByXPath("//*[@id = '" + inplaceSelectId + "List']"); + assertNotNull(list); + assertTrue(list.isDisplayed()); + + HtmlElement item = page.getFirstByXPath("//*[@id = '" + inplaceSelectId + "Item"+selectIndex+"']"); + assertNotNull(item); + item.click(); + + list = page.getFirstByXPath("//*[@id = '" + inplaceSelectId + "List']"); + assertNotNull(list); + assertFalse(list.isDisplayed()); + } + + + public void TestEditWithControls() { + } +} Added: trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/InputBean.java =================================================================== --- trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/InputBean.java (rev 0) +++ trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/InputBean.java 2010-10-27 12:17:48 UTC (rev 19682) @@ -0,0 +1,39 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.renderkit; + + +public class InputBean { + + private String value; + + public InputBean() { + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} Added: trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/SelectBean.java =================================================================== --- trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/SelectBean.java (rev 0) +++ trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/SelectBean.java 2010-10-27 12:17:48 UTC (rev 19682) @@ -0,0 +1,17 @@ +package org.richfaces.renderkit; + +public class SelectBean { + + private String value; + + public SelectBean() { + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} Added: trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/html/IgnoreScriptsContent.java =================================================================== --- trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/html/IgnoreScriptsContent.java (rev 0) +++ trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/html/IgnoreScriptsContent.java 2010-10-27 12:17:48 UTC (rev 19682) @@ -0,0 +1,55 @@ +/** + * 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 + */ + +/* + * + */ + + + +// Remove after test moved to the test-jsf project + +package org.richfaces.renderkit.html; + +import org.custommonkey.xmlunit.Difference; +import org.custommonkey.xmlunit.DifferenceConstants; +import org.custommonkey.xmlunit.DifferenceListener; +import org.w3c.dom.Node; + +/** + * @author akolonitsky + * @since Oct 22, 2010 + */ +public class IgnoreScriptsContent implements DifferenceListener { + + public int differenceFound(Difference difference) { + if (DifferenceConstants.TEXT_VALUE_ID == difference.getId() + && !"script".equalsIgnoreCase(difference.getTestNodeDetail().getNode().getLocalName())) { + + return RETURN_IGNORE_DIFFERENCE_NODES_SIMILAR; + } + return RETURN_ACCEPT_DIFFERENCE; + } + + public void skippedComparison(Node node, Node node1) { + + } +} Added: trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/html/RendererTestBase.java =================================================================== --- trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/html/RendererTestBase.java (rev 0) +++ trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/html/RendererTestBase.java 2010-10-27 12:17:48 UTC (rev 19682) @@ -0,0 +1,102 @@ +/** + * 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.renderkit.html; +/* + * Remove after test moved to the test-jsf project + * + */ + +import com.gargoylesoftware.htmlunit.html.HtmlElement; +import com.gargoylesoftware.htmlunit.html.HtmlPage; +import org.custommonkey.xmlunit.Diff; +import org.custommonkey.xmlunit.XMLUnit; +import org.jboss.test.faces.htmlunit.HtmlUnitEnvironment; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.xml.sax.SAXException; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.StringReader; +import java.net.URISyntaxException; + +import static org.junit.Assert.assertNotNull; + +/** + * @author akolonitsky + * @since Oct 22, 2010 + */ +public abstract class RendererTestBase { + + static { + XMLUnit.setNormalizeWhitespace(true); + XMLUnit.setIgnoreDiffBetweenTextAndCDATA(true); + XMLUnit.setIgnoreWhitespace(true); + XMLUnit.setIgnoreComments(true); + } + + protected HtmlUnitEnvironment environment; + + @Before + public void setUp() throws URISyntaxException { + environment = new HtmlUnitEnvironment(); + environment.withWebRoot(new File(this.getClass().getResource(".").toURI())); + environment.start(); + } + + @After + public void tearDown() { + environment.release(); + environment = null; + } + + protected void doTest(String pageName, String pageElementToTest) throws IOException, SAXException { + doTest(pageName, null, pageElementToTest); + } + + protected void doTest(String pageName, String xmlunitPageName, String pageElementToTest) throws IOException, SAXException { + HtmlPage page = environment.getPage('/' + pageName + ".jsf"); + HtmlElement panel = page.getElementById(pageElementToTest); + assertNotNull(panel); + + checkXmlStructure(pageName, xmlunitPageName, panel.asXml()); + } + + protected void checkXmlStructure(String pageName, String xmlunitPageName, String pageCode) throws SAXException, IOException { + if(xmlunitPageName == null) { + xmlunitPageName = pageName + ".xmlunit.xml"; + } + InputStream expectedPageCode = this.getClass().getResourceAsStream(xmlunitPageName + ".xmlunit.xml"); + if (expectedPageCode == null) { + return; + } + + Diff xmlDiff = new Diff(new StringReader(pageCode), new InputStreamReader(expectedPageCode)); + xmlDiff.overrideDifferenceListener(new IgnoreScriptsContent()); + Assert.assertTrue("XML was not similar:" + xmlDiff.toString(), xmlDiff.similar()); + } + +} Modified: trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/faces-config.xml =================================================================== --- trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/faces-config.xml 2010-10-27 09:56:19 UTC (rev 19681) +++ trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/faces-config.xml 2010-10-27 12:17:48 UTC (rev 19682) @@ -6,9 +6,15 @@ version="2.0"> <managed-bean> - <managed-bean-name>dataBean</managed-bean-name> - <managed-bean-class>org.richfaces.renderkit.DataBean</managed-bean-class> + <managed-bean-name>inputBean</managed-bean-name> + <managed-bean-class>org.richfaces.renderkit.InputBean</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> </managed-bean> + + <managed-bean> + <managed-bean-name>selectBean</managed-bean-name> + <managed-bean-class>org.richfaces.renderkit.SelectBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> </faces-config> \ No newline at end of file Modified: trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTest.xhtml =================================================================== --- trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTest.xhtml 2010-10-27 09:56:19 UTC (rev 19681) +++ trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTest.xhtml 2010-10-27 12:17:48 UTC (rev 19682) @@ -12,13 +12,25 @@ <h:body> <h:form id="form"> - <in:inplaceInput id="input_default" value="#{dataBean.value}"/> - - <in:inplaceInput id="input_controls" showControls="true" value="#{dataBean.value}"/> - - <in:inplaceInput id="input_edit" state="edit" showControls="true" value="#{dataBean.value}"/> - - <h:panelGroup id="panel"> + <h:panelGroup id="one" layout="block"> + <in:inplaceInput id="inplaceInputDefault" defaultLabel="Edit Text" value="#{inputBean.value}"/> + </h:panelGroup> + <br/> + <br/> + <br/> + <h:panelGroup id="two" layout="block"> + <in:inplaceInput id="inplaceInputWithControls" defaultLabel="Edit Text" showControls="true" value="#{inputBean.value}"/> + </h:panelGroup> + <br/> + <br/> + <br/> + <h:panelGroup id="three" layout="block"> + <in:inplaceInput id="inplaceInputEdit" defaultLabel="Edit Text" state="edit" showControls="true" value="#{inputBean.value}"/> + </h:panelGroup> + <br/> + <br/> + <br/> + <h:panelGroup id="panel" layout="block"> <!-- click here for blur --> </h:panelGroup> </h:form> Added: trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestDefault.xmlunit.xml =================================================================== --- trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestDefault.xmlunit.xml (rev 0) +++ trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestDefault.xmlunit.xml 2010-10-27 12:17:48 UTC (rev 19682) @@ -0,0 +1,13 @@ +<span class="rf-ii-d-s" id="form:inplaceInputDefault"> + <span class="rf-ii-lbl" id="form:inplaceInputDefaultLabel">Edit Text</span> + <input class="rf-ii-none" id="form:inplaceInputDefaultFocus" + style="position: absolute; top: 0px; left: 0px; outline-style: none;" + type="image" /> + <span class="rf-ii-edit rf-ii-none" id="form:inplaceInputDefaultEdit"> + <input autocomplete="off" class="rf-ii-fld" id="form:inplaceInputDefaultInput" + name="form:inplaceInputDefault" style="width: 100%;" type="text" /> + </span> + <script type="text/javascript"> + //ignored + </script> +</span> Added: trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestEdit.xmlunit.xml =================================================================== --- trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestEdit.xmlunit.xml (rev 0) +++ trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestEdit.xmlunit.xml 2010-10-27 12:17:48 UTC (rev 19682) @@ -0,0 +1,36 @@ +<span class="rf-ii-d-s rf-ii-e-s" id="form:inplaceInputEdit"> + <span class="rf-ii-lbl" id="form:inplaceInputEditLabel">Edit Text</span> + <input class="rf-ii-none" id="form:inplaceInputEditFocus" + style="position: absolute; top: 0px; left: 0px; outline-style: none;" + type="image" /> + <span class="rf-ii-edit" id="form:inplaceInputEditEdit"> + <input autocomplete="off" class="rf-ii-fld" id="form:inplaceInputEditInput" + name="form:inplaceInputEdit" style="width: 100%;" type="text" /> + <span class="rf-ii-btn-prepos"> + <span class="rf-ii-btn-pos"> + <span class="rf-ii-btn-shadow" id="form:inplaceInputEditBtnshadow"> + <span class="rf-ii-btn-shdw-t"></span> + <span class="rf-ii-btn-shdw-l"></span> + <span class="rf-ii-btn-shdw-r"></span> + <span class="rf-ii-btn-shdw-b"></span> + <span id="form:inplaceInputEditBtn" style="position : relative"> + <input class="rf-ii-btn" id="form:inplaceInputEditOkbtn" + onmousedown="this.className='rf-ii-btn-p'" onmouseout="this.className='rf-ii-btn'" + onmouseup="this.className='rf-ii-btn'" + src="/javax.faces.resource/org.richfaces/ico_ok.gif.jsf" + type="image" /> + <input class="rf-ii-btn" id="form:inplaceInputEditCancelbtn" + onmousedown="this.className='rf-ii-btn-press'" onmouseout="this.className='rf-ii-btn'" + onmouseup="this.className='rf-ii-btn'" + src="/javax.faces.resource/org.richfaces/ico_cancel.gif.jsf" + type="image" /> + <br /> + </span> + </span> + </span> + </span> + </span> + <script type="text/javascript"> + // ignored + </script> +</span> \ No newline at end of file Added: trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestWithControls.xmlunit.xml =================================================================== --- trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestWithControls.xmlunit.xml (rev 0) +++ trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestWithControls.xmlunit.xml 2010-10-27 12:17:48 UTC (rev 19682) @@ -0,0 +1,37 @@ +<span class="rf-ii-d-s" id="form:inplaceInputWithControls"> + <span class="rf-ii-lbl" id="form:inplaceInputWithControlsLabel">Edit Text</span> + <input class="rf-ii-none" id="form:inplaceInputWithControlsFocus" + style="position: absolute; top: 0px; left: 0px; outline-style: none;" + type="image" /> + <span class="rf-ii-edit rf-ii-none" id="form:inplaceInputWithControlsEdit"> + <input autocomplete="off" class="rf-ii-fld" + id="form:inplaceInputWithControlsInput" name="form:inplaceInputWithControls" + style="width: 100%;" type="text" /> + <span class="rf-ii-btn-prepos"> + <span class="rf-ii-btn-pos"> + <span class="rf-ii-btn-shadow" id="form:inplaceInputWithControlsBtnshadow"> + <span class="rf-ii-btn-shdw-t"></span> + <span class="rf-ii-btn-shdw-l"></span> + <span class="rf-ii-btn-shdw-r"></span> + <span class="rf-ii-btn-shdw-b"></span> + <span id="form:inplaceInputWithControlsBtn" style="position : relative"> + <input class="rf-ii-btn" id="form:inplaceInputWithControlsOkbtn" + onmousedown="this.className='rf-ii-btn-p'" onmouseout="this.className='rf-ii-btn'" + onmouseup="this.className='rf-ii-btn'" + src="/javax.faces.resource/org.richfaces/ico_ok.gif.jsf" + type="image" /> + <input class="rf-ii-btn" id="form:inplaceInputWithControlsCancelbtn" + onmousedown="this.className='rf-ii-btn-press'" onmouseout="this.className='rf-ii-btn'" + onmouseup="this.className='rf-ii-btn'" + src="/javax.faces.resource/org.richfaces/ico_cancel.gif.jsf" + type="image" /> + <br /> + </span> + </span> + </span> + </span> + </span> + <script type="text/javascript"> + //ignored + </script> +</span> \ No newline at end of file Added: trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTest.xhtml =================================================================== --- trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTest.xhtml (rev 0) +++ trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTest.xhtml 2010-10-27 12:17:48 UTC (rev 19682) @@ -0,0 +1,41 @@ +<!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:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:in="http://richfaces.org/input"> +<f:view contentType="text/html" /> + +<h:head> + <title>Richfaces InplaceSelect</title> +</h:head> +<h:body> + <h:form id="form"> + <h:panelGroup id="example" layout="block"> + <in:inplaceSelect id="inplaceSelectDefault" defaultLabel="Edit Text" value="#{selectBean.value}"> + <f:selectItem itemLabel="Label#1" itemValue="Value#1" /> + <f:selectItem itemLabel="Label#2" itemValue="Value#2" /> + <f:selectItem itemLabel="Label#3" itemValue="Value#3" /> + <f:selectItem itemLabel="Label#4" itemValue="Value#4" /> + </in:inplaceSelect> + <in:inplaceSelect id="inplaceSelectWithControls" showControls="true" defaultLabel="Edit Text" value="#{selectBean.value}"> + <f:selectItem itemLabel="Label#1" itemValue="Value#1" /> + <f:selectItem itemLabel="Label#2" itemValue="Value#2" /> + <f:selectItem itemLabel="Label#3" itemValue="Value#3" /> + <f:selectItem itemLabel="Label#4" itemValue="Value#4" /> + </in:inplaceSelect> + <in:inplaceSelect id="inplaceSelectEdit" state="edit" showControls="true" defaultLabel="Edit Text" value="#{selectBean.value}"> + <f:selectItem itemLabel="Label#1" itemValue="Value#1" /> + <f:selectItem itemLabel="Label#2" itemValue="Value#2" /> + <f:selectItem itemLabel="Label#3" itemValue="Value#3" /> + <f:selectItem itemLabel="Label#4" itemValue="Value#4" /> + </in:inplaceSelect> + <h:panelGroup id="out" layout="block"> + <h:outputText id="inplaceSelectValue" + value="Entered Value: #{selectBean.value}" /> + </h:panelGroup> + </h:panelGroup> + + </h:form> +</h:body> +</html> \ No newline at end of file Added: trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestDefault.xmlunit.xml =================================================================== --- trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestDefault.xmlunit.xml (rev 0) +++ trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestDefault.xmlunit.xml 2010-10-27 12:17:48 UTC (rev 19682) @@ -0,0 +1,39 @@ +<span class="rf-is-d-s" id="form:inplaceSelectDefault"> + <span class="rf-is-lbl" id="form:inplaceSelectDefaultLabel">Edit Text</span> + <input class="rf-is-none" id="form:inplaceSelectDefaultFocus" + style="position: absolute; top: 0px; left: 0px; outline-style: none;" + type="image" /> + <span class="rf-is-edit rf-is-none" id="form:inplaceSelectDefaultEdit"> + <input id="form:inplaceSelectDefaultselValue" name="form:inplaceSelectDefault" + type="hidden" value="Edit Text" /> + <input autocomplete="off" class="rf-is-fld" id="form:inplaceSelectDefaultInput" + readonly="readonly" style="width: ;" type="text" /> + <span class="rf-is-lst-cord" id="form:inplaceSelectDefaultList" + style="display: none"> + <span class="rf-is-lst-pos" style="width: 250px"> + <span class="rf-is-shdw"> + <span class="rf-is-shdw-t"></span> + <span class="rf-is-shdw-l"></span> + <span class="rf-is-shdw-r"></span> + <span class="rf-is-shdw-b"></span> + <span class="rf-is-lst-dec"> + <span class="rf-is-lst-scrl" id="form:inplaceSelectDefaultItems" + style="height: 100px"> + <span id="form:inplaceSelectDefaultItem0" class="rf-is-opt">Label#1 + </span> + <span id="form:inplaceSelectDefaultItem1" class="rf-is-opt">Label#2 + </span> + <span id="form:inplaceSelectDefaultItem2" class="rf-is-opt">Label#3 + </span> + <span id="form:inplaceSelectDefaultItem3" class="rf-is-opt">Label#4 + </span> + </span> + </span> + </span> + </span> + </span> + </span> + <script type="text/javascript"> + //ignored + </script> +</span> Added: trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml =================================================================== --- trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml (rev 0) +++ trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml 2010-10-27 12:17:48 UTC (rev 19682) @@ -0,0 +1,58 @@ +<span class="rf-is-d-s rf-is-e-s" id="form:inplaceSelectEdit"> + <span class="rf-is-lbl" id="form:inplaceSelectEditLabel">Edit Text</span> + <input class="rf-is-none" id="form:inplaceSelectEditFocus" + style="position: absolute; top: 0px; left: 0px; outline-style: none;" + type="image" /> + <span class="rf-is-edit" id="form:inplaceSelectEditEdit"> + <input id="form:inplaceSelectEditselValue" name="form:inplaceSelectEdit" + type="hidden" value="Edit Text" /> + <input autocomplete="off" class="rf-is-fld" id="form:inplaceSelectEditInput" + readonly="readonly" style="width: ;" type="text" /> + <span class="rf-is-btn-prepos"> + <span class="rf-is-btn-pos"> + <span class="rf-is-shdw" id="form:inplaceSelectEditBtnshadow"> + <span class="rf-is-shdw-t"></span> + <span class="rf-is-shdw-l"></span> + <span class="rf-is-shdw-r"></span> + <span class="rf-is-shdw-b"></span> + <span id="form:inplaceSelectEditBtn" style="position : relative;"> + <input class="rf-is-btn" id="form:inplaceSelectEditOkbtn" + onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" + onmouseup="this.className='rf-is-btn'" + src="/javax.faces.resource/org.richfaces/ico_ok.gif.jsf" + type="image" /> + <input class="rf-is-btn" id="form:inplaceSelectEditCancelbtn" + onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" + onmouseup="this.className='rf-is-btn'" + src="/javax.faces.resource/org.richfaces/ico_cancel.gif.jsf" + type="image" /> + <br /> + </span> + </span> + </span> + </span> + <span class="rf-is-lst-cord" id="form:inplaceSelectEditList" + style="display: none"> + <span class="rf-is-lst-pos" style="width: 250px"> + <span class="rf-is-shdw"> + <span class="rf-is-shdw-t"></span> + <span class="rf-is-shdw-l"></span> + <span class="rf-is-shdw-r"></span> + <span class="rf-is-shdw-b"></span> + <span class="rf-is-lst-dec"> + <span class="rf-is-lst-scrl" id="form:inplaceSelectEditItems" + style="height: 100px"> + <span id="form:inplaceSelectEditItem0" class="rf-is-opt">Label#1</span> + <span id="form:inplaceSelectEditItem1" class="rf-is-opt">Label#2</span> + <span id="form:inplaceSelectEditItem2" class="rf-is-opt">Label#3</span> + <span id="form:inplaceSelectEditItem3" class="rf-is-opt">Label#4</span> + </span> + </span> + </span> + </span> + </span> + </span> + <script type="text/javascript"> + //ignored + </script> +</span> Added: trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml =================================================================== --- trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml (rev 0) +++ trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml 2010-10-27 12:17:48 UTC (rev 19682) @@ -0,0 +1,63 @@ +<span class="rf-is-d-s" id="form:inplaceSelectWithControls"> + <span class="rf-is-lbl" id="form:inplaceSelectWithControlsLabel">Edit Text</span> + <input class="rf-is-none" id="form:inplaceSelectWithControlsFocus" + style="position: absolute; top: 0px; left: 0px; outline-style: none;" + type="image" /> + <span class="rf-is-edit rf-is-none" id="form:inplaceSelectWithControlsEdit"> + <input id="form:inplaceSelectWithControlsselValue" name="form:inplaceSelectWithControls" + type="hidden" value="Edit Text" /> + <input autocomplete="off" class="rf-is-fld" + id="form:inplaceSelectWithControlsInput" readonly="readonly" style="width: ;" + type="text" /> + <span class="rf-is-btn-prepos"> + <span class="rf-is-btn-pos"> + <span class="rf-is-shdw" id="form:inplaceSelectWithControlsBtnshadow"> + <span class="rf-is-shdw-t"></span> + <span class="rf-is-shdw-l"></span> + <span class="rf-is-shdw-r"></span> + <span class="rf-is-shdw-b"></span> + <span id="form:inplaceSelectWithControlsBtn" style="position : relative;"> + <input class="rf-is-btn" id="form:inplaceSelectWithControlsOkbtn" + onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" + onmouseup="this.className='rf-is-btn'" + src="/javax.faces.resource/org.richfaces/ico_ok.gif.jsf" + type="image" /> + <input class="rf-is-btn" id="form:inplaceSelectWithControlsCancelbtn" + onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" + onmouseup="this.className='rf-is-btn'" + src="/javax.faces.resource/org.richfaces/ico_cancel.gif.jsf" + type="image" /> + <br /> + </span> + </span> + </span> + </span> + <span class="rf-is-lst-cord" id="form:inplaceSelectWithControlsList" + style="display: none"> + <span class="rf-is-lst-pos" style="width: 250px"> + <span class="rf-is-shdw"> + <span class="rf-is-shdw-t"></span> + <span class="rf-is-shdw-l"></span> + <span class="rf-is-shdw-r"></span> + <span class="rf-is-shdw-b"></span> + <span class="rf-is-lst-dec"> + <span class="rf-is-lst-scrl" id="form:inplaceSelectWithControlsItems" + style="height: 100px"> + <span id="form:inplaceSelectWithControlsItem0" class="rf-is-opt">Label#1 + </span> + <span id="form:inplaceSelectWithControlsItem1" class="rf-is-opt">Label#2 + </span> + <span id="form:inplaceSelectWithControlsItem2" class="rf-is-opt">Label#3 + </span> + <span id="form:inplaceSelectWithControlsItem3" class="rf-is-opt">Label#4 + </span> + </span> + </span> + </span> + </span> + </span> + </span> + <script type="text/javascript"> + // ignored + </script> +</span> \ No newline at end of file