June 2010 - gatein-commits - Jboss List Archives

gatein SVN: r3386 - components/wsrp/trunk/wsrp-producer-war.

by do-not-reply＠jboss.org

Author: mwringe Date: 2010-06-18 13:36:40 -0400 (Fri, 18 Jun 2010) New Revision: 3386 Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml Log: GTNWSRP-46: Update the test build so it can now use a zip or a exploded directory for building. Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-06-18 13:30:33 UTC (rev 3385) +++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-06-18 17:36:40 UTC (rev 3386) @@ -35,27 +35,76 @@ <packaging>war</packaging> <name>GateIn WSRP Producer WAR</name> + <properties> +  +  + <cargo.jvmargs.default>-Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=false</cargo.jvmargs.default> + <cargo.jvmargs>${cargo.jvmargs.default}</cargo.jvmargs> + </properties> + <profiles> - <profile> - <id>cargo-debug</id> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-maven2-plugin</artifactId> - <version>1.0.1</version> + <profile> + <id>default</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <cargo.jvmargs>${cargo.jvmargs.default}</cargo.jvmargs> + </properties> + </profile> + <profile> + <id>cargo-debug</id> + <properties> +  + <cargo.jvmargs.debug>-Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n</cargo.jvmargs.debug> + <cargo.jvmargs>${cargo.jvmargs.default} ${cargo.jvmargs.debug}</cargo.jvmargs> + </properties> + </profile> + <profile> +  + <id>server-url</id> + <activation> + <property> + <name>jboss.zip.url</name> + </property> + </activation> + <properties> + <JBOSS_HOME>${project.build.directory}/cargo/servers/jboss-5.1.0.GA</JBOSS_HOME> + </properties> + <dependencies> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-distribution</artifactId> + <version>5.1.0.GA</version> + <scope>system</scope> + <type>zip</type> + <systemPath>${jboss.zip.url}</systemPath> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.1</version> + <executions> + <execution> + <id>dependency-unpack</id> + <phase>pre-integration-test</phase> + <goals> + <goal>unpack-dependencies</goal> + </goals> <configuration> - <configuration> - <properties> - <cargo.jvmargs> - <![CDATA[-Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y]]></cargo.jvmargs> - </properties> - </configuration> + <includeGroupIds>org.jboss.jbossas</includeGroupIds> + <includeArtifactIds>jboss-as-distribution</includeArtifactIds> + <outputDirectory>${project.build.directory}/cargo/servers</outputDirectory> </configuration> - </plugin> - </plugins> - </build> - </profile> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> <dependencies> @@ -320,8 +369,9 @@ <includes> <include>org/gatein/wsrp/protocol/v1/MarkupTestCase.class</include> <include>org/gatein/wsrp/protocol/v1/PortletManagementTestCase.class</include> -  +  <include>org/gatein/wsrp/protocol/v1/ServiceDescriptionTestCase.class</include> +  <include>org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.class</include> </includes> <excludes> @@ -342,9 +392,9 @@ <log>${basedir}/target/jboss51x/container.log</log> <systemProperties>  + server so that the tests can use them. -->  + properties to enable this behaviour. --> <jboss.deploy.dir>${jboss.server.home.dir}/conf</jboss.deploy.dir> <test.deployables.dir>${basedir}/target/test-archives</test.deployables.dir> <jboss.deploy.url.prefix>http://localhost:8080/jmx-console/HtmlAdaptor?action=invokeOpByName&n...</jboss.deploy.url.prefix> @@ -353,10 +403,10 @@ </container> <wait>false</wait> <configuration> - <home>${basedir}/target/cargo</home> + <home>${basedir}/target/cargo/standalone</home> <properties> <cargo.logging>low</cargo.logging> - <cargo.jvmargs>-Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=false</cargo.jvmargs> + <cargo.jvmargs>${cargo.jvmargs}</cargo.jvmargs> </properties> <deployables> <deployable> @@ -364,6 +414,13 @@ <type>sar</type> </deployable> </deployables> + <configfiles> +  + <configfile> + <file>${JBOSS_HOME}/server/default/conf/jboss-log4j.xml</file> + <tofile>/conf/jboss-log4j.xml</tofile> + </configfile> + </configfiles> </configuration> </configuration> <executions>

14 years, 3 months

1
0
0 / 0

gatein SVN: r3385 - in components/wsrp/trunk: wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2 and 1 other directories.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-06-18 09:30:33 -0400 (Fri, 18 Jun 2010) New Revision: 3385 Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/ServiceDescriptionHandler.java components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-basic-portlet-war/WEB-INF/portlet.xml Log: - Fixed ServiceDescriptionHandler: event descriptions were not properly reset, and now, make sure that we don't have duplicates. - Added EventDescription testing. - Added events and public render parameters in BasicPortlet for testing purposes. Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/ServiceDescriptionHandler.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/ServiceDescriptionHandler.java 2010-06-18 13:25:58 UTC (rev 3384) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/ServiceDescriptionHandler.java 2010-06-18 13:30:33 UTC (rev 3385) @@ -63,6 +63,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -357,7 +358,7 @@ private ServiceDescription registrationPortletsServiceDescription; private long lastGenerated; - private List<EventDescription> eventDescriptions; + private Map<QName, EventDescription> eventDescriptions; private static final List<String> OPTIONS = new ArrayList<String>(5); @@ -428,20 +429,33 @@ Collection<PortletDescription> offeredPortletDescriptions = new ArrayList<PortletDescription>(portlets.size()); // reset event descriptions as they will be repopulated when we build the portlet descriptions - eventDescriptions = new ArrayList<EventDescription>(portlets.size()); + eventDescriptions = new HashMap<QName, EventDescription>(portlets.size()); for (Portlet portlet : portlets) { - PortletDescription desc = getPortletDescription(portlet, desiredLocales); + PortletDescription desc = getPortletDescription(portlet, desiredLocales, this); offeredPortletDescriptions.add(desc); } // events - registrationPortletsServiceDescription.getEventDescriptions().addAll(eventDescriptions); - registrationNoPortletsServiceDescription.getEventDescriptions().addAll(eventDescriptions); - noRegistrationPortletsServiceDescription.getEventDescriptions().addAll(eventDescriptions); - noRegistrationNoPortletsServiceDescription.getEventDescriptions().addAll(eventDescriptions); + Collection<EventDescription> events = eventDescriptions.values(); + List<EventDescription> eventDescriptions = registrationPortletsServiceDescription.getEventDescriptions(); + eventDescriptions.clear(); + eventDescriptions.addAll(events); + eventDescriptions = registrationNoPortletsServiceDescription.getEventDescriptions(); + eventDescriptions.clear(); + eventDescriptions.addAll(events); + + eventDescriptions = noRegistrationPortletsServiceDescription.getEventDescriptions(); + eventDescriptions.clear(); + eventDescriptions.addAll(events); + + eventDescriptions = noRegistrationNoPortletsServiceDescription.getEventDescriptions(); + eventDescriptions.clear(); + eventDescriptions.addAll(events); + + // portlets List<PortletDescription> offeredPortlets = registrationPortletsServiceDescription.getOfferedPortlets(); offeredPortlets.clear(); offeredPortlets.addAll(offeredPortletDescriptions); @@ -466,16 +480,20 @@ public void addEventInfo(EventInfo info, List<String> desiredLocales) { - EventDescription desc = WSRPTypeFactory.createEventDescription(info.getName()); - desc.setDescription(Utils.convertToWSRPLocalizedString(info.getDescription(), desiredLocales)); - desc.setLabel(Utils.convertToWSRPLocalizedString(info.getDisplayName(), desiredLocales)); - Collection<QName> aliases = info.getAliases(); - if (ParameterValidation.existsAndIsNotEmpty(aliases)) + QName name = info.getName(); + if (!eventDescriptions.containsKey(name)) { - desc.getAliases().addAll(aliases); + EventDescription desc = WSRPTypeFactory.createEventDescription(name); + desc.setDescription(Utils.convertToWSRPLocalizedString(info.getDescription(), desiredLocales)); + desc.setLabel(Utils.convertToWSRPLocalizedString(info.getDisplayName(), desiredLocales)); + Collection<QName> aliases = info.getAliases(); + if (ParameterValidation.existsAndIsNotEmpty(aliases)) + { + desc.getAliases().addAll(aliases); + } + // todo: deal with type info... + eventDescriptions.put(name, desc); } - // todo: deal with type info... - eventDescriptions.add(desc); } } } Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java 2010-06-18 13:25:58 UTC (rev 3384) +++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java 2010-06-18 13:30:33 UTC (rev 3385) @@ -37,10 +37,13 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.oasis.wsrp.v2.EventDescription; import org.oasis.wsrp.v2.InvalidRegistration; import org.oasis.wsrp.v2.OperationFailed; +import org.oasis.wsrp.v2.PortletDescription; import org.oasis.wsrp.v2.ServiceDescription; +import javax.xml.namespace.QName; import java.util.List; /** @@ -94,4 +97,112 @@ ExtendedAssert.assertTrue(options.contains(WSRP2Constants.OPTIONS_IMPORT)); ExtendedAssert.assertTrue(options.contains(WSRP2Constants.OPTIONS_EXPORT)); } + + @Test + public void testEventDescriptions() throws Exception + { + try + { + deploy("google-portlet.war"); + + ServiceDescription description = producer.getServiceDescription(getNoRegistrationServiceDescriptionRequest()); + + List<EventDescription> eventDescriptions = description.getEventDescriptions(); + ExtendedAssert.assertNotNull(eventDescriptions); + ExtendedAssert.assertEquals(1, eventDescriptions.size()); + + QName zip = new QName("urn:jboss:portal:samples:event", "ZipEvent"); + EventDescription event = eventDescriptions.get(0); + ExtendedAssert.assertEquals(zip, event.getName()); + ExtendedAssert.assertTrue(event.getAliases().isEmpty()); + ExtendedAssert.assertTrue(event.getLabel().getValue().contains(zip.toString())); + + List<PortletDescription> portlets = description.getOfferedPortlets(); + ExtendedAssert.assertEquals(2, portlets.size()); + + // get GoogleMap portlet description + for (PortletDescription portlet : portlets) + { + if (portlet.getPortletHandle().contains("GoogleMap")) + { + List<QName> publishedEvents = portlet.getPublishedEvents(); + ExtendedAssert.assertEquals(1, publishedEvents.size()); + ExtendedAssert.assertEquals(zip, publishedEvents.get(0)); + + ExtendedAssert.assertTrue(portlet.getHandledEvents().isEmpty()); + } + } + + deploy("test-basic-portlet.war"); + + // reload service description + description = producer.getServiceDescription(getNoRegistrationServiceDescriptionRequest()); + eventDescriptions = description.getEventDescriptions(); + portlets = description.getOfferedPortlets(); + + QName foo = new QName("urn:jboss:gatein", "foo"); + ExtendedAssert.assertEquals(2, eventDescriptions.size()); + for (EventDescription eventDesc : eventDescriptions) + { + QName name = eventDesc.getName(); + boolean isZip = zip.equals(name); + boolean isFoo = foo.equals(name); + if (isZip || isFoo) + { + if (isFoo) + { + ExtendedAssert.assertEquals(foo, eventDesc.getName()); + ExtendedAssert.assertTrue(eventDesc.getLabel().getValue().contains(foo.toString())); + List<QName> aliases = eventDesc.getAliases(); + ExtendedAssert.assertEquals(2, aliases.size()); + ExtendedAssert.assertTrue(aliases.contains(new QName("urn:jboss:gatein", "bar"))); + ExtendedAssert.assertTrue(aliases.contains(new QName("urn:jboss:gatein", "baz"))); + } + } + else + { + ExtendedAssert.fail("Only 2 events should be ZipEvent or foo!"); + } + } + + for (PortletDescription portlet : portlets) + { + if (portlet.getPortletHandle().contains("Simple Test Portlet")) + { + List<QName> events = portlet.getPublishedEvents(); + ExtendedAssert.assertEquals(2, events.size()); + ExtendedAssert.assertTrue(events.contains(zip)); + ExtendedAssert.assertTrue(events.contains(foo)); + + events = portlet.getHandledEvents(); + ExtendedAssert.assertEquals(1, events.size()); + ExtendedAssert.assertTrue(events.contains(zip)); + } + } + } + finally + { + undeploy("google-portlet.war"); + undeploy("test-basic-portlet.war"); + } + + } + + /*@Test + public void testParameterDescriptions() throws Exception + { + try + { + deploy("google-portlet.war"); + + ServiceDescription description = producer.getServiceDescription(getNoRegistrationServiceDescriptionRequest()); + + description.get + } + finally + { + undeploy("google-portlet.war"); + } + + }*/ } Modified: components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-basic-portlet-war/WEB-INF/portlet.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-basic-portlet-war/WEB-INF/portlet.xml 2010-06-18 13:25:58 UTC (rev 3384) +++ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-basic-portlet-war/WEB-INF/portlet.xml 2010-06-18 13:30:33 UTC (rev 3385) @@ -1,27 +1,30 @@ <?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-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> <portlet-name>Simple Test Portlet</portlet-name> <portlet-class>org.gatein.wsrp.portlet.BasicPortlet</portlet-class> @@ -47,10 +50,40 @@ <value>prefValue2</value> </preference> </portlet-preferences> + <supported-publishing-event> + <qname xmlns:jbp='urn:jboss:portal:samples:event'>jbp:ZipEvent</qname> + </supported-publishing-event> + <supported-publishing-event> + <qname xmlns:gtn='urn:jboss:gatein'>gtn:foo</qname> + </supported-publishing-event> + <supported-processing-event> + <qname xmlns:jbp='urn:jboss:portal:samples:event'>jbp:ZipEvent</qname> + </supported-processing-event> + <supported-public-render-parameter>zipcode</supported-public-render-parameter> </portlet> - <container-runtime-option> + <event-definition> + <qname xmlns:jbp='urn:jboss:portal:samples:event'>jbp:ZipEvent</qname> + <value-type>java.lang.String</value-type> + </event-definition> + <event-definition> + <qname xmlns:gtn='urn:jboss:gatein'>gtn:foo</qname> + <value-type>java.lang.String</value-type> + <alias xmlns:gtn='urn:jboss:gatein'>gtn:bar</alias> + <alias xmlns:gtn='urn:jboss:gatein'>gtn:baz</alias> + </event-definition> + + <public-render-parameter> + <identifier>zipcode</identifier> + <qname xmlns:g='urn:jboss:portal:simple:google'>g:zipcode</qname> + </public-render-parameter> + <public-render-parameter> + <identifier>foo</identifier> + <qname xmlns:gtn='urn:jboss:gatein'>gtn:foo</qname> + </public-render-parameter> + + <container-runtime-option> <name>org.gatein.pc.remotable</name> <value>true</value> - </container-runtime-option> + </container-runtime-option> </portlet-app> \ No newline at end of file

