November 2010 - gatein-commits - Jboss List Archives

gatein SVN: r4894 - portal/branches/branch-GTNPORTAL-1592/webui/framework/src/main/java/org/exoplatform/webui/config.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2010-11-01 21:28:58 -0400 (Mon, 01 Nov 2010) New Revision: 4894 Modified: portal/branches/branch-GTNPORTAL-1592/webui/framework/src/main/java/org/exoplatform/webui/config/Component.java Log: GTNPORTAL-1541: Concurrency problem in Breadcumbs portlet Modified: portal/branches/branch-GTNPORTAL-1592/webui/framework/src/main/java/org/exoplatform/webui/config/Component.java =================================================================== --- portal/branches/branch-GTNPORTAL-1592/webui/framework/src/main/java/org/exoplatform/webui/config/Component.java 2010-11-01 21:25:30 UTC (rev 4893) +++ portal/branches/branch-GTNPORTAL-1592/webui/framework/src/main/java/org/exoplatform/webui/config/Component.java 2010-11-02 01:28:58 UTC (rev 4894) @@ -176,21 +176,33 @@ public Event getUIComponentEventConfig(String eventName) throws Exception { - if (eventMap != null) + if(eventMap == null) { - return eventMap.get(eventName); + synchronized(this) + { + if(eventMap == null) + { + eventMap = new HashMap<String, Event>(); + + if (events == null) + { + return null; + } + + for (Event event : events) + { + createCachedEventListeners(event); + eventMap.put(event.getName(), event); + } + } + + return eventMap.get(eventName); + } } - eventMap = new HashMap<String, Event>(); - if (events == null) + else { - return null; + return eventMap.get(eventName); } - for (Event event : events) - { - createCachedEventListeners(event); - eventMap.put(event.getName(), event); - } - return eventMap.get(eventName); } public List<EventListener> getUIComponentEventListeners(String eventName) throws Exception

13 years, 6 months

1
0
0 / 0

gatein SVN: r4893 - in portal/trunk/webui: portlet/src/main/java/org/exoplatform/webui/application/portlet and 1 other directory.

by do-not-reply＠jboss.org

