JBoss Portal SVN: r11977 - branches/JBoss_Portal_Branch_2_6/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-25 03:04:17 -0400 (Thu, 25 Sep 2008)
New Revision: 11977
Modified:
branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml
Log:
Needs 1.1-SNAPSHOT
Modified: branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2008-09-25 06:59:23 UTC (rev 11976)
+++ branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2008-09-25 07:04:17 UTC (rev 11977)
@@ -47,7 +47,7 @@
are pushed to the http://repository.jboss.com site.
-->
- <componentref name="jboss-portal/modules/common" version="1.1.2"/>
+ <componentref name="jboss-portal/modules/common" version="1.1-SNAPSHOT"/>
<componentref name="jboss-portal/modules/web" version="1.1.0"/>
<componentref name="jboss-portal/modules/test" version="1.0.1.SP1"/>
<componentref name="jboss-portal/modules/portlet" version="1.0.3"/>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11976 - branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/impl/jcr/command.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2008-09-25 02:59:23 -0400 (Thu, 25 Sep 2008)
New Revision: 11976
Modified:
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/impl/jcr/command/GetArchiveCommand.java
Log:
JBPORTAL-2172 - Path inconsistency for import/export archive
Modified: branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/impl/jcr/command/GetArchiveCommand.java
===================================================================
--- branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/impl/jcr/command/GetArchiveCommand.java 2008-09-25 03:12:35 UTC (rev 11975)
+++ branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/impl/jcr/command/GetArchiveCommand.java 2008-09-25 06:59:23 UTC (rev 11976)
@@ -26,6 +26,7 @@
import org.jboss.portal.cms.impl.jcr.JCRCommandContext;
import org.jboss.portal.cms.model.Content;
import org.jboss.portal.cms.model.File;
+import org.jboss.portal.cms.util.NodeUtil;
import javax.jcr.Node;
import javax.jcr.NodeIterator;
@@ -99,17 +100,23 @@
while (ni.hasNext())
{
Node node = ni.nextNode();
- NodeType nt = node.getPrimaryNodeType();
+ NodeType nt = node.getPrimaryNodeType();
if (nt.getName().equals("portalcms:folder"))
{
this.zipFiles(node.getPath(), zos);
}
else if (nt.getName().equals("portalcms:file"))
{
+ String diff = node.getPath();
+ if(!this.msRootPath.equals("/"))
+ {
+ diff = node.getPath().substring(NodeUtil.getParentPath(this.msRootPath).length());
+ }
+
JCRCommand fileList = (JCRCommand)this.mContext.getCommandFactory().createFileGetCommand(node.getPath(), new Locale(this.msLanguage));
File childFile = (File)this.mContext.execute(fileList);
- ZipEntry entry = new ZipEntry(this.rootFolderName + node.getPath());
+ ZipEntry entry = new ZipEntry(diff);
zos.putNextEntry(entry);
Content content = childFile.getContent();
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11975 - branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-09-24 23:12:35 -0400 (Wed, 24 Sep 2008)
New Revision: 11975
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
Log:
oops
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-09-25 03:04:18 UTC (rev 11974)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-09-25 03:12:35 UTC (rev 11975)
@@ -166,7 +166,7 @@
try{
darktip<%=index%>.setAttribute("id", infoContainerId<%=index%>);
}catch(e){
- alert(e);
+ //alert(e);
}
</script>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11974 - branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-09-24 23:04:18 -0400 (Wed, 24 Sep 2008)
New Revision: 11974
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
Log:
https://jira.jboss.org/jira/browse/JBPORTAL-2175
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-09-25 02:45:48 UTC (rev 11973)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-09-25 03:04:18 UTC (rev 11974)
@@ -115,8 +115,14 @@
<portlet:param name="content.uri" value="<%= instance.getId() %>"/>
</portlet:actionURL>
+ <script type="text/javascript">
+ //escape single quote and others for js
+ var infoContainerId<%=index%> = "<%= displayName %>".replace(/'/,"/'");
+ infoContainerId<%=index%> = 'info-container-' + infoContainerId<%=index%>;
+ </script>
+
<div style="display:none">
- <div class="darktip" id="info-container-<%= displayName %>">
+ <div class="darktip" id="" name="darktip<%=index%>">
<div class="toolbar" style="width: 250px;">
<div class="title"><%= getLocalizedValue(portletMetaInfo.getMetaValue(MetaInfo.TITLE), locale) %>
</div>
@@ -130,12 +136,22 @@
</div>
</div>
</div>
-
+
+ <script type="text/javascript">
+ //assign dynamically generated id
+ var darktip<%=index%> = document.getElementsByName('darktip<%=index%>')[0];
+ try{
+ darktip<%=index%>.setAttribute("id", infoContainerId<%=index%>);
+ }catch(e){
+ //alert(e);
+ }
+ </script>
+
<tr class="<%= rowClass %>">
<td>
<img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0" alt="icon"/>
- <span onmouseover="domTT_activate(this, event, 'content', document.getElementById('info-container-<%= displayName %>'),'delay', 0, 'trail', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a
+ <span onmouseover="domTT_activate(this, event, 'content', document.getElementById(infoContainerId<%=index%>),'delay', 0, 'trail', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a
href="<%= url %>" id="<%= linkId %>"><%= displayName %>
</a></span></td>
</tr>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11973 - branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-09-24 22:45:48 -0400 (Wed, 24 Sep 2008)
New Revision: 11973
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
Log:
https://jira.jboss.org/jira/browse/JBPORTAL-2175
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-09-24 23:07:35 UTC (rev 11972)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-09-25 02:45:48 UTC (rev 11973)
@@ -139,8 +139,14 @@
<portlet:param name="content.uri" value="<%= instance.getId() %>"/>
</portlet:actionURL>
+ <script type="text/javascript">
+ //escape single quote and others for js
+ var infoContainerId<%=index%> = "<%= displayName %>".replace(/'/,"/'");
+ infoContainerId<%=index%> = 'info-container-' + infoContainerId<%=index%>;
+ </script>
+
<div style="display:none">
- <div class="darktip" id="info-container-<%= displayName %>">
+ <div class="darktip" id="" name="darktip<%=index%>">
<div class="toolbar" style="width: 250px;">
<div class="title"><%= getLocalizedValue(portletMetaInfo.getMetaValue(MetaInfo.TITLE), locale) %>
</div>
@@ -154,11 +160,21 @@
</div>
</div>
</div>
+ <script type="text/javascript">
+ //assign dynamically generated id
+ var darktip<%=index%> = document.getElementsByName('darktip<%=index%>')[0];
+ try{
+ darktip<%=index%>.setAttribute("id", infoContainerId<%=index%>);
+ }catch(e){
+ alert(e);
+ }
+ </script>
+
<tr class="<%= rowClass %>">
<td>
<img src="<%= iconLocation %>" align="middle" class="editor-icon" alt="icon"/>
<span
- onmouseover="domTT_activate(this, event, 'content', document.getElementById('info-container-<%= displayName %>'),'delay', 0, 'trail', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a
+ onmouseover="domTT_activate(this, event, 'content', document.getElementById(infoContainerId<%=index%>),'delay', 0, 'trail', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a
href="javascript:void(0);" onclick="submitForm('<%= url %>');return false"
id="<%= linkId %>"><%= displayName %>
</a></span>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11972 - in branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf: common and 1 other directories.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-09-24 19:07:35 -0400 (Wed, 24 Sep 2008)
New Revision: 11972
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPreferences.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowWizardConfirm.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectRegion.xhtml
Log:
[JBPORTAL-2166] just ids..lots of them. getting bored now.
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2008-09-24 19:35:00 UTC (rev 11971)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2008-09-24 23:07:35 UTC (rev 11972)
@@ -37,12 +37,12 @@
<p class="portlet-class">#{bundle.COMMON_SURE_DELETE} #{portalobjectmgr.selectedObjectType}?</p>
- <h:form>
- <h:commandButton value="#{bundle.COMMON_DELETE}" action="objects" actionListener="#{portalobjectmgr.destroyObject}"
+ <h:form id="confirm-form">
+ <h:commandButton id="delete" value="#{bundle.COMMON_DELETE}" action="objects" actionListener="#{portalobjectmgr.destroyObject}"
styleClass="portlet-form-button portlet-section-buttonrow">
<f:attribute name="objectId" value="#{portalobjectmgr.selectedDeletingObject.id}"/>
</h:commandButton>
- <h:commandButton value="#{bundle.COMMON_CANCEL}" action="objects"
+ <h:commandButton id="cancel" value="#{bundle.COMMON_CANCEL}" action="objects"
actionListener="#{portalobjectmgr.selectParentObject}"
styleClass="portlet-form-button portlet-section-buttonrow"/>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2008-09-24 19:35:00 UTC (rev 11971)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2008-09-24 23:07:35 UTC (rev 11972)
@@ -17,7 +17,7 @@
<td valign="top" class="portlet-section-body">
-<h:form>
+<h:form id="edit-page-error-form">
<table class="datatable full-width">
<thead class="portlet-section-header">
<tr>
@@ -32,13 +32,13 @@
<h:outputText value="#{properties.pageControlAccessDenied.displayName}"/>
</td>
<td>
- <h:selectBooleanCheckbox disabled="#{!properties.pageControlAccessDenied.inheritable}"
+ <h:selectBooleanCheckbox id="page-access-check" disabled="#{!properties.pageControlAccessDenied.inheritable}"
onclick="submit();"
valueChangeListener="#{properties.pageControlAccessDenied.inherit}"
value="#{properties.pageControlAccessDenied.inherited}"/>#{bundle.COMMON_INHERIT_ACTION}
</td>
<td>
- <h:selectOneMenu value="#{properties.pageControlAccessDenied.value}"
+ <h:selectOneMenu id="page-access-select" value="#{properties.pageControlAccessDenied.value}"
disabled="#{properties.pageControlAccessDenied.inherited}" onchange="submit();">
<f:selectItems value="#{properties.pageSelectItems}"/>
</h:selectOneMenu>
@@ -49,13 +49,13 @@
<h:outputText value="#{properties.pageControlUnavailable.displayName}"/>
</td>
<td>
- <h:selectBooleanCheckbox disabled="#{!properties.pageControlUnavailable.inheritable}"
+ <h:selectBooleanCheckbox id="page-control-check" disabled="#{!properties.pageControlUnavailable.inheritable}"
onclick="submit();"
valueChangeListener="#{properties.pageControlUnavailable.inherit}"
value="#{properties.pageControlUnavailable.inherited}"/>#{bundle.COMMON_INHERIT_ACTION}
</td>
<td>
- <h:selectOneMenu value="#{properties.pageControlUnavailable.value}"
+ <h:selectOneMenu id="page-control-select" value="#{properties.pageControlUnavailable.value}"
disabled="#{properties.pageControlUnavailable.inherited}" onchange="submit();">
<f:selectItems value="#{properties.pageSelectItems}"/>
</h:selectOneMenu>
@@ -66,13 +66,13 @@
<h:outputText value="#{properties.pageControlError.displayName}"/>
</td>
<td>
- <h:selectBooleanCheckbox disabled="#{!properties.pageControlError.inheritable}"
+ <h:selectBooleanCheckbox id="page-error-check" disabled="#{!properties.pageControlError.inheritable}"
onclick="submit();"
valueChangeListener="#{properties.pageControlError.inherit}"
value="#{properties.pageControlError.inherited}"/>#{bundle.COMMON_INHERIT_ACTION}
</td>
<td>
- <h:selectOneMenu value="#{properties.pageControlError.value}"
+ <h:selectOneMenu id="page-error-select" value="#{properties.pageControlError.value}"
disabled="#{properties.pageControlError.inherited}" onchange="submit();">
<f:selectItems value="#{properties.pageSelectItems}"/>
</h:selectOneMenu>
@@ -83,13 +83,13 @@
<h:outputText value="#{properties.pageControlInternalError.displayName}"/>
</td>
<td>
- <h:selectBooleanCheckbox disabled="#{!properties.pageControlInternalError.inheritable}"
+ <h:selectBooleanCheckbox id="page-internal-check" disabled="#{!properties.pageControlInternalError.inheritable}"
onclick="submit();"
valueChangeListener="#{properties.pageControlInternalError.inherit}"
value="#{properties.pageControlInternalError.inherited}"/>#{bundle.COMMON_INHERIT_ACTION}
</td>
<td>
- <h:selectOneMenu value="#{properties.pageControlInternalError.value}"
+ <h:selectOneMenu id="page-internal-select" value="#{properties.pageControlInternalError.value}"
disabled="#{properties.pageControlInternalError.inherited}" onchange="submit();">
<f:selectItems value="#{properties.pageSelectItems}"/>
</h:selectOneMenu>
@@ -100,13 +100,13 @@
<h:outputText value="#{properties.pageControlNotFound.displayName}"/>
</td>
<td>
- <h:selectBooleanCheckbox disabled="#{!properties.pageControlNotFound.inheritable}"
+ <h:selectBooleanCheckbox id="page-not-found-check" disabled="#{!properties.pageControlNotFound.inheritable}"
onclick="submit();"
valueChangeListener="#{properties.pageControlNotFound.inherit}"
value="#{properties.pageControlNotFound.inherited}"/>#{bundle.COMMON_INHERIT_ACTION}
</td>
<td>
- <h:selectOneMenu value="#{properties.pageControlNotFound.value}"
+ <h:selectOneMenu id="page-not-found-select" value="#{properties.pageControlNotFound.value}"
disabled="#{properties.pageControlNotFound.inherited}" onchange="submit();">
<f:selectItems value="#{properties.pageSelectItems}"/>
</h:selectOneMenu>
@@ -117,19 +117,19 @@
<h:outputText value="#{properties.pageControlResourceURI.displayName}"/>
</td>
<td>
- <h:selectBooleanCheckbox disabled="#{!properties.pageControlResourceURI.inheritable}"
+ <h:selectBooleanCheckbox id="page-res-check" disabled="#{!properties.pageControlResourceURI.inheritable}"
onclick="submit();"
valueChangeListener="#{properties.pageControlResourceURI.inherit}"
value="#{properties.pageControlResourceURI.inherited}"/>#{bundle.COMMON_INHERIT_ACTION}
</td>
<td>
- <h:inputText value="#{properties.pageControlResourceURI.value}" size="60"
+ <h:inputText id="page-res-select" value="#{properties.pageControlResourceURI.value}" size="60"
disabled="#{properties.pageControlResourceURI.inherited}"/>
</td>
</tr>
</tbody>
</table>
-<h:commandButton value="#{bundle.COMMON_UPDATE}" styleClass="portlet-form-button portlet-section-buttonrow"/>
+<h:commandButton id="update" value="#{bundle.COMMON_UPDATE}" styleClass="portlet-form-button portlet-section-buttonrow"/>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2008-09-24 19:35:00 UTC (rev 11971)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2008-09-24 23:07:35 UTC (rev 11972)
@@ -150,7 +150,7 @@
</div>
</td>
<td>
- <h:selectManyListbox
+ <h:selectManyListbox id="windows-select"
value="#{pageManager.assignedWindows['unknown']}"
size="7" styleClass="windowList portlet-form-field">
<f:selectItems
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2008-09-24 19:35:00 UTC (rev 11971)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2008-09-24 23:07:35 UTC (rev 11972)
@@ -18,7 +18,7 @@
<tr>
<td valign="top" class="portlet-section-body">
-<h:form>
+<h:form id="edit-portal-error-form">
<table class="datatable full-width">
<thead class="portlet-section-header">
<tr>
@@ -33,13 +33,13 @@
<h:outputText value="#{properties.portalControlAccessDenied.displayName}"/>
</td>
<td>
- <h:selectBooleanCheckbox disabled="#{!properties.portalControlAccessDenied.inheritable}"
+ <h:selectBooleanCheckbox id="portal-access-check" disabled="#{!properties.portalControlAccessDenied.inheritable}"
onclick="submit();"
valueChangeListener="#{properties.portalControlAccessDenied.inherit}"
value="#{properties.portalControlAccessDenied.inherited}"/>#{bundle.COMMON_INHERIT_ACTION}
</td>
<td>
- <h:selectOneMenu value="#{properties.portalControlAccessDenied.value}"
+ <h:selectOneMenu id="portal-access-select" value="#{properties.portalControlAccessDenied.value}"
disabled="#{properties.portalControlAccessDenied.inherited}"
onchange="submit();">
<f:selectItems value="#{properties.portalSelectItems}"/>
@@ -51,13 +51,13 @@
<h:outputText value="#{properties.portalControlUnavailable.displayName}"/>
</td>
<td>
- <h:selectBooleanCheckbox disabled="#{!properties.portalControlUnavailable.inheritable}"
+ <h:selectBooleanCheckbox id="portal-unavail-check" disabled="#{!properties.portalControlUnavailable.inheritable}"
onclick="submit();"
valueChangeListener="#{properties.portalControlUnavailable.inherit}"
value="#{properties.portalControlUnavailable.inherited}"/>#{bundle.COMMON_INHERIT_ACTION}
</td>
<td>
- <h:selectOneMenu value="#{properties.portalControlUnavailable.value}"
+ <h:selectOneMenu id="portal-unavail-select" value="#{properties.portalControlUnavailable.value}"
disabled="#{properties.portalControlUnavailable.inherited}"
onchange="submit();">
<f:selectItems value="#{properties.portalSelectItems}"/>
@@ -69,13 +69,13 @@
<h:outputText value="#{properties.portalControlError.displayName}"/>
</td>
<td>
- <h:selectBooleanCheckbox disabled="#{!properties.portalControlError.inheritable}"
+ <h:selectBooleanCheckbox id="portal-error-check" disabled="#{!properties.portalControlError.inheritable}"
onclick="submit();"
valueChangeListener="#{properties.portalControlError.inherit}"
value="#{properties.portalControlError.inherited}"/>#{bundle.COMMON_INHERIT_ACTION}
</td>
<td>
- <h:selectOneMenu value="#{properties.portalControlError.value}"
+ <h:selectOneMenu id="portal-error-select" value="#{properties.portalControlError.value}"
disabled="#{properties.portalControlError.inherited}" onchange="submit();">
<f:selectItems value="#{properties.portalSelectItems}"/>
</h:selectOneMenu>
@@ -86,13 +86,13 @@
<h:outputText value="#{properties.portalControlInternalError.displayName}"/>
</td>
<td>
- <h:selectBooleanCheckbox disabled="#{!properties.portalControlInternalError.inheritable}"
+ <h:selectBooleanCheckbox id="portal-internal-check" disabled="#{!properties.portalControlInternalError.inheritable}"
onclick="submit();"
valueChangeListener="#{properties.portalControlInternalError.inherit}"
value="#{properties.portalControlInternalError.inherited}"/>#{bundle.COMMON_INHERIT_ACTION}
</td>
<td>
- <h:selectOneMenu value="#{properties.portalControlInternalError.value}"
+ <h:selectOneMenu id="portal-internal-select" value="#{properties.portalControlInternalError.value}"
disabled="#{properties.portalControlInternalError.inherited}"
onchange="submit();">
<f:selectItems value="#{properties.portalSelectItems}"/>
@@ -104,13 +104,13 @@
<h:outputText value="#{properties.portalControlNotFound.displayName}"/>
</td>
<td>
- <h:selectBooleanCheckbox disabled="#{!properties.portalControlNotFound.inheritable}"
+ <h:selectBooleanCheckbox id="portal-not-found-check" disabled="#{!properties.portalControlNotFound.inheritable}"
onclick="submit();"
valueChangeListener="#{properties.portalControlNotFound.inherit}"
value="#{properties.portalControlNotFound.inherited}"/>#{bundle.COMMON_INHERIT_ACTION}
</td>
<td>
- <h:selectOneMenu value="#{properties.portalControlNotFound.value}"
+ <h:selectOneMenu id="portal-not-found-select" value="#{properties.portalControlNotFound.value}"
disabled="#{properties.portalControlNotFound.inherited}" onchange="submit();">
<f:selectItems value="#{properties.portalSelectItems}"/>
</h:selectOneMenu>
@@ -121,19 +121,19 @@
<h:outputText value="#{properties.portalControlResourceURI.displayName}"/>
</td>
<td>
- <h:selectBooleanCheckbox disabled="#{!properties.portalControlResourceURI.inheritable}"
+ <h:selectBooleanCheckbox id="portal-res-check" disabled="#{!properties.portalControlResourceURI.inheritable}"
onclick="submit();"
valueChangeListener="#{properties.portalControlResourceURI.inherit}"
value="#{properties.portalControlResourceURI.inherited}"/>#{bundle.COMMON_INHERIT_ACTION}
</td>
<td>
- <h:inputText value="#{properties.portalControlResourceURI.value}" size="60"
+ <h:inputText id="portal-res-input" value="#{properties.portalControlResourceURI.value}" size="60"
disabled="#{properties.portalControlResourceURI.inherited}"/>
</td>
</tr>
</tbody>
</table>
-<h:commandButton value="#{bundle.COMMON_UPDATE}" styleClass="portlet-form-button portlet-section-buttonrow"/>
+<h:commandButton id="update" value="#{bundle.COMMON_UPDATE}" styleClass="portlet-form-button portlet-section-buttonrow"/>
</h:form>
</td>
</tr>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPreferences.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPreferences.xhtml 2008-09-24 19:35:00 UTC (rev 11971)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPreferences.xhtml 2008-09-24 23:07:35 UTC (rev 11972)
@@ -8,7 +8,7 @@
<f:loadBundle basename="Resource" var="bundle" />
<c:choose>
<c:when test="#{not empty prefs.entries}">
- <h:form>
+ <h:form id="edit-pref-form">
<table class="full-width datatable">
<thead class="portlet-section-header" style="text-align:left;">
<tr>
@@ -26,7 +26,7 @@
<td>
<c:choose>
<c:when test="#{prefs.mutable and pref.readOnly == false}">
- <h:commandLink
+ <h:commandLink id="pref-link-#{status.index}"
rendered="#{pref.readOnly == false}"
action="#{pref.select}">#{pref.name}</h:commandLink>
</c:when>
@@ -37,7 +37,7 @@
<h:outputText value="#{pref.displayName.value}"/>
</td>
<td>
- <h:selectBooleanCheckbox disabled="true" value="#{pref.readOnly}"/>
+ <h:selectBooleanCheckbox id="pref-check-#{status.index}" disabled="true" value="#{pref.readOnly}"/>
</td>
<c:if test="#{prefs.mutable}">
<td>
@@ -56,7 +56,7 @@
</c:choose>
<c:if test="#{prefs.selectedEntry != null}">
- <h:form style="padding: 1em 0 1em 0">
+ <h:form id="edit-exisiting-form" style="padding: 1em 0 1em 0">
<fieldset style="border: 1px solid;">
<legend>#{bundle.COMMON_EDIT_EXISTING_VALUES}</legend>
<table>
@@ -69,7 +69,7 @@
</h:outputLabel>
</td>
<td>
- <h:inputText value="#{prefs.selectedEntry[index]}" styleClass="portlet-form-input-field"/>
+ <h:inputText id="pref-input-#{status.index}" value="#{prefs.selectedEntry[index]}" styleClass="portlet-form-input-field"/>
</td>
<td>
<h:commandButton
@@ -82,7 +82,7 @@
</c:forEach>
<tr>
<td colspan="3">
- <h:commandButton value="#{bundle.COMMON_UPDATE}" styleClass="portlet-form-button"/>
+ <h:commandButton id="update" value="#{bundle.COMMON_UPDATE}" styleClass="portlet-form-button"/>
</td>
</tr>
</tbody>
@@ -90,14 +90,14 @@
</fieldset>
</h:form>
- <h:form>
+ <h:form id="append-form">
<fieldset style="border: 1px solid;">
<legend>#{bundle.COMMON_APPEND_VALUE}</legend>
<h:outputLabel for="new_value">
<h:outputText value="#{bundle.COMMON_NEW_VALUE}: " styleClass="portlet-form-field-label"/>
</h:outputLabel>
<h:inputText id="new_value" value="#{prefs.selectedEntry.line}" styleClass="portlet-form-input-field"/>
- <h:commandButton action="#{prefs.selectedEntry.appendLine}" value="#{bundle.COMMON_APPEND}"
+ <h:commandButton id="append-button" action="#{prefs.selectedEntry.appendLine}" value="#{bundle.COMMON_APPEND}"
styleClass="portlet-form-button"/>
</fieldset>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2008-09-24 19:35:00 UTC (rev 11971)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2008-09-24 23:07:35 UTC (rev 11972)
@@ -22,7 +22,7 @@
<tr>
<td class="dotted-blue-vert-rt">
- <h:form>
+ <h:form id="edit-prop-form">
<!-- defines layout of property form -->
<table>
<tbody>
@@ -59,7 +59,7 @@
</tbody>
</table>
<!-- ends layout of property form -->
- <h:commandButton value="#{bundle.COMMON_ADD_PROPERTY_BUTTON}"
+ <h:commandButton id="add-property" value="#{bundle.COMMON_ADD_PROPERTY_BUTTON}"
styleClass="portlet-form-button portlet-section-buttonrow"
action="#{properties.action.updateProperty}"/></h:form>
@@ -81,9 +81,9 @@
<tr>
<td class="portlet-section-body" valign="top">
- <h:form>
+ <h:form id="manage-prop-form">
<!-- defines layout of property table -->
- <h:dataTable value="#{properties.entries}" width="100%" headerClass="portlet-section-header"
+ <h:dataTable id="prop-data-table" value="#{properties.entries}" width="100%" headerClass="portlet-section-header"
styleClass="datatable full-width"
rowClasses="portlet-section-body, portlet-section-alternate" var="prop">
<h:column>
@@ -100,15 +100,15 @@
</h:column>
<h:column>
<f:facet name="header">#{bundle.COMMON_VALUE}</f:facet>
- <h:selectBooleanCheckbox value="#{prop.value}"
+ <h:selectBooleanCheckbox id="prop-read-check" value="#{prop.value}"
readonly="#{prop.readOnly}"
rendered="#{prop.type == 'java.lang.Boolean'}"/>
- <h:inputText styleClass="portlet-form-input-field" value="#{prop.value}"
+ <h:inputText id="prop-value-input" styleClass="portlet-form-input-field" value="#{prop.value}"
readonly="#{prop.readOnly}"
rendered="#{prop.type eq 'java.lang.String' and prop.name ne 'portal.windowInitialState'}"/>
- <h:selectOneMenu styleClass="portlet-form-input-field"
+ <h:selectOneMenu id="prop-value-select" styleClass="portlet-form-input-field"
value="#{prop.value}"
rendered="#{prop.type eq 'java.lang.String' and prop.name eq 'portal.windowInitialState' and (!portalobjectmgr.maximizedStateExists or prop.value eq 'MAXIMIZED')}">
<f:selectItem itemLabel="Choose One..." itemValue=""/>
@@ -117,7 +117,7 @@
<f:selectItem itemLabel="Normal" itemValue="NORMAL"/>
</h:selectOneMenu>
- <h:selectOneMenu styleClass="portlet-form-input-field"
+ <h:selectOneMenu id="prop-value-select1" styleClass="portlet-form-input-field"
value="#{prop.value}" disabled="true"
rendered="#{prop.type eq 'java.lang.String' and prop.name eq 'portal.windowInitialState' and (portalobjectmgr.maximizedStateExists and prop.value ne 'MAXIMIZED')}">
<f:selectItem itemLabel="Minimized" itemValue="MINIMIZED"/>
@@ -127,7 +127,7 @@
</h:column>
<h:column>
<f:facet name="header">#{bundle.COMMON_DELETE}</f:facet>
- <h:commandLink action="#{properties.action.removeProperty}"
+ <h:commandLink id="delete" action="#{properties.action.removeProperty}"
rendered="#{!prop.inherited}">
<h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/>
<f:param name="name" value="#{prop.name}"/>
@@ -136,9 +136,8 @@
</h:dataTable>
<!-- ends property list -->
- <h:commandButton value="#{bundle.COMMON_UPDATE}"
+ <h:commandButton id="update" value="#{bundle.COMMON_UPDATE}"
styleClass="portlet-form-button portlet-section-buttonrow"/></h:form>
-
</td>
</tr>
</table>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml 2008-09-24 19:35:00 UTC (rev 11971)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml 2008-09-24 23:07:35 UTC (rev 11972)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core">
<f:loadBundle basename="Resource" var="bundle" />
- <h:form>
+ <h:form id="edit-security-form">
<table class="datatable full-width">
<thead class="portlet-section-header">
<tr>
@@ -37,8 +37,8 @@
</table>
<br />
<div>
- <h:commandButton value="#{bundle.COMMON_UPDATE}" action="#{auth.submit}" styleClass="portlet-form-button"/>
- <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{auth.cancel}" styleClass="portlet-form-button" immediate="true"/>
+ <h:commandButton id="update" value="#{bundle.COMMON_UPDATE}" action="#{auth.submit}" styleClass="portlet-form-button"/>
+ <h:commandButton id="cancel" value="#{bundle.COMMON_CANCEL}" action="#{auth.cancel}" styleClass="portlet-form-button" immediate="true"/>
</div>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2008-09-24 19:35:00 UTC (rev 11971)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2008-09-24 23:07:35 UTC (rev 11972)
@@ -2,7 +2,7 @@
xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core">
<f:loadBundle basename="Resource" var="bundle" />
- <h:form>
+ <h:form id="edit-theme-form">
<table class="full-width datatable">
<thead class="portlet-section-header">
<tr>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml 2008-09-24 19:35:00 UTC (rev 11971)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml 2008-09-24 23:07:35 UTC (rev 11972)
@@ -5,7 +5,7 @@
xmlns:f="http://java.sun.com/jsf/core">
<f:loadBundle basename="Resource" var="bundle" />
- <h:form>
+ <h:form id="edit-window-theme-form">
<table class="full-width datatable">
<thead class="portlet-section-header">
<tr>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml 2008-09-24 19:35:00 UTC (rev 11971)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml 2008-09-24 23:07:35 UTC (rev 11972)
@@ -6,13 +6,13 @@
xmlns:c="http://java.sun.com/jstl/core">
<f:loadBundle basename="Resource" var="bundle" />
- <h:form>
+ <h:form id="show-portlet-detail-form">
<p class="portlet-area-header">#{bundle.COMMON_PORTLET_INSTANCE_INFORMATION}</p>
- <h:panelGrid columns="3" styleClass="panelGrid-basic">
+ <h:panelGrid id="detail-panel" columns="3" styleClass="panelGrid-basic">
<f:subview id="field1">
<dl>
<dt class="portlet-form-field-label">#{bundle.COMMON_PORTLET_NAME}:</dt>
- <dd><h:commandLink
+ <dd><h:commandLink id="select"
action="#{portletmgr.selectPortlet}">
<f:param name="id" value="#{portlet.context.id}"/>
<f:param name="plugin" value="manager"/>
@@ -59,19 +59,19 @@
<h:selectOneMenu id="locales" value="#{instanceDisplayNameAction.newLocale}">
<f:selectItems value="#{instanceDisplayNameAction.locales}"/>
</h:selectOneMenu>
- <h:commandButton value="#{instanceDisplayNameAction.newText ne null ? 'Modify' : 'Add'} Name" action="#{instanceDisplayNameAction.addDisplayName}"
+ <h:commandButton id="addDisplay" value="#{instanceDisplayNameAction.newText ne null ? 'Modify' : 'Add'} Name" action="#{instanceDisplayNameAction.addDisplayName}"
styleClass="portlet-form-button"/>
</div>
</h:form>
</div>
<div class="float-left two-third-width-pad5">
- <h:form>
+ <h:form id="instance-display-form">
<h3 class="sectionTitle zero">#{bundle.COMMON_CURRENT_INSTANCE_DISPLAY_NAMES}</h3>
<div class="portlet-area-body">
- <h:dataTable var="value" value="#{instanceDisplayNameAction.currentLocales}" styleClass="objectList datatable"
+ <h:dataTable id="locale-data-table" var="value" value="#{instanceDisplayNameAction.currentLocales}" styleClass="objectList datatable"
rowClasses="portlet-section-body,portlet-section-alternate"
columnClasses="objectNameColumn, objectActionColumn"
headerClass="portlet-section-header">
@@ -92,7 +92,7 @@
<h:outputText value="#{bundle.COMMON_DELETE}"/>
</f:facet>
- <div style="width:150px"><h:commandLink action="#{instanceDisplayNameAction.editDisplayName}">
+ <div style="width:150px"><h:commandLink id="delete-link" action="#{instanceDisplayNameAction.editDisplayName}">
<h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/>
<f:param name="locale" value="#{value.locale}"/>
<f:param name="editAction" value="delete"/>
@@ -103,7 +103,7 @@
<h:outputText value="#{bundle.RENAME}"/>
</f:facet>
- <div style="width:150px"><h:commandLink action="#{instanceDisplayNameAction.editDisplayName}">
+ <div style="width:150px"><h:commandLink id="edit-link" action="#{instanceDisplayNameAction.editDisplayName}">
<h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/>
<f:param name="locale" value="#{value.locale}"/>
<f:param name="editAction" value="rename"/>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml 2008-09-24 19:35:00 UTC (rev 11971)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml 2008-09-24 23:07:35 UTC (rev 11972)
@@ -11,10 +11,10 @@
<ui:composition template="instancesTemplate.xhtml">
<ui:define name="content">
- <h:form>
+ <h:form id="confirm-delete-form">
<ul class="objectpath">
<li class="pathItem">
- <h:commandLink action="instances">#{bundle.PORTLET_INSTANCES}</h:commandLink>
+ <h:commandLink id="instance-link" action="instances">#{bundle.PORTLET_INSTANCES}</h:commandLink>
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
@@ -36,12 +36,12 @@
<p class="portlet-class">#{bundle.ARE_YOU_SURE_DELETE}</p>
- <h:form>
- <h:commandButton value="#{bundle.COMMON_DELETE}" action="instances" actionListener="#{instancemgr.deleteInstance}"
+ <h:form id="confirm-delete-form1">
+ <h:commandButton id="delete" value="#{bundle.COMMON_DELETE}" action="instances" actionListener="#{instancemgr.deleteInstance}"
styleClass="portlet-form-button portlet-section-buttonrow">
<f:attribute name="instanceId" value="#{instancemgr.selectedInstance.id}"/>
</h:commandButton>
- <h:commandButton value="#{bundle.COMMON_CANCEL}" action="instances" actionListener="objects"
+ <h:commandButton id="cancel" value="#{bundle.COMMON_CANCEL}" action="instances" actionListener="objects"
styleClass="portlet-form-button portlet-section-buttonrow"/>
</h:form>
</div>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml 2008-09-24 19:35:00 UTC (rev 11971)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml 2008-09-24 23:07:35 UTC (rev 11972)
@@ -8,17 +8,17 @@
<!-- Common nav -->
<f:loadBundle basename="Resource" var="bundle" />
- <h:form>
+ <h:form id="dashboard-temp-form">
<ul class="topnav">
<li>
- <h:commandLink value="#{bundle.PORTAL_OBJECTS}" action="objects"
+ <h:commandLink id="obj-link" value="#{bundle.PORTAL_OBJECTS}" action="objects"
actionListener="#{portalobjectmgr.selectRootObject}"/>
</li>
<li>
- <h:commandLink value="#{bundle.PORTLET_INSTANCES}" action="instances"/>
+ <h:commandLink id="instance-link" value="#{bundle.PORTLET_INSTANCES}" action="instances"/>
</li>
<li>
- <h:commandLink value="#{bundle.PORTLET_DEFINITIONS}" action="#{portletmgr.selectPortlet}"/>
+ <h:commandLink id="def-link" value="#{bundle.PORTLET_DEFINITIONS}" action="#{portletmgr.selectPortlet}"/>
</li>
<li id="currentTab">#{bundle.DASHBOARDS}</li>
</ul>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml 2008-09-24 19:35:00 UTC (rev 11971)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml 2008-09-24 23:07:35 UTC (rev 11972)
@@ -11,7 +11,7 @@
<ui:define name="content">
<br/><br/>
<div class="float-left third-width-pad5">
- <h:form id="displayNameForm">
+ <h:form id="display-name-form">
<h3 class="sectionTitle zero">#{bundle.ADD_DISPLAY_NAMES}</h3>
<div class="portlet-area-body">
@@ -19,19 +19,19 @@
<h:selectOneMenu id="locales" value="#{addDisplayNameAction.newLocale}">
<f:selectItems value="#{addDisplayNameAction.locales}"/>
</h:selectOneMenu>
- <h:commandButton value="#{addDisplayNameAction.newText ne null ? 'Modify' : 'Add'} Name" action="#{addDisplayNameAction.addDisplayName}"
+ <h:commandButton id="add-display" value="#{addDisplayNameAction.newText ne null ? 'Modify' : 'Add'} Name" action="#{addDisplayNameAction.addDisplayName}"
styleClass="portlet-form-button"/>
</div>
</h:form>
</div>
<div class="float-left two-third-width-pad5">
- <h:form>
+ <h:form id="display-name-form1">
<h3 class="sectionTitle zero">#{bundle.CURRENT_DISPLAY_NAMES}</h3>
<div class="portlet-area-body">
- <h:dataTable var="value" value="#{addDisplayNameAction.currentLocales}" styleClass="objectList datatable"
+ <h:dataTable id="locale-datatable" var="value" value="#{addDisplayNameAction.currentLocales}" styleClass="objectList datatable"
rowClasses="portlet-section-body,portlet-section-alternate"
columnClasses="objectNameColumn, objectActionColumn"
headerClass="portlet-section-header">
@@ -52,7 +52,7 @@
<h:outputText value="#{bundle.COMMON_DELETE}"/>
</f:facet>
- <div style="width:150px"><h:commandLink action="#{addDisplayNameAction.editDisplayName}">
+ <div style="width:150px"><h:commandLink id="delete" action="#{addDisplayNameAction.editDisplayName}">
<h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/>
<f:param name="locale" value="#{value.locale}"/>
<f:param name="editAction" value="delete"/>
@@ -63,7 +63,7 @@
<h:outputText value="#{bundle.RENAME}"/>
</f:facet>
- <div style="width:150px"><h:commandLink action="#{addDisplayNameAction.editDisplayName}">
+ <div style="width:150px"><h:commandLink id="rename" action="#{addDisplayNameAction.editDisplayName}">
<h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/>
<f:param name="locale" value="#{value.locale}"/>
<f:param name="editAction" value="rename"/>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2008-09-24 19:35:00 UTC (rev 11971)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2008-09-24 23:07:35 UTC (rev 11972)
@@ -16,8 +16,8 @@
<c:otherwise><span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{bundle.PORTAL}</c:otherwise>
</c:choose>
</h3>
- <h:form>
- <h:commandLink action="editProperties" actionListener="#{portalobjectmgr.selectObject}"
+ <h:form id="edit-context-form">
+ <h:commandLink id="object-link" action="editProperties" actionListener="#{portalobjectmgr.selectObject}"
styleClass="actionProperties">
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
#{bundle.COMMON_PROPERTIES}
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2008-09-24 19:35:00 UTC (rev 11971)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2008-09-24 23:07:35 UTC (rev 11972)
@@ -13,37 +13,37 @@
#{portalobjectmgr.selectedObject.typeName}</h3>
<h:form id="admin-portal-form">
- <h:panelGroup rendered="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_PAGE}"><h:commandLink
- action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionLayout">
+ <h:panelGroup id="page-panel" rendered="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_PAGE}"><h:commandLink
+ id="edit-layout-link" action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionLayout">
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
#{bundle.PAGE_LAYOUT}
- </h:commandLink> | </h:panelGroup><h:commandLink action="editPageSecurity" styleClass="actionSecurity"
+ </h:commandLink> | </h:panelGroup><h:commandLink id="edit-security-link" action="editPageSecurity" styleClass="actionSecurity"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
#{bundle.SECURITY}
- </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties"
+ </h:commandLink> | <h:commandLink id="edit-prop-link" action="editProperties" styleClass="actionProperties"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
#{bundle.COMMON_PROPERTIES}
- </h:commandLink> | <h:commandLink action="editPageTheme" styleClass="actionTheme"
+ </h:commandLink> | <h:commandLink id="edit-theme-link" action="editPageTheme" styleClass="actionTheme"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
#{bundle.THEME}
- </h:commandLink><h:panelGroup
+ </h:commandLink><h:panelGroup id="page-panel1"
rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template')))}">
- | <h:commandLink
+ | <h:commandLink id="rename-link"
action="renameObject" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename">
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
#{bundle.RENAME}
</h:commandLink></h:panelGroup>
- | <h:commandLink
+ | <h:commandLink id="rename-display-link"
action="#{addDisplayNameAction.editDisplayNames}" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename">
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}" />
#{bundle.DISPLAY_NAMES}
</h:commandLink>
- <h:panelGroup
+ <h:panelGroup id="page-panel2"
rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.default)))}">
- | <h:commandLink action="confirm" styleClass="actionDelete"
+ | <h:commandLink id="confirm-link" action="confirm" styleClass="actionDelete"
actionListener="#{portalobjectmgr.selectDeletingObject}">
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
#{bundle.COMMON_DELETE}
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml 2008-09-24 19:35:00 UTC (rev 11971)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml 2008-09-24 23:07:35 UTC (rev 11972)
@@ -16,14 +16,14 @@
<p class="portlet-area-header">#{bundle.EVENT_LISTENER_BINDING}</p>
<div class="portlet-area-body tenpx-top-bottom">
- <h:form>
+ <h:form id="edit-prop-form">
<h:outputLabel for="listener" styleClass="portlet-form-field-label">
#{bundle.CHOOSE_ID_PORTALEVENTLISTENER} #{portalobjectmgr.selectedObjectType}:
</h:outputLabel>
<h:selectOneMenu id="listener" value="#{portalobjectmgr.selectedObject.listener}">
<f:selectItems value="#{portalobjectmgr.listenerIds}"/>
</h:selectOneMenu>
- <h:commandButton value="#{bundle.COMMON_UPDATE}" styleClass="portlet-form-button"/>
+ <h:commandButton id="update" value="#{bundle.COMMON_UPDATE}" styleClass="portlet-form-button"/>
</h:form>
</div>
</div>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2008-09-24 19:35:00 UTC (rev 11971)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2008-09-24 23:07:35 UTC (rev 11972)
@@ -63,7 +63,7 @@
<c:forEach begin="0" end="#{(instancemgr.instanceCount - 1)/ instancemgr.paginationSize}" step="1"
var="index">
<li class="#{index == (instancemgr.selectedFrom / instancemgr.paginationSize)? 'selected' : ''}">
- <h:commandLink action="#{instancemgr.selectFrom}">
+ <h:commandLink id="pagination-#{index}" action="#{instancemgr.selectFrom}">
<f:param name="from" value="#{index * instancemgr.paginationSize}"/>
<h:outputText value="#{index * instancemgr.paginationSize}"/>
</h:commandLink>
@@ -77,10 +77,10 @@
<c:if test="#{instancemgr.selectedPlugin == 'info'}">
<!-- Path nav -->
- <h:form>
+ <h:form id="instance-form1">
<ul class="objectpath">
<li class="pathItem">
- <h:commandLink action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink>
+ <h:commandLink id="instance-link" action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink>
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
@@ -105,10 +105,10 @@
<c:if test="#{instancemgr.selectedPlugin == 'preferences'}">
<!-- Path nav -->
- <h:form>
+ <h:form id="instance-form2">
<ul class="objectpath">
<li class="pathItem">
- <h:commandLink action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink>
+ <h:commandLink id="instance-link" action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink>
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
@@ -123,18 +123,18 @@
</ui:include>
<br />
<h:form>
- <h:commandButton value="#{bundle.SAVE}" action="#{instancemgr.updatePrefs}" styleClass="portlet-form-button"/>
- <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{instancemgr.cancelPrefs}" styleClass="portlet-form-button"/>
+ <h:commandButton id="save" value="#{bundle.SAVE}" action="#{instancemgr.updatePrefs}" styleClass="portlet-form-button"/>
+ <h:commandButton id="cancel" value="#{bundle.COMMON_CANCEL}" action="#{instancemgr.cancelPrefs}" styleClass="portlet-form-button"/>
</h:form>
</div>
</c:if>
<c:if test="#{instancemgr.selectedPlugin == 'security'}">
<!-- Path nav -->
- <h:form>
+ <h:form id="instance-form3">
<ul class="objectpath">
<li class="pathItem">
- <h:commandLink action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink>
+ <h:commandLink id="instance-link" action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink>
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2008-09-24 19:35:00 UTC (rev 11971)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2008-09-24 23:07:35 UTC (rev 11972)
@@ -9,10 +9,10 @@
<f:loadBundle basename="Resource" var="bundle"/>
-<h:form>
+<h:form id="obj-nav-form">
<c:if test="#{not empty portalobjectmgr.selectedObject.portals}">
- <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.portals}" styleClass="objectList datatable"
+ <h:dataTable id="portal-datatable" var="object" value="#{portalobjectmgr.selectedObject.portals}" styleClass="objectList datatable"
rowClasses="portlet-section-body,portlet-section-alternate"
columnClasses="objectNameColumn, objectActionColumn"
headerClass="portlet-section-header">
@@ -20,7 +20,7 @@
<f:facet name="header">
<h:outputText value="#{bundle.WIZARD_PORTAL}"/>
</f:facet>
- <h:commandLink action="#{portalobjectmgr.selectObject}">#{object.name}
+ <h:commandLink id="object-iid-link" action="#{portalobjectmgr.selectObject}">#{object.name}
<f:param name="id" value="#{object.id}"/>
</h:commandLink>
</h:column>
@@ -28,22 +28,22 @@
<f:facet name="header">
<h:outputText value="#{bundle.ACTIONS}"/>
</f:facet>
- <h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}"
+ <h:commandLink id="security-link" action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}"
styleClass="actionSecurity">
<f:param name="id" value="#{object.id}"/>
#{bundle.SECURITY}
- </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties"
+ </h:commandLink> | <h:commandLink id="prop-link" action="editProperties" styleClass="actionProperties"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>
#{bundle.COMMON_PROPERTIES}
- </h:commandLink> | <h:commandLink action="editPortalTheme" styleClass="actionTheme"
+ </h:commandLink> | <h:commandLink id="theme-link" action="editPortalTheme" styleClass="actionTheme"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>
#{bundle.THEME}
</h:commandLink>
- <h:panelGroup
+ <h:panelGroup id="obj-nav-panel"
rendered="#{(object.name != 'admin') and (object.name != 'template')}">
- | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}"
+ | <h:commandLink id="rename" action="renameObject" actionListener="#{portalobjectmgr.selectObject}"
styleClass="actionRename">
<h:outputText value="#{bundle.RENAME}"/>
<f:param name="id" value="#{object.id}"/>
@@ -51,26 +51,26 @@
</h:panelGroup>
<h:panelGroup
rendered="#{(object.name != 'admin') and (object.name != 'template') and (not object.default)}">
- | <h:commandLink action="confirm" styleClass="actionDelete"
+ | <h:commandLink id="delete" action="confirm" styleClass="actionDelete"
actionListener="#{portalobjectmgr.selectDeletingObject}">
<f:param name="id" value="#{object.id}"/>
#{bundle.COMMON_DELETE}
</h:commandLink>
</h:panelGroup>
- <h:panelGroup rendered="#{not object.default}"> | <h:commandLink styleClass="actionMakeDefault"
+ <h:panelGroup id="obj-nav-panel1" rendered="#{not object.default}"> | <h:commandLink id="default-link" styleClass="actionMakeDefault"
action="#{portalobjectmgr.makeObjectDefault}">
<f:param name="id" value="#{object.id}"/>
#{bundle.MAKE_DEFAULT}
</h:commandLink>
</h:panelGroup>
- <h:panelGroup rendered="#{object.default}"> | <h:outputText styleClass="actionDefault"
+ <h:panelGroup id="obj-nav-panel2" rendered="#{object.default}"> | <h:outputText styleClass="actionDefault"
value="#{bundle.DEFAULT}"/></h:panelGroup>
</h:column>
</h:dataTable>
</c:if>
<c:if test="#{not empty portalobjectmgr.selectedObject.pages}">
- <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.pages}" styleClass="objectList datatable"
+ <h:dataTable id="pages-datatable" var="object" value="#{portalobjectmgr.selectedObject.pages}" styleClass="objectList datatable"
columnClasses="objectNameColumn, objectActionColumn"
rowClasses="portlet-section-body,portlet-section-alternate"
headerClass="portlet-section-header">
@@ -78,7 +78,7 @@
<f:facet name="header">
<h:outputText value="#{bundle.WIZARD_PAGE}"/>
</f:facet>
- <h:commandLink action="#{portalobjectmgr.selectObject}">#{object.name}
+ <h:commandLink id="object-link" action="#{portalobjectmgr.selectObject}">#{object.name}
<f:param name="id" value="#{object.id}"/>
</h:commandLink>
</h:column>
@@ -86,39 +86,39 @@
<f:facet name="header">
<h:outputText value="#{bundle.ACTIONS}"/>
</f:facet>
- <h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}"
+ <h:commandLink id="edit-page-layout" action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}"
styleClass="actionLayout">
<f:param name="id" value="#{object.id}"/>
#{bundle.PAGE_LAYOUT}
- </h:commandLink> | <h:commandLink action="editPageSecurity" styleClass="actionSecurity"
+ </h:commandLink> | <h:commandLink id="security-link" action="editPageSecurity" styleClass="actionSecurity"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>
#{bundle.SECURITY}
- </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties"
+ </h:commandLink> | <h:commandLink id="prop-link" action="editProperties" styleClass="actionProperties"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>
#{bundle.COMMON_PROPERTIES}
- </h:commandLink> | <h:commandLink action="editPageTheme" styleClass="actionTheme"
+ </h:commandLink> | <h:commandLink id="theme-link" action="editPageTheme" styleClass="actionTheme"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>
#{bundle.THEME}
- </h:commandLink> | <h:commandLink action="renameObject" styleClass="actionRename"
+ </h:commandLink> | <h:commandLink id="rename-link" action="renameObject" styleClass="actionRename"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>
#{bundle.RENAME}
- </h:commandLink> | <h:commandLink action="#{addDisplayNameAction.editDisplayNames}" styleClass="actionRename"
+ </h:commandLink> | <h:commandLink id="rename-display" action="#{addDisplayNameAction.editDisplayNames}" styleClass="actionRename"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>
#{bundle.DISPLAY_NAMES}
</h:commandLink>
- <h:panelGroup
- rendered="#{not object.default}"> | <h:commandLink action="confirm" styleClass="actionDelete"
+ <h:panelGroup id="obj-nav-panel"
+ rendered="#{not object.default}"> | <h:commandLink id="delete-link" action="confirm" styleClass="actionDelete"
actionListener="#{portalobjectmgr.selectDeletingObject}">
<f:param name="id" value="#{object.id}"/>
#{bundle.COMMON_DELETE}
</h:commandLink>
</h:panelGroup>
- <h:panelGroup rendered="#{not object.default}"> | <h:commandLink styleClass="actionMakeDefault"
+ <h:panelGroup rendered="#{not object.default}"> | <h:commandLink id="default-link" styleClass="actionMakeDefault"
action="#{portalobjectmgr.makeObjectDefault}">
<f:param name="id" value="#{object.id}"/>
#{bundle.MAKE_DEFAULT}
@@ -137,7 +137,7 @@
<ui:param name="maximizedStateExists" value="#{portalobjectmgr.selectedObject.maximizedStateExists}"/>
- <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.windows}" styleClass="objectList datatable"
+ <h:dataTable id="windows-datatable" var="object" value="#{portalobjectmgr.selectedObject.windows}" styleClass="objectList datatable"
rowClasses="portlet-section-body,portlet-section-alternate"
columnClasses="objectNameColumn, objectActionColumn"
headerClass="portlet-section-header">
@@ -165,7 +165,7 @@
<h:outputText value="#{object.name}"
rendered="#{fn:startsWith(object.declaredProperties['portal.windowContentType'], 'widget/')}"/>
- <h:commandLink action="#{portalobjectmgr.selectObject}"
+ <h:commandLink id="window-name-link" action="#{portalobjectmgr.selectObject}"
rendered="#{! fn:startsWith(object.declaredProperties['portal.windowContentType'], 'widget/')}">
<h:outputText value="#{object.name}"/>
<f:param name="id" value="#{object.id}"/>
@@ -177,20 +177,20 @@
<f:facet name="header">
<h:outputText value="#{bundle.ACTIONS}"/>
</f:facet>
- <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}"
+ <h:commandLink id="theme-link" action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}"
styleClass="actionTheme">
<f:param name="id" value="#{object.id}"/>
#{bundle.THEME}
- </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties"
+ </h:commandLink> | <h:commandLink id="edit-prop-link" action="editProperties" styleClass="actionProperties"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>
<f:param name="maximizedStateExists" value="#{portalobjectmgr.selectedObject.maximizedStateExists}"/>
#{bundle.COMMON_PROPERTIES}
- </h:commandLink> | <h:commandLink action="renameObject" styleClass="actionRename"
+ </h:commandLink> | <h:commandLink id="rename-link" action="renameObject" styleClass="actionRename"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>
#{bundle.RENAME}
- </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectDeletingObject}"
+ </h:commandLink> | <h:commandLink id="delete-link" action="confirm" actionListener="#{portalobjectmgr.selectDeletingObject}"
styleClass="actionDelete">
<f:param name="id" value="#{object.id}"/>
#{bundle.COMMON_DELETE}
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2008-09-24 19:35:00 UTC (rev 11971)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2008-09-24 23:07:35 UTC (rev 11972)
@@ -92,10 +92,10 @@
<c:if test="#{portletmgr.selectedPlugin == 'manager'}">
<!-- Path nav -->
- <h:form>
+ <h:form id="man-form">
<ul class="objectpath">
<li class="pathItem">
- <h:commandLink action="#{portletmgr.selectPortlet}">#{bundle.PORTLET_DEFINITIONS}</h:commandLink>
+ <h:commandLink id="def-link" action="#{portletmgr.selectPortlet}">#{bundle.PORTLET_DEFINITIONS}</h:commandLink>
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
@@ -112,10 +112,10 @@
<c:if test="#{portletmgr.selectedPlugin == 'preferences'}">
<!-- Path nav -->
- <h:form>
+ <h:form id="pref-form">
<ul class="objectpath">
<li class="pathItem">
- <h:commandLink action="#{portletmgr.selectPortlet}">#{bundle.PORTLET_DEFINITIONS}</h:commandLink>
+ <h:commandLink id="def-link" action="#{portletmgr.selectPortlet}">#{bundle.PORTLET_DEFINITIONS}</h:commandLink>
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml 2008-09-24 19:35:00 UTC (rev 11971)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml 2008-09-24 23:07:35 UTC (rev 11972)
@@ -15,7 +15,7 @@
<p>#{bundle.RENAME_THE} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span>
#{portalobjectmgr.selectedObjectType} #{bundle.TO}:
<h:inputText id="newName" value="#{renameAction.newName}"/>
- <h:commandButton value="#{bundle.RENAME}" action="#{renameAction.execute}" styleClass="portlet-form-button"/>
+ <h:commandButton id="rename" value="#{bundle.RENAME}" action="#{renameAction.execute}" styleClass="portlet-form-button"/>
</p>
</h:form>
</ui:define>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml 2008-09-24 19:35:00 UTC (rev 11971)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml 2008-09-24 23:07:35 UTC (rev 11972)
@@ -26,7 +26,7 @@
<c:otherwise>
<c:choose>
<c:when test="#{newWindowWizard.enabled[0]}">
- <h:form><h:commandLink action="#{newWindowWizard.goTo}">
+ <h:form id="new-window-wiz-form"><h:commandLink id="goto-link" action="#{newWindowWizard.goTo}">
<f:param name="step" value="0"/>
<div class="wizardStepBox">
@@ -58,7 +58,7 @@
<c:otherwise>
<c:choose>
<c:when test="#{newWindowWizard.enabled[1]}">
- <h:form><h:commandLink action="#{newWindowWizard.goTo}">
+ <h:form id="new-window-wiz-form"><h:commandLink id="goto-link" action="#{newWindowWizard.goTo}">
<f:param name="step" value="1"/>
<div class="wizardStepBox">
@@ -90,7 +90,7 @@
<c:otherwise>
<c:choose>
<c:when test="#{newWindowWizard.enabled[2]}">
- <h:form><h:commandLink action="#{newWindowWizard.goTo}">
+ <h:form id="new-window-wiz-form"><h:commandLink id="goto-link" action="#{newWindowWizard.goTo}">
<f:param name="step" value="2"/>
<div class="wizardStepBox">
@@ -122,7 +122,7 @@
<c:otherwise>
<c:choose>
<c:when test="#{newWindowWizard.enabled[3]}">
- <h:form><h:commandLink action="#{newWindowWizard.goTo}">
+ <h:form id="new-window-wiz-form"><h:commandLink id="goto-link" action="#{newWindowWizard.goTo}">
<f:param name="step" value="3"/>
<div class="wizardStepBox">
@@ -154,7 +154,7 @@
<c:otherwise>
<c:choose>
<c:when test="#{newWindowWizard.enabled[4]}">
- <h:form><h:commandLink action="#{newWindowWizard.goTo}">
+ <h:form id="new-window-wiz-form"><h:commandLink id="goto-link" action="#{newWindowWizard.goTo}">
<f:param name="step" value="4"/>
<div class="wizardStepBox">
@@ -186,17 +186,17 @@
</div>
<div class="wizardButtonBox">
- <h:form>
- <h:commandButton rendered="#{newWindowWizard.currentStep gt 0}" value="#{bundle.WIZARD_PREVIOUS}"
+ <h:form id="wiz-nav-form">
+ <h:commandButton id="previous" rendered="#{newWindowWizard.currentStep gt 0}" value="#{bundle.WIZARD_PREVIOUS}"
action="#{newWindowWizard.previous}" styleClass="portlet-form-button"/>
- <h:commandButton
+ <h:commandButton id="next"
rendered="#{newWindowWizard.currentStep lt 4 and newWindowWizard.enabled[newWindowWizard.currentStep + 1]}"
value="#{bundle.WIZARD_NEXT}" action="#{newWindowWizard.next}" styleClass="portlet-form-button"/>
</h:form>
</div>
-<h:form>
- <p style="text-align: right;"><h:commandLink action="advancedMode">#{bundle.WIZARD_SWITCH_ADVANCED_MODE}</h:commandLink></p>
+<h:form id="advance-form">
+ <p style="text-align: right;"><h:commandLink id="advanced-link" action="advancedMode">#{bundle.WIZARD_SWITCH_ADVANCED_MODE}</h:commandLink></p>
</h:form>
</div>
</div>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowWizardConfirm.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowWizardConfirm.xhtml 2008-09-24 19:35:00 UTC (rev 11971)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowWizardConfirm.xhtml 2008-09-24 23:07:35 UTC (rev 11972)
@@ -28,9 +28,9 @@
</tr>
</table>
- <h:form>
- <h:commandButton value="#{bundle.WIZARD_CONFIRM}" action="#{newWindowWizard.createWindow}" styleClass="portlet-form-button"/>
- <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{newWindowWizard.cancel}" styleClass="portlet-form-button"/>
+ <h:form id="wiz-conf-form">
+ <h:commandButton id="confirm" value="#{bundle.WIZARD_CONFIRM}" action="#{newWindowWizard.createWindow}" styleClass="portlet-form-button"/>
+ <h:commandButton id="cancel" value="#{bundle.COMMON_CANCEL}" action="#{newWindowWizard.cancel}" styleClass="portlet-form-button"/>
</h:form>
</ui:define>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml 2008-09-24 19:35:00 UTC (rev 11971)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml 2008-09-24 23:07:35 UTC (rev 11972)
@@ -17,8 +17,8 @@
</tr>
</tbody>
<tbody>
- <h:form>
- <h:commandLink action="#{newWindowWizard.up}"
+ <h:form id="wiz-page-form">
+ <h:commandLink id="parent-link" action="#{newWindowWizard.up}"
rendered="#{newWindowWizard.selectedParentPage.type != PortalObject.TYPE_PORTAL}">
<h:outputText value="#{bundle.COMMON_UP}"/>
<f:param name="id" value="#{newWindowWizard.selectedParentPageId}"/>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml 2008-09-24 19:35:00 UTC (rev 11971)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml 2008-09-24 23:07:35 UTC (rev 11972)
@@ -16,12 +16,12 @@
</tr>
</tbody>
<tbody>
- <h:form>
+ <h:form id="portal-wiz-form">
<c:forEach items="#{newWindowWizard.portals}" var="object" varStatus="status">
<tr
class="#{object.id == newWindowWizard.selectedPortalId ? 'portlet-section-selected' : status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
<td>
- <h:commandLink action="#{newWindowWizard.selectPortal}">
+ <h:commandLink id="portal-link-#{status.index}" action="#{newWindowWizard.selectPortal}">
<h:outputText value="#{object.name}"/>
<f:param name="id" value="#{object.id}"/>
</h:commandLink>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml 2008-09-24 19:35:00 UTC (rev 11971)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml 2008-09-24 23:07:35 UTC (rev 11972)
@@ -7,17 +7,17 @@
<f:loadBundle basename="Resource" var="bundle" />
<ui:composition template="newWindowTpl.xhtml">
<ui:define name="content">
- <h:form>
+ <h:form id="portlet-wiz-form">
<h:outputLabel for="menu">
<h:outputText value="#{bundle.WIZARD_PORTLET_PROVIDER}: " styleClass="portlet-form-field-label"/>
</h:outputLabel>
<h:selectOneMenu id="menu" styleClass="portlet-form-field" value="#{portletmgr.selectedPortletInvokerId}">
<f:selectItems value="#{portletmgr.portletInvokerItems}"/>
</h:selectOneMenu>
- <h:commandButton value="#{bundle.WIZARD_CHANGE}" styleClass="portlet-form-button"/>
+ <h:commandButton id="wiz-change" value="#{bundle.WIZARD_CHANGE}" styleClass="portlet-form-button"/>
</h:form>
- <h:form>
+ <h:form id="portlet-wiz-form1">
<table class="full-width datatable">
<thead class="portlet-section-header">
<tr>
@@ -29,7 +29,7 @@
<tr
class="#{portlet.context.id == newWindowWizard.selectedPortletId ? 'portlet-section-selected' : (status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate')}">
<td title="#{portlet.description.value}">
- <h:commandLink action="#{newWindowWizard.selectPortlet}">
+ <h:commandLink id="portlet-link-#{status.index}" action="#{newWindowWizard.selectPortlet}">
<h:outputText>#{portlet.name}</h:outputText>
<f:param name="id" value="#{portlet.context.id}"/>
<f:param name="portletInvokerId" value="#{portletmgr.selectedPortletInvokerId}"/>
@@ -42,7 +42,7 @@
<c:forEach begin="0" end="#{(portletmgr.portletCount - 1)/portletmgr.paginationSize}" step="1"
var="index">
<li class="#{index == portletmgr.selectedFrom ? 'selected' : ''}">
- <h:commandLink action="#{portletmgr.selectFrom}">
+ <h:commandLink id="pagination-#{index}" action="#{portletmgr.selectFrom}">
<f:param name="from" value="#{index * portletmgr.paginationSize}"/>
<h:outputText value="#{index * portletmgr.paginationSize}"/>
</h:commandLink>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectRegion.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectRegion.xhtml 2008-09-24 19:35:00 UTC (rev 11971)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectRegion.xhtml 2008-09-24 23:07:35 UTC (rev 11972)
@@ -17,12 +17,12 @@
</tr>
</tbody>
<tbody>
- <h:form>
+ <h:form id="region-wiz-form">
<c:forEach items="#{newWindowWizard.regions}" var="object" varStatus="status">
<tr
class="#{object == newWindowWizard.selectedRegionId ? 'portlet-section-selected' : status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
<td>
- <h:commandLink action="#{newWindowWizard.selectRegion}">
+ <h:commandLink id="region-#{status.index}" action="#{newWindowWizard.selectRegion}">
<h:outputText value="#{object}"/>
<f:param name="name" value="#{object}"/>
</h:commandLink>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11971 - in branches/JBoss_Portal_Branch_2_6: core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard and 1 other directory.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-09-24 15:35:00 -0400 (Wed, 24 Sep 2008)
New Revision: 11971
Modified:
branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml
Log:
JBPORTAL-2173 silly mistake..should have been more careful
Modified: branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2008-09-24 16:12:39 UTC (rev 11970)
+++ branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2008-09-24 19:35:00 UTC (rev 11971)
@@ -47,7 +47,7 @@
are pushed to the http://repository.jboss.com site.
-->
- <componentref name="jboss-portal/modules/common" version="1.1-SNAPSHOT"/>
+ <componentref name="jboss-portal/modules/common" version="1.1.2"/>
<componentref name="jboss-portal/modules/web" version="1.1.0"/>
<componentref name="jboss-portal/modules/test" version="1.0.1.SP1"/>
<componentref name="jboss-portal/modules/portlet" version="1.0.3"/>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml 2008-09-24 16:12:39 UTC (rev 11970)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml 2008-09-24 19:35:00 UTC (rev 11971)
@@ -66,7 +66,7 @@
id="pageNameSelector"
value="#{dashboard.selectedPageName}"
styleClass="portlet-form-field"
- onchange="document.getElementById('page_selector_form').submit()">
+ onchange="document.getElementById('page-selector-form').submit()">
<f:selectItems value="#{dashboard.pageItems}"/>
</h:selectOneMenu>
</h:form>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11970 - in branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium: portal and 1 other directory.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2008-09-24 12:12:39 -0400 (Wed, 24 Sep 2008)
New Revision: 11970
Modified:
branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java
branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java
branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java
branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java
Log:
some tests id corrections, increased the value for timeout
Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2008-09-24 14:22:05 UTC (rev 11969)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2008-09-24 16:12:39 UTC (rev 11970)
@@ -73,8 +73,6 @@
selenium.waitForPageToLoad(PAGE_LOAD);
}
- //System.out.println(selenium.isElementPresent("_id15jbpnsabcsnpbj:themeSelector"));
- //System.out.println(selenium.getSelectedLabel("_id15jbpnsabcsnpbj:themeSelector"));
Assert.assertEquals("renaissance", selenium.getSelectedLabel(SELECT_THEME));
}
Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2008-09-24 14:22:05 UTC (rev 11969)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2008-09-24 16:12:39 UTC (rev 11970)
@@ -9,7 +9,7 @@
public class JBossPortalSeleniumTestCase {
protected Selenium selenium;
- protected static final String PAGE_LOAD = "50000";
+ protected static final String PAGE_LOAD = "150000";
@BeforeClass
public void setupChromeForLogin() throws Exception {
Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-09-24 14:22:05 UTC (rev 11969)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-09-24 16:12:39 UTC (rev 11970)
@@ -34,9 +34,9 @@
private static final String INPUT_CACHEEXP = "edit-cons-form:cache";
private static final String SUBMIT_ADDPROP_INIT = "producer-form:add-reg-prop";
private static final String SUBMIT_ADDPROP = "producer-form:add-reg-prop";
- private static final String INPUT_PROPHINT = "producer-form:reg-properties:0:_id33jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj";
- private static final String INPUT_PROPLABEL = "producer-form:reg-properties:0:_id30jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj";
- private static final String INPUT_PROPNAME = "producer-form:reg-properties:0:_id24jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj";
+ private static final String INPUT_PROPHINT = "producer-form:reg-properties:0:hint";
+ private static final String INPUT_PROPLABEL = "producer-form:reg-properties:0:label";
+ private static final String INPUT_PROPNAME = "producer-form:reg-properties:0:name";
private static final String SUBMIT_CREATECONS = "createConsumer:createConsumerButton";
private static final String INPUT_CREATECONS = "createConsumer:consumerName";
private static final String ID_LINK_PRODCONF = "cons-temp-form:producer-link";
Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2008-09-24 14:22:05 UTC (rev 11969)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2008-09-24 16:12:39 UTC (rev 11970)
@@ -11,19 +11,17 @@
@Test(groups = { "admin_portal" }, enabled = true, description = "Partal administrating.")
public class AdminPortalTestCase extends JBossPortalSeleniumTestCase {
- private static final String INPUT_SUBMIT_PAGECREATE = "_id65jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id67jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj";
- private static final String INPUT_PAGENAME = "_id65jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:pageName";
- private static final String INPUT_PORTALNAME = "_id33jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:name";
- private static final String INPUT_SUBMIT_CREATEPORTAL = "_id33jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id35jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj";
+ private static final String INPUT_SUBMIT_PAGECREATE = "create-page-form:create-page";
+ private static final String INPUT_PAGENAME = "create-page-form:pageName";
+ private static final String INPUT_PORTALNAME = "create-portal-form:name";
+ private static final String INPUT_SUBMIT_CREATEPORTAL = "create-portal-form:create-portal";
private final String TAB_PORTALOBJ_ID = "//div[@id='current']/a";
- // private final String LINK_PORTALS_ID =
- // "_id12jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id15jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj"
- // ;
+
private final String LINK_PORTALS_ID = "link=*Portal Objects*";
- private final String LINK_PORTAL_HOME = "_id12jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id15jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj";
+ private final String LINK_PORTAL_HOME = "_id8jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id11jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj";
- private final String TABLE_PORTAL_ADMIN = "//form[@id='_id39jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj']/table";
+ private final String TABLE_PORTAL_ADMIN = "//form[@id='_id33jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj']/table";
private final String POR_TL_MAIN = "_id39jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id40jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id43jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj";
private final String POR_TL_SECURITY = "_id39jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id40jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id48jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj";
private final String POR_TL_PROPERTIES = "_id39jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id40jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id52jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj";
@@ -32,7 +30,7 @@
private final String POR_TL_DELETE = "_id39jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id40jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id66jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj";
private final String POR_TL_MAKEDEF = "_id39jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id40jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id71jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj";
- private final String TABLE_PORTALPAGE_ADMIN = "//form[@id='_id71jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj']/table";
+ private final String TABLE_PORTALPAGE_ADMIN = "//form[@id='_id64jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj']/table";
private final String PAG_TL_MAIN = "_id71jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id72jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id75jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj";
private final String PAG_TL_LAYOUT = "_id71jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id72jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id80jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj";
private final String PAG_TL_SECURITY = "_id71jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id72jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:{0}:_id84jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj";
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11969 - in branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests: src/org/jboss/portal/test/selenium and 1 other directories.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2008-09-24 10:22:05 -0400 (Wed, 24 Sep 2008)
New Revision: 11969
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/PortletUserCreationTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSDirectoryTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java
Log:
selenium tests update
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2008-09-24 14:15:14 UTC (rev 11968)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2008-09-24 14:22:05 UTC (rev 11969)
@@ -20,6 +20,7 @@
<property name="selsrv.dir" location="selenium-rc-server" />
<property name="node0" value="localhost" />
<property name="jboss.test.home" value="${env.JBOSS_TEST_HOME}" />
+ <property name="jboss.home" value="${env.JBOSS_HOME}" />
<property name="jboss.test.jar" value="${env.JBOSSTESTJAR}" />
<property name="jboss.portal.dir" value="${env.JBOSS_UNZIPED_DIR}" />
<property name="portal_archive" value="${env.JBOSS_ARCHIVE}" />
@@ -42,35 +43,14 @@
</path>
<taskdef name="testng" classpathref="libraries.cp" classname="org.testng.TestNGAntTask" />
-
- <taskdef name="config" classname="org.jboss.ant.taskdefs.server.ConfigManagerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader">
- <classpath id="server.taskdef.classpath">
- <path refid="jboss.test.classpath" />
- </classpath>
- </taskdef>
- <taskdef name="start" classname="org.jboss.ant.taskdefs.server.StartServerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader">
- <classpath refid="server.taskdef.classpath" />
- </taskdef>
- <taskdef name="stop" classname="org.jboss.ant.taskdefs.server.StopServerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader">
- <classpath refid="server.taskdef.classpath" />
- </taskdef>
-
- <target name="init">
+
+<target name="init">
<echo message="Browser : ${browser}" />
<echo message="Workspace : ${workspace}" />
<echo message="Deleting testng report directory"/>
<delete dir="${testng.output.dir}"/>
</target>
- <!--target name="server-config" depends="unpack-portal"-->
- <server:config javaHome="${java.home}" jbossHome="${jboss.test.home}/${jboss.portal.dir}/">
- <server name="${portal.instance}" host="${node0}">
- <!-- jvmarg value="${jpda.cmdline}" / -->
- <jvmarg value="-Xmx512m" />
- <sysproperty key="java.endorsed.dirs" value="${jboss.test.home}/${jboss.portal.dir}/lib/endorsed" />
- </server>
- </server:config>
- <!--/target-->
<target name="compile" depends="">
<echo message="Compiling testsuite" />
@@ -96,22 +76,11 @@
<echo taskname="selenium-shutdown" message="DGF Errors during shutdown are expected" />
</target>
- <target name="unpack-portal">
- <echo message="Going to unpack ${portal_archive} into ${jboss.test.home}" />
- <unzip src="${portal_archive}" dest="${jboss.test.home}" />
- <chmod file="${jboss.test.home}/${jboss.portal.dir}/bin/run.sh" perm="u+x" />
- </target>
-
- <target name="copyApps" depends="unpack-portal">
+ <target name="copyApps">
<echo message="Copying userInterceptor portlet into the ${portal.instance} server"/>
- <copy file="apps/userDetail-portlet.war" tofile="${jboss.test.home}/${jboss.portal.dir}/server/${portal.instance}/deploy/userDetail-portlet.war"/>
+ <copy file="apps/userDetail-portlet.war" tofile="${jboss.home}/server/${portal.instance}/deploy/userDetail-portlet.war"/>
</target>
- <target name="delete-portal">
- <echo message="Going to delete directory ${jboss.test.home}" />
- <delete dir="${jboss.test.home}/${jboss.portal.dir}/" />
- </target>
-
<target name="clean">
<echo message="Going to delete directory ${test.build.dir}" />
<delete dir="${test.build.dir}" />
@@ -120,26 +89,12 @@
<target name="cleanup">
<echo message="Cleaning up..." />
<antcall target="stop-src" />
- <antcall target="delete-portal" />
</target>
- <target name="reports">
- <mkdir dir="${junit.report.dir}" />
- <junitreport todir="test-report">
- <fileset dir="test-output">
- <include name="*/*.xml" />
- </fileset>
+ <target name="selenium-test" depends="init, compile, run-src">
- <report format="noframes" todir="test-report" />
- </junitreport>
- </target>
-
- <target name="selenium-test" depends="init, compile, unpack-portal, run-src">
<antcall target="copyApps" />
- <echo message="Starting portal instance : ${portal.instance}" />
- <server:start name="${portal.instance}" />
-
<echo message="Runing TestNG" />
<mkdir dir="test-output" />
<testng classpathref="test.cp" sourcedir="${test.src.dir}" outputdir="test-output"
@@ -147,16 +102,12 @@
<xmlfileset dir="." includes="testng.xml" />
- <!--classfileset dir="${test.build.dir}"
- includes="org/jboss/portal/test/selenium/*Test.class" / -->
<sysproperty key="browser" value="${browser}" />
<sysproperty key="workspace" value="${workspace}"/>
<jvmarg value="-ea" />
</testng>
- <echo message="Stoping portal instance : ${portal.instance}" />
- <server:stop name="${portal.instance}" />
<antcall target="cleanup" />
</target>
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2008-09-24 14:15:14 UTC (rev 11968)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2008-09-24 14:22:05 UTC (rev 11969)
@@ -10,6 +10,14 @@
@Test(groups = { "cms_dashboard" }, enabled = true, description = "Dashboard issues test case.")
public class DashboardTestCase extends JBossPortalSeleniumTestCase {
+ private static final String SELECT_PAGE = "page-selector-form:pageNameSelector";
+ private static final String INPUT_PAGENAME = "dashboard-form:pageName";
+ private static final String SUBMIT_CREATEPAGE = "dashboard-form:save-button";
+ private static final String SELECT_LAYOUT = "dashboardLayoutForm:layoutSelector";
+ private static final String SUBMIT_LAYOUTSEL = "dashboardLayoutForm:update-layout";
+ private static final String SELECT_THEME = "dashboardThemeForm:themeSelector";
+ private static final String SUBMIT_THEMESEL = "dashboardThemeForm:update-theme";
+
@BeforeMethod(groups = { "log" })
public void loginBeforeTest() {
//selenium.setSpeed("3000");
@@ -27,8 +35,8 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Configure dashboard");
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.type("_id3jbpnsabcsnpbj:pageName", "DashTestPage");
- selenium.click("_id3jbpnsabcsnpbj:_id4jbpnsabcsnpbj");
+ selenium.type(INPUT_PAGENAME, "DashTestPage");
+ selenium.click(SUBMIT_CREATEPAGE);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Dashboard");
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -38,59 +46,65 @@
Assert.assertTrue(selenium.isTextPresent("Powered by JBoss Portal"));
}
- @Test(enabled = false, dependsOnMethods = { "testCreatePage" })
+ @Test(enabled = true, dependsOnMethods = { "testCreatePage" })
public void testUpdateTheme() {
selenium.click("link=Dashboard");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Configure dashboard");
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.select("page_selector_form:pageNameSelector", "label=DashTestPage");
- selenium.waitForPageToLoad(PAGE_LOAD);
+
+
+ System.out.println(selenium.getSelectedLabel(SELECT_PAGE));
+ if (!selenium.getSelectedLabel(SELECT_PAGE).equals("DashTestPage"))
+ selenium.select(SELECT_PAGE, "label=DashTestPage");
+
+ //selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.select("_id15jbpnsabcsnpbj:themeSelector", "label=renaissance");
- selenium.click("_id15jbpnsabcsnpbj:_id18jbpnsabcsnpbj");
+ selenium.select(SELECT_THEME, "label=renaissance");
+ selenium.click(SUBMIT_THEMESEL);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Dashboard");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Configure dashboard");
selenium.waitForPageToLoad(PAGE_LOAD);
- if (!selenium.getSelectedLabel("page_selector_form:pageNameSelector").equals("DashTestPage")) {
- selenium.select("page_selector_form:pageNameSelector", "label=DashTestPage");
+ if (!selenium.getSelectedLabel(SELECT_PAGE).equals("DashTestPage")) {
+ selenium.select(SELECT_PAGE, "label=DashTestPage");
selenium.waitForPageToLoad(PAGE_LOAD);
}
//System.out.println(selenium.isElementPresent("_id15jbpnsabcsnpbj:themeSelector"));
//System.out.println(selenium.getSelectedLabel("_id15jbpnsabcsnpbj:themeSelector"));
- Assert.assertEquals("renaissance", selenium.getSelectedLabel("_id15jbpnsabcsnpbj:themeSelector"));
+ Assert.assertEquals("renaissance", selenium.getSelectedLabel(SELECT_THEME));
}
- @Test(enabled = false, dependsOnMethods = { "testCreatePage" })
+ @Test(enabled = true, dependsOnMethods = { "testCreatePage" })
public void testUpdateLayout() {
selenium.click("link=Dashboard");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Configure dashboard");
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.select("page_selector_form:pageNameSelector", "label=DashTestPage");
- selenium.waitForPageToLoad(PAGE_LOAD);
+ if (!selenium.getSelectedLabel(SELECT_PAGE).equals("DashTestPage"))
+ selenium.select(SELECT_PAGE, "label=DashTestPage");
+ //selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertEquals("default", selenium.getSelectedLabel("_id10jbpnsabcsnpbj:layoutSelector"));
+ Assert.assertEquals("default", selenium.getSelectedLabel(SELECT_LAYOUT));
- selenium.select("_id10jbpnsabcsnpbj:layoutSelector", "label=generic");
- selenium.click("_id15jbpnsabcsnpbj:_id18jbpnsabcsnpbj");
+ selenium.select(SELECT_LAYOUT, "label=generic");
+ selenium.click(SUBMIT_LAYOUTSEL);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Dashboard");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Configure dashboard");
selenium.waitForPageToLoad(PAGE_LOAD);
- if (!selenium.getSelectedLabel("page_selector_form:pageNameSelector").equals("DashTestPage")) {
- selenium.select("page_selector_form:pageNameSelector", "label=DashTestPage");
+ if (!selenium.getSelectedLabel(SELECT_PAGE).equals("DashTestPage")) {
+ selenium.select(SELECT_PAGE, "label=DashTestPage");
selenium.waitForPageToLoad(PAGE_LOAD);
}
- Assert.assertEquals("generic", selenium.getSelectedLabel("_id10jbpnsabcsnpbj:layoutSelector"));
+ Assert.assertEquals("generic", selenium.getSelectedLabel(SELECT_LAYOUT));
}
@Test(enabled = true, dependsOnMethods = { "testCreatePage" })
@@ -100,8 +114,9 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Configure dashboard");
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.select("page_selector_form:pageNameSelector", "label=DashTestPage");
- selenium.waitForPageToLoad(PAGE_LOAD);
+ if (!selenium.getSelectedLabel(SELECT_PAGE).equals("DashTestPage"))
+ selenium.select(SELECT_PAGE, "label=DashTestPage");
+ //selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Who's online portlet");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("layoutForm:a_center");
@@ -115,14 +130,15 @@
Assert.assertTrue(selenium.isTextPresent("[admin]"));
}
- @Test(enabled = false, dependsOnMethods = { "testCreatePage" })
+ @Test(enabled = true, dependsOnMethods = { "testCreatePage" })
public void testAddGooglePortlet() {
selenium.click("link=Dashboard");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Configure dashboard");
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.select("page_selector_form:pageNameSelector", "label=DashTestPage");
- selenium.waitForPageToLoad(PAGE_LOAD);
+ if (!selenium.getSelectedLabel(SELECT_PAGE).equals("DashTestPage"))
+ selenium.select(SELECT_PAGE, "label=DashTestPage");
+ //selenium.waitForPageToLoad(PAGE_LOAD);
selenium.select("abc:instanceId", "label=widget/google");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Hindu God of the Week");
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2008-09-24 14:15:14 UTC (rev 11968)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2008-09-24 14:22:05 UTC (rev 11969)
@@ -1,5 +1,7 @@
package org.jboss.portal.test.selenium;
+import java.text.MessageFormat;
+
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
@@ -14,60 +16,61 @@
@Test(groups = { "admin_ui" }, enabled = true)
public class IdentityAdminTestCase extends JBossPortalSeleniumTestCase {
- public static final String ID_SUBMIT_CONF_CREATE_USER = "_id25jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:admin";
- public static final String ID_SUBMIT_DELETE_ROLE = "_id31jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:_id33jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj";
- //private static final String ID_BUT_DELETE_ROLE = "_id21jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:userlist:2:_id38jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj";
- public static final String ID_SUBMIT_ROLE_CREATE = "_id24jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:_id29jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj";
- public static final String ID_INPUT_ROLEDISNAME = "_id24jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:roledisplayname";
- public static final String ID_INPUT_ROLENAME = "_id24jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:rolename";
- public static final String ID_BUT_ROLE_CREATE = "_id43jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:_id45jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj";
- public static final String ID_BUT_SUBMIT_DEL_USER = "_id32jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:_id34jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj";
- //private static final String ID_BUT_USER_DELETE = "_id28jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:userlist:0:_id60jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj";
- public static final String ID_SUBMIT_ASSIGN_ROLE = "_id28jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:_id31jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj";
- //private static final String ID_BUT_SEARCHED_USER_ROLES = "_id28jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:userlist:0:_id51jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj";
- public static final String ID_SUBMIT_CREATE_USER = "_id25jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:submit";
- public static final String ID_INPUT_PASSWORD_CHK = "_id25jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:passwordCheck";
- public static final String ID_INPUT_PASSWORD = "_id25jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:password";
- public static final String ID_INPUT_USEREMAIL = "_id25jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:email";
- public static final String ID_INPUT_USERNAME = "_id25jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:username";
- public static final String ID_SUBMIT_SEARCH_USER = "_id24jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:search";
- public static final String ID_INPUT_SEARCH_USER = "_id24jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:searchString";
- public static final String ID_BUT_SEARCH_USER = "_id20jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:_id22jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj";
- public static final String ID_LINK_USERTAB = "_id1jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:_id3jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj";
- public static final String ID_LINK_USERMAIN = "_id9jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:_id12jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj";
- public static final String ID_LINK_ROLETAB = "_id1jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:_id5jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj";
- public static final String ID_LINK_ROLEMAIN = "_id9jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:_id12jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj";
- public static final String ID_LINK_CREATE_USER = "_id20jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:_id23jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj";
-
- private String butSeaUsrRol_id(String userName){
- String table ="_id28jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:userlist";
+ public static final String LINK_T_USRLIST_DEL = "search-user-form1:userlist:{0}:delete-user-link";
+ public static final String LINK_T_USRLIST_ROLES = "search-user-form1:userlist:{0}:assign-role-link";
+ public static final String LINK_T_ROLLIST_DEL = "roles-form:userlist:{0}:delete-role-link";
+ public static final String TABLE_ROLELIST = "roles-form:userlist";
+ public static final String TABLE_USERLIST = "search-user-form1:userlist";
+ public static final String ID_SUBMIT_CONF_CREATE_USER = "confirm-form:admin";
+ public static final String ID_SUBMIT_DELETE_ROLE = "delete-role-form:confirm";
+ public static final String ID_SUBMIT_ROLE_CREATE = "create-role-form:submit";
+ public static final String ID_INPUT_ROLEDISNAME = "create-role-form:roledisplayname";
+ public static final String ID_INPUT_ROLENAME = "create-role-form:rolename";
+ public static final String ID_BUT_ROLE_CREATE = "create-role-form:create-role-link";
+ public static final String ID_BUT_SUBMIT_DEL_USER = "delete-user-form:submit";
+ public static final String ID_SUBMIT_ASSIGN_ROLE = "assign-roles-form:submit";
+ public static final String ID_SUBMIT_USER_ROLE = "register-role-form:submit";
+ public static final String ID_SUBMIT_CREATE_USER = "register-form:submit";
+ public static final String ID_INPUT_PASSWORD_CHK = "register-form:passwordCheck";
+ public static final String ID_INPUT_PASSWORD = "register-form:password";
+ public static final String ID_INPUT_USEREMAIL = "register-form:email";
+ public static final String ID_INPUT_USERNAME = "register-form:username";
+ public static final String ID_SUBMIT_SEARCH_USER = "search-user-form:search";
+ public static final String ID_INPUT_SEARCH_USER = "search-user-form:searchString";
+ public static final String LINK_SEARCH_USER = "user-form:search-user-link";
+ public static final String ID_LINK_USERTAB = "role-temp-form:manage-users";
+ public static final String ID_LINK_USERMAIN = "user-temp-form1:user-adm-link";
+ public static final String ID_LINK_ROLETAB = "user-temp-form:role-mgm-link";
+ public static final String ID_LINK_ROLEMAIN = "role-temp-form1:role-mgm-link";
+ public static final String LINK_USERMANG_MAIN = "user-temp-form1:assign-role-link";
+ public static final String LINK_USERMANG_MAIN2 = "user-temp-form1:user-mgm-link";
+ public static final String ID_LINK_CREATE_USER = "user-form:create-user-link";
+
+ public static final String ID_CHECK_ROLE = "//input[@name=''assign-roles-form:roles'' and @value=''{0}'']";
+
+ private String butDelUsr_id(String userName) {
+ String table = TABLE_USERLIST;
int r = findTableRow(table, userName, 0);
- return "_id28jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:userlist:"+(r-1)+":_id51jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj";
+ return MessageFormat.format(LINK_T_USRLIST_DEL, r - 1);
}
-
- private String butDelUsr_id(String userName){
- String table = "_id28jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:userlist";
- int r = findTableRow(table, userName, 0);
- return "_id28jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:userlist:"+(r-1)+":_id60jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj";
- }
-
- private String butDelRol_id(String roleName){
- String table = "_id21jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:userlist";
+
+ private String butDelRol_id(String roleName) {
+ String table = TABLE_ROLELIST;
int r = findTableRow(table, roleName, 0);
- return "_id21jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:userlist:"+(r-1)+":_id38jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj";
+ return MessageFormat.format(LINK_T_ROLLIST_DEL, r - 1);
}
-
- private String butUsrRol_id(String userName){
- String table ="_id28jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:userlist";
+
+ private String butUsrRol_id(String userName) {
+ String table = TABLE_USERLIST;
int r = findTableRow(table, userName, 0);
- return "_id28jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:userlist:"+(r-1)+":_id51jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj";
+ return MessageFormat.format(LINK_T_USRLIST_ROLES, r - 1);
}
-
+
@BeforeMethod(groups = { "log" })
public void loginBeforeTest() {
login("admin", "admin");
- }
-
+ }
+
@AfterMethod(groups = { "log" })
public void logoutAfterTest() {
logout();
@@ -115,60 +118,61 @@
createUser(user, "tempPassword", userMail);
createRole(role, "tempRoleDisplay");
assignRole(user, userMail, role, roleDisplay);
-
+
deassignRole(user, userMail, role, roleDisplay);
deleteRole(role);
deleteUser(user, userMail);
}
- private void assignRole(String user, String email, String role, String roleDisplay) {
+ void assignRole(String user, String email, String role, String roleDisplay) {
searchUser(user, email);
- selenium.click(butSeaUsrRol_id(user));
+ selenium.click(butUsrRol_id(user));
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent(roleDisplay), "Role display name: " + roleDisplay + " not found on the page.");
- final String ID_CHECK_ROLE = "//input[@name='_id28jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:roles' and @value='" + role + "']";
+ final String CHECK_ROLE = MessageFormat.format(this.ID_CHECK_ROLE, role);
+ selenium.click(CHECK_ROLE);
- selenium.click(ID_CHECK_ROLE);
-
selenium.click(ID_SUBMIT_ASSIGN_ROLE);
selenium.waitForPageToLoad(PAGE_LOAD);
searchUser(user, email);
- selenium.click(butSeaUsrRol_id(user));
+ selenium.click(butUsrRol_id(user));
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isChecked(ID_CHECK_ROLE), "The role wasn't correctly assigned.");
+ Assert.assertTrue(selenium.isChecked(CHECK_ROLE), "The role wasn't correctly assigned.");
}
- private void deassignRole(String user, String email, String role, String roleDisplay) {
+ void deassignRole(String user, String email, String role, String roleDisplay) {
searchUser(user, email);
- selenium.click(butSeaUsrRol_id(user));
+ selenium.click(butUsrRol_id(user));
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent(roleDisplay), "Role display name: " + roleDisplay + " not found on the page.");
// check the tempRole check box
- final String ID_CHECK_ROLE = "//input[@name='_id28jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:roles' and @value='" + role + "']";
- selenium.click(ID_CHECK_ROLE);
+ final String CHECK_ROLE = MessageFormat.format(this.ID_CHECK_ROLE, role);
+ selenium.click(CHECK_ROLE);
selenium.click(ID_SUBMIT_ASSIGN_ROLE);
selenium.waitForPageToLoad(PAGE_LOAD);
searchUser(user, email);
- selenium.click(butSeaUsrRol_id(user));
+ selenium.click(butUsrRol_id(user));
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertFalse(selenium.isChecked(ID_CHECK_ROLE), "Unassigned role is assigned (checked).");
+ Assert.assertFalse(selenium.isChecked(CHECK_ROLE), "Unassigned role is assigned (checked).");
}
- private void createUser(String username, String password, String email) {
+ void createUser(String username, String password, String email) {
selenium.open("/portal/auth/portal/default");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
selenium.click("link=Admin");
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -194,7 +198,7 @@
Assert.assertFalse(selenium.isTextPresent("This username is already taken. tempUser"), "User already exists.");
- selenium.click(ID_SUBMIT_ASSIGN_ROLE);
+ selenium.click(ID_SUBMIT_USER_ROLE);
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent("Confirmation"), "Confirmation screen is missing or corrupted.");
@@ -206,6 +210,8 @@
private void createExistingUser(String username, String password, String email) {
selenium.open("/portal/auth/portal/default");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
selenium.click("link=Admin");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Members");
@@ -228,7 +234,7 @@
}
- private void searchUser(String username, String email) {
+ void searchUser(String username, String email) {
selenium.open("/portal/");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Admin");
@@ -238,8 +244,9 @@
clickIfVisible(ID_LINK_USERTAB);
clickIfVisible(ID_LINK_USERMAIN);
+ clickIfVisible(LINK_USERMANG_MAIN);
- selenium.click(ID_BUT_SEARCH_USER);
+ selenium.click(LINK_SEARCH_USER);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.type(ID_INPUT_SEARCH_USER, username);
@@ -261,15 +268,19 @@
clickIfVisible(ID_LINK_USERTAB);
// user home page
clickIfVisible(ID_LINK_USERMAIN);
+ clickIfVisible(LINK_USERMANG_MAIN);
+ clickIfVisible(LINK_USERMANG_MAIN2);
- selenium.click(ID_BUT_SEARCH_USER);
+ selenium.click(LINK_SEARCH_USER);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.type(ID_INPUT_SEARCH_USER, username);
selenium.click(ID_SUBMIT_SEARCH_USER);
selenium.waitForPageToLoad(PAGE_LOAD);
+
Assert.assertTrue(selenium.isTextPresent(username), "Username was not found.");
Assert.assertTrue(selenium.isTextPresent(email), "User e-mail adress was not found.");
+
selenium.click(butDelUsr_id(username));
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(ID_BUT_SUBMIT_DEL_USER);
@@ -316,9 +327,9 @@
clickIfVisible(ID_LINK_ROLEMAIN);
Assert.assertTrue(selenium.isTextPresent(roleName), "Role name is missing");
-
+
selenium.click(butDelRol_id(roleName));
-
+
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent("Warning! You are about to delete the role " + roleName),
"Confirmation text for role deletion missing missing.");
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2008-09-24 14:15:14 UTC (rev 11968)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2008-09-24 14:22:05 UTC (rev 11969)
@@ -18,7 +18,6 @@
selenium = new DefaultSelenium("127.0.0.1", 44444, browser, "http://localhost:8080/portal/");
selenium.start();
- selenium.setTimeout("300000");
}
@AfterClass
@@ -27,12 +26,10 @@
}
protected void clickIfVisible(String id) {
- if (findLink(id)) {
- selenium.click(id);
- selenium.waitForPageToLoad(PAGE_LOAD);
- }
+
if (selenium.isElementPresent(id)){
selenium.click(id);
+
selenium.waitForPageToLoad(PAGE_LOAD);
}
}
@@ -62,6 +59,7 @@
}
protected void login(String username, String password) {
+ selenium.setTimeout("0");
selenium.open("/portal/");
selenium.waitForPageToLoad(PAGE_LOAD);
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/PortletUserCreationTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/PortletUserCreationTestCase.java 2008-09-24 14:15:14 UTC (rev 11968)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/PortletUserCreationTestCase.java 2008-09-24 14:22:05 UTC (rev 11969)
@@ -9,21 +9,21 @@
@Test(groups = { "portlet_user_creation" }, enabled = true)
public class PortletUserCreationTestCase extends JBossPortalSeleniumTestCase {
- private static final String SUBMIT_CREATE_CONF = "_id14jbpns_2fdefault_2fdefault_2fIdentityUserPortletWindowsnpbj:user";
+ private static final String SUBMIT_CREATE_CONF = "confirm-form:user";
- private static final String SUBMIT_CREATE_USER = "_id14jbpns_2fdefault_2fdefault_2fIdentityUserPortletWindowsnpbj:submit";
+ private static final String SUBMIT_CREATE_USER = "register-form:submit";
- private static final String INPUT_USERPASSWDCONF = "_id14jbpns_2fdefault_2fdefault_2fIdentityUserPortletWindowsnpbj:passwordCheck";
+ private static final String INPUT_USERPASSWDCONF = "register-form:passwordCheck";
- private static final String INPUT_USERPASSWD = "_id14jbpns_2fdefault_2fdefault_2fIdentityUserPortletWindowsnpbj:password";
+ private static final String INPUT_USERPASSWD = "register-form:password";
- private static final String INPUT_USERMAIL = "_id14jbpns_2fdefault_2fdefault_2fIdentityUserPortletWindowsnpbj:email";
+ private static final String INPUT_USERMAIL = "register-form:email";
- private static final String INPUT_USERNAME = "_id14jbpns_2fdefault_2fdefault_2fIdentityUserPortletWindowsnpbj:username";
+ private static final String INPUT_USERNAME = "register-form:username";
- private static final String LINK_CREATE_USER = "_id14jbpns_2fdefault_2fdefault_2fIdentityUserPortletWindowsnpbj:_id16jbpns_2fdefault_2fdefault_2fIdentityUserPortletWindowsnpbj";
+ private static final String LINK_CREATE_USER = "create-account-form:register";
- private static final String TAB_WELCOME = "_id1jbpns_2fdefault_2fdefault_2fIdentityUserPortletWindowsnpbj:_id3jbpns_2fdefault_2fdefault_2fIdentityUserPortletWindowsnpbj";
+ private static final String TAB_WELCOME = "register-temp-form:start-link";
@Test(enabled = true, description = "Simple user creation.")
public void userCreationTest() {
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-09-24 14:15:14 UTC (rev 11968)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-09-24 14:22:05 UTC (rev 11969)
@@ -1,5 +1,7 @@
package org.jboss.portal.test.selenium;
+import java.text.MessageFormat;
+
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -10,6 +12,9 @@
@Test(groups = { "cms_wsrp" }, enabled = true, description = "WSRP test case.")
public class WSRPTestCase extends JBossPortalSeleniumTestCase {
+ private static final String SUBMIT_REFRESH_CANCEL = "edit-cons-form:list-cons-link_1";
+ private static final String SUBMIT_PROD_SAVE = "producer-form:save-producer";
+ private static final String SUBMIT_CONSDEL_CONF = "confirm-delete-form:destroy-link";
// private static final String ID_LINK_PRODCONF =
// "_id1jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:_id3jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj"
// ;
@@ -17,11 +22,37 @@
// "_id1jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:_id3jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj"
// ;
- private static final String ID_LINK_PRODCONF = "link=*Producer Configuration*";
- private static final String ID_LINK_CONSCONF = "link=*Consumers Configuration*";
+
- public static String WSRP_CONSUMER_TABLE = "//div[@id='center']/div/div/div/table";
-
+ // TODO shouldn't be same as REFRESH?
+ private static final String SUBMIT_CONS_REGVAL = "edit-cons-form:refresh-cons-link";
+ private static final String SUBMIT_REFRESHFINAL = "edit-cons-form:refresh-cons-link";
+
+ private static final String INPUT_CONS_REGVALUE = "edit-cons-form:prop-value-input";
+ private static final String SUBMIT_REFRESHSAVE = "edit-cons-form:refresh-cons-link";
+ private static final String INPUT_CONSWSDL = "edit-cons-form:wsdl";
+ private static final String INPUT_CACHEEXP = "edit-cons-form:cache";
+ private static final String SUBMIT_ADDPROP_INIT = "producer-form:add-reg-prop";
+ private static final String SUBMIT_ADDPROP = "producer-form:add-reg-prop";
+ private static final String INPUT_PROPHINT = "producer-form:reg-properties:0:_id33jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj";
+ private static final String INPUT_PROPLABEL = "producer-form:reg-properties:0:_id30jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj";
+ private static final String INPUT_PROPNAME = "producer-form:reg-properties:0:_id24jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj";
+ private static final String SUBMIT_CREATECONS = "createConsumer:createConsumerButton";
+ private static final String INPUT_CREATECONS = "createConsumer:consumerName";
+ private static final String ID_LINK_PRODCONF = "cons-temp-form:producer-link";
+ private static final String ID_LINK_CONSCONF = "producer-temp-form:consumersTab";
+ private static final String LINK_CONSUMER_HOME ="cons-temp-form1:list-cons-link";
+ private static final String LINK_T_CONS_CON="consumer-list-form:consumersList:{0}:configure";
+ private static final String LINK_T_CONS_REF="consumer-list-form:consumersList:{0}:refresh";
+ private static final String LINK_T_CONS_ACT="consumer-list-form:consumersList:{0}:activate";
+ private static final String LINK_T_CONS_DEA="consumer-list-form:consumersList:{0}:activate";
+ private static final String LINK_T_CONS_REG="consumer-list-form:consumersList:{0}:register";
+ private static final String LINK_T_CONS_DER="consumer-list-form:consumersList:{0}:register";
+ private static final String LINK_T_CONS_DEL="consumer-list-form:consumersList:{0}:delete";
+
+
+// public static String WSRP_CONSUMER_TABLE = "//form[@id='_id18jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj']/table";
+ public static String WSRP_CONSUMER_TABLE = "consumer-list-form:consumersList";
@BeforeMethod(groups = { "log" })
public void loginBeforeTest() {
@@ -36,32 +67,30 @@
@Test(enabled = true, description = "Creating a standard BEA consumer.")
public void testCreateBeaConsumer() {
selenium.open("/portal/");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Admin");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=WSRP");
selenium.waitForPageToLoad(PAGE_LOAD);
clickIfVisible(ID_LINK_CONSCONF);
- selenium.type("_id16jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:consumerName", "BEA");
- selenium.click("_id16jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:_id18jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj");
+ selenium.type(INPUT_CREATECONS, "BEA");
+
+ selenium.click(SUBMIT_CREATECONS);
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.type("_id21jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:cache", "600");
- // selenium.click("link=14. Web Services for Remote Portlets (WSRP)");
- selenium.type("_id21jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:wsdl", "http://wsrp.bea.com:7001/producer/producer?WSDL");
- selenium.click("_id21jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:_id34jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj");
+ selenium.type(INPUT_CACHEEXP, "600");
+
+ selenium.type(INPUT_CONSWSDL, "http://wsrp.bea.com:7001/producer/producer?WSDL");
+ selenium.click(SUBMIT_REFRESHSAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent("Refresh failed (probably because the registration information was not valid)."));
- Assert
- .assertEquals(
- "Missing value",
- selenium
- .getText("//form[@id='_id21jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj']/table/tbody/tr[4]/td/span/table/tbody/tr[2]/td[3]/span"));
- selenium.type("_id21jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:_id38jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj",
- "public");
- selenium.click("_id21jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:_id48jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj");
+ Assert.assertTrue(selenium.isTextPresent("Missing value"));
+
+ selenium.type(INPUT_CONS_REGVALUE, "public");
+ selenium.click(SUBMIT_CONS_REGVAL);
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent("Refresh was successful."));
- selenium.click("_id6jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:_id8jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj");
+ selenium.click(SUBMIT_REFRESHFINAL);
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent("BEA"));
}
@@ -70,23 +99,24 @@
public void testBeaConsumerRegister() {
selenium.open("/portal/");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Admin");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=WSRP");
selenium.waitForPageToLoad(PAGE_LOAD);
clickIfVisible(ID_LINK_CONSCONF);
-
- int r = findTableRow(WSRP_CONSUMER_TABLE, "BEAreg", 0);
- selenium.click(WSRP_CONSUMER_TABLE + "/tbody/tr[" + r + "]/td[2]/a[4]");
+ clickIfVisible(LINK_CONSUMER_HOME);
+ int r = findTableRow(WSRP_CONSUMER_TABLE, "BEAreg", 0)-1 ;
+ selenium.click(MessageFormat.format(LINK_T_CONS_REG,r));
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.click("_id21jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:_id52jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj");
+ selenium.click(SUBMIT_REFRESHSAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.click("_id6jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:_id8jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj");
+ selenium.click(LINK_CONSUMER_HOME);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertEquals(selenium.getText(WSRP_CONSUMER_TABLE + "/tbody/tr[" + r + "]/td[2]/a[4]"), "Deregister");
+ Assert.assertEquals(selenium.getText(MessageFormat.format(LINK_T_CONS_DER,r)), "Deregister");
}
@Test(enabled = true, dependsOnMethods = { "testCreateBeaConsumer" }, description = "Standard BEA consumer deregistering.")
@@ -94,36 +124,40 @@
createConsumer("BEAreg", "100", "http://wsrp.bea.com:7001/producer/producer?WSDL");
selenium.open("/portal/");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Admin");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=WSRP");
selenium.waitForPageToLoad(PAGE_LOAD);
clickIfVisible(ID_LINK_CONSCONF);
+ clickIfVisible(LINK_CONSUMER_HOME);
+
+ int r = findTableRow(WSRP_CONSUMER_TABLE, "BEAreg", 0) -1;
- int r = findTableRow(WSRP_CONSUMER_TABLE, "BEAreg", 0);
-
- selenium.click(WSRP_CONSUMER_TABLE + "/tbody/tr[" + r + "]/td[2]/a[4]");
+ selenium.click(MessageFormat.format(LINK_T_CONS_DER,r));
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.click("_id21jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:_id49jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj");
+ selenium.click(SUBMIT_REFRESH_CANCEL);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertEquals(selenium.getText(WSRP_CONSUMER_TABLE + "/tbody/tr[" + r + "]/td[2]/a[4]"), "Register");
+ Assert.assertEquals(selenium.getText(MessageFormat.format(LINK_T_CONS_DER,r)), "Register");
}
@Test(enabled = true, dependsOnMethods = { "testCreateBeaConsumer", "testBeaConsumerDeactivate" }, description = "Standard BEA consumer activating.")
public void testBeaConsumerActivate() {
selenium.open("/portal/");
+
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Admin");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=WSRP");
selenium.waitForPageToLoad(PAGE_LOAD);
clickIfVisible(ID_LINK_CONSCONF);
+ clickIfVisible(LINK_CONSUMER_HOME);
+ int r = findTableRow(WSRP_CONSUMER_TABLE, "BEAact", 0)-1;
- int r = findTableRow(WSRP_CONSUMER_TABLE, "BEAact", 0);
-
Assert.assertTrue(selenium.isTextPresent("BEAact (inactive) (refresh needed)"));
- selenium.click(WSRP_CONSUMER_TABLE + "/tbody/tr[" + r + "]/td[2]/a[3]");
+ selenium.click(MessageFormat.format(LINK_T_CONS_ACT,r));
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertFalse(selenium.isTextPresent("BEAact (inactive) (refresh needed)"));
@@ -135,16 +169,19 @@
createConsumer("BEAact", "100", "http://wsrp.bea.com:7001/producer/producer?WSDL");
selenium.open("/portal/");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Admin");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=WSRP");
selenium.waitForPageToLoad(PAGE_LOAD);
clickIfVisible(ID_LINK_CONSCONF);
- int r = findTableRow(WSRP_CONSUMER_TABLE, "BEAact", 0);
+ clickIfVisible(LINK_CONSUMER_HOME);
+
+ int r = findTableRow(WSRP_CONSUMER_TABLE, "BEAact", 0)-1;
Assert.assertFalse(selenium.isTextPresent("BEAact (inactive) (refresh needed)"));
- selenium.click(WSRP_CONSUMER_TABLE + "/tbody/tr[" + r + "]/td[2]/a[3]");
+ selenium.click(MessageFormat.format(LINK_T_CONS_DEA,r));
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent("BEAact (inactive) (refresh needed)"));
@@ -159,22 +196,28 @@
public void testBeaConsumerDelete() {
createConsumer("BEAdel", "100", "http://wsrp.bea.com:7001/producer/producer?WSDL");
-
+ //selenium.setSpeed("2000");
selenium.open("/portal/");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Admin");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=WSRP");
-
selenium.waitForPageToLoad(PAGE_LOAD);
clickIfVisible(ID_LINK_CONSCONF);
+ clickIfVisible(LINK_CONSUMER_HOME);
Assert.assertTrue(selenium.isTextPresent("BEAdel"));
- int r = findTableRow(WSRP_CONSUMER_TABLE, "BEAdel", 0);
+ selenium.captureScreenshot("tabletable");
+ Assert.assertTrue(selenium.isElementPresent(WSRP_CONSUMER_TABLE),"Consumer table not available.");
+ int r = findTableRow(WSRP_CONSUMER_TABLE, "BEAdel", 0)-1;
+ Assert.assertFalse(r < 0,"Consumer BEAdel not found");
- selenium.click(WSRP_CONSUMER_TABLE + "/tbody/tr[" + r + "]/td[2]/a[5]");
+ selenium.click(MessageFormat.format(LINK_T_CONS_DEL,r));
selenium.waitForPageToLoad(PAGE_LOAD);
-
- selenium.click("_id29jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:_id30jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj");
+ selenium.captureScreenshot("delete");
+ Assert.assertTrue(selenium.isTextPresent("Delete 'BEAdel' consumer?"));
+
+ selenium.click(SUBMIT_CONSDEL_CONF);
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertFalse(selenium.isTextPresent("BEAdel"));
@@ -183,73 +226,53 @@
@Test(enabled = true, description = "Basic configuring of WSRP producer.")
public void testConfigureProducer() {
selenium.open("/portal/");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Admin");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=WSRP");
selenium.waitForPageToLoad(PAGE_LOAD);
-
clickIfVisible(ID_LINK_PRODCONF);
-
-
- selenium.click("_id10jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:_id26jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj");
+
+ selenium.click(SUBMIT_ADDPROP_INIT);
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium
- .type(
- "_id10jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:registrationProperties:0:_id27jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj",
- "testProp");
- selenium
- .type(
- "_id10jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:registrationProperties:0:_id34jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj",
- "testProp label");
- selenium
- .type(
- "_id10jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:registrationProperties:0:_id37jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj",
- "tetsPropHint");
- selenium.click("_id10jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:_id45jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj");
+ selenium.type(INPUT_PROPNAME, "testProp");
+ selenium.type(INPUT_PROPLABEL, "testProp label");
+ selenium.type(INPUT_PROPHINT, "tetsPropHint");
+
+ selenium.click(SUBMIT_PROD_SAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
+
Assert.assertTrue(selenium.isTextPresent("Producer configuration successfully saved!"));
clickIfVisible(ID_LINK_CONSCONF);
clickIfVisible(ID_LINK_PRODCONF);
- Assert
- .assertEquals(
- "testProp",
- selenium
- .getValue("_id10jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:registrationProperties:0:_id27jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj"));
- Assert
- .assertEquals(
- "testProp label",
- selenium
- .getValue("_id10jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:registrationProperties:0:_id34jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj"));
- Assert
- .assertEquals(
- "tetsPropHint",
- selenium
- .getValue("_id10jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:registrationProperties:0:_id37jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj"));
+ Assert.assertEquals("testProp", selenium.getValue(INPUT_PROPNAME));
+ Assert.assertEquals("testProp label", selenium.getValue(INPUT_PROPLABEL));
+ Assert.assertEquals("tetsPropHint", selenium.getValue(INPUT_PROPHINT));
}
private void createConsumer(String name, String timeout, String address) {
selenium.open("/portal/");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Admin");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=WSRP");
selenium.waitForPageToLoad(PAGE_LOAD);
clickIfVisible(ID_LINK_CONSCONF);
- selenium.type("_id16jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:consumerName", name);
- selenium.click("_id16jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:_id18jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj");
+ selenium.type(INPUT_CREATECONS, name);
+ selenium.click(SUBMIT_CREATECONS);
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.type("_id21jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:cache", timeout);
+ selenium.type(INPUT_CACHEEXP, timeout);
// selenium.click("link=14. Web Services for Remote Portlets (WSRP)");
- selenium.type("_id21jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:wsdl", address);
- selenium.click("_id21jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:_id34jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj");
+ selenium.type(INPUT_CONSWSDL, address);
+ selenium.click(SUBMIT_REFRESHSAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.type("_id21jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:_id38jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj",
- "public");
- selenium.click("_id21jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:_id48jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj");
+ selenium.type(INPUT_CONS_REGVALUE, "public");
+ selenium.click(SUBMIT_CONS_REGVAL);
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.click("_id6jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:_id8jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj");
+ selenium.click(SUBMIT_REFRESHFINAL);
selenium.waitForPageToLoad(PAGE_LOAD);
}
}
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSDirectoryTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSDirectoryTestCase.java 2008-09-24 14:15:14 UTC (rev 11968)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSDirectoryTestCase.java 2008-09-24 14:22:05 UTC (rev 11969)
@@ -38,6 +38,8 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.open("/portal/auth/portal/admin/CMS");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
Assert.assertFalse(selenium.isTextPresent("TestFolder["), "Test folder is already present.");
selenium.select("//div[@id='center']/div/div/div[1]/div/select", "label=Create Folder");
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java 2008-09-24 14:15:14 UTC (rev 11968)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java 2008-09-24 14:22:05 UTC (rev 11969)
@@ -1,7 +1,10 @@
package org.jboss.portal.test.selenium.cms;
+import java.text.MessageFormat;
+
import org.jboss.portal.test.selenium.IdentityAdminTestCase;
import org.jboss.portal.test.selenium.JBossPortalSeleniumTestCase;
+import org.jboss.portal.test.selenium.portal.AdminPortalTestCase;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
@@ -14,7 +17,22 @@
@Test(groups = { "cms_secure" }, enabled = true, description = "Setting permissions on the default portlet.")
public class CMSSecureTestCase extends JBossPortalSeleniumTestCase {
- //@AfterMethod()
+ private static final String SELECT_CMS_ACTION = "//div[@id='center']/div/div/div[1]/div/select";
+
+ @AfterMethod(groups = { "log" })
+ public void logoutAfterTestIfPossible() {
+
+ selenium.open("/portal/");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ if (selenium.isElementPresent("link=Logout")) {
+ selenium.click("link=Logout");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ }
+
+ resetSecurity();
+ }
+
+ // @AfterMethod()
private void resetSecurity() {
login("admin", "admin");
selenium.click("link=Admin");
@@ -25,7 +43,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=index.html");
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.select("//div[@id='center']/div/div/div/div/select", "label=Secure");
+ selenium.select(SELECT_CMS_ACTION, "label=Secure");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.select("secureroles:read", "label=Anonymous");
selenium.select("secureusers:read", "label=admin");
@@ -78,29 +96,28 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=index.html");
selenium.waitForPageToLoad(PAGE_LOAD);
-
-
- selenium.select("//div[@id='center']/div/div/div/div/select", "label=Secure");
+
+ selenium.select(SELECT_CMS_ACTION, "label=Secure");
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
selenium.select("secureroles:read", "label=Administrators");
selenium.select("secureusers:read", "label=admin");
-
+
selenium.click("submit");
selenium.waitForPageToLoad(PAGE_LOAD);
logout();
Assert.assertTrue(selenium.isTextPresent("Access Denied"));
- Assert.assertTrue(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html"));
+ //Assert.assertTrue(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html"));
login("user", "user");
Assert.assertTrue(selenium.isTextPresent("Access Denied"));
- Assert.assertTrue(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html"));
+ //Assert.assertTrue(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html"));
logout();
-
+
resetSecurity();
}
@@ -119,7 +136,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=index.html");
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.select("//div[@id='center']/div/div/div/div/select", "label=Secure");
+ selenium.select(SELECT_CMS_ACTION, "label=Secure");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.select("secureroles:read", "label=Administrators");
selenium.select("secureusers:read", "label=user");
@@ -129,15 +146,15 @@
logout();
Assert.assertTrue(selenium.isTextPresent("Access Denied"));
- Assert.assertTrue(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html"));
+ //Assert.assertTrue(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html"));
login("user", "user");
Assert.assertFalse(selenium.isTextPresent("Access Denied"));
- Assert.assertFalse(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html"));
+ //Assert.assertFalse(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html"));
logout();
-
+
resetSecurity();
}
@@ -158,7 +175,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=index.html");
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.select("//div[@id='center']/div/div/div/div/select", "label=Secure");
+ selenium.select(SELECT_CMS_ACTION, "label=Secure");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.select("secureroles:read", "label=secRoleDisp");
selenium.select("secureusers:read", "label=admin");
@@ -168,15 +185,15 @@
logout();
Assert.assertTrue(selenium.isTextPresent("Access Denied"));
- Assert.assertTrue(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html"));
+ //Assert.assertTrue(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html"));
login("user", "user");
Assert.assertFalse(selenium.isTextPresent("Access Denied"));
- Assert.assertFalse(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html"));
+ //Assert.assertFalse(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html"));
logout();
-
+
resetSecurity();
}
@@ -197,7 +214,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=index.html");
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.select("//div[@id='center']/div/div/div/div/select", "label=Secure");
+ selenium.select(SELECT_CMS_ACTION, "label=Secure");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.select("secureroles:read", "label=secRoleDisp");
selenium.select("secureusers:read", "label=admin");
@@ -207,20 +224,20 @@
logout();
Assert.assertTrue(selenium.isTextPresent("Access Denied"));
- Assert.assertTrue(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html"));
+ //Assert.assertTrue(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html"));
login("user", "user");
Assert.assertTrue(selenium.isTextPresent("Access Denied"));
- Assert.assertTrue(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html"));
+ //Assert.assertTrue(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html"));
logout();
-
+
resetSecurity();
}
-
+
@Test(enabled = false, description = "Recursive permission test")
- public void testRecursiveSecurity(){
+ public void testRecursiveSecurity() {
login("admin", "admin");
deassignRole("user", "user(a)portal.com", "secRole", "secRoleDisp");
@@ -236,7 +253,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=index.html");
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.select("//div[@id='center']/div/div/div/div/select", "label=Secure");
+ selenium.select(SELECT_CMS_ACTION, "label=Secure");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.select("secureroles:read", "label=secRoleDisp");
selenium.select("secureusers:read", "label=admin");
@@ -246,15 +263,19 @@
logout();
resetSecurity();
}
-
+
@Test(enabled = true, description = "Subpage permission test")
- public void testSubpageSecurity(){
+ public void testSubpageSecurity() {
selenium.open("/portal/portal/default");
- Assert.assertTrue(selenium.isTextPresent("Thank you for downloading and deploying JBoss Portal. We hope your enjoy working with it as much as we enjoy developing it!"));
+
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ Assert.assertTrue(selenium
+ .isTextPresent("Thank you for downloading and deploying JBoss Portal. We hope your enjoy working with it as much as we enjoy developing it!"));
selenium.click("link=Explore");
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertFalse(selenium.isTextPresent("Thank you for downloading and deploying JBoss Portal. We hope your enjoy working with it as much as we enjoy developing it!"));
-
+ Assert.assertFalse(selenium
+ .isTextPresent("Thank you for downloading and deploying JBoss Portal. We hope your enjoy working with it as much as we enjoy developing it!"));
+
login("admin", "admin");
selenium.click("link=Admin");
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -264,7 +285,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=support.html");
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.select("//div[@id='center']/div/div/div/div/select", "label=Secure");
+ selenium.select(SELECT_CMS_ACTION, "label=Secure");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.select("secureroles:read", "label=Administrators");
selenium.select("secureusers:read", "label=admin");
@@ -276,23 +297,25 @@
selenium.waitForPageToLoad(PAGE_LOAD);
logout();
- Assert.assertTrue(selenium.isTextPresent("Thank you for downloading and deploying JBoss Portal. We hope your enjoy working with it as much as we enjoy developing it!"));
+ Assert.assertTrue(selenium
+ .isTextPresent("Thank you for downloading and deploying JBoss Portal. We hope your enjoy working with it as much as we enjoy developing it!"));
selenium.open("/portal/portal/default");
selenium.click("link=Explore");
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent("Thank you for downloading and deploying JBoss Portal. We hope your enjoy working with it as much as we enjoy developing it!"));
-
+ Assert.assertTrue(selenium
+ .isTextPresent("Thank you for downloading and deploying JBoss Portal. We hope your enjoy working with it as much as we enjoy developing it!"));
+
resetSecurity();
}
- private void assignRole(String user, String email, String role, String roleDisplay) {
+ void assignRole(String user, String email, String role, String roleDisplay) {
searchUser(user, email);
- selenium.click(butSeaUsrRol_id(user));
+ selenium.click(butUsrRol_id(user));
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent(roleDisplay), "Role display name: " + roleDisplay + " not found on the page.");
- final String ID_CHECK_ROLE = "//input[@name='_id28jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:roles' and @value='" + role + "']";
+ final String ID_CHECK_ROLE = "//input[@name='assign-roles-form:roles' and @value='" + role + "']";
selenium.click(ID_CHECK_ROLE);
@@ -301,37 +324,36 @@
searchUser(user, email);
- selenium.click(butSeaUsrRol_id(user));
+ selenium.click(butUsrRol_id(user));
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isChecked(ID_CHECK_ROLE), "The role wasn't correctly assigned.");
}
- private void deassignRole(String user, String email, String role, String roleDisplay) {
+ void deassignRole(String user, String email, String role, String roleDisplay) {
searchUser(user, email);
- selenium.click(butSeaUsrRol_id(user));
+ selenium.click(butUsrRol_id(user));
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent(roleDisplay), "Role display name: " + roleDisplay + " not found on the page.");
- // uncheck the tempRole check box
- final String ID_CHECK_ROLE = "//input[@name='_id28jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:roles' and @value='" + role + "']";
- Assert.assertTrue(selenium.isChecked(ID_CHECK_ROLE), "Role to unassign wasn't really assigned (checked).");
+ // check the tempRole check box
+ final String ID_CHECK_ROLE = "//input[@name='assign-roles-form:roles' and @value='" + role + "']";
selenium.click(ID_CHECK_ROLE);
selenium.click(IdentityAdminTestCase.ID_SUBMIT_ASSIGN_ROLE);
selenium.waitForPageToLoad(PAGE_LOAD);
searchUser(user, email);
- selenium.click(butSeaUsrRol_id(user));
+ selenium.click(butUsrRol_id(user));
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertFalse(selenium.isChecked(ID_CHECK_ROLE), "Unassigned role is assigned (checked).");
}
- private void searchUser(String username, String email) {
+ void searchUser(String username, String email) {
selenium.open("/portal/");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Admin");
@@ -342,7 +364,7 @@
clickIfVisible(IdentityAdminTestCase.ID_LINK_USERTAB);
clickIfVisible(IdentityAdminTestCase.ID_LINK_USERMAIN);
- selenium.click(IdentityAdminTestCase.ID_BUT_SEARCH_USER);
+ selenium.click(IdentityAdminTestCase.LINK_SEARCH_USER);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.type(IdentityAdminTestCase.ID_INPUT_SEARCH_USER, username);
@@ -353,10 +375,9 @@
Assert.assertTrue(selenium.isTextPresent(email), "User email adress was not found.");
}
- private String butSeaUsrRol_id(String userName) {
- String table = "_id28jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:userlist";
+ private String butUsrRol_id(String userName) {
+ String table = IdentityAdminTestCase.TABLE_USERLIST;
int r = findTableRow(table, userName, 0);
- return "_id28jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:userlist:" + (r - 1)
- + ":_id51jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj";
+ return MessageFormat.format(IdentityAdminTestCase.LINK_T_USRLIST_ROLES, r - 1);
}
}
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11968 - branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2008-09-24 10:15:14 -0400 (Wed, 24 Sep 2008)
New Revision: 11968
Modified:
branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/build.xml
Log:
copying of userinterceptor portlet added to ant
Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/build.xml 2008-09-24 14:02:12 UTC (rev 11967)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/build.xml 2008-09-24 14:15:14 UTC (rev 11968)
@@ -20,6 +20,7 @@
<property name="selsrv.dir" location="selenium-rc-server" />
<property name="node0" value="localhost" />
<property name="jboss.test.home" value="${env.JBOSS_TEST_HOME}" />
+ <property name="jboss.home" value="${env.JBOSS_HOME}" />
<property name="jboss.test.jar" value="${env.JBOSSTESTJAR}" />
<property name="jboss.portal.dir" value="${env.JBOSS_UNZIPED_DIR}" />
<property name="portal_archive" value="${env.JBOSS_ARCHIVE}" />
@@ -42,39 +43,15 @@
</path>
<taskdef name="testng" classpathref="libraries.cp" classname="org.testng.TestNGAntTask" />
-<!--
- <taskdef name="config" classname="org.jboss.ant.taskdefs.server.ConfigManagerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader">
- <classpath id="server.taskdef.classpath">
- <path refid="jboss.test.classpath" />
- </classpath>
- </taskdef>
- <taskdef name="start" classname="org.jboss.ant.taskdefs.server.StartServerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader">
- <classpath refid="server.taskdef.classpath" />
- </taskdef>
- <taskdef name="stop" classname="org.jboss.ant.taskdefs.server.StopServerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader">
- <classpath refid="server.taskdef.classpath" />
- </taskdef>
--->
- <target name="init">
+
+<target name="init">
<echo message="Browser : ${browser}" />
<echo message="Workspace : ${workspace}" />
<echo message="Deleting testng report directory"/>
<delete dir="${testng.output.dir}"/>
</target>
- <!--target name="server-config" depends="unpack-portal"-->
-<!--
-<server:config javaHome="${java.home}" jbossHome="${jboss.test.home}/${jboss.portal.dir}/">
- <server name="${portal.instance}" host="${node0}">
- --> <!-- jvmarg value="${jpda.cmdline}" / --> <!--
- <jvmarg value="-Xmx512m" />
- <sysproperty key="java.endorsed.dirs" value="${jboss.test.home}/${jboss.portal.dir}/lib/endorsed" />
- </server>
- </server:config>
--->
- <!--/target-->
-
<target name="compile" depends="">
<echo message="Compiling testsuite" />
<mkdir dir="${test.build.dir}" />
@@ -99,22 +76,11 @@
<echo taskname="selenium-shutdown" message="DGF Errors during shutdown are expected" />
</target>
- <target name="unpack-portal">
- <echo message="Going to unpack ${portal_archive} into ${jboss.test.home}" />
- <unzip src="${portal_archive}" dest="${jboss.test.home}" />
- <chmod file="${jboss.test.home}/${jboss.portal.dir}/bin/run.sh" perm="u+x" />
- </target>
-
- <target name="copyApps" depends="unpack-portal">
+ <target name="copyApps">
<echo message="Copying userInterceptor portlet into the ${portal.instance} server"/>
- <copy file="apps/userDetail-portlet.war" tofile="${jboss.test.home}/${jboss.portal.dir}/server/${portal.instance}/deploy/userDetail-portlet.war"/>
+ <copy file="apps/userDetail-portlet.war" tofile="${jboss.home}/server/${portal.instance}/deploy/userDetail-portlet.war"/>
</target>
- <target name="delete-portal">
- <echo message="Going to delete directory ${jboss.test.home}" />
- <delete dir="${jboss.test.home}/${jboss.portal.dir}/" />
- </target>
-
<target name="clean">
<echo message="Going to delete directory ${test.build.dir}" />
<delete dir="${test.build.dir}" />
@@ -123,28 +89,12 @@
<target name="cleanup">
<echo message="Cleaning up..." />
<antcall target="stop-src" />
-<!-- <antcall target="delete-portal" /> -->
</target>
- <target name="reports">
- <mkdir dir="${junit.report.dir}" />
- <junitreport todir="test-report">
- <fileset dir="test-output">
- <include name="*/*.xml" />
- </fileset>
-
- <report format="noframes" todir="test-report" />
- </junitreport>
- </target>
-
<target name="selenium-test" depends="init, compile, run-src">
-<!--
- <antcall target="copyApps" />
- <echo message="Starting portal instance : ${portal.instance}" />
- <server:start name="${portal.instance}" />
--->
+ <antcall target="copyApps" />
<echo message="Runing TestNG" />
<mkdir dir="test-output" />
<testng classpathref="test.cp" sourcedir="${test.src.dir}" outputdir="test-output"
@@ -152,18 +102,12 @@
<xmlfileset dir="." includes="testng.xml" />
- <!--classfileset dir="${test.build.dir}"
- includes="org/jboss/portal/test/selenium/*Test.class" / -->
<sysproperty key="browser" value="${browser}" />
<sysproperty key="workspace" value="${workspace}"/>
<jvmarg value="-ea" />
</testng>
-<!--
- <echo message="Stoping portal instance : ${portal.instance}" />
- <server:stop name="${portal.instance}" />
--->
<antcall target="cleanup" />
</target>
17 years, 7 months
- 1
- 0