14 years, 3 months

1
0
0 / 0

gatein SVN: r3384 - components/wsrp/trunk/wsrp-producer-war.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-06-18 09:25:58 -0400 (Fri, 18 Jun 2010) New Revision: 3384 Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml Log: - Added cargo-debug profile that can be activated to remotely attach a debugger to the cargo instance to debug the tests. - Added possibility of skipping integration tests with maven.test.skip. Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-06-18 13:21:41 UTC (rev 3383) +++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-06-18 13:25:58 UTC (rev 3384) @@ -35,6 +35,29 @@ <packaging>war</packaging> <name>GateIn WSRP Producer WAR</name> + <profiles> + <profile> + <id>cargo-debug</id> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-maven2-plugin</artifactId> + <version>1.0.1</version> + <configuration> + <configuration> + <properties> + <cargo.jvmargs> + <![CDATA[-Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y]]></cargo.jvmargs> + </properties> + </configuration> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + <dependencies> <dependency> <groupId>org.gatein.wsrp</groupId> @@ -293,7 +316,7 @@ <goal>test</goal> </goals> <configuration> - <skip>false</skip> + <skip>${maven.test.skip}</skip> <includes> <include>org/gatein/wsrp/protocol/v1/MarkupTestCase.class</include> <include>org/gatein/wsrp/protocol/v1/PortletManagementTestCase.class</include> @@ -367,5 +390,4 @@ </testResource> </testResources> </build> - </project>

14 years, 3 months

1
0
0 / 0

gatein SVN: r3383 - components/wsrp/trunk.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-06-18 09:21:41 -0400 (Fri, 18 Jun 2010) New Revision: 3383 Modified: components/wsrp/trunk/pom.xml Log: - Updated to use 2.1.2-GA-SNAPSHOT of PC as we need a fix for GTNPC-21. Modified: components/wsrp/trunk/pom.xml =================================================================== --- components/wsrp/trunk/pom.xml 2010-06-18 12:57:00 UTC (rev 3382) +++ components/wsrp/trunk/pom.xml 2010-06-18 13:21:41 UTC (rev 3383) @@ -47,7 +47,7 @@ </scm> <properties> - <version.gatein.pc>2.1.1-GA</version.gatein.pc> + <version.gatein.pc>2.1.2-GA-SNAPSHOT</version.gatein.pc> <version.gatein.common>2.0.3-GA-SNAPSHOT</version.gatein.common> <version.gatein.wci>2.0.1-GA</version.gatein.wci>

14 years, 3 months

1
0
0 / 0

