Author: andrei_exadel
Date: 2008-04-24 05:56:08 -0400 (Thu, 24 Apr 2008)
New Revision: 8109
Added:
trunk/test-applications/seleniumTest/src/main/webapp/layout/layout.xhtml
trunk/test-applications/seleniumTest/src/main/webapp/template/
trunk/test-applications/seleniumTest/src/main/webapp/template/dataTableTemplate.xhtml
trunk/test-applications/seleniumTest/src/main/webapp/template/modalPanelTemplate.xhtml
trunk/test-applications/seleniumTest/src/main/webapp/template/simpleTemplate.xhtml
Removed:
trunk/test-applications/seleniumTest/src/main/webapp/layout/template.xhtml
Modified:
trunk/test-applications/seleniumTest/src/test/testng/win/testng.xml
Log:
refactoring
Copied: trunk/test-applications/seleniumTest/src/main/webapp/layout/layout.xhtml (from rev
8105, trunk/test-applications/seleniumTest/src/main/webapp/layout/template.xhtml)
===================================================================
--- trunk/test-applications/seleniumTest/src/main/webapp/layout/layout.xhtml
(rev 0)
+++ trunk/test-applications/seleniumTest/src/main/webapp/layout/layout.xhtml 2008-04-24
09:56:08 UTC (rev 8109)
@@ -0,0 +1,61 @@
+<!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:h="http://java.sun.com/jsf/html"
+
xmlns:rich="http://richfaces.org/rich"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets">
+<head>
+ <script>
+ var errorMessage = null;
+ var pauseHolder = {};
+ window.onerror = function (message, url, code) {
+ errorMessage = message;
+ };
+ function checkError () {
+ return errorMessage;
+ }
+
+ function pause (miliseconds, id) {
+ pauseHolder[id] = false;
+ window.setTimeout(function () { pauseHolder[id] = true; }, miliseconds);
+ }
+
+ function submitForm () {
+ document.getElementById('_form').submit();
+ }
+
+ function reRenderAll () {
+ document.getElementById('_Selenium_Test_ReRender_Form:_reRender').onclick();
+ return;
+ }
+ </script>
+ <style type="text/css">
+ <ui:insert name="style"/>
+ </style>
+</head>
+<f:view>
+<body>
+<div style="padding: 10px; font-size: 24px;">Rich faces component testing
by Selenium</div><br/>
+
+<h:form id="_Selenium_Test_ReRender_Form">
+ <table border="0" cellpadding="5" cellspacing="0">
+ <tr>
+ <td colspan="2">
+ <a4j:commandLink reRender="_Selenium_Test_Common_Grid"
style="display: none;" value="ReRenderAll"
id="_reRender"/>
+ </td>
+ </tr>
+ </table>
+</h:form>
+<div id="_Selenium_Test_ControlPoint1" style="display:
none;">Control1</div>
+<h:panelGrid id="_Selenium_Test_Common_Grid">
+ <ui:insert name="template"/>
+</h:panelGrid>
+<script type="text/javascript">
+ window.done=false;A4J.AJAX.AddListener(new
A4J.AJAX.Listener(function(){window.done=true}));
+</script>
+
+<div id="_Selenium_Test_ControlPoint2" style="display:
none;">Control2</div>
+</body>
+</f:view>
+</html>
\ No newline at end of file
Deleted: trunk/test-applications/seleniumTest/src/main/webapp/layout/template.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/src/main/webapp/layout/template.xhtml 2008-04-24
09:25:39 UTC (rev 8108)
+++ trunk/test-applications/seleniumTest/src/main/webapp/layout/template.xhtml 2008-04-24
09:56:08 UTC (rev 8109)
@@ -1,112 +0,0 @@
-<!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:h="http://java.sun.com/jsf/html"
-
xmlns:rich="http://richfaces.org/rich"
-
xmlns:f="http://java.sun.com/jsf/core"
-
xmlns:ui="http://java.sun.com/jsf/facelets">
-<head>
- <script>
- var errorMessage = null;
- var pauseHolder = {};
- window.onerror = function (message, url, code) {
- errorMessage = message;
- };
- function checkError () {
- return errorMessage;
- }
-
- function pause (miliseconds, id) {
- pauseHolder[id] = false;
- window.setTimeout(function () { pauseHolder[id] = true; }, miliseconds);
- }
-
- function submitForm () {
- document.getElementById('_form').submit();
- }
-
- function reRenderAll () {
- document.getElementById('_Selenium_Test_ReRender_Form:_reRender').onclick();
- return;
- }
- </script>
- <style type="text/css">
- <ui:insert name="style"/>
- </style>
-</head>
-<f:view>
-<body>
-<div style="padding: 10px; font-size: 24px;">Rich faces component testing
by Selenium</div><br/>
-<h:form id="_Selenium_Test_ReRender_Form">
- <table border="0" cellpadding="5" cellspacing="0">
- <tr>
- <td colspan="2">
- <a4j:commandLink reRender="_Selenium_Test_Form1, _Selenium_Test_Form2"
style="text-decoration: underline; color: blue" value="ReRenderAll"
id="_reRender"/>
- </td>
- </tr>
- <!-- tr>
- <td>
- <b>Ajax Status:</b>
- </td>
- <td>
- <a4j:status startText="Ajax in progress...">
- <f:facet name="stop">
- <h:outputText value="Completed" style="color:
green"></h:outputText>
- </f:facet>
- <f:facet name="start">
- <h:outputText value="In progress..." style="color:
red"></h:outputText>
- </f:facet>
- </a4j:status>
- </td>
- </tr-->
- </table>
-</h:form>
-<br/>
-<div id="_Selenium_Test_ControlPoint1" style="display:
none;">Control1</div>
- <br/>
-<table border="0" cellpadding="0"
cellspacing="10"><tr><td style="vertical-align: top">
- <rich:dataTable value="1" id="_Selenium_Test_Description">
- <h:column>
- <f:facet name="header">
- <h:outputText value="Description area"></h:outputText>
- </f:facet>
- <ui:insert name="description"></ui:insert>
- </h:column>
- </rich:dataTable>
-</td></tr></table>
-
- <br/><br/>
-<table border="0" cellpadding="0"
cellspacing="10"><tr><td style="vertical-align: top">
-<h:form id="_Selenium_Test_Form1">
- <rich:dataTable value="1" id="_Selenium_Test_DataTable"
style="width: auto">
- <h:column>
- <f:facet name="header">
- <h:outputText value="Testing area inside Data
Table"></h:outputText>
- </f:facet>
- <ui:insert name="component" />
- </h:column>
- </rich:dataTable>
-</h:form>
-</td>
-<td style="width: 20px">
-</td>
-<td style="vertical-align: top">
-<h:form id="_Selenium_Test_Form2">
- <rich:panel id="_Selenium_Test_Panel">
- <f:facet name="header">
- <h:outputText value="Testing area inside Panel"></h:outputText>
- </f:facet>
- <ui:insert name="component" />
- </rich:panel>
-</h:form>
-</td></tr></table>
-
-
-<script type="text/javascript">
- window.done=false;A4J.AJAX.AddListener(new
A4J.AJAX.Listener(function(){window.done=true}));
-</script>
-
-<div id="_Selenium_Test_ControlPoint2" style="display:
none;">Control2</div>
-</body>
-</f:view>
-</html>
\ No newline at end of file
Added:
trunk/test-applications/seleniumTest/src/main/webapp/template/dataTableTemplate.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/src/main/webapp/template/dataTableTemplate.xhtml
(rev 0)
+++
trunk/test-applications/seleniumTest/src/main/webapp/template/dataTableTemplate.xhtml 2008-04-24
09:56:08 UTC (rev 8109)
@@ -0,0 +1,17 @@
+<!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:h="http://java.sun.com/jsf/html"
+
xmlns:rich="http://richfaces.org/rich"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets">
+<ui:composition template="../layout/layout.xhtml">
+ <rich:dataTable value="1" id="_Selenium_Test_DataTable">
+ <rich:column>
+ <f:facet name="header">
+ <ui:insert name="body" />
+ </f:facet>
+ </rich:column>
+ </rich:dataTable>
+</ui:composition>
+</html>
\ No newline at end of file
Added:
trunk/test-applications/seleniumTest/src/main/webapp/template/modalPanelTemplate.xhtml
===================================================================
---
trunk/test-applications/seleniumTest/src/main/webapp/template/modalPanelTemplate.xhtml
(rev 0)
+++
trunk/test-applications/seleniumTest/src/main/webapp/template/modalPanelTemplate.xhtml 2008-04-24
09:56:08 UTC (rev 8109)
@@ -0,0 +1,13 @@
+<!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:h="http://java.sun.com/jsf/html"
+
xmlns:rich="http://richfaces.org/rich"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets">
+<ui:composition template="../layout/layout.xhtml">
+ <rich:modalPanel id="_Selenium_Test_ModelPanel">
+ <ui:insert name="body" />
+ </rich:modalPanel>
+</ui:composition>
+</html>
\ No newline at end of file
Added: trunk/test-applications/seleniumTest/src/main/webapp/template/simpleTemplate.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/src/main/webapp/template/simpleTemplate.xhtml
(rev 0)
+++
trunk/test-applications/seleniumTest/src/main/webapp/template/simpleTemplate.xhtml 2008-04-24
09:56:08 UTC (rev 8109)
@@ -0,0 +1,11 @@
+<!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:h="http://java.sun.com/jsf/html"
+
xmlns:rich="http://richfaces.org/rich"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets">
+<ui:composition template="../layout/layout.xhtml">
+ <ui:insert name="body" />
+</ui:composition>
+</html>
\ No newline at end of file
Modified: trunk/test-applications/seleniumTest/src/test/testng/win/testng.xml
===================================================================
--- trunk/test-applications/seleniumTest/src/test/testng/win/testng.xml 2008-04-24
09:25:39 UTC (rev 8108)
+++ trunk/test-applications/seleniumTest/src/test/testng/win/testng.xml 2008-04-24
09:56:08 UTC (rev 8109)
@@ -4,7 +4,8 @@
<parameter name="browser" value="*iexplore"/>
<packages>
<package name="org.richfaces" />
- </packages>
+ </packages>
+
</test>
<test name="FireFoxFunctionalTests">
<parameter name="browser" value="*firefox"/>