JBoss Rich Faces SVN: r12408 - in trunk/test-applications/realworld/web/src/main/webapp/img: modal and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-01-23 11:51:16 -0500 (Fri, 23 Jan 2009)
New Revision: 12408
Added:
trunk/test-applications/realworld/web/src/main/webapp/img/modal/
trunk/test-applications/realworld/web/src/main/webapp/img/modal/Thumbs.db
trunk/test-applications/realworld/web/src/main/webapp/img/modal/close.png
Log:
Added items remotely
E:\richfaces\test-applications\realworld\web\src\main\webapp\img\icons
E:\richfaces\test-applications\realworld\web\src\main\webapp\img\modal
E:\richfaces\test-applications\realworld\web\src\main\webapp\img\tree
E:\richfaces\test-applications\realworld\web\src\main\webapp\img\ajax
Added: trunk/test-applications/realworld/web/src/main/webapp/img/modal/Thumbs.db
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/img/modal/Thumbs.db
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/test-applications/realworld/web/src/main/webapp/img/modal/close.png
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/img/modal/close.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
16 years, 8 months
JBoss Rich Faces SVN: r12407 - in trunk/test-applications/realworld/web/src/main/webapp/img: icons and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-01-23 11:51:10 -0500 (Fri, 23 Jan 2009)
New Revision: 12407
Added:
trunk/test-applications/realworld/web/src/main/webapp/img/icons/
trunk/test-applications/realworld/web/src/main/webapp/img/icons/Thumbs.db
trunk/test-applications/realworld/web/src/main/webapp/img/icons/arrow.png
trunk/test-applications/realworld/web/src/main/webapp/img/icons/copy.gif
trunk/test-applications/realworld/web/src/main/webapp/img/icons/create_doc.gif
trunk/test-applications/realworld/web/src/main/webapp/img/icons/create_folder.gif
trunk/test-applications/realworld/web/src/main/webapp/img/icons/cut.gif
trunk/test-applications/realworld/web/src/main/webapp/img/icons/delete.gif
trunk/test-applications/realworld/web/src/main/webapp/img/icons/edit.gif
trunk/test-applications/realworld/web/src/main/webapp/img/icons/filter.gif
trunk/test-applications/realworld/web/src/main/webapp/img/icons/find.gif
trunk/test-applications/realworld/web/src/main/webapp/img/icons/message.gif
trunk/test-applications/realworld/web/src/main/webapp/img/icons/open.gif
trunk/test-applications/realworld/web/src/main/webapp/img/icons/paste.gif
trunk/test-applications/realworld/web/src/main/webapp/img/icons/redo.gif
trunk/test-applications/realworld/web/src/main/webapp/img/icons/reload.gif
trunk/test-applications/realworld/web/src/main/webapp/img/icons/repeat.gif
trunk/test-applications/realworld/web/src/main/webapp/img/icons/save.gif
trunk/test-applications/realworld/web/src/main/webapp/img/icons/save_all.gif
trunk/test-applications/realworld/web/src/main/webapp/img/icons/save_as.gif
trunk/test-applications/realworld/web/src/main/webapp/img/icons/undo.gif
trunk/test-applications/realworld/web/src/main/webapp/img/icons/verify.gif
Log:
Added items remotely
E:\richfaces\test-applications\realworld\web\src\main\webapp\img\icons
E:\richfaces\test-applications\realworld\web\src\main\webapp\img\modal
E:\richfaces\test-applications\realworld\web\src\main\webapp\img\tree
E:\richfaces\test-applications\realworld\web\src\main\webapp\img\ajax
Added: trunk/test-applications/realworld/web/src/main/webapp/img/icons/Thumbs.db
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/img/icons/Thumbs.db
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/test-applications/realworld/web/src/main/webapp/img/icons/arrow.png
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/img/icons/arrow.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/test-applications/realworld/web/src/main/webapp/img/icons/copy.gif
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/img/icons/copy.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Added: trunk/test-applications/realworld/web/src/main/webapp/img/icons/create_doc.gif
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/img/icons/create_doc.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Added: trunk/test-applications/realworld/web/src/main/webapp/img/icons/create_folder.gif
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/img/icons/create_folder.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Added: trunk/test-applications/realworld/web/src/main/webapp/img/icons/cut.gif
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/img/icons/cut.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Added: trunk/test-applications/realworld/web/src/main/webapp/img/icons/delete.gif
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/img/icons/delete.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Added: trunk/test-applications/realworld/web/src/main/webapp/img/icons/edit.gif
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/img/icons/edit.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Added: trunk/test-applications/realworld/web/src/main/webapp/img/icons/filter.gif
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/img/icons/filter.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Added: trunk/test-applications/realworld/web/src/main/webapp/img/icons/find.gif
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/img/icons/find.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Added: trunk/test-applications/realworld/web/src/main/webapp/img/icons/message.gif
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/img/icons/message.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Added: trunk/test-applications/realworld/web/src/main/webapp/img/icons/open.gif
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/img/icons/open.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Added: trunk/test-applications/realworld/web/src/main/webapp/img/icons/paste.gif
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/img/icons/paste.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Added: trunk/test-applications/realworld/web/src/main/webapp/img/icons/redo.gif
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/img/icons/redo.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Added: trunk/test-applications/realworld/web/src/main/webapp/img/icons/reload.gif
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/img/icons/reload.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Added: trunk/test-applications/realworld/web/src/main/webapp/img/icons/repeat.gif
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/img/icons/repeat.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Added: trunk/test-applications/realworld/web/src/main/webapp/img/icons/save.gif
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/img/icons/save.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Added: trunk/test-applications/realworld/web/src/main/webapp/img/icons/save_all.gif
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/img/icons/save_all.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Added: trunk/test-applications/realworld/web/src/main/webapp/img/icons/save_as.gif
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/img/icons/save_as.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Added: trunk/test-applications/realworld/web/src/main/webapp/img/icons/undo.gif
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/img/icons/undo.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Added: trunk/test-applications/realworld/web/src/main/webapp/img/icons/verify.gif
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/img/icons/verify.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
16 years, 8 months
JBoss Rich Faces SVN: r12406 - 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-01-23 11:33:36 -0500 (Fri, 23 Jan 2009)
New Revision: 12406
Added:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/panelMenuItem/styleAndClasseStandardHTMLAttributesTest.xhtml
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuItemTest.java
Log:
https://jira.jboss.org/jira/browse/RF-5791
Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/panelMenuItem/styleAndClasseStandardHTMLAttributesTest.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/panelMenuItem/styleAndClasseStandardHTMLAttributesTest.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuItemTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuItemTest.java 2009-01-23 16:11:13 UTC (rev 12405)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuItemTest.java 2009-01-23 16:33:36 UTC (rev 12406)
@@ -5,11 +5,19 @@
import org.ajax4jsf.template.Template;
import org.richfaces.AutoTester;
+import org.richfaces.SeleniumEvent;
import org.richfaces.SeleniumTestBase;
import org.testng.annotations.Test;
public class PanelMenuItemTest extends SeleniumTestBase {
+ private final static String LOOK_AND_FEEL_TEST_URL = "pages/panelMenuItem/styleAndClasseStandardHTMLAttributesTest.xhtml";
+
+ private static final String FORM_ID = "form:";
+
+ private static final String CONTROL_FORM_ID = "control:";
+
+
private static Map<String, String> params = new HashMap<String, String>();
static {
@@ -58,6 +66,63 @@
tester.testLimitToList();
}
+ @Test
+ public void testStandardHTMLAttributesAreOutputToClient(Template template) {
+ renderPage(LOOK_AND_FEEL_TEST_URL, template, null);
+
+ writeStatus("Check standard HTML attributes are output to client");
+
+ String parentId = getParentId();
+ String isDisabledId = parentId + CONTROL_FORM_ID + "isDisabled";
+ String disablingControlId = parentId + CONTROL_FORM_ID + "disable";
+ String menuItemId = "icon" + parentId + FORM_ID + "item";
+
+ check(isDisabledId, false);
+ clickCommandAndWait(disablingControlId);
+
+ writeStatus("Check standart HTML attributes");
+ assertEvents(menuItemId, SeleniumEvent.STANDARD_HTML_EVENTS);
+ }
+
+ @Test
+ public void testStylesAndStyleClassesAreOutputToClient(Template template) {
+ renderPage(LOOK_AND_FEEL_TEST_URL, template, null);
+
+ writeStatus("Check styles and classes are output to client");
+
+ String parentId = getParentId();
+ String isDisabledId = parentId + CONTROL_FORM_ID + "isDisabled";
+ String disablingControlId = parentId + CONTROL_FORM_ID + "disable";
+ String itemId = parentId + FORM_ID + "item";
+
+ writeStatus("Check enabled component at first");
+ check(isDisabledId, false);
+ clickCommandAndWait(disablingControlId);
+
+ String styleElementId = "tablehide" + parentId + FORM_ID + "item";
+ assertStyleAttribute(styleElementId, "font-size: 16px", "Style attribute was not output to client");
+ assertClassNames(styleElementId, new String[] { "noclass" }, "Class attribute was not output to client", true);
+
+ writeStatus("Check hoverClass/hoverStyle attributes");
+ selenium.mouseOver(styleElementId);
+ //assertStyleAttribute(styleElementId, "font-size: 14px", "hoverStyle attribute was not output to client");
+ assertClassNames(styleElementId, new String[] { "hover-class" }, "hoverClass attribute was not output to client", true);
+ selenium.mouseOut(styleElementId);
+
+ writeStatus("Check iconClass/iconStyle attributes");
+ String iconTdXpath = "//*[@id='" + itemId + "']/table/tbody/tr/td[1]";
+ //assertStyleAttribute(iconTdXpath, "font-size: 15px", "iconStyle attribute was not output to client");
+ assertClassNames(iconTdXpath, new String[] { "icon-class" }, "iconClass attribute was not output to client", false);
+
+ writeStatus("Check disabled component");
+ check(isDisabledId, true);
+ clickCommandAndWait(disablingControlId);
+
+ writeStatus("Check disabledClass/disabledStyle attributes");
+ assertStyleAttribute(styleElementId, "font-size: 13px", "disabledStyle attribute was not output to client");
+ assertClassNames(styleElementId, new String[] { "disabled-class" }, "disabledStyle attribute was not output to client", true);
+ }
+
@Override
public void sendAjax() {
clickAjaxCommandAndWait("icon" + getAutoTester(this).getClientId("") + "item");
@@ -73,4 +138,8 @@
return null;
}
+ private void check(String id, boolean isChecked) {
+ runScript("document.getElementById('" + id + "').checked=" + isChecked);
+ }
+
}
16 years, 8 months
JBoss Rich Faces SVN: r12405 - trunk/ui/modal-panel/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: atsebro
Date: 2009-01-23 11:11:13 -0500 (Fri, 23 Jan 2009)
New Revision: 12405
Modified:
trunk/ui/modal-panel/src/main/config/component/modalPanel.xml
Log:
RF-5739: ModalPanel "domElementAttachment" attribute description
Modified: trunk/ui/modal-panel/src/main/config/component/modalPanel.xml
===================================================================
--- trunk/ui/modal-panel/src/main/config/component/modalPanel.xml 2009-01-23 16:09:37 UTC (rev 12404)
+++ trunk/ui/modal-panel/src/main/config/component/modalPanel.xml 2009-01-23 16:11:13 UTC (rev 12405)
@@ -299,6 +299,7 @@
<property>
<name>domElementAttachment</name>
<classname>java.lang.String</classname>
+ <description>Defines the DOM element, which stacking context will assimilate the modalPanel. Possible values: "body", "form", "parent". Default value is "body".</description>
</property>
</component>
</components>
16 years, 8 months
JBoss Rich Faces SVN: r12404 - trunk/ui/inplaceSelect/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: atsebro
Date: 2009-01-23 11:09:37 -0500 (Fri, 23 Jan 2009)
New Revision: 12404
Modified:
trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml
Log:
Fixing some inconsistence in XML
Modified: trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml
===================================================================
--- trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml 2009-01-23 15:36:03 UTC (rev 12403)
+++ trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml 2009-01-23 16:09:37 UTC (rev 12404)
@@ -86,7 +86,7 @@
<name>showValueInView</name>
<classname>boolean</classname>
<description>
- If "true", shows the SelectItem labels in the InplaceSelect&s pull-down list, but displays the value in the field in view mode once an item is selected.
+ If "true", shows the SelectItem labels in the InplaceSelect pull-down list, but displays the value in the field in view mode once an item is selected.
Default value is "false"
</description>
<defaultvalue>false</defaultvalue>
16 years, 8 months
JBoss Rich Faces SVN: r12403 - trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/dnd.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2009-01-23 10:36:03 -0500 (Fri, 23 Jan 2009)
New Revision: 12403
Modified:
trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js
Log:
https://jira.jboss.org/jira/browse/RF-5834
Modified: trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js
===================================================================
--- trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js 2009-01-23 15:26:19 UTC (rev 12402)
+++ trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js 2009-01-23 15:36:03 UTC (rev 12403)
@@ -19,12 +19,22 @@
this.onupBound = this.onup.bindAsEventListener(this);
},
- activate: function(event) {
+ activate: function(event) {
Event.observe(document, "mousemove", this.onmoveBound);
Event.observe(document, "mouseup", this.onupBound);
if (event.type == "mousemove") {
this.onmoveBound(event);
}
+ // prevent text selection in IE
+ this.onSelectStartHandler = document.onselectstart;
+ this.onDragStartHandler = document.ondragstart;
+
+ document.onselectstart = function () { return false; };
+ document.ondragstart = function () { DnD.ieReleaseCapture(); return false; };
+
+ if (document.releaseCapture) {
+ Event.observe(document, "mousemove", DnD.ieReleaseCapture);
+ }
},
onmove: function(event) {
@@ -58,6 +68,13 @@
deactivate: function() {
Event.stopObserving(document, "mousemove", this.onmoveBound);
Event.stopObserving(document, "mouseup", this.onupBound);
+
+ document.onselectstart = this.onSelectStartHandler;
+ document.ondragstart = this.onDragStartHandler;
+
+ if (document.releaseCapture) {
+ Event.stopObserving(document, "mousemove", DnD.ieReleaseCapture);
+ }
}
};
@@ -207,18 +224,7 @@
Event.observe(document, "mousemove", this.dragTrigger);
this.lastDragX = Event.pointerX(event);
- this.lastDragY = Event.pointerY(event);
-
- // prevent text selection in IE
- this.onSelectStartHandler = document.onselectstart;
- this.onDragStartHandler = document.ondragstart;
-
- document.onselectstart = function () { return false; };
- document.ondragstart = function () { DnD.ieReleaseCapture(); return false; };
-
- if (document.releaseCapture) {
- Event.observe(document, "mousemove", DnD.ieReleaseCapture);
- }
+ this.lastDragY = Event.pointerY(event);
}
},
@@ -263,13 +269,6 @@
this.lastDragX = undefined;
this.lastDragY = undefined;
- document.onselectstart = this.onSelectStartHandler;
- document.ondragstart = this.onDragStartHandler;
-
- if (document.releaseCapture) {
- Event.stopObserving(document, "mousemove", DnD.ieReleaseCapture);
- }
-
if (this.endDragListener) {
this.endDragListener.deactivate();
}
16 years, 8 months
JBoss Rich Faces SVN: r12402 - in trunk/test-applications/realworld/web/src/main/webapp: WEB-INF and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2009-01-23 10:26:19 -0500 (Fri, 23 Jan 2009)
New Revision: 12402
Added:
trunk/test-applications/realworld/web/src/main/webapp/layout/template2.xhtml
trunk/test-applications/realworld/web/src/main/webapp/stylesheet/realworld2.css
Modified:
trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/web.xml
trunk/test-applications/realworld/web/src/main/webapp/error.xhtml
trunk/test-applications/realworld/web/src/main/webapp/index.xhtml
trunk/test-applications/realworld/web/src/main/webapp/layout/menu.xhtml
trunk/test-applications/realworld/web/src/main/webapp/main.xhtml
trunk/test-applications/realworld/web/src/main/webapp/register.xhtml
Log:
Redesign realworld application
Modified: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/web.xml 2009-01-23 14:25:45 UTC (rev 12401)
+++ trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/web.xml 2009-01-23 15:26:19 UTC (rev 12402)
@@ -81,7 +81,7 @@
<context-param>
<param-name>uploadRoot</param-name>
<param-value>
- /home/richfaces/Upload/
+ D:\Projects\JBRF\trunk_\test-applications\realworld\Upload\
</param-value>
</context-param>
Modified: trunk/test-applications/realworld/web/src/main/webapp/error.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld/web/src/main/webapp/index.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld/web/src/main/webapp/layout/menu.xhtml
===================================================================
(Binary files differ)
Added: trunk/test-applications/realworld/web/src/main/webapp/layout/template2.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/layout/template2.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Modified: trunk/test-applications/realworld/web/src/main/webapp/main.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld/web/src/main/webapp/register.xhtml
===================================================================
(Binary files differ)
Added: trunk/test-applications/realworld/web/src/main/webapp/stylesheet/realworld2.css
===================================================================
--- trunk/test-applications/realworld/web/src/main/webapp/stylesheet/realworld2.css (rev 0)
+++ trunk/test-applications/realworld/web/src/main/webapp/stylesheet/realworld2.css 2009-01-23 15:26:19 UTC (rev 12402)
@@ -0,0 +1,96 @@
+.main-body {
+ margin: 0px;
+ background: url(../img/shell/page_bg.gif) repeat-x #D7D7D7;
+ height: 100%;
+}
+
+.header-div {
+ height: 116px;
+}
+
+.header-content-div {
+ height: 79px;
+ position: relative;
+}
+
+.user-info-div {
+ position: absolute;
+ font-weight: bold;
+ color: #ffffff;
+ right: 25px;
+ top: 49px;
+}
+
+.top-right-menu {
+ position: absolute;
+ right: 8px;
+ top: 14px;
+}
+
+.top-right-menu-item {
+ vertical-align: top;
+ padding: 0px 8px 0px 15px;
+}
+
+.top-right-menu-item-content {
+ font-size: 11px;
+ color: #ffffff;
+ text-decoration: none;
+}
+
+.main-menu {
+ height: 37px;
+ position: relative;
+ background: url(../img/shell/general_panelbar_bg.gif) repeat-x #A84807;
+ padding-left: 15px;
+}
+
+.body-main-div {
+ background: url(../img/shell/general_panel_bg.gif) right top repeat-y;
+ height: 100%;
+}
+
+.body-main-div-top {
+ height: 15px;
+ background: url(../img/shell/general_panel_header_bg.gif) right top;
+ font-size: 1px;
+}
+
+.footer-div {
+ height: 82px;
+ position: relative;
+ background: url(../img/shell/footer_bg.gif) repeat-x #000000;
+}
+
+.footer-div-content {
+ position: absolute;
+ left: 8px;
+ top: 51px;
+}
+
+.bottom-right-menu-item {
+ vertical-align: top;
+ padding: 0px 15px 0px 8px;
+}
+
+.bottom-right-menu-item-content {
+ font-size: 11px;
+ color: #ffffff;
+ text-decoration: none;
+}
+
+.logged-user {
+ color: #FF7D2A
+}
+
+.rich-toolbar {
+ background: none;
+ border: none;
+}
+
+.rich-toolbar-item a {
+ color: #FFFFFF;
+ font-size: 11px;
+ font-weight: bold;
+ text-decoration: none;
+}
\ No newline at end of file
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/stylesheet/realworld2.css
___________________________________________________________________
Name: svn:mime-type
+ text/css
Name: svn:eol-style
+ native
16 years, 8 months
JBoss Rich Faces SVN: r12401 - in trunk/test-applications/seleniumTest/richfaces/src: test/java/org/richfaces/testng and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-01-23 09:25:45 -0500 (Fri, 23 Jan 2009)
New Revision: 12401
Added:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/treeNodesAdaptor/recursiveTreeNodesAdaptor.xhtml
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/treeNodesAdaptor/treeNodesAdaptorBase.xhtml
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AbstractTreeNodesAdaptorTest.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/RecursiveTreeNodesAdaptorTest.java
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/treeNodesAdaptor/treeNodesAdaptor.xhtml
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TreeNodesAdaptorTest.java
Log:
RF-5576 RF-5577 RF-5578
Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/treeNodesAdaptor/recursiveTreeNodesAdaptor.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/treeNodesAdaptor/recursiveTreeNodesAdaptor.xhtml (rev 0)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/treeNodesAdaptor/recursiveTreeNodesAdaptor.xhtml 2009-01-23 14:25:45 UTC (rev 12401)
@@ -0,0 +1,21 @@
+<!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="treeNodesAdaptorBase.xhtml">
+ <ui:define name="treeNodesAdaptor">
+ <rich:recursiveTreeNodesAdaptor roots="#{treeNodesAdaptor.nodes}" var="node" nodes="#{node.children}" includedNode="#{treeNodesAdaptor.includedNode}">
+ <rich:treeNode ajaxSingle="#{treeNodesAdaptor.ajaxSingle}">
+ <h:inputText value="#{node.id}"></h:inputText>
+ <h:commandButton id="submit" value="submit" actionListener="#{treeNodesAdaptor.submit}"></h:commandButton>
+ <a4j:commandButton id="ajaxSubmit" value="ajaxSubmit" actionListener="#{treeNodesAdaptor.submit}"></a4j:commandButton>
+ <a4j:commandButton id="ajaxSingleSubmit" value="ajaxSingleSubmit" actionListener="#{treeNodesAdaptor.submit}" ajaxSingle="true"></a4j:commandButton>
+ </rich:treeNode>
+ </rich:recursiveTreeNodesAdaptor>
+ </ui:define>
+</ui:composition>
+</html>
\ No newline at end of file
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/treeNodesAdaptor/treeNodesAdaptor.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/treeNodesAdaptor/treeNodesAdaptor.xhtml 2009-01-23 13:48:43 UTC (rev 12400)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/treeNodesAdaptor/treeNodesAdaptor.xhtml 2009-01-23 14:25:45 UTC (rev 12401)
@@ -6,48 +6,32 @@
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="ajaxSingle" />
- <h:selectBooleanCheckbox id="ajaxSingle" value="#{treeNodesAdaptor.ajaxSingle}">
- <a4j:support event="onchange" reRender="tree"/>
- </h:selectBooleanCheckbox>
- <h:outputText value="includedNode" />
- <h:selectBooleanCheckbox id="includedNode" value="#{treeNodesAdaptor.includedNode}">
- <a4j:support event="onchange" reRender="tree"/>
- </h:selectBooleanCheckbox>
- </h:form>
- <h:form id="mainForm">
- <rich:tree id="tree">
- <rich:treeNodesAdaptor nodes="#{treeNodesAdaptor.nodes}" var="node">
+<ui:composition template="treeNodesAdaptorBase.xhtml">
+ <ui:define name="treeNodesAdaptor">
+ <rich:treeNodesAdaptor nodes="#{treeNodesAdaptor.nodes}" var="node">
+ <rich:treeNode>
+ <h:inputText value="#{node.id}"></h:inputText>
+ <h:commandButton id="submit" value="submit" actionListener="#{treeNodesAdaptor.submit}"></h:commandButton>
+ <a4j:commandButton id="ajaxSubmit" value="ajaxSubmit" actionListener="#{treeNodesAdaptor.submit}"></a4j:commandButton>
+ <a4j:commandButton id="ajaxSingleSubmit" value="ajaxSingleSubmit" actionListener="#{treeNodesAdaptor.submit}" ajaxSingle="true"></a4j:commandButton>
+ </rich:treeNode>
+ <rich:treeNodesAdaptor nodes="#{node.children}" var="child" includedNode="#{treeNodesAdaptor.includedNode}">
+ <rich:treeNode ajaxSingle="#{treeNodesAdaptor.ajaxSingle}">
+ <h:inputText value="#{child.id}"></h:inputText>
+ <h:commandButton id="submit2" value="submit" actionListener="#{treeNodesAdaptor.submit}"></h:commandButton>
+ <a4j:commandButton id="ajaxSubmit2" value="ajaxSubmit" actionListener="#{treeNodesAdaptor.submit}"></a4j:commandButton>
+ <a4j:commandButton id="ajaxSingleSubmit2" value="ajaxSingleSubmit" actionListener="#{treeNodesAdaptor.submit}" ajaxSingle="true"></a4j:commandButton>
+ </rich:treeNode>
+ <rich:treeNodesAdaptor nodes="#{child.children}" var="child2">
<rich:treeNode>
- <h:outputText value="#{node.id}"></h:outputText>
- <h:commandButton id="submit" value="submit" actionListener="#{treeNodesAdaptor.submit}"></h:commandButton>
- <a4j:commandButton id="ajaxSubmit" value="ajaxSubmit" actionListener="#{treeNodesAdaptor.submit}"></a4j:commandButton>
- <a4j:commandButton id="ajaxSingleSubmit" value="ajaxSingleSubmit" actionListener="#{treeNodesAdaptor.submit}" ajaxSingle="true"></a4j:commandButton>
+ <h:inputText value="#{child2.id}"></h:inputText>
+ <h:commandButton id="submit3" value="submit" actionListener="#{treeNodesAdaptor.submit}"></h:commandButton>
+ <a4j:commandButton id="ajaxSubmit3" value="ajaxSubmit" actionListener="#{treeNodesAdaptor.submit}"></a4j:commandButton>
+ <a4j:commandButton id="ajaxSingleSubmit3" value="ajaxSingleSubmit" actionListener="#{treeNodesAdaptor.submit}" ajaxSingle="true"></a4j:commandButton>
</rich:treeNode>
- <rich:treeNodesAdaptor nodes="#{node.children}" var="child" includedNode="#{treeNodesAdaptor.includedNode}">
- <rich:treeNode ajaxSingle="#{treeNodesAdaptor.ajaxSingle}">
- <h:inputText value="#{child.id}"></h:inputText>
- </rich:treeNode>
- <rich:treeNodesAdaptor nodes="#{child.children}" var="child2">
- <rich:treeNode>
- <h:outputText value="#{child2.id}"></h:outputText>
- </rich:treeNode>
- </rich:treeNodesAdaptor>
- </rich:treeNodesAdaptor>
</rich:treeNodesAdaptor>
- </rich:tree>
- </h:form>
- <a4j:outputPanel ajaxRendered="true">
- <h:outputText id="outputText" value="#{treeNodesAdaptor.trace}"></h:outputText>
- <h:dataTable id="dataTable" value="#{treeNodesAdaptor.nodes[1].children}" var="child">
- <h:column>
- <h:outputText value="#{child.id}"></h:outputText>
- </h:column>
- </h:dataTable>
- </a4j:outputPanel>
+ </rich:treeNodesAdaptor>
+ </rich:treeNodesAdaptor>
</ui:define>
</ui:composition>
</html>
\ No newline at end of file
Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/treeNodesAdaptor/treeNodesAdaptorBase.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/treeNodesAdaptor/treeNodesAdaptorBase.xhtml (rev 0)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/treeNodesAdaptor/treeNodesAdaptorBase.xhtml 2009-01-23 14:25:45 UTC (rev 12401)
@@ -0,0 +1,36 @@
+<!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="ajaxSingle" />
+ <h:selectBooleanCheckbox id="ajaxSingle" value="#{treeNodesAdaptor.ajaxSingle}">
+ <a4j:support event="onchange" reRender="tree"/>
+ </h:selectBooleanCheckbox>
+ <h:outputText value="includedNode" />
+ <h:selectBooleanCheckbox id="includedNode" value="#{treeNodesAdaptor.includedNode}">
+ <a4j:support event="onchange" reRender="tree"/>
+ </h:selectBooleanCheckbox>
+ </h:form>
+ <h:form id="mainForm">
+ <rich:tree id="tree">
+ <ui:insert name="treeNodesAdaptor" />
+ </rich:tree>
+ </h:form>
+ <a4j:outputPanel ajaxRendered="true">
+ <h:outputText id="outputText" value="#{treeNodesAdaptor.trace}"></h:outputText>
+ <h:dataTable id="dataTable" value="#{treeNodesAdaptor.nodes[1].children}" var="child">
+ <h:column>
+ <h:outputText value="#{child.id}"></h:outputText>
+ </h:column>
+ </h:dataTable>
+ </a4j:outputPanel>
+ </ui:define>
+</ui:composition>
+</html>
\ No newline at end of file
Added: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AbstractTreeNodesAdaptorTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AbstractTreeNodesAdaptorTest.java (rev 0)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AbstractTreeNodesAdaptorTest.java 2009-01-23 14:25:45 UTC (rev 12401)
@@ -0,0 +1,149 @@
+/**
+ * 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.testng;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.ajax4jsf.bean.tree.TreeNodesAdaptorTestBean.Node;
+import org.ajax4jsf.template.Template;
+import org.richfaces.SeleniumTestBase;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+public abstract class AbstractTreeNodesAdaptorTest extends SeleniumTestBase {
+
+ private List<Node> nodes;
+
+ private String ajaxSingle;
+
+ private String includedNode;
+
+ private String tree;
+
+ private String outputText;
+ private String dataTable;
+ private void init(Template template) {
+ renderPage(null, template, "#{treeNodesAdaptor.init}");
+ nodes = new ArrayList<Node>(3);
+ for (int i = 1; i <= 3; i++) {
+ Node node = new Node(Integer.toString(i));
+ nodes.add(node);
+ for (int j = 1; j <= 3; j++) {
+ Node node2 = new Node(Integer.toString(i * 10 + j));
+ node.addChild(node2);
+ for (int k = 1; k <= 3; k++) {
+ node2.addChild(new Node(Integer.toString(i * 100 + j * 10 + k)));
+ }
+ }
+ }
+ String attrForm = getParentId() + "attrForm";
+ ajaxSingle = attrForm + ":ajaxSingle";
+ includedNode = attrForm + ":includedNode";
+ String mainForm = getParentId() + "mainForm";
+ tree = mainForm + ":tree";
+ outputText = getParentId() + "outputText";
+ dataTable = getParentId() + "dataTable";
+ }
+
+ /**
+ * component builds right tree structure: data is fetched from nodes collection
+ * and assigned to var variable
+ */
+ @Test
+ public void testTreeStructure(Template template) {
+ init(template);
+ String locator = "xpath=id('"+ tree + "')/div";
+ for (int i = 0; i < nodes.size(); i++) {
+ Node node = nodes.get(i);
+ String rootLocator = locator + "/table[" + (i + 1) + "]/tbody/tr";
+ Assert.assertEquals(selenium.getValue(rootLocator + "/td[3]/input[1]"), node.getId());
+ clickAjaxCommandAndWait(rootLocator + "/td[1]/div/a");
+ String nodesLocator = locator + "/div[" + (i + 1) + "]";
+ List<Node> children = node.getChildren();
+ for (int j = 0; j < children.size(); j++) {
+ Assert.assertEquals(selenium.getValue(nodesLocator + "/table[" + (j + 1) + "]/tbody/tr/td[3]/input[1]"), children.get(j).getId());
+ }
+ }
+ }
+
+ private void checkModel(String nodesLocator, boolean ajaxSingle) {
+ String dataTableLocator = "xpath=id('"+ dataTable + "')/tbody/tr[";
+ for (int j = 1; j <= 3; j++) {
+ if (ajaxSingle && j != 2) {
+ Assert.assertFalse(selenium.getValue(nodesLocator + "/table[" + j + "]/tbody/tr/td[3]/input[1]").equals(selenium.getText(dataTableLocator + j + "]")));
+ } else {
+ Assert.assertEquals(selenium.getValue(nodesLocator + "/table[" + j + "]/tbody/tr/td[3]/input[1]"), selenium.getText(dataTableLocator + j + "]"));
+ }
+ }
+ }
+
+ /**
+ * check input and command components processing with ajaxSingle nodes
+ */
+ @Test
+ public void testComponentsProcessing(Template template) {
+ init(template);
+ String locator = "xpath=id('"+ tree + "')/div";
+ String titleLocator = locator + "/table[2]/tbody/tr";
+ clickAjaxCommandAndWait(titleLocator + "/td[1]/div/a");
+ String nodesLocator = locator + "/div[2]";
+ checkModel(nodesLocator, false);
+ for (int j = 1; j <= 3; j++) {
+ selenium.type(nodesLocator + "/table[" + j + "]/tbody/tr/td[3]/input[1]", "abc" + j);
+ }
+ clickAjaxCommandAndWait(nodesLocator + "/table[1]/tbody/tr/td[1]/div/a");
+ checkModel(nodesLocator, false);
+ clickAjaxCommandAndWait(ajaxSingle);
+ for (int j = 1; j <= 3; j++) {
+ selenium.type(nodesLocator + "/table[" + j + "]/tbody/tr/td[3]/input[1]", "xyz" + j);
+ }
+ clickAjaxCommandAndWait(nodesLocator + "/table[2]/tbody/tr/td[1]/div/a");
+ checkModel(nodesLocator, true);
+ String buttonLocator = titleLocator + "/td[3]/input[";
+ Assert.assertEquals(selenium.getText(outputText), "");
+ selenium.click(buttonLocator + "2]");
+ waitForPageToLoad();
+ Assert.assertTrue(selenium.getText(outputText).indexOf("1::submit") != -1);
+ selenium.click(buttonLocator + "3]");
+ waitForAjaxCompletion();
+ Assert.assertTrue(selenium.getText(outputText).indexOf("1::ajaxSubmit") != -1);
+ selenium.click(buttonLocator + "4]");
+ waitForAjaxCompletion();
+ Assert.assertTrue(selenium.getText(outputText).indexOf("1::ajaxSingleSubmit") != -1);
+ }
+
+ /**
+ * includedNode expression is handled properly
+ */
+ @Test
+ public void testIncludedNode(Template template) {
+ init(template);
+ String xpath = "id('"+ tree + "')/div";
+ clickAjaxCommandAndWait("xpath=" + xpath + "/table[2]/tbody/tr/td[1]/div/a");
+ String childrenXpath = "id('"+ tree + "')/div" + "/div[2]/table";
+ Assert.assertEquals(selenium.getXpathCount(childrenXpath), nodes.get(1).getChildren().size());
+ clickAjaxCommandAndWait(includedNode);
+ Assert.assertEquals(selenium.getXpathCount(childrenXpath), 0);
+ }
+
+}
Added: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/RecursiveTreeNodesAdaptorTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/RecursiveTreeNodesAdaptorTest.java (rev 0)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/RecursiveTreeNodesAdaptorTest.java 2009-01-23 14:25:45 UTC (rev 12401)
@@ -0,0 +1,32 @@
+/**
+ * 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.testng;
+
+
+
+public class RecursiveTreeNodesAdaptorTest extends AbstractTreeNodesAdaptorTest {
+
+ @Override
+ public String getTestUrl() {
+ return "pages/treeNodesAdaptor/recursiveTreeNodesAdaptor.xhtml";
+ }
+
+}
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TreeNodesAdaptorTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TreeNodesAdaptorTest.java 2009-01-23 13:48:43 UTC (rev 12400)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TreeNodesAdaptorTest.java 2009-01-23 14:25:45 UTC (rev 12401)
@@ -20,132 +20,10 @@
*/
package org.richfaces.testng;
-import java.util.ArrayList;
-import java.util.List;
-import org.ajax4jsf.bean.tree.TreeNodesAdaptorTestBean.Node;
-import org.ajax4jsf.template.Template;
-import org.richfaces.SeleniumTestBase;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+public class TreeNodesAdaptorTest extends AbstractTreeNodesAdaptorTest {
-public class TreeNodesAdaptorTest extends SeleniumTestBase {
-
- private List<Node> nodes;
-
- private String ajaxSingle;
-
- private String includedNode;
-
- private String tree;
-
- private String outputText;
- private String dataTable;
- private void init(Template template) {
- renderPage(null, template, "#{treeNodesAdaptor.init}");
- nodes = new ArrayList<Node>(3);
- for (int i = 1; i <= 3; i++) {
- Node node = new Node(Integer.toString(i));
- nodes.add(node);
- for (int j = 1; j <= 3; j++) {
- Node node2 = new Node(Integer.toString(i * 10 + j));
- node.addChild(node2);
- for (int k = 1; k <= 3; k++) {
- node2.addChild(new Node(Integer.toString(i * 100 + j * 10 + k)));
- }
- }
- }
- String attrForm = getParentId() + "attrForm";
- ajaxSingle = attrForm + ":ajaxSingle";
- includedNode = attrForm + ":includedNode";
- String mainForm = getParentId() + "mainForm";
- tree = mainForm + ":tree";
- outputText = getParentId() + "outputText";
- dataTable = getParentId() + "dataTable";
- }
-
- /**
- * component builds right tree structure: data is fetched from nodes collection
- * and assigned to var variable
- */
- @Test
- public void testTreeStructure(Template template) {
- init(template);
- String locator = "xpath=id('"+ tree + "')/div";
- for (int i = 0; i < nodes.size(); i++) {
- Node node = nodes.get(i);
- String rootLocator = locator + "/table[" + (i + 1) + "]/tbody/tr";
- Assert.assertEquals(selenium.getText(rootLocator), node.getId());
- clickAjaxCommandAndWait(rootLocator + "/td[1]/div/a");
- String nodesLocator = locator + "/div[" + (i + 1) + "]";
- List<Node> children = node.getChildren();
- for (int j = 0; j < children.size(); j++) {
- Assert.assertEquals(selenium.getValue(nodesLocator + "/table[" + (j + 1) + "]/tbody/tr/td[3]/input"), children.get(j).getId());
- }
- }
- }
-
- private void checkModel(String nodesLocator, boolean ajaxSingle) {
- String dataTableLocator = "xpath=id('"+ dataTable + "')/tbody/tr[";
- for (int j = 1; j <= 3; j++) {
- if (ajaxSingle && j != 2) {
- Assert.assertFalse(selenium.getValue(nodesLocator + "/table[" + j + "]/tbody/tr/td[3]/input").equals(selenium.getText(dataTableLocator + j + "]")));
- } else {
- Assert.assertEquals(selenium.getValue(nodesLocator + "/table[" + j + "]/tbody/tr/td[3]/input"), selenium.getText(dataTableLocator + j + "]"));
- }
- }
- }
-
- /**
- * check input and command components processing with ajaxSingle nodes
- */
- @Test
- public void testComponentsProcessing(Template template) {
- init(template);
- String locator = "xpath=id('"+ tree + "')/div";
- String titleLocator = locator + "/table[2]/tbody/tr";
- clickAjaxCommandAndWait(titleLocator + "/td[1]/div/a");
- String nodesLocator = locator + "/div[2]";
- checkModel(nodesLocator, false);
- for (int j = 1; j <= 3; j++) {
- selenium.type(nodesLocator + "/table[" + j + "]/tbody/tr/td[3]/input", "abc" + j);
- }
- clickAjaxCommandAndWait(nodesLocator + "/table[1]/tbody/tr/td[1]/div/a");
- checkModel(nodesLocator, false);
- clickAjaxCommandAndWait(ajaxSingle);
- for (int j = 1; j <= 3; j++) {
- selenium.type(nodesLocator + "/table[" + j + "]/tbody/tr/td[3]/input", "xyz" + j);
- }
- clickAjaxCommandAndWait(nodesLocator + "/table[2]/tbody/tr/td[1]/div/a");
- checkModel(nodesLocator, true);
- String buttonLocator = titleLocator + "/td[3]/input[";
- Assert.assertEquals(selenium.getText(outputText), "");
- selenium.click(buttonLocator + "1]");
- waitForPageToLoad();
- Assert.assertTrue(selenium.getText(outputText).endsWith("1::submit"));
- selenium.click(buttonLocator + "2]");
- waitForAjaxCompletion();
- Assert.assertTrue(selenium.getText(outputText).endsWith("1::ajaxSubmit"));
- selenium.click(buttonLocator + "3]");
- waitForAjaxCompletion();
- Assert.assertTrue(selenium.getText(outputText).endsWith("1::ajaxSingleSubmit"));
- }
-
- /**
- * includedNode expression is handled properly
- */
- @Test
- public void testIncludedNode(Template template) {
- init(template);
- String xpath = "id('"+ tree + "')/div";
- clickAjaxCommandAndWait("xpath=" + xpath + "/table[2]/tbody/tr/td[1]/div/a");
- String childrenXpath = "id('"+ tree + "')/div" + "/div[2]/table";
- Assert.assertEquals(selenium.getXpathCount(childrenXpath), nodes.get(1).getChildren().size());
- clickAjaxCommandAndWait(includedNode);
- Assert.assertEquals(selenium.getXpathCount(childrenXpath), 0);
- }
-
@Override
public String getTestUrl() {
return "pages/treeNodesAdaptor/treeNodesAdaptor.xhtml";
16 years, 8 months
JBoss Rich Faces SVN: r12400 - in trunk/test-applications/realworld/Upload/amarkhel: Cars/Child1 and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-01-23 08:48:43 -0500 (Fri, 23 Jan 2009)
New Revision: 12400
Added:
trunk/test-applications/realworld/Upload/amarkhel/Cars/Child1/
trunk/test-applications/realworld/Upload/amarkhel/Cars/Child2/
Modified:
trunk/test-applications/realworld/Upload/amarkhel/avatars/
Log:
Property changes on: trunk/test-applications/realworld/Upload/amarkhel/Cars/Child1
___________________________________________________________________
Name: svn:ignore
+ Thumbs.db
Property changes on: trunk/test-applications/realworld/Upload/amarkhel/Cars/Child2
___________________________________________________________________
Name: svn:ignore
+ Thumbs.db
Property changes on: trunk/test-applications/realworld/Upload/amarkhel/avatars
___________________________________________________________________
Name: svn:ignore
+ *.db
16 years, 8 months
JBoss Rich Faces SVN: r12399 - trunk/test-applications/realworld/web/META-INF.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-01-23 08:47:44 -0500 (Fri, 23 Jan 2009)
New Revision: 12399
Modified:
trunk/test-applications/realworld/web/META-INF/MANIFEST.MF
Log:
Modified: trunk/test-applications/realworld/web/META-INF/MANIFEST.MF
===================================================================
--- trunk/test-applications/realworld/web/META-INF/MANIFEST.MF 2009-01-23 13:47:11 UTC (rev 12398)
+++ trunk/test-applications/realworld/web/META-INF/MANIFEST.MF 2009-01-23 13:47:44 UTC (rev 12399)
@@ -3,6 +3,6 @@
mons-digester-1.8.jar commons-logging-1.1.jar jboss-seam-debug-2.1.0.
SP1.jar jboss-seam-jul-2.1.0.SP1.jar jboss-seam-remoting-2.1.0.SP1.ja
r jboss-seam-ui-2.1.0.SP1.jar jsf-facelets-1.1.14.jar log4j-1.2.14.ja
- r logkit-1.0.1.jar richfaces-impl-3.3.0-SNAPSHOT.jar richfaces-ui-3.3
- .0-SNAPSHOT.jar
+ r logkit-1.0.1.jar metadata-extractor-2.4.0-beta1.jar richfaces-impl-
+ 3.3.0-SNAPSHOT.jar richfaces-ui-3.3.0-SNAPSHOT.jar
16 years, 8 months