JBoss Portal SVN: r13404 - modules/portlet/branches/JBP_PORTLET_2_0_5_JBEPP-73/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api.
by portal-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2009-05-23 21:33:15 -0400 (Sat, 23 May 2009)
New Revision: 13404
Modified:
modules/portlet/branches/JBP_PORTLET_2_0_5_JBEPP-73/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/MimeResponseImpl.java
Log:
[JBEPP-73] - Fixed jsr168 ext-*cache test case failures
Modified: modules/portlet/branches/JBP_PORTLET_2_0_5_JBEPP-73/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/MimeResponseImpl.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_2_0_5_JBEPP-73/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/MimeResponseImpl.java 2009-05-22 13:44:25 UTC (rev 13403)
+++ modules/portlet/branches/JBP_PORTLET_2_0_5_JBEPP-73/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/MimeResponseImpl.java 2009-05-24 01:33:15 UTC (rev 13404)
@@ -217,7 +217,7 @@
return ResourceURLImpl.createResourceURL(invocation, preq);
}
- public void addProperty(String key, String value) throws IllegalArgumentException
+ private void setCache(String key, String value)
{
if (MimeResponse.EXPIRATION_CACHE.equals(key))
{
@@ -250,12 +250,37 @@
getCacheControl().setUseCachedContent(true);
}
}
+ }
+
+ public void addProperty(String key, String value) throws IllegalArgumentException
+ {
+ if (MimeResponse.EXPIRATION_CACHE.equals(key)
+ || MimeResponse.ETAG.equals(key)
+ || MimeResponse.USE_CACHED_CONTENT.equals(key))
+ {
+ setCache(key, value);
+ }
else
{
super.addProperty(key, value);
}
}
+
+ public void setProperty(String key, String value) throws IllegalArgumentException
+ {
+ if (MimeResponse.EXPIRATION_CACHE.equals(key)
+ || MimeResponse.ETAG.equals(key)
+ || MimeResponse.USE_CACHED_CONTENT.equals(key))
+ {
+ setCache(key, value);
+ }
+ else
+ {
+ super.setProperty(key, value);
+ }
+ }
+
public CacheControl getCacheControl()
{
if (cacheControl == null)
14 years, 11 months
JBoss Portal SVN: r13403 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-05-22 09:44:25 -0400 (Fri, 22 May 2009)
New Revision: 13403
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserLoginTestCase.java
Log:
[selenium] - trying to fix due to new login form
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2009-05-21 19:57:48 UTC (rev 13402)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2009-05-22 13:44:25 UTC (rev 13403)
@@ -219,6 +219,8 @@
selenium.type(INPUT_USERNAME, userName);
selenium.type(INPUT_PASSWORD, userPass);
+ selenium.fireEvent(INPUT_PASSWORD, "keydown");
+
selenium.click(SUBMIT_LOGIN);
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent("Your account is disabled"), "Message telling that account is disabled is other then expected or missing.");
@@ -620,7 +622,7 @@
selenium.click(SUB_CREATE_USER);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertFalse(selenium.isTextPresent("This username is already taken. tempUser"), "User already exists.");
+ Assert.assertFalse(selenium.isTextPresent("This username is already taken."), "User already exists.");
selenium.click(SUB_USER_ROLE);
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2009-05-21 19:57:48 UTC (rev 13402)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2009-05-22 13:44:25 UTC (rev 13403)
@@ -385,6 +385,7 @@
selenium.type(INPUT_USERNAME, username);
selenium.type(INPUT_PASSWORD, password);
+ selenium.fireEvent(INPUT_PASSWORD, "keydown");
Assert.assertTrue(selenium.isElementPresent(SUBMIT_LOGIN));
selenium.click(SUBMIT_LOGIN);
selenium.waitForPageToLoad(PAGE_LOAD);
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserLoginTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserLoginTestCase.java 2009-05-21 19:57:48 UTC (rev 13402)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserLoginTestCase.java 2009-05-22 13:44:25 UTC (rev 13403)
@@ -21,7 +21,7 @@
private final String FRM_MAIN = getLoc(casePfx+"frm.main","relative=up");
private final String SUB_CANCEL = getLoc(casePfx+"sub.portal","cancel");
private final String LNK_LOGOUT = getLoc(casePfx+"lnk.logout","link=Logout");
- private final String SUB_LOGIN = getLoc(casePfx+"sub.login","login");
+ private final String SUB_LOGIN = getLoc(casePfx+"saub.login","login-submit");
private final String INP_PASSWORD = getLoc(casePfx+"inp.password","xpath=id('j_password')");
private final String INP_USERNAME = getLoc(casePfx+"inp.username","xpath=id('j_username')");
private final String FRM_LOGINFORM = getLoc(casePfx+"frm.login","login-content");
@@ -68,6 +68,7 @@
Assert.assertTrue(selenium.isElementPresent(INP_PASSWORD), "Expected input DOM element for password doesn't exist.");
selenium.type(INP_PASSWORD, loginPass);
+ selenium.fireEvent(INP_PASSWORD, "keydown");
selenium.click(SUB_LOGIN);
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -108,8 +109,10 @@
selenium.type(INP_USERNAME, loginName);
Assert.assertTrue(selenium.isElementPresent(INP_PASSWORD), "Expected input DOM element for password doesn't exist.");
selenium.type(INP_PASSWORD, loginPass);
+ selenium.fireEvent(INP_PASSWORD, "keydown");
selenium.click(SUB_LOGIN);
+ //waitFor(AJAX_LOAD);
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent("Logged in as: admin"), "\"Logged in as\" message missing.");
@@ -186,8 +189,9 @@
selenium.type(INP_USERNAME, loginName);
Assert.assertTrue(selenium.isElementPresent(INP_PASSWORD), "Expected input DOM element for password doesn't exist.");
selenium.type(INP_PASSWORD, loginPass);
+ selenium.fireEvent(INP_PASSWORD, "keydown");
selenium.click(SUB_LOGIN);
-
+
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent("The user doesn't exist or the password is incorrect "), "\"Logged in as\" message missing.");
@@ -220,6 +224,7 @@
selenium.type(INP_USERNAME, loginName);
Assert.assertTrue(selenium.isElementPresent(INP_PASSWORD), "Expected input DOM element for password doesn't exist.");
selenium.type(INP_PASSWORD, loginPass);
+ selenium.fireEvent(INP_PASSWORD, "keydown");
selenium.click(SUB_LOGIN);
selenium.waitForPageToLoad(PAGE_LOAD);
14 years, 11 months
JBoss Portal SVN: r13402 - in branches/JBoss_Portal_Branch_2_7/core/src: bin/portal-core-war/themes/renewal/images and 1 other directories.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2009-05-21 15:57:48 -0400 (Thu, 21 May 2009)
New Revision: 13402
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renaissance/images/favicon.ico
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/images/favicon.ico
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portal-themes.xml
Log:
JBPORTAL-2351
Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renaissance/images/favicon.ico
===================================================================
(Binary files differ)
Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/images/favicon.ico
===================================================================
(Binary files differ)
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portal-themes.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portal-themes.xml 2009-05-21 19:19:35 UTC (rev 13401)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portal-themes.xml 2009-05-21 19:57:48 UTC (rev 13402)
@@ -27,7 +27,7 @@
<name>renaissance</name>
<link rel="stylesheet" id="main_css" href="/themes/renaissance/portal_style.css" type="text/css"/>
<link rel="shortcut icon" href="/themes/renaissance/images/favicon.ico"/>
- <link rel="icon" href="/themes/renaissance/images/animated_favicon1.gif" type="image/gif"/>
+ <link rel="icon" href="/themes/renaissance/images/favicon.ico" type="image/gif"/>
</theme>
<theme>
<name>industrial</name>
@@ -43,6 +43,6 @@
<name>renewal</name>
<link rel="stylesheet" id="main_css" href="/themes/renewal/portal_style.css" type="text/css"/>
<link rel="shortcut icon" href="/themes/renewal/images/favicon.ico"/>
- <link rel="icon" href="/themes/renewal/images/animated_favicon1.gif" type="image/gif"/>
+ <link rel="icon" href="/themes/renewal/images/favicon.ico" type="image/gif"/>
</theme>
</themes>
\ No newline at end of file
14 years, 11 months
JBoss Portal SVN: r13401 - in branches/JBoss_Portal_Branch_2_7/core/src: bin/portal-core-war/js and 2 other directories.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2009-05-21 15:19:35 -0400 (Thu, 21 May 2009)
New Revision: 13401
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/modal.css
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/modal.js
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/common/modal_body.jsp
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp
Log:
JBPORTAL-2227
Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css 2009-05-21 15:12:39 UTC (rev 13400)
+++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css 2009-05-21 19:19:35 UTC (rev 13401)
@@ -2,7 +2,7 @@
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-size: 11px;
width: 255px;
- border: 1px solid #436999;
+ /*border: 1px solid #436999;*/
position: relative;
margin: 0 auto 0 auto;
background-color:white;
Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/modal.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/modal.css 2009-05-21 15:12:39 UTC (rev 13400)
+++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/modal.css 2009-05-21 19:19:35 UTC (rev 13401)
@@ -45,6 +45,6 @@
iframe.login-content{
padding:0;
margin:0;
- border:0;
+ border: 1px solid #436999;
}
Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/modal.js
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/modal.js 2009-05-21 15:12:39 UTC (rev 13400)
+++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/modal.js 2009-05-21 19:19:35 UTC (rev 13401)
@@ -591,18 +591,6 @@
// preload and create loader image
var imgPreloader = new Image();
- // if loader image found, create link to hide Modal and create loadingimage
- //imgPreloader.onload=function(){
-
- /*var objLoadingImageLink = document.getElementById(componentId + 'ImageLink');
-
- if (!objLoadingImageLink){
- objLoadingImageLink.setAttribute('href','#');
- objLoadingImageLink.onclick = function () {hideModal(); return false;}
- objLoadingImageLink.setAttribute('id',componentId + 'ImageLink');
- objModal.appendChild(objLoadingImageLink);
- }*/
-
var objLoadingImageWidth = "100";
var objLoadingImage = document.getElementById(componentId + 'loading-image')
@@ -652,6 +640,7 @@
}catch(Exception){
}
+ return true;
}
Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/common/modal_body.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/common/modal_body.jsp 2009-05-21 15:12:39 UTC (rev 13400)
+++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/common/modal_body.jsp 2009-05-21 19:19:35 UTC (rev 13401)
@@ -1,5 +1,5 @@
<div id="login-modal" style="display:none">
- <div id="login-modal-msg" style="display:none;width:257px;height:157px">
- <iframe src="" frameborder="0" width="257" height="157" scrolling="no" marginheight="0" marginwidth="0" name="login-content" class="login-content" id="loginIframe"></iframe>
+ <div id="login-modal-msg" style="display:none;width:255px;height:157px">
+ <iframe src="" frameborder="0" width="255" height="157" scrolling="no" marginheight="0" marginwidth="0" name="login-content" class="login-content" id="loginIframe"></iframe>
</div>
</div>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2009-05-21 15:12:39 UTC (rev 13400)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2009-05-21 19:19:35 UTC (rev 13401)
@@ -39,7 +39,7 @@
<link rel="stylesheet" href="/portal-core/css/login.css" type="text/css"/>
</head>
-<body onload="JBossPortal.login.setFocusOnLoginForm();JBossPortal.login.displayStatus();">
+<body onload="JBossPortal.login.setFocusOnLoginForm();JBossPortal.login.displayStatus();JBossPortal.login.validate(10);">
<div class="login-container">
@@ -69,12 +69,12 @@
<div class="form-field">
<label for="j_username"><%= rb.getString("LOGIN_USERNAME") %>
</label>
- <input type="text" style="width:155px;" name="j_username" id="j_username" value="" onFocus="JBossPortal.login.highlight('j_username');" onblur="JBossPortal.login.highlight('j_username');"/>
+ <input type="text" style="width:155px;" name="j_username" id="j_username" value="" onkeydown="JBossPortal.login.validate();" onFocus="JBossPortal.login.highlight('j_username');JBossPortal.login.validate();" onblur="JBossPortal.login.highlight('j_username');"/>
</div>
<div class="form-field">
<label for="j_password"><%= rb.getString("LOGIN_PASSWORD") %>
</label>
- <input type="password" style="width:155px;" name="j_password" id="j_password" value="" onFocus="JBossPortal.login.highlight('j_password');" onblur="JBossPortal.login.highlight('j_password');"/>
+ <input type="password" style="width:155px;" name="j_password" id="j_password" value="" onkeydown="JBossPortal.login.validate();" onFocus="JBossPortal.login.highlight('j_password');JBossPortal.login.validate();" onblur="JBossPortal.login.highlight('j_password');"/>
</div>
<br class="clear"/>
14 years, 11 months
JBoss Portal SVN: r13400 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-05-21 11:12:39 -0400 (Thu, 21 May 2009)
New Revision: 13400
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml
Log:
[selenium] ant build properties fix
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-05-21 14:34:33 UTC (rev 13399)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-05-21 15:12:39 UTC (rev 13400)
@@ -9,9 +9,11 @@
<property name="suitename" location="testng-files" />
<property name="testname" location="testng-files" />
<property name="testng.dir" location="testng-files" />
+-->
+
<property name="testng.output.dir" location="test-output" />
<property name="testng.debug.dir" location="debug" />
--->
+
<property name="dir.testfiles" location="test_files" />
<property name="dir.javadoc" location="javadoc" />
<property name="test.build.dir" location="output/classes" />
14 years, 11 months
JBoss Portal SVN: r13399 - modules/cms/branches/JBP_CMS_1_2_5_DB2/cms-jackrabbit.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2009-05-21 10:34:33 -0400 (Thu, 21 May 2009)
New Revision: 13399
Modified:
modules/cms/branches/JBP_CMS_1_2_5_DB2/cms-jackrabbit/pom.xml
Log:
fixing db2
Modified: modules/cms/branches/JBP_CMS_1_2_5_DB2/cms-jackrabbit/pom.xml
===================================================================
--- modules/cms/branches/JBP_CMS_1_2_5_DB2/cms-jackrabbit/pom.xml 2009-05-21 13:24:44 UTC (rev 13398)
+++ modules/cms/branches/JBP_CMS_1_2_5_DB2/cms-jackrabbit/pom.xml 2009-05-21 14:34:33 UTC (rev 13399)
@@ -227,19 +227,19 @@
<version>10.2.0.4</version>
<scope>test</scope>
</dependency-->
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc</artifactId>
+ <version>3.1.57</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc_license_cu</artifactId>
+ <version>3.1.57</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
- <groupId>com.ibm.db2</groupId>
- <artifactId>jdbc-driver</artifactId>
- <version>9.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.ibm.db2</groupId>
- <artifactId>jdbc-driver-license</artifactId>
- <version>9.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>net.sourceforge.jtds</groupId>
<artifactId>jtds</artifactId>
<version>1.2.2</version>
14 years, 11 months
JBoss Portal SVN: r13398 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-05-21 09:24:44 -0400 (Thu, 21 May 2009)
New Revision: 13398
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java
Log:
[selenium] - fixing cms archive - error commited by accident
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java 2009-05-21 13:23:01 UTC (rev 13397)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java 2009-05-21 13:24:44 UTC (rev 13398)
@@ -20,7 +20,7 @@
/** The constant defining the wait time (in ms) between attempts when checking if the file was uploaded. */
- public static final int ARCHIVE_WAITING = 1000;
+ public static final int ARCHIVE_WAITING = 7000;
/** The constant defining the the number of attempts when checking if the file was uploaded. */
public static final int ATTEMPTS = 50;
@@ -28,11 +28,11 @@
* uncomment following lines and set the right path to the workspace in the
* case you want to use this test case locally from eclipse
*/
-
+ /*
{
System.setProperty("workspace", "/home/vrockai/workspace/p2.7tests/ui-tests/");
}
-
+ */
/** prefix for locator properties = cms.arch.*/
public final String casePfx = "cms.arch.";
private final String SUB_CANCEL_ARCH_UPLOAD = getLoc(casePfx+"sub.cancel.arch.upload","cancel");
14 years, 11 months
JBoss Portal SVN: r13397 - in branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests: src/org/jboss/portal/test and 3 other directories.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-05-21 09:23:01 -0400 (Thu, 21 May 2009)
New Revision: 13397
Added:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/ant/
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/ant/FileCreate.java
Removed:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/test_files/big_archive.zip
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/test_files/many_files.zip
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java
Log:
[selenium] - removing big archive files for cms, generating them instead
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-05-20 13:42:30 UTC (rev 13396)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-05-21 13:23:01 UTC (rev 13397)
@@ -1,17 +1,18 @@
-
<project name="Tests" default="compile" basedir="." xmlns:server="http://jboss.org/ns/test/ant/server">
<property environment="env" />
<property name="workspace" location="${basedir}" />
<property name="java.home" location="${env.JAVA_HOME}" />
-
+
+<!--
<property name="suitename" location="testng-files" />
<property name="testname" location="testng-files" />
-
<property name="testng.dir" location="testng-files" />
<property name="testng.output.dir" location="test-output" />
<property name="testng.debug.dir" location="debug" />
+-->
+ <property name="dir.testfiles" location="test_files" />
<property name="dir.javadoc" location="javadoc" />
<property name="test.build.dir" location="output/classes" />
<property name="test.src.dir" location="src" />
@@ -42,7 +43,6 @@
<fileset dir="${lib.dir}">
<include name="*.jar" />
</fileset>
-
</path>
<path id="test.cp">
@@ -73,7 +73,6 @@
<!--delete dir="${dir.javadoc}" /-->
</target>
-
<target name="compile" depends="">
<echo message="Compiling testsuite" />
<mkdir dir="${test.build.dir}" />
@@ -81,7 +80,23 @@
<copy file="${test.src.dir}/org/jboss/portal/test/selenium/locator.properties" todir="${test.build.dir}/org/jboss/portal/test/selenium/" />
<copy file="${test.src.dir}/org/jboss/portal/test/selenium/assert.properties" todir="${test.build.dir}/org/jboss/portal/test/selenium/" />
</target>
+
+ <target name="jar-task" depends="compile">
+ <jar destfile="${lib.dir}/createFile.jar" basedir="${test.build.dir}" includes="**/ant/**" />
+ <taskdef name="createfile" classname="org.jboss.portal.test.ant.FileCreate" classpath="${lib.dir}/createFile.jar"/>
+ </target>
+ <target name="create-test-files" depends="jar-task">
+
+ <mkdir dir="${dir.testfiles}/tmp"/>
+ <createfile filename="${dir.testfiles}/tmp/bigfile" size="20971520"/>
+ <zip destfile="${dir.testfiles}/big_archive.zip" basedir="${dir.testfiles}/tmp/" includes="bigfile" />
+
+ <mkdir dir="${dir.testfiles}/tmp/many_files"/>
+ <createfile filename="${dir.testfiles}/tmp/many_files/file" count="101" size="1024" suffix=".txt"/>
+ <zip destfile="${dir.testfiles}/many_files.zip" basedir="${dir.testfiles}/tmp/" includes="many_files/**" />
+ </target>
+
<target name="javadoc" depends="">
<delete dir="${dir.javadoc}" />
<mkdir dir="${dir.javadoc}" />
@@ -121,6 +136,7 @@
<target name="clean">
<echo message="Going to delete directory ${test.build.dir}" />
+ <delete dir="${dir.testfiles}/tmp"/>
<delete dir="${test.build.dir}" />
</target>
@@ -133,13 +149,35 @@
</server>
</server:config>
-
<target name="cleanup">
<echo message="Cleaning up..." />
<antcall target="stop-src" />
</target>
- <target name="selenium-suite" depends="init, compile, run-src, copyApps">
+ <target name="selenium-groups" depends="init, compile, run-src, copyApps, create-test-files">
+ <echo message="Runing TestNG groups: ${testng.groups}" />
+
+ <mkdir dir="test-output" />
+ <mkdir dir="debug" />
+ <testng classpathref="test.cp" groups="" sourcedir="${test.src.dir}" listeners="org.jboss.portal.test.selenium.JBossSeleniumTestListener" outputdir="${testng.output.dir}" suitename="SeleniumSuite">
+
+ <classfileset dir="${test.build.dir}" includes="**/*.class" />
+
+ <sysproperty key="browser" value="${browser}" />
+ <sysproperty key="screenshot" value="${screenshot}" />
+ <sysproperty key="debug" value="${debug}" />
+ <sysproperty key="workspace" value="${workspace}" />
+ <sysproperty key="userCount" value="${userCount}" />
+ <sysproperty key="html-src" value="${html-src}" />
+ <sysproperty key="output-dir" value="${testng.output.dir}" />
+
+ <jvmarg value="-ea" />
+
+ </testng>
+ <antcall target="cleanup" />
+ </target>
+
+ <target name="selenium-suite" depends="init, compile, run-src, copyApps, create-test-files">
<echo message="Runing TestNG" />
<mkdir dir="test-output" />
@@ -162,7 +200,7 @@
<antcall target="cleanup" />
</target>
- <target name="run-and-build" depends="init, compile, copyApps">
+ <target name="run-and-build" depends="init, compile, copyApps, create-test-files">
<echo message="Starting portal instance : ${portal.instance}" />
<server:start name="${portal.instance}" />
@@ -186,7 +224,7 @@
<antcall target="cleanup" />
</target>
- <target name="single-test" depends="init, compile, run-src, copyApps">
+ <target name="single-test" depends="init, compile, run-src, copyApps, create-test-files">
<echo message="Runing TestNG" />
<mkdir dir="test-output" />
@@ -207,7 +245,7 @@
</target>
- <target name="selenium-test" depends="init, compile, run-src, copyApps">
+ <target name="selenium-test" depends="init, compile, run-src, copyApps, create-test-files">
<echo message="Runing TestNG" />
<mkdir dir="test-output" />
@@ -230,7 +268,7 @@
<antcall target="cleanup" />
</target>
- <target name="selenium-cms-test" depends="init, compile, run-src, copyApps">
+ <target name="selenium-cms-test" depends="init, compile, run-src, copyApps, create-test-files">
<echo message="Runing TestNG" />
<mkdir dir="test-output" />
@@ -253,7 +291,7 @@
<antcall target="cleanup" />
</target>
- <target name="selenium-usecase" depends="init, compile, run-src, copyApps">
+ <target name="selenium-usecase" depends="init, compile, run-src, copyApps, create-test-files">
<echo message="Runing TestNG" />
<mkdir dir="test-output" />
@@ -275,13 +313,6 @@
</testng>
<antcall target="cleanup" />
</target>
-
- <target name="archive">
- <!--<touch file="touchme.txt"/>-->
- <echo file="touchme.txt" message="pipik2" />
- <genkey alias="apache-group" storepass="secret" dname="CN=Ant Group, OU=Jakarta Division, O=Apache.org, C=US" />
- <echo message="" />
- </target>
-
+
</project>
Added: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/ant/FileCreate.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/ant/FileCreate.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/ant/FileCreate.java 2009-05-21 13:23:01 UTC (rev 13397)
@@ -0,0 +1,62 @@
+package org.jboss.portal.test.ant;
+
+import java.io.FileWriter;
+import java.io.IOException;
+
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+
+public class FileCreate extends Task {
+
+ String filename;
+ String suffix = "";
+ int size = 0;
+ int count = 1;
+
+ public void setFilename(String filename) {
+ this.filename = filename;
+ }
+
+ public void setSuffix(String suffix) {
+ this.suffix = suffix;
+ }
+
+ public void setSize(int size) {
+ this.size = size;
+ }
+
+ public void setCount(int count) {
+ this.count = count;
+ }
+
+ public void execute() {
+ createFile();
+ }
+
+ public void createFile() {
+
+ FileWriter fstream;
+ try {
+ for (int i = 0; i < count; i++) {
+
+ String fname = count > 1 ? filename + "" + (i+1) + suffix: filename;
+
+ fstream = new FileWriter(fname);
+
+ for (int k = 0; k < size; k++) {
+ fstream.write(Math.random() > 0.5 ? 1 : 0);
+ }
+
+ fstream.close();
+
+ }
+ String mess = "File \"" + filename + "\" of size " + size + "B was created";
+ if (count > 1)
+ mess = count + " files \"" + filename + "[i]"+suffix+"\" each of size " + size + "B were created";
+ log(mess, Project.MSG_INFO);
+ } catch (IOException e) {
+ log("FAIL: " + e.getLocalizedMessage());
+ }
+ }
+
+}
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java 2009-05-20 13:42:30 UTC (rev 13396)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java 2009-05-21 13:23:01 UTC (rev 13397)
@@ -28,11 +28,11 @@
* uncomment following lines and set the right path to the workspace in the
* case you want to use this test case locally from eclipse
*/
- /*
+
{
System.setProperty("workspace", "/home/vrockai/workspace/p2.7tests/ui-tests/");
}
- */
+
/** prefix for locator properties = cms.arch.*/
public final String casePfx = "cms.arch.";
private final String SUB_CANCEL_ARCH_UPLOAD = getLoc(casePfx+"sub.cancel.arch.upload","cancel");
@@ -51,7 +51,7 @@
logoutIfPossible();
login("admin", "admin");
// timeout hack
- selenium.setSpeed("10000");
+ selenium.setSpeed("1000");
}
@AfterMethod(groups = { "log" })
Deleted: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/test_files/big_archive.zip
===================================================================
(Binary files differ)
Deleted: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/test_files/many_files.zip
===================================================================
(Binary files differ)
14 years, 11 months
JBoss Portal SVN: r13396 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-05-20 09:42:30 -0400 (Wed, 20 May 2009)
New Revision: 13396
Added:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng-cms-wf.xml
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml
Log:
[selenium] - target for running custom test suite
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-05-20 10:27:45 UTC (rev 13395)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-05-20 13:42:30 UTC (rev 13396)
@@ -137,7 +137,29 @@
<target name="cleanup">
<echo message="Cleaning up..." />
<antcall target="stop-src" />
+ </target>
+ <target name="selenium-suite" depends="init, compile, run-src, copyApps">
+ <echo message="Runing TestNG" />
+
+ <mkdir dir="test-output" />
+ <mkdir dir="debug" />
+ <testng classpathref="test.cp" sourcedir="${test.src.dir}" outputdir="${testng.output.dir}" suitename="SeleniumSuite">
+
+ <xmlfileset dir="." includes="${user.suite}" />
+
+ <sysproperty key="browser" value="${browser}" />
+ <sysproperty key="screenshot" value="${screenshot}" />
+ <sysproperty key="debug" value="${debug}" />
+ <sysproperty key="workspace" value="${workspace}" />
+ <sysproperty key="userCount" value="${userCount}" />
+ <sysproperty key="html-src" value="${html-src}" />
+ <sysproperty key="output-dir" value="${testng.output.dir}" />
+
+ <jvmarg value="-ea" />
+
+ </testng>
+ <antcall target="cleanup" />
</target>
<target name="run-and-build" depends="init, compile, copyApps">
@@ -148,17 +170,17 @@
<mkdir dir="test-output" />
<testng classpathref="test.cp" sourcedir="${test.src.dir}" outputdir="${testng.output.dir}" suitename="SeleniumSuite">
- <xmlfileset dir="." includes="${test.suite}" />
- <sysproperty key="browser" value="${browser}" />
- <sysproperty key="screenshot" value="${screenshot}" />
- <sysproperty key="debug" value="${debug}" />
- <sysproperty key="workspace" value="${workspace}" />
- <sysproperty key="html-src" value="${html-src}" />
- <sysproperty key="output-dir" value="${testng.output.dir}" />
+ <xmlfileset dir="." includes="${test.suite}" />
+ <sysproperty key="browser" value="${browser}" />
+ <sysproperty key="screenshot" value="${screenshot}" />
+ <sysproperty key="debug" value="${debug}" />
+ <sysproperty key="workspace" value="${workspace}" />
+ <sysproperty key="html-src" value="${html-src}" />
+ <sysproperty key="output-dir" value="${testng.output.dir}" />
- <jvmarg value="-ea" />
+ <jvmarg value="-ea" />
- </testng>
+ </testng>
<echo message="Stoping portal instance : ${portal.instance}" />
<server:stop name="${portal.instance}" />
<antcall target="cleanup" />
Added: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng-cms-wf.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng-cms-wf.xml (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng-cms-wf.xml 2009-05-20 13:42:30 UTC (rev 13396)
@@ -0,0 +1,37 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="SeleniumTest">
+
+ <test name="org.jboss.portal.test.selenium.cms.CMSFileWorkflowTestCase"
+ verbose="2" annotations="JDK">
+ <classes>
+ <class name="org.jboss.portal.test.selenium.cms.CMSFileWorkflowTestCase"></class></classes>
+ </test>
+
+ <test name="org.jboss.portal.test.selenium.cms.CMSSecureTestCase"
+ verbose="2" annotations="JDK">
+ <classes>
+ <class name="org.jboss.portal.test.selenium.cms.CMSSecureTestCase"></class></classes>
+ </test>
+
+ <test name="org.jboss.portal.test.selenium.cms.CMSDirectoryTestCase"
+ verbose="2" annotations="JDK">
+ <classes>
+ <class name="org.jboss.portal.test.selenium.cms.CMSDirectoryTestCase"></class></classes>
+ </test>
+
+ <test name="org.jboss.portal.test.selenium.cms.CMSFileUploadTestCase"
+ verbose="2" annotations="JDK">
+ <classes>
+ <class name="org.jboss.portal.test.selenium.cms.CMSFileUploadTestCase"></class></classes>
+ </test>
+
+ <test name="org.jboss.portal.test.selenium.cms.CMSArchiveUploadTestCase"
+ verbose="2" annotations="JDK">
+ <classes>
+ <class name="org.jboss.portal.test.selenium.cms.CMSArchiveUploadTestCase"></class></classes>
+ </test>
+
+<listeners>
+ <listener class-name="org.jboss.portal.test.selenium.JBossSeleniumTestListener"/>
+</listeners>
+</suite>
14 years, 11 months
JBoss Portal SVN: r13395 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-05-20 06:27:45 -0400 (Wed, 20 May 2009)
New Revision: 13395
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/assert.properties
Log:
[selenium] - identity admin fix
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2009-05-20 09:43:03 UTC (rev 13394)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2009-05-20 10:27:45 UTC (rev 13395)
@@ -15,6 +15,8 @@
@Test(groups = { "admin_ui" }, enabled = true)
public class IdentityAdminTestCase extends JBossPortalSeleniumTestCase {
+
+
/** prefix for locator properties */
public String casePfx = "iden.man.";
@@ -83,6 +85,7 @@
private final String CHK_ROLE = getLoc(casePfx + "chk.role", "//input[contains(@name,''assign-roles-form:roles'') and @value=''{0}'']");
+ private final String MSG_CREATE_ROLE = getMess(casePfx + "chk.role", "Create role");
/** The timeout used to wait after clicking submit button in user search. */
public final long SEARCH_TIMEOUT = 10000;
@@ -751,7 +754,7 @@
clickIfVisible(LNK_ROLEMAIN);
Assert.assertTrue(selenium.isElementPresent(LNK_ROLE_CREATE), "Button for role creating has wrong id or doesn't exist.");
- Assert.assertEquals(selenium.getText(LNK_ROLE_CREATE), "Create role", "Button for role creating has wrong label.");
+ Assert.assertEquals(selenium.getText(LNK_ROLE_CREATE), MSG_CREATE_ROLE, "Button for role creating has wrong label.");
selenium.click(LNK_ROLE_CREATE);
selenium.waitForPageToLoad(PAGE_LOAD);
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/assert.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/assert.properties 2009-05-20 09:43:03 UTC (rev 13394)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/assert.properties 2009-05-20 10:27:45 UTC (rev 13395)
@@ -2,6 +2,7 @@
selenium.timeout.ajax=3000
selenium.timeout.elem=220
+iden.man.chk.role=Create new role
cms.sec.denied=You are not allowed to access the resource
14 years, 11 months