JBoss Rich Faces SVN: r8281 - in trunk/test-applications/seleniumTest/src: test/java/org/richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-04-29 07:49:41 -0400 (Tue, 29 Apr 2008)
New Revision: 8281
Modified:
trunk/test-applications/seleniumTest/src/main/webapp/pages/simpleTogglePanel/simpleTogglePanel.xhtml
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/SimpleTogglePanelTest.java
Log:
simple toggle panel refactoring
Modified: trunk/test-applications/seleniumTest/src/main/webapp/pages/simpleTogglePanel/simpleTogglePanel.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/src/main/webapp/pages/simpleTogglePanel/simpleTogglePanel.xhtml 2008-04-29 11:43:56 UTC (rev 8280)
+++ trunk/test-applications/seleniumTest/src/main/webapp/pages/simpleTogglePanel/simpleTogglePanel.xhtml 2008-04-29 11:49:41 UTC (rev 8281)
@@ -6,11 +6,12 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets">
-<ui:composition template="../../layout/template.xhtml">
+<ui:composition template="#{templateBean.template}">
<ui:define name="style">
</ui:define>
<ui:define name="component">
+ <h:form id="_form">
<rich:simpleTogglePanel switchType="ajax" id="panel1" label="ajax switchType"
action="#{panelBean.increment}" actionListener="#{panelBean.actionListener}"
opened="false"
@@ -56,9 +57,7 @@
<h:inputText value="#{panelBean.value}" id="_value"></h:inputText>
<h:outputText value="#{panelBean.value2}" id="_value2"></h:outputText>
<br/>
+ </h:form>
</ui:define>
- <ui:define name="description">
- <ui:include src="simpleTogglePanelDescription.xhtml" />
- </ui:define>
</ui:composition>
</html>
\ No newline at end of file
Modified: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/SimpleTogglePanelTest.java
===================================================================
--- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/SimpleTogglePanelTest.java 2008-04-29 11:43:56 UTC (rev 8280)
+++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/SimpleTogglePanelTest.java 2008-04-29 11:49:41 UTC (rev 8281)
@@ -1,110 +1,109 @@
-/**
- * License Agreement.
- *
- * JBoss RichFaces - 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;
-
-import org.ajax4jsf.test.base.RichSeleniumTest;
-import org.ajax4jsf.test.base.SeleniumTestBase;
-import org.testng.Assert;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Parameters;
-import org.testng.annotations.Test;
-
-public class SimpleTogglePanelTest extends SeleniumTestBase implements RichSeleniumTest {
-
- public SimpleTogglePanelTest() {
- super("http", "localhost", "8080");
- }
-
- /**
- * This method are invoking before selenium tests started
- */
- @BeforeTest
- @Parameters( { "browser" })
- public void startSelenium(String browser) {
- super.startSelenium(browser);
- }
-
- /**
- * This method are invoking after selenium tests completed
- */
- @AfterTest
- public void stopSelenium() {
- super.stopSelenium();
- }
-
- @Test
- public void testSimpleTogglePanelComponent() throws Exception {
- renderPage("/faces/pages/simpleTogglePanel/simpleTogglePanel.xhtml");
-
-// _testSimpleTogglePanelComponent(COMPONENT_PREFIX_SIMPLE);
-// _testSimpleTogglePanelComponent(COMPONENT_PREFIX_INSIDE_TABLE);
- }
-
- private void _testSimpleTogglePanelComponent(String parentId) {
- String inputId = parentId + "_value";
- String outputId = parentId + "_value2";
-
- String ajaxHeader = parentId + "panel1_header";
- String serverHeader = parentId + "panel2_header";
- String clientHeader = parentId + "panel3_header";
-
- String ajaxBody = parentId + "panel1_body";
- String serverBody = parentId + "panel2_body";
- String clientBody = parentId + "panel3_body";
-
- clickById(clientHeader);
- Assert.assertTrue(isVisibleById(clientBody));
- clickById(clientHeader);
- Assert.assertFalse(isVisibleById(clientBody));
-
- clickById(ajaxHeader);
- waitForAjaxCompletion(5000);
- AssertValueEquals(inputId, "panel1");
- AssertTextEquals(outputId, "1");
- Assert.assertTrue(isVisibleById(ajaxBody));
-
- clickById(ajaxHeader);
- waitForAjaxCompletion(5000);
- AssertValueEquals(inputId, "panel1");
- AssertTextEquals(outputId, "2");
- Assert.assertFalse(isVisibleById(ajaxBody));
-
- clickById(serverHeader);
- waitForPageToLoad();
- AssertValueEquals(inputId, "panel2");
- AssertTextEquals(outputId, "3");
- Assert.assertTrue(isVisibleById(serverBody));
-
- clickById(serverHeader);
- waitForPageToLoad();
- AssertValueEquals(inputId, "panel2");
- AssertTextEquals(outputId, "4");
- Assert.assertFalse(isVisibleById(serverBody));
- }
-
- public String getTestUrl() {
- return null;
- }
-
-
-}
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces - 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;
+
+import org.ajax4jsf.test.base.RichSeleniumTest;
+import org.ajax4jsf.test.base.SeleniumTestBase;
+import org.ajax4jsf.test.base.Templates;
+import org.testng.Assert;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+public class SimpleTogglePanelTest extends SeleniumTestBase implements RichSeleniumTest {
+
+ public SimpleTogglePanelTest() {
+ super("http", "localhost", "8080");
+ }
+
+ /**
+ * This method are invoking before selenium tests started
+ */
+ @BeforeTest
+ @Parameters( { "browser" })
+ public void startSelenium(String browser) {
+ super.startSelenium(browser);
+ }
+
+ /**
+ * This method are invoking after selenium tests completed
+ */
+ @AfterTest
+ public void stopSelenium() {
+ super.stopSelenium();
+ }
+
+ @Test
+ public void testSimpleTogglePanelComponent() throws Exception {
+ _testSimpleTogglePanelComponent(Templates.SIMPLE);
+ _testSimpleTogglePanelComponent(Templates.DATATABLE);
+ }
+
+ private void _testSimpleTogglePanelComponent(Templates template) {
+ renderPage(getTestUrl(), template);
+ String parentId = getParentId() + "_form:";
+ String inputId = parentId + "_value";
+ String outputId = parentId + "_value2";
+
+ String ajaxHeader = parentId + "panel1_header";
+ String serverHeader = parentId + "panel2_header";
+ String clientHeader = parentId + "panel3_header";
+
+ String ajaxBody = parentId + "panel1_body";
+ String serverBody = parentId + "panel2_body";
+ String clientBody = parentId + "panel3_body";
+
+ clickById(clientHeader);
+ Assert.assertTrue(isVisibleById(clientBody));
+ clickById(clientHeader);
+ Assert.assertFalse(isVisibleById(clientBody));
+
+ clickById(ajaxHeader);
+ waitForAjaxCompletion(5000);
+ AssertValueEquals(inputId, "panel1");
+ AssertTextEquals(outputId, "1");
+ Assert.assertTrue(isVisibleById(ajaxBody));
+
+ clickById(ajaxHeader);
+ waitForAjaxCompletion(5000);
+ AssertValueEquals(inputId, "panel1");
+ AssertTextEquals(outputId, "2");
+ Assert.assertFalse(isVisibleById(ajaxBody));
+
+ clickCommandAndWait(serverHeader);
+ AssertValueEquals(inputId, "panel2");
+ AssertTextEquals(outputId, "3");
+ Assert.assertTrue(isVisibleById(serverBody));
+
+ clickCommandAndWait(serverHeader);
+ AssertValueEquals(inputId, "panel2");
+ AssertTextEquals(outputId, "4");
+ Assert.assertFalse(isVisibleById(serverBody));
+ }
+
+ public String getTestUrl() {
+ return "/faces/pages/simpleTogglePanel/simpleTogglePanel.xhtml";
+ }
+
+
+}
16 years, 8 months
JBoss Rich Faces SVN: r8280 - in trunk/test-applications/seleniumTest/src: main/webapp/pages/panelMenu and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-04-29 07:43:56 -0400 (Tue, 29 Apr 2008)
New Revision: 8280
Modified:
trunk/test-applications/seleniumTest/src/main/webapp/layout/layout.xhtml
trunk/test-applications/seleniumTest/src/main/webapp/pages/panelMenu/panelMenuTest.xhtml
trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/Templates.java
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelMenuTest.java
Log:
Panel Menu test refactoring
Modified: trunk/test-applications/seleniumTest/src/main/webapp/layout/layout.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/src/main/webapp/layout/layout.xhtml 2008-04-29 10:38:06 UTC (rev 8279)
+++ trunk/test-applications/seleniumTest/src/main/webapp/layout/layout.xhtml 2008-04-29 11:43:56 UTC (rev 8280)
@@ -64,7 +64,7 @@
<div id="_Selenium_Test_ControlPoint1" style="display: none;">Control1</div>
<h:panelGrid id="_Selenium_Test_Common_Grid">
<div>
- <b>Status: </b> <input style="border: 0px; color: black" id="_Selenium_Test_Status_Message" />
+ <b>Status: </b> <input style="border: 0px; color: black; width: 500px" id="_Selenium_Test_Status_Message" />
</div>
<br/>
<div>
Modified: trunk/test-applications/seleniumTest/src/main/webapp/pages/panelMenu/panelMenuTest.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/src/main/webapp/pages/panelMenu/panelMenuTest.xhtml 2008-04-29 10:38:06 UTC (rev 8279)
+++ trunk/test-applications/seleniumTest/src/main/webapp/pages/panelMenu/panelMenuTest.xhtml 2008-04-29 11:43:56 UTC (rev 8280)
@@ -6,7 +6,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets">
-<ui:composition template="../../layout/template.xhtml">
+<ui:composition template="#{templateBean.template}">
<ui:define name="style">
.link {margin: 0px 5px}
@@ -15,7 +15,8 @@
margin: 2px;
}
</ui:define>
- <ui:define name="component">
+ <ui:define name="component">
+ <h:form id="_form">
<h:panelGroup layout="block" styleClass="component_div" >
<b>Multiple</b>
<rich:panelMenu id="pMenu" >
@@ -86,9 +87,7 @@
<h:inputText value="#{panelBean.value}" id="_value"></h:inputText>
<h:outputText value="#{panelBean.value2}" id="_value2"></h:outputText>
<br/>
+ </h:form>
</ui:define>
- <ui:define name="description">
- <ui:include src="panelMenuDescription.xhtml" />
- </ui:define>
</ui:composition>
</html>
\ No newline at end of file
Modified: trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/Templates.java
===================================================================
--- trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/Templates.java 2008-04-29 10:38:06 UTC (rev 8279)
+++ trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/Templates.java 2008-04-29 11:43:56 UTC (rev 8280)
@@ -1,6 +1,5 @@
package org.ajax4jsf.test.base;
-import sun.java2d.pipe.SpanShapeRenderer.Simple;
public class Templates {
@@ -31,10 +30,8 @@
public void loadTemplate(SeleniumTestBase test) {
setParentId(test);
- if (!this.equals(SIMPLE)) {
- test.runScript("loadTemplate('" + template + "');", false);
- test.waitForPageToLoad();
- }
+ test.runScript("loadTemplate('" + template + "');", false);
+ test.waitForPageToLoad();
}
public boolean equals(Object obj) {
Modified: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelMenuTest.java
===================================================================
--- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelMenuTest.java 2008-04-29 10:38:06 UTC (rev 8279)
+++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelMenuTest.java 2008-04-29 11:43:56 UTC (rev 8280)
@@ -1,203 +1,224 @@
-package org.richfaces;
-
-import org.ajax4jsf.test.base.RichSeleniumTest;
-import org.ajax4jsf.test.base.SeleniumTestBase;
-import org.testng.Assert;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Parameters;
-import org.testng.annotations.Test;
-
-import com.thoughtworks.selenium.SeleniumException;
-
-public class PanelMenuTest extends SeleniumTestBase implements RichSeleniumTest {
-
- public PanelMenuTest() {
- super("http", "localhost", "8080");
- }
-
- /**
- * This method are invoking before selenium tests started
- */
- @BeforeTest
- @Parameters( { "browser" })
- public void startSelenium(String browser) {
- super.startSelenium(browser);
- }
-
- /**
- * This method are invoking after selenium tests completed
- */
- @AfterTest
- public void stopSelenium() {
- super.stopSelenium();
- }
-
- @Test
- public void testPanelMenuComponent() throws Exception {
- renderPage("/faces/pages/panelMenu/panelMenuTest.xhtml");
-
-// _testPanelMenuComponent(COMPONENT_PREFIX_SIMPLE);
-// _testPanelMenuComponent(COMPONENT_PREFIX_INSIDE_TABLE);
-//
-// _testPanelMenuComponentSingleMode(COMPONENT_PREFIX_SIMPLE);
-// _testPanelMenuComponentSingleMode(COMPONENT_PREFIX_INSIDE_TABLE);
-//
-// _testPanelMenuItemAction(COMPONENT_PREFIX_SIMPLE);
-// _testPanelMenuItemAction(COMPONENT_PREFIX_INSIDE_TABLE);
- }
-
- private void _testPanelMenuComponent(String parentId) {
- String inputId = parentId + "_value";
- String outputId = parentId + "_value2";
-
- String ajaxGroup = "tablehide" + parentId + "pGroup1";
- String serverGroup = "tablehide" + parentId + "pGroup2";
- String clientGroup = "tablehide" + parentId + "pGroup3";
- String disabledGroup = "tablehide" + parentId + "pGroup4";
-
- String ajaxItem = "tablehide" + parentId + "pItem1";
- String serverItem = "tablehide" + parentId + "pItem2";
- String clientItem = "tablehide" + parentId + "pItem3";
- String disabledItem = "tablehide" + parentId + "pItem4";
-
- clickById(ajaxGroup);
- waitForAjaxCompletion();
- AssertValueEquals(inputId, "pGroup1");
- AssertTextEquals(outputId, "1");
- Assert.assertTrue(isVisibleById(ajaxItem));
- Assert.assertFalse(isVisibleById(serverItem));
- Assert.assertFalse(isVisibleById(clientItem));
-
- clickById(serverGroup);
- waitForPageToLoad();
- AssertValueEquals(inputId, "pGroup2");
- AssertTextEquals(outputId, "2");
- Assert.assertTrue(isVisibleById(ajaxItem));
- Assert.assertTrue(isVisibleById(serverItem));
- Assert.assertFalse(isVisibleById(clientItem));
-
- clickById(ajaxGroup);
- waitForAjaxCompletion();
- AssertValueEquals(inputId, "pGroup1");
- AssertTextEquals(outputId, "3");
- Assert.assertFalse(isVisibleById(ajaxItem));
- Assert.assertTrue(isVisibleById(serverItem));
- Assert.assertFalse(isVisibleById(clientItem));
-
- clickById(serverGroup);
- waitForPageToLoad();
- AssertValueEquals(inputId, "pGroup2");
- AssertTextEquals(outputId, "4");
- Assert.assertFalse(isVisibleById(ajaxItem));
- Assert.assertFalse(isVisibleById(serverItem));
- Assert.assertFalse(isVisibleById(clientItem));
-
- clickById(clientGroup);
- Assert.assertFalse(isVisibleById(ajaxItem));
- Assert.assertFalse(isVisibleById(serverItem));
- Assert.assertTrue(isVisibleById(clientItem));
-
- clickById(clientGroup);
- Assert.assertFalse(isVisibleById(ajaxItem));
- Assert.assertFalse(isVisibleById(serverItem));
- Assert.assertFalse(isVisibleById(clientItem));
-
- clickById(disabledGroup);
- Assert.assertFalse(isVisibleById(disabledItem));
- }
-
- private void _testPanelMenuComponentSingleMode(String parentId) {
- String inputId = parentId + "_value";
- String outputId = parentId + "_value2";
-
- String ajaxGroup = "tablehide" + parentId + "pGroup1_single";
- String serverGroup = "tablehide" + parentId + "pGroup2_single";
- String clientGroup = "tablehide" + parentId + "pGroup3_single";
- String disabledGroup = "tablehide" + parentId + "pGroup4_single";
-
- String ajaxItem = "tablehide" + parentId + "pItem1_single";
- String serverItem = "tablehide" + parentId + "pItem2_single";
- String clientItem = "tablehide" + parentId + "pItem3_single";
- String disabledItem = "tablehide" + parentId + "pItem4_single";
-
- clickById(ajaxGroup);
- waitForAjaxCompletion();
- AssertValueEquals(inputId, "pGroup1_single");
- AssertTextEquals(outputId, "1");
- Assert.assertTrue(isVisibleById(ajaxItem));
- Assert.assertFalse(isVisibleById(serverItem));
- Assert.assertFalse(isVisibleById(clientItem));
-
- clickById(serverGroup);
- waitForPageToLoad();
- AssertValueEquals(inputId, "pGroup2_single");
- AssertTextEquals(outputId, "2");
- Assert.assertFalse(isVisibleById(ajaxItem));
- Assert.assertTrue(isVisibleById(serverItem));
- Assert.assertFalse(isVisibleById(clientItem));
-
- clickById(ajaxGroup);
- waitForAjaxCompletion();
- AssertValueEquals(inputId, "pGroup1_single");
- AssertTextEquals(outputId, "3");
- Assert.assertTrue(isVisibleById(ajaxItem));
- Assert.assertFalse(isVisibleById(serverItem));
- Assert.assertFalse(isVisibleById(clientItem));
-
- clickById(serverGroup);
- waitForPageToLoad();
- AssertValueEquals(inputId, "pGroup2_single");
- AssertTextEquals(outputId, "4");
- Assert.assertFalse(isVisibleById(ajaxItem));
- Assert.assertTrue(isVisibleById(serverItem));
- Assert.assertFalse(isVisibleById(clientItem));
-
- clickById(clientGroup);
- Assert.assertFalse(isVisibleById(ajaxItem));
- Assert.assertFalse(isVisibleById(serverItem));
- Assert.assertTrue(isVisibleById(clientItem));
-
- clickById(clientGroup);
- Assert.assertFalse(isVisibleById(ajaxItem));
- Assert.assertFalse(isVisibleById(serverItem));
- Assert.assertFalse(isVisibleById(clientItem));
-
- clickById(disabledGroup);
- Assert.assertFalse(isVisibleById(disabledItem));
- }
-
- private void _testPanelMenuItemAction(String parentId) {
- String inputId = parentId + "_value";
- String outputId = parentId + "_value2";
-
- String group = "tablehide" + parentId + "pGroup1";
- String groupSingle = "tablehide" + parentId + "pGroup1_single";
-
- String item = "tablehide" + parentId + "pItem1";
- String itemSingle = "tablehide" + parentId + "pItem1_single";
-
- clickById(group);
- waitForAjaxCompletion();
- AssertValueEquals(inputId, "pGroup1");
-
- clickById(groupSingle);
- waitForAjaxCompletion();
- AssertValueEquals(inputId, "pGroup1_single");
-
- clickById(item);
- waitForPageToLoad();
- AssertValueEquals(inputId, "pItem1");
- AssertTextEquals(outputId, "1");
-
- clickById(itemSingle);
- waitForPageToLoad();
- AssertValueEquals(inputId, "pItem1_single");
- AssertTextEquals(outputId, "2");
- }
-
- public String getTestUrl() {
- return null;
- }
-
-}
+package org.richfaces;
+
+import org.ajax4jsf.test.base.RichSeleniumTest;
+import org.ajax4jsf.test.base.SeleniumTestBase;
+import org.ajax4jsf.test.base.Templates;
+import org.testng.Assert;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+public class PanelMenuTest extends SeleniumTestBase implements RichSeleniumTest {
+
+ public PanelMenuTest() {
+ super("http", "localhost", "8080");
+ }
+
+ /**
+ * This method are invoking before selenium tests started
+ */
+ @BeforeTest
+ @Parameters( { "browser" })
+ public void startSelenium(String browser) {
+ super.startSelenium(browser);
+ }
+
+ /**
+ * This method are invoking after selenium tests completed
+ */
+ @AfterTest
+ public void stopSelenium() {
+ super.stopSelenium();
+ }
+
+ @Test
+ public void testPanelMenuComponent() throws Exception {
+
+ _testPanelMenuComponent(Templates.SIMPLE);
+ _testPanelMenuComponent(Templates.DATATABLE);
+
+ _testPanelMenuComponentSingleMode(Templates.SIMPLE);
+ _testPanelMenuComponentSingleMode(Templates.DATATABLE);
+
+ _testPanelMenuItemAction(Templates.SIMPLE);
+ _testPanelMenuItemAction(Templates.DATATABLE);
+
+ }
+
+ private void _testPanelMenuComponent(Templates template) {
+ renderPage(getTestUrl(), template);
+ String parentId = getParentId() + "_form:";
+
+ String inputId = parentId + "_value";
+ String outputId = parentId + "_value2";
+
+ String ajaxGroup = "tablehide" + parentId + "pGroup1";
+ String serverGroup = "tablehide" + parentId + "pGroup2";
+ String clientGroup = "tablehide" + parentId + "pGroup3";
+ String disabledGroup = "tablehide" + parentId + "pGroup4";
+
+ String ajaxItem = "tablehide" + parentId + "pItem1";
+ String serverItem = "tablehide" + parentId + "pItem2";
+ String clientItem = "tablehide" + parentId + "pItem3";
+ String disabledItem = "tablehide" + parentId + "pItem4";
+
+ writeStatus("Click on ajax group");
+ clickById(ajaxGroup);
+ waitForAjaxCompletion();
+ AssertValueEquals(inputId, "pGroup1");
+ AssertTextEquals(outputId, "1");
+ Assert.assertTrue(isVisibleById(ajaxItem));
+ Assert.assertFalse(isVisibleById(serverItem));
+ Assert.assertFalse(isVisibleById(clientItem));
+
+ writeStatus("Click on server group");
+ clickCommandAndWait(serverGroup);
+ AssertValueEquals(inputId, "pGroup2");
+ AssertTextEquals(outputId, "2");
+ Assert.assertTrue(isVisibleById(ajaxItem));
+ Assert.assertTrue(isVisibleById(serverItem));
+ Assert.assertFalse(isVisibleById(clientItem));
+
+ writeStatus("Click on ajax group");
+ clickById(ajaxGroup);
+ waitForAjaxCompletion();
+ AssertValueEquals(inputId, "pGroup1");
+ AssertTextEquals(outputId, "3");
+ Assert.assertFalse(isVisibleById(ajaxItem));
+ Assert.assertTrue(isVisibleById(serverItem));
+ Assert.assertFalse(isVisibleById(clientItem));
+
+ writeStatus("Click on server group");
+ clickCommandAndWait(serverGroup);
+
+ AssertValueEquals(inputId, "pGroup2");
+ AssertTextEquals(outputId, "4");
+ Assert.assertFalse(isVisibleById(ajaxItem));
+ Assert.assertFalse(isVisibleById(serverItem));
+ Assert.assertFalse(isVisibleById(clientItem));
+
+ writeStatus("Click on client group");
+ clickById(clientGroup);
+ Assert.assertFalse(isVisibleById(ajaxItem));
+ Assert.assertFalse(isVisibleById(serverItem));
+ Assert.assertTrue(isVisibleById(clientItem));
+
+ writeStatus("Click on client group");
+ clickById(clientGroup);
+ Assert.assertFalse(isVisibleById(ajaxItem));
+ Assert.assertFalse(isVisibleById(serverItem));
+ Assert.assertFalse(isVisibleById(clientItem));
+
+ writeStatus("Click on disabled client group");
+ clickById(disabledGroup);
+ Assert.assertFalse(isVisibleById(disabledItem));
+ }
+
+ private void _testPanelMenuComponentSingleMode(Templates template) {
+ renderPage(getTestUrl(), template);
+ String parentId = getParentId() + "_form:";
+
+ String inputId = parentId + "_value";
+ String outputId = parentId + "_value2";
+
+ String ajaxGroup = "tablehide" + parentId + "pGroup1_single";
+ String serverGroup = "tablehide" + parentId + "pGroup2_single";
+ String clientGroup = "tablehide" + parentId + "pGroup3_single";
+ String disabledGroup = "tablehide" + parentId + "pGroup4_single";
+
+ String ajaxItem = "tablehide" + parentId + "pItem1_single";
+ String serverItem = "tablehide" + parentId + "pItem2_single";
+ String clientItem = "tablehide" + parentId + "pItem3_single";
+ String disabledItem = "tablehide" + parentId + "pItem4_single";
+
+ writeStatus("Click on ajax group");
+ clickById(ajaxGroup);
+ waitForAjaxCompletion();
+ AssertValueEquals(inputId, "pGroup1_single");
+ AssertTextEquals(outputId, "1");
+ Assert.assertTrue(isVisibleById(ajaxItem));
+ Assert.assertFalse(isVisibleById(serverItem));
+ Assert.assertFalse(isVisibleById(clientItem));
+
+ writeStatus("Click on server group");
+ clickCommandAndWait(serverGroup);
+ AssertValueEquals(inputId, "pGroup2_single");
+ AssertTextEquals(outputId, "2");
+ Assert.assertFalse(isVisibleById(ajaxItem));
+ Assert.assertTrue(isVisibleById(serverItem));
+ Assert.assertFalse(isVisibleById(clientItem));
+
+ writeStatus("Click on ajax group");
+ clickById(ajaxGroup);
+ waitForAjaxCompletion();
+ AssertValueEquals(inputId, "pGroup1_single");
+ AssertTextEquals(outputId, "3");
+ Assert.assertTrue(isVisibleById(ajaxItem));
+ Assert.assertFalse(isVisibleById(serverItem));
+ Assert.assertFalse(isVisibleById(clientItem));
+
+ writeStatus("Click on server group");
+ clickCommandAndWait(serverGroup);
+ AssertValueEquals(inputId, "pGroup2_single");
+ AssertTextEquals(outputId, "4");
+ Assert.assertFalse(isVisibleById(ajaxItem));
+ Assert.assertTrue(isVisibleById(serverItem));
+ Assert.assertFalse(isVisibleById(clientItem));
+
+ writeStatus("Click on client group");
+ clickById(clientGroup);
+ Assert.assertFalse(isVisibleById(ajaxItem));
+ Assert.assertFalse(isVisibleById(serverItem));
+ Assert.assertTrue(isVisibleById(clientItem));
+
+ writeStatus("Click on client group");
+ clickById(clientGroup);
+ Assert.assertFalse(isVisibleById(ajaxItem));
+ Assert.assertFalse(isVisibleById(serverItem));
+ Assert.assertFalse(isVisibleById(clientItem));
+
+ writeStatus("Click on disabled client group");
+ clickById(disabledGroup);
+ Assert.assertFalse(isVisibleById(disabledItem));
+ }
+
+ private void _testPanelMenuItemAction(Templates template) {
+ renderPage(getTestUrl(), template);
+ String parentId = getParentId() + "_form:";
+
+ String inputId = parentId + "_value";
+ String outputId = parentId + "_value2";
+
+ String group = "tablehide" + parentId + "pGroup1";
+ String groupSingle = "tablehide" + parentId + "pGroup1_single";
+
+ String item = "tablehide" + parentId + "pItem1";
+ String itemSingle = "tablehide" + parentId + "pItem1_single";
+
+ writeStatus("Click on ajax group");
+ clickById(group);
+ waitForAjaxCompletion();
+ AssertValueEquals(inputId, "pGroup1");
+
+ writeStatus("Click on ajax group");
+ clickById(groupSingle);
+ waitForAjaxCompletion();
+ AssertValueEquals(inputId, "pGroup1_single");
+
+ writeStatus("Click on server group");
+ clickCommandAndWait(item);
+ AssertValueEquals(inputId, "pItem1");
+ AssertTextEquals(outputId, "1");
+
+ writeStatus("Click on server group");
+ clickCommandAndWait(itemSingle);
+ AssertValueEquals(inputId, "pItem1_single");
+ AssertTextEquals(outputId, "2");
+ }
+
+ public String getTestUrl() {
+ return "/faces/pages/panelMenu/panelMenuTest.xhtml";
+ }
+
+}
16 years, 8 months
JBoss Rich Faces SVN: r8278 - trunk/test-applications/jsp/src/main/resources/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-04-29 06:37:08 -0400 (Tue, 29 Apr 2008)
New Revision: 8278
Added:
trunk/test-applications/jsp/src/main/resources/org/richfaces/renderkit/fileUpload.properties
Log:
org.richfaces.renderkit.fileUpload.properties
Copied: trunk/test-applications/jsp/src/main/resources/org/richfaces/renderkit/fileUpload.properties (from rev 8274, trunk/test-applications/jsp/src/main/java/org/richfaces/renderkit/fileUpload.properties)
===================================================================
--- trunk/test-applications/jsp/src/main/resources/org/richfaces/renderkit/fileUpload.properties (rev 0)
+++ trunk/test-applications/jsp/src/main/resources/org/richfaces/renderkit/fileUpload.properties 2008-04-29 10:37:08 UTC (rev 8278)
@@ -0,0 +1,8 @@
+RICH_FILE_UPLOAD_CANCEL_LABEL=\u043E\u0442\u043C\u0435\u043D\u0430
+RICH_FILE_UPLOAD_STOP_LABEL=\u0441\u0442\u043E\u043F
+RICH_FILE_UPLOAD_PROGRESS_LABEL=\u043F\u0440\u043E\u0433\u0440\u0435\u0441\u0441...
+RICH_FILE_UPLOAD_CLEAR_LABEL=\u043E\u0447\u0438\u0441\u0442\u0438\u0442\u044C
+RICH_FILE_UPLOAD_CLEAR_ALL_LABEL=\u043E\u0447\u0438\u0441\u0442\u0438\u0442\u044C \u0432\u0441\u0451
+RICH_FILE_UPLOAD_ENTRY_CANCEL_LABEL=\u043E\u0442\u043C\u0435\u043D\u0430
+RICH_FILE_UPLOAD_ADD_LABEL=\u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0444\u0430\u0439\u043B
+RICH_FILE_UPLOAD_UPLOAD_LABEL=\u0441\u043A\u0430\u0447\u0430\u0442\u044C
16 years, 8 months
JBoss Rich Faces SVN: r8277 - in trunk/test-applications/seleniumTest/src: test/java/org/ajax4jsf/test/base and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-04-29 06:33:06 -0400 (Tue, 29 Apr 2008)
New Revision: 8277
Modified:
trunk/test-applications/seleniumTest/src/main/webapp/pages/panelBar/panelBarTest.xhtml
trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/SeleniumTestBase.java
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelBarTest.java
Log:
Panel Bar test refactoring
Modified: trunk/test-applications/seleniumTest/src/main/webapp/pages/panelBar/panelBarTest.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/src/main/webapp/pages/panelBar/panelBarTest.xhtml 2008-04-29 10:23:35 UTC (rev 8276)
+++ trunk/test-applications/seleniumTest/src/main/webapp/pages/panelBar/panelBarTest.xhtml 2008-04-29 10:33:06 UTC (rev 8277)
@@ -6,11 +6,12 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets">
-<ui:composition template="../../layout/template.xhtml">
+<ui:composition template="#{templateBean.template}">
<ui:define name="style">
.link {margin: 0px 5px}
</ui:define>
<ui:define name="component">
+ <h:form id="_form">
<rich:panelBar id="panelBar" width="300" height="300" >
<rich:panelBarItem id="item1" >
<f:facet name="label">
@@ -36,9 +37,7 @@
<h:commandButton id="button_simple" value="Simple submit" />
<a4j:commandButton id="button_ajax" value="Ajax submit" reRender="panelBar" />
<br/>
+ </h:form>
</ui:define>
- <ui:define name="description">
- <ui:include src="panelBarDescription.xhtml" />
- </ui:define>
</ui:composition>
</html>
\ No newline at end of file
Modified: trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/SeleniumTestBase.java
===================================================================
--- trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/SeleniumTestBase.java 2008-04-29 10:23:35 UTC (rev 8276)
+++ trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/SeleniumTestBase.java 2008-04-29 10:33:06 UTC (rev 8277)
@@ -359,6 +359,15 @@
selenium.click("id=" + id);
checkJSError();
}
+
+ /**
+ * This method should be used for click on command controls instead of 'clickById' method.
+ * @param commandId
+ */
+ public void clickCommandAndWait(String commandId) {
+ selenium.click("id=" + commandId);
+ waitForPageToLoad();
+ }
/**
* Return true if element is visible
Modified: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelBarTest.java
===================================================================
--- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelBarTest.java 2008-04-29 10:23:35 UTC (rev 8276)
+++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelBarTest.java 2008-04-29 10:33:06 UTC (rev 8277)
@@ -1,103 +1,104 @@
-/**
- * License Agreement.
- *
- * JBoss RichFaces - 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;
-
-import org.ajax4jsf.test.base.RichSeleniumTest;
-import org.ajax4jsf.test.base.SeleniumTestBase;
-import org.testng.Assert;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Parameters;
-import org.testng.annotations.Test;
-
-public class PanelBarTest extends SeleniumTestBase implements RichSeleniumTest {
-
-
- public PanelBarTest() {
- super("http", "localhost", "8080");
- }
-
-
- /**
- * This method are invoking before selenium tests started
- */
- @BeforeTest
- @Parameters( { "browser" })
- public void startSelenium(String browser) {
- super.startSelenium(browser);
- }
-
- /**
- * This method are invoking after selenium tests completed
- */
- @AfterTest
- public void stopSelenium() {
- super.stopSelenium();
- }
-
- @Test
- public void testPanelBarComponent() throws Exception {
- renderPage("/faces/pages/panelBar/panelBarTest.xhtml");
-
-// _testPanelBarComponent(COMPONENT_PREFIX_SIMPLE);
-// _testPanelBarComponent(COMPONENT_PREFIX_INSIDE_TABLE);
- }
-
- private void _testPanelBarComponent(String parentId) {
- String label2 = parentId + "label2";
- String label3 = parentId + "label3";
-
- String output1 = parentId + "output1";
- String output2 = parentId + "output2";
- String output3 = parentId + "output3";
-
- String ajaxButton = parentId + "button_ajax";
- String simpleButton = parentId + "button_simple";
-
- clickById(label2);
- Assert.assertFalse(isVisibleById(output1));
- Assert.assertTrue(isVisibleById(output2));
- Assert.assertFalse(isVisibleById(output3));
-
- clickById(simpleButton);
- waitForPageToLoad();
- Assert.assertFalse(isVisibleById(output1));
- Assert.assertTrue(isVisibleById(output2));
- Assert.assertFalse(isVisibleById(output3));
-
- clickById(label3);
- Assert.assertFalse(isVisibleById(output1));
- Assert.assertFalse(isVisibleById(output2));
- Assert.assertTrue(isVisibleById(output3));
-
- clickById(ajaxButton);
- waitForAjaxCompletion();
- Assert.assertFalse(isVisibleById(output1));
- Assert.assertFalse(isVisibleById(output2));
- Assert.assertTrue(isVisibleById(output3));
- }
-
- public String getTestUrl() {
- return null;
- }
-
-}
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces - 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;
+
+import org.ajax4jsf.test.base.RichSeleniumTest;
+import org.ajax4jsf.test.base.SeleniumTestBase;
+import org.ajax4jsf.test.base.Templates;
+import org.testng.Assert;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+public class PanelBarTest extends SeleniumTestBase implements RichSeleniumTest {
+
+
+ public PanelBarTest() {
+ super("http", "localhost", "8080");
+ }
+
+
+ /**
+ * This method are invoking before selenium tests started
+ */
+ @BeforeTest
+ @Parameters( { "browser" })
+ public void startSelenium(String browser) {
+ super.startSelenium(browser);
+ }
+
+ /**
+ * This method are invoking after selenium tests completed
+ */
+ @AfterTest
+ public void stopSelenium() {
+ super.stopSelenium();
+ }
+
+ @Test
+ public void testPanelBarComponent() throws Exception {
+ renderPage("/faces/pages/panelBar/panelBarTest.xhtml");
+ _testPanelBarComponent(Templates.SIMPLE);
+ }
+
+ private void _testPanelBarComponent(Templates template) {
+ renderPage(getTestUrl(), template);
+ String parentId = getParentId() + "_form:";
+
+ String label2 = parentId + "label2";
+ String label3 = parentId + "label3";
+
+ String output1 = parentId + "output1";
+ String output2 = parentId + "output2";
+ String output3 = parentId + "output3";
+
+ String ajaxButton = parentId + "button_ajax";
+ String simpleButton = parentId + "button_simple";
+
+ clickById(label2);
+ Assert.assertFalse(isVisibleById(output1));
+ Assert.assertTrue(isVisibleById(output2));
+ Assert.assertFalse(isVisibleById(output3));
+
+ clickCommandAndWait(simpleButton);
+ Assert.assertFalse(isVisibleById(output1));
+ Assert.assertTrue(isVisibleById(output2));
+ Assert.assertFalse(isVisibleById(output3));
+
+ clickById(label3);
+ Assert.assertFalse(isVisibleById(output1));
+ Assert.assertFalse(isVisibleById(output2));
+ Assert.assertTrue(isVisibleById(output3));
+
+ clickById(ajaxButton);
+ waitForAjaxCompletion();
+ Assert.assertFalse(isVisibleById(output1));
+ Assert.assertFalse(isVisibleById(output2));
+ Assert.assertTrue(isVisibleById(output3));
+ }
+
+ public String getTestUrl() {
+ return "/faces/pages/panelBar/panelBarTest.xhtml";
+ }
+
+}
16 years, 8 months
JBoss Rich Faces SVN: r8276 - in trunk/test-applications/jsp/src/main: java/tree and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2008-04-29 06:23:35 -0400 (Tue, 29 Apr 2008)
New Revision: 8276
Modified:
trunk/test-applications/jsp/src/main/java/rich/Options.java
trunk/test-applications/jsp/src/main/java/tree/Bean.java
trunk/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp
trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp
Log:
+fix tree
+add a4j:log
Modified: trunk/test-applications/jsp/src/main/java/rich/Options.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/rich/Options.java 2008-04-29 10:22:00 UTC (rev 8275)
+++ trunk/test-applications/jsp/src/main/java/rich/Options.java 2008-04-29 10:23:35 UTC (rev 8276)
@@ -25,14 +25,14 @@
private static String [] INPUTNUMBERSLIDER_EVENT = {"onblur", "onchange", "onclick", "ondblclick", "onerror", "onfocus", "onkeydown", "onkeypress", "onkeyup", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup", "onselect", "onslide"};
private static String [] INPUTNUMBERSLIDER_STYLE = {"barClass", "barStyle", "handleClass", "inputClass", "handleSelectedClass", "inputSize", "styleClass", "inputStyle", "tipStyle", "style", "tipClass"};
- private boolean consol;
+ private boolean log;
private boolean reDefault;
private boolean reComponent;
private boolean reProperty;
private boolean reStraightforward;
public Options() {
-
+ log = false;
reDefault = true;
reComponent = true;
reProperty = true;
@@ -66,11 +66,17 @@
this.reDefault = reDefault;
}
- public boolean isConsol() {
- return consol;
+ /**
+ * @return the log
+ */
+ public boolean isLog() {
+ return log;
}
- public void setConsol(boolean consol) {
- this.consol = consol;
+ /**
+ * @param log the log to set
+ */
+ public void setLog(boolean log) {
+ this.log = log;
}
}
Modified: trunk/test-applications/jsp/src/main/java/tree/Bean.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/tree/Bean.java 2008-04-29 10:22:00 UTC (rev 8275)
+++ trunk/test-applications/jsp/src/main/java/tree/Bean.java 2008-04-29 10:23:35 UTC (rev 8276)
@@ -108,17 +108,18 @@
}
public void changeIcons(javax.faces.event.ActionEvent event) {
- if (null == icon) {
+
+ if ("".equals(icon)) {
iconCollapsed = "/pics/header.png";
iconExpanded = "/pics/item.png";
iconLeaf = "/pics/ajax_process.gif";
icon = "/pics/ajax_stoped.gif";
commandButtonCaption = "Set defoult icons";
} else {
- iconCollapsed = null;
- iconExpanded = null;
- iconLeaf = null;
- icon = null;
+ iconCollapsed = "";
+ iconExpanded = "";
+ iconLeaf = "";
+ icon = "";
commandButtonCaption = "Set user icons";
}
}
@@ -169,11 +170,6 @@
UITree tree = getTree(event);
TreeRowKey key = (TreeRowKey) tree.getRowKey();
- Set keys = tree.getAjaxKeys();
- if (keys == null) {
- keys = new HashSet();
- tree.setAjaxKeys(keys);
- }
AjaxContext ajaxCtx = AjaxContext.getCurrentInstance();
FacesContext fctx = FacesContext.getCurrentInstance();
@@ -181,7 +177,7 @@
// Force more than one node to update here:
for (int i = 0; i < 5; i++) {
ListRowKey dirtyKey = new ListRowKey(Integer.toString(i));
- keys.add(dirtyKey);
+ tree.addRequestKey(dirtyKey);
tree.setRowKey(dirtyKey);
ajaxCtx.addComponentToAjaxRender(tree.getParent(), tree.getClientId(fctx));
}
@@ -334,4 +330,5 @@
public void setRenderFacets(boolean renderFacets) {
this.renderFacets = renderFacets;
}
+
}
Modified: trunk/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp 2008-04-29 10:22:00 UTC (rev 8275)
+++ trunk/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp 2008-04-29 10:23:35 UTC (rev 8276)
@@ -35,7 +35,7 @@
<h:column rendered="#{option.reComponent}">
<jsp:include page="${richBean.pathComponent}"/>
</h:column>
-
+ <a4j:log popup="false" rendered="#{option.log}"></a4j:log>
<h:column rendered="#{option.reStraightforward}">
<jsp:include page="${richBean.pathStraightforward}"/>
</h:column>
Modified: trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp 2008-04-29 10:22:00 UTC (rev 8275)
+++ trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp 2008-04-29 10:23:35 UTC (rev 8276)
@@ -7,7 +7,7 @@
<h:panelGrid columns="6" border="1">
<h:panelGrid columns="2">
<h:outputText value="a4j:log"></h:outputText>
- <h:selectBooleanCheckbox value="#{option.consol}" onchange="submit();"></h:selectBooleanCheckbox>
+ <h:selectBooleanCheckbox value="#{option.log}" onchange="submit();"></h:selectBooleanCheckbox>
</h:panelGrid>
<h:panelGrid columns="2">
<h:outputText value="h" />
@@ -18,7 +18,7 @@
<a4j:commandButton value="immediate" immediate="true" reRender="richGridID" style="width : 85px; height : 21px;"></a4j:commandButton>
</h:panelGrid>
<h:panelGrid columns="1">
- <a4j:status startText="WORK!" startStyle="color: red;" stopText="a4j:status"></a4j:status>
+ <a4j:status id="a4jStatusID" startText="WORK!" startStyle="color: red;" stopText="a4j:status"></a4j:status>
</h:panelGrid>
<h:panelGrid columns="1">
<h:panelGrid columns="4">
16 years, 8 months
JBoss Rich Faces SVN: r8275 - trunk/test-applications/jsp/src/main/webapp/FileUpload.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2008-04-29 06:22:00 -0400 (Tue, 29 Apr 2008)
New Revision: 8275
Modified:
trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp
Log:
http://jira.jboss.com/jira/browse/RF-3155?page=all
Modified: trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp 2008-04-29 09:51:25 UTC (rev 8274)
+++ trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp 2008-04-29 10:22:00 UTC (rev 8275)
@@ -5,6 +5,7 @@
<f:subview id="FileUploadSubviewID">
<rich:fileUpload id="fileUploadID"
+ status="a4jStatusID"
uploadData="#{fileUpload.data}"
acceptedTypes="#{fileUpload.acceptedTypes}"
disabled="#{fileUpload.disabled}"
16 years, 8 months
JBoss Rich Faces SVN: r8273 - trunk/test-applications/jsp/src/main/webapp/FileUpload.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2008-04-29 05:38:54 -0400 (Tue, 29 Apr 2008)
New Revision: 8273
Modified:
trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp
Log:
fix
Modified: trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp 2008-04-29 09:15:43 UTC (rev 8272)
+++ trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp 2008-04-29 09:38:54 UTC (rev 8273)
@@ -54,7 +54,6 @@
uploadButtonClassDisabled="#{fileUpload.uploadButtonClassDisabled}"
uploadListClass="#{fileUpload.uploadListClass}"
uploadListClassDisabled="#{fileUpload.uploadListClassDisabled}"
- converter="fileUploadConverter"
immediateUpload="#{fileUpload.immediateUpload}"
locale="ru"
noDuplicate="#{fileUpload.noDuplicate}"
16 years, 8 months