JBoss Portal SVN: r12101 - in branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests: src/org/jboss/portal/test/selenium and 1 other directory.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2008-10-20 11:35:39 -0400 (Mon, 20 Oct 2008)
New Revision: 12101
Modified:
branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java
branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserLoginTestCase.java
branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/testng.xml
Log:
user login test , waitForElement added
Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2008-10-20 15:24:57 UTC (rev 12100)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2008-10-20 15:35:39 UTC (rev 12101)
@@ -18,7 +18,12 @@
public static final String INPUT_PASSWORD = "j_password";
public static final String INPUT_USERNAME = "j_username";
protected Selenium selenium;
+
+ //Generic timeout in miliseconds
protected static final String PAGE_LOAD = "450000";
+
+ //Element timeout in seconds
+ protected static final int ELEM_TIMEOUT = 30;
@BeforeClass
public void setupChromeForLogin() throws Exception {
@@ -97,6 +102,29 @@
return Boolean.valueOf(selenium.getEval("selenium.assertTextOrder(\"" + text + "\")"));
}
+ protected void waitFor(long time){
+ try {
+ Thread.sleep(time);
+ } catch (InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ public void waitForElement(String locator) {
+ for (int second = 0; ; second++) {
+ if (second >= ELEM_TIMEOUT) {
+ Assert.fail("Element "+locator+" not found.");
+ }
+ try {
+ if (selenium.isElementPresent(locator)) break;
+ } catch (Exception e) {
+ }
+ waitFor(1000);
+ }
+ }
+
+
protected void login(String username, String password) {
selenium.open(ADDR_PORTAL);
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -104,12 +132,10 @@
selenium.click(LINK_LOGIN);
selenium.selectFrame(FRAME_LOGIN_CONTENT);
- try {
- Thread.sleep(2000);
- } catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+
+ waitForElement(INPUT_USERNAME);
+ waitForElement(INPUT_PASSWORD);
+ waitForElement(SUBMIT_LOGIN);
selenium.type(INPUT_USERNAME, username);
selenium.type(INPUT_PASSWORD, password);
Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserLoginTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserLoginTestCase.java 2008-10-20 15:24:57 UTC (rev 12100)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserLoginTestCase.java 2008-10-20 15:35:39 UTC (rev 12101)
@@ -35,6 +35,9 @@
selenium.click("link=Login");
selenium.selectFrame("login-content");
+ waitForElement("j_username");
+ waitForElement("j_password");
+
Assert.assertTrue(selenium.isElementPresent("xpath=id('j_username')"), "Expected input DOM element for username doesn't exist.");
selenium.type("j_username", "user");
Assert.assertTrue(selenium.isElementPresent("xpath=id('j_password')"), "Expected input DOM element for password doesn't exist.");
@@ -79,6 +82,8 @@
selenium.click("link=Login");
selenium.selectFrame("login-content");
+ waitForElement("j_username");
+ waitForElement("j_password");
Assert.assertTrue(selenium.isElementPresent("xpath=id('j_username')"), "Expected input DOM element for username doesn't exist.");
selenium.type("j_username", "admin");
@@ -128,6 +133,8 @@
selenium.click("link=Login");
selenium.selectFrame("login-content");
+ waitForElement("j_username");
+ waitForElement("j_password");
Assert.assertTrue(selenium.isElementPresent("xpath=id('j_username')"), "Expected input DOM element for username doesn't exist.");
selenium.type("j_username", "saki");
Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/testng.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/testng.xml 2008-10-20 15:24:57 UTC (rev 12100)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/testng.xml 2008-10-20 15:35:39 UTC (rev 12101)
@@ -16,8 +16,6 @@
<class name="org.jboss.portal.test.selenium.IdentityAdminTestCase"></class></classes>
</test>
-
-
<test name="org.jboss.portal.test.selenium.PortletUserCreationTestCase"
verbose="2" annotations="JDK">
<classes>
17 years, 7 months
JBoss Portal SVN: r12100 - modules/identity/tags/JBP_IDENTITY_1_0_5/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-20 11:24:57 -0400 (Mon, 20 Oct 2008)
New Revision: 12100
Modified:
modules/identity/tags/JBP_IDENTITY_1_0_5/build/build-thirdparty.xml
modules/identity/tags/JBP_IDENTITY_1_0_5/build/build.xml
Log:
Using more recent modules, marked as 1.0.5
Modified: modules/identity/tags/JBP_IDENTITY_1_0_5/build/build-thirdparty.xml
===================================================================
--- modules/identity/tags/JBP_IDENTITY_1_0_5/build/build-thirdparty.xml 2008-10-20 15:20:53 UTC (rev 12099)
+++ modules/identity/tags/JBP_IDENTITY_1_0_5/build/build-thirdparty.xml 2008-10-20 15:24:57 UTC (rev 12100)
@@ -47,8 +47,8 @@
are pushed to the http://repository.jboss.com site.
-->
- <componentref name="jboss-portal/modules/common" version="1.1.0"/>
- <componentref name="jboss-portal/modules/test" version="1.0.1"/>
+ <componentref name="jboss-portal/modules/common" version="1.1.3"/>
+ <componentref name="jboss-portal/modules/test" version="1.0.1.SP2"/>
<componentref name="apache-log4j" version="1.2.8"/>
<componentref name="apache-logging" version="1.0.5.SP1-jboss"/>
<componentref name="apache-xerces" version="2.7.1"/>
Modified: modules/identity/tags/JBP_IDENTITY_1_0_5/build/build.xml
===================================================================
--- modules/identity/tags/JBP_IDENTITY_1_0_5/build/build.xml 2008-10-20 15:20:53 UTC (rev 12099)
+++ modules/identity/tags/JBP_IDENTITY_1_0_5/build/build.xml 2008-10-20 15:24:57 UTC (rev 12100)
@@ -61,8 +61,8 @@
<property name="version.major" value="1"/>
<property name="version.minor" value="0"/>
- <property name="version.revision" value="3"/>
- <property name="version.tag" value="SNAPSHOT"/>
+ <property name="version.revision" value="5"/>
+ <property name="version.tag" value="GA"/>
<property name="version.name" value=""/>
<!-- This must be set to the CVS tag for any release -->
17 years, 7 months
JBoss Portal SVN: r12099 - modules/identity/tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-20 11:20:53 -0400 (Mon, 20 Oct 2008)
New Revision: 12099
Added:
modules/identity/tags/JBP_IDENTITY_1_0_5/
Log:
1.0.5 tagging
Copied: modules/identity/tags/JBP_IDENTITY_1_0_5 (from rev 12098, modules/identity/branches/JBP_IDENTITY_BRANCH_1_0)
17 years, 7 months
JBoss Portal SVN: r12098 - modules/test/tags/JBP_TEST_1_0_1_SP2/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-20 11:14:15 -0400 (Mon, 20 Oct 2008)
New Revision: 12098
Modified:
modules/test/tags/JBP_TEST_1_0_1_SP2/build/build-thirdparty.xml
modules/test/tags/JBP_TEST_1_0_1_SP2/build/build.xml
Log:
Using common 1.1.3, tagged to 1.0.1.SP2
Modified: modules/test/tags/JBP_TEST_1_0_1_SP2/build/build-thirdparty.xml
===================================================================
--- modules/test/tags/JBP_TEST_1_0_1_SP2/build/build-thirdparty.xml 2008-10-20 15:05:25 UTC (rev 12097)
+++ modules/test/tags/JBP_TEST_1_0_1_SP2/build/build-thirdparty.xml 2008-10-20 15:14:15 UTC (rev 12098)
@@ -47,7 +47,7 @@
are pushed to the http://repository.jboss.com site.
-->
- <componentref name="jboss-portal/modules/common" version="trunk-SNAPSHOT"/>
+ <componentref name="jboss-portal/modules/common" version="1.1.3"/>
<componentref name="codehaus/cargo" version="0.9"/>
Modified: modules/test/tags/JBP_TEST_1_0_1_SP2/build/build.xml
===================================================================
--- modules/test/tags/JBP_TEST_1_0_1_SP2/build/build.xml 2008-10-20 15:05:25 UTC (rev 12097)
+++ modules/test/tags/JBP_TEST_1_0_1_SP2/build/build.xml 2008-10-20 15:14:15 UTC (rev 12098)
@@ -61,8 +61,8 @@
<property name="version.major" value="1"/>
<property name="version.minor" value="0"/>
- <property name="version.revision" value="2"/>
- <property name="version.tag" value="GA"/>
+ <property name="version.revision" value="1"/>
+ <property name="version.tag" value="SP2"/>
<property name="version.name" value=""/>
<!-- This must be set to the CVS tag for any release -->
17 years, 7 months
JBoss Portal SVN: r12097 - modules/test/tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-20 11:05:25 -0400 (Mon, 20 Oct 2008)
New Revision: 12097
Added:
modules/test/tags/JBP_TEST_1_0_1_SP2/
Log:
Tagging test module 1.0.1.SP2
Copied: modules/test/tags/JBP_TEST_1_0_1_SP2 (from rev 12096, modules/test/branches/JBP_TEST_BRANCH_1_0)
17 years, 7 months
JBoss Portal SVN: r12096 - in modules/common/tags/JBP_COMMON_1_1_3: build and 3 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-20 11:04:01 -0400 (Mon, 20 Oct 2008)
New Revision: 12096
Modified:
modules/common/tags/JBP_COMMON_1_1_3/build/pom.xml
modules/common/tags/JBP_COMMON_1_1_3/common/pom.xml
modules/common/tags/JBP_COMMON_1_1_3/mc/pom.xml
modules/common/tags/JBP_COMMON_1_1_3/pom.xml
modules/common/tags/JBP_COMMON_1_1_3/portal/pom.xml
modules/common/tags/JBP_COMMON_1_1_3/releaseLibs.sh
Log:
1.1.3 version number change
Modified: modules/common/tags/JBP_COMMON_1_1_3/build/pom.xml
===================================================================
--- modules/common/tags/JBP_COMMON_1_1_3/build/pom.xml 2008-10-20 15:00:45 UTC (rev 12095)
+++ modules/common/tags/JBP_COMMON_1_1_3/build/pom.xml 2008-10-20 15:04:01 UTC (rev 12096)
@@ -10,7 +10,7 @@
<artifactId>module-parent</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Modules Common</name>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1.3</version>
<url>http://labs.jboss.com/jbossportal</url>
<properties>
Modified: modules/common/tags/JBP_COMMON_1_1_3/common/pom.xml
===================================================================
--- modules/common/tags/JBP_COMMON_1_1_3/common/pom.xml 2008-10-20 15:00:45 UTC (rev 12095)
+++ modules/common/tags/JBP_COMMON_1_1_3/common/pom.xml 2008-10-20 15:04:01 UTC (rev 12096)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.common</groupId>
<artifactId>module-parent</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1.3</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/common/tags/JBP_COMMON_1_1_3/mc/pom.xml
===================================================================
--- modules/common/tags/JBP_COMMON_1_1_3/mc/pom.xml 2008-10-20 15:00:45 UTC (rev 12095)
+++ modules/common/tags/JBP_COMMON_1_1_3/mc/pom.xml 2008-10-20 15:04:01 UTC (rev 12096)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.common</groupId>
<artifactId>module-parent</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1.3</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/common/tags/JBP_COMMON_1_1_3/pom.xml
===================================================================
--- modules/common/tags/JBP_COMMON_1_1_3/pom.xml 2008-10-20 15:00:45 UTC (rev 12095)
+++ modules/common/tags/JBP_COMMON_1_1_3/pom.xml 2008-10-20 15:04:01 UTC (rev 12096)
@@ -5,7 +5,7 @@
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Modules Common (aggregator)</name>
- <version>1.1-SNAPHOT</version>
+ <version>1.1.3</version>
<distributionManagement>
<repository>
Modified: modules/common/tags/JBP_COMMON_1_1_3/portal/pom.xml
===================================================================
--- modules/common/tags/JBP_COMMON_1_1_3/portal/pom.xml 2008-10-20 15:00:45 UTC (rev 12095)
+++ modules/common/tags/JBP_COMMON_1_1_3/portal/pom.xml 2008-10-20 15:04:01 UTC (rev 12096)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.common</groupId>
<artifactId>module-parent</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1.3</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/common/tags/JBP_COMMON_1_1_3/releaseLibs.sh
===================================================================
--- modules/common/tags/JBP_COMMON_1_1_3/releaseLibs.sh 2008-10-20 15:00:45 UTC (rev 12095)
+++ modules/common/tags/JBP_COMMON_1_1_3/releaseLibs.sh 2008-10-20 15:04:01 UTC (rev 12096)
@@ -22,6 +22,6 @@
fi
-cp common/target/common-common-1.1-SNAPSHOT.jar $loc/portal-common-lib.jar
-cp mc/target/common-mc-1.1-SNAPSHOT.jar $loc/portal-common-mc-lib.jar
-cp portal/target/common-portal-1.1-SNAPSHOT.jar $loc/portal-common-portal-lib.jar
+cp common/target/common-common-1.1.3.jar $loc/portal-common-lib.jar
+cp mc/target/common-mc-1.1.3.jar $loc/portal-common-mc-lib.jar
+cp portal/target/common-portal-1.1.3.jar $loc/portal-common-portal-lib.jar
17 years, 7 months
JBoss Portal SVN: r12095 - modules/common/tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-20 11:00:45 -0400 (Mon, 20 Oct 2008)
New Revision: 12095
Added:
modules/common/tags/JBP_COMMON_1_1_3/
Log:
Tagging Common 1.1.3
Copied: modules/common/tags/JBP_COMMON_1_1_3 (from rev 12094, modules/common/branches/JBP_COMMON_BRANCH_1_1)
17 years, 7 months
JBoss Portal SVN: r12094 - branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2008-10-20 09:42:50 -0400 (Mon, 20 Oct 2008)
New Revision: 12094
Modified:
branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java
Log:
higher timeout
Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2008-10-20 12:13:52 UTC (rev 12093)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2008-10-20 13:42:50 UTC (rev 12094)
@@ -18,7 +18,7 @@
public static final String INPUT_PASSWORD = "j_password";
public static final String INPUT_USERNAME = "j_username";
protected Selenium selenium;
- protected static final String PAGE_LOAD = "250000";
+ protected static final String PAGE_LOAD = "450000";
@BeforeClass
public void setupChromeForLogin() throws Exception {
17 years, 7 months
JBoss Portal SVN: r12093 - branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2008-10-20 08:13:52 -0400 (Mon, 20 Oct 2008)
New Revision: 12093
Modified:
branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java
Log:
wsrp id fix
Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-10-20 08:12:11 UTC (rev 12092)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-10-20 12:13:52 UTC (rev 12093)
@@ -20,7 +20,7 @@
private static final String SUBMIT_CONS_REGVAL = "edit-cons-form:refresh-cons-link";
private static final String SUBMIT_REFRESHFINAL = "edit-cons-form:refresh-cons-link";
- private static final String INPUT_CONS_REGVALUE = "edit-cons-form:prop-value-input";
+ private static final String INPUT_CONS_REGVALUE = "edit-cons-form:existingProps:{0}:prop-value-input";
private static final String SUBMIT_REFRESHSAVE = "edit-cons-form:refresh-cons-link";
private static final String INPUT_CONSWSDL = "edit-cons-form:wsdl";
private static final String INPUT_CACHEEXP = "edit-cons-form:cache";
@@ -76,7 +76,7 @@
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.type(MessageFormat.format(INPUT_CONS_REGVALUE,0), "public");
selenium.click(SUBMIT_CONS_REGVAL);
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent("Refresh was successful."));
@@ -307,7 +307,7 @@
selenium.type(INPUT_CONSWSDL, address);
selenium.click(SUBMIT_REFRESHSAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.type(INPUT_CONS_REGVALUE, "public");
+ selenium.type(MessageFormat.format(INPUT_CONS_REGVALUE,0), "public");
selenium.click(SUBMIT_CONS_REGVAL);
selenium.waitForPageToLoad(PAGE_LOAD);
17 years, 7 months
JBoss Portal SVN: r12092 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/control/portal.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-10-20 04:12:11 -0400 (Mon, 20 Oct 2008)
New Revision: 12092
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/control/portal/DefaultPortalControlPolicy.java
Log:
sync from 2.6 branch
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/control/portal/DefaultPortalControlPolicy.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/control/portal/DefaultPortalControlPolicy.java 2008-10-20 07:52:54 UTC (rev 12091)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/control/portal/DefaultPortalControlPolicy.java 2008-10-20 08:12:11 UTC (rev 12092)
@@ -28,6 +28,7 @@
import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.core.controller.ControllerRequestDispatcher;
import org.jboss.portal.core.controller.ControllerResponse;
+import org.jboss.portal.core.controller.AccessDeniedException;
import org.jboss.portal.core.controller.command.response.ErrorResponse;
import org.jboss.portal.core.controller.command.response.SecurityErrorResponse;
import org.jboss.portal.core.controller.command.response.UnavailableResourceResponse;
@@ -126,7 +127,14 @@
//
if (cause != null)
{
- log.error("Rendering portlet window " + "" + " produced an error", cause);
+ if (cause instanceof AccessDeniedException)
+ {
+ log.debug("Rendering portlet window " + "" + " produced an error", cause);
+ }
+ else
+ {
+ log.error("Rendering portlet window " + "" + " produced an error", cause);
+ }
}
//
17 years, 7 months