JBoss Rich Faces SVN: r12895 - in trunk/test-applications/realworld2/web/src/main/webapp/includes: panelBar and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2009-03-09 13:53:40 -0400 (Mon, 09 Mar 2009)
New Revision: 12895
Modified:
trunk/test-applications/realworld2/web/src/main/webapp/includes/contextMenu/CMForAlbum.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/contextMenu/CMForShelf.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/panelBar/tree2.xhtml
Log:
Context menu for shelf & albums
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/contextMenu/CMForAlbum.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/contextMenu/CMForShelf.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/panelBar/tree2.xhtml
===================================================================
(Binary files differ)
15 years, 10 months
JBoss Rich Faces SVN: r12894 - in trunk/test-applications/seleniumTest/richfaces/src: main/webapp/WEB-INF and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2009-03-09 13:23:40 -0400 (Mon, 09 Mar 2009)
New Revision: 12894
Added:
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/SuggestionBoxBean.java
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/suggestionBox/
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/suggestionBox/suggestionBoxAutoTest.xhtml
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SuggestionBoxTest.java
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/WEB-INF/faces-config.xml
Log:
https://jira.jboss.org/jira/browse/RF-6237 started
Added: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/SuggestionBoxBean.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/SuggestionBoxBean.java (rev 0)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/SuggestionBoxBean.java 2009-03-09 17:23:40 UTC (rev 12894)
@@ -0,0 +1,93 @@
+package org.ajax4jsf.bean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SuggestionBoxBean {
+
+ private List<Country> countries = new ArrayList<Country>();
+
+ private String countryName;
+
+ public SuggestionBoxBean() {
+ countries.add(new Country("Armenia", "Yerevan", 603628D, 46372700L));
+ countries.add(new Country("Azerbaijan", "Baku", 86600D, 8676000L));
+ countries.add(new Country("Belarus", "Minsk", 207600D, 9689800L));
+ countries.add(new Country("Georgia", "Tbilisi", 69700D, 4630841L));
+ countries.add(new Country("Kazakhstan", "Astana", 2724900D, 15217711L));
+ countries.add(new Country("Kyrgyzstan", "Bishkek", 199900D, 5264000L));
+ countries.add(new Country("Moldova", "Kishinev", 33846D, 4128047L));
+ countries.add(new Country("Russia", "Moscow", 17075400D, 142008838L));
+ countries.add(new Country("Tajikistan", "Dushanbe", 143100D, 6920300L));
+ countries.add(new Country("Turkmenistan", "Ashgabat", 488100D, 5110023L));
+ countries.add(new Country("Ukraine", "Kiev", 603628D, 46372700L));
+ countries.add(new Country("Uzbekistan", "Tashkent", 447400D, 27372000L));
+ }
+
+ public List<Country> getCountries() {
+ return countries;
+ }
+
+ /**
+ * Gets value of countryName field.
+ * @return value of countryName field
+ */
+ public String getCountryName() {
+ return countryName;
+ }
+
+ /**
+ * Set a new value for countryName field.
+ * @param countryName a new value for countryName field
+ */
+ public void setCountryName(String countryName) {
+ this.countryName = countryName;
+ }
+
+ public List<Country> autocomplete(Object suggestion) {
+ String s = (String) suggestion;
+ ArrayList<Country> retVal = new ArrayList<Country>();
+ for (Country country : countries) {
+ // if ("".equals(s) ||
+ // country.getName().toLowerCase().startsWith(s.toLowerCase())) {
+ if (country.getName().matches(".*" + s + ".*")) {
+ retVal.add(country);
+ }
+ }
+ return retVal;
+ }
+
+ /**
+ * Country
+ */
+ public static class Country {
+ private String name;
+ private String capital;
+ private Double area;
+ private Long population;
+
+ public Country(String name, String capital, Double area, Long population) {
+ this.name = name;
+ this.capital = capital;
+ this.area = area;
+ this.population = population;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getCapital() {
+ return capital;
+ }
+
+ public Double getArea() {
+ return area;
+ }
+
+ public Long getPopulation() {
+ return population;
+ }
+ }
+
+}
Property changes on: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/SuggestionBoxBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/WEB-INF/faces-config.xml 2009-03-09 16:28:19 UTC (rev 12893)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/WEB-INF/faces-config.xml 2009-03-09 17:23:40 UTC (rev 12894)
@@ -358,7 +358,12 @@
<managed-bean-name>columnGroupBean</managed-bean-name>
<managed-bean-class>org.ajax4jsf.bean.ColumnGroupBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
- </managed-bean>
+ </managed-bean>
+ <managed-bean>
+ <managed-bean-name>suggestionBean</managed-bean-name>
+ <managed-bean-class>org.ajax4jsf.bean.SuggestionBoxBean</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
<navigation-rule>
<from-view-id>/pages/ajaxInclude/step1.xhtml</from-view-id>
<navigation-case>
Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/suggestionBox/suggestionBoxAutoTest.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/suggestionBox/suggestionBoxAutoTest.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SuggestionBoxTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SuggestionBoxTest.java (rev 0)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SuggestionBoxTest.java 2009-03-09 17:23:40 UTC (rev 12894)
@@ -0,0 +1,53 @@
+package org.richfaces.testng;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.ajax4jsf.template.Template;
+import org.richfaces.AutoTester;
+import org.richfaces.SeleniumTestBase;
+import org.testng.annotations.Test;
+
+public class SuggestionBoxTest extends SeleniumTestBase {
+
+ private static Map<String, String> params = new HashMap<String, String>();
+
+ static {
+ params.put("parameter1", "value1");
+ params.put("parameter2", "value2");
+ params.put("parameter3", "value3");
+ }
+
+ @Test
+ public void testRenderedAttribute(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, null);
+ writeStatus("Test component with rendered = false is not present on the page");
+ tester.testRendered();
+ }
+
+ @Test
+ public void testNestedParams(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, null);
+ writeStatus("Test component encodes nested f:param tags and their values are present as request parameters");
+ tester.testRequestParameters(params);
+ }
+
+ @Override
+ public void sendAjax() {
+ type(getAutoTester(this).getClientId("suggestion"), "Bel");
+ waitForAjaxCompletion();
+ }
+
+ @Override
+ public String getAutoTestUrl() {
+ return "pages/suggestionBox/suggestionBoxAutoTest.xhtml";
+ }
+
+ @Override
+ public String getTestUrl() {
+ return null;
+ }
+
+}
Property changes on: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SuggestionBoxTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
15 years, 10 months
JBoss Rich Faces SVN: r12893 - trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-03-09 12:28:19 -0400 (Mon, 09 Mar 2009)
New Revision: 12893
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/HotKeyTest.java
Log:
RF-6293
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/HotKeyTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/HotKeyTest.java 2009-03-09 16:22:36 UTC (rev 12892)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/HotKeyTest.java 2009-03-09 16:28:19 UTC (rev 12893)
@@ -21,7 +21,8 @@
/**
* Create hotKey component with timing="immediate"
* (or "onload")attribute and check that it works -
- * alpha/numeric/arrows/special(ins/del/pgup/pgdn/home/end)/enter/esc keys
+ * alpha/numeric/arrows/special(ins/del/pgup/pgdn/home/end)/enter/esc keys
+ * and check 'key' attribute
*/
@Test
public void testKeyAttribute(Template template) {
15 years, 10 months
JBoss Rich Faces SVN: r12892 - in trunk/test-applications/seleniumTest/richfaces/src: main/webapp/WEB-INF and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-03-09 12:22:36 -0400 (Mon, 09 Mar 2009)
New Revision: 12892
Added:
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/HotKeyBean.java
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/hotKey/
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/hotKey/hotKey.xhtml
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/HotKeyTest.java
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/WEB-INF/faces-config.xml
Log:
RF-6288
Added: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/HotKeyBean.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/HotKeyBean.java (rev 0)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/HotKeyBean.java 2009-03-09 16:22:36 UTC (rev 12892)
@@ -0,0 +1,18 @@
+package org.ajax4jsf.bean;
+
+public class HotKeyBean {
+
+ private String key;
+
+ public void init() {
+ key = null;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ public String getKey() {
+ return key;
+ }
+}
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/WEB-INF/faces-config.xml 2009-03-09 14:33:16 UTC (rev 12891)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/WEB-INF/faces-config.xml 2009-03-09 16:22:36 UTC (rev 12892)
@@ -186,6 +186,11 @@
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<managed-bean>
+ <managed-bean-name>hotKey</managed-bean-name>
+ <managed-bean-class>org.ajax4jsf.bean.HotKeyBean</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+ <managed-bean>
<managed-bean-name>sliderBean</managed-bean-name>
<managed-bean-class>org.ajax4jsf.bean.InputNumberSliderBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/hotKey/hotKey.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/hotKey/hotKey.xhtml (rev 0)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/hotKey/hotKey.xhtml 2009-03-09 16:22:36 UTC (rev 12892)
@@ -0,0 +1,23 @@
+<!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:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+
+<ui:composition template="#{templateBean.template}">
+ <ui:define name="component">
+ <h:form id="attrForm">
+ <h:outputText value="key" />
+ <h:inputText id="key" value="#{hotKey.key}">
+ <a4j:support event="onchange" reRender="panelGroup"/>
+ </h:inputText>
+ </h:form>
+ <h:panelGroup id="panelGroup">
+ <rich:hotKey key="#{hotKey.key}" handler="document.getElementById('input').value = '#{hotKey.key}'"/>
+ <input id="input" />
+ </h:panelGroup>
+ </ui:define>
+</ui:composition>
+</html>
\ No newline at end of file
Added: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/HotKeyTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/HotKeyTest.java (rev 0)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/HotKeyTest.java 2009-03-09 16:22:36 UTC (rev 12892)
@@ -0,0 +1,97 @@
+package org.richfaces.testng;
+
+import org.ajax4jsf.template.Template;
+import org.richfaces.SeleniumTestBase;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class HotKeyTest extends SeleniumTestBase {
+
+ private String key;
+
+ private String input;
+
+ private void init(Template template) {
+ renderPage(null, template, "#{dataList.init}");
+ String attrForm = getParentId() + "attrForm";
+ key = attrForm + ":key";
+ input = "input";
+ }
+
+ /**
+ * Create hotKey component with timing="immediate"
+ * (or "onload")attribute and check that it works -
+ * alpha/numeric/arrows/special(ins/del/pgup/pgdn/home/end)/enter/esc keys
+ */
+ @Test
+ public void testKeyAttribute(Template template) {
+ init(template);
+
+ String keySequence = "alt+a";
+ selenium.type(key, keySequence);
+ waitForAjaxCompletion();
+ selenium.altKeyDown();
+ selenium.keyDown(input, "a");
+ selenium.altKeyUp();
+ Assert.assertEquals(selenium.getValue(input), keySequence);
+
+ keySequence = "ctrl+1";
+ selenium.type(key, keySequence);
+ waitForAjaxCompletion();
+ selenium.controlKeyDown();
+ selenium.keyDown(input, "1");
+ selenium.controlKeyUp();
+ Assert.assertEquals(selenium.getValue(input), keySequence);
+
+ keySequence = "shift+down";
+ selenium.type(key, keySequence);
+ waitForAjaxCompletion();
+ selenium.shiftKeyDown();
+ selenium.keyDown(input, "\\40");
+ selenium.shiftKeyUp();
+ Assert.assertEquals(selenium.getValue(input), keySequence);
+
+ keySequence = "insert";
+ selenium.type(key, keySequence);
+ waitForAjaxCompletion();
+ selenium.keyDown(input, "\\45");
+ Assert.assertEquals(selenium.getValue(input), keySequence);
+
+ keySequence = "del";
+ selenium.type(key, keySequence);
+ waitForAjaxCompletion();
+ selenium.keyDown(input, "\\46");
+ Assert.assertEquals(selenium.getValue(input), keySequence);
+
+ keySequence = "pageup";
+ selenium.type(key, keySequence);
+ waitForAjaxCompletion();
+ selenium.keyDown(input, "\\33");
+ Assert.assertEquals(selenium.getValue(input), keySequence);
+
+ keySequence = "end";
+ selenium.type(key, keySequence);
+ waitForAjaxCompletion();
+ selenium.keyDown(input, "\\35");
+ Assert.assertEquals(selenium.getValue(input), keySequence);
+
+ keySequence = "return";
+ selenium.type(key, keySequence);
+ waitForAjaxCompletion();
+ selenium.keyDown(input, "\\13");
+ Assert.assertEquals(selenium.getValue(input), keySequence);
+
+ keySequence = "esc";
+ selenium.type(key, keySequence);
+ waitForAjaxCompletion();
+ selenium.keyDown(input, "\\27");
+ Assert.assertEquals(selenium.getValue(input), keySequence);
+
+ }
+
+ @Override
+ public String getTestUrl() {
+ return "pages/hotKey/hotKey.xhtml";
+ }
+
+}
15 years, 10 months
JBoss Rich Faces SVN: r12891 - in trunk/test-applications/realworld2/web/src/main: java/org/richfaces/realworld/navigation and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2009-03-09 10:33:16 -0400 (Mon, 09 Mar 2009)
New Revision: 12891
Added:
trunk/test-applications/realworld2/web/src/main/webapp/includes/album/userAlbumEditBlock.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbumEdit.xhtml
Modified:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java
trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbum.xhtml
Log:
Realworld: add album edit murkup
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-03-09 14:02:08 UTC (rev 12890)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-03-09 14:33:16 UTC (rev 12891)
@@ -37,6 +37,7 @@
import org.richfaces.realworld.domain.Shelf;
import org.richfaces.realworld.domain.User;
import org.richfaces.realworld.fileupload.FileManager;
+import org.richfaces.realworld.navigation.NavigationEnum;
import org.richfaces.realworld.service.Constants;
import org.richfaces.realworld.service.IAlbumAction;
import org.richfaces.realworld.util.ConversationState;
@@ -94,7 +95,8 @@
public void editAlbum(Album album){
albumAction.editAlbum(album);
- conversationState.setSelectedAlbum(album);
+ conversationState.setSelectedAlbum(album);
+ Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_PREVIEW);
Events.instance().raiseEvent("albumEdited");
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java 2009-03-09 14:02:08 UTC (rev 12890)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java 2009-03-09 14:33:16 UTC (rev 12891)
@@ -34,7 +34,8 @@
TAGS("includes/tag.xhtml"),
ALL_ALBUMS("/includes/userAlbums.xhtml"),
ALL_IMAGES("/includes/userImages.xhtml"),
- ALBUM_IMAGE_EDIT("/includes/userImageEdit.xhtml");
+ ALBUM_IMAGE_EDIT("/includes/userImageEdit.xhtml"),
+ ALBUM_EDIT("/includes/userAlbumEdit.xhtml");
private NavigationEnum(String t){
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java 2009-03-09 14:02:08 UTC (rev 12890)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java 2009-03-09 14:33:16 UTC (rev 12891)
@@ -254,12 +254,20 @@
}
public void cancelEditImage(Image image){
- if(!image.getAlbum().isShared() && !image.getAlbum().getOwner().equals(user)){
+ Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_IMAGE_PREVIEW);
+ }
+
+ public void editAlbum(Album album){
+ if(album.getOwner().equals(user)){
Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(HAVENT_ACCESS));
return;
}
- Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_IMAGE_PREVIEW);
+ Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_EDIT);
}
+
+ public void cancelEditAlbum(Album album){
+ Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_PREVIEW);
+ }
public void selectMyAlbums(){
setSelectedAlbum(null);
Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/userAlbumEditBlock.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/userAlbumEditBlock.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbum.xhtml
===================================================================
(Binary files differ)
Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbumEdit.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbumEdit.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
15 years, 10 months
JBoss Rich Faces SVN: r12890 - in trunk/test-applications/realworld2/web/src/main/webapp: layout and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2009-03-09 10:02:08 -0400 (Mon, 09 Mar 2009)
New Revision: 12890
Modified:
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/web.xml
trunk/test-applications/realworld2/web/src/main/webapp/layout/menu.xhtml
Log:
Fix fileUpload ADD button disabling
Modified: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/web.xml 2009-03-09 12:48:17 UTC (rev 12889)
+++ trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/web.xml 2009-03-09 14:02:08 UTC (rev 12890)
@@ -93,6 +93,11 @@
<param-name>facelets.REFRESH_PERIOD</param-name>
<param-value>-1</param-value>
</context-param>
+
+ <context-param>
+ <param-name>org.richfaces.LoadScriptStrategy</param-name>
+ <param-value>ALL</param-value>
+ </context-param>
<servlet>
Modified: trunk/test-applications/realworld2/web/src/main/webapp/layout/menu.xhtml
===================================================================
(Binary files differ)
15 years, 10 months
JBoss Rich Faces SVN: r12889 - in trunk/test-applications/realworld2/web/src/main/webapp/includes: panelBar and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-03-09 08:48:17 -0400 (Mon, 09 Mar 2009)
New Revision: 12889
Added:
trunk/test-applications/realworld2/web/src/main/webapp/includes/contextMenu/CMForShelf.xhtml
Modified:
trunk/test-applications/realworld2/web/src/main/webapp/includes/panelBar/tree2.xhtml
Log:
Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/contextMenu/CMForShelf.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/contextMenu/CMForShelf.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/panelBar/tree2.xhtml
===================================================================
(Binary files differ)
15 years, 10 months
JBoss Rich Faces SVN: r12888 - in trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces: testng and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2009-03-09 07:38:06 -0400 (Mon, 09 Mar 2009)
New Revision: 12888
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelBarTest.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PickListTest.java
Log:
RF-6163
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java 2009-03-08 16:41:16 UTC (rev 12887)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java 2009-03-09 11:38:06 UTC (rev 12888)
@@ -413,7 +413,7 @@
changeValue();
clickSubmit();
- checkValueChangeListener(false);
+ checkValueChangeListener(true);
checkUpdateModel(false);
}
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelBarTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelBarTest.java 2009-03-08 16:41:16 UTC (rev 12887)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelBarTest.java 2009-03-09 11:38:06 UTC (rev 12888)
@@ -26,7 +26,6 @@
import org.ajax4jsf.template.Template;
import org.richfaces.AutoTester;
import org.richfaces.SeleniumTestBase;
-import org.testng.Assert;
import org.testng.annotations.Test;
public class PanelBarTest extends SeleniumTestBase {
@@ -52,28 +51,28 @@
writeStatus("Click on label two. It should be opened.");
clickById(label2);
- Assert.assertFalse(isVisibleById(output1));
- Assert.assertTrue(isVisibleById(output2));
- Assert.assertFalse(isVisibleById(output3));
+ AssertNotVisible(output1);
+ AssertVisible(output2);
+ AssertNotVisible(output3);
writeStatus("Click on simple commandButton. Opened states should not change after page reloaded.");
clickCommandAndWait(simpleButton);
- Assert.assertFalse(isVisibleById(output1));
- Assert.assertTrue(isVisibleById(output2));
- Assert.assertFalse(isVisibleById(output3));
+ AssertNotVisible(output1);
+ AssertVisible(output2);
+ AssertNotVisible(output3);
writeStatus("Click on label three. It should be opened.");
clickById(label3);
- Assert.assertFalse(isVisibleById(output1));
- Assert.assertFalse(isVisibleById(output2));
- Assert.assertTrue(isVisibleById(output3));
+ AssertNotVisible(output1);
+ AssertNotVisible(output2);
+ AssertVisible(output3);
writeStatus("Click on ajax commandButton. Opened states should not change.");
clickById(ajaxButton);
waitForAjaxCompletion();
- Assert.assertFalse(isVisibleById(output1));
- Assert.assertFalse(isVisibleById(output2));
- Assert.assertTrue(isVisibleById(output3));
+ AssertNotVisible(output1);
+ AssertNotVisible(output2);
+ AssertVisible(output3);
}
@Test
@@ -89,7 +88,15 @@
AutoTester tester = getAutoTester(this);
tester.renderPage(template, null);
writeStatus("Test component's form submission with an invalid element in it");
- tester.testSubmitWithExternalValidationFailed();
+ tester.reset();
+ tester.clickLoad();
+
+ tester.setExtrenalValidationFailed();
+ changeValue();
+ tester.clickSubmit();
+
+ tester.checkValueChangeListener(false);
+ tester.checkUpdateModel(false);
}
@Test
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PickListTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PickListTest.java 2009-03-08 16:41:16 UTC (rev 12887)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PickListTest.java 2009-03-09 11:38:06 UTC (rev 12888)
@@ -326,6 +326,14 @@
}
@Test
+ public void testWithExternalValidationFailure(Template template) {
+ AutoTester autoTester = getAutoTester(this);
+ autoTester.renderPage(template, null);
+ writeStatus("Check component in case of external validation failure: valueChangeListeners are invoked, model is not updated");
+ autoTester.testSubmitWithExternalValidationFailed();
+ }
+
+ @Test
public void testI18N(Template template) {
renderPage(I18N_TEST_URL, template, RESET_METHOD);
15 years, 10 months
JBoss Rich Faces SVN: r12887 - trunk/ui/extendedDataTable/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: pkawiak
Date: 2009-03-08 12:41:16 -0400 (Sun, 08 Mar 2009)
New Revision: 12887
Modified:
trunk/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java
Log:
RF-6477: introducing new style class definition for grouping row in extDt
Modified: trunk/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java
===================================================================
--- trunk/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java 2009-03-08 16:40:55 UTC (rev 12886)
+++ trunk/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java 2009-03-08 16:41:16 UTC (rev 12887)
@@ -550,7 +550,7 @@
writer.startElement(HTML.td_ELEM, table);
writer.writeAttribute(HTML.class_ATTRIBUTE,
- "extdt-group-cell", null);
+ "extdt-group-cell rich-extdt-group-cell", null);
writer.writeAttribute("colspan", numberOfColumns, null);
writer.startElement(HTML.SPAN_ELEM, table);
writer.startElement(HTML.IMG_ELEMENT, table);
15 years, 10 months
JBoss Rich Faces SVN: r12886 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: pkawiak
Date: 2009-03-08 12:40:55 -0400 (Sun, 08 Mar 2009)
New Revision: 12886
Modified:
trunk/docs/userguide/en/src/main/docbook/included/extendedDataTable.xml
Log:
RF-6477: updating documentation connected with introducing new style class definition for grouping row in extDt
Modified: trunk/docs/userguide/en/src/main/docbook/included/extendedDataTable.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/extendedDataTable.xml 2009-03-08 12:02:57 UTC (rev 12885)
+++ trunk/docs/userguide/en/src/main/docbook/included/extendedDataTable.xml 2009-03-08 16:40:55 UTC (rev 12886)
@@ -606,6 +606,11 @@
<entry>Defines styles for a column
footer cell</entry>
</row>
+
+ <row>
+ <entry>rich-extdt-group-cell</entry>
+ <entry>Defines styles for a grouping row cell</entry>
+ </row>
</tbody>
</tgroup>
</table>
15 years, 10 months