gatein SVN: r3382 - components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-06-18 08:57:00 -0400 (Fri, 18 Jun 2010) New Revision: 3382 Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerEventInfo.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerInfoBuilder.java Log: - GTNPC-21: Properly pass aliases to ContainerEventInfo upon construction. - Also return an immutable collection on getAliases so that it cannot be modified by clients. Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerEventInfo.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerEventInfo.java 2010-06-18 09:37:58 UTC (rev 3381) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerEventInfo.java 2010-06-18 12:57:00 UTC (rev 3382) @@ -1,34 +1,36 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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. * - ******************************************************************************/ +/* + * 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.pc.portlet.impl.info; +import org.gatein.common.i18n.LocalizedString; +import org.gatein.common.util.ParameterValidation; import org.gatein.pc.api.info.EventInfo; -import org.gatein.common.i18n.LocalizedString; import javax.xml.namespace.QName; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; import java.util.List; -import java.util.Collection; -import java.util.ArrayList; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -56,20 +58,22 @@ QName name, ContainerTypeInfo type, LocalizedString displayName, - LocalizedString description) + LocalizedString description, List<QName> aliases) { this.name = name; this.type = type; this.displayName = displayName; this.description = description; - this.aliases = new ArrayList<QName>(); + if (ParameterValidation.existsAndIsNotEmpty(aliases)) + { + this.aliases = aliases; + } + else + { + this.aliases = new ArrayList<QName>(); + } } - public void addAlias(QName alias) - { - aliases.add(alias); - } - public LocalizedString getDisplayName() { return displayName; @@ -92,6 +96,6 @@ public Collection<QName> getAliases() { - return aliases; + return Collections.unmodifiableCollection(aliases); } } Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerInfoBuilder.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerInfoBuilder.java 2010-06-18 09:37:58 UTC (rev 3381) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerInfoBuilder.java 2010-06-18 12:57:00 UTC (rev 3382) @@ -1,37 +1,39 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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. * - ******************************************************************************/ +/* + * 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.pc.portlet.impl.info; -import org.gatein.common.logging.Logger; -import org.gatein.common.logging.LoggerFactory; -import org.gatein.pc.api.Mode; -import org.gatein.pc.api.WindowState; import org.gatein.common.i18n.LocaleFormat; import org.gatein.common.i18n.LocalizedString; import org.gatein.common.i18n.ResourceBundleManager; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import org.gatein.common.reflect.NoSuchClassException; import org.gatein.common.util.ConversionException; import org.gatein.pc.api.LifeCyclePhase; +import org.gatein.pc.api.Mode; +import org.gatein.pc.api.WindowState; +import org.gatein.pc.api.info.MetaInfo; +import org.gatein.pc.api.info.RuntimeOptionInfo; import org.gatein.pc.portlet.impl.metadata.CustomPortletModeMetaData; import org.gatein.pc.portlet.impl.metadata.CustomWindowStateMetaData; import org.gatein.pc.portlet.impl.metadata.ListenerMetaData; @@ -55,8 +57,6 @@ import org.gatein.pc.portlet.impl.metadata.portlet.SupportsMetaData; import org.gatein.pc.portlet.impl.metadata.portlet.WindowStateMetaData; import org.gatein.pc.portlet.impl.metadata.security.SecurityConstraintMetaData; -import org.gatein.pc.api.info.MetaInfo; -import org.gatein.pc.api.info.RuntimeOptionInfo; import javax.xml.XMLConstants; import javax.xml.namespace.QName; @@ -602,7 +602,7 @@ getDefaultStringFor(eventDefinitionMD.getDescription(), "Description of event " + name)); // - return new ContainerEventInfo(name, type, displayName, description); + return new ContainerEventInfo(name, type, displayName, description, eventDefinitionMD.getAlias()); } private ContainerPortletInfo build(PortletMetaData portletMD)

14 years, 3 months

1
0
0 / 0

gatein SVN: r3381 - components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-06-18 05:37:58 -0400 (Fri, 18 Jun 2010) New Revision: 3381 Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/V2ProducerBaseTest.java Log: - Test should now pass. Not sure why it wasn't working before... :( Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/V2ProducerBaseTest.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/V2ProducerBaseTest.java 2010-06-18 07:52:01 UTC (rev 3380) +++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/V2ProducerBaseTest.java 2010-06-18 09:37:58 UTC (rev 3381) @@ -46,7 +46,6 @@ protected V2ProducerBaseTest(String name) throws Exception { super(name); - producer.start(); } @Override

14 years, 3 months

1
0
0 / 0

gatein SVN: r3380 - in components/sso/trunk: agent and 12 other directories.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-06-18 03:52:01 -0400 (Fri, 18 Jun 2010) New Revision: 3380 Modified: components/sso/trunk/agent/pom.xml components/sso/trunk/auth-callback/pom.xml components/sso/trunk/cas/gatein-cas-plugin/pom.xml components/sso/trunk/cas/gatein-cas-portal/pom.xml components/sso/trunk/cas/pom.xml components/sso/trunk/josso/gatein-josso-plugin/pom.xml components/sso/trunk/josso/gatein-josso-portal/pom.xml components/sso/trunk/josso/pom.xml components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml components/sso/trunk/opensso/gatein-opensso-portal/pom.xml components/sso/trunk/opensso/pom.xml components/sso/trunk/packaging/pom.xml components/sso/trunk/pom.xml components/sso/trunk/spnego/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: components/sso/trunk/agent/pom.xml =================================================================== --- components/sso/trunk/agent/pom.xml 2010-06-18 07:51:33 UTC (rev 3379) +++ components/sso/trunk/agent/pom.xml 2010-06-18 07:52:01 UTC (rev 3380) @@ -3,7 +3,7 @@ <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: components/sso/trunk/auth-callback/pom.xml =================================================================== --- components/sso/trunk/auth-callback/pom.xml 2010-06-18 07:51:33 UTC (rev 3379) +++ components/sso/trunk/auth-callback/pom.xml 2010-06-18 07:52:01 UTC (rev 3380) @@ -3,7 +3,7 @@ <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: components/sso/trunk/cas/gatein-cas-plugin/pom.xml =================================================================== --- components/sso/trunk/cas/gatein-cas-plugin/pom.xml 2010-06-18 07:51:33 UTC (rev 3379) +++ components/sso/trunk/cas/gatein-cas-plugin/pom.xml 2010-06-18 07:52:01 UTC (rev 3380) @@ -3,7 +3,7 @@ <groupId>org.gatein.sso</groupId> <artifactId>sso-cas-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: components/sso/trunk/cas/gatein-cas-portal/pom.xml =================================================================== --- components/sso/trunk/cas/gatein-cas-portal/pom.xml 2010-06-18 07:51:33 UTC (rev 3379) +++ components/sso/trunk/cas/gatein-cas-portal/pom.xml 2010-06-18 07:52:01 UTC (rev 3380) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.sso</groupId> <artifactId>sso-cas-parent</artifactId> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -14,7 +14,7 @@ <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-cas-plugin</artifactId> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> </dependency> <dependency> <groupId>commons-httpclient</groupId> @@ -23,12 +23,12 @@ <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-agent</artifactId> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> </dependency> <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-auth-callback</artifactId> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> </dependency> <dependency> <groupId>org.jasig.cas</groupId> Modified: components/sso/trunk/cas/pom.xml =================================================================== --- components/sso/trunk/cas/pom.xml 2010-06-18 07:51:33 UTC (rev 3379) +++ components/sso/trunk/cas/pom.xml 2010-06-18 07:52:01 UTC (rev 3380) @@ -3,13 +3,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.gatein.sso</groupId> <artifactId>sso-cas-parent</artifactId> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> <packaging>pom</packaging> <parent> <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> </parent> <name>GateIn SSO - CAS</name> Modified: components/sso/trunk/josso/gatein-josso-plugin/pom.xml =================================================================== --- components/sso/trunk/josso/gatein-josso-plugin/pom.xml 2010-06-18 07:51:33 UTC (rev 3379) +++ components/sso/trunk/josso/gatein-josso-plugin/pom.xml 2010-06-18 07:52:01 UTC (rev 3380) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.sso</groupId> <artifactId>sso-josso-parent</artifactId> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: components/sso/trunk/josso/gatein-josso-portal/pom.xml =================================================================== --- components/sso/trunk/josso/gatein-josso-portal/pom.xml 2010-06-18 07:51:33 UTC (rev 3379) +++ components/sso/trunk/josso/gatein-josso-portal/pom.xml 2010-06-18 07:52:01 UTC (rev 3380) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.sso</groupId> <artifactId>sso-josso-parent</artifactId> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -54,12 +54,12 @@ <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-agent</artifactId> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> </dependency> <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-auth-callback</artifactId> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> </dependency> <dependency> @@ -74,7 +74,7 @@ <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-josso-plugin</artifactId> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> </dependency> <dependency> <groupId>apache-log4j</groupId> Modified: components/sso/trunk/josso/pom.xml =================================================================== --- components/sso/trunk/josso/pom.xml 2010-06-18 07:51:33 UTC (rev 3379) +++ components/sso/trunk/josso/pom.xml 2010-06-18 07:52:01 UTC (rev 3380) @@ -3,13 +3,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.gatein.sso</groupId> <artifactId>sso-josso-parent</artifactId> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> <packaging>pom</packaging> <parent> <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> </parent> Modified: components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml =================================================================== --- components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml 2010-06-18 07:51:33 UTC (rev 3379) +++ components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml 2010-06-18 07:52:01 UTC (rev 3380) @@ -3,7 +3,7 @@ <groupId>org.gatein.sso</groupId> <artifactId>sso-opensso-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: components/sso/trunk/opensso/gatein-opensso-portal/pom.xml =================================================================== --- components/sso/trunk/opensso/gatein-opensso-portal/pom.xml 2010-06-18 07:51:33 UTC (rev 3379) +++ components/sso/trunk/opensso/gatein-opensso-portal/pom.xml 2010-06-18 07:52:01 UTC (rev 3380) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.sso</groupId> <artifactId>sso-opensso-parent</artifactId> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -14,7 +14,7 @@ <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-opensso-plugin</artifactId> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> </dependency> <dependency> <groupId>commons-httpclient</groupId> @@ -28,12 +28,12 @@ <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-agent</artifactId> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> </dependency> <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-auth-callback</artifactId> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> </dependency> </dependencies> Modified: components/sso/trunk/opensso/pom.xml =================================================================== --- components/sso/trunk/opensso/pom.xml 2010-06-18 07:51:33 UTC (rev 3379) +++ components/sso/trunk/opensso/pom.xml 2010-06-18 07:52:01 UTC (rev 3380) @@ -3,13 +3,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.gatein.sso</groupId> <artifactId>sso-opensso-parent</artifactId> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> <packaging>pom</packaging> <parent> <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> </parent> Modified: components/sso/trunk/packaging/pom.xml =================================================================== --- components/sso/trunk/packaging/pom.xml 2010-06-18 07:51:33 UTC (rev 3379) +++ components/sso/trunk/packaging/pom.xml 2010-06-18 07:52:01 UTC (rev 3380) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -14,12 +14,12 @@ <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-agent</artifactId> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> </dependency> <dependency> <groupId>org.gatein.sso</groupId> <artifactId>spnego</artifactId> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> </dependency> <dependency> <groupId>org.jboss.security</groupId> Modified: components/sso/trunk/pom.xml =================================================================== --- components/sso/trunk/pom.xml 2010-06-18 07:51:33 UTC (rev 3379) +++ components/sso/trunk/pom.xml 2010-06-18 07:52:01 UTC (rev 3380) @@ -10,7 +10,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> <packaging>pom</packaging> <parent> @@ -25,9 +25,9 @@ <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/sso/tags/1.0.0-GA</connection> - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/sso/tags/1.0.0-GA</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/sso/tags/1.0.0-GA</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/sso/trunk</connection> + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/sso/trunk</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/sso/trunk</url> </scm> Modified: components/sso/trunk/spnego/pom.xml =================================================================== --- components/sso/trunk/spnego/pom.xml 2010-06-18 07:51:33 UTC (rev 3379) +++ components/sso/trunk/spnego/pom.xml 2010-06-18 07:52:01 UTC (rev 3380) @@ -3,7 +3,7 @@ <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.0.0-GA</version> + <version>1.0.1-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>

14 years, 3 months

1
0
0 / 0

gatein SVN: r3379 - components/sso/tags.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-06-18 03:51:33 -0400 (Fri, 18 Jun 2010) New Revision: 3379 Added: components/sso/tags/1.0.0-GA/ Log: [maven-scm] copy for tag 1.0.0-GA Copied: components/sso/tags/1.0.0-GA (from rev 3378, components/sso/trunk)

14 years, 3 months

1
0
0 / 0

gatein SVN: r3378 - in components/sso/trunk: agent and 12 other directories.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-06-18 03:51:17 -0400 (Fri, 18 Jun 2010) New Revision: 3378 Modified: components/sso/trunk/agent/pom.xml components/sso/trunk/auth-callback/pom.xml components/sso/trunk/cas/gatein-cas-plugin/pom.xml components/sso/trunk/cas/gatein-cas-portal/pom.xml components/sso/trunk/cas/pom.xml components/sso/trunk/josso/gatein-josso-plugin/pom.xml components/sso/trunk/josso/gatein-josso-portal/pom.xml components/sso/trunk/josso/pom.xml components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml components/sso/trunk/opensso/gatein-opensso-portal/pom.xml components/sso/trunk/opensso/pom.xml components/sso/trunk/packaging/pom.xml components/sso/trunk/pom.xml components/sso/trunk/spnego/pom.xml Log: [maven-release-plugin] prepare release 1.0.0-GA Modified: components/sso/trunk/agent/pom.xml =================================================================== --- components/sso/trunk/agent/pom.xml 2010-06-18 07:34:26 UTC (rev 3377) +++ components/sso/trunk/agent/pom.xml 2010-06-18 07:51:17 UTC (rev 3378) @@ -1,10 +1,9 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -68,6 +67,12 @@ <groupId>org.jboss.security</groupId> <artifactId>jboss-negotiation-spnego</artifactId> </dependency> + + <dependency> + <groupId>javax.security</groupId> + <artifactId>jacc</artifactId> + </dependency> + </dependencies> <build> @@ -137,9 +142,7 @@ <tasks> <echo message="Deploying the Gatein SSO Agent" /> - <copy - file="${settings.localRepository}/org/gatein/sso/sso-agent/${project.version}/${project.artifactId}-${project.version}.jar" - todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" /> + <copy file="${settings.localRepository}/org/gatein/sso/sso-agent/${project.version}/${project.artifactId}-${project.version}.jar" todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" /> </tasks> </configuration> <goals> Modified: components/sso/trunk/auth-callback/pom.xml =================================================================== --- components/sso/trunk/auth-callback/pom.xml 2010-06-18 07:34:26 UTC (rev 3377) +++ components/sso/trunk/auth-callback/pom.xml 2010-06-18 07:51:17 UTC (rev 3378) @@ -3,7 +3,7 @@ <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: components/sso/trunk/cas/gatein-cas-plugin/pom.xml =================================================================== --- components/sso/trunk/cas/gatein-cas-plugin/pom.xml 2010-06-18 07:34:26 UTC (rev 3377) +++ components/sso/trunk/cas/gatein-cas-plugin/pom.xml 2010-06-18 07:51:17 UTC (rev 3378) @@ -3,7 +3,7 @@ <groupId>org.gatein.sso</groupId> <artifactId>sso-cas-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: components/sso/trunk/cas/gatein-cas-portal/pom.xml =================================================================== --- components/sso/trunk/cas/gatein-cas-portal/pom.xml 2010-06-18 07:34:26 UTC (rev 3377) +++ components/sso/trunk/cas/gatein-cas-portal/pom.xml 2010-06-18 07:51:17 UTC (rev 3378) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.sso</groupId> <artifactId>sso-cas-parent</artifactId> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -14,7 +14,7 @@ <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-cas-plugin</artifactId> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> </dependency> <dependency> <groupId>commons-httpclient</groupId> @@ -23,12 +23,12 @@ <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-agent</artifactId> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> </dependency> <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-auth-callback</artifactId> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> </dependency> <dependency> <groupId>org.jasig.cas</groupId> Modified: components/sso/trunk/cas/pom.xml =================================================================== --- components/sso/trunk/cas/pom.xml 2010-06-18 07:34:26 UTC (rev 3377) +++ components/sso/trunk/cas/pom.xml 2010-06-18 07:51:17 UTC (rev 3378) @@ -3,13 +3,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.gatein.sso</groupId> <artifactId>sso-cas-parent</artifactId> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> <packaging>pom</packaging> <parent> <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> </parent> <name>GateIn SSO - CAS</name> Modified: components/sso/trunk/josso/gatein-josso-plugin/pom.xml =================================================================== --- components/sso/trunk/josso/gatein-josso-plugin/pom.xml 2010-06-18 07:34:26 UTC (rev 3377) +++ components/sso/trunk/josso/gatein-josso-plugin/pom.xml 2010-06-18 07:51:17 UTC (rev 3378) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.sso</groupId> <artifactId>sso-josso-parent</artifactId> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: components/sso/trunk/josso/gatein-josso-portal/pom.xml =================================================================== --- components/sso/trunk/josso/gatein-josso-portal/pom.xml 2010-06-18 07:34:26 UTC (rev 3377) +++ components/sso/trunk/josso/gatein-josso-portal/pom.xml 2010-06-18 07:51:17 UTC (rev 3378) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.sso</groupId> <artifactId>sso-josso-parent</artifactId> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -54,12 +54,12 @@ <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-agent</artifactId> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> </dependency> <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-auth-callback</artifactId> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> </dependency> <dependency> @@ -74,7 +74,7 @@ <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-josso-plugin</artifactId> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> </dependency> <dependency> <groupId>apache-log4j</groupId> Modified: components/sso/trunk/josso/pom.xml =================================================================== --- components/sso/trunk/josso/pom.xml 2010-06-18 07:34:26 UTC (rev 3377) +++ components/sso/trunk/josso/pom.xml 2010-06-18 07:51:17 UTC (rev 3378) @@ -3,13 +3,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.gatein.sso</groupId> <artifactId>sso-josso-parent</artifactId> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> <packaging>pom</packaging> <parent> <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> </parent> Modified: components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml =================================================================== --- components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml 2010-06-18 07:34:26 UTC (rev 3377) +++ components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml 2010-06-18 07:51:17 UTC (rev 3378) @@ -3,7 +3,7 @@ <groupId>org.gatein.sso</groupId> <artifactId>sso-opensso-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: components/sso/trunk/opensso/gatein-opensso-portal/pom.xml =================================================================== --- components/sso/trunk/opensso/gatein-opensso-portal/pom.xml 2010-06-18 07:34:26 UTC (rev 3377) +++ components/sso/trunk/opensso/gatein-opensso-portal/pom.xml 2010-06-18 07:51:17 UTC (rev 3378) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.sso</groupId> <artifactId>sso-opensso-parent</artifactId> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -14,7 +14,7 @@ <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-opensso-plugin</artifactId> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> </dependency> <dependency> <groupId>commons-httpclient</groupId> @@ -28,12 +28,12 @@ <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-agent</artifactId> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> </dependency> <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-auth-callback</artifactId> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> </dependency> </dependencies> Modified: components/sso/trunk/opensso/pom.xml =================================================================== --- components/sso/trunk/opensso/pom.xml 2010-06-18 07:34:26 UTC (rev 3377) +++ components/sso/trunk/opensso/pom.xml 2010-06-18 07:51:17 UTC (rev 3378) @@ -3,13 +3,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.gatein.sso</groupId> <artifactId>sso-opensso-parent</artifactId> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> <packaging>pom</packaging> <parent> <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> </parent> Modified: components/sso/trunk/packaging/pom.xml =================================================================== --- components/sso/trunk/packaging/pom.xml 2010-06-18 07:34:26 UTC (rev 3377) +++ components/sso/trunk/packaging/pom.xml 2010-06-18 07:51:17 UTC (rev 3378) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -14,12 +14,12 @@ <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-agent</artifactId> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> </dependency> <dependency> <groupId>org.gatein.sso</groupId> <artifactId>spnego</artifactId> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> </dependency> <dependency> <groupId>org.jboss.security</groupId> Modified: components/sso/trunk/pom.xml =================================================================== --- components/sso/trunk/pom.xml 2010-06-18 07:34:26 UTC (rev 3377) +++ components/sso/trunk/pom.xml 2010-06-18 07:51:17 UTC (rev 3378) @@ -10,13 +10,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> <packaging>pom</packaging> <parent> <groupId>org.gatein</groupId> <artifactId>gatein-parent</artifactId> - <version>1.0.0-Beta04</version> + <version>1.0.1-GA</version> </parent> @@ -25,9 +25,9 @@ <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/sso/trunk</connection> - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/sso/trunk</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/sso/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/sso/tags/1.0.0-GA</connection> + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/sso/tags/1.0.0-GA</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/sso/tags/1.0.0-GA</url> </scm> @@ -68,9 +68,9 @@  - <org.exoplatform.core.version>2.3.0-CR2</org.exoplatform.core.version> - <org.exoplatform.ws.version>2.1.0-CR2</org.exoplatform.ws.version> - <org.exoplatform.portal.version>3.0.0-CR01</org.exoplatform.portal.version> + <org.exoplatform.core.version>2.3.2-GA</org.exoplatform.core.version> + <org.exoplatform.ws.version>2.1.2-GA</org.exoplatform.ws.version> + <org.exoplatform.portal.version>3.1.0-GA</org.exoplatform.portal.version>  <version.javax.ws.rs>1.0</version.javax.ws.rs> @@ -209,6 +209,12 @@ <artifactId>jboss-negotiation-spnego</artifactId> <version>${version.jboss.negotiation}</version> </dependency> + + <dependency> + <groupId>javax.security</groupId> + <artifactId>jacc</artifactId> + <version>1.0</version> + </dependency> </dependencies> </dependencyManagement> Modified: components/sso/trunk/spnego/pom.xml =================================================================== --- components/sso/trunk/spnego/pom.xml 2010-06-18 07:34:26 UTC (rev 3377) +++ components/sso/trunk/spnego/pom.xml 2010-06-18 07:51:17 UTC (rev 3378) @@ -1,10 +1,9 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.0.0-Beta03-SNAPSHOT</version> + <version>1.0.0-GA</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -70,9 +69,7 @@ <tasks> <echo message="Deploying the Gatein SPNEGO Login Module" /> - <copy - file="${settings.localRepository}/org/gatein/sso/spnego/${project.version}/${project.artifactId}-${project.version}.jar" - todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" /> + <copy file="${settings.localRepository}/org/gatein/sso/spnego/${project.version}/${project.artifactId}-${project.version}.jar" todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" /> </tasks> </configuration> <goals>

14 years, 3 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: vuthelinh Date: 2010-06-18 03:34:26 -0400 (Fri, 18 Jun 2010) New Revision: 3377 Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03_ChangeDisplayingLanguage.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04_SignInAndSignOut.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RememberMyLogin.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06_UsersManagement.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07_GroupsManagement.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08_MembershipsManagement.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09_ImportApplication.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_CreateAndEditAndDeleteCategoryInApplicationRegistry.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11_AddApplicationIntoCategory.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_Portlet.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_AddRemoteAndCreateNewGadget.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14_ShowOrNotImportApplicationIcon.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15_LinkToPages.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16_ExpandAll.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17_CollapseAll.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_CreateNewPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_EditPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_DeletePortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_ChangeUsingPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_AddNavigation.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31_ChangeLanguagePrivateMode.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_ChangeSkin.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35_CreateNewAccountPrivateMode.html Log: TESTVN-861: All GateIn Snifftest tests run on multiple browsers Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03_ChangeDisplayingLanguage.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03_ChangeDisplayingLanguage.html 2010-06-17 23:14:00 UTC (rev 3376) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03_ChangeDisplayingLanguage.html 2010-06-18 07:34:26 UTC (rev 3377) @@ -4,12 +4,12 @@ <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>SNF_PRL_03</title> +<title>Test_SNF_PRL_03_ChangeDisplayingLanguage</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_03</td></tr> +<tr><td rowspan="1" colspan="3">Test_SNF_PRL_03_ChangeDisplayingLanguage</td></tr> </thead><tbody> <tr> <td>open</td> @@ -18,53 +18,68 @@ </tr> <tr> <td>echo</td> - <td>-Change Language-</td> + <td>-Change Language- English into Vietnamese</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>xpath=//a[@class='Language']</td> - <td>1,1</td> + <td>waitForElementPresent</td> + <td>//a[3]</td> + <td></td> </tr> <tr> + <td>click</td> + <td>//a[3]</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Vietnamese</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Vietnamese</td> - <td>1,1</td> + <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>link=Apply</td> - <td>1,1</td> + <td></td> </tr> <tr> - <td>waitForElementNotPresent</td> - <td>link=Apply</td> + <td>verifyTextPresent</td> + <td>Đăng ký</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>xpath=//a[@class='Language']</td> - <td>1,1</td> + <td>verifyTextPresent</td> + <td>Đăng nhập</td> + <td></td> </tr> <tr> - <td>clickAt</td> - <td>xpath=//a[@class='Language']</td> - <td>1,1</td> + <td>verifyTextPresent</td> + <td>Thay đổi ngôn ngữ</td> + <td></td> </tr> <tr> + <td>verifyTextPresent</td> + <td>Để biết thêm thông tin xin hãy liên lạc với chúng tôi.</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Thay đổi ngôn ngữ</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> - <td>xpath=//div[@id='UITabContent']//div[2]/a</td> + <td>link=Tiếng Anh</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>xpath=//div[@id='UITabContent']//div[2]/a</td> - <td>1,1</td> + <td>click</td> + <td>link=Tiếng Anh</td> + <td></td> </tr> <tr> <td>clickAndWait</td> @@ -72,10 +87,25 @@ <td></td> </tr> <tr> + <td>verifyTextPresent</td> + <td>Sign in</td> + <td></td> +</tr> +<tr> <td>verifyElementPresent</td> - <td>link=Sign in</td> + <td>link=Register</td> <td></td> </tr> +<tr> + <td>verifyElementPresent</td> + <td>link=Change Language</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>For more information, please contact us.</td> + <td></td> +</tr> </tbody></table> </body> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04_SignInAndSignOut.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04_SignInAndSignOut.html 2010-06-17 23:14:00 UTC (rev 3376) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04_SignInAndSignOut.html 2010-06-18 07:34:26 UTC (rev 3377) @@ -4,12 +4,12 @@ <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="http://localhost:8080" /> -<title>SNF_PRL_04</title> +<title>Test_SNF_PRL_04_SignInAndSignOut</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_04</td></tr> +<tr><td rowspan="1" colspan="3">Test_SNF_PRL_04_SignInAndSignOut</td></tr> </thead><tbody> <tr> <td>open</td> @@ -22,6 +22,11 @@ <td></td> </tr> <tr> + <td>verifyTextNotPresent</td> + <td>Root Root</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=Sign in</td> <td></td> @@ -42,28 +47,28 @@ <td>gtn</td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>xpath=//div[@id='UIPortalLoginFormAction']//a</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>link=Sign out</td> + <td>verifyTextPresent</td> + <td>Root Root</td> <td></td> </tr> <tr> - <td>click</td> + <td>clickAndWait</td> <td>link=Sign out</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>link=Sign in</td> + <td>verifyTextNotPresent</td> + <td>Root Root</td> <td></td> </tr> <tr> - <td>verifyElementPresent</td> - <td>link=Sign in</td> + <td>verifyTextPresent</td> + <td>Sign in</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RememberMyLogin.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RememberMyLogin.html 2010-06-17 23:14:00 UTC (rev 3376) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RememberMyLogin.html 2010-06-18 07:34:26 UTC (rev 3377) @@ -4,12 +4,12 @@ <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>SNF_PRL_05</title> +<title>Test_SNF_PRL_05_RememberMyLogin</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_05</td></tr> +<tr><td rowspan="1" colspan="3">Test_SNF_PRL_05_RememberMyLogin</td></tr> </thead><tbody> <tr> <td>open</td> @@ -22,7 +22,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Sign in</td> <td></td> </tr> @@ -47,14 +47,14 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>rememberme</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>//div[@id='UIPortalLoginFormAction']//div[@class='ButtonMiddle']/a</td> - <td>1,1</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> @@ -68,10 +68,20 @@ </tr> <tr> <td>open</td> - <td>/</td> + <td>http://www.google.com</td> <td></td> </tr> <tr> + <td>pause</td> + <td>3000</td> + <td></td> +</tr> +<tr> + <td>verifyTitle</td> + <td>Google</td> + <td></td> +</tr> +<tr> <td>echo</td> <td>--Errase JSESSION Cookie to simulate leaving the browser</td> <td></td> @@ -97,15 +107,10 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> + <td>clickAndWait</td> <td>link=Sign out</td> <td></td> </tr> -<tr> - <td>clickAt</td> - <td>link=Sign out</td> - <td></td> -</tr> </tbody></table> </body> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06_UsersManagement.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06_UsersManagement.html 2010-06-17 23:14:00 UTC (rev 3376) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06_UsersManagement.html 2010-06-18 07:34:26 UTC (rev 3377) @@ -147,9 +147,9 @@ <td>test_name_nick_06</td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Save</td> - <td>1,1</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07_GroupsManagement.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07_GroupsManagement.html 2010-06-17 23:14:00 UTC (rev 3376) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07_GroupsManagement.html 2010-06-18 07:34:26 UTC (rev 3377) @@ -29,7 +29,7 @@ <tr> <td>waitForElementPresent</td> <td>username</td> - <td>root</td> + <td></td> </tr> <tr> <td>type</td> @@ -52,47 +52,32 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> + <td>clickAndWait</td> <td>link=Group</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>link=Group</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</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>waitForElementPresent</td> + <td>click</td> <td>xpath=//div[@id='UIOrganizationPortlet']//div[@class='ManagementIconContainer']/a[@class='GroupButton']</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>xpath=//div[@id='UIOrganizationPortlet']//div[@class='ManagementIconContainer']/a[@class='GroupButton']</td> + <td>echo</td> + <td>--Select "Organization" group from group tree</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>xpath=//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[3]/div/a</td> + <td>xpath=//div[@id='UIOrganizationPortlet']//div[3]//div[@class='ExpandIcon']/a</td> <td></td> </tr> <tr> - <td>echo</td> - <td>--Select "Organization" group from group tree</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//div[@id='UIOrganizationPortlet']//div[3]//div[@class='ExpandIcon']/a</td> <td></td> </tr> @@ -107,7 +92,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//div[@id='UIOrganizationPortlet']//div[3]//div[@class='ExpandIcon']/a</td> <td></td> </tr> @@ -118,15 +103,25 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>xpath=//div[@id='UIOrganizationPortlet']//div[@class='TitleBar']/a[@class='TreeActionIcon AddGroupIcon']</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>clickAt</td> + <td>waitForElementPresent</td> <td>xpath=//div[2]/div[1]/div[1]/a[3]</td> <td></td> </tr> <tr> + <td>click</td> + <td>xpath=//div[2]/div[1]/div[1]/a[3]</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>Group Name</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>groupName</td> <td></td> @@ -152,17 +147,17 @@ <td></td> </tr> <tr> - <td>clickAt</td> - <td>xpath=//form[@id='UIGroupForm']//div[@class='ActionButton LightBlueStyle']</td> + <td>click</td> + <td>link=Save</td> <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>test_group_label_07</td> + <td>waitForElementPresent</td> + <td>link=test_group_label_07</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=test_group_label_07</td> <td></td> </tr> @@ -171,34 +166,35 @@ <td>--Click "Select User" icon</td> <td></td> </tr> + <tr> <td>waitForElementPresent</td> - <td>xpath=//form[@id='UIGroupMembershipForm']//div[@class='HorizontalLayout']//table[@class='UIFormGrid']//td[@class='FieldComponent']/a</td> + <td>xpath=//td[2]/a</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//td[2]/a</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>xpath=//form[@id='UIUserSelector']/div[2]/div[2]/table/tbody/tr/td/a[1]/div/div/div</td> + <td>//tr[2]/td[1]/div/input</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>john</td> + <td>check</td> + <td>//tr[3]/td[1]/div/input</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>mary</td> + <td>click</td> + <td>//tr[2]/td[1]/div/input</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>root</td> + <td>click</td> + <td>//tr[4]/td[1]/div/input</td> <td></td> </tr> <tr> @@ -212,23 +208,23 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//form[@id='UIUserSelector']//div[@class='UIAction']//a[@class='ActionButton LightBlueStyle']</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>xpath=//input[@value='john,mary,root']</td> - <td></td> + <td>waitForValue</td> + <td>username</td> + <td>john,mary,root</td> </tr> <tr> - <td>clickAt</td> + <td>waitForElementPresent</td> <td>link=Save</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>xpath=//div[@class='UIUserInGroup']//div[@title='john']</td> + <td>click</td> + <td>link=Save</td> <td></td> </tr> <tr> @@ -252,27 +248,33 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>waitForElementPresent</td> <td>link=test_group_label_07</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> + <td>link=test_group_label_07</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>xpath=//a[@class='TreeActionIcon RemoveGroupIcon']</td> <td></td> </tr> + <tr> - <td>assertConfirmation</td> - <td>Are you sure you want to delete this group?</td> + <td>click</td> + <td>xpath=//a[@class='TreeActionIcon RemoveGroupIcon']</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>link=Sign out</td> + <td>waitForConfirmation</td> + <td>Are you sure you want to delete this group?</td> <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_SNF_PRL_08_MembershipsManagement.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08_MembershipsManagement.html 2010-06-17 23:14:00 UTC (rev 3376) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08_MembershipsManagement.html 2010-06-18 07:34:26 UTC (rev 3377) @@ -27,6 +27,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> <td>type</td> <td>username</td> <td>root</td> @@ -47,31 +52,21 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> + <td>clickAndWait</td> <td>link=Users and groups management</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>link=Users and groups management</td> - <td></td> -</tr> -<tr> <td>echo</td> <td>--Choose "Memebership Management" tab</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> + <td>click</td> <td>xpath=//div[@id='UIOrganizationPortlet']//div[@class='ManagementIconContainer']/a[@class='MembershipButton']</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>xpath=//div[@id='UIOrganizationPortlet']//div[@class='ManagementIconContainer']/a[@class='MembershipButton']</td> - <td></td> -</tr> -<tr> <td>echo</td> <td>--Create new membership</td> <td></td> @@ -92,7 +87,7 @@ <td>test_description_08</td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Save</td> <td></td> </tr> @@ -112,9 +107,9 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//table[@class='UIGrid']//tbody/tr[2]/td[5]//img[@class='EditMembershipIcon']</td> - <td>1,1</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> @@ -129,50 +124,45 @@ <tr> <td>waitForElementPresent</td> <td>link=Save</td> - <td>1,1</td> + <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Save</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>test_description_edit_08</td> <td></td> </tr> <tr> - <td>verifyTextPresent</td> - <td>test_description_edit_08</td> - <td></td> -</tr> -<tr> <td>echo</td> <td>--Delete membership</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//table[@class='UIGrid']//tbody/tr[2]/td[5]//img[@class='DeleteMembershipIcon']</td> <td></td> </tr> <tr> - <td>assertConfirmation</td> + <td>waitForConfirmation</td> <td>Are you sure you want to delete this membership?</td> <td></td> </tr> <tr> - <td>clickAndWait</td> - <td>link=classic</td> + <td>waitForTextNotPresent</td> + <td>test_name_08</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>link=Sign out</td> + <td>verifyTextNotPresent</td> + <td>test_name_08</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>verifyTextNotPresent</td> + <td>test_description_08</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> <td>link=Sign out</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09_ImportApplication.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09_ImportApplication.html 2010-06-17 23:14:00 UTC (rev 3376) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09_ImportApplication.html 2010-06-18 07:34:26 UTC (rev 3377) @@ -17,14 +17,14 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> + <td>click</td> <td>link=Sign in</td> <td></td> </tr> <tr> - <td>click</td> - <td>link=Sign in</td> - <td></td> + <td>waitForElementPresent</td> + <td>username</td> + <td>root</td> </tr> <tr> <td>type</td> @@ -37,7 +37,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> @@ -52,7 +52,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Application Registry</td> <td></td> </tr> @@ -67,7 +67,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//div[@id='UIApplicationRegistryPortlet']/div[2]/div[2]/div/div/div[2]</td> <td></td> </tr> @@ -82,15 +82,10 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> + <td>clickAndWait</td> <td>link=Sign out</td> <td></td> </tr> -<tr> - <td>clickAt</td> - <td>link=Sign out</td> - <td></td> -</tr> </tbody></table> </body> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_CreateAndEditAndDeleteCategoryInApplicationRegistry.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_CreateAndEditAndDeleteCategoryInApplicationRegistry.html 2010-06-17 23:14:00 UTC (rev 3376) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_CreateAndEditAndDeleteCategoryInApplicationRegistry.html 2010-06-18 07:34:26 UTC (rev 3377) @@ -27,6 +27,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> <td>type</td> <td>username</td> <td>root</td> @@ -52,9 +57,9 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Application Registry</td> - <td>1,1</td> + <td></td> </tr> <tr> <td>echo</td> @@ -64,12 +69,12 @@ <tr> <td>waitForElementPresent</td> <td>xpath=//div[@id='UIApplicationOrganizer']//div[@class='UIControlbar']/div[1]</td> - <td>1,1</td> + <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//div[@id='UIApplicationOrganizer']//div[@class='UIControlbar']/div[1]</td> - <td>1,1</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> @@ -107,7 +112,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Add Permission</td> <td></td> </tr> @@ -117,7 +122,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Platform</td> <td></td> </tr> @@ -127,7 +132,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Administrators</td> <td></td> </tr> @@ -137,7 +142,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=manager</td> <td></td> </tr> @@ -147,7 +152,7 @@ <td>manager</td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Save</td> <td></td> </tr> @@ -172,9 +177,9 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//div[@id='UIApplicationOrganizer']//a[@class='ControlIcon EditIcon']</td> - <td>1,1</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> @@ -187,11 +192,16 @@ <td>test_displayname_edit_10</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>waitForTextPresent</td> <td>test_displayname_edit_10</td> <td></td> @@ -207,12 +217,12 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//div[@class='SelectedTab']//a[@class='ControlIcon DeleteIcon']</td> <td></td> </tr> <tr> - <td>assertConfirmation</td> + <td>waitForConfirmation</td> <td>Are you sure to delete this category and all applications on it?</td> <td></td> </tr> @@ -227,15 +237,10 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>link=Sign out</td> + <td>clickAndWait</td> + <td>//div[3]/a</td> <td></td> </tr> -<tr> - <td>clickAt</td> - <td>link=Sign out</td> - <td></td> -</tr> </tbody></table> </body> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11_AddApplicationIntoCategory.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11_AddApplicationIntoCategory.html 2010-06-17 23:14:00 UTC (rev 3376) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11_AddApplicationIntoCategory.html 2010-06-18 07:34:26 UTC (rev 3377) @@ -218,22 +218,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//a[@onclick="javascript:ajaxGet('/portal/private/classic/administration/registry?portal:componentId=7f5a8dba-5a76-426f-8fdb-3d9db683b0ac&portal:type=action&uicomponent=UIApplicationOrganizer&op=EditCategory&objectId=Test_cat_11&ajaxRequest=true')"]</td> + <td>//a[4]</td> <td></td> </tr> <tr> <td>click</td> - <td>//a[@onclick="javascript:ajaxGet('/portal/private/classic/administration/registry?portal:componentId=7f5a8dba-5a76-426f-8fdb-3d9db683b0ac&portal:type=action&uicomponent=UIApplicationOrganizer&op=EditCategory&objectId=Test_cat_11&ajaxRequest=true')"]</td> + <td>//a[4]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UICategoryForm', 'categoryPermission');javascript:eXo.webui.UIForm.submitEvent('7f5a8dba-5a76-426f-8fdb-3d9db683b0ac#UICategoryForm','SelectTab','&objectId=categoryPermission')"]</td> + <td>//div[2]/div[2]/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UICategoryForm', 'categoryPermission');javascript:eXo.webui.UIForm.submitEvent('7f5a8dba-5a76-426f-8fdb-3d9db683b0ac#UICategoryForm','SelectTab','&objectId=categoryPermission')"]</td> + <td>//div[2]/div[2]/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> <td></td> </tr> <tr> @@ -277,6 +277,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Test_cat_11</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=Test_cat_11</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_Portlet.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_Portlet.html 2010-06-17 23:14:00 UTC (rev 3376) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_Portlet.html 2010-06-18 07:34:26 UTC (rev 3377) @@ -42,7 +42,7 @@ <td>gtn</td> </tr> <tr> - <td>click</td> + <td>clickAndWait</td> <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td> <td></td> </tr> @@ -87,11 +87,6 @@ <td></td> </tr> <tr> - <td>waitForText</td> - <td>//div[@id='UIApplicationOrganizer']/div[2]/div[1]/div/div/div[2]/div/div[1]/div[2]/div[2]/a[1]</td> - <td>New Account</td> -</tr> -<tr> <td>verifyTextPresent</td> <td>New Account</td> <td></td> @@ -113,12 +108,12 @@ </tr> <tr> <td>waitForTextPresent</td> - <td>OrganizationPortlet</td> + <td>Organization Management</td> <td></td> </tr> <tr> <td>verifyTextPresent</td> - <td>OrganizationPortlet</td> + <td>Organization Management</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_AddRemoteAndCreateNewGadget.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_AddRemoteAndCreateNewGadget.html 2010-06-17 23:14:00 UTC (rev 3376) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_AddRemoteAndCreateNewGadget.html 2010-06-18 07:34:26 UTC (rev 3377) @@ -22,14 +22,14 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Sign in</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> <td>username</td> - <td>root</td> + <td></td> </tr> <tr> <td>type</td> @@ -42,7 +42,7 @@ <td>gtn</td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td> <td></td> </tr> @@ -57,9 +57,9 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Application Registry</td> - <td>1,1</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> @@ -67,7 +67,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Gadget</td> <td></td> </tr> @@ -82,9 +82,9 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//div[@class='IconControl AddNewIcon']</td> - <td>1,1</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> @@ -102,9 +102,9 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Add</td> - <td>1,1</td> + <td></td> </tr> <tr> <td>waitForTextPresent</td> @@ -127,16 +127,21 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>//div[@class='SelectedItem ItemContent']/a[2]</td> <td></td> </tr> <tr> - <td>assertConfirmation</td> + <td>waitForConfirmation</td> <td>Are you sure to delete this gadget?</td> <td></td> </tr> <tr> + <td>waitForElementNotPresent</td> + <td>//a[@title='Date & Time']</td> + <td></td> +</tr> +<tr> <td>verifyElementNotPresent</td> <td>//a[@title='Date & Time']</td> <td></td> @@ -152,11 +157,16 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>//div[@id='UIApplicationRegistryPortlet']/div[2]/div[2]/div/div/div[2]</td> <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>name</td> + <td></td> +</tr> +<tr> <td>type</td> <td>name</td> <td>SNF_PRL_13</td> @@ -167,7 +177,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Save</td> <td></td> </tr> @@ -182,25 +192,20 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>//div[@class='SelectedItem ItemContent']//a[2]</td> <td></td> </tr> <tr> - <td>assertConfirmation</td> + <td>waitForConfirmation</td> <td>Are you sure to delete this gadget?</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> + <td>clickAndWait</td> <td>link=Sign out</td> <td></td> </tr> -<tr> - <td>clickAt</td> - <td>link=Sign out</td> - <td></td> -</tr> </tbody></table> </body> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14_ShowOrNotImportApplicationIcon.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14_ShowOrNotImportApplicationIcon.html 2010-06-17 23:14:00 UTC (rev 3376) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14_ShowOrNotImportApplicationIcon.html 2010-06-18 07:34:26 UTC (rev 3377) @@ -22,11 +22,16 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <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> @@ -37,21 +42,16 @@ <td>gtn</td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> + <td>clickAndWait</td> <td>link=Application Registry</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>link=Application Registry</td> - <td>1,1</td> -</tr> -<tr> <td>waitForElementPresent</td> <td>xpath=//div[@class='IconControl ImportIcon']</td> <td></td> @@ -67,17 +67,22 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>waitForElementPresent</td> <td>link=Edit Page</td> <td></td> </tr> <tr> + <td>click</td> + <td>link=Edit Page</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>xpath=//a[@class='EditPortletPropertiesIcon']</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//a[@class='EditPortletPropertiesIcon']</td> <td></td> </tr> @@ -97,17 +102,22 @@ <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=Close</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Close</td> <td></td> </tr> @@ -117,7 +127,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> <td></td> </tr> @@ -147,17 +157,22 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>waitForElementPresent</td> <td>link=Edit Page</td> <td></td> </tr> <tr> + <td>click</td> + <td>link=Edit Page</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>xpath=//a[@class='EditPortletPropertiesIcon']</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//a[@class='EditPortletPropertiesIcon']</td> <td></td> </tr> @@ -177,17 +192,22 @@ <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=Close</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Close</td> <td></td> </tr> @@ -197,7 +217,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> <td></td> </tr> @@ -222,15 +242,10 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> + <td>clickAndWait</td> <td>link=Sign out</td> <td></td> </tr> -<tr> - <td>clickAt</td> - <td>link=Sign out</td> - <td></td> -</tr> </tbody></table> </body> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15_LinkToPages.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15_LinkToPages.html 2010-06-17 23:14:00 UTC (rev 3376) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15_LinkToPages.html 2010-06-18 07:34:26 UTC (rev 3377) @@ -4,12 +4,12 @@ <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>SNF_PRL_15</title> +<title>Test_SNF_PRL_15_LinkToPages</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_15</td></tr> +<tr><td rowspan="1" colspan="3">Test_SNF_PRL_15_LinkToPages</td></tr> </thead><tbody> <tr> <td>open</td> @@ -17,6 +17,11 @@ <td></td> </tr> <tr> + <td>windowMaximize</td> + <td></td> + <td></td> +</tr> +<tr> <td>echo</td> <td>-SiteMapAndLinkToPage-</td> <td></td> @@ -24,6 +29,11 @@ <tr> <td>clickAt</td> <td>link=Sign in</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> <td></td> </tr> <tr> @@ -42,8 +52,8 @@ <td></td> </tr> <tr> - <td>open</td> - <td>/portal/private/classic/sitemap</td> + <td>clickAndWait</td> + <td>//div[@id='PortalNavigationTopContainer']/div[2]/div/div/div/div/div/div/a</td> <td></td> </tr> <tr> @@ -52,6 +62,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>css=div#UISiteMap div.ExpandIcon</td> + <td>1,1</td> +</tr> +<tr> <td>clickAt</td> <td>css=div#UISiteMap div.ExpandIcon</td> <td>1,1</td> @@ -62,23 +77,28 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>waitForElementPresent</td> <td>css=div#UISiteMap div.ChildrenContainer a</td> <td></td> </tr> <tr> - <td>waitForElementNotPresent</td> - <td>css=div#UISiteMap div.ChildrenContainer a</td> + <td>clickAndWait</td> + <td>//div[@id='UISiteMap']/div[2]/div/div[3]/div[2]/div[1]/div/div/a</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>link=Sign out</td> + <td>clickAndWait</td> + <td>//div[3]/a</td> + <td>1,1</td> +</tr> +<tr> + <td>pause</td> + <td>1000</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>link=Sign out</td> + <td>assertLocation</td> + <td>http://localhost:8080/portal/public/classic/</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16_ExpandAll.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16_ExpandAll.html 2010-06-17 23:14:00 UTC (rev 3376) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16_ExpandAll.html 2010-06-18 07:34:26 UTC (rev 3377) @@ -4,12 +4,12 @@ <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>SNF_PRL_16</title> +<title>Test_SNF_PRL_16_ExpandAll</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_16</td></tr> +<tr><td rowspan="1" colspan="3">Test_SNF_PRL_16_ExpandAll</td></tr> </thead><tbody> <tr> <td>open</td> @@ -24,6 +24,11 @@ <tr> <td>clickAt</td> <td>link=Sign in</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> <td></td> </tr> <tr> @@ -52,6 +57,16 @@ <td></td> </tr> <tr> + <td>waitForElementNotPresent</td> + <td>//div[3]/div[2]/div[1]/div/div/a</td> + <td></td> +</tr> +<tr> + <td>verifyElementNotPresent</td> + <td>//div[3]/div[2]/div[1]/div/div/a</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>xpath=//div[@id='UISiteMap']//div[@class='ClearFix']/div[2]</td> <td>1,1</td> @@ -72,12 +87,27 @@ <td></td> </tr> <tr> - <td>verifyElementNotPresent</td> - <td>xpath=//div[@class='ExpandIcon FloatLeft']</td> + <td>verifyTextPresent</td> + <td>Users and groups management</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>verifyTextPresent</td> + <td>Google</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>Facebook</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>Page Management</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> <td>link=Sign out</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17_CollapseAll.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17_CollapseAll.html 2010-06-17 23:14:00 UTC (rev 3376) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17_CollapseAll.html 2010-06-18 07:34:26 UTC (rev 3377) @@ -4,12 +4,12 @@ <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>SNF_PRL_17</title> +<title>Test_SNF_PRL_17_CollapseAll</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_17</td></tr> +<tr><td rowspan="1" colspan="3">Test_SNF_PRL_17_CollapseAll</td></tr> </thead><tbody> <tr> <td>open</td> @@ -27,6 +27,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> <td>type</td> <td>username</td> <td>root</td> @@ -42,8 +47,8 @@ <td></td> </tr> <tr> - <td>open</td> - <td>/portal/private/classic/sitemap</td> + <td>clickAndWait</td> + <td>link=SiteMap</td> <td></td> </tr> <tr> @@ -58,41 +63,126 @@ </tr> <tr> <td>waitForTextPresent</td> - <td>Blog</td> + <td>Page Management</td> <td></td> </tr> <tr> <td>verifyTextPresent</td> + <td>Page Management</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> <td>New Staff</td> <td></td> </tr> <tr> <td>verifyTextPresent</td> - <td>Application Registry</td> + <td>Users and groups management</td> <td></td> </tr> <tr> + <td>verifyTextPresent</td> + <td>Blog</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>Google</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>Facebook</td> + <td></td> +</tr> +<tr> <td>echo</td> <td>--Collapse SiteMap Tree</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>xpath=//div[@id='UISiteMap']//div[@class='ClearFix']/div[1]</td> - <td>1,1</td> + <td>waitForElementPresent</td> + <td>//div[@id='UISiteMap']/div[1]/div[1]</td> + <td></td> </tr> <tr> - <td>waitForTextNotPresent</td> - <td>Blog</td> + <td>click</td> + <td>//div[@id='UISiteMap']/div[1]/div[1]</td> <td></td> </tr> <tr> + <td>echo</td> + <td>-- verify Application Registry disappear</td> + <td></td> +</tr> +<tr> <td>verifyElementNotPresent</td> - <td>xpath=//div[@class='CollapseIcon FloatLeft']</td> + <td>//div[@id='UISiteMap']/div[2]/div/div[3]/div[2]/div[1]/div/div/a</td> <td></td> </tr> <tr> - <td>click</td> + <td>echo</td> + <td>-- verify  Page Management disappear</td> + <td></td> +</tr> +<tr> + <td>verifyElementNotPresent</td> + <td>//div[3]/div[2]/div[2]/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- verify  New Staff disappear</td> + <td></td> +</tr> +<tr> + <td>verifyElementNotPresent</td> + <td>//div[4]/div[2]/div[1]/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- verify Users and groups management  disappear</td> + <td></td> +</tr> +<tr> + <td>verifyElementNotPresent</td> + <td>//div[4]/div[2]/div[2]/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- verify  Blog disappear</td> + <td></td> +</tr> +<tr> + <td>verifyElementNotPresent</td> + <td>//div[5]/div[2]/div[1]/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- verify  Google disappear</td> + <td></td> +</tr> +<tr> + <td>verifyElementNotPresent</td> + <td>//div[5]/div[2]/div[2]/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- verify Facebook disappear</td> + <td></td> +</tr> +<tr> + <td>verifyElementNotPresent</td> + <td>//div[3]/div/div/a</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> <td>link=Sign out</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_CreateNewPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_CreateNewPortal.html 2010-06-17 23:14:00 UTC (rev 3376) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_CreateNewPortal.html 2010-06-18 07:34:26 UTC (rev 3377) @@ -3,7 +3,7 @@ <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="" /> +<link rel="selenium.base" href="http://localhost:8080" /> <title>Test_SNF_PRL_18_CreateNewPortal</title> </head> <body> @@ -48,7 +48,7 @@ </tr> <tr> <td>open</td> - <td>/portal/private/classic/portalnavigation</td> + <td>/portal/public/classic/portalnavigation</td> <td></td> </tr> <tr> @@ -82,76 +82,115 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>waitForElementPresent</td> <td>//div[contains(@onclick, 'eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane') and contains(@onclick, 'PermissionSetting')]</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>publicMode</td> + <td>//div[contains(@onclick, 'eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane') and contains(@onclick, 'PermissionSetting')]</td> <td></td> </tr> + <tr> - <td>clickAt</td> + <td>click</td> + <td>link=Add Permission</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Customers</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Customers</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=exact:*</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=exact:*</td> + <td></td> +</tr> + +<tr> + <td>waitForElementPresent</td> <td>link=Edit Permission Setting</td> - <td>1,1</td> + <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> + <td>link=Edit Permission Setting</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>link=Select Permission</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>link=Platform</td> - <td>1,1</td> + <td>link=Select Permission</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>xpath=//div[@id='PermissionSelector']//a[@title='Administrators']</td> + <td>//div[@id='PermissionSelector']/div/div[2]/div/div[2]/div/div/div[5]/div/a</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>xpath=//div[@id='PermissionSelector']//a[@title='Administrators']</td> - <td>1,1</td> + <td>click</td> + <td>//div[@id='PermissionSelector']/div/div[2]/div/div[2]/div/div/div[5]/div/a</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>xpath=//div[@id='PermissionSelector']//a[@title='manager']</td> + <td>link=Administrators</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>xpath=//div[@id='PermissionSelector']//a[@title='manager']</td> + <td>click</td> + <td>link=Administrators</td> <td></td> </tr> + <tr> - <td>waitForTextNotPresent</td> - <td>Permission Selector</td> + <td>waitForElementPresent</td> + <td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[2]/a</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>xpath=//form[@id='UIPortalForm']//div[@class='UIAction']//div[@class='ActionButton LightBlueStyle']//div[@class='ButtonMiddle']/a</td> - <td>1,1</td> + <td>click</td> + <td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[2]/a</td> + <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>test_portal_18</td> + <td>waitForElementPresent</td> + <td>link=Save</td> <td></td> </tr> <tr> - <td>pause</td> - <td>10000</td> + <td>click</td> + <td>link=Save</td> <td></td> </tr> + <tr> <td>echo</td> <td>--Verify portal creation</td> <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=test_portal_18</td> + <td></td> +</tr> +<tr> <td>verifyElementPresent</td> <td>link=test_portal_18</td> <td></td> @@ -171,43 +210,35 @@ <td>link=Site</td> <td></td> </tr> + <tr> - <td>pause</td> - <td>10000</td> - <td></td> -</tr> -<tr> <td>waitForElementPresent</td> <td>xpath=//div[@id='UISiteManagement']/table/tbody/tr/td[2]/div</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>xpath=//div[@id='UISiteManagement']/table[2]//a[@class='DeleteIcon']</td> + <td>clickAndWait</td> + <td>link=Delete</td> <td></td> </tr> <tr> - <td>assertConfirmation</td> + <td>waitForConfirmation</td> <td>Are you sure you want to delete this portal?</td> <td></td> </tr> + <tr> - <td>pause</td> - <td>5000</td> - <td></td> -</tr> -<tr> <td>waitForTextNotPresent</td> <td>test_portal_18</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>link=Sign out</td> + <td>verifyTextNotPresent</td> + <td>test_portal_18</td> <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_SNF_PRL_19_EditPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_EditPortal.html 2010-06-17 23:14:00 UTC (rev 3376) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_EditPortal.html 2010-06-18 07:34:26 UTC (rev 3377) @@ -22,14 +22,14 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Sign in</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> <td>username</td> - <td>root</td> + <td></td> </tr> <tr> <td>type</td> @@ -42,7 +42,7 @@ <td>gtn</td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> <td></td> </tr> @@ -52,7 +52,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Site</td> <td></td> </tr> @@ -67,7 +67,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//a[@class='EditLayoutIcon']</td> <td></td> </tr> @@ -77,7 +77,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//a[@title='Administration']</td> <td></td> </tr> @@ -97,13 +97,8 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//div[@id='UIPortalComposer']//div[@class='OverflowContainer']/a[@class='CloseButton']</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>classic</td> <td></td> </tr> <tr> @@ -112,19 +107,24 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>waitForElementPresent</td> <td>link=Edit Navigation</td> - <td>1,1</td> + <td></td> </tr> <tr> + <td>click</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Add Node</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Add Node</td> - <td>1,1</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> @@ -147,17 +147,22 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>waitForElementPresent</td> <td>css=div#UISiteManagement > div.UIPopupWindow div.TabsContainer div.NormalTab div.MiddleTab</td> - <td>1,1</td> + <td></td> </tr> <tr> + <td>click</td> + <td>css=div#UISiteManagement > div.UIPopupWindow div.TabsContainer div.NormalTab div.MiddleTab</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Search and Select Page</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Search and Select Page</td> <td></td> </tr> @@ -172,7 +177,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//div[@id='UIRepeater']//table//tbody/tr/td[5]/div[@class='ActionContainer']/img</td> <td></td> </tr> @@ -187,9 +192,9 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Save</td> - <td>1,1</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> @@ -202,7 +207,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Save</td> <td></td> </tr> @@ -214,12 +219,12 @@ <tr> <td>waitForElementPresent</td> <td>link=Edit Portal's Config</td> - <td>1,1</td> + <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Edit Portal's Config</td> - <td>1,1</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> @@ -227,7 +232,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//div[@id='UIMaskWorkspace']//div[3]//div[@class='MiddleTab']</td> <td></td> </tr> @@ -237,7 +242,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Edit Permission Setting</td> <td></td> </tr> @@ -247,7 +252,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Select Permission</td> <td></td> </tr> @@ -257,7 +262,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Platform</td> <td></td> </tr> @@ -267,26 +272,37 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Administrators</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>xpath=//div[@id='PermissionSelector']//div[2]/a</td> + <td>waitForElementPresent</td> + <td>link=manager</td> <td></td> </tr> <tr> - <td>waitForTextNotPresent</td> - <td>Permission Selector</td> + <td>click</td> + <td>link=manager</td> <td></td> </tr> + <tr> - <td>clickAt</td> - <td>xpath=//form[@id='UIPortalForm']//div[@class='UIAction']//div[@class='ActionButton LightBlueStyle']</td> + <td>waitForElementPresent</td> + <td>//form[@id='UIPortalForm']/div[3]/div[2]/table/tbody/tr/td/div[1]/div/div/div/a</td> <td></td> </tr> <tr> + <td>click</td> + <td>//form[@id='UIPortalForm']/div[3]/div[2]/table/tbody/tr/td/div[1]/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=test_node_label_19</td> + <td></td> +</tr> +<tr> <td>waitForTextNotPresent</td> <td>Portal Setting</td> <td></td> @@ -302,31 +318,21 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>link=test_node_label_19</td> + <td>clickAndWait</td> + <td>//div[@id='PortalNavigationTopContainer']/div[3]/div/div/div/div/div/div/a</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>link=test_node_label_19</td> - <td></td> -</tr> -<tr> <td>echo</td> <td>--Delete node</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> + <td>clickAndWait</td> <td>link=Site</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>link=Site</td> - <td></td> -</tr> -<tr> <td>waitForElementPresent</td> <td>link=Edit Navigation</td> <td></td> @@ -337,22 +343,22 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>xpath=//div[@id='UINavigationManagement']</td> + <td>componentExoContextMenu</td> + <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[8]/div/a</td> <td></td> </tr> <tr> - <td>componentExoContextMenu</td> - <td>xpath=//a[@title='test_node_label_19']</td> + <td>echo</td> + <td>test bug</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td> + <td>click</td> + <td>link=Delete Node</td> <td></td> </tr> <tr> - <td>assertConfirmation</td> + <td>waitForConfirmation</td> <td>Are you sure you want to delete this node?</td> <td></td> </tr> @@ -362,50 +368,30 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Save</td> <td></td> </tr> <tr> - <td>waitForElementNotPresent</td> - <td>link=test_node_label_19</td> - <td></td> -</tr> -<tr> <td>echo</td> <td>--Verify Deletion</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> + <td>clickAndWait</td> <td>link=Home</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>link=Home</td> - <td></td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>Demo</td> - <td></td> -</tr> -<tr> <td>verifyTextNotPresent</td> <td>test_node_label_19</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> + <td>clickAndWait</td> <td>link=Sign out</td> <td></td> </tr> -<tr> - <td>clickAt</td> - <td>link=Sign out</td> - <td></td> -</tr> </tbody></table> </body> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_DeletePortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_DeletePortal.html 2010-06-17 23:14:00 UTC (rev 3376) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_DeletePortal.html 2010-06-18 07:34:26 UTC (rev 3377) @@ -22,7 +22,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Sign in</td> <td></td> </tr> @@ -47,7 +47,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>link=Site</td> <td></td> </tr> @@ -106,18 +106,40 @@ <td>xpath=//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'PermissionSetting');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=PermissionSetting')"]</td> <td></td> </tr> + <tr> <td>waitForElementPresent</td> - <td>publicMode</td> + <td>link=Add Permission</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>publicMode</td> + <td>click</td> + <td>link=Add Permission</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> + <td>link=Customers</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Customers</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=exact:*</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=exact:*</td> + <td></td> +</tr> + +<tr> + <td>waitForElementPresent</td> <td>link=Edit Permission Setting</td> <td></td> </tr> @@ -136,34 +158,40 @@ <td>link=Select Permission</td> <td></td> </tr> + <tr> <td>waitForElementPresent</td> - <td>link=Platform</td> + <td>//div[@onclick="javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','ChangeNode','&subComponentId=TreePermissionSelector&objectId=/platform')"]</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>link=Platform</td> + <td>click</td> + <td>//div[@onclick="javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','ChangeNode','&subComponentId=TreePermissionSelector&objectId=/platform')"]</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>link=Platform</td> + <td>waitForElementPresent</td> + <td>//div[@id='PermissionSelector']/div/div[2]/div/div[2]/div/div/div[5]/div[2]/div[1]/div/a</td> <td></td> </tr> <tr> + <td>click</td> + <td>//div[@id='PermissionSelector']/div/div[2]/div/div[2]/div/div/div[5]/div[2]/div[1]/div/a</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> - <td>link=exact:*</td> + <td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[4]/a</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>link=exact:*</td> + <td>click</td> + <td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[4]/a</td> <td></td> </tr> <tr> - <td>waitForText</td> - <td>xpath=//div[@id='UIPermissionSelector']/div/div[2]/div[1]/div[3]/div[2]</td> + <td>waitForElementPresent</td> + <td>link=Save</td> <td>exact:*</td> </tr> <tr> @@ -192,22 +220,12 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>xpath=//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td> + <td>clickAndWait</td> + <td>link=Delete</td> <td></td> </tr> <tr> - <td>pause</td> - <td>5000</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>xpath=//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td> - <td></td> -</tr> -<tr> - <td>assertConfirmation</td> + <td>waitForConfirmation</td> <td>Are you sure you want to delete this portal?</td> <td></td> </tr> @@ -222,15 +240,10 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> + <td>clickAndWait</td> <td>link=Sign out</td> <td></td> </tr> -<tr> - <td>clickAt</td> - <td>link=Sign out</td> - <td></td> -</tr> </tbody></table> </body> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_ChangeUsingPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_ChangeUsingPortal.html 2010-06-17 23:14:00 UTC (rev 3376) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_ChangeUsingPortal.html 2010-06-18 07:34:26 UTC (rev 3377) @@ -22,7 +22,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Sign in</td> <td></td> </tr> @@ -47,7 +47,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>link=Site</td> <td></td> </tr> @@ -62,7 +62,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Add New Portal</td> <td></td> </tr> @@ -77,12 +77,17 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>name</td> + <td></td> +</tr> +<tr> <td>type</td> <td>name</td> <td>test_portal_name_21</td> </tr> <tr> - <td>clickAt</td> + <td>waitForElementPresent</td> <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'Properties');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=Properties')"]</td> <td></td> </tr> @@ -91,144 +96,151 @@ <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'PermissionSetting');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=PermissionSetting')"]</td> <td></td> </tr> + <tr> - <td>clickAt</td> - <td>publicMode</td> + <td>waitForElementPresent</td> + <td>link=Add Permission</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>link=Edit Permission Setting</td> + <td>click</td> + <td>link=Add Permission</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>link=Select Permission</td> + <td>waitForElementPresent</td> + <td>//a[contains(text(),'Platform')]</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>link=Platform</td> + <td>click</td> + <td>//a[contains(text(),'Platform')]</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>link=Platform</td> + <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>link=exact:*</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=exact:*</td> <td></td> </tr> + <tr> - <td>waitForText</td> - <td>//div[@id='UIPermissionSelector']/div/div[2]/div[1]/div[3]/div[2]</td> - <td>exact:*</td> + <td>waitForElementPresent</td> + <td>link=Edit Permission Setting</td> + <td></td> </tr> <tr> - <td>clickAt</td> - <td>link=Save</td> + <td>click</td> + <td>link=Edit Permission Setting</td> <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>test_portal_name_21</td> + <td>waitForElementPresent</td> + <td>link=Select Permission</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td> + <td>click</td> + <td>link=Select Permission</td> <td></td> </tr> <tr> - <td>verifyTextPresent</td> - <td>test_portal_name_21</td> + <td>waitForElementPresent</td> + <td>//div[@onclick="javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','ChangeNode','&subComponentId=TreePermissionSelector&objectId=/platform')"]</td> <td></td> </tr> <tr> - <td>echo</td> - <td>--View new portal</td> + <td>click</td> + <td>//div[@onclick="javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','ChangeNode','&subComponentId=TreePermissionSelector&objectId=/platform')"]</td> <td></td> </tr> <tr> - <td>clickAndWait</td> - <td>link=Site</td> + <td>waitForElementPresent</td> + <td>//div[@onclick="javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','ChangeNode','&subComponentId=TreePermissionSelector&objectId=/platform/administrators')"]</td> <td></td> </tr> <tr> - <td>clickAndWait</td> - <td>link=test_portal_name_21</td> + <td>click</td> + <td>//div[@onclick="javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','ChangeNode','&subComponentId=TreePermissionSelector&objectId=/platform/administrators')"]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>link=Site</td> + <td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[4]/a</td> <td></td> </tr> <tr> - <td>open</td> - <td>/portal/private/classic/</td> + <td>click</td> + <td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[4]/a</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>link=Site</td> + <td>link=Save</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>link=Site</td> + <td>link=Save</td> <td></td> </tr> <tr> - <td>echo</td> - <td>--Delete new portal</td> + <td>waitForElementPresent</td> + <td>//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']/table[2]//td[3]/a[4]</td> + <td>verifyTextPresent</td> + <td>test_portal_name_21</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>//div[@id='UISiteManagement']/table[2]//td[3]/a[4]</td> + <td>echo</td> + <td>--View new portal</td> <td></td> </tr> <tr> - <td>assertConfirmation</td> - <td>Are you sure you want to delete this portal?</td> + <td>clickAndWait</td> + <td>link=test_portal_name_21</td> <td></td> </tr> <tr> - <td>pause</td> - <td>5000</td> + <td>echo</td> + <td>--Delete new portal</td> <td></td> </tr> <tr> - <td>waitForTextNotPresent</td> - <td>test_portal_name_21</td> + <td>clickAndWait</td> + <td>link=Site</td> <td></td> </tr> <tr> - <td>verifyTextNotPresent</td> - <td>test_portal_name_21</td> + <td>clickAndWait</td> + <td>link=Delete</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>link=Sign out</td> + <td>waitForConfirmation</td> + <td>Are you sure you want to delete this portal?</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>link=Sign out</td> + <td>verifyTextNotPresent</td> + <td>test_portal_name_21</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal.html 2010-06-17 23:14:00 UTC (rev 3376) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal.html 2010-06-18 07:34:26 UTC (rev 3377) @@ -3,7 +3,7 @@ <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="http://localhost:8080/portal" /> +<link rel="selenium.base" href="http://localhost:8080" /> <title>Test_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal</title> </head> <body> @@ -52,11 +52,16 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>waitForElementPresent</td> <td>link=Edit Layout</td> - <td>1,1</td> + <td></td> </tr> <tr> + <td>click</td> + <td>link=Edit Layout</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Site's Config</td> <td></td> @@ -132,24 +137,24 @@ <td></td> </tr> <tr> - <td>waitForText</td> - <td>xpath=//div[@id='UIPermissionSelector']/div/div[2]/div[1]/div[3]/div[2]</td> - <td>exact:*</td> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Save</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>xpath=//div[@id='UIPortalComposer']//a[@class='EdittedSaveButton']</td> + <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>xpath=//div[@id='UIPortalComposer']//a[@class='EdittedSaveButton']</td> - <td>1,1</td> + <td>click</td> + <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> @@ -167,19 +172,19 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> + <td>clickAndWait</td> <td>link=Site</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>link=Site</td> + <td>waitForElementPresent</td> + <td>link=Edit Layout</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Edit Layout</td> - <td>1,1</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> @@ -197,39 +202,54 @@ <td></td> </tr> <tr> + <td>select</td> + <td>locale</td> + <td>label=English</td> +</tr> +<tr> <td>verifyTextPresent</td> <td>French</td> <td></td> </tr> <tr> - <td>select</td> - <td>locale</td> - <td>label=English</td> + <td>waitForElementPresent</td> + <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']//div[3]//div[@class='MiddleTab']</td> + <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']//div[3]//div[@class='MiddleTab']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>publicMode</td> + <td>link=Save</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>xpath=//div[@id='UIPortalComposer']//a[@class='EdittedSaveButton']</td> - <td>1,1</td> + <td>click</td> + <td>link=Save</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> + <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[1]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[1]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>link=classic</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=classic</td> - <td>1,1</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> @@ -237,9 +257,9 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>link=Sign out</td> - <td>1,1</td> + <td></td> </tr> </tbody></table> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_AddNavigation.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_AddNavigation.html 2010-06-17 23:14:00 UTC (rev 3376) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_AddNavigation.html 2010-06-18 07:34:26 UTC (rev 3377) @@ -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> @@ -52,16 +52,11 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> + <td>clickAndWait</td> <td>link=Group</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>link=Group</td> - <td></td> -</tr> -<tr> <td>waitForElementPresent</td> <td>link=Add Navigation</td> <td></td> @@ -87,7 +82,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Cancel</td> <td></td> </tr> @@ -97,7 +92,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>//div[@id='UIGroupNavigationGrid']/table[2]/tbody/tr/td[3]/a[1]</td> <td></td> </tr> @@ -117,7 +112,12 @@ <td></td> </tr> <tr> - <td>waitForText</td> + <td>waitForElementPresent</td> + <td>//div[contains(@id,'UIPopupWindow')]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>name</td> <td></td> </tr> @@ -247,17 +247,12 @@ <td></td> </tr> <tr> - <td>waitForElementNotPresent</td> - <td>link=test_grp_label_23</td> - <td></td> -</tr> -<tr> <td>waitForElementPresent</td> <td>link=Sign out</td> <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_SNF_PRL_31_ChangeLanguagePrivateMode.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31_ChangeLanguagePrivateMode.html 2010-06-17 23:14:00 UTC (rev 3376) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31_ChangeLanguagePrivateMode.html 2010-06-18 07:34:26 UTC (rev 3377) @@ -4,12 +4,12 @@ <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>SNF_PRL_31</title> +<title>Test_SNF_PRL_31_ChangeLanguagePrivateMode</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_31</td></tr> +<tr><td rowspan="1" colspan="3">Test_SNF_PRL_31_ChangeLanguagePrivateMode</td></tr> </thead><tbody> <tr> <td>open</td> @@ -27,6 +27,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> <td>type</td> <td>username</td> <td>root</td> @@ -112,10 +117,15 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <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> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_ChangeSkin.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_ChangeSkin.html 2010-06-17 23:14:00 UTC (rev 3376) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_ChangeSkin.html 2010-06-18 07:34:26 UTC (rev 3377) @@ -22,16 +22,11 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> + <td>click</td> <td>link=Sign in</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>link=Sign in</td> - <td></td> -</tr> -<tr> <td>waitForElementPresent</td> <td>username</td> <td></td> @@ -47,7 +42,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 +52,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Change Skin</td> <td></td> </tr> @@ -68,17 +63,17 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>xpath=//div[@id='UITabContent']//div[@class='ItemListContainer']//div[@class='ItemList']//div[@class='SelectedItem Item']</td> + <td>//div[@id='UITabContent']/div/div/div[1]/div[2]/div[1]/div/div/div</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>xpath=//div[@id='UITabContent']//div[@class='ItemListContainer']//div[@class='ItemList']//div[@class='SelectedItem Item']</td> + <td>click</td> + <td>//div[@id='UITabContent']/div/div/div[1]/div[2]/div[1]/div/div/div</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>//div[@id='UIMaskWorkspace']//div[@class='UIChangeSkinForm']//div[@class='UIAction']//div</td> + <td>clickAndWait</td> + <td>link=Apply</td> <td></td> </tr> <tr> @@ -88,11 +83,6 @@ </tr> <tr> <td>echo</td> - <td>---------</td> - <td></td> -</tr> -<tr> - <td>echo</td> <td>--Change to Simple skin--</td> <td></td> </tr> @@ -113,22 +103,22 @@ </tr> <tr> <td>verifyText</td> - <td>//div[@id='UITabContent']//div[@class='ItemListContainer']//div[@class='ItemList']/div[@class='SelectedItem Item']</td> + <td>//div[@id='UITabContent']/div/div/div[1]/div[2]/div[1]/div/div/div</td> <td>Default Style Skin</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UITabContent']//div[@class='ItemListContainer']//div[@class='ItemList']/div[2]</td> + <td>//div[@id='UITabContent']/div/div/div[1]/div[2]/div[2]/div/div/div</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>//div[@id='UITabContent']//div[@class='ItemListContainer']//div[@class='ItemList']/div[2]</td> + <td>click</td> + <td>//div[@id='UITabContent']/div/div/div[1]/div[2]/div[2]/div/div/div</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>//div[@id='UIMaskWorkspace']//div[@class='UIChangeSkinForm']//div[@class='UIAction']//div</td> + <td>clickAndWait</td> + <td>link=Apply</td> <td></td> </tr> <tr> @@ -153,39 +143,34 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UITabContent']//div[@class='ItemListContainer']//div[@class='ItemList']//div[@class='Item']</td> + <td>//div[@id='UITabContent']/div/div/div[1]/div[2]/div[1]/div/div/div</td> <td>Default Style Skin</td> </tr> <tr> <td>verifyText</td> - <td>//div[@id='UITabContent']//div[@class='ItemListContainer']//div[@class='ItemList']//div[@class='Item']</td> + <td>//div[@id='UITabContent']/div/div/div[1]/div[2]/div[1]/div/div/div</td> <td>Default Style Skin</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UITabContent']//div[@class='ItemListContainer']//div[@class='ItemList']/div/div</td> + <td>//div[@id='UITabContent']/div/div/div[1]/div[2]/div[2]/div/div/div</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>//div[@id='UITabContent']//div[@class='ItemListContainer']//div[@class='ItemList']/div/div</td> + <td>click</td> + <td>//div[@id='UITabContent']/div/div/div[1]/div[2]/div[2]/div/div/div</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>//div[@id='UIMaskWorkspace']//div[@class='UIChangeSkinForm']//div[@class='UIAction']//div</td> + <td>clickAndWait</td> + <td>link=Apply</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> + <td>clickAndWait</td> <td>link=Sign out</td> <td></td> </tr> -<tr> - <td>clickAt</td> - <td>link=Sign out</td> - <td></td> -</tr> </tbody></table> </body> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35_CreateNewAccountPrivateMode.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35_CreateNewAccountPrivateMode.html 2010-06-17 23:14:00 UTC (rev 3376) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35_CreateNewAccountPrivateMode.html 2010-06-18 07:34:26 UTC (rev 3377) @@ -17,16 +17,26 @@ <td></td> </tr> <tr> + <td>windowMaximize</td> + <td></td> + <td></td> +</tr> +<tr> <td>echo</td> <td>-CreateNewAccountInPrivateMode-</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Sign in</td> <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>username</td> + <td>root</td> +</tr> +<tr> <td>type</td> <td>username</td> <td>root</td> @@ -37,12 +47,12 @@ <td>gtn</td> </tr> <tr> - <td>clickAtAndWait</td> + <td>clickAndWait</td> <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>link=New Staff</td> <td></td> </tr> @@ -87,7 +97,7 @@ <td>test_user_35(a)yahoo.com</td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//div[@class='UIRowContainer']//div[@class='UIFormTabPane']//div[@class='TabsContainer']/div[2]/div/div/div/div</td> <td></td> </tr> @@ -102,12 +112,12 @@ <td>test_name_given_35</td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//div[@class='UIRowContainer']//div[@class='UIFormTabPane']//div[@class='TabsContainer']/div/div/div/div/div</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Save</td> <td></td> </tr> @@ -127,7 +137,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>link=Users and groups management</td> <td></td> </tr> @@ -152,12 +162,12 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>click</td> <td>xpath=//div[@class='UIListUsers']//tbody/tr[5]//img[@class='DeleteUserIcon']</td> <td></td> </tr> <tr> - <td>assertConfirmation</td> + <td>waitForConfirmation</td> <td>Are you sure you want to delete test_user_35 user?</td> <td></td> </tr> @@ -167,12 +177,12 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>link=Sign out</td> + <td>verifyTextNotPresent</td> + <td>test_user_35</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>link=Sign out</td> <td></td> </tr>

14 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits June 2010