JBoss Portal SVN: r13674 - branches/Enterprise_Portal_Platform_4_3/theme/src/main/org/jboss/portal/test/theme/tmp.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-08-05 07:53:16 -0400 (Wed, 05 Aug 2009)
New Revision: 13674
Modified:
branches/Enterprise_Portal_Platform_4_3/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java
Log:
Eclipse bug ;)
Modified: branches/Enterprise_Portal_Platform_4_3/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java 2009-08-05 11:52:55 UTC (rev 13673)
+++ branches/Enterprise_Portal_Platform_4_3/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java 2009-08-05 11:53:16 UTC (rev 13674)
@@ -327,7 +327,6 @@
return null; //To change body of implemented methods use File | Settings | File Templates.
}
- @Override
public String getContextPath()
{
return null;
16 years, 9 months
JBoss Portal SVN: r13673 - tags/Enterprise_Portal_Platform_4_3_GA_CP02/theme/src/main/org/jboss/portal/test/theme/tmp.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-08-05 07:52:55 -0400 (Wed, 05 Aug 2009)
New Revision: 13673
Modified:
tags/Enterprise_Portal_Platform_4_3_GA_CP02/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java
Log:
Eclipse bug ;)
Modified: tags/Enterprise_Portal_Platform_4_3_GA_CP02/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java
===================================================================
--- tags/Enterprise_Portal_Platform_4_3_GA_CP02/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java 2009-08-05 11:48:57 UTC (rev 13672)
+++ tags/Enterprise_Portal_Platform_4_3_GA_CP02/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java 2009-08-05 11:52:55 UTC (rev 13673)
@@ -327,7 +327,6 @@
return null; //To change body of implemented methods use File | Settings | File Templates.
}
- @Override
public String getContextPath()
{
return null;
16 years, 9 months
JBoss Portal SVN: r13672 - tags/Enterprise_Portal_Platform_4_3_GA_CP02/theme/src/main/org/jboss/portal/test/theme/tmp.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-08-05 07:48:57 -0400 (Wed, 05 Aug 2009)
New Revision: 13672
Modified:
tags/Enterprise_Portal_Platform_4_3_GA_CP02/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java
Log:
Upgrade to Servlet 2.5
Modified: tags/Enterprise_Portal_Platform_4_3_GA_CP02/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java
===================================================================
--- tags/Enterprise_Portal_Platform_4_3_GA_CP02/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java 2009-08-05 11:46:14 UTC (rev 13671)
+++ tags/Enterprise_Portal_Platform_4_3_GA_CP02/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java 2009-08-05 11:48:57 UTC (rev 13672)
@@ -326,6 +326,12 @@
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+
+ @Override
+ public String getContextPath()
+ {
+ return null;
+ }
}
16 years, 9 months
JBoss Portal SVN: r13671 - branches/Enterprise_Portal_Platform_4_3/theme/src/main/org/jboss/portal/test/theme/tmp.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-08-05 07:46:14 -0400 (Wed, 05 Aug 2009)
New Revision: 13671
Modified:
branches/Enterprise_Portal_Platform_4_3/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java
Log:
Upgrade to Servlet 2.5
Modified: branches/Enterprise_Portal_Platform_4_3/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java 2009-08-05 10:26:27 UTC (rev 13670)
+++ branches/Enterprise_Portal_Platform_4_3/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java 2009-08-05 11:46:14 UTC (rev 13671)
@@ -326,6 +326,12 @@
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+
+ @Override
+ public String getContextPath()
+ {
+ return null;
+ }
}
16 years, 9 months
JBoss Portal SVN: r13670 - tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-08-05 06:26:27 -0400 (Wed, 05 Aug 2009)
New Revision: 13670
Added:
tags/Enterprise_Portal_Platform_4_3_GA_CP02/
Log:
Taggin EPP 4.3 CP02
Copied: tags/Enterprise_Portal_Platform_4_3_GA_CP02 (from rev 13669, branches/Enterprise_Portal_Platform_4_3)
16 years, 9 months
JBoss Portal SVN: r13669 - branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-sar/conf/hibernate/workflow.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-08-05 05:47:56 -0400 (Wed, 05 Aug 2009)
New Revision: 13669
Modified:
branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml
Log:
jbpm changed their Hibernate mapping location
Modified: branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml 2009-08-05 09:22:53 UTC (rev 13668)
+++ branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml 2009-08-05 09:47:56 UTC (rev 13669)
@@ -21,6 +21,7 @@
<property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
<!-- managed environment transaction configuration -->
+
<property
name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
<property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
@@ -43,9 +44,7 @@
<!-- want to use the jBPM identity mgmgt -->
<!-- component. -->
<!-- identity mappings (begin) -->
- <mapping resource="org/jbpm/identity/User.hbm.xml"/>
- <mapping resource="org/jbpm/identity/Group.hbm.xml"/>
- <mapping resource="org/jbpm/identity/Membership.hbm.xml"/>
+ <mapping resource="hibernate.identity.hbm.xml"/>
<!-- identity mappings (end) -->
<!-- following mapping files have a dependendy on -->
16 years, 9 months
JBoss Portal SVN: r13668 - in branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests: src/org/jboss/portal/test/selenium and 1 other directory.
by portal-commits＠lists.jboss.org
Author: mposolda(a)redhat.com
Date: 2009-08-05 05:22:53 -0400 (Wed, 05 Aug 2009)
New Revision: 13668
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/JBossPortalSeleniumTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/LdapIdentityAdminTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties
Log:
Refactoring. Selenium tests with Ldap and HTTPS.
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-08-05 09:20:20 UTC (rev 13667)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-08-05 09:22:53 UTC (rev 13668)
@@ -39,6 +39,7 @@
<!-- Default properties for single-test-without-dependencies -->
<property name="suite.test.name" value="Ant test" />
+ <property name="browser.url" value="http://localhost:8080/portal/" />
<path id="jboss.test.classpath">
<pathelement path="${jboss.test.jar}" />
@@ -113,6 +114,13 @@
</target>
<target name="run-src">
+ <!-- Only one call is performed -->
+ <antcall target="run-src-without-ssl" />
+ <antcall target="run-src-with-ssl" />
+ </target>
+
+ <!-- RUNNING SELENIUM SERVER FOR NORMAL TESTING -->
+ <target name="run-src-without-ssl" unless="https.flag">
<echo message="Starting Selenium Remote Control" />
<java jar="${selsrv.dir}/selenium-server.jar" fork="true" spawn="true">
<arg value="-multiWindow" />
@@ -125,25 +133,30 @@
<arg value="-debug" />
<arg value="-userExtensions" />
<arg value="${selsrv.dir}/user-extensions.js" />
- </java>
+ </java>
<sleep seconds="20" />
</target>
- <target name="run-src-with-ssl">
- <echo message="Starting Selenium Remote Control with usage of HTTPS" />
+ <!-- RUNNING SELENIUM SERVER FOR HTTPS TESTING -->
+ <target name="run-src-with-ssl" if="https.flag">
+ <echo message="Starting Selenium Remote Control for testing with HTTPS" />
<java jar="${selsrv.dir}/selenium-server.jar" fork="true" spawn="true">
<arg value="-trustAllSSLCertificates" />
<arg value="-multiWindow" />
+ <arg value="-timeout" />
+ <arg value="320000" />
<arg value="-port" />
<arg value="44444" />
<arg value="-log" />
<arg value="selenium.log" />
<arg value="-debug" />
+ <arg value="-firefoxProfileTemplate" />
+ <arg value="${selsrv.dir}/https-testing/localhost/SSLFirefoxProfile" />
<arg value="-userExtensions" />
- <arg value="${selsrv.dir}/user-extensions.js" />
+ <arg value="${selsrv.dir}/user-extensions.js" />
</java>
<sleep seconds="20" />
- </target>
+ </target>
<target name="stop-src">
<get taskname="selenium-shutdown" src="http://localhost:44444/selenium-server/driver/?cmd=shutDown" dest="result.txt" ignoreerrors="true" />
@@ -212,6 +225,7 @@
<xmlfileset dir="." includes="${user.suite}" />
<sysproperty key="browser" value="${browser}" />
+ <sysproperty key="browser.url" value="${browser.url}" />
<sysproperty key="screenshot" value="${screenshot}" />
<sysproperty key="debug" value="${debug}" />
<sysproperty key="workspace" value="${workspace}" />
@@ -235,6 +249,7 @@
<xmlfileset dir="." includes="${test.suite}" />
<sysproperty key="browser" value="${browser}" />
+ <sysproperty key="browser.url" value="${browser.url}" />
<sysproperty key="screenshot" value="${screenshot}" />
<sysproperty key="debug" value="${debug}" />
<sysproperty key="workspace" value="${workspace}" />
@@ -258,6 +273,7 @@
<classfileset dir="${test.build.dir}" includes="${testname}" />
<sysproperty key="browser" value="${browser}" />
+ <sysproperty key="browser.url" value="${browser.url}" />
<sysproperty key="screenshot" value="${screenshot}" />
<sysproperty key="debug" value="${debug}" />
<sysproperty key="workspace" value="${workspace}" />
@@ -280,6 +296,7 @@
<classfileset dir="${test.build.dir}" includes="${testname}" />
<sysproperty key="browser" value="${browser}" />
+ <sysproperty key="browser.url" value="${browser.url}" />
<sysproperty key="screenshot" value="${screenshot}" />
<sysproperty key="debug" value="${debug}" />
<sysproperty key="workspace" value="${workspace}" />
@@ -303,6 +320,7 @@
<xmlfileset dir="." includes="${test.suite}" />
<sysproperty key="browser" value="${browser}" />
+ <sysproperty key="browser.url" value="${browser.url}" />
<sysproperty key="screenshot" value="${screenshot}" />
<sysproperty key="debug" value="${debug}" />
<sysproperty key="workspace" value="${workspace}" />
@@ -326,6 +344,7 @@
<xmlfileset dir="." includes="${test.cms.suite}" />
<sysproperty key="browser" value="${browser}" />
+ <sysproperty key="browser.url" value="${browser.url}" />
<sysproperty key="screenshot" value="${screenshot}" />
<sysproperty key="debug" value="${debug}" />
<sysproperty key="workspace" value="${workspace}" />
@@ -350,6 +369,7 @@
<xmlfileset dir="." includes="${usecase.suite}" />
<sysproperty key="browser" value="${browser}" />
+ <sysproperty key="browser.url" value="${browser.url}" />
<sysproperty key="screenshot" value="${screenshot}" />
<sysproperty key="debug" value="${debug}" />
<sysproperty key="workspace" value="${workspace}" />
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-08-05 09:20:20 UTC (rev 13667)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2009-08-05 09:22:53 UTC (rev 13668)
@@ -76,9 +76,12 @@
ELEM_TIMEOUT = Integer.valueOf(getMess("selenium.timeout.elem", String.valueOf(ELEM_TIMEOUT+"")));
String browser = System.getProperty("browser");
+ String browserURL = System.getProperty("browser.url");
+ if ((browserURL == null) || ("".equals(browserURL))) {
+ browserURL = "http://localhost:8080/portal/";
+ }
+ selenium = new DefaultSelenium("127.0.0.1", 44444, browser, browserURL);
- 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/LdapIdentityAdminTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/LdapIdentityAdminTestCase.java 2009-08-05 09:20:20 UTC (rev 13667)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/LdapIdentityAdminTestCase.java 2009-08-05 09:22:53 UTC (rev 13668)
@@ -31,6 +31,12 @@
private final String LDAP_ROLE_NAME = "Ldap";
+ private final String INP_PROFILE_GIVENNAME = getLoc(casePfx + "inp.profile.givenname", "//input[contains(@id,'profile-form:givenname')]");
+ private final String INP_PROFILE_FAMILYNAME = getLoc(casePfx + "inp.profile.familyname", "//input[contains(@id,'profile-form:familyname')]");
+ private final String INP_PROFILE_EXTRA = getLoc(casePfx + "inp.profile.extra", "//textarea[contains(@id,'profile-form:extra')]");
+ private final String INP_PROFILE_HOMEPAGE = getLoc(casePfx + "inp.profile.homepage", "//input[contains(@id,'profile-form:homepage')]");
+ private final String INP_PROFILE_LOCATION = getLoc(casePfx + "inp.profile.location", "//input[contains(@id,'profile-form:location')]");
+
/**
* <p>User (tempUser, tempPassword, tempUser(a)redhat.com) and role (tempRole,
* tempRoleDisplay) are created. The role is assigned to the user and it is
@@ -103,6 +109,25 @@
// Go to edit page and check user profile
goToEdit(LDAP1_USER, LDAP1_USER_MAIL);
// TODO: add localizators while they will be added to IdentityAdminTestCase.
+ Assert.assertTrue(selenium.getValue(INP_PROFILE_GIVENNAME).equals(LDAP1_FIRST_NAME), "First name should be " + LDAP1_FIRST_NAME + " but is " + selenium.getValue(INP_PROFILE_GIVENNAME));
+ Assert.assertTrue(selenium.getValue(INP_PROFILE_FAMILYNAME).equals(LDAP1_SURNAME), "Surname should be " + LDAP1_SURNAME + " but is " + selenium.getValue(INP_PROFILE_FAMILYNAME));
+ Assert.assertTrue(selenium.getValue(INP_PROFILE_LOCATION).contains("Brno, Czechue Republic"), "Location should contains Brno,Czechue Republic but is " + selenium.getValue(INP_PROFILE_LOCATION));
+ Assert.assertTrue(selenium.getValue(INP_PROFILE_EXTRA).contains("This is content of ldap attribute \"description\""), "Description has value " + selenium.getValue(INP_PROFILE_EXTRA));
+
+ // fill some attributes (homepage should be DB attribute and givenname should be LDAP attribute) and check them.
+ selenium.type(INP_PROFILE_GIVENNAME, "Jack");
+ selenium.type(INP_PROFILE_HOMEPAGE, "http://www.jboss.org/jbossportal");
+ clickAndWait(SUB_EDIT_PROF);
+ goToEdit(LDAP1_USER, LDAP1_USER_MAIL);
+ Assert.assertTrue(selenium.getValue(INP_PROFILE_GIVENNAME).equals("Jack"), "First name should be Jack but is " + selenium.getValue(INP_PROFILE_GIVENNAME));
+ Assert.assertTrue(selenium.getValue(INP_PROFILE_HOMEPAGE).equals("http://www.jboss.org/jbossportal"), "Homepage should be http://www.jboss.org/jbossportal but is " + selenium.getValue(INP_PROFILE_HOMEPAGE));
+ // Change name to the original value
+ selenium.type(INP_PROFILE_GIVENNAME, LDAP1_FIRST_NAME);
+ clickAndWait(SUB_EDIT_PROF);
+
+ // Go to edit page and check user profile
+ goToEdit(LDAP1_USER, LDAP1_USER_MAIL);
+ // TODO: add localizators while they will be added to IdentityAdminTestCase.
Assert.assertTrue(selenium.getValue("//input[contains(@id,'profile-form:givenname')]").equals(LDAP1_FIRST_NAME), "First name should be " + LDAP1_FIRST_NAME + " but is " + selenium.getValue("//input[contains(@id,'profile-form:givenname')]"));
Assert.assertTrue(selenium.getValue("//input[contains(@id,'profile-form:familyname')]").equals(LDAP1_SURNAME), "Surname should be " + LDAP1_SURNAME + " but is " + selenium.getValue("//input[contains(@id,'profile-form:familyname')]"));
Assert.assertTrue(selenium.getValue("//input[contains(@id,'profile-form:location')]").contains("Brno, Czechue Republic"), "Location should contains Brno,Czechue Republic but is " + selenium.getValue("//input[contains(@id,'profile-form:location')]"));
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-08-05 09:20:20 UTC (rev 13667)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-08-05 09:22:53 UTC (rev 13668)
@@ -74,6 +74,11 @@
iden.man.lnk.usermang.main2=//a[contains(@id,'user-temp-form1:user-mgm-link')]
iden.man.lnk.create.user=//a[contains(@id,':user-form:create-user-link')]
iden.man.chk.role=//input[contains(@name,''assign-roles-form:roles'') and @value=''{0}'']
+iden.man.inp.profile.givenname=//input[contains(@id,'profile-form:givenname')]
+iden.man.inp.profile.familyname=//input[contains(@id,'profile-form:familyname')]
+iden.man.inp.profile.extra=//textarea[contains(@id,'profile-form:extra')]
+iden.man.inp.profile.homepage=//input[contains(@id,'profile-form:homepage')]
+iden.man.inp.profile.location=//input[contains(@id,'profile-form:location')]
# DashboardTestCase
16 years, 9 months
JBoss Portal SVN: r13667 - branches/Enterprise_Portal_Platform_4_3/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-08-05 05:20:20 -0400 (Wed, 05 Aug 2009)
New Revision: 13667
Modified:
branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml
Log:
Removed unused dependency
Modified: branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml 2009-08-05 09:19:07 UTC (rev 13666)
+++ branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml 2009-08-05 09:20:20 UTC (rev 13667)
@@ -103,7 +103,6 @@
<componentref name="jbossas/core-libs" version="4.0.4.GA"/>
<componentref name="jboss/aop" version="1.5.5.GA_CP03-brew"/>
<componentref name="jboss/cache" version="1.4.1.SP13-brew"/>
- <componentref name="jboss/jbossretro-rt" version="1.0.3.GA"/>
<componentref name="jboss/jbossws" version="2.0.1.SP2"/>
<componentref name="jboss/jbossxb" version="1.0.0.SP3-brew"/>
<componentref name="jboss/microcontainer" version="1.0.2-brew"/>
16 years, 9 months
JBoss Portal SVN: r13666 - branches/Enterprise_Portal_Platform_4_3/workflow/src/resources/portal-workflow-sar/META-INF.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-08-05 05:19:07 -0400 (Wed, 05 Aug 2009)
New Revision: 13666
Modified:
branches/Enterprise_Portal_Platform_4_3/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml
Log:
Change the persistence factory
Modified: branches/Enterprise_Portal_Platform_4_3/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml 2009-08-05 08:54:14 UTC (rev 13665)
+++ branches/Enterprise_Portal_Platform_4_3/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml 2009-08-05 09:19:07 UTC (rev 13666)
@@ -52,7 +52,7 @@
<![CDATA[
<jbpm-configuration>
<jbpm-context>
- <service name="persistence" factory="org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory" />
+ <service name="persistence" factory="org.jbpm.persistence.db.DbPersistenceServiceFactory" />
<service name="scheduler" factory="org.jbpm.scheduler.db.DbSchedulerServiceFactory" />
<service name="message" factory="org.jbpm.msg.db.DbMessageServiceFactory" />
<service name="tx" factory="org.jbpm.tx.TxServiceFactory"/>
16 years, 9 months
JBoss Portal SVN: r13665 - branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium.
by portal-commits＠lists.jboss.org
Author: mposolda(a)redhat.com
Date: 2009-08-05 04:54:14 -0400 (Wed, 05 Aug 2009)
New Revision: 13665
Modified:
branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/LdapIdentityAdminTestCase.java
branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties
Log:
Refactoring and fix test failures in epp ldap identity selenium test.
Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2009-08-04 19:30:33 UTC (rev 13664)
+++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2009-08-05 08:54:14 UTC (rev 13665)
@@ -108,14 +108,20 @@
return MessageFormat.format(LNK_T_USRLIST_ROLES, r - 1);
}
+ /**
+ * This method shouldn't be private because of subclasses of IdentityAdminTestCase
+ */
@BeforeMethod(groups = { "log" })
- private void loginBeforeTest() {
+ protected void loginBeforeTest() {
logoutIfPossible();
login("admin", "admin");
}
+ /**
+ * This method shouldn't be private because of subclasses of IdentityAdminTestCase
+ */
@AfterMethod(groups = { "log" })
- private void logoutAfterTest() {
+ protected void logoutAfterTest() {
}
Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/LdapIdentityAdminTestCase.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/LdapIdentityAdminTestCase.java 2009-08-04 19:30:33 UTC (rev 13664)
+++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/LdapIdentityAdminTestCase.java 2009-08-05 08:54:14 UTC (rev 13665)
@@ -31,6 +31,12 @@
private final String LDAP_ROLE_NAME = "Ldap";
+ private final String INP_PROFILE_GIVENNAME = getLoc(casePfx + "inp.profile.givenname", "//input[contains(@id,'profile-form:givenname')]");
+ private final String INP_PROFILE_FAMILYNAME = getLoc(casePfx + "inp.profile.familyname", "//input[contains(@id,'profile-form:familyname')]");
+ private final String INP_PROFILE_EXTRA = getLoc(casePfx + "inp.profile.extra", "//textarea[contains(@id,'profile-form:extra')]");
+ private final String INP_PROFILE_HOMEPAGE = getLoc(casePfx + "inp.profile.homepage", "//input[contains(@id,'profile-form:homepage')]");
+ private final String INP_PROFILE_LOCATION = getLoc(casePfx + "inp.profile.location", "//input[contains(@id,'profile-form:location')]");
+
/**
* <p>User (tempUser, tempPassword, tempUser(a)redhat.com) and role (tempRole,
* tempRoleDisplay) are created. The role is assigned to the user and it is
@@ -103,20 +109,20 @@
// Go to edit page and check user profile
goToEdit(LDAP1_USER, LDAP1_USER_MAIL);
// TODO: add localizators while they will be added to IdentityAdminTestCase.
- Assert.assertTrue(selenium.getValue("//input[contains(@id,'profile-form:givenname')]").equals(LDAP1_FIRST_NAME), "First name should be " + LDAP1_FIRST_NAME + " but is " + selenium.getValue("//input[contains(@id,'profile-form:givenname')]"));
- Assert.assertTrue(selenium.getValue("//input[contains(@id,'profile-form:lastname')]").equals(LDAP1_SURNAME), "Surname should be " + LDAP1_SURNAME + " but is " + selenium.getValue("//input[contains(@id,'profile-form:lastname')]"));
- Assert.assertTrue(selenium.getValue("//input[contains(@id,'profile-form:location')]").contains("Brno, Czechue Republic"), "Location should contains Brno,Czechue Republic but is " + selenium.getValue("//input[contains(@id,'profile-form:location')]"));
- Assert.assertTrue(selenium.getValue("//textarea[contains(@id,'profile-form:extra')]").contains("This is content of ldap attribute \"description\""), "Description has value " + selenium.getValue("//textarea[contains(@id,'profile-form:extra')]"));
+ Assert.assertTrue(selenium.getValue(INP_PROFILE_GIVENNAME).equals(LDAP1_FIRST_NAME), "First name should be " + LDAP1_FIRST_NAME + " but is " + selenium.getValue(INP_PROFILE_GIVENNAME));
+ Assert.assertTrue(selenium.getValue(INP_PROFILE_FAMILYNAME).equals(LDAP1_SURNAME), "Surname should be " + LDAP1_SURNAME + " but is " + selenium.getValue(INP_PROFILE_FAMILYNAME));
+ Assert.assertTrue(selenium.getValue(INP_PROFILE_LOCATION).contains("Brno, Czechue Republic"), "Location should contains Brno,Czechue Republic but is " + selenium.getValue(INP_PROFILE_LOCATION));
+ Assert.assertTrue(selenium.getValue(INP_PROFILE_EXTRA).contains("This is content of ldap attribute \"description\""), "Description has value " + selenium.getValue(INP_PROFILE_EXTRA));
// fill some attributes (homepage should be DB attribute and givenname should be LDAP attribute) and check them.
- selenium.type("//input[contains(@id,'profile-form:givenname')]", "Jack");
- selenium.type("//input[contains(@id,'profile-form:homepage')]", "http://www.jboss.org/jbossportal");
+ selenium.type(INP_PROFILE_GIVENNAME, "Jack");
+ selenium.type(INP_PROFILE_HOMEPAGE, "http://www.jboss.org/jbossportal");
clickAndWait(SUB_EDIT_PROF);
goToEdit(LDAP1_USER, LDAP1_USER_MAIL);
- Assert.assertTrue(selenium.getValue("//input[contains(@id,'profile-form:givenname')]").equals("Jack"), "First name should be Jack but is " + selenium.getValue("//input[contains(@id,'profile-form:givenname')]"));
- Assert.assertTrue(selenium.getValue("//input[contains(@id,'profile-form:homepage')]").equals("http://www.jboss.org/jbossportal"), "Homepage should be http://www.jboss.org/jbossportal but is " + selenium.getValue("//input[contains(@id,'profile-form:homepage')]"));
+ Assert.assertTrue(selenium.getValue(INP_PROFILE_GIVENNAME).equals("Jack"), "First name should be Jack but is " + selenium.getValue(INP_PROFILE_GIVENNAME));
+ Assert.assertTrue(selenium.getValue(INP_PROFILE_HOMEPAGE).equals("http://www.jboss.org/jbossportal"), "Homepage should be http://www.jboss.org/jbossportal but is " + selenium.getValue(INP_PROFILE_HOMEPAGE));
// Change name to the original value
- selenium.type("//input[contains(@id,'profile-form:givenname')]", LDAP1_FIRST_NAME);
+ selenium.type(INP_PROFILE_GIVENNAME, LDAP1_FIRST_NAME);
clickAndWait(SUB_EDIT_PROF);
}
Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-08-04 19:30:33 UTC (rev 13664)
+++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-08-05 08:54:14 UTC (rev 13665)
@@ -74,6 +74,11 @@
iden.man.lnk.usermang.main2=//a[contains(@id,'user-temp-form1:user-mgm-link')]
iden.man.lnk.create.user=//a[contains(@id,':user-form:create-user-link')]
iden.man.chk.role=//input[contains(@name,''assign-roles-form:roles'') and @value=''{0}'']
+iden.man.inp.profile.givenname=//input[contains(@id,'profile-form:givenname')]
+iden.man.inp.profile.familyname=//input[contains(@id,'profile-form:familyname')]
+iden.man.inp.profile.extra=//textarea[contains(@id,'profile-form:extra')]
+iden.man.inp.profile.homepage=//input[contains(@id,'profile-form:homepage')]
+iden.man.inp.profile.location=//input[contains(@id,'profile-form:location')]
# DashboardTestCase
16 years, 9 months