Author: mwringe Date: 2010-11-01 17:25:30 -0400 (Mon, 01 Nov 2010) New Revision: 4893 Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoPortletInvocationContext.java portal/trunk/webui/portlet/src/main/java/org/exoplatform/webui/application/portlet/PortletURLBuilder.java Log: GTNPORTAL-1597: if the URLFormat specifies it wants to work with XML, then use & instead of just & when creating urls. Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoPortletInvocationContext.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoPortletInvocationContext.java 2010-11-01 16:55:20 UTC (rev 4892) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoPortletInvocationContext.java 2010-11-01 21:25:30 UTC (rev 4893) @@ -60,6 +60,7 @@ private static final String QMARK = "?"; private static final String EQ = "="; private static final String AMP = "&"; + private static final String XMLAMP = "&"; public ExoPortletInvocationContext(PortalRequestContext portalRequestContext, UIPortlet portlet) { @@ -95,6 +96,12 @@ public String renderURL(ContainerURL containerURL, URLFormat format) { + boolean wantEscapeXML = false; + if (format != null && format.getWantEscapeXML() != null) + { + wantEscapeXML = format.getWantEscapeXML(); + } + // todo: shouldn't we be using URLFormat to decide on the path to use at the beginning of the URL? StringBuilder baseURL = new StringBuilder(this.portalRequestURI).append(QMARK) .append(PortalRequestContext.UI_COMPONENT_ID).append(EQ).append(this.portletId); @@ -119,30 +126,30 @@ if (!type.equals(Constants.PORTAL_RENDER)) { - appendParameter(baseURL, Constants.TYPE_PARAMETER, type); + appendParameter(baseURL, Constants.TYPE_PARAMETER, type, wantEscapeXML); } if (format != null && format.getWantSecure() != null) { - appendParameter(baseURL, Constants.SECURE_PARAMETER, format.getWantSecure().toString()); + appendParameter(baseURL, Constants.SECURE_PARAMETER, format.getWantSecure().toString(), wantEscapeXML); } StateString navigationalState = containerURL.getNavigationalState(); if (navigationalState != null && !navigationalState.getStringValue().equals(StateString.JBPNS_PREFIX)) { - appendParameter(baseURL, NAVIGATIONAL_STATE_PARAM_NAME, navigationalState.getStringValue()); + appendParameter(baseURL, NAVIGATIONAL_STATE_PARAM_NAME, navigationalState.getStringValue(), wantEscapeXML); } WindowState windowState = containerURL.getWindowState(); if (windowState != null) { - appendParameter(baseURL, Constants.WINDOW_STATE_PARAMETER, windowState.toString()); + appendParameter(baseURL, Constants.WINDOW_STATE_PARAMETER, windowState.toString(), wantEscapeXML); } Mode mode = containerURL.getMode(); if (mode != null) { - appendParameter(baseURL, Constants.PORTLET_MODE_PARAMETER, mode.toString()); + appendParameter(baseURL, Constants.PORTLET_MODE_PARAMETER, mode.toString(), wantEscapeXML); } if (containerURL instanceof ActionURL) @@ -152,25 +159,25 @@ StateString state = actionURL.getInteractionState(); if (state != null && !state.getStringValue().equals(StateString.JBPNS_PREFIX)) { - appendParameter(baseURL, INTERACTION_STATE_PARAM_NAME, state.getStringValue()); + appendParameter(baseURL, INTERACTION_STATE_PARAM_NAME, state.getStringValue(), wantEscapeXML); } } else if (containerURL instanceof ResourceURL) { ResourceURL resourceURL = (ResourceURL)containerURL; - appendParameter(baseURL, Constants.RESOURCE_ID_PARAMETER, resourceURL.getResourceId()); + appendParameter(baseURL, Constants.RESOURCE_ID_PARAMETER, resourceURL.getResourceId(), wantEscapeXML); CacheLevel cachability = resourceURL.getCacheability(); if (cachability != null) { - appendParameter(baseURL, Constants.CACHELEVEL_PARAMETER, cachability.name()); + appendParameter(baseURL, Constants.CACHELEVEL_PARAMETER, cachability.name(), wantEscapeXML); } StateString resourceState = resourceURL.getResourceState(); if (resourceState != null && !resourceState.getStringValue().equals(StateString.JBPNS_PREFIX)) { - appendParameter(baseURL, RESOURCE_STATE_PARAM_NAME, resourceState.getStringValue()); + appendParameter(baseURL, RESOURCE_STATE_PARAM_NAME, resourceState.getStringValue(), wantEscapeXML); } } else @@ -187,12 +194,12 @@ { for (String value : values) { - appendParameter(baseURL, key, value); + appendParameter(baseURL, key, value, wantEscapeXML); } } else { - appendParameter(baseURL, "removePP", key); + appendParameter(baseURL, "removePP", key, wantEscapeXML); } } } @@ -201,11 +208,18 @@ return baseURL.toString(); } - private void appendParameter(StringBuilder builder, String name, String value) + private void appendParameter(StringBuilder builder, String name, String value, boolean wantEscapeXML) { if (value != null) { - builder.append(AMP).append(name).append(EQ).append(value); + if (wantEscapeXML) + { + builder.append(XMLAMP).append(name).append(EQ).append(value); + } + else + { + builder.append(AMP).append(name).append(EQ).append(value); + } } } } Modified: portal/trunk/webui/portlet/src/main/java/org/exoplatform/webui/application/portlet/PortletURLBuilder.java =================================================================== --- portal/trunk/webui/portlet/src/main/java/org/exoplatform/webui/application/portlet/PortletURLBuilder.java 2010-11-01 16:55:20 UTC (rev 4892) +++ portal/trunk/webui/portlet/src/main/java/org/exoplatform/webui/application/portlet/PortletURLBuilder.java 2010-11-01 21:25:30 UTC (rev 4893) @@ -58,7 +58,7 @@ protected void createURL(StringBuilder builder, UIComponent targetComponent, String action, String targetBeanId, Parameter[] params) { - String baseUrl = getBaseURL().replaceAll("&", AMP); + String baseUrl = getBaseURL(); builder.append(baseUrl).append(AMP).append(UIComponent.UICOMPONENT).append(EQUALS).append( targetComponent.getId());

13 years, 6 months

1
0
0 / 0

gatein SVN: r4892 - in components/wsrp/trunk/wsrp-producer-war: src/test/assembly and 6 other directories.

by do-not-reply＠jboss.org

Author: mvanco(a)redhat.com Date: 2010-11-01 12:55:20 -0400 (Mon, 01 Nov 2010) New Revision: 4892 Added: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-resourceserving-portlet.xml components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/ResourceServingPortlet.java components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-resourceserving-portlet-war/ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-resourceserving-portlet-war/WEB-INF/ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-resourceserving-portlet-war/WEB-INF/portlet.xml components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-resourceserving-portlet-war/WEB-INF/web.xml components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-resourceserving-portlet-war/image/ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-resourceserving-portlet-war/image/jboss_logo.png components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-resourceserving-portlet-war/view.jsp Removed: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-testobject-jar.xml Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java Log: WSRP2 Sample portlets - added new sample portlet for resource serving - removed assembly script for testobject jar (not used anymore) - updated test for portletmodes Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-11-01 16:15:31 UTC (rev 4891) +++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-11-01 16:55:20 UTC (rev 4892) @@ -179,8 +179,8 @@ <descriptor>src/test/assembly/test-events-portlet.xml</descriptor> <descriptor>src/test/assembly/test-portletmodes-portlet.xml</descriptor> <descriptor>src/test/assembly/test-prp-portlet.xml</descriptor> - <descriptor>src/test/assembly/test-testobject-jar.xml</descriptor> <descriptor>src/test/assembly/test-state-portlet.xml</descriptor> + <descriptor>src/test/assembly/test-resourceserving-portlet.xml</descriptor> </descriptors> </configuration> <executions> Added: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-resourceserving-portlet.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-resourceserving-portlet.xml (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-resourceserving-portlet.xml 2010-11-01 16:55:20 UTC (rev 4892) @@ -0,0 +1,27 @@ +<assembly> + <id>resourceserving-portlet</id> + <formats> + <format>war</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> +  + <fileSet> + <directory>target/test-classes</directory> + <outputDirectory>WEB-INF/classes</outputDirectory> + <includes> + <include>org/gatein/wsrp/portlet/ResourceServingPortlet.class + </include> + </includes> + </fileSet> +  + <fileSet> + <directory>src/test/test-portlets/test-resourceserving-portlet-war + </directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> + +</assembly> + Deleted: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-testobject-jar.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-testobject-jar.xml 2010-11-01 16:15:31 UTC (rev 4891) +++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-testobject-jar.xml 2010-11-01 16:55:20 UTC (rev 4892) @@ -1,20 +0,0 @@ -<assembly> - <id>events-testobject</id> - <formats> - <format>jar</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - <fileSets> -  - <fileSet> - <directory>target/test-classes</directory> - <outputDirectory></outputDirectory> - <includes> - <include>org/gatein/wsrp/portlet/utils/TestObject.class</include> - </includes> - </fileSet> - </fileSets> - -</assembly> - Added: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/ResourceServingPortlet.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/ResourceServingPortlet.java (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/ResourceServingPortlet.java 2010-11-01 16:55:20 UTC (rev 4892) @@ -0,0 +1,73 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2010, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.gatein.wsrp.portlet; + +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.OutputStream; + +import javax.portlet.GenericPortlet; +import javax.portlet.PortletException; +import javax.portlet.PortletRequestDispatcher; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; +import javax.portlet.ResourceRequest; +import javax.portlet.ResourceResponse; + +/** + * @author <a href="mailto:mvanco@redhat.com">Michal Vanco</a> + * @version $Revision$ + */ +public class ResourceServingPortlet extends GenericPortlet +{ + + @Override + public void doView(RenderRequest request, RenderResponse response) throws PortletException, IOException + { + response.setContentType("text/html"); + String imageHash = "142b674dd615a0513061cf44c7ae6adb"; + request.setAttribute("hash", imageHash); + String imageWidth = "451"; + String imageHeight = "257"; + request.setAttribute("width", imageWidth); + request.setAttribute("height", imageHeight); + PortletRequestDispatcher dispatcher = getPortletContext().getRequestDispatcher("/view.jsp"); + dispatcher.include(request, response); + } + + @Override + public void serveResource(ResourceRequest request, ResourceResponse response) throws PortletException, IOException + { + response.setContentType(" image/png"); + OutputStream out = response.getPortletOutputStream(); + File image = new File(getPortletContext().getRealPath("/image/jboss_logo.png")); + BufferedInputStream bis = new BufferedInputStream(new FileInputStream(image)); + long length = image.length(); + byte[] bytes = new byte[(int) length]; + bis.read(bytes, 0, (int) length); + out.write(bytes); + } + +} Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java 2010-11-01 16:15:31 UTC (rev 4891) +++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java 2010-11-01 16:55:20 UTC (rev 4892) @@ -923,14 +923,17 @@ GetMarkup getMarkup = createMarkupRequest(); getMarkup.getMarkupParams().setMode(WSRPConstants.EDIT_MODE); + assertEquals(WSRPConstants.EDIT_MODE, getMarkup.getMarkupParams().getMode()); MarkupResponse responseEdit = producer.getMarkup(getMarkup); checkMarkupResponse(responseEdit, "This is EDIT MODE.", false, true); getMarkup.getMarkupParams().setMode(WSRPConstants.VIEW_MODE); + assertEquals(WSRPConstants.VIEW_MODE, getMarkup.getMarkupParams().getMode()); MarkupResponse responseView = producer.getMarkup(getMarkup); checkMarkupResponse(responseView, "This is VIEW MODE.", false, true); getMarkup.getMarkupParams().setMode(WSRPConstants.HELP_MODE); + assertEquals(WSRPConstants.HELP_MODE, getMarkup.getMarkupParams().getMode()); MarkupResponse responseHelp = producer.getMarkup(getMarkup); checkMarkupResponse(responseHelp, "This is HELP MODE.", false, true); } @@ -951,6 +954,7 @@ { GetMarkup getMarkup = createMarkupRequest(); getMarkup.getMarkupParams().setMode("test_mode"); + assertEquals("test_mode", getMarkup.getMarkupParams().getMode()); MarkupResponse response = producer.getMarkup(getMarkup); checkMarkupResponse(response, "This is TEST MODE.", false, true); } Added: components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-resourceserving-portlet-war/WEB-INF/portlet.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-resourceserving-portlet-war/WEB-INF/portlet.xml (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-resourceserving-portlet-war/WEB-INF/portlet.xml 2010-11-01 16:55:20 UTC (rev 4892) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<portlet-app xmlns='http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' + xsi:schemaLocation='http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd' + version='2.0'> + <portlet> + <description>Resource Portlet</description> + <portlet-name>Resource Portlet</portlet-name> + <display-name>Resource Portlet</display-name> + <portlet-class>org.gatein.wsrp.portlet.ResourceServingPortlet</portlet-class> + <expiration-cache>0</expiration-cache> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>VIEW</portlet-mode> + </supports> + <portlet-info> + <title>Resource Portlet sample</title> + <short-title>Resource Portlet sample</short-title> + </portlet-info> + </portlet> + +  + <container-runtime-option> + <name>org.gatein.pc.remotable</name> + <value>true</value> + </container-runtime-option> + +</portlet-app> Added: components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-resourceserving-portlet-war/WEB-INF/web.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-resourceserving-portlet-war/WEB-INF/web.xml (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-resourceserving-portlet-war/WEB-INF/web.xml 2010-11-01 16:55:20 UTC (rev 4892) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<web-app version="2.4" + xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> +</web-app> \ No newline at end of file Added: components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-resourceserving-portlet-war/image/jboss_logo.png =================================================================== (Binary files differ) Property changes on: components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-resourceserving-portlet-war/image/jboss_logo.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-resourceserving-portlet-war/view.jsp =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-resourceserving-portlet-war/view.jsp (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-resourceserving-portlet-war/view.jsp 2010-11-01 16:55:20 UTC (rev 4892) @@ -0,0 +1,15 @@ +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%> +<portlet:defineObjects /> +<h1>Resource serving...</h1> +This is sample portlet to verify portlet resource serving.<br /> +In this sample the image is rendered with resourceURL, not static source.<br /> +<br /> +<img src="<portlet:resourceURL />" /> +<br /><br /> +If you can see above image, resource serving works properly. There are parameters to verify image:<br /> +<ul> + <li>hash: <span id="hash">${hash}</span></li> + <li>image size: <span id="width">${width}</span>x<span id="height">${height}</span></li> +</ul> \ No newline at end of file

13 years, 6 months

1
0
0 / 0

gatein SVN: r4891 - portal/trunk/web/portal/src/main/webapp/groovy/webui/core.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-11-01 12:15:31 -0400 (Mon, 01 Nov 2010) New Revision: 4891 Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIGrid.gtmpl Log: GTNPORTAL-1616: XSS issue in user creation page Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIGrid.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIGrid.gtmpl 2010-11-01 15:46:08 UTC (rev 4890) +++ portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIGrid.gtmpl 2010-11-01 16:15:31 UTC (rev 4891) @@ -3,6 +3,7 @@ import org.exoplatform.webui.form.UIForm; import java.text.DateFormat; import java.text.SimpleDateFormat; + import org.gatein.common.text.EntityEncoder; String[] beanFields = uicomponent.getBeanFields(); String[] beanActions = uicomponent.getBeanActions(); @@ -64,6 +65,7 @@ %> <tr class="$rowClass"> <% + EntityEncoder encoder = EntityEncoder.FULL; for (field in beanFields) { def fieldValue = uicomponent.getFieldValue(bean, field); @@ -80,8 +82,8 @@ } else { fieldValue = ""; } - String value = fieldValue.toString(); - println "<td><div class=\""+cssClass+"\" title='$fieldValue'>"+fieldValue+"</div></td>"; + String value = encoder.encode(fieldValue.toString()); + println "<td><div class=\""+cssClass+"\" title='$value'>"+value+"</div></td>"; } if (beanActions != null && beanActions.length > 0) {

13 years, 6 months

1
0
0 / 0

gatein SVN: r4890 - portal/branches/branch-GTNPORTAL-1592/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component.

by do-not-reply＠jboss.org

Author: ndkhoiits Date: 2010-11-01 11:46:08 -0400 (Mon, 01 Nov 2010) New Revision: 4890 Modified: portal/branches/branch-GTNPORTAL-1592/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarSitePortlet.java Log: GTNPORTAL 1614 Have problems with portal name containing "portal" keyword Modified: portal/branches/branch-GTNPORTAL-1592/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarSitePortlet.java =================================================================== --- portal/branches/branch-GTNPORTAL-1592/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarSitePortlet.java 2010-11-01 13:32:30 UTC (rev 4889) +++ portal/branches/branch-GTNPORTAL-1592/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarSitePortlet.java 2010-11-01 15:46:08 UTC (rev 4890) @@ -60,7 +60,8 @@ public String getPortalURI(String portalName) { - return Util.getPortalRequestContext().getPortalURI().replace(getCurrentPortal(), portalName); + String currentPortalURI = Util.getPortalRequestContext().getPortalURI(); + return currentPortalURI.substring(0, currentPortalURI.lastIndexOf(getCurrentPortal())) + portalName + "/"; } public PageNavigation getCurrentPortalNavigation() throws Exception

13 years, 6 months

1
0
0 / 0

gatein SVN: r4889 - in portal/trunk: webui/portal/src/main/java/org/exoplatform/portal/webui and 1 other directory.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-11-01 09:32:30 -0400 (Mon, 01 Nov 2010) New Revision: 4889 Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/RegisterPortletApplicationController.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/CaptchaValidator.java Log: GTNPORTAL-1615: Captcha is not refreshing on Register page Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/RegisterPortletApplicationController.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/RegisterPortletApplicationController.java 2010-11-01 11:05:57 UTC (rev 4888) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/RegisterPortletApplicationController.java 2010-11-01 13:32:30 UTC (rev 4889) @@ -67,18 +67,18 @@ { PortletSession session = req.getPortletSession(); Captcha captcha; - if (session.getAttribute(NAME) == null) + if (session.getAttribute(NAME, PortletSession.APPLICATION_SCOPE) == null) { captcha = new Captcha.Builder(_width, _height).addText().gimp().addNoise().addBackground().build(); - session.setAttribute(NAME, captcha); + session.setAttribute(NAME, captcha, PortletSession.APPLICATION_SCOPE); writeImage(resp, captcha.getImage()); return; } - captcha = (Captcha)session.getAttribute(NAME); + captcha = (Captcha)session.getAttribute(NAME, PortletSession.APPLICATION_SCOPE); writeImage(resp, captcha.getImage()); } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/CaptchaValidator.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/CaptchaValidator.java 2010-11-01 11:05:57 UTC (rev 4888) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/CaptchaValidator.java 2010-11-01 13:32:30 UTC (rev 4889) @@ -49,7 +49,7 @@ PortletRequest req = ctx.getRequest(); PortletSession session = req.getPortletSession(); - Captcha captcha = (Captcha) session.getAttribute(Captcha.NAME); + Captcha captcha = (Captcha) session.getAttribute(Captcha.NAME, PortletSession.APPLICATION_SCOPE); if ((captcha != null) && (captcha.isCorrect((String) uiInput.getValue()))) {

13 years, 6 months

1
0
0 / 0

gatein SVN: r4888 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.

by do-not-reply＠jboss.org

Author: hangnguyen Date: 2010-11-01 07:05:57 -0400 (Mon, 01 Nov 2010) New Revision: 4888 Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_02_001_CreateNewNodeInTheFirstLevel.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_02_002_CreateNewNodeAsChildOfExistingNode.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_02_010_AddNewNodeWithNameIsTheSameWithExistingOneInTheSameLevelIn1Navigation.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_02_033_CheckDoNotShowGroupEditorMenu.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_04_001_CopyPasteNodeIntoTheSameNavigation.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_04_003_CopyPasteNodeToSamePlace.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_04_004_CopyPasteNodeIntoTheSameResource.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_001_CutPasteNodeToSamePlace.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_002_CutPasteNodeToSameNavigation.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_004_CutPasteNodeByAddPageWizard.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_005_CutPasteNodeInToTheSameThisSource.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_06_001_DeleteNodeWithDeletingConfirmation.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_06_003_DeleteNodeInCaseNodeContainsSubNode.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_07_001_ChangeOrderOfNode.html Log: TestVN-356:Clean and Improve existing Selenium for GateIn Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_02_001_CreateNewNodeInTheFirstLevel.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_02_001_CreateNewNodeInTheFirstLevel.html 2010-11-01 10:12:16 UTC (rev 4887) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_02_001_CreateNewNodeInTheFirstLevel.html 2010-11-01 11:05:57 UTC (rev 4888) @@ -17,7 +17,12 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>windowMaximize</td> + <td></td> + <td></td> +</tr> +<tr> + <td>click</td> <td>link=Sign in</td> <td></td> </tr> @@ -37,7 +42,7 @@ <td>gtn</td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> <td></td> </tr> @@ -52,7 +57,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Group</td> <td></td> </tr> @@ -62,7 +67,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Edit Navigation</td> <td></td> </tr> @@ -72,7 +77,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Add Node</td> <td></td> </tr> @@ -102,7 +107,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>css=div#UIGroupNavigationManagement div.UIPopupWindow div.TabsContainer div.NormalTab div.MiddleTab</td> <td></td> </tr> @@ -112,7 +117,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Search and Select Page</td> <td></td> </tr> @@ -122,7 +127,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//img[@title='Select Page']</td> <td></td> </tr> @@ -132,22 +137,27 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Save</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>waitForElementPresent</td> <td>link=Save</td> <td></td> </tr> <tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Test_POR_25_02_001</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Test_POR_25_02_001</td> <td></td> </tr> @@ -162,7 +172,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Group</td> <td></td> </tr> @@ -172,12 +182,12 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Edit Navigation</td> <td></td> </tr> <tr> - <td>componentExoContextMenu</td> + <td>mouseDownRight</td> <td>xpath=//a[@title='Test_POR_25_02_001']</td> <td></td> </tr> @@ -187,7 +197,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td> <td></td> </tr> @@ -202,7 +212,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Save</td> <td></td> </tr> @@ -217,7 +227,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>link=Sign out</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_02_002_CreateNewNodeAsChildOfExistingNode.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_02_002_CreateNewNodeAsChildOfExistingNode.html 2010-11-01 10:12:16 UTC (rev 4887) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_02_002_CreateNewNodeAsChildOfExistingNode.html 2010-11-01 11:05:57 UTC (rev 4888) @@ -17,7 +17,12 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>windowMaximize</td> + <td></td> + <td></td> +</tr> +<tr> + <td>click</td> <td>link=Sign in</td> <td></td> </tr> @@ -37,7 +42,7 @@ <td>gtn</td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> <td></td> </tr> @@ -52,7 +57,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Group</td> <td></td> </tr> @@ -62,7 +67,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Edit Navigation</td> <td></td> </tr> @@ -72,12 +77,12 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>//a[@title='New Staff']</td> <td></td> </tr> <tr> - <td>componentExoContextMenu</td> + <td>mouseDownRight</td> <td>//a[@title='New Staff']</td> <td></td> </tr> @@ -87,7 +92,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>//div[@id='UINavigationManagement']/div[2]/div[3]/div/div/div/div/div/div/div/div[2]/div/div/div//a</td> <td></td> </tr> @@ -117,7 +122,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>css=div#UIGroupNavigationManagement div.UIPopupWindow div.TabsContainer div.NormalTab div.MiddleTab</td> <td></td> </tr> @@ -127,7 +132,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Search and Select Page</td> <td></td> </tr> @@ -137,7 +142,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//img[@title='Select Page']</td> <td></td> </tr> @@ -147,16 +152,21 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Save</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>waitForElementPresent</td> <td>link=Save</td> <td></td> </tr> <tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> <td>echo</td> <td>--View page(node)--</td> <td></td> @@ -167,7 +177,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Test_POR_25_02_002</td> <td></td> </tr> @@ -182,7 +192,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Group</td> <td></td> </tr> @@ -192,7 +202,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Edit Navigation</td> <td></td> </tr> @@ -202,12 +212,12 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>//a[@title='New Staff']</td> <td></td> </tr> <tr> - <td>componentExoContextMenu</td> + <td>mouseDownRight</td> <td>xpath=//a[@title='Test_POR_25_02_002']</td> <td></td> </tr> @@ -217,7 +227,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td> <td></td> </tr> @@ -232,7 +242,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Save</td> <td></td> </tr> @@ -247,7 +257,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>link=Sign out</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_02_010_AddNewNodeWithNameIsTheSameWithExistingOneInTheSameLevelIn1Navigation.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_02_010_AddNewNodeWithNameIsTheSameWithExistingOneInTheSameLevelIn1Navigation.html 2010-11-01 10:12:16 UTC (rev 4887) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_02_010_AddNewNodeWithNameIsTheSameWithExistingOneInTheSameLevelIn1Navigation.html 2010-11-01 11:05:57 UTC (rev 4888) @@ -163,7 +163,7 @@ </tr> <tr> <td>mouseDownRight</td> - <td>//a[@class='NodeIcon DefaultPageIcon' and @title='Test_POR_25_02_010']</td> + <td>//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Test_POR_25_02_010']</td> <td></td> </tr> <tr> @@ -403,12 +403,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[4]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[4]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_02_033_CheckDoNotShowGroupEditorMenu.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_02_033_CheckDoNotShowGroupEditorMenu.html 2010-11-01 10:12:16 UTC (rev 4887) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_02_033_CheckDoNotShowGroupEditorMenu.html 2010-11-01 11:05:57 UTC (rev 4888) @@ -143,12 +143,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[3]/div/div/div[1]/div/div/div/div/div/div/div/div[2]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div</td> + <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[3]/div/div/div[1]/div/div/div/div/div/div/div/div[2]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div</td> + <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> <td></td> </tr> <tr> @@ -448,12 +448,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPopupWindow-5069919b29e9496ab3fd91047f3a11d4']/div/div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPopupWindow-5069919b29e9496ab3fd91047f3a11d4']/div/div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> <td></td> </tr> <tr> @@ -523,7 +523,7 @@ </tr> <tr> <td>echo</td> - <td>-- Login by new user -- </td> + <td>-- Login by new user --</td> <td></td> </tr> <tr> @@ -677,26 +677,6 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>No result found.</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>No result found.</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[4]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//div[4]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> - <td></td> -</tr> -<tr> <td>echo</td> <td>-- Delete node --</td> <td></td> @@ -827,11 +807,6 @@ <td></td> </tr> <tr> - <td>echo</td> - <td>-- https://jira.jboss.org/browse/GTNPORTAL-1304 --</td> - <td></td> -</tr> -<tr> <td>waitForElementPresent</td> <td>//img[@title='Delete Page']</td> <td></td> @@ -858,12 +833,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[4]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[4]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_04_001_CopyPasteNodeIntoTheSameNavigation.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_04_001_CopyPasteNodeIntoTheSameNavigation.html 2010-11-01 10:12:16 UTC (rev 4887) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_04_001_CopyPasteNodeIntoTheSameNavigation.html 2010-11-01 11:05:57 UTC (rev 4888) @@ -22,12 +22,12 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>link=Sign in</td> + <td>windowMaximize</td> <td></td> + <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Sign in</td> <td></td> </tr> @@ -42,7 +42,7 @@ <td>gtn</td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> <td></td> </tr> @@ -57,7 +57,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Group</td> <td></td> </tr> @@ -67,7 +67,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Edit Navigation</td> <td></td> </tr> @@ -82,7 +82,7 @@ <td></td> </tr> <tr> - <td>componentExoContextMenu</td> + <td>mouseDownRight</td> <td>xpath=//div[@id='UINavigationNodeSelector']//a[@class='NodeIcon DefaultPageIcon' and @title='New Staff']</td> <td></td> </tr> @@ -92,7 +92,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Copy Node</td> <td></td> </tr> @@ -107,7 +107,7 @@ <td></td> </tr> <tr> - <td>componentExoContextMenu</td> + <td>mouseDownRight</td> <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[1]</td> <td></td> </tr> @@ -122,7 +122,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>//div[@id='UINavigationNodeSelector']/div/div/div[2]/div/div/div[2]/a</td> <td></td> </tr> @@ -132,12 +132,12 @@ <td></td> </tr> <tr> - <td>componentExoContextMenu</td> + <td>mouseDownRight</td> <td>xpath=//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div//a</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Delete Node</td> <td></td> </tr> @@ -152,7 +152,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Save</td> <td></td> </tr> @@ -167,7 +167,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>link=Sign out</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_04_003_CopyPasteNodeToSamePlace.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_04_003_CopyPasteNodeToSamePlace.html 2010-11-01 10:12:16 UTC (rev 4887) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_04_003_CopyPasteNodeToSamePlace.html 2010-11-01 11:05:57 UTC (rev 4888) @@ -22,12 +22,12 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>link=Sign in</td> + <td>windowMaximize</td> <td></td> + <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Sign in</td> <td></td> </tr> @@ -42,7 +42,7 @@ <td>gtn</td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> <td></td> </tr> @@ -57,7 +57,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Group</td> <td></td> </tr> @@ -67,7 +67,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Edit Navigation</td> <td></td> </tr> @@ -82,7 +82,7 @@ <td></td> </tr> <tr> - <td>componentExoContextMenu</td> + <td>mouseDownRight</td> <td>xpath=//div[@id='UINavigationNodeSelector']//a[@class='NodeIcon DefaultPageIcon' and @title='New Staff']</td> <td></td> </tr> @@ -92,7 +92,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Copy Node</td> <td></td> </tr> @@ -102,7 +102,7 @@ <td></td> </tr> <tr> - <td>componentExoContextMenu</td> + <td>mouseDownRight</td> <td>//a[@title='Organization']</td> <td></td> </tr> @@ -132,7 +132,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>//div[@id='UIPortalApplication']/div[@class='UIPopupWindow UIDragObject']//div[@class='MiddleLeftSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</td> <td></td> </tr> @@ -142,7 +142,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Save</td> <td></td> </tr> @@ -157,7 +157,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>link=Sign out</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_04_004_CopyPasteNodeIntoTheSameResource.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_04_004_CopyPasteNodeIntoTheSameResource.html 2010-11-01 10:12:16 UTC (rev 4887) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_04_004_CopyPasteNodeIntoTheSameResource.html 2010-11-01 11:05:57 UTC (rev 4888) @@ -22,12 +22,12 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>link=Sign in</td> + <td>windowMaximize</td> <td></td> + <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Sign in</td> <td></td> </tr> @@ -42,7 +42,7 @@ <td>gtn</td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> <td></td> </tr> @@ -57,7 +57,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Group</td> <td></td> </tr> @@ -67,7 +67,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Edit Navigation</td> <td></td> </tr> @@ -82,7 +82,7 @@ <td></td> </tr> <tr> - <td>componentExoContextMenu</td> + <td>mouseDownRight</td> <td>xpath=//div[@id='UINavigationNodeSelector']//a[@class='NodeIcon DefaultPageIcon' and @title='New Staff']</td> <td></td> </tr> @@ -92,7 +92,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Copy Node</td> <td></td> </tr> @@ -102,7 +102,7 @@ <td></td> </tr> <tr> - <td>componentExoContextMenu</td> + <td>mouseDownRight</td> <td>//div[@class='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div[2]/div/div/a</td> <td></td> </tr> @@ -112,7 +112,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//div[@id="UINavigationNodeSelector"]/div/div/div/div/div/div[2]/div/div/div[7]/a</td> <td></td> </tr> @@ -132,7 +132,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>//div[@id='UIPortalApplication']/div[@class='UIPopupWindow UIDragObject']//div[@class='MiddleLeftSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</td> <td></td> </tr> @@ -142,7 +142,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Save</td> <td></td> </tr> @@ -157,7 +157,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>link=Sign out</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_001_CutPasteNodeToSamePlace.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_001_CutPasteNodeToSamePlace.html 2010-11-01 10:12:16 UTC (rev 4887) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_001_CutPasteNodeToSamePlace.html 2010-11-01 11:05:57 UTC (rev 4888) @@ -22,12 +22,12 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>link=Sign in</td> + <td>windowMaximize</td> <td></td> + <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Sign in</td> <td></td> </tr> @@ -42,7 +42,7 @@ <td>gtn</td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> <td></td> </tr> @@ -57,7 +57,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Group</td> <td></td> </tr> @@ -67,7 +67,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Edit Navigation</td> <td></td> </tr> @@ -77,7 +77,7 @@ <td></td> </tr> <tr> - <td>componentExoContextMenu</td> + <td>mouseDownRight</td> <td>//a[@title='New Staff']</td> <td></td> </tr> @@ -87,7 +87,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Cut Node</td> <td></td> </tr> @@ -97,7 +97,7 @@ <td></td> </tr> <tr> - <td>componentExoContextMenu</td> + <td>mouseDownRight</td> <td>//a[@title='Organization']</td> <td></td> </tr> @@ -107,7 +107,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>//div[@class='UIContextMenuContainer']/div[2]/div/div/div[7]/a</td> <td></td> </tr> @@ -132,7 +132,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>//div[@id='UIPortalApplication']/div[@class='UIPopupWindow UIDragObject']//a</td> <td></td> </tr> @@ -142,7 +142,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>//div[@id='UINavigationManagement']//table[@class='ActionContainer']//tr//td[2]//a</td> <td></td> </tr> @@ -157,7 +157,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>link=Sign out</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_002_CutPasteNodeToSameNavigation.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_002_CutPasteNodeToSameNavigation.html 2010-11-01 10:12:16 UTC (rev 4887) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_002_CutPasteNodeToSameNavigation.html 2010-11-01 11:05:57 UTC (rev 4888) @@ -22,12 +22,12 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>link=Sign in</td> + <td>windowMaximize</td> <td></td> + <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Sign in</td> <td></td> </tr> @@ -42,7 +42,7 @@ <td>gtn</td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> <td></td> </tr> @@ -57,7 +57,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Group</td> <td></td> </tr> @@ -67,7 +67,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Edit Navigation</td> <td></td> </tr> @@ -82,7 +82,7 @@ <td></td> </tr> <tr> - <td>componentExoContextMenu</td> + <td>mouseDownRight</td> <td>//a[@title='Users and groups management']</td> <td></td> </tr> @@ -92,7 +92,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Cut Node</td> <td></td> </tr> @@ -102,7 +102,7 @@ <td></td> </tr> <tr> - <td>componentExoContextMenu</td> + <td>mouseDownRight</td> <td>//div[@class='HomeNode']</td> <td></td> </tr> @@ -112,7 +112,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>//div[@id='UINavigationManagement']/div[2]/div/div/div[2]/div/div/div[2]//a</td> <td></td> </tr> @@ -122,7 +122,7 @@ <td></td> </tr> <tr> - <td>componentExoContextMenu</td> + <td>mouseDownRight</td> <td>//a[@title='Users and groups management']</td> <td></td> </tr> @@ -132,7 +132,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Delete Node</td> <td></td> </tr> @@ -147,7 +147,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Save</td> <td></td> </tr> @@ -162,7 +162,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>link=Sign out</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_004_CutPasteNodeByAddPageWizard.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_004_CutPasteNodeByAddPageWizard.html 2010-11-01 10:12:16 UTC (rev 4887) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_004_CutPasteNodeByAddPageWizard.html 2010-11-01 11:05:57 UTC (rev 4888) @@ -22,7 +22,12 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>windowMaximize</td> + <td></td> + <td></td> +</tr> +<tr> + <td>click</td> <td>link=Sign in</td> <td></td> </tr> @@ -52,7 +57,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Group</td> <td></td> </tr> @@ -62,7 +67,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=New Staff</td> <td></td> </tr> @@ -77,7 +82,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Add New Page</td> <td></td> </tr> @@ -107,7 +112,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> <td></td> </tr> @@ -122,7 +127,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> <td></td> </tr> @@ -147,7 +152,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Group</td> <td></td> </tr> @@ -157,7 +162,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Edit Navigation</td> <td></td> </tr> @@ -172,12 +177,12 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div[2]/div[1]/div/a</td> <td></td> </tr> <tr> - <td>componentExoContextMenu</td> + <td>mouseDownRight</td> <td>xpath=//div[@id='UINavigationNodeSelector']//a[@class='NodeIcon DefaultPageIcon' and @title='Test_POR_25_05_004']</td> <td></td> </tr> @@ -187,7 +192,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Cut Node</td> <td></td> </tr> @@ -197,7 +202,7 @@ <td></td> </tr> <tr> - <td>componentExoContextMenu</td> + <td>mouseDownRight</td> <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div[2]/div/div</td> <td></td> </tr> @@ -207,7 +212,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>//div[@class="UIContextMenuContainer"]/div[2]/div/div/div[2]//a</td> <td></td> </tr> @@ -222,17 +227,17 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[1]/a</td> <td></td> </tr> <tr> - <td>componentExoContextMenu</td> + <td>mouseDownRight</td> <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div//a</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Delete Node</td> <td></td> </tr> @@ -247,7 +252,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Save</td> <td></td> </tr> @@ -262,7 +267,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>link=Sign out</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_005_CutPasteNodeInToTheSameThisSource.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_005_CutPasteNodeInToTheSameThisSource.html 2010-11-01 10:12:16 UTC (rev 4887) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_005_CutPasteNodeInToTheSameThisSource.html 2010-11-01 11:05:57 UTC (rev 4888) @@ -22,12 +22,12 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>link=Sign in</td> + <td>windowMaximize</td> <td></td> + <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Sign in</td> <td></td> </tr> @@ -42,7 +42,7 @@ <td>gtn</td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> <td></td> </tr> @@ -57,7 +57,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Group</td> <td></td> </tr> @@ -67,7 +67,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Edit Navigation</td> <td></td> </tr> @@ -82,7 +82,7 @@ <td></td> </tr> <tr> - <td>componentExoContextMenu</td> + <td>mouseDownRight</td> <td>xpath=//div[@id='UINavigationNodeSelector']//a[@class='NodeIcon DefaultPageIcon' and @title='New Staff']</td> <td></td> </tr> @@ -92,7 +92,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Cut Node</td> <td></td> </tr> @@ -102,7 +102,7 @@ <td></td> </tr> <tr> - <td>componentExoContextMenu</td> + <td>mouseDownRight</td> <td>//div[@class='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div[2]/div/div/a</td> <td></td> </tr> @@ -112,7 +112,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//div[@id="UINavigationNodeSelector"]/div/div/div/div/div/div[2]/div/div/div[7]/a</td> <td></td> </tr> @@ -132,7 +132,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>//div[@id='UIPortalApplication']/div[@class='UIPopupWindow UIDragObject']//div[@class='MiddleLeftSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</td> <td></td> </tr> @@ -142,7 +142,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Save</td> <td></td> </tr> @@ -157,7 +157,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>link=Sign out</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_06_001_DeleteNodeWithDeletingConfirmation.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_06_001_DeleteNodeWithDeletingConfirmation.html 2010-11-01 10:12:16 UTC (rev 4887) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_06_001_DeleteNodeWithDeletingConfirmation.html 2010-11-01 11:05:57 UTC (rev 4888) @@ -22,7 +22,12 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>windowMaximize</td> + <td></td> + <td></td> +</tr> +<tr> + <td>click</td> <td>link=Sign in</td> <td></td> </tr> @@ -42,7 +47,7 @@ <td>gtn</td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> <td></td> </tr> @@ -57,7 +62,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Group</td> <td></td> </tr> @@ -67,7 +72,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Edit Navigation</td> <td></td> </tr> @@ -77,7 +82,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Add Node</td> <td></td> </tr> @@ -107,7 +112,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>css=div#UIGroupNavigationManagement div.UIPopupWindow div.TabsContainer div.NormalTab div.MiddleTab</td> <td></td> </tr> @@ -117,7 +122,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Search and Select Page</td> <td></td> </tr> @@ -127,7 +132,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//img[@title='Select Page']</td> <td></td> </tr> @@ -137,16 +142,21 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Save</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>waitForElementPresent</td> <td>link=Save</td> <td></td> </tr> <tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> <td>echo</td> <td>--Delete node with confimation--</td> <td></td> @@ -157,7 +167,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//div[@ID='UIGroupNavigationGrid']//table[1]//a[@class='EditNavIcon']</td> <td></td> </tr> @@ -167,7 +177,7 @@ <td></td> </tr> <tr> - <td>componentExoContextMenu</td> + <td>mouseDownRight</td> <td>xpath=//a[@title='Test_POR_25_06_001']</td> <td></td> </tr> @@ -177,7 +187,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td> <td></td> </tr> @@ -197,7 +207,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Save</td> <td></td> </tr> @@ -207,7 +217,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>link=Sign out</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_06_003_DeleteNodeInCaseNodeContainsSubNode.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_06_003_DeleteNodeInCaseNodeContainsSubNode.html 2010-11-01 10:12:16 UTC (rev 4887) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_06_003_DeleteNodeInCaseNodeContainsSubNode.html 2010-11-01 11:05:57 UTC (rev 4888) @@ -163,7 +163,7 @@ </tr> <tr> <td>mouseDownRight</td> - <td>//a[@class='NodeIcon DefaultPageIcon' and @title='Test_POR_25_06_003']</td> + <td>//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Test_POR_25_06_003']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_07_001_ChangeOrderOfNode.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_07_001_ChangeOrderOfNode.html 2010-11-01 10:12:16 UTC (rev 4887) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_07_001_ChangeOrderOfNode.html 2010-11-01 11:05:57 UTC (rev 4888) @@ -22,12 +22,17 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>windowMaximize</td> + <td></td> + <td></td> +</tr> +<tr> + <td>click</td> <td>link=Sign in</td> <td></td> </tr> <tr> - <td>verifyElementPresent</td> + <td>waitForElementPresent</td> <td>username</td> <td></td> </tr> @@ -57,7 +62,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Group</td> <td></td> </tr> @@ -67,7 +72,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Edit Navigation</td> <td></td> </tr> @@ -77,7 +82,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Add Node</td> <td></td> </tr> @@ -107,7 +112,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>css=div#UIGroupNavigationManagement div.UIPopupWindow div.TabsContainer div.NormalTab div.MiddleTab</td> <td></td> </tr> @@ -117,7 +122,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Search and Select Page</td> <td></td> </tr> @@ -127,7 +132,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//img[@title='Select Page']</td> <td></td> </tr> @@ -137,22 +142,27 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Save</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>waitForElementPresent</td> <td>link=Save</td> <td></td> </tr> <tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Test_POR_25_07_001</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Test_POR_25_07_001</td> <td></td> </tr> @@ -167,7 +177,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Group</td> <td></td> </tr> @@ -177,7 +187,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Edit Navigation</td> <td></td> </tr> @@ -192,7 +202,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//div[@ID='UIGroupNavigationGrid']//table[1]//a[@class='EditNavIcon']</td> <td></td> </tr> @@ -212,7 +222,7 @@ <td></td> </tr> <tr> - <td>componentExoContextMenu</td> + <td>mouseDownRight</td> <td>xpath=//a[@title='Test_POR_25_07_001']</td> <td></td> </tr> @@ -222,7 +232,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon MoveUp16x16Icon']</td> <td></td> </tr> @@ -237,7 +247,7 @@ <td></td> </tr> <tr> - <td>componentExoContextMenu</td> + <td>mouseDownRight</td> <td>xpath=//a[@title='Test_POR_25_07_001']</td> <td></td> </tr> @@ -247,7 +257,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon MoveDown16x16Icon']</td> <td></td> </tr> @@ -257,7 +267,7 @@ <td></td> </tr> <tr> - <td>componentExoContextMenu</td> + <td>mouseDownRight</td> <td>xpath=//a[@title='Test_POR_25_07_001']</td> <td></td> </tr> @@ -267,7 +277,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td> <td></td> </tr> @@ -282,7 +292,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Save</td> <td></td> </tr> @@ -297,7 +307,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>link=Sign out</td> <td></td> </tr>

13 years, 6 months

1
0
0 / 0

gatein SVN: r4887 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate.

by do-not-reply＠jboss.org

Author: hangnguyen Date: 2010-11-01 06:12:16 -0400 (Mon, 01 Nov 2010) New Revision: 4887 Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_24_01_002_CheckNavigationListByUserWhoDoesNotHaveRightToEditAnyGroupNavigation.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_24_01_003_CheckNavigationListByUserWhoHasRightToEditCurrentPortalButIsNotManagerOfAnyGroup.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_24_02_005_CreateNewNaviForTheSameGroupAfterCurrentNavigationHadJustBeenDeleted.html Log: TESTVN-1635 - Manage folders in selegen with GTNPORTAL product Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_24_01_002_CheckNavigationListByUserWhoDoesNotHaveRightToEditAnyGroupNavigation.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_24_01_002_CheckNavigationListByUserWhoDoesNotHaveRightToEditAnyGroupNavigation.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_24_01_002_CheckNavigationListByUserWhoDoesNotHaveRightToEditAnyGroupNavigation.html 2010-11-01 10:12:16 UTC (rev 4887) @@ -0,0 +1,372 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>Test_POR_24_01_002_CheckNavigationListByUserWhoDoesNotHaveRightToEditAnyGroupNavigation</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">Test_POR_24_01_002_CheckNavigationListByUserWhoDoesNotHaveRightToEditAnyGroupNavigation</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Check navigations list by user who does not have right to edit any group navigation --</td> + <td></td> +</tr> +<tr> + <td>windowMaximize</td> + <td></td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Create new user --</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=New Staff</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>Test_POR_24_01_002</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>Test_POR_24_01_002</td> +</tr> +<tr> + <td>type</td> + <td>Confirmpassword</td> + <td>Test_POR_24_01_002</td> +</tr> +<tr> + <td>type</td> + <td>firstName</td> + <td>Test_POR_24_01_002</td> +</tr> +<tr> + <td>type</td> + <td>lastName</td> + <td>Test_POR_24_01_002</td> +</tr> +<tr> + <td>type</td> + <td>email</td> + <td>Test_POR_24_01_002(a)gmail.com</td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose User Profile tab --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[3]/div/div/div[1]/div/div/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[3]/div/div/div[1]/div/div/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>user.language</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>user.language</td> + <td>label=English</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>You have registered a new account.</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>You have registered a new account.</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Add this user into a group with membership is not “Manager” --</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[2]/div[1]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[2]/div[1]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[3]/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[3]/div/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Management</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>Test_POR_24_01_002</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Login by new user --</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>Test_POR_24_01_002</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>Test_POR_24_01_002</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- The Add Navigation button is not existing --</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td></td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Go to Users and group management --</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Search new user --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchTerm</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>searchTerm</td> + <td>Test_POR_24_01_002</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UISearchForm']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//form[@id='UISearchForm']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Delete user --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//img[@alt='DeleteUser']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//img[@alt='DeleteUser']</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmationPresent</td> + <td></td> + <td></td> +</tr> +<tr> + <td>assertConfirmation</td> + <td>Are you sure you want to delete Test_POR_24_01_002 user?</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_24_01_003_CheckNavigationListByUserWhoHasRightToEditCurrentPortalButIsNotManagerOfAnyGroup.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_24_01_003_CheckNavigationListByUserWhoHasRightToEditCurrentPortalButIsNotManagerOfAnyGroup.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_24_01_003_CheckNavigationListByUserWhoHasRightToEditCurrentPortalButIsNotManagerOfAnyGroup.html 2010-11-01 10:12:16 UTC (rev 4887) @@ -0,0 +1,462 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>Test_POR_24_01_003_CheckNavigationListByUserWhoHasRightToEditCurrentPortalButIsNotManagerOfAnyGroup</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">Test_POR_24_01_003_CheckNavigationListByUserWhoHasRightToEditCurrentPortalButIsNotManagerOfAnyGroup</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Check navigations list by user who does not have right to edit any group navigation --</td> + <td></td> +</tr> +<tr> + <td>windowMaximize</td> + <td></td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Create new user --</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=New Staff</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>Test_POR_24_01_003</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>Test_POR_24_01_003</td> +</tr> +<tr> + <td>type</td> + <td>Confirmpassword</td> + <td>Test_POR_24_01_003</td> +</tr> +<tr> + <td>type</td> + <td>firstName</td> + <td>Test_POR_24_01_003</td> +</tr> +<tr> + <td>type</td> + <td>lastName</td> + <td>Test_POR_24_01_003</td> +</tr> +<tr> + <td>type</td> + <td>email</td> + <td>Test_POR_24_01_003(a)gmail.com</td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose User Profile tab --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[3]/div/div/div[1]/div/div/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[3]/div/div/div[1]/div/div/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>user.language</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>user.language</td> + <td>label=English</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>You have registered a new account.</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>You have registered a new account.</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Add this user into a group with membership is not “Manager” --</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[2]/div[1]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[2]/div[1]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[3]/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[3]/div/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Management</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>Test_POR_24_01_003</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Add this user into group that can edit current portal --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[1]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[1]/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>Test_POR_24_01_003</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Login by new user --</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>Test_POR_24_01_003</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>Test_POR_24_01_003</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Show navigation list which user has right to edit  --</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>Administrators</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>Administrators</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>Users</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>Users</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Check add Navigation --</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Add Navigation</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- https://jira.jboss.org/browse/GTNPORTAL-1464 --</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Go to Users and group management --</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Search new user --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchTerm</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>searchTerm</td> + <td>Test_POR_24_01_003</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UISearchForm']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//form[@id='UISearchForm']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Delete user --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//img[@alt='DeleteUser']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//img[@alt='DeleteUser']</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmationPresent</td> + <td></td> + <td></td> +</tr> +<tr> + <td>assertConfirmation</td> + <td>Are you sure you want to delete Test_POR_24_01_002 user?</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_24_02_005_CreateNewNaviForTheSameGroupAfterCurrentNavigationHadJustBeenDeleted.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_24_02_005_CreateNewNaviForTheSameGroupAfterCurrentNavigationHadJustBeenDeleted.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_24_02_005_CreateNewNaviForTheSameGroupAfterCurrentNavigationHadJustBeenDeleted.html 2010-11-01 10:12:16 UTC (rev 4887) @@ -0,0 +1,582 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>Test_POR_24_02_005_CreateNewNaviForTheSameGroupAfterCurrentNavigationHadJustBeenDeleted</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">Test_POR_24_02_005_CreateNewNaviForTheSameGroupAfterCurrentNavigationHadJustBeenDeleted</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Create new nav for the same group after current navigation had just been deleted --</td> + <td></td> +</tr> +<tr> + <td>windowMaximize</td> + <td></td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Add new user --</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=New Staff</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>Test_POR_24_02_005</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>Test_POR_24_02_005</td> +</tr> +<tr> + <td>type</td> + <td>Confirmpassword</td> + <td>Test_POR_24_02_005</td> +</tr> +<tr> + <td>type</td> + <td>firstName</td> + <td>Test_POR_24_02_005</td> +</tr> +<tr> + <td>type</td> + <td>lastName</td> + <td>Test_POR_24_02_005</td> +</tr> +<tr> + <td>type</td> + <td>email</td> + <td>Test_POR_24_02_005(a)gmail.com</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>You have registered a new account.</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>You have registered a new account.</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Go to user and group management --</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Add new group --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[2]/div[1]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[2]/div[1]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[1]/a[3]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[1]/a[3]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>groupName</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>groupName</td> + <td>Test_POR_24_02_005</td> +</tr> +<tr> + <td>type</td> + <td>label</td> + <td>Test_POR_24_02_005</td> +</tr> +<tr> + <td>type</td> + <td>description</td> + <td>Test_POR_24_02_005</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Add this user into new added group with “manager” role --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>Test_POR_24_02_005</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>membership</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>membership</td> + <td>label=manager</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>Test_POR_24_02_005</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>Test_POR_24_02_005</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Create navigation for group --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Add Navigation</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Add Navigation</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIAddGroupNavigationGrid']/table/tbody/tr/td[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIAddGroupNavigationGrid']/table/tbody/tr/td[2]/a</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>Each of the groups has navigation now</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>Each of the groups has navigation now</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Cancel</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Cancel</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Delete group navigation --</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Delete Navigation</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmationPresent</td> + <td></td> + <td></td> +</tr> +<tr> + <td>assertConfirmation</td> + <td>Are you sure to delete this navigation?</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td></td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td></td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--  Create navigation after deleted --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Add Navigation</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Add Navigation</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIAddGroupNavigationGrid']/table/tbody/tr/td[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIAddGroupNavigationGrid']/table/tbody/tr/td[2]/a</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>Each of the groups has navigation now</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>Each of the groups has navigation now</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Cancel</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>Test_POR_24_02_005</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>Test_POR_24_02_005</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Delete group navigation --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Delete Navigation</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Delete Navigation</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmationPresent</td> + <td></td> + <td></td> +</tr> +<tr> + <td>assertConfirmation</td> + <td>Are you sure to delete this navigation?</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Go to Users and group management --</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- delete new group --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[2]/div[1]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[2]/div[1]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Test_POR_24_02_005</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Test_POR_24_02_005</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[1]/a[1]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[1]/a[1]</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmationPresent</td> + <td></td> + <td></td> +</tr> +<tr> + <td>assertConfirmation</td> + <td>Are you sure you want to delete this group?</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Delete new user --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[1]/div[1]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[1]/div[1]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchTerm</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>searchTerm</td> + <td>Test_POR_24_02_005</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UISearchForm']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//form[@id='UISearchForm']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//img[@alt='DeleteUser']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//img[@alt='DeleteUser']</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmationPresent</td> + <td></td> + <td></td> +</tr> +<tr> + <td>assertConfirmation</td> + <td>Are you sure you want to delete Test_POR_24_02_005 user?</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html>

13 years, 6 months

1
0
0 / 0

gatein SVN: r4886 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.

by do-not-reply＠jboss.org

Author: hangnguyen Date: 2010-11-01 06:11:04 -0400 (Mon, 01 Nov 2010) New Revision: 4886 Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_24_01_002_CheckNavigationListByUserWhoDoesNotHaveRightToEditAnyGroupNavigation.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_24_01_003_CheckNavigationListByUserWhoHasRightToEditCurrentPortalButIsNotManagerOfAnyGroup.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_24_02_005_CreateNewNaviForTheSameGroupAfterCurrentNavigationHadJustBeenDeleted.html Log: TestVN-356:Clean and Improve existing Selenium for GateIn Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_24_01_002_CheckNavigationListByUserWhoDoesNotHaveRightToEditAnyGroupNavigation.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_24_01_002_CheckNavigationListByUserWhoDoesNotHaveRightToEditAnyGroupNavigation.html 2010-11-01 10:10:33 UTC (rev 4885) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_24_01_002_CheckNavigationListByUserWhoDoesNotHaveRightToEditAnyGroupNavigation.html 2010-11-01 10:11:04 UTC (rev 4886) @@ -143,12 +143,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[3]/div/div/div[1]/div/div/div/div/div/div/div/div[2]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[3]/div/div/div[1]/div/div/div/div/div/div/div/div[2]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> <td></td> </tr> <tr> @@ -362,26 +362,6 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>No result found.</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>No result found.</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[4]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//div[4]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div</td> - <td></td> -</tr> -<tr> <td>clickAndWait</td> <td>link=Sign out</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_24_01_003_CheckNavigationListByUserWhoHasRightToEditCurrentPortalButIsNotManagerOfAnyGroup.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_24_01_003_CheckNavigationListByUserWhoHasRightToEditCurrentPortalButIsNotManagerOfAnyGroup.html 2010-11-01 10:10:33 UTC (rev 4885) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_24_01_003_CheckNavigationListByUserWhoHasRightToEditCurrentPortalButIsNotManagerOfAnyGroup.html 2010-11-01 10:11:04 UTC (rev 4886) @@ -143,12 +143,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[3]/div/div/div[1]/div/div/div/div/div/div/div/div[2]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[3]/div/div/div[1]/div/div/div/div/div/div/div/div[2]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> <td></td> </tr> <tr> @@ -409,7 +409,7 @@ <tr> <td>type</td> <td>searchTerm</td> - <td>Test_POR_24_01_002</td> + <td>Test_POR_24_01_003</td> </tr> <tr> <td>waitForElementPresent</td> @@ -447,26 +447,11 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>No result found.</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>No result found.</td> - <td></td> -</tr> -<tr> <td>waitForElementPresent</td> - <td>//div[4]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div</td> + <td>link=Sign out</td> <td></td> </tr> <tr> - <td>click</td> - <td>//div[4]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div</td> - <td></td> -</tr> -<tr> <td>clickAndWait</td> <td>link=Sign out</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_24_02_005_CreateNewNaviForTheSameGroupAfterCurrentNavigationHadJustBeenDeleted.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_24_02_005_CreateNewNaviForTheSameGroupAfterCurrentNavigationHadJustBeenDeleted.html 2010-11-01 10:10:33 UTC (rev 4885) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_24_02_005_CreateNewNaviForTheSameGroupAfterCurrentNavigationHadJustBeenDeleted.html 2010-11-01 10:11:04 UTC (rev 4886) @@ -118,12 +118,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[3]/div/div/div[1]/div/div/div/div/div/div/div/div[2]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[3]/div/div/div[1]/div/div/div/div/div/div/div/div[2]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div</td> <td></td> </tr> <tr> @@ -137,6 +137,11 @@ <td></td> </tr> <tr> + <td>clickAndWait</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> <td>echo</td> <td>-- Add new group --</td> <td></td> @@ -468,6 +473,26 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[2]/div[1]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[2]/div[1]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Test_POR_24_02_005</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Test_POR_24_02_005</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[1]/a[1]</td> <td></td> </tr> @@ -542,26 +567,11 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>No result found.</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>No result found.</td> - <td></td> -</tr> -<tr> <td>waitForElementPresent</td> - <td>//div[4]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div</td> + <td>link=Sign out</td> <td></td> </tr> <tr> - <td>click</td> - <td>//div[4]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div</td> - <td></td> -</tr> -<tr> <td>clickAndWait</td> <td>link=Sign out</td> <td></td>

13 years, 6 months

1
0
0 / 0

gatein SVN: r4885 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues.

by do-not-reply＠jboss.org

Author: hangnguyen Date: 2010-11-01 06:10:33 -0400 (Mon, 01 Nov 2010) New Revision: 4885 Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_POR_24_03_001_EditPropertiesOfGroupNavigation.html Log: TESTVN-1635 - Manage folders in selegen with GTNPORTAL product Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_POR_24_03_001_EditPropertiesOfGroupNavigation.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_POR_24_03_001_EditPropertiesOfGroupNavigation.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_POR_24_03_001_EditPropertiesOfGroupNavigation.html 2010-11-01 10:10:33 UTC (rev 4885) @@ -0,0 +1,187 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>Test_POR_24_03_001_EditPropertiesOfGroupNavigation</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">Test_POR_24_03_001_EditPropertiesOfGroupNavigation</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Edit priority--</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Edit Properties</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>priority</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>priority</td> + <td>label=1</td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Check after edit--</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>mouseOver</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Return to old priority--</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Administrator</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Edit Properties</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>priority</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>priority</td> + <td>label=5</td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- https://jira.jboss.org/browse/GTNPORTAL-1402 --</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Check after change to old priority--</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Administrator</td> + <td></td> +</tr> +<tr> + <td>mouseOver</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html>

13 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits November 2010