JBoss Portal SVN: r12844 - modules/portlet/tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-02-20 07:51:23 -0500 (Fri, 20 Feb 2009)
New Revision: 12844
Added:
modules/portlet/tags/JBP_PORTLET_2_0_6/
Log:
TAgging portlet 2.0.6
Copied: modules/portlet/tags/JBP_PORTLET_2_0_6 (from rev 12843, modules/portlet/trunk)
17 years, 2 months
JBoss Portal SVN: r12843 - in modules/common/tags/JBP_COMMON_1_2_4: build and 3 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-02-20 07:38:24 -0500 (Fri, 20 Feb 2009)
New Revision: 12843
Modified:
modules/common/tags/JBP_COMMON_1_2_4/build/pom.xml
modules/common/tags/JBP_COMMON_1_2_4/common/pom.xml
modules/common/tags/JBP_COMMON_1_2_4/mc/pom.xml
modules/common/tags/JBP_COMMON_1_2_4/pom.xml
modules/common/tags/JBP_COMMON_1_2_4/portal/pom.xml
modules/common/tags/JBP_COMMON_1_2_4/releaseLibs.sh
Log:
Tagging 1.2.4
Modified: modules/common/tags/JBP_COMMON_1_2_4/build/pom.xml
===================================================================
--- modules/common/tags/JBP_COMMON_1_2_4/build/pom.xml 2009-02-20 12:32:51 UTC (rev 12842)
+++ modules/common/tags/JBP_COMMON_1_2_4/build/pom.xml 2009-02-20 12:38:24 UTC (rev 12843)
@@ -10,7 +10,7 @@
<artifactId>module-parent</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Modules Common</name>
- <version>trunk-SNAPSHOT</version>
+ <version>1.2.4</version>
<url>http://labs.jboss.com/jbossportal</url>
<properties>
Modified: modules/common/tags/JBP_COMMON_1_2_4/common/pom.xml
===================================================================
--- modules/common/tags/JBP_COMMON_1_2_4/common/pom.xml 2009-02-20 12:32:51 UTC (rev 12842)
+++ modules/common/tags/JBP_COMMON_1_2_4/common/pom.xml 2009-02-20 12:38:24 UTC (rev 12843)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.common</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.2.4</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/common/tags/JBP_COMMON_1_2_4/mc/pom.xml
===================================================================
--- modules/common/tags/JBP_COMMON_1_2_4/mc/pom.xml 2009-02-20 12:32:51 UTC (rev 12842)
+++ modules/common/tags/JBP_COMMON_1_2_4/mc/pom.xml 2009-02-20 12:38:24 UTC (rev 12843)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.common</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.2.4</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/common/tags/JBP_COMMON_1_2_4/pom.xml
===================================================================
--- modules/common/tags/JBP_COMMON_1_2_4/pom.xml 2009-02-20 12:32:51 UTC (rev 12842)
+++ modules/common/tags/JBP_COMMON_1_2_4/pom.xml 2009-02-20 12:38:24 UTC (rev 12843)
@@ -5,7 +5,7 @@
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Modules Common (aggregator)</name>
- <version>trunk-SNAPSHOT</version>
+ <version>1.2.4</version>
<distributionManagement>
<repository>
Modified: modules/common/tags/JBP_COMMON_1_2_4/portal/pom.xml
===================================================================
--- modules/common/tags/JBP_COMMON_1_2_4/portal/pom.xml 2009-02-20 12:32:51 UTC (rev 12842)
+++ modules/common/tags/JBP_COMMON_1_2_4/portal/pom.xml 2009-02-20 12:38:24 UTC (rev 12843)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.common</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.2.4</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/common/tags/JBP_COMMON_1_2_4/releaseLibs.sh
===================================================================
--- modules/common/tags/JBP_COMMON_1_2_4/releaseLibs.sh 2009-02-20 12:32:51 UTC (rev 12842)
+++ modules/common/tags/JBP_COMMON_1_2_4/releaseLibs.sh 2009-02-20 12:38:24 UTC (rev 12843)
@@ -1,4 +1,4 @@
-repos=$HOME/Dev/portal-modules-repos/common/trunk-SNAPSHOT/lib
+repos=$HOME/Dev/portal-modules-repos/common/1.2.4/lib
thirdparty=$HOME/Dev/jboss-portal-2.7/thirdparty/jboss-portal/modules/common/lib/
echo "Copies current version of common libraries either to local repository copy or Portal thirdparty to test or release purpose"
@@ -26,6 +26,6 @@
fi
-cp common/target/common-common-trunk-SNAPSHOT.jar $loc/portal-common-lib.jar
-cp mc/target/common-mc-trunk-SNAPSHOT.jar $loc/portal-common-mc-lib.jar
-cp portal/target/common-portal-trunk-SNAPSHOT.jar $loc/portal-common-portal-lib.jar
+cp common/target/common-common-1.2.4.jar $loc/portal-common-lib.jar
+cp mc/target/common-mc-1.2.4.jar $loc/portal-common-mc-lib.jar
+cp portal/target/common-portal-1.2.4.jar $loc/portal-common-portal-lib.jar
17 years, 2 months
JBoss Portal SVN: r12842 - modules/common/tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-02-20 07:32:51 -0500 (Fri, 20 Feb 2009)
New Revision: 12842
Added:
modules/common/tags/JBP_COMMON_1_2_4/
Log:
Tagging common 1.2.4
Copied: modules/common/tags/JBP_COMMON_1_2_4 (from rev 12841, modules/common/trunk)
17 years, 2 months
JBoss Portal SVN: r12841 - in modules/common/trunk: common and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-02-20 07:09:06 -0500 (Fri, 20 Feb 2009)
New Revision: 12841
Modified:
modules/common/trunk/build/pom.xml
modules/common/trunk/common/pom.xml
Log:
Update libs
Modified: modules/common/trunk/build/pom.xml
===================================================================
--- modules/common/trunk/build/pom.xml 2009-02-19 19:55:40 UTC (rev 12840)
+++ modules/common/trunk/build/pom.xml 2009-02-20 12:09:06 UTC (rev 12841)
@@ -15,16 +15,16 @@
<properties>
<version.activation>1.1</version.activation>
- <version.javax.servlet>2.4</version.javax.servlet>
- <version.jboss-j2ee>4.2.0.GA</version.jboss-j2ee>
- <version.jboss-jmx>4.2.0.GA</version.jboss-jmx>
+ <version.javax.servlet>2.5</version.javax.servlet>
+ <version.jboss-j2ee>4.2.3.GA</version.jboss-j2ee>
+ <version.jboss-jmx>4.2.3.GA</version.jboss-jmx>
<version.log4j>1.2.14</version.log4j>
<version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient>
- <version.jboss.microcontainer>2.0.0.Beta13</version.jboss.microcontainer>
- <version.jboss.man>2.0.0.Beta12</version.jboss.man>
+ <version.jboss.microcontainer>2.0.2.GA</version.jboss.microcontainer>
+ <version.jboss.man>2.0.0.GA</version.jboss.man>
<version.cargo>0.8</version.cargo>
<version.junit>3.8.1</version.junit>
- <version.ant>1.6.5</version.ant>
+ <version.ant>1.7.0</version.ant>
</properties>
<repositories>
@@ -80,7 +80,7 @@
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>${version.ant}</version>
</dependency>
@@ -104,7 +104,7 @@
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant-junit</artifactId>
<version>${version.ant}</version>
</dependency>
@@ -116,13 +116,13 @@
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant-nodeps</artifactId>
<version>${version.ant}</version>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
<version>${version.ant}</version>
</dependency>
Modified: modules/common/trunk/common/pom.xml
===================================================================
--- modules/common/trunk/common/pom.xml 2009-02-19 19:55:40 UTC (rev 12840)
+++ modules/common/trunk/common/pom.xml 2009-02-20 12:09:06 UTC (rev 12841)
@@ -29,7 +29,7 @@
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</dependency>
@@ -49,7 +49,7 @@
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant-junit</artifactId>
</dependency>
@@ -59,12 +59,12 @@
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant-nodeps</artifactId>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
</dependency>
17 years, 2 months
JBoss Portal SVN: r12840 - in branches/Enterprise_Portal_Platform_4_3_GA_JBEPP-36: theme/src/bin/portal-ajax-war/dyna and 1 other directory.
by portal-commits＠lists.jboss.org
Author: mmillson
Date: 2009-02-19 14:55:40 -0500 (Thu, 19 Feb 2009)
New Revision: 12840
Modified:
branches/Enterprise_Portal_Platform_4_3_GA_JBEPP-36/core/src/main/org/jboss/portal/core/theme/WindowContextFactory.java
branches/Enterprise_Portal_Platform_4_3_GA_JBEPP-36/theme/src/bin/portal-ajax-war/dyna/dyna.js
Log:
Fix partial refresh content update for [JBEPP-36].
Modified: branches/Enterprise_Portal_Platform_4_3_GA_JBEPP-36/core/src/main/org/jboss/portal/core/theme/WindowContextFactory.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3_GA_JBEPP-36/core/src/main/org/jboss/portal/core/theme/WindowContextFactory.java 2009-02-19 17:47:27 UTC (rev 12839)
+++ branches/Enterprise_Portal_Platform_4_3_GA_JBEPP-36/core/src/main/org/jboss/portal/core/theme/WindowContextFactory.java 2009-02-19 19:55:40 UTC (rev 12840)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, 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. *
@@ -25,11 +25,11 @@
import org.jboss.portal.Mode;
import org.jboss.portal.WindowState;
import org.jboss.portal.core.controller.ControllerContext;
-import org.jboss.portal.core.model.portal.PortalObjectPath;
import org.jboss.portal.core.model.portal.Window;
import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowRenderCommand;
import org.jboss.portal.core.model.portal.command.response.MarkupResponse;
import org.jboss.portal.core.model.portal.content.WindowRendition;
+import org.jboss.portal.portlet.impl.jsr168.PortletUtils;
import org.jboss.portal.server.ServerInvocationContext;
import org.jboss.portal.server.request.URLContext;
import org.jboss.portal.server.request.URLFormat;
@@ -84,7 +84,7 @@
//
return new WindowContext(
- window.getId().toString(PortalObjectPath.LEGACY_BASE64_FORMAT),
+ PortletUtils.generateNamespaceFrom(window.getId().toString()),
region,
order,
windowResult);
Modified: branches/Enterprise_Portal_Platform_4_3_GA_JBEPP-36/theme/src/bin/portal-ajax-war/dyna/dyna.js
===================================================================
--- branches/Enterprise_Portal_Platform_4_3_GA_JBEPP-36/theme/src/bin/portal-ajax-war/dyna/dyna.js 2009-02-19 17:47:27 UTC (rev 12839)
+++ branches/Enterprise_Portal_Platform_4_3_GA_JBEPP-36/theme/src/bin/portal-ajax-war/dyna/dyna.js 2009-02-19 19:55:40 UTC (rev 12840)
@@ -225,13 +225,13 @@
*/
function copyInnerHTML(srcContainer, dstContainer, className)
{
- var srcs = Element.getElementsByClassName(srcContainer, className);
+ var srcs = srcContainer.select("." + className);
if (srcs.length == 1)
{
var src = srcs[0];
//
- var dsts = Element.getElementsByClassName(dstContainer, className)
+ var dsts = dstContainer.select("." + className);
if (dsts.length == 1)
{
var dst = dsts[0];
17 years, 2 months
JBoss Portal SVN: r12839 - branches.
by portal-commits＠lists.jboss.org
Author: mmillson
Date: 2009-02-19 12:47:27 -0500 (Thu, 19 Feb 2009)
New Revision: 12839
Added:
branches/Enterprise_Portal_Platform_4_3_GA_JBEPP-36/
Log:
Create JBEPP-36 patch branch from Enterprise_Portal_Platform_4_3_GA tag
Copied: branches/Enterprise_Portal_Platform_4_3_GA_JBEPP-36 (from rev 12838, tags/Enterprise_Portal_Platform_4_3_GA)
17 years, 2 months
JBoss Portal SVN: r12838 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-02-19 07:59:45 -0500 (Thu, 19 Feb 2009)
New Revision: 12838
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh
Log:
run.sh script
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-02-19 11:43:13 UTC (rev 12837)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-02-19 12:59:45 UTC (rev 12838)
@@ -29,7 +29,7 @@
<property name="portal.instance" value="default" />
<property name="test.suite" value="testng.xml" />
- <property name="usecase.suite" value="usecaseng.xml" />
+ <property name="usecase.suite" value="end2end.xml" />
<path id="jboss.test.classpath">
<pathelement path="${jboss.test.jar}" />
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh 2009-02-19 11:43:13 UTC (rev 12837)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh 2009-02-19 12:59:45 UTC (rev 12838)
@@ -1,28 +1,65 @@
#!/bin/bash
-echo "Firefox bin location: $2"
+export HELPMODE=0
-ant clean
-
-if [ $1 = "test" ]; then
- ant -f build.xml copyApps
- ant -f build.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true"
+if [ ! -n "${1+x}" ]; then
+ export HELPMODE=1
+elif [ $1 = "help" ]; then
+ export HELPMODE=1
fi
-if [ $1 = "end2end" ]; then
- ant -f build.xml copyApps
- ant -f build.xml selenium-usecase -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true"
+if [ $HELPMODE -eq 1 ]; then
+ echo "Usage: "
+ echo " run.sh MODE FF_LOCATION [TESTCLASS_NAME]"
+ echo
+ echo "Description:"
+ echo " Command used to run selenium test of JBoss Portal. Enviroment variables JBOSS_HOME, JAVA_HOME must be set before running the script. JBoss portal must run on the same machine where the script is being run (\"http://localhost:8080/portal/\") ."
+ echo
+ echo "FF_LOCATION - the location of firefox binary file (not the firefox running script - the binary is ussually located in \"/usr/lib*/firefox*/\" directory )"
+ echo
+ echo "MODE - one of available modes:"
+ echo " help : prints out this helpscreen"
+ echo " test : runnnig the selenium test suite defined in testng.xml"
+ echo " end2end : runnnig the selenium test suite defined in testng.xml"
+ echo " selenium : run the selenium server only (no tests are executed)"
+ echo " single : run single selenium testcase of specified class (TESTCLASS_NAME must be specified)"
+ echo
+ echo "TESTCLASS_NAME - the class specifiing single testcase (must be set when running \"single\" mode)"
+ echo
+ echo "Examples:"
+ echo " running the testsuite:"
+ echo " run.sh test /home/vrockai/opt/firefox3/firefox-bin"
+ echo
+ echo " running single testcase:"
+ echo " run.sh single /home/vrockai/opt/firefox3/firefox-bin org/jboss/portal/test/selenium/DashboardTestCase.class"
+else
+ if [ $1 != "help" ]; then
+ ant clean
+ echo "Action: $1"
+ echo "Firefox bin location: $2"
+ echo "Testclass name: $3"
+ fi
+
+ if [ $1 = "test" ]; then
+ ant -f build.xml copyApps
+ ant -f build.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true"
+ fi
+
+ if [ $1 = "end2end" ]; then
+ ant -f build.xml copyApps
+ ant -f build.xml selenium-usecase -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true"
+ fi
+
+ if [ $1 = "perf" ]; then
+ ant -f build-local.xml copyApps
+ ant -f build-local.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/"
+ fi
+
+ if [ $1 = "selenium" ]; then
+ ant -f build-local.xml run-src
+ fi
+
+ if [ $1 = "single" ]; then
+ ant -f build-local.xml single-test -Dbrowser="*firefox $2" -Dtestname="$3"
+ fi
fi
-
-if [ $1 = "perf" ]; then
- ant -f build-local.xml copyApps
- ant -f build-local.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/"
-fi
-
-if [ $1 = "selenium" ]; then
- ant -f build-local.xml run-src
-fi
-
-if [ $1 = "single" ]; then
- ant -f build-local.xml single-test -Dbrowser="*firefox $2" -Dtestname="$3"
-fi
17 years, 2 months
JBoss Portal SVN: r12837 - in branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests: src/org/jboss/portal/test/selenium and 1 other directories.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-02-19 06:43:13 -0500 (Thu, 19 Feb 2009)
New Revision: 12837
Added:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/usecaseng.xml
Log:
bea portlet and run.sh
Added: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh 2009-02-19 11:43:13 UTC (rev 12837)
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+echo "Firefox bin location: $2"
+
+ant clean
+
+if [ $1 = "test" ]; then
+ ant -f build.xml copyApps
+ ant -f build.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true"
+fi
+
+if [ $1 = "end2end" ]; then
+ ant -f build.xml copyApps
+ ant -f build.xml selenium-usecase -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true"
+fi
+
+if [ $1 = "perf" ]; then
+ ant -f build-local.xml copyApps
+ ant -f build-local.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/"
+fi
+
+if [ $1 = "selenium" ]; then
+ ant -f build-local.xml run-src
+fi
+
+if [ $1 = "single" ]; then
+ ant -f build-local.xml single-test -Dbrowser="*firefox $2" -Dtestname="$3"
+fi
Property changes on: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java 2009-02-19 11:43:13 UTC (rev 12837)
@@ -0,0 +1,233 @@
+package org.jboss.portal.test.selenium;
+
+import java.text.MessageFormat;
+
+import org.testng.Assert;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * @author <a href="mailto:vrockai@redhat.com">Viliam Rockai</a>
+ */
+@Test(groups = {"end2end"}, enabled = true, description = "Creating of new portal with content.")
+public class EndToEndBeaPortlet extends JBossPortalSeleniumTestCase {
+
+ private static final String SUB_VIEW_PORTLETS = "_jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_viewRoot:definition-form:view-portlets";
+
+ private static final String SEL_CONS_TYPE = "_jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_viewRoot:definition-form:menu";
+
+ public static String casePfx = "e2e.wsrp.";
+
+ private final String INP_CONSUMER_NAME = getProp(casePfx+"inp.consumer.name","//input[contains(@id,'edit-cons-form:id')]");
+ private final String SUBMIT_REFRESH_CANCEL = getProp(casePfx+"submit.refresh.cancel","//a[contains(@id,'edit-cons-form:list-cons-link')]");
+ private final String SUBMIT_PROD_SAVE = getProp(casePfx+"submit.prod.save","//input[contains(@id,'producer-form:save-producer')]");
+ private final String SUBMIT_CONSDEL_CONF = getProp(casePfx+"submit.consdel.conf","//a[contains(@id,'confirm-delete-form:destroy-link')]");
+
+ private final String SUBMIT_CONS_REGVAL = getProp(casePfx+"submit.cons.regval","//input[contains(@id,'edit-cons-form:refresh-cons-link')]");
+ private final String SUBMIT_REFRESHFINAL = getProp(casePfx+"submit.refreshfinal","//input[contains(@id,'edit-cons-form:refresh-cons-link')]");
+
+ private final String INPUT_CONS_REGVALUE = getProp(casePfx+"input.cons.regvalue","//input[contains(@id,'edit-cons-form:existingProps:0:prop-value-input')]");
+ private final String SUBMIT_REFRESHSAVE = getProp(casePfx+"submit.refreshsave","//input[contains(@id,'edit-cons-form:refresh-cons-link')]");
+ private final String INPUT_CONSWSDL = getProp(casePfx+"input.conswsdl","//input[contains(@id,'edit-cons-form:wsdl')]");
+ private final String INPUT_CACHEEXP = getProp(casePfx+"input.cacheexp","//input[contains(@id,'edit-cons-form:cache')]");
+ private final String SUBMIT_ADDPROP_INIT = getProp(casePfx+"submit.addprop.init","//a[contains(@id,'producer-form:add-reg-prop')]");
+ private final String SUBMIT_ADDPROP = getProp(casePfx+"submit.addprop","//a[contains(@id,'producer-form:add-reg-prop')]");
+ private final String INPUT_PROPHINT = getProp(casePfx+"input.prophint","//input[contains(@id,'producer-form:reg-properties:0:hint')]");
+ private final String INPUT_PROPLABEL = getProp(casePfx+"input.proplabel","//input[contains(@id,'producer-form:reg-properties:0:label')]");
+ private final String INPUT_PROPNAME = getProp(casePfx+"input.propname","//input[contains(@id,'producer-form:reg-properties:0:name')]");
+ private final String SUBMIT_CREATECONS = getProp(casePfx+"submit.createcons","//input[contains(@id,'createConsumer:createConsumerButton')]");
+ private final String INPUT_CREATECONS = getProp(casePfx+"input.createcons","//input[contains(@id,'createConsumer:consumerName')]");
+ private final String ID_LINK_PRODCONF = getProp(casePfx+"id.link.prodconf","//a[contains(@id,'cons-temp-form:producer-link')]");
+ private final String ID_LINK_CONSCONF = getProp(casePfx+"id.link.consconf","//a[contains(@id,'producer-temp-form:consumersTab')]");
+ private final String LINK_CONSUMER_HOME =getProp(casePfx+"link.consumer.home","//a[contains(@id,'cons-temp-form1:list-cons-link')]");
+
+ private final String LINK_T_CONS_CON=getProp(casePfx+"link.t.cons.con","//a[contains(@id,''consumer-list-form:consumersList:{0}:configure'')]");
+ private final String LINK_T_CONS_REF=getProp(casePfx+"link.t.cons.ref","//a[contains(@id,''consumer-list-form:consumersList:{0}:refresh'')]");
+ private final String LINK_T_CONS_ACT=getProp(casePfx+"link.t.cons.act","//a[contains(@id,''consumer-list-form:consumersList:{0}:activate'')]");
+ private final String LINK_T_CONS_DEA=getProp(casePfx+"link.t.cons.dea","//a[contains(@id,''consumer-list-form:consumersList:{0}:activate'')]");
+ private final String LINK_T_CONS_REG=getProp(casePfx+"link.t.cons.reg","//a[contains(@id,''consumer-list-form:consumersList:{0}:register'')]");
+ private final String LINK_T_CONS_DER=getProp(casePfx+"link.t.cons.der","//a[contains(@id,''consumer-list-form:consumersList:{0}:register'')]");
+ private final String LINK_T_CONS_DEL=getProp(casePfx+"link.t.cons.del","//a[contains(@id,''consumer-list-form:consumersList:{0}:delete'')]");
+
+ ///
+
+ public final String SEL_PORTLET_TYPE = getProp(casePfx+"sel.portlet.type","_jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_viewRoot:windowForm:instanceId");
+ private final String SUB_LAYOUT_ADD_CENTER = getProp(casePfx+"sub.layout.add.center","//input[contains(@id,'layoutForm:a_center')]");
+ private final String INP_WINDOW_NAME = getProp(casePfx+"inp.window.name","//input[contains(@id,'windowForm:windowName')]");
+ private final String SUB_RENAME_PORTAL = getProp(casePfx+"sub.rename.portal","//input[contains(@id,'renameForm:rename')]");
+ private final String INP_RENAME_PORTAL = getProp(casePfx+"inp.rename.portal","//input[contains(@id,'renameForm:newName')]");
+ private final String SUB_DELETE_PORTAL_CONF = getProp(casePfx+"sub.delete.portal.conf","//input[contains(@id,'delete-view:confirm-form:delete')]");
+ private final String INP_SUBMIT_PAGECREATE = getProp(casePfx+"inp.submit.pagecreate","//input[contains(@id,'create-page-form:create-page')]");
+ private final String INP_PAGENAME = getProp(casePfx+"inp.pagename","//input[contains(@id,'create-page-form:pageName')]");
+ private final String INP_PORTALNAME = getProp(casePfx+"inp.portalname","//input[contains(@id,'create-portal-form:name')]");
+ private final String INP_SUBMIT_CREATEPORTAL = getProp(casePfx+"inp.submit.createportal","//input[contains(@id,'create-portal-form:create-portal')]");
+ private final String TAB_PORTALOBJ_ID = getProp(casePfx+"tab.portalobj.id","Link=Admin");
+ private final String LNK_PORTALS_ID = getProp(casePfx+"lnk.portals.id","link=*Portal Objects*");
+ private final String LNK_PORTAL_HOME = getProp(casePfx+"lnk.portal.home","//a[contains(@id,'obj-temp-form:object-link-0')]");
+ private final String TBL_PORTAL_ADMIN = getProp(casePfx+"tbl.portal.admin","//table[contains(@id,'obj-nav-form:portal-datatable')]");
+ private final String POR_TL_MAIN = getProp(casePfx+"por.tl.main","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:object-iid-link'')]");
+ private final String POR_TL_SECURITY = getProp(casePfx+"por.tl.security","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:security-link'')]");
+ private final String POR_TL_PROPERTIES = getProp(casePfx+"por.tl.properties","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:prop-link'')]");
+ private final String POR_TL_THEME = getProp(casePfx+"por.tl.theme","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:theme-link'')]");
+ private final String POR_TL_RENAME = getProp(casePfx+"por.tl.rename","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:rename'')]");
+ private final String POR_TL_DELETE = getProp(casePfx+"por.tl.delete","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:delete'')]");
+ private final String POR_TL_MAKEDEF = getProp(casePfx+"por.tl.makedef","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:default-link'')]");
+ private final String TBL_PORTALPAGE_ADMIN = getProp(casePfx+"tbl.portalpage.admin","//table[contains(@id,'obj-nav-form:pages-datatable')]");
+ private final String PAG_TL_MAIN = getProp(casePfx+"pag.tl.main","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:object-link'')]");
+ private final String PAG_TL_LAYOUT = getProp(casePfx+"pag.tl.layout","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:edit-page-layout'')]");
+ private final String PAG_TL_SECURITY = getProp(casePfx+"pag.tl.security","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:security-link'')]");
+ private final String PAG_TL_PROPERTIES = getProp(casePfx+"pag.tl.properties","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:prop-link'')]");
+ private final String PAG_TL_THEME = getProp(casePfx+"pag.tl.theme","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:theme-link'')]");
+ private final String PAG_TL_RENAME = getProp(casePfx+"pag.tl.rename","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:rename-link'')]");
+ private final String PAG_TL_DISPLAY = getProp(casePfx+"pag.tl.display","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:rename-display'')]");
+ private final String PAG_TL_DELETE = getProp(casePfx+"pag.tl.delete","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:delete-link'')]");
+ private final String PAG_TL_MAKEDEF = getProp(casePfx+"pag.tl.makedef","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:default-link'')]");
+
+
+ /// def
+
+ private static final String T_LINK_PREF = "//a[contains(@id,''def-list:portlet-pref-{0}'')]";
+ private static final String SUBMIT_CREATE_INST = "//input[contains(@name,'add_instance_form:j_id19')]";
+ private static final String INPUT_INSTANCE_NAME = "//input[contains(@id,'add_instance_form:instanceId')]";
+ private static final String T_LINK_CREATE = "//a[contains(@id,''def-list:create-instance-{0}'')]";
+ private static final String SUBMIT_PROVIDER_VIEW = "//input[contains(@id,'definition-form:view-portlets')]";
+ private static final String SELECT_PROVIDER = "//select[contains(@id,'definition-form:menu')]";
+ private static final String TABLE_PORTLET = "//form[contains(@id,'def-list')]/table";
+ private static final String LINK_NAME_ADMIN_PORT = "//a[contains(@id,'common-show-portlet-detail-form:field1:select')]";
+ private static final String LINK_ADMIN_PORT = "//a[contains(@id,'def-list:portlet-def-0')]";
+ private static final String LINK_ADMIN = "link=Admin";
+ private static final String LINK_TAB_PD = "//a[contains(@id,'admin-subtab-form:portlet-def-link')]";
+ private static final String LINK_PD_MAIN = "//a[contains(@id,'man-form:def-link')]";
+
+ public static String WSRP_CONSUMER_TABLE = "//table[contains(@id,':consumer-list-form:consumersList')]";
+ @BeforeMethod(groups = { "log" })
+ public void loginBeforeTest() {
+ logoutIfPossible();
+ login("admin", "admin");
+ }
+
+ @AfterMethod(groups = { "log" })
+ public void logoutAfterTest() {
+ //logout();
+ }
+
+ private String PORTLET = "";
+
+ @Test(enabled = true, description = "Creating a standard BEA portlet.")
+ public void testEnd2EndBeaPortlet(){
+
+ String consName = "BeaE2E";
+ String portalName = "default";
+ String pageName = "default";
+ String defName= "BEA: Hello World";
+ String insName = "BeaPor";
+
+ createConsumer(consName);
+ createInstance(defName, consName, insName);
+ addPortlet(portalName, pageName, PORTLET, "portlet");
+
+ }
+
+ private void createConsumer(String consumerName){
+ selenium.open("/portal/");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click("link=Admin");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click("link=WSRP");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ clickIfVisible(ID_LINK_CONSCONF);
+
+ selenium.type(INPUT_CREATECONS, consumerName);
+
+ selenium.click(SUBMIT_CREATECONS);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.type(INPUT_CACHEEXP, "600");
+
+ selenium.type(INPUT_CONSWSDL, "http://wsrp.bea.com:7001/producer/producer?WSDL");
+ selenium.click(SUBMIT_REFRESHSAVE);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ Assert.assertTrue(selenium.isTextPresent("Refresh failed (probably because the registration information was not valid)."));
+ Assert.assertTrue(selenium.isTextPresent("Missing value"));
+
+ selenium.type(INPUT_CONS_REGVALUE, "public");
+ selenium.click(SUBMIT_CONS_REGVAL);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ Assert.assertTrue(selenium.isTextPresent("Refresh was successful."));
+ selenium.click(SUBMIT_REFRESHFINAL);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ Assert.assertTrue(selenium.isTextPresent(consumerName));
+ }
+
+ private void createInstance(String defName, String type, String insName){
+ selenium.open("/portal/");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ clickIfVisible(LINK_ADMIN);
+ clickIfVisible(LINK_ADMIN);
+ clickIfVisible(LINK_TAB_PD);
+ clickIfVisible(LINK_PD_MAIN);
+
+ selenium.select(SEL_CONS_TYPE, "label="+type);
+ selenium.click(SUB_VIEW_PORTLETS);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ int r = findTableRow(TABLE_PORTLET, defName, 0);
+
+ selenium.click(MessageFormat.format(T_LINK_CREATE,r-1));
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ selenium.type(INPUT_INSTANCE_NAME, insName);
+ selenium.click(SUBMIT_CREATE_INST);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ Assert.assertTrue(selenium.isTextPresent(insName + " portlet details"));
+ }
+
+ private void addPortlet(String portalName, String pageName, String portletName, String type) {
+ selenium.open("/portal/");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ selenium.click("link=Admin");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ clickIfVisible(TAB_PORTALOBJ_ID);
+ clickIfVisible(LNK_PORTALS_ID);
+ clickIfVisible(LNK_PORTAL_HOME);
+
+ int r = findTableRow(TBL_PORTAL_ADMIN, portalName, 0) - 1;
+ selenium.click(MessageFormat.format(POR_TL_MAIN, r));
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ r = findTableRow(TBL_PORTALPAGE_ADMIN, pageName, 0) - 1;
+
+ // click on the page layout
+ selenium.click(MessageFormat.format(PAG_TL_LAYOUT, r));
+
+ try {
+ Thread.sleep(5000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+
+ //hack
+ selenium.select(SEL_PORTLET_TYPE, "label=" + "cms");
+ try {
+ Thread.sleep(5000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+
+ selenium.select(SEL_PORTLET_TYPE, "label=" + type);
+ try {
+ Thread.sleep(5000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+
+ selenium.click(portletName);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ selenium.click(SUB_LAYOUT_ADD_CENTER);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ }
+}
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2009-02-19 09:58:37 UTC (rev 12836)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2009-02-19 11:43:13 UTC (rev 12837)
@@ -11,6 +11,9 @@
*/
@Test(groups = { "cms_wsrp" }, enabled = true, description = "WSRP test case.")
public class WSRPTestCase extends JBossPortalSeleniumTestCase {
+
+ public static String casePfx = "test.wsrp.";
+
private static final String INP_CONSUMER_NAME = "//input[contains(@id,'edit-cons-form:id')]";
private static final String SUBMIT_REFRESH_CANCEL = "//a[contains(@id,'edit-cons-form:list-cons-link')]";
private static final String SUBMIT_PROD_SAVE = "//input[contains(@id,'producer-form:save-producer')]";
@@ -43,6 +46,7 @@
private static final String LINK_T_CONS_DEL="//a[contains(@id,''consumer-list-form:consumersList:{0}:delete'')]";
public static String WSRP_CONSUMER_TABLE = "//table[contains(@id,':consumer-list-form:consumersList')]";
+
@BeforeMethod(groups = { "log" })
public void loginBeforeTest() {
logoutIfPossible();
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-02-19 09:58:37 UTC (rev 12836)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-02-19 11:43:13 UTC (rev 12837)
@@ -1 +1,63 @@
-vilko.pilko=mimilko
\ No newline at end of file
+# EndToEndBeaPortlet
+
+e2e.wsrp.inp.consumer.name=//input[contains(@id,'edit-cons-form:id')]
+e2e.wsrp.submit.refresh.cancel=//a[contains(@id,'edit-cons-form:list-cons-link')]
+e2e.wsrp.submit.prod.save=//input[contains(@id,'producer-form:save-producer')]
+e2e.wsrp.submit.consdel.conf=//a[contains(@id,'confirm-delete-form:destroy-link')]
+e2e.wsrp.submit.cons.regval=//input[contains(@id,'edit-cons-form:refresh-cons-link')]
+e2e.wsrp.submit.refreshfinal=//input[contains(@id,'edit-cons-form:refresh-cons-link')]
+e2e.wsrp.input.cons.regvalue=//input[contains(@id,'edit-cons-form:existingProps:0:prop-value-input')]
+e2e.wsrp.submit.refreshsave=//input[contains(@id,'edit-cons-form:refresh-cons-link')]
+e2e.wsrp.input.conswsdl=//input[contains(@id,'edit-cons-form:wsdl')]
+e2e.wsrp.input.cacheexp=//input[contains(@id,'edit-cons-form:cache')]
+e2e.wsrp.submit.addprop.init=//a[contains(@id,'producer-form:add-reg-prop')]
+e2e.wsrp.submit.addprop=//a[contains(@id,'producer-form:add-reg-prop')]
+e2e.wsrp.input.prophint=//input[contains(@id,'producer-form:reg-properties:0:hint')]
+e2e.wsrp.input.proplabel=//input[contains(@id,'producer-form:reg-properties:0:label')]
+e2e.wsrp.input.propname=//input[contains(@id,'producer-form:reg-properties:0:name')]
+e2e.wsrp.submit.createcons=//input[contains(@id,'createConsumer:createConsumerButton')]
+e2e.wsrp.input.createcons=//input[contains(@id,'createConsumer:consumerName')]
+e2e.wsrp.id.link.prodconf=//a[contains(@id,'cons-temp-form:producer-link')]
+e2e.wsrp.id.link.consconf=//a[contains(@id,'producer-temp-form:consumersTab')]
+e2e.wsrp.link.consumer.home=//a[contains(@id,'cons-temp-form1:list-cons-link')]
+e2e.wsrp.link.t.cons.con=//a[contains(@id,''consumer-list-form:consumersList:{0}:configure'')]
+e2e.wsrp.link.t.cons.ref=//a[contains(@id,''consumer-list-form:consumersList:{0}:refresh'')]
+e2e.wsrp.link.t.cons.act=//a[contains(@id,''consumer-list-form:consumersList:{0}:activate'')]
+e2e.wsrp.link.t.cons.dea=//a[contains(@id,''consumer-list-form:consumersList:{0}:activate'')]
+e2e.wsrp.link.t.cons.reg=//a[contains(@id,''consumer-list-form:consumersList:{0}:register'')]
+e2e.wsrp.link.t.cons.der=//a[contains(@id,''consumer-list-form:consumersList:{0}:register'')]
+e2e.wsrp.link.t.cons.del=//a[contains(@id,''consumer-list-form:consumersList:{0}:delete'')]
+
+# EndtoEndPortalAdminTestCase
+
+e2e.portal.sel.portlet.type=_jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_viewRoot:windowForm:instanceId
+e2e.portal.sub.layout.add.center=//input[contains(@id,'layoutForm:a_center')]
+e2e.portal.inp.window.name=//input[contains(@id,'windowForm:windowName')]
+e2e.portal.sub.rename.portal=//input[contains(@id,'renameForm:rename')]
+e2e.portal.inp.rename.portal=//input[contains(@id,'renameForm:newName')]
+e2e.portal.sub.delete.portal.conf=//input[contains(@id,'delete-view:confirm-form:delete')]
+e2e.portal.inp.submit.pagecreate=//input[contains(@id,'create-page-form:create-page')]
+e2e.portal.inp.pagename=//input[contains(@id,'create-page-form:pageName')]
+e2e.portal.inp.portalname=//input[contains(@id,'create-portal-form:name')]
+e2e.portal.inp.submit.createportal=//input[contains(@id,'create-portal-form:create-portal')]
+e2e.portal.tab.portalobj.id=Link=Admin
+e2e.portal.lnk.portals.id=link=*Portal Objects*
+e2e.portal.lnk.portal.home=//a[contains(@id,'obj-temp-form:object-link-0')]
+e2e.portal.tbl.portal.admin=//table[contains(@id,'obj-nav-form:portal-datatable')]
+e2e.portal.por.tl.main=//a[contains(@id,''obj-nav-form:portal-datatable:{0}:object-iid-link'')]
+e2e.portal.por.tl.security=//a[contains(@id,''obj-nav-form:portal-datatable:{0}:security-link'')]
+e2e.portal.por.tl.properties=//a[contains(@id,''obj-nav-form:portal-datatable:{0}:prop-link'')]
+e2e.portal.por.tl.theme=//a[contains(@id,''obj-nav-form:portal-datatable:{0}:theme-link'')]
+e2e.portal.por.tl.rename=//a[contains(@id,''obj-nav-form:portal-datatable:{0}:rename'')]
+e2e.portal.por.tl.delete=//a[contains(@id,''obj-nav-form:portal-datatable:{0}:delete'')]
+e2e.portal.por.tl.makedef=//a[contains(@id,''obj-nav-form:portal-datatable:{0}:default-link'')]
+e2e.portal.tbl.portalpage.admin=//table[contains(@id,'obj-nav-form:pages-datatable')]
+e2e.portal.pag.tl.main=//a[contains(@id,''obj-nav-form:pages-datatable:{0}:object-link'')]
+e2e.portal.pag.tl.layout=//a[contains(@id,''obj-nav-form:pages-datatable:{0}:edit-page-layout'')]
+e2e.portal.pag.tl.security=//a[contains(@id,''obj-nav-form:pages-datatable:{0}:security-link'')]
+e2e.portal.pag.tl.properties=//a[contains(@id,''obj-nav-form:pages-datatable:{0}:prop-link'')]
+e2e.portal.pag.tl.theme=//a[contains(@id,''obj-nav-form:pages-datatable:{0}:theme-link'')]
+e2e.portal.pag.tl.rename=//a[contains(@id,''obj-nav-form:pages-datatable:{0}:rename-link'')]
+e2e.portal.pag.tl.display=//a[contains(@id,''obj-nav-form:pages-datatable:{0}:rename-display'')]
+e2e.portal.pag.tl.delete=//a[contains(@id,''obj-nav-form:pages-datatable:{0}:delete-link'')]
+e2e.portal.pag.tl.makedef=//a[contains(@id,''obj-nav-form:pages-datatable:{0}:default-link'')]
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java 2009-02-19 09:58:37 UTC (rev 12836)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java 2009-02-19 11:43:13 UTC (rev 12837)
@@ -14,40 +14,43 @@
/**
* @author <a href="mailto:vrockai@redhat.com">Viliam Rockai</a>
*/
-@Test(groups = {"usecase"}, enabled = true, description = "Creating of new portal with content.")
+@Test(groups = {"end2end"}, enabled = true, description = "Creating of new portal with content.")
public class EndtoEndPortalAdminTestCase extends JBossPortalSeleniumTestCase {
- public static final String SEL_PORTLET_TYPE = "_jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_viewRoot:windowForm:instanceId";
- private static final String SUB_LAYOUT_ADD_CENTER = "//input[contains(@id,'layoutForm:a_center')]";
- private static final String INP_WINDOW_NAME = "//input[contains(@id,'windowForm:windowName')]";
- private static final String SUB_RENAME_PORTAL = "//input[contains(@id,'renameForm:rename')]";
- private static final String INP_RENAME_PORTAL = "//input[contains(@id,'renameForm:newName')]";
- private static final String SUB_DELETE_PORTAL_CONF = "//input[contains(@id,'delete-view:confirm-form:delete')]";
- private static final String INP_SUBMIT_PAGECREATE = "//input[contains(@id,'create-page-form:create-page')]";
- private static final String INP_PAGENAME = "//input[contains(@id,'create-page-form:pageName')]";
- private static final String INP_PORTALNAME = "//input[contains(@id,'create-portal-form:name')]";
- private static final String INP_SUBMIT_CREATEPORTAL = "//input[contains(@id,'create-portal-form:create-portal')]";
- private final String TAB_PORTALOBJ_ID = "Link=Admin";
- private final String LNK_PORTALS_ID = "link=*Portal Objects*";
- private final String LNK_PORTAL_HOME = "//a[contains(@id,'obj-temp-form:object-link-0')]";
- private final String TBL_PORTAL_ADMIN = "//table[contains(@id,'obj-nav-form:portal-datatable')]";
- private final String POR_TL_MAIN = "//a[contains(@id,''obj-nav-form:portal-datatable:{0}:object-iid-link'')]";
- private final String POR_TL_SECURITY = "//a[contains(@id,''obj-nav-form:portal-datatable:{0}:security-link'')]";
- private final String POR_TL_PROPERTIES = "//a[contains(@id,''obj-nav-form:portal-datatable:{0}:prop-link'')]";
- private final String POR_TL_THEME = "//a[contains(@id,''obj-nav-form:portal-datatable:{0}:theme-link'')]";
- private final String POR_TL_RENAME = "//a[contains(@id,''obj-nav-form:portal-datatable:{0}:rename'')]";
- private final String POR_TL_DELETE = "//a[contains(@id,''obj-nav-form:portal-datatable:{0}:delete'')]";
- private final String POR_TL_MAKEDEF = "//a[contains(@id,''obj-nav-form:portal-datatable:{0}:default-link'')]";
- private final String TBL_PORTALPAGE_ADMIN = "//table[contains(@id,'obj-nav-form:pages-datatable')]";
- private final String PAG_TL_MAIN = "//a[contains(@id,''obj-nav-form:pages-datatable:{0}:object-link'')]";
- private final String PAG_TL_LAYOUT = "//a[contains(@id,''obj-nav-form:pages-datatable:{0}:edit-page-layout'')]";
- private final String PAG_TL_SECURITY = "//a[contains(@id,''obj-nav-form:pages-datatable:{0}:security-link'')]";
- private final String PAG_TL_PROPERTIES = "//a[contains(@id,''obj-nav-form:pages-datatable:{0}:prop-link'')]";
- private final String PAG_TL_THEME = "//a[contains(@id,''obj-nav-form:pages-datatable:{0}:theme-link'')]";
- private final String PAG_TL_RENAME = "//a[contains(@id,''obj-nav-form:pages-datatable:{0}:rename-link'')]";
- private final String PAG_TL_DISPLAY = "//a[contains(@id,''obj-nav-form:pages-datatable:{0}:rename-display'')]";
- private final String PAG_TL_DELETE = "//a[contains(@id,''obj-nav-form:pages-datatable:{0}:delete-link'')]";
- private final String PAG_TL_MAKEDEF = "//a[contains(@id,''obj-nav-form:pages-datatable:{0}:default-link'')]";
+ public static String casePfx = "portal.e2e.";
+
+ public final String SEL_PORTLET_TYPE = getProp(casePfx+"sel.portlet.type","_jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_viewRoot:windowForm:instanceId");
+ private final String SUB_LAYOUT_ADD_CENTER = getProp(casePfx+"sub.layout.add.center","//input[contains(@id,'layoutForm:a_center')]");
+ private final String INP_WINDOW_NAME = getProp(casePfx+"inp.window.name","//input[contains(@id,'windowForm:windowName')]");
+ private final String SUB_RENAME_PORTAL = getProp(casePfx+"sub.rename.portal","//input[contains(@id,'renameForm:rename')]");
+ private final String INP_RENAME_PORTAL = getProp(casePfx+"inp.rename.portal","//input[contains(@id,'renameForm:newName')]");
+ private final String SUB_DELETE_PORTAL_CONF = getProp(casePfx+"sub.delete.portal.conf","//input[contains(@id,'delete-view:confirm-form:delete')]");
+ private final String INP_SUBMIT_PAGECREATE = getProp(casePfx+"inp.submit.pagecreate","//input[contains(@id,'create-page-form:create-page')]");
+ private final String INP_PAGENAME = getProp(casePfx+"inp.pagename","//input[contains(@id,'create-page-form:pageName')]");
+ private final String INP_PORTALNAME = getProp(casePfx+"inp.portalname","//input[contains(@id,'create-portal-form:name')]");
+ private final String INP_SUBMIT_CREATEPORTAL = getProp(casePfx+"inp.submit.createportal","//input[contains(@id,'create-portal-form:create-portal')]");
+ private final String TAB_PORTALOBJ_ID = getProp(casePfx+"tab.portalobj.id","Link=Admin");
+ private final String LNK_PORTALS_ID = getProp(casePfx+"lnk.portals.id","link=*Portal Objects*");
+ private final String LNK_PORTAL_HOME = getProp(casePfx+"lnk.portal.home","//a[contains(@id,'obj-temp-form:object-link-0')]");
+ private final String TBL_PORTAL_ADMIN = getProp(casePfx+"tbl.portal.admin","//table[contains(@id,'obj-nav-form:portal-datatable')]");
+ private final String POR_TL_MAIN = getProp(casePfx+"por.tl.main","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:object-iid-link'')]");
+ private final String POR_TL_SECURITY = getProp(casePfx+"por.tl.security","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:security-link'')]");
+ private final String POR_TL_PROPERTIES = getProp(casePfx+"por.tl.properties","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:prop-link'')]");
+ private final String POR_TL_THEME = getProp(casePfx+"por.tl.theme","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:theme-link'')]");
+ private final String POR_TL_RENAME = getProp(casePfx+"por.tl.rename","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:rename'')]");
+ private final String POR_TL_DELETE = getProp(casePfx+"por.tl.delete","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:delete'')]");
+ private final String POR_TL_MAKEDEF = getProp(casePfx+"por.tl.makedef","//a[contains(@id,''obj-nav-form:portal-datatable:{0}:default-link'')]");
+ private final String TBL_PORTALPAGE_ADMIN = getProp(casePfx+"tbl.portalpage.admin","//table[contains(@id,'obj-nav-form:pages-datatable')]");
+ private final String PAG_TL_MAIN = getProp(casePfx+"pag.tl.main","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:object-link'')]");
+ private final String PAG_TL_LAYOUT = getProp(casePfx+"pag.tl.layout","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:edit-page-layout'')]");
+ private final String PAG_TL_SECURITY = getProp(casePfx+"pag.tl.security","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:security-link'')]");
+ private final String PAG_TL_PROPERTIES = getProp(casePfx+"pag.tl.properties","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:prop-link'')]");
+ private final String PAG_TL_THEME = getProp(casePfx+"pag.tl.theme","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:theme-link'')]");
+ private final String PAG_TL_RENAME = getProp(casePfx+"pag.tl.rename","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:rename-link'')]");
+ private final String PAG_TL_DISPLAY = getProp(casePfx+"pag.tl.display","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:rename-display'')]");
+ private final String PAG_TL_DELETE = getProp(casePfx+"pag.tl.delete","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:delete-link'')]");
+ private final String PAG_TL_MAKEDEF = getProp(casePfx+"pag.tl.makedef","//a[contains(@id,''obj-nav-form:pages-datatable:{0}:default-link'')]");
+
/*
- create a new portal
- add couple of page to the portal
@@ -65,6 +68,7 @@
@AfterMethod(groups = {"log"})
public void logoutAfterTest() {
}
+
final String portalName = "UseCasePortal";
final String page1Name = "firstPage";
final String page2Name = "anotherPage";
@@ -80,7 +84,6 @@
createPortal(portalName);
addPage(page1Name);
- //selenium.setSpeed("4000");
addPage(page2Name);
addPage(page3Name);
addPage(page4Name);
@@ -165,26 +168,21 @@
try {
Thread.sleep(5000);
} catch (InterruptedException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
-
//hack
selenium.select(SEL_PORTLET_TYPE, "label=" + "cms");
try {
Thread.sleep(5000);
} catch (InterruptedException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
-
selenium.select(SEL_PORTLET_TYPE, "label=" + type);
try {
Thread.sleep(5000);
} catch (InterruptedException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml 2009-02-19 09:58:37 UTC (rev 12836)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml 2009-02-19 11:43:13 UTC (rev 12837)
@@ -52,12 +52,6 @@
<class name="org.jboss.portal.test.selenium.portal.PortletInstancesTestCase"></class></classes>
</test>
- <test verbose="2" name="org.jboss.portal.test.selenium.usecase.NewPortalUsecaseTestCase" annotations="JDK">
- <classes>
- <class name="org.jboss.portal.test.selenium.usecase.NewPortalUsecaseTestCase"/>
- </classes>
- </test>
-
<test name="org.jboss.portal.test.selenium.cms.CMSFileTestCase"
verbose="2" annotations="JDK">
<classes>
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/usecaseng.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/usecaseng.xml 2009-02-19 09:58:37 UTC (rev 12836)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/usecaseng.xml 2009-02-19 11:43:13 UTC (rev 12837)
@@ -1,9 +1,9 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
<suite name="SeleniumTest">
- <test verbose="2" name="org.jboss.portal.test.selenium.usecase.NewPortalUsecaseTestCase" annotations="JDK">
+ <test verbose="2" name="org.jboss.portal.test.selenium.portal.EndtoEndPortalAdminTestCase" annotations="JDK">
<classes>
- <class name="org.jboss.portal.test.selenium.usecase.NewPortalUsecaseTestCase"/>
+ <class name="org.jboss.portal.test.selenium.portal.EndtoEndPortalAdminTestCase"/>
</classes>
</test>
17 years, 2 months
JBoss Portal SVN: r12836 - branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-02-19 04:58:37 -0500 (Thu, 19 Feb 2009)
New Revision: 12836
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
Log:
JBPORTAL-2292: Typos in the Identity Resource Bundle
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2009-02-19 00:52:20 UTC (rev 12835)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2009-02-19 09:58:37 UTC (rev 12836)
@@ -21,7 +21,7 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
################################################################################
-IDENTITY_APPLICATION_NOT_AVAILABLE=Porlet not available. Please check your configuration and the error log for further information.
+IDENTITY_APPLICATION_NOT_AVAILABLE=Portlet not available. Please check your configuration and the error log for further information.
IDENTITY_WELCOME=Welcome
IDENTITY_REGISTER=Register
17 years, 2 months
JBoss Portal SVN: r12835 - branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-02-18 19:52:20 -0500 (Wed, 18 Feb 2009)
New Revision: 12835
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
Log:
- Fixed messed-up Resources... :(
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2009-02-19 00:48:22 UTC (rev 12834)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2009-02-19 00:52:20 UTC (rev 12835)
@@ -21,7 +21,48 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
################################################################################
- Default
+PORTLET_INSTANCES=Portlet Instances
+INSTANCE_DELETE=instance Delete
+PORTLET_CAUSING_REFERENCING_NOT_ABLE=portlet instance causing windows referencing it to not be able to display their content anymore
+ARE_YOU_SURE_DELETE=Are you sure you want to delete this portlet instance ?
+DASHBOARD_THEME_PROPERTIES=Dashboard theme properties
+CONFIGURE_DASHBOARD_SETTINGS=Configure dashboards settings
+DASHBOARDS=Dashboards
+ADD_DISPLAY_NAMES=Add Display Names
+CURRENT_DISPLAY_NAMES=Current Display Names
+SAVE=Save
+MANAGE=Manage
+PORTALS_NO_CAP=portals
+PORTAL=portal
+SUB_PORTALS=sub-portals
+PAGES_WITHIN=pages within
+CREATE_PORTAL_NAMED=Create a portal named
+PAGE_LAYOUT=Page layout
+SECURITY=Security
+THEME=Theme
+RENAME=Rename
+DISPLAY_NAMES=Display Names
+MANAGE_SUB_PAGES_WITHIN=Manage sub-pages within
+CREATE_PAGE_NAMED=Create a page named
+SET_PAGE_PERMISSIONS=Please set the page permissions
+PAGE_THEME_PROPERTIES=Page theme properties
+SET_PORTAL_PERMISSIONS=Please set the portal permissions
+PORTAL_THEME_PROPERTIES=Portal theme properties
+SETTINGS_ARE_INHERITED_BY_ALL_PAGES=These settings are inherited by all the pages and windows of this portal. You may override these settings by selecting the appropriate value on the respective Theme settings pages
+EVENT_LISTENER_BINDING=Event Listener Binding
+CHOOSE_ID_PORTALEVENTLISTENER=Choose the id of the PortalEventListener to bind to this
+SET_PERMISSIONS_FOR=Please set the permissions for the
+WINDOW_NO_CAP=window
+WINDOW_THEME_PROPERTIES=Window theme properties
+INSTANCE_ID=Instance id
+INSTANCE_NAME=Instance name
+ACTIONS=Actions
+PREFERENCES=Preferences
+PORTLET_DETAILS=portlet details
+ASSOCIATED_PORTLET_NOT_AVAILABLE=The associated portlet is not available
+PREFERENCES_NO_CAP=preferences
+SECURITY_SETTINGS=security settings
+MAKE_DEFAULT=Make Default
MANAGE_WINDOWS_WITHIN=Manage windows within
PORTAL_OBJECTS=Portal Objects
PORTALS=Portals
17 years, 2 months