JBoss Portal SVN: r12394 - 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: 2008-12-16 11:48:07 -0500 (Tue, 16 Dec 2008)
New Revision: 12394
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/UserLoginTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml
Log:
turning on portlet definition and portlet instace tests
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 2008-12-16 15:48:10 UTC (rev 12393)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2008-12-16 16:48:07 UTC (rev 12394)
@@ -34,8 +34,9 @@
@BeforeClass
public void setupChromeForLogin() throws Exception {
String browser = System.getProperty("browser");
- //String browser ="*firefox /usr/lib64/firefox-3.0.1/firefox";
+
selenium = new DefaultSelenium("127.0.0.1", 44444, browser, "http://localhost:8080/portal/");
+
JBossSeleniumTestListener.selenium = selenium;
selenium.start();
selenium.setTimeout(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 2008-12-16 15:48:10 UTC (rev 12393)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserLoginTestCase.java 2008-12-16 16:48:07 UTC (rev 12394)
@@ -60,7 +60,7 @@
public void testAdminLogin() throws Exception {
selenium.open("/portal");
selenium.waitForPageToLoad(PAGE_LOAD);
-
+ waitForElement("link=Login");
Assert.assertTrue(selenium.isElementPresent("link=Login"), "Expected DOM element for login link does not exist.");
Assert.assertEquals(selenium.getText("link=Login"), "Login", "Login button doesn't exist.");
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java 2008-12-16 15:48:10 UTC (rev 12393)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java 2008-12-16 16:48:07 UTC (rev 12394)
@@ -61,6 +61,20 @@
}
@Test(enabled = true)
+ public void testCreateInstanceUncommonName(){
+
+ int r = findTableRow(TABLE_PORTLET, "Administration Portlet", 0);
+
+ selenium.click(MessageFormat.format(T_LINK_CREATE,r-1));
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ selenium.type(INPUT_INSTANCE_NAME, "str.nge.n.me");
+ selenium.click(SUBMIT_CREATE_INST);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ Assert.assertTrue(selenium.isTextPresent("littleAdmin portlet details"));
+ }
+
+ @Test(enabled = true)
public void testPreferences(){
int r = findTableRow(TABLE_PORTLET, "Current Users Portlet", 0);
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2008-12-16 15:48:10 UTC (rev 12393)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2008-12-16 16:48:07 UTC (rev 12394)
@@ -10,35 +10,36 @@
public class PortletInstancesTestCase extends JBossPortalSeleniumTestCase {
- private static final String SUBMIT_SECURITY_UPDATE = "common-edit-security-form:update";
- private static final String SUBMIT_SECURITY_CANCEL = "common-edit-security-form:cancel";
+ private static final String SUBMIT_SECURITY_UPDATE = "//input[contains(@id,'common-edit-security-form:update')]";
+ private static final String SUBMIT_SECURITY_CANCEL = "//input[contains(@id,'common-edit-security-form:cancel')]";
- private static final String LINK_PREF_WELCOMEPORT = "instances-form:security-JSPPortletInstance";
+ private static final String LINK_20_PAGE = "link=20";
+ private static final String LINK_PREF_WELCOMEPORT = "//a[contains(@id,'security-JSPPortletInstance')]";
- private static final String TABLE_PREF_KEY = "//form[@id='common-edit-pref-form']/table";
+ private static final String TABLE_PREF_KEY = "//form[contains(@id,'common-edit-pref-form')]/table";
- private static final String SUBMIT_PREF_DELETE = "common-edit-exisiting-form:row_0";
- private static final String LINK_PREF_GUESTNUM = "common-edit-pref-form:pref-link-0";
- private static final String INPUT_PREF_NEWVAL = "common-append-form:new_value";
- private static final String SUBMIT_PREF_UPDATE = "common-append-form:append-button";
- private static final String SUBMIT_PREF_SAVE = "_id919jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:save";
- private static final String INPUT_PREF_UPDATE = "common-edit-exisiting-form:update";
- private static final String INPUT_PREF_APPEND = "common-edit-exisiting-form:pref-input-0";
- private static final String SUBMIT_PREF_CANCEL = "_id458jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:cancel";
- private static final String LINK_CURUSER_PREFERENCES = "instances-form:preference-CurrentUsersPortletInstance";
- private static final String LINK_DEL_EXCEPTPORT = "instances-form:delete-ExceptionPortletInstance";
- private static final String SUBMIT_PI_DELETE_CONF = "confirm-delete-form1:delete";
- private static final String SUBMIT_PI_DELETE_CANC = "confirm-delete-form1:cancel";
- private static final String T_LINK_DELETENAME = "displaynamecontainer:instance-display-form:locale-data-table:{0}:delete-link";
- private static final String T_LINK_MODIFYNAME = "displaynamecontainer:instance-display-form:locale-data-table:{0}:edit-link";
- private static final String LINK_COUNTPORT = "instances-form:CounterPortletInstance";
- private static final String SUBMIT_MODIFY_NAME = "displaynamecontainer:displayNameForm:addDisplay";
- private static final String INPUT_NAME = "displaynamecontainer:displayNameForm:newName";
- private static final String SELECT_LANGUAGE = "displaynamecontainer:displayNameForm:locales";
+ private static final String SUBMIT_PREF_DELETE = "//input[contains(@id,'common-edit-exisiting-form:row_0')]";
+ private static final String LINK_PREF_GUESTNUM = "//a[contains(@id,'common-edit-pref-form:pref-link-0')]";
+ private static final String INPUT_PREF_NEWVAL = "//input[contains(@id,'common-append-form:new_value')]";
+ private static final String SUBMIT_PREF_UPDATE = "//input[contains(@id,'common-append-form:append-button')]";
+ private static final String SUBMIT_PREF_SAVE = "//input[contains(@id,':save')]";
+ private static final String INPUT_PREF_UPDATE = "//input[contains(@id,'common-edit-exisiting-form:update')]";
+ private static final String INPUT_PREF_APPEND = "//input[contains(@id,'common-edit-exisiting-form:pref-input-0')]";
+ private static final String SUBMIT_PREF_CANCEL = "//input[contains(@id,':cancel')]";
+ private static final String LINK_CURUSER_PREFERENCES = "//a[contains(@id,'instances-form:preference-CurrentUsersPortletInstance')]";
+ private static final String LINK_DEL_EXCEPTPORT = "//a[contains(@id,'instances-form:delete-ExceptionPortletInstance')]";
+ private static final String SUBMIT_PI_DELETE_CONF = "//input[contains(@id,'confirm-delete-form1:delete')]";
+ private static final String SUBMIT_PI_DELETE_CANC = "//input[contains(@id,'confirm-delete-form1:cancel')]";
+ private static final String T_LINK_DELETENAME = "//a[contains(@id,''instance-display-form:locale-datatable:{0}:delete-link'')]";
+ private static final String T_LINK_MODIFYNAME = "//a[contains(@id,''instance-display-form:locale-datatable:{0}:edit-link'')]";
+ private static final String LINK_COUNTPORT = "//a[contains(@id,'instances-form:CounterPortletInstance')]";
+ private static final String SUBMIT_MODIFY_NAME = "//input[contains(@id,'add-display-name-form:addDisplay')]";
+ private static final String INPUT_NAME = "//input[contains(@id,'add-display-name-form:newName')]";
+ private static final String SELECT_LANGUAGE = "//select[contains(@id,'add-display-name-form:locales')]";
private static final String LINK_ADMIN = "link=Admin";
- private static final String LINK_TAB_PI = "admin-subtab-form:portlet-instance-link";
- private static final String LINK_PI_MAIN = "instance-form1:instance-link";
- private static final String TABLE_DISPNAMES = "displaynamecontainer:instance-display-form:locale-data-table";
+ private static final String LINK_TAB_PI = "//a[contains(@id,'admin-subtab-form:portlet-instance-link')]";
+ private static final String LINK_PI_MAIN = "//a[contains(@id,'instance-form1:instance-link')]";
+ private static final String TABLE_DISPNAMES = "//table[contains(@id,'instance-display-form:locale-datatable')]";
@BeforeMethod(groups = { "log" })
public void loginBeforeTest() {
@@ -52,8 +53,18 @@
}
+ @Test(enabled=true)
+ public void testGo()
+ {
+ selenium.setSpeed("2000");
+ goToPI();
+ Assert.assertTrue(selenium.isTextPresent("CoordinationPublicParametersPortletInstance1"));
+ }
+
@Test(enabled = true)
public void testAddName() {
+ //selenium.click(LINK_20_PAGE);
+ //selenium.waitForPageToLoad(PAGE_LOAD);
clickAndWait(LINK_COUNTPORT);
safeSelect(SELECT_LANGUAGE, "Czech");
@@ -87,6 +98,8 @@
@Test(enabled = true)
public void testModifyName() {
// adding the name
+// selenium.click(LINK_20_PAGE);
+// selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_COUNTPORT);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.select(SELECT_LANGUAGE, "label=Japanese");
@@ -113,15 +126,16 @@
@Test(enabled = true)
public void testSecure() {
- // "common-edit-security-form:cancel"
+ selenium.click(LINK_20_PAGE);
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_PREF_WELCOMEPORT);
selenium.waitForPageToLoad("30000");
- selenium.click("//input[@name='common-edit-security-form:cars_2']");
- selenium.click("//input[@name='common-edit-security-form:cars_1']");
- selenium.click("//input[@name='common-edit-security-form:cars_0']");
- selenium.click("//input[@name='common-edit-security-form:cars_0' and @value='admin']");
- selenium.click("//input[@name='common-edit-security-form:cars_1' and @value='admin']");
- selenium.click("//input[@name='common-edit-security-form:cars_2' and @value='admin']");
+ selenium.click("//input[contains(@name,'common-edit-security-form:cars_2')]");
+ selenium.click("//input[contains(@name,'common-edit-security-form:cars_1')]");
+ selenium.click("//input[contains(@name,'common-edit-security-form:cars_0')]");
+ selenium.click("//input[contains(@name,'common-edit-security-form:cars_0') and @value='admin']");
+ selenium.click("//input[contains(@name,'common-edit-security-form:cars_1') and @value='admin']");
+ selenium.click("//input[contains(@name,'common-edit-security-form:cars_2') and @value='admin']");
selenium.click(SUBMIT_SECURITY_UPDATE);
selenium.waitForPageToLoad("30000");
@@ -130,15 +144,17 @@
Assert.assertTrue(selenium.isTextPresent("Greetings !"));
// then cancel
- selenium.click("link=Admin");
- selenium.waitForPageToLoad("30000");
+
+ goToPI();
+ selenium.click(LINK_20_PAGE);
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_PREF_WELCOMEPORT);
selenium.waitForPageToLoad("30000");
- selenium.click("//input[@name='common-edit-security-form:cars_0']");
- selenium.click("//input[@name='common-edit-security-form:cars_1' and @value='admin']");
- selenium.click("//input[@name='common-edit-security-form:cars_0' and @value='admin']");
- selenium.click("//input[@name='common-edit-security-form:cars_2' and @value='admin']");
- selenium.click("//input[@name='common-edit-security-form:cars_1']");
+ selenium.click("//input[contains(@name,'common-edit-security-form:cars_0')]");
+ selenium.click("//input[contains(@name,'common-edit-security-form:cars_1') and @value='admin']");
+ selenium.click("//input[contains(@name,'common-edit-security-form:cars_0') and @value='admin']");
+ selenium.click("//input[contains(@name,'common-edit-security-form:cars_2') and @value='admin']");
+ selenium.click("//input[contains(@name,'common-edit-security-form:cars_1')]");
selenium.click(SUBMIT_SECURITY_CANCEL);
selenium.waitForPageToLoad("30000");
selenium.open("/portal/auth/portal/default/");
@@ -146,15 +162,16 @@
Assert.assertTrue(selenium.isTextPresent("Greetings !"));
// then really stop the greetings portlet
- selenium.click("link=Admin");
- selenium.waitForPageToLoad("30000");
+ goToPI();
+ selenium.click(LINK_20_PAGE);
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_PREF_WELCOMEPORT);
selenium.waitForPageToLoad("30000");
- selenium.click("//input[@name='common-edit-security-form:cars_0']");
- selenium.click("//input[@name='common-edit-security-form:cars_1' and @value='admin']");
- selenium.click("//input[@name='common-edit-security-form:cars_0' and @value='admin']");
- selenium.click("//input[@name='common-edit-security-form:cars_2' and @value='admin']");
- selenium.click("//input[@name='common-edit-security-form:cars_1']");
+ selenium.click("//input[contains(@name='common-edit-security-form:cars_0')]");
+ selenium.click("//input[contains(@name='common-edit-security-form:cars_1') and @value='admin']");
+ selenium.click("//input[contains(@name='common-edit-security-form:cars_0') and @value='admin']");
+ selenium.click("//input[contains(@name='common-edit-security-form:cars_2') and @value='admin']");
+ selenium.click("//input[contains(@name='common-edit-security-form:cars_1')]");
selenium.click(SUBMIT_SECURITY_UPDATE);
selenium.waitForPageToLoad("30000");
@@ -188,6 +205,8 @@
@Test(enabled = true)
public void testPreferences() {
int r;
+ // selenium.click(LINK_20_PAGE);
+ // selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_CURUSER_PREFERENCES);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(SUBMIT_PREF_CANCEL);
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml 2008-12-16 15:48:10 UTC (rev 12393)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml 2008-12-16 16:48:07 UTC (rev 12394)
@@ -1,6 +1,6 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
<suite name="SeleniumTest">
-
+
<test verbose="2" name="org.jboss.portal.test.selenium.UserLoginTestCase" annotations="JDK">
<classes>
<class name="org.jboss.portal.test.selenium.UserLoginTestCase"/>
@@ -27,7 +27,7 @@
<classes>
<class name="org.jboss.portal.test.selenium.UserInterceptorPortletTestCase"></class></classes>
</test>
-
+
<test name="org.jboss.portal.test.selenium.cms.CMSFileTestCase"
verbose="2" annotations="JDK">
<classes>
@@ -69,6 +69,18 @@
<classes>
<class name="org.jboss.portal.test.selenium.portal.AdminPortalTestCase"></class></classes>
</test>
+
+ <test name="org.jboss.portal.test.selenium.portal.PortletDefinitionsTestCase"
+ verbose="2" annotations="JDK">
+ <classes>
+ <class name="org.jboss.portal.test.selenium.portal.PortletDefinitionsTestCase"></class></classes>
+ </test>
+
+ <test name="org.jboss.portal.test.selenium.portal.PortletInstancesTestCase"
+ verbose="2" annotations="JDK">
+ <classes>
+ <class name="org.jboss.portal.test.selenium.portal.PortletInstancesTestCase"></class></classes>
+ </test>
<listeners>
<!-- <listener class-name="org.testng.reporters.JUnitXMLReporter"></listener> -->
17 years, 5 months
JBoss Portal SVN: r12393 - modules/common/trunk/common/src/main/java/org/jboss/portal/common/p3p.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-12-16 10:48:10 -0500 (Tue, 16 Dec 2008)
New Revision: 12393
Modified:
modules/common/trunk/common/src/main/java/org/jboss/portal/common/p3p/P3PConstants.java
Log:
- Added constants for JSR-286.
Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/p3p/P3PConstants.java
===================================================================
--- modules/common/trunk/common/src/main/java/org/jboss/portal/common/p3p/P3PConstants.java 2008-12-16 04:46:13 UTC (rev 12392)
+++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/p3p/P3PConstants.java 2008-12-16 15:48:10 UTC (rev 12393)
@@ -140,8 +140,19 @@
* User information attribute names (PLT.D in the portlet spec) that are defined in P3P spec.
*/
- //
+ // User info
public static final String INFO_USER_BDATE = "user.bdate";
+ private static final String INFO_USER_BDATE_YMD = INFO_USER_BDATE + ".ymd";
+ public static final String INFO_USER_BDATE_YMD_YEAR = INFO_USER_BDATE_YMD + ".year";
+ public static final String INFO_USER_BDATE_YMD_MONTH = INFO_USER_BDATE_YMD + ".month";
+ public static final String INFO_USER_BDATE_YMD_DAY = INFO_USER_BDATE_YMD + ".day";
+ private static final String INFO_USER_BDATE_HMS = INFO_USER_BDATE + ".hms";
+ public static final String INFO_USER_BDATE_HMS_HOUR = INFO_USER_BDATE_HMS + ".hour";
+ public static final String INFO_USER_BDATE_HMS_MINUTE = INFO_USER_BDATE_HMS + ".minute";
+ public static final String INFO_USER_BDATE_HMS_SECOND = INFO_USER_BDATE_HMS + ".second";
+ public static final String INFO_USER_BDATE_FRACTIONSECOND = INFO_USER_BDATE + ".fractionsecond";
+ public static final String INFO_USER_BDATE_TIMEZONE = INFO_USER_BDATE + ".timezone";
+
public static final String INFO_USER_GENDER = "user.gender";
public static final String INFO_USER_EMPLOYER = "user.employer";
public static final String INFO_USER_DEPARTMENT = "user.department";
@@ -152,6 +163,7 @@
public static final String INFO_USER_NAME_MIDDLE = "user.name.middle";
public static final String INFO_USER_NAME_SUFFIX = "user.name.suffix";
public static final String INFO_USER_NAME_NICKNAME = "user.name.nickName";
+ public static final String INFO_USER_LOGIN_ID = "user.login.id";
// User home
private static final String INFO_USER_HOME_PREFIX = "user.home-info.";
17 years, 5 months