JBoss Rich Faces SVN: r8556 - trunk/test-applications/facelets/src/main/java/inplaceSelect.
by richfaces-svn-commits＠lists.jboss.org
Author: gmaksimenko
Date: 2008-05-13 11:21:22 -0400 (Tue, 13 May 2008)
New Revision: 8556
Modified:
trunk/test-applications/facelets/src/main/java/inplaceSelect/InplaceSelect.java
Log:
Erase editOnTab attribute
Modified: trunk/test-applications/facelets/src/main/java/inplaceSelect/InplaceSelect.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/inplaceSelect/InplaceSelect.java 2008-05-13 15:15:16 UTC (rev 8555)
+++ trunk/test-applications/facelets/src/main/java/inplaceSelect/InplaceSelect.java 2008-05-13 15:21:22 UTC (rev 8556)
@@ -11,7 +11,6 @@
private String controlsVerticalPosition;
private String defaultLabel;
private String editEvent;
- private boolean editOnTab;
private boolean immediate;
private String listHeight;
private String listWidth;
@@ -44,7 +43,6 @@
listHeight = "150";
showControls = false;
applyFromControlsOnly = false;
- editOnTab = false;
openOnEdit = true;
rendered = true;
immediate = false;
@@ -147,10 +145,6 @@
return applyFromControlsOnly;
}
- public boolean isEditOnTab() {
- return editOnTab;
- }
-
public boolean isImmediate() {
return immediate;
}
@@ -187,10 +181,6 @@
this.editEvent = editEvent;
}
- public void setEditOnTab(boolean editOnTab) {
- this.editOnTab = editOnTab;
- }
-
public void setImmediate(boolean immediate) {
this.immediate = immediate;
}
16 years, 8 months
JBoss Rich Faces SVN: r8555 - in trunk/test-applications/seleniumTest/src: main/webapp/pages/contextMenu and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2008-05-13 11:15:16 -0400 (Tue, 13 May 2008)
New Revision: 8555
Modified:
trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/ContextMenuTestBean.java
trunk/test-applications/seleniumTest/src/main/webapp/pages/contextMenu/contextMenu.xhtml
trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/Templates.java
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/ContextMenuTest.java
Log:
Selenium tests for context menu.
Modified: trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/ContextMenuTestBean.java
===================================================================
--- trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/ContextMenuTestBean.java 2008-05-13 14:38:18 UTC (rev 8554)
+++ trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/ContextMenuTestBean.java 2008-05-13 15:15:16 UTC (rev 8555)
@@ -26,7 +26,12 @@
public class ContextMenuTestBean {
private String value;
- private int value2 = 0;
+ private int value2;
+
+ public ContextMenuTestBean() {
+ value = "";
+ value2 = 0;
+ }
public void actionListener(ActionEvent event) {
this.value = event.getComponent().getId();
@@ -41,7 +46,11 @@
}
public String action() {
- value2++;
+ if (4 == value2 ) {
+ value2 = 1;
+ } else {
+ value2++;
+ }
return null;
}
Modified: trunk/test-applications/seleniumTest/src/main/webapp/pages/contextMenu/contextMenu.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/src/main/webapp/pages/contextMenu/contextMenu.xhtml 2008-05-13 14:38:18 UTC (rev 8554)
+++ trunk/test-applications/seleniumTest/src/main/webapp/pages/contextMenu/contextMenu.xhtml 2008-05-13 15:15:16 UTC (rev 8555)
@@ -9,33 +9,34 @@
<ui:composition template="#{templateBean.template}">
<ui:define name="component">
<h:form id="_form">
- <rich:contextMenu submitMode="server" id="menu_input" attached="false" >
- <rich:menuItem action="#{contextMenuBean.action}"
- value="One" submitMode="ajax"
- actionListener="#{contextMenuBean.actionListener}"
- id="menu1_item1"
- reRender="input,input2" >
- </rich:menuItem>
- <rich:menuSeparator />
- <rich:menuItem action="#{contextMenuBean.action}"
- value="Two"
- actionListener="#{contextMenuBean.actionListener}"
- id="menu1_item2" >
- </rich:menuItem>
- <rich:menuItem action="#{contextMenuBean.action}"
- value="Three"
- actionListener="#{contextMenuBean.actionListener}" >
- </rich:menuItem>
- </rich:contextMenu>
+ <h:inputText id="input" value="#{contextMenuBean.value}" >
+ <rich:contextMenu submitMode="server" id="menu_input" attached="true" event="onclick" >
+ <rich:menuItem action="#{contextMenuBean.action}"
+ value="One" submitMode="ajax"
+ actionListener="#{contextMenuBean.actionListener}"
+ id="menu1_item1"
+ reRender="input,_value2" >
+ </rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem action="#{contextMenuBean.action}"
+ value="Two"
+ actionListener="#{contextMenuBean.actionListener}"
+ id="menu1_item2" >
+ </rich:menuItem>
+ <rich:menuItem action="#{contextMenuBean.action}"
+ value="Three"
+ actionListener="#{contextMenuBean.actionListener}" >
+ </rich:menuItem>
+ </rich:contextMenu>
+ </h:inputText>
- <h:inputText id="input" value="#{contextMenuBean.value}" />
- <h:inputText id="input2" value="#{contextMenuBean.value2}" >
+ <h:inputText id="input2" >
<rich:contextMenu submitMode="server" id="menu_input2" event="onclick" >
<rich:menuItem action="#{contextMenuBean.action}"
value="One" submitMode="ajax"
actionListener="#{contextMenuBean.actionListener}"
id="menu2_item1"
- reRender="input,input2" >
+ reRender="input,_value2" >
</rich:menuItem>
<rich:menuSeparator />
<rich:menuItem action="#{contextMenuBean.action}"
@@ -49,10 +50,7 @@
</rich:menuItem>
</rich:contextMenu>
</h:inputText>
-
- <rich:componentControl event="onclick" attachTo="input" for=":_form:menu_input"
- operation="doShow">
- </rich:componentControl>
+ <h:outputText value="#{contextMenuBean.value2}" id="_value2" />
</h:form>
</ui:define>
<ui:define name="description">
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-05-13 14:38:18 UTC (rev 8554)
+++ trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/Templates.java 2008-05-13 15:15:16 UTC (rev 8555)
@@ -18,7 +18,7 @@
public static Templates DATATABLE = new Templates("dataTable");
- public static Templates MODALPANEL = new Templates("dodalPanel");
+ public static Templates MODALPANEL = new Templates("modalPanel");
private void setParentId(SeleniumTestBase test) {
if ("simple".equals(template)) {
Modified: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/ContextMenuTest.java
===================================================================
--- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/ContextMenuTest.java 2008-05-13 14:38:18 UTC (rev 8554)
+++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/ContextMenuTest.java 2008-05-13 15:15:16 UTC (rev 8555)
@@ -65,19 +65,54 @@
String parentId = getParentId() + "_form:";
String inputId = parentId + "input";
String input2Id = parentId + "input2";
+ String outputId = parentId + "_value2";
String menuId = parentId + "menu_input_menu";
String menu2Id = parentId + "menu_input2_menu";
+ String menu1_item_ajax = parentId + "menu1_item1";
+ String menu1_item_server = parentId + "menu1_item2";
+ String menu2_item_ajax = parentId + "menu2_item1";
+ String menu2_item_server = parentId + "menu2_item2";
+
writeStatus("Click on first input");
clickById(inputId);
Assert.assertTrue(isVisibleById(menuId));
writeStatus("Click on second input");
clickById(input2Id);
+ Assert.assertFalse(isVisibleById(menuId));
Assert.assertTrue(isVisibleById(menu2Id));
- Assert.assertFalse(isVisibleById(menuId));
+ writeStatus("Click on first input again");
+ clickById(inputId);
+ Assert.assertTrue(isVisibleById(menuId));
+ Assert.assertFalse(isVisibleById(menu2Id));
+ writeStatus("Click on ajax item in first menu");
+ clickById(menu1_item_ajax);
+ waitForAjaxCompletion();
+ AssertValueEquals(inputId, "menu1_item1");
+ AssertTextEquals(outputId, "1");
+
+ writeStatus("Click on server item in first menu");
+ clickCommandAndWait(menu1_item_server);
+ AssertValueEquals(inputId, "menu1_item2");
+ AssertTextEquals(outputId, "2");
+
+ writeStatus("Click on second input again");
+ clickById(input2Id);
+ Assert.assertTrue(isVisibleById(menu2Id));
+
+ writeStatus("Click on ajax item in first menu");
+ clickById(menu2_item_ajax);
+ waitForAjaxCompletion();
+ AssertValueEquals(inputId, "menu2_item1");
+ AssertTextEquals(outputId, "3");
+
+ writeStatus("Click on server item in second menu");
+ clickCommandAndWait(menu2_item_server);
+ AssertValueEquals(inputId, "menu2_item2");
+ AssertTextEquals(outputId, "4");
}
public String getTestUrl() {
16 years, 8 months
JBoss Rich Faces SVN: r8554 - Reports/3.2.1 and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: tkuprevich
Date: 2008-05-13 10:38:18 -0400 (Tue, 13 May 2008)
New Revision: 8554
Modified:
trunk/test-applications/qa/Test Reports/3.2.1/DailyReportCR4tkuprevich.xls
trunk/test-applications/qa/Test Reports/3.2.1/QA test report Build RF 3.2.1 CR3.xls
Log:
Modified: trunk/test-applications/qa/Test Reports/3.2.1/DailyReportCR4tkuprevich.xls
===================================================================
(Binary files differ)
Modified: trunk/test-applications/qa/Test Reports/3.2.1/QA test report Build RF 3.2.1 CR3.xls
===================================================================
(Binary files differ)
16 years, 8 months
JBoss Rich Faces SVN: r8553 - trunk/docs/userguide/en/src/main/resources/images.
by richfaces-svn-commits＠lists.jboss.org
Author: atsebro
Date: 2008-05-13 09:43:56 -0400 (Tue, 13 May 2008)
New Revision: 8553
Added:
trunk/docs/userguide/en/src/main/resources/images/separator2.png
Removed:
trunk/docs/userguide/en/src/main/resources/images/separatorClass.png
Log:
RF-3361--Separator line type
Added: trunk/docs/userguide/en/src/main/resources/images/separator2.png
===================================================================
(Binary files differ)
Property changes on: trunk/docs/userguide/en/src/main/resources/images/separator2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/docs/userguide/en/src/main/resources/images/separatorClass.png
===================================================================
(Binary files differ)
16 years, 8 months
JBoss Rich Faces SVN: r8552 - trunk/docs/userguide/en/src/main/docbook/modules.
by richfaces-svn-commits＠lists.jboss.org
Author: atsebro
Date: 2008-05-13 08:24:33 -0400 (Tue, 13 May 2008)
New Revision: 8552
Modified:
trunk/docs/userguide/en/src/main/docbook/modules/RFCidesupport.xml
Log:
JBDS-318--richfaces doc about IDE is wrong
Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCidesupport.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/modules/RFCidesupport.xml 2008-05-13 11:53:08 UTC (rev 8551)
+++ trunk/docs/userguide/en/src/main/docbook/modules/RFCidesupport.xml 2008-05-13 12:24:33 UTC (rev 8552)
@@ -14,12 +14,14 @@
</keywordset>
</chapterinfo>
<title>IDE Support</title>
- <para> RichFaces support is implemented in <ulink url="http://www.jboss.org/tools/index.html">Jboss Tools</ulink>
- and in <ulink url="http://www.redhat.com/developers/rhds/index.html">Jboss Developer Studio 1.0.0 GA</ulink>
- that is a fully packaged <property>IDE</property> that provides full support for Java Server Faces, RichFaces, Facelets, Struts, and other Web technologies.
+ <para>
+ RichFaces support is implemented in
+ <ulink url="http://www.redhat.com/developers/rhds/index.html">JBoss Developer Studio 1.0.0 GA</ulink> and in
+ <ulink url="http://www.jboss.org/tools/index.html">Jboss Tools</ulink>. JBoss Developer Studio is a fully packaged
+ <property>IDE</property> that provides full support for Java Server Faces, RichFaces, Facelets, Struts and other Web technologies.
In addition to this, it seamlessly combines visual and source-oriented development approaches.
- One of the special support feature for <property>RichFaces</property> is that it is available as project "capabilities".
- These project "capabilities" can be added to any existing JSF project to make the project a RichFaces JSF project by automatically adding libraries
- and modifying configuration files as required." </para>
+ One of the special support feature for RichFaces is that it is available as project "capabilitiy"
+ which can be added to any existing JSF project by adding libraries and modifying configuration files as required."
+ </para>
</chapter>
16 years, 8 months
JBoss Rich Faces SVN: r8551 - trunk/framework/impl/src/main/java/org/ajax4jsf/request.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-05-13 07:53:08 -0400 (Tue, 13 May 2008)
New Revision: 8551
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/request/MultipartRequest.java
Log:
RF-3372
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/request/MultipartRequest.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/request/MultipartRequest.java 2008-05-13 11:51:58 UTC (rev 8550)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/request/MultipartRequest.java 2008-05-13 11:53:08 UTC (rev 8551)
@@ -290,23 +290,27 @@
}
private String decodeFileName(String name) {
- String fileName = null;
- StringBuffer buffer = new StringBuffer();
- String[] codes = name.split(";");
- if (codes != null) {
- for (String code : codes) {
- if (code.startsWith("&")) {
- String sCode = code.replaceAll("[&#]*", "");
- Integer iCode = Integer.parseInt(sCode);
- buffer.append(Character.toChars(iCode));
- }else {
- buffer.append(code);
- }
+ String fileName = null;
+ try {
+ StringBuffer buffer = new StringBuffer();
+ String[] codes = name.split(";");
+ if (codes != null) {
+ for (String code : codes) {
+ if (code.startsWith("&")) {
+ String sCode = code.replaceAll("[&#]*", "");
+ Integer iCode = Integer.parseInt(sCode);
+ buffer.append(Character.toChars(iCode));
+ } else {
+ buffer.append(code);
+ }
+ }
+ fileName = buffer.toString();
+ }
+ } catch (Exception e) {
+ fileName = name;
}
- fileName = buffer.toString();
- }
- return fileName;
- }
+ return fileName;
+ }
public void cancel() {
if (parameters != null) {
16 years, 8 months
JBoss Rich Faces SVN: r8550 - in trunk/ui/fileUpload/src/main: templates/org/richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-05-13 07:51:58 -0400 (Tue, 13 May 2008)
New Revision: 8550
Modified:
trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
Log:
RF-3407
Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
===================================================================
--- trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-05-13 11:25:06 UTC (rev 8549)
+++ trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-05-13 11:51:58 UTC (rev 8550)
@@ -116,6 +116,8 @@
fileInput: null,
+ fileName: null,
+
uploadObject: null,
state: FileUploadEntry.INITIALIZED,
@@ -125,6 +127,7 @@
this.uploadObject = uploadObject;
var fileName = JSNode.prototype.xmlEscape($F(this.fileInput));
+ this.fileName = fileName;
var content = FileUploadEntry.template.invoke('getContent', {fileName: fileName, fileEntryWidth: uploadObject.getFileEntryWidth(), className : this.uploadObject.classes.FILE_ENTRY.ENABLED }).join('');
Element.insert(this.uploadObject.items, content);
@@ -558,7 +561,7 @@
if (!this.options.noDuplicate) return true;
var fileName = elt.value;
for (var i = 0; i < this.entries.length; i++) {
- if (fileName == this.entries[i].fileInput.value) {
+ if (fileName == this.entries[i].fileName) {
return false;
}
}
Modified: trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
===================================================================
--- trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2008-05-13 11:25:06 UTC (rev 8549)
+++ trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2008-05-13 11:51:58 UTC (rev 8550)
@@ -59,8 +59,6 @@
<div class="rich-fileupload-list-decor" style="width: #{listWidth}" id="#{clientId}">
<f:call name="utils.encodeBeginFormIfNessesary" />
-<!-- iframe name="ddd" id="#{clientId}_iframe" style="display: none;"/ -->
-
<span style="display: none;">
<jsp:scriptlet>
<![CDATA[
@@ -101,10 +99,6 @@
</div>
</div>
- <!-- todo review -->
-
- <!-- -->
-
<div class="rich-fileupload-button-border" style=" float:right; display: none;">
<div class="rich-fileupload-button rich-fileupload-font #{component.attributes['cleanButtonClass']}" onmouseover="this.className='rich-fileupload-button-light rich-fileupload-font'" onmousedown="this.className='rich-fileupload-button-press rich-fileupload-font'" onmouseup="this.className='rich-fileupload-button rich-fileupload-font'"
onmouseout="this.className='rich-fileupload-button rich-fileupload-font'"
@@ -120,10 +114,8 @@
</tr>
</table>
- <div class="rich-fileupload-list-overflow #{uploadListClass}" style="width: 100%; height: #{listHeight}" id="#{clientId}:fileItems">
+ <div class="rich-fileupload-list-overflow #{uploadListClass}" style="width: 100%; height: #{listHeight}" id="#{clientId}:fileItems"></div>
- </div>
-
<span>
<script type="text/javascript">
FileUpload.CLASSES = {
@@ -188,7 +180,5 @@
</span>
<f:call name="utils.encodeEndFormIfNessesary" />
</div>
-
-
</f:root>
\ No newline at end of file
16 years, 8 months
JBoss Rich Faces SVN: r8549 - trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-05-13 07:25:06 -0400 (Tue, 13 May 2008)
New Revision: 8549
Modified:
trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java
Log:
RF-3384
Modified: trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java
===================================================================
--- trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java 2008-05-13 11:21:47 UTC (rev 8548)
+++ trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java 2008-05-13 11:25:06 UTC (rev 8549)
@@ -507,6 +507,7 @@
"style",
(style != null ? style + ";" : "") + " width: " + width
+ "%;");
+ writer.write(" ");
writer.endElement("div");
}
@@ -538,6 +539,7 @@
writer.startElement(HTML.SPAN_ELEM, component);
writer.writeAttribute(HTML.style_ATTRIBUTE, "display: none;", null);
writer.startElement(HTML.SCRIPT_ELEM, component);
+ writer.writeAttribute(HTML.TYPE_ATTR, "text/javascript", null);
}
/**
16 years, 8 months
JBoss Rich Faces SVN: r8548 - trunk/test-applications/jsp/src/main/webapp/WEB-INF.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2008-05-13 07:21:47 -0400 (Tue, 13 May 2008)
New Revision: 8548
Modified:
trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml
Log:
Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml 2008-05-13 10:30:49 UTC (rev 8547)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml 2008-05-13 11:21:47 UTC (rev 8548)
@@ -9,114 +9,6 @@
<to-view-id>/pages/Div/Div.jsp</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>Spinner</from-outcome>
- <to-view-id>/InputNumberSpinner/InputNumberSpinner.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>Panel</from-outcome>
- <to-view-id>/Panel/Panel.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>Separ</from-outcome>
- <to-view-id>/Separator/Separator.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>Spacer</from-outcome>
- <to-view-id>/Spacer/Spacer.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>sTP</from-outcome>
- <to-view-id>/SimpleTogglePanel/SimpleTogglePanel.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>TabPanel</from-outcome>
- <to-view-id>/TabPanel/TabPanel.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>Suggest</from-outcome>
- <to-view-id>/SuggestionBox/SuggestionBox.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>Paint</from-outcome>
- <to-view-id>/Paint2D/Paint2D.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>Tree</from-outcome>
- <to-view-id>/Tree/Tree.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>Slide</from-outcome>
- <to-view-id>/InputNumberSlider/InputNumberSlider.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>PanelBar</from-outcome>
- <to-view-id>/PanelBar/PanelBar.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>TogglePanel</from-outcome>
- <to-view-id>/TogglePanel/TogglePanel.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>Gmap</from-outcome>
- <to-view-id>/Gmap/Gmap.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>ToolBar</from-outcome>
- <to-view-id>/ToolBar/ToolBar.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>dnd</from-outcome>
- <to-view-id>/DragAndDrop/DragAndDrop.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>DS</from-outcome>
- <to-view-id>/DataScroller/DataScroller.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>DDMenu</from-outcome>
- <to-view-id>/DropDownMenu/DropDownMenu.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>DFS</from-outcome>
- <to-view-id>/DataFilterSlider/DataFilterSlider.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>PanelMenu</from-outcome>
- <to-view-id>/PanelMenu/PanelMenu.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>ModalPanel</from-outcome>
- <to-view-id>/ModalPanel/ModalPanel.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>Tooltip</from-outcome>
- <to-view-id>/Tooltip/Tooltip.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>Calendar</from-outcome>
- <to-view-id>/Calendar/Calendar.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>Message</from-outcome>
- <to-view-id>/Message/Message.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>VirtualEarth</from-outcome>
- <to-view-id>/VirtualEarth/VirtualEarth.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>Effect</from-outcome>
- <to-view-id>/Effect/Effect.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>Insert</from-outcome>
- <to-view-id>/Insert/Insert.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>SDT</from-outcome>
- <to-view-id>/ScrollableDataTable/ScrollableDataTable.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
<from-outcome>RichFaces</from-outcome>
<to-view-id>/pages/Rich/Rich.jsp</to-view-id>
</navigation-case>
@@ -128,10 +20,6 @@
<from-outcome>CustomizePage</from-outcome>
<to-view-id>/CustomizePage/CustomizePage.jsp</to-view-id>
</navigation-case>
- <navigation-case>
- <from-outcome>jQuery</from-outcome>
- <to-view-id>/jQuery/jQuery.jsp</to-view-id>
- </navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>*</from-view-id>
16 years, 8 months
JBoss Rich Faces SVN: r8547 - in trunk/test-applications/seleniumTest/src: main/webapp/WEB-INF and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2008-05-13 06:30:49 -0400 (Tue, 13 May 2008)
New Revision: 8547
Added:
trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/PickListTestBean.java
trunk/test-applications/seleniumTest/src/main/webapp/pages/pickList/
trunk/test-applications/seleniumTest/src/main/webapp/pages/pickList/pickListTest.xhtml
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PickListTest.java
Modified:
trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml
Log:
PickList component test
Added: trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/PickListTestBean.java
===================================================================
--- trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/PickListTestBean.java (rev 0)
+++ trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/PickListTestBean.java 2008-05-13 10:30:49 UTC (rev 8547)
@@ -0,0 +1,110 @@
+package org.ajax4jsf;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.faces.model.SelectItem;
+
+public class PickListTestBean {
+
+ private String copyAllLabel = "MOVE ALL";
+
+ private String copyLabel = "MOVE";
+
+ private String removeLabel = "TAKE AWAY";
+
+ private String removeAllLabel = "TAKE ALL AWAY";
+
+ private List<String> items = Arrays.asList("ZHURIK", "MELESHKO", "LEONTIEV", "KOVAL", "KALYUZHNY", "DUDIK",
+ "KOSTITSYN", "GRABOVSKI");
+
+ private List<SelectItem> options = new ArrayList<SelectItem>();
+
+ private List<String> result = new ArrayList<String>();
+
+ public PickListTestBean() {
+ for (String player : items) {
+ options.add(new SelectItem(player, player));
+ }
+
+ // preselected items
+ result.add(items.get(0));
+ result.add(items.get(1));
+ }
+
+ /**
+ * Gets value of copyAllLabel field.
+ *
+ * @return value of copyAllLabel field
+ */
+ public String getCopyAllLabel() {
+ return copyAllLabel;
+ }
+
+ /**
+ * Gets value of copyLabel field.
+ *
+ * @return value of copyLabel field
+ */
+ public String getCopyLabel() {
+ return copyLabel;
+ }
+
+ /**
+ * Gets value of removeLabel field.
+ *
+ * @return value of removeLabel field
+ */
+ public String getRemoveLabel() {
+ return removeLabel;
+ }
+
+ /**
+ * Gets value of removeAllLabel field.
+ *
+ * @return value of removeAllLabel field
+ */
+ public String getRemoveAllLabel() {
+ return removeAllLabel;
+ }
+
+ /**
+ * Gets value of options field.
+ *
+ * @return value of options field
+ */
+ public List<SelectItem> getOptions() {
+ return options;
+ }
+
+ /**
+ * Set a new value for options field.
+ *
+ * @param options
+ * a new value for options field
+ */
+ public void setOptions(List<SelectItem> options) {
+ this.options = options;
+ }
+
+ /**
+ * Gets value of result field.
+ *
+ * @return value of result field
+ */
+ public List<String> getResult() {
+ return result;
+ }
+
+ /**
+ * Set a new value for result field.
+ *
+ * @param result
+ * a new value for result field
+ */
+ public void setResult(List<String> result) {
+ this.result = result;
+ }
+
+}
Property changes on: trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/PickListTestBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Modified: trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml 2008-05-13 09:36:53 UTC (rev 8546)
+++ trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml 2008-05-13 10:30:49 UTC (rev 8547)
@@ -81,11 +81,15 @@
<managed-bean-name>ddmenuBean</managed-bean-name>
<managed-bean-class>org.ajax4jsf.DropDownMenuTestBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
- </managed-bean>
-
+ </managed-bean>
<managed-bean>
<managed-bean-name>contextMenuBean</managed-bean-name>
<managed-bean-class>org.ajax4jsf.ContextMenuTestBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+ <managed-bean>
+ <managed-bean-name>pickListBean</managed-bean-name>
+ <managed-bean-class>org.ajax4jsf.PickListTestBean</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
</managed-bean>
</faces-config>
\ No newline at end of file
Added: trunk/test-applications/seleniumTest/src/main/webapp/pages/pickList/pickListTest.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/seleniumTest/src/main/webapp/pages/pickList/pickListTest.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PickListTest.java
===================================================================
--- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PickListTest.java (rev 0)
+++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PickListTest.java 2008-05-13 10:30:49 UTC (rev 8547)
@@ -0,0 +1,99 @@
+package org.richfaces;
+
+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 PickListTest extends SeleniumTestBase {
+
+ public PickListTest() {
+ 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 testPickListComponent() throws Exception {
+ _testPickListComponent(Templates.SIMPLE);
+ _testPickListComponent(Templates.DATATABLE);
+ }
+
+ private void _testPickListComponent(Templates template) {
+ renderPage("/faces/pages/pickList/pickListTest.xhtml", template);
+
+ String parentId = getParentId() + "_form:";
+ String pickListId = "pickList";
+ String copyElemId = parentId + pickListId + "discopy";
+ String copyAllElemId = parentId + pickListId + "copyAll";
+ String removeElemId = parentId + pickListId + "disremove";
+ String removeAllElemId = parentId + pickListId + "removeAll";
+
+ writeStatus("Check move controls customized labels");
+
+ AssertTextEquals(copyElemId, "MOVE");
+ AssertTextEquals(copyAllElemId, "MOVE ALL");
+ AssertTextEquals(removeElemId, "TAKE AWAY");
+ AssertTextEquals(removeAllElemId, "TAKE ALL AWAY");
+
+ String destListId = parentId + pickListId + "tlTbody";
+ String srcListId = parentId + pickListId + "tbody";
+
+ writeStatus("Check initial disposition");
+
+ Assert.assertEquals(getNumberOfChildren(srcListId), 6);
+ Assert.assertEquals(getNumberOfChildren(destListId), 2);
+
+ writeStatus("Verify initial selected items.");
+
+ Assert.assertEquals(selenium.getText("dom=selenium.browserbot.getCurrentWindow().$('" + destListId
+ + "').down('tr', 0)"), "ZHURIK");
+ Assert.assertEquals(selenium.getText("dom=selenium.browserbot.getCurrentWindow().$('" + destListId
+ + "').down('tr', 1)"), "MELESHKO");
+
+ writeStatus("Try to select first item and check state thereafter");
+
+ selenium.doubleClick("dom=selenium.browserbot.getCurrentWindow().$('" + srcListId + "').down('tr').down('td')");
+ Assert.assertEquals(getNumberOfChildren(srcListId), 5);
+ Assert.assertEquals(getNumberOfChildren(destListId), 3);
+ Assert.assertEquals(selenium.getText("dom=selenium.browserbot.getCurrentWindow().$('" + destListId
+ + "').down('tr', 2)"), "LEONTIEV");
+
+ }
+
+ /**
+ * Returns number of children for DOM element with given id.
+ * @param elemId DOM element id
+ * @return number of children
+ */
+ private int getNumberOfChildren(String elemId) {
+ int retVal = -1;
+ try {
+ retVal = Integer.parseInt(runScript("dom=selenium.browserbot.getCurrentWindow().$('" + elemId
+ + "').childElements().size()"));
+ } catch (Exception e) {
+ Assert.fail(e.getMessage());
+ }
+
+ return retVal;
+ }
+
+}
Property changes on: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PickListTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
16 years, 8 months