February 2010 - gatein-commits - Jboss List Archives

gatein SVN: r1813 - in portal/trunk: web/portal/src/main/webapp/WEB-INF/conf/organization and 1 other directory.

by do-not-reply＠jboss.org

Author: bdaw Date: 2010-02-23 04:11:54 -0500 (Tue, 23 Feb 2010) New Revision: 1813 Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/Config.java portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml Log: - JTA config switch Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/Config.java =================================================================== --- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/Config.java 2010-02-22 23:32:56 UTC (rev 1812) +++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/Config.java 2010-02-23 09:11:54 UTC (rev 1813) @@ -50,7 +50,9 @@ private boolean ignoreMappedMembershipType = true; + private boolean useJTA = false; + public Config() { } @@ -271,4 +273,14 @@ { this.ignoreMappedMembershipType = ignoreMappedMembershipType; } + + public boolean isUseJTA() + { + return useJTA; + } + + public void setUseJTA(boolean useJTA) + { + this.useJTA = useJTA; + } } Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java =================================================================== --- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java 2010-02-22 23:32:56 UTC (rev 1812) +++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java 2010-02-23 09:11:54 UTC (rev 1813) @@ -30,6 +30,8 @@ import org.exoplatform.services.organization.BaseOrganizationService; import org.picocontainer.Startable; +import javax.naming.InitialContext; +import javax.transaction.UserTransaction; import java.util.LinkedList; import java.util.concurrent.atomic.AtomicInteger; @@ -136,7 +138,15 @@ { try { - idmService_.getIdentitySession().beginTransaction(); + if (configuration.isUseJTA()) + { + UserTransaction tx = (UserTransaction)new InitialContext().lookup("java:comp/UserTransaction"); + tx.begin(); + } + else + { + idmService_.getIdentitySession().beginTransaction(); + } } catch (Exception e) { @@ -148,7 +158,15 @@ { try { - idmService_.getIdentitySession().getTransaction().commit(); + if (configuration.isUseJTA()) + { + UserTransaction tx = (UserTransaction)new InitialContext().lookup("java:comp/UserTransaction"); + tx.commit(); + } + else + { + idmService_.getIdentitySession().getTransaction().commit(); + } } catch (Exception e) { Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-02-22 23:32:56 UTC (rev 1812) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-02-23 09:11:54 UTC (rev 1813) @@ -173,6 +173,10 @@ <field name="ignoreMappedMembershipType"> <boolean>false</boolean> </field> +  + <field name="useJTA"> + <boolean>false</boolean> + </field> </object> </object-param> </init-params>

14 years, 10 months

1
0
0 / 0

gatein SVN: r1812 - in portal/trunk/testsuite/selenium-snifftests: src/main/java/org/exoplatform/portal/selenium and 5 other directories.

by do-not-reply＠jboss.org

Author: dbaeli Date: 2010-02-22 18:32:56 -0500 (Mon, 22 Feb 2010) New Revision: 1812 Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_SNF_PRL_22.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_SNF_PRL_28.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design/ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_24.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/unstable/ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/unstable/Test_SNF_PRL_20.html Removed: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_22.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_24.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_28.html Modified: portal/trunk/testsuite/selenium-snifftests/pom.xml portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/TestSuite_SNF_PRL.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10.html Log: GTNPORTAL-509: Selenium tests * Hudson integration, tuning tests * Fixing unstable tests (22, 28) * Default Speed to 300 (Some tests can't run full speed for now, like 7 and 10) Modified: portal/trunk/testsuite/selenium-snifftests/pom.xml =================================================================== --- portal/trunk/testsuite/selenium-snifftests/pom.xml 2010-02-22 20:13:16 UTC (rev 1811) +++ portal/trunk/testsuite/selenium-snifftests/pom.xml 2010-02-22 23:32:56 UTC (rev 1812) @@ -16,8 +16,8 @@ <org.selenium.server.version>1.0.1</org.selenium.server.version> <selenium.port>4444</selenium.port> <selenium.browser>firefox</selenium.browser> - <selenium.timeout>30000</selenium.timeout> - <selenium.speed>150</selenium.speed> + <selenium.timeout>10000</selenium.timeout> + <selenium.speed>300</selenium.speed> <org.selenium.maven-plugin.version>1.0</org.selenium.maven-plugin.version> </properties> Modified: portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java 2010-02-22 20:13:16 UTC (rev 1811) +++ portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java 2010-02-22 23:32:56 UTC (rev 1812) @@ -120,7 +120,7 @@ if (xml.indexOf(""") != -1) { xml = replace(xml, """, "\""); - writeFile(outputdir + "/" + scriptFile, xml); + //writeFile(outputdir + "/" + scriptFile, xml); } int x = xml.indexOf("<tbody>"); Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/TestSuite_SNF_PRL.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/TestSuite_SNF_PRL.html 2010-02-22 20:13:16 UTC (rev 1811) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/TestSuite_SNF_PRL.html 2010-02-22 23:32:56 UTC (rev 1812) @@ -23,25 +23,25 @@ <tr><td><a href="Test_SNF_PRL_16.html">SNF_PRL_16</a></td></tr> <tr><td><a href="Test_SNF_PRL_17.html">SNF_PRL_17</a></td></tr> <tr><td><a href="Test_SNF_PRL_18.html">SNF_PRL_18</a></td></tr> -<tr><td><a href="Test_SNF_PRL_20.html">SNF_PRL_20</a></td></tr> <tr><td><a href="Test_SNF_PRL_31.html">SNF_PRL_31</a></td></tr> <tr><td><a href="Test_SNF_PRL_32.html">SNF_PRL_32</a></td></tr> <tr><td><a href="Test_SNF_PRL_33.html">SNF_PRL_33</a></td></tr> <tr><td><a href="Test_SNF_PRL_34.html">SNF_PRL_34</a></td></tr> <tr><td><a href="Test_SNF_PRL_35.html">SNF_PRL_35</a></td></tr> -<tr><td><a href="ko/Test_SNF_PRL_21.html">SNF_PRL_21 Not java</a></td></tr> -<tr><td><a href="ko/Test_SNF_PRL_22.html">SNF_PRL_22 Not working select</a></td></tr> -<tr><td><a href="ko/Test_SNF_PRL_24.html">SNF_PRL_24 Users not always same place</a></td></tr> -<tr><td><a href="ko/Test_SNF_PRL_25.html">SNF_PRL_25 Not working</a></td></tr> +<tr><td><a href="candidate/Test_SNF_PRL_28.html">SNF_PRL_28</a></td></tr> +<tr><td><a href="candidate/Test_SNF_PRL_22.html">SNF_PRL_22</a></td></tr> +<tr><td><a href="unstable/Test_SNF_PRL_20.html">SNF_PRL_20 getConfirmation</a></td></tr> +<tr><td><a href="ko/Test_SNF_PRL_21.html">SNF_PRL_21 verifyTextNotPresent failing in Java</a></td></tr> +<tr><td><a href="ko/Test_SNF_PRL_25.html">SNF_PRL_25 Not working full speed popup</a></td></tr> <tr><td><a href="ko/Test_SNF_PRL_26.html">SNF_PRL_26 Not working</a></td></tr> <tr><td><a href="ko/Test_SNF_PRL_27.html">SNF_PRL_27 Not working</a></td></tr> -<tr><td><a href="ko/Test_SNF_PRL_28.html">SNF_PRL_28 Not working</a></td></tr> <tr><td><a href="ko/Test_SNF_PRL_29.html">SNF_PRL_29 Not working</a></td></tr> <tr><td><a href="ko/Test_SNF_PRL_30.html">SNF_PRL_30 Not working</a></td></tr> <tr><td><a href="issues/Test_SNF_PRL_06.html">SNF_PRL_06 GTNPORTAL-270</a></td></tr> <tr><td><a href="issues/Test_SNF_PRL_13.html">SNF_PRL_13 GTNPORTAL-439</a></td></tr> <tr><td><a href="issues/Test_SNF_PRL_19.html">SNF_PRL_19 On tomcat to confirm</a></td></tr> <tr><td><a href="issues/Test_SNF_PRL_23.html">SNF_PRL_23 GroupNavigation elements order not stable</a></td></tr> +<tr><td><a href="issues/Test_SNF_PRL_24.html">SNF_PRL_24 GroupNavigation elements order not stable</a></td></tr> </tbody></table> </body> </html> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07.html 2010-02-22 20:13:16 UTC (rev 1811) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07.html 2010-02-22 23:32:56 UTC (rev 1812) @@ -113,12 +113,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIOrganizationPortlet']//div[@class='TitleBar']/a[@class='TreeActionIcon AddGroupIcon']</td> + <td>//div[@class="GroupNavigation"]//a[@class="TreeActionIcon AddGroupIcon"]</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[2]/div[1]/div[1]/a[3]</td> + <td>//div[@class="GroupNavigation"]//a[@class="TreeActionIcon AddGroupIcon"]</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10.html 2010-02-22 20:13:16 UTC (rev 1811) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10.html 2010-02-22 23:32:56 UTC (rev 1812) @@ -27,6 +27,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>username</td> + <td>root</td> +</tr> +<tr> <td>type</td> <td>username</td> <td>root</td> Deleted: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20.html 2010-02-22 20:13:16 UTC (rev 1811) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20.html 2010-02-22 23:32:56 UTC (rev 1812) @@ -1,207 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link rel="selenium.base" href="" /> -<title>SNF_PRL_20</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_20</td></tr> -</thead><tbody> -<tr> - <td>open</td> - <td>/portal/public/classic/</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>-DeletePortal-</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Sign in</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>username</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>username</td> - <td>root</td> -</tr> -<tr> - <td>type</td> - <td>password</td> - <td>gtn</td> -</tr> -<tr> - <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Site</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Add new portal</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Add New Portal</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Add New Portal</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'PortalSetting');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=PortalSetting')"]</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'PortalSetting');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=PortalSetting')"]</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>name</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>name</td> - <td>test_portal_name_20</td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'Properties');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=Properties')"]</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>document.forms[0].elements[6]</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'PermissionSetting');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=PermissionSetting')"]</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>publicMode</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>publicMode</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Edit Permission Setting</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Select Permission</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Select Permission</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Platform</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Platform</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=exact:*</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=exact:*</td> - <td></td> -</tr> -<tr> - <td>waitForText</td> - <td>//div[@id='UIPermissionSelector']/div/div[2]/div[1]/div[3]/div[2]</td> - <td>exact:*</td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Save</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>test_portal_name_20</td> - <td>1,1</td> -</tr> -<tr> - <td>echo</td> - <td>--Delete portal</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td> - <td></td> -</tr> -<tr> - <td>waitForConfirmation</td> - <td>Are you sure you want to delete this portal?</td> - <td></td> -</tr> -<tr> - <td>waitForTextNotPresent</td> - <td>test_portal_name_20</td> - <td></td> -</tr> -<tr> - <td>verifyTextNotPresent</td> - <td>test_portal_name_20</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Sign out</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Sign out</td> - <td></td> -</tr> - -</tbody></table> -</body> -</html> Copied: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_SNF_PRL_22.html (from rev 1794, portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_22.html) =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_SNF_PRL_22.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_SNF_PRL_22.html 2010-02-22 23:32:56 UTC (rev 1812) @@ -0,0 +1,232 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="http://localhost:8080/portal" /> +<title>SNF_PRL_22 Not working select</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">SNF_PRL_22 Not working select</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-EditPortalLayout-</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Edit Layout</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Portal Properties</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Portal Properties</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>locale</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>locale</td> + <td>label=French</td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']//div[3]//div[@class='MiddleTab']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>publicMode</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Edit Permission Setting</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Select Permission</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Select Permission</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Users</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Users</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=exact:*</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=exact:*</td> + <td></td> +</tr> +<tr> + <td>waitForText</td> + <td>//div[@id='UIPermissionSelector']/div/div[2]/div[1]/div[3]/div[2]</td> + <td>exact:*</td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIPortalComposer']//a[@class='EdittedSaveButton']</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=classic</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=classic</td> + <td>1,1</td> +</tr> +<tr> + <td>echo</td> + <td>--Verify</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Edit Layout</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Portal Properties</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Portal Properties</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>locale</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>French</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>locale</td> + <td>label=French</td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']//div[3]//div[@class='MiddleTab']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>publicMode</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIPortalComposer']//a[@class='EdittedSaveButton']</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=classic</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=classic</td> + <td>1,1</td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign out</td> + <td>1,1</td> +</tr> + +</tbody></table> +</body> +</html> Copied: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_SNF_PRL_28.html (from rev 1794, portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_28.html) =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_SNF_PRL_28.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_SNF_PRL_28.html 2010-02-22 23:32:56 UTC (rev 1812) @@ -0,0 +1,202 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>SNF_PRL_28 Not working</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">SNF_PRL_28 Not working</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-ActionsDashboardpage-</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>clickAtAndWait</td> + <td>link=Dashboard</td> + <td>1,1</td> +</tr> +<tr> + <td>echo</td> + <td>--Add gadgets into dashboard page</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Add Gadgets</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Add Gadgets</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--By url</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>//input[@id='url']</td> + <td>http://www.google.com/ig/modules/datetime.xml</td> +</tr> +<tr> + <td>clickAt</td> + <td>//img[@class='AddNewNodeIcon']</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@class='UIPopupWindow UIDragObject']//div[@class='CloseButton']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@class='UIPopupWindow UIDragObject']//div[@class='CloseButton']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@class='GadgetTitle']</td> + <td></td> +</tr> +<tr> + <td>verifyElementPresent</td> + <td>//div[@class='GadgetTitle']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@title='Delete Gadget']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@onclick='eXo.gadget.UIGadget.deleteGadget(this)']</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmation</td> + <td>Are you sure to delete this gadget?</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Add Gadgets</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Add Gadgets</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--By drag and drop</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@class='GadgetTitle' and @title='Calculator']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@class='GadgetTitle' and @title='Calculator']</td> + <td></td> +</tr> +<tr> + <td>dragAndDropToObject</td> + <td>//div[@class='GadgetTitle' and @title='Calculator']</td> + <td>//div[@class='UIDashboardContainer']</td> +</tr> +<tr> + <td>echo</td> + <td>--------To fast</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@class='GadgetTitle' and @style='display: block;']</td> + <td></td> +</tr> +<tr> + <td>verifyElementPresent</td> + <td>//div[@class='GadgetTitle' and @style='display: block;']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@class='CloseGadget IconControl']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@class='UIPopupWindow UIDragObject']//div[@class='CloseButton']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@class='UIPopupWindow UIDragObject']//div[@class='CloseButton']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@onclick='eXo.gadget.UIGadget.deleteGadget(this)']</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmation</td> + <td>Are you sure to delete this gadget?</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>Drag your gadgets here.</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> Copied: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_24.html (from rev 1794, portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_24.html) =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_24.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_24.html 2010-02-22 23:32:56 UTC (rev 1812) @@ -0,0 +1,252 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>SNF_PRL_24 Users not always same place</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">SNF_PRL_24 Users not always same place</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-EditDeleteNavigation-</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>open</td> + <td>/portal/private/classic/</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Add Navigation</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Add Navigation</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Cancel</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Cancel</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Add Node</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Add Node</td> + <td></td> +</tr> +<tr> + <td>waitForText</td> + <td>name</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>name</td> + <td>test_grp_node_24</td> +</tr> +<tr> + <td>type</td> + <td>label</td> + <td>test_grp_label_24</td> +</tr> +<tr> + <td>echo</td> + <td>--Choose "Page Selector" tab</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@class='CenterHorizontalTabs']//div[@class='NormalTab']//div[@class='MiddleTab']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Search and Select Page</td> + <td>1,1</td> +</tr> +<tr> + <td>echo</td> + <td>--Select the first page from pages list</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIRepeater']//img[@class='SelectPageIcon']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td>1,1</td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=test_grp_label_24</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=test_grp_label_24</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Edit navigation properties</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='PortalNavigationTopContainer']/div[2]/div/div/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIGroupNavigationGrid']/table[4]//td[@class='ActionBlock']//a[@class='EditProIcon']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIGroupNavigationGrid']/table[4]//td[@class='ActionBlock']//a[@class='EditProIcon']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>priority</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>priority</td> + <td>10</td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@ID='UIGroupNavigationGrid']//table[4]//a[@class='EditNavIcon']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@ID='UIGroupNavigationGrid']//table[4]//a[@class='EditNavIcon']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//a[@title='test_grp_label_24']</td> + <td></td> +</tr> +<tr> + <td>verifyElementPresent</td> + <td>//a[@title='test_grp_label_24']</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Delete new group navigation</td> + <td></td> +</tr> +<tr> + <td>componentExoContextMenu</td> + <td>//a[@title='test_grp_label_24']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmation</td> + <td>Are you sure you want to delete this node?</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> Deleted: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_22.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_22.html 2010-02-22 20:13:16 UTC (rev 1811) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_22.html 2010-02-22 23:32:56 UTC (rev 1812) @@ -1,232 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link rel="selenium.base" href="http://localhost:8080/portal" /> -<title>SNF_PRL_22</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_22</td></tr> -</thead><tbody> -<tr> - <td>open</td> - <td>/portal/public/classic/</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>-EditPortalLayout-</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Sign in</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>username</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>username</td> - <td>root</td> -</tr> -<tr> - <td>type</td> - <td>password</td> - <td>gtn</td> -</tr> -<tr> - <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> - <td></td> -</tr> -<tr> - <td>clickAndWait</td> - <td>link=Site</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Edit Layout</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Portal Properties</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Portal Properties</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>locale</td> - <td></td> -</tr> -<tr> - <td>select</td> - <td>locale</td> - <td>label=French (France)</td> -</tr> -<tr> - <td>click</td> - <td>//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']//div[3]//div[@class='MiddleTab']</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>publicMode</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Edit Permission Setting</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Select Permission</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Select Permission</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Platform</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Platform</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Users</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Users</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=exact:*</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=exact:*</td> - <td></td> -</tr> -<tr> - <td>waitForText</td> - <td>//div[@id='UIPermissionSelector']/div/div[2]/div[1]/div[3]/div[2]</td> - <td>exact:*</td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Save</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIPortalComposer']//a[@class='EdittedSaveButton']</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=classic</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=classic</td> - <td>1,1</td> -</tr> -<tr> - <td>echo</td> - <td>--Verify</td> - <td></td> -</tr> -<tr> - <td>clickAndWait</td> - <td>link=Site</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Edit Layout</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Portal Properties</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Portal Properties</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>locale</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>French (France)</td> - <td></td> -</tr> -<tr> - <td>select</td> - <td>locale</td> - <td>label=French (France)</td> -</tr> -<tr> - <td>click</td> - <td>//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']//div[3]//div[@class='MiddleTab']</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>publicMode</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIPortalComposer']//a[@class='EdittedSaveButton']</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=classic</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=classic</td> - <td>1,1</td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Sign out</td> - <td>1,1</td> -</tr> - -</tbody></table> -</body> -</html> Deleted: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_24.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_24.html 2010-02-22 20:13:16 UTC (rev 1811) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_24.html 2010-02-22 23:32:56 UTC (rev 1812) @@ -1,252 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link rel="selenium.base" href="" /> -<title>SNF_PRL_24 Users not always same place</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_24 Users not always same place</td></tr> -</thead><tbody> -<tr> - <td>open</td> - <td>/portal/public/classic</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>-EditDeleteNavigation-</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Sign in</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>username</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>username</td> - <td>root</td> -</tr> -<tr> - <td>type</td> - <td>password</td> - <td>gtn</td> -</tr> -<tr> - <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> - <td></td> -</tr> -<tr> - <td>open</td> - <td>/portal/private/classic/</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Group</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Add Navigation</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Add Navigation</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Cancel</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Cancel</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Edit Navigation</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Add Node</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Add Node</td> - <td></td> -</tr> -<tr> - <td>waitForText</td> - <td>name</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>name</td> - <td>test_grp_node_24</td> -</tr> -<tr> - <td>type</td> - <td>label</td> - <td>test_grp_label_24</td> -</tr> -<tr> - <td>echo</td> - <td>--Choose "Page Selector" tab</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@class='CenterHorizontalTabs']//div[@class='NormalTab']//div[@class='MiddleTab']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Search and Select Page</td> - <td>1,1</td> -</tr> -<tr> - <td>echo</td> - <td>--Select the first page from pages list</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIRepeater']//img[@class='SelectPageIcon']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Save</td> - <td>1,1</td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Save</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=test_grp_label_24</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=test_grp_label_24</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Edit navigation properties</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='PortalNavigationTopContainer']/div[2]/div/div/div/div/div/div/a</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Group</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UIGroupNavigationGrid']/table[4]//td[@class='ActionBlock']//a[@class='EditProIcon']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIGroupNavigationGrid']/table[4]//td[@class='ActionBlock']//a[@class='EditProIcon']</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>priority</td> - <td></td> -</tr> -<tr> - <td>select</td> - <td>priority</td> - <td>10</td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Save</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@ID='UIGroupNavigationGrid']//table[4]//a[@class='EditNavIcon']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@ID='UIGroupNavigationGrid']//table[4]//a[@class='EditNavIcon']</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//a[@title='test_grp_label_24']</td> - <td></td> -</tr> -<tr> - <td>verifyElementPresent</td> - <td>//a[@title='test_grp_label_24']</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Delete new group navigation</td> - <td></td> -</tr> -<tr> - <td>componentExoContextMenu</td> - <td>//a[@title='test_grp_label_24']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td> - <td></td> -</tr> -<tr> - <td>waitForConfirmation</td> - <td>Are you sure you want to delete this node?</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Save</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Save</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Sign out</td> - <td></td> -</tr> - -</tbody></table> -</body> -</html> Deleted: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_28.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_28.html 2010-02-22 20:13:16 UTC (rev 1811) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_28.html 2010-02-22 23:32:56 UTC (rev 1812) @@ -1,192 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link rel="selenium.base" href="" /> -<title>SNF_PRL_28</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_28</td></tr> -</thead><tbody> -<tr> - <td>open</td> - <td>/portal/public/classic</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>-ActionsDashboardpage-</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Sign in</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>username</td> - <td>root</td> -</tr> -<tr> - <td>type</td> - <td>username</td> - <td>root</td> -</tr> -<tr> - <td>type</td> - <td>password</td> - <td>gtn</td> -</tr> -<tr> - <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> - <td></td> -</tr> -<tr> - <td>clickAtAndWait</td> - <td>link=Dashboard</td> - <td>1,1</td> -</tr> -<tr> - <td>echo</td> - <td>--Add gadgets into dashboard page</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Add Gadgets</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Add Gadgets</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--By url</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>//input[@id='url']</td> - <td>http://www.google.com/ig/modules/datetime.xml</td> -</tr> -<tr> - <td>clickAt</td> - <td>//img[@class='AddNewNodeIcon']</td> - <td>1,1</td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIAddGadgetPopup']//div[@class='CloseButton']</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@class='GadgetTitle']</td> - <td></td> -</tr> -<tr> - <td>verifyElementPresent</td> - <td>//div[@class='GadgetTitle']</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@title='Delete Gadget']</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//div[@onclick='eXo.gadget.UIGadget.deleteGadget(this)']</td> - <td></td> -</tr> -<tr> - <td>waitForConfirmation</td> - <td>Are you sure to delete this gadget?</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Add Gadgets</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Add Gadgets</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--By drag and drop</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@class='GadgetTitle' and @title='Calculator']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@class='GadgetTitle' and @title='Calculator']</td> - <td></td> -</tr> -<tr> - <td>dragAndDropToObject</td> - <td>//div[@class='GadgetTitle' and @title='Calculator']</td> - <td>//div[@class='UIDashboardContainer']</td> -</tr> -<tr> - <td>echo</td> - <td>--------To fast</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@class='GadgetTitle' and @style='display: block;']</td> - <td></td> -</tr> -<tr> - <td>verifyElementPresent</td> - <td>//div[@class='GadgetTitle' and @style='display: block;']</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@class='CloseGadget IconControl']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIAddGadgetPopup']//div[@class='CloseButton']</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//div[@onclick='eXo.gadget.UIGadget.deleteGadget(this)']</td> - <td></td> -</tr> -<tr> - <td>waitForConfirmation</td> - <td>Are you sure to delete this gadget?</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>Drag your gadgets here.</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Sign out</td> - <td></td> -</tr> - -</tbody></table> -</body> -</html> Copied: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/unstable/Test_SNF_PRL_20.html (from rev 1810, portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20.html) =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/unstable/Test_SNF_PRL_20.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/unstable/Test_SNF_PRL_20.html 2010-02-22 23:32:56 UTC (rev 1812) @@ -0,0 +1,212 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>SNF_PRL_20</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">SNF_PRL_20</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-DeletePortal-</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Add new portal</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Add New Portal</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Add New Portal</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'PortalSetting');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=PortalSetting')"]</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'PortalSetting');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=PortalSetting')"]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>name</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>name</td> + <td>test_portal_name_20</td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'Properties');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=Properties')"]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>document.forms[0].elements[6]</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'PermissionSetting');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=PermissionSetting')"]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>publicMode</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>publicMode</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Edit Permission Setting</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Select Permission</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Select Permission</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=exact:*</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=exact:*</td> + <td></td> +</tr> +<tr> + <td>setSpeed</td> + <td>1000</td> + <td></td> +</tr> +<tr> + <td>waitForText</td> + <td>//div[@id='UIPermissionSelector']/div/div[2]/div[1]/div[3]/div[2]</td> + <td>exact:*</td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>test_portal_name_20</td> + <td>1,1</td> +</tr> +<tr> + <td>echo</td> + <td>--Delete portal</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmation</td> + <td>Are you sure you want to delete this portal?</td> + <td></td> +</tr> +<tr> + <td>waitForTextNotPresent</td> + <td>test_portal_name_20</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> + <td>test_portal_name_20</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html>

14 years, 10 months

1
0
0 / 0

gatein SVN: r1811 - components/mop/trunk/spi/src/main/java/org/gatein/mop/spi/content.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-02-22 15:13:16 -0500 (Mon, 22 Feb 2010) New Revision: 1811 Modified: components/mop/trunk/spi/src/main/java/org/gatein/mop/spi/content/ContentProvider.java Log: minor javadoc Modified: components/mop/trunk/spi/src/main/java/org/gatein/mop/spi/content/ContentProvider.java =================================================================== --- components/mop/trunk/spi/src/main/java/org/gatein/mop/spi/content/ContentProvider.java 2010-02-22 18:55:21 UTC (rev 1810) +++ components/mop/trunk/spi/src/main/java/org/gatein/mop/spi/content/ContentProvider.java 2010-02-22 20:13:16 UTC (rev 1811) @@ -21,6 +21,8 @@ import java.util.List; /** + * A content provider that integrates with the mop. + * * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ * @param <E> the external state type

14 years, 10 months

1
0
0 / 0

gatein SVN: r1810 - in portal/trunk/testsuite/selenium-snifftests: src/suite/org/exoplatform/portal/selenium and 2 other directories.

by do-not-reply＠jboss.org

Author: dbaeli Date: 2010-02-22 13:55:21 -0500 (Mon, 22 Feb 2010) New Revision: 1810 Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_19.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_23.html Removed: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_07.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_10.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_18.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_20.html Modified: portal/trunk/testsuite/selenium-snifftests/pom.xml portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/TestSuite_SNF_PRL.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12.html Log: GTNPORTAL-509: Selenium tests * Hudson integration, add timeout and speed as parameter * Move tests blocked by GateIn issues in issues/ directory * Reworked some tests to avoid interferences Modified: portal/trunk/testsuite/selenium-snifftests/pom.xml =================================================================== --- portal/trunk/testsuite/selenium-snifftests/pom.xml 2010-02-22 17:36:06 UTC (rev 1809) +++ portal/trunk/testsuite/selenium-snifftests/pom.xml 2010-02-22 18:55:21 UTC (rev 1810) @@ -140,6 +140,14 @@ <name>selenium.browser</name> <value>${selenium.browser}</value> </property> + <property> + <name>selenium.speed</name> + <value>${selenium.speed}</value> + </property> + <property> + <name>selenium.timeout</name> + <value>${selenium.timeout}</value> + </property> </systemProperties> </configuration> </execution> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/TestSuite_SNF_PRL.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/TestSuite_SNF_PRL.html 2010-02-22 17:36:06 UTC (rev 1809) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/TestSuite_SNF_PRL.html 2010-02-22 18:55:21 UTC (rev 1810) @@ -12,25 +12,23 @@ <tr><td><a href="Test_SNF_PRL_03.html">SNF_PRL_03</a></td></tr> <tr><td><a href="Test_SNF_PRL_04.html">SNF_PRL_04</a></td></tr> <tr><td><a href="Test_SNF_PRL_05.html">SNF_PRL_05</a></td></tr> +<tr><td><a href="Test_SNF_PRL_07.html">SNF_PRL_07</a></td></tr> <tr><td><a href="Test_SNF_PRL_08.html">SNF_PRL_08</a></td></tr> <tr><td><a href="Test_SNF_PRL_09.html">SNF_PRL_09</a></td></tr> +<tr><td><a href="Test_SNF_PRL_10.html">SNF_PRL_10</a></td></tr> <tr><td><a href="Test_SNF_PRL_11.html">SNF_PRL_11</a></td></tr> <tr><td><a href="Test_SNF_PRL_12.html">SNF_PRL_12</a></td></tr> <tr><td><a href="Test_SNF_PRL_14.html">SNF_PRL_14</a></td></tr> <tr><td><a href="Test_SNF_PRL_15.html">SNF_PRL_15</a></td></tr> <tr><td><a href="Test_SNF_PRL_16.html">SNF_PRL_16</a></td></tr> <tr><td><a href="Test_SNF_PRL_17.html">SNF_PRL_17</a></td></tr> -<tr><td><a href="Test_SNF_PRL_19.html">SNF_PRL_19</a></td></tr> -<tr><td><a href="Test_SNF_PRL_23.html">SNF_PRL_23</a></td></tr> +<tr><td><a href="Test_SNF_PRL_18.html">SNF_PRL_18</a></td></tr> +<tr><td><a href="Test_SNF_PRL_20.html">SNF_PRL_20</a></td></tr> <tr><td><a href="Test_SNF_PRL_31.html">SNF_PRL_31</a></td></tr> <tr><td><a href="Test_SNF_PRL_32.html">SNF_PRL_32</a></td></tr> <tr><td><a href="Test_SNF_PRL_33.html">SNF_PRL_33</a></td></tr> <tr><td><a href="Test_SNF_PRL_34.html">SNF_PRL_34</a></td></tr> <tr><td><a href="Test_SNF_PRL_35.html">SNF_PRL_35</a></td></tr> -<tr><td><a href="ko/Test_SNF_PRL_07.html">SNF_PRL_07 Not stable</a></td></tr> -<tr><td><a href="ko/Test_SNF_PRL_10.html">SNF_PRL_10 Not stable</a></td></tr> -<tr><td><a href="ko/Test_SNF_PRL_18.html">SNF_PRL_18 Not stable</a></td></tr> -<tr><td><a href="ko/Test_SNF_PRL_20.html">SNF_PRL_20 Not stable</a></td></tr> <tr><td><a href="ko/Test_SNF_PRL_21.html">SNF_PRL_21 Not java</a></td></tr> <tr><td><a href="ko/Test_SNF_PRL_22.html">SNF_PRL_22 Not working select</a></td></tr> <tr><td><a href="ko/Test_SNF_PRL_24.html">SNF_PRL_24 Users not always same place</a></td></tr> @@ -42,6 +40,8 @@ <tr><td><a href="ko/Test_SNF_PRL_30.html">SNF_PRL_30 Not working</a></td></tr> <tr><td><a href="issues/Test_SNF_PRL_06.html">SNF_PRL_06 GTNPORTAL-270</a></td></tr> <tr><td><a href="issues/Test_SNF_PRL_13.html">SNF_PRL_13 GTNPORTAL-439</a></td></tr> +<tr><td><a href="issues/Test_SNF_PRL_19.html">SNF_PRL_19 On tomcat to confirm</a></td></tr> +<tr><td><a href="issues/Test_SNF_PRL_23.html">SNF_PRL_23 GroupNavigation elements order not stable</a></td></tr> </tbody></table> </body> </html> Copied: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07.html (from rev 1794, portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_07.html) =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07.html 2010-02-22 18:55:21 UTC (rev 1810) @@ -0,0 +1,277 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>SNF_PRL_07</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">SNF_PRL_07</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-GroupManagement-</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Select "Users and groups management" in menu</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIOrganizationPortlet']//div[@class='ManagementIconContainer']/a[@class='GroupButton']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[3]/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Select "Organization" group from group tree</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIOrganizationPortlet']//div[3]//div[@class='ExpandIcon']/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Select "Management group" from group tree</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>Management</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIOrganizationPortlet']//div[3]//div[@class='ExpandIcon']/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Click Add new group icon</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIOrganizationPortlet']//div[@class='TitleBar']/a[@class='TreeActionIcon AddGroupIcon']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[2]/div[1]/div[1]/a[3]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>groupName</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>groupName</td> + <td>test_group_name_07</td> +</tr> +<tr> + <td>type</td> + <td>label</td> + <td>test_group_label_07</td> +</tr> +<tr> + <td>type</td> + <td>description</td> + <td>test_group_description_07</td> +</tr> +<tr> + <td>echo</td> + <td>--Click "Save" to complete adding new group</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//form[@id='UIGroupForm']//div[@class='ActionButton LightBlueStyle']</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>test_group_label_07</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=test_group_label_07</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Click "Select User" icon</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIGroupMembershipForm']//div[@class='HorizontalLayout']//table[@class='UIFormGrid']//td[@class='FieldComponent']/a</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//td[2]/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIUserSelector']/div[2]/div[2]/table/tbody/tr/td/a[1]/div/div/div</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>john</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>mary</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>root</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Click "Add" button</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIUserSelector']//div[@class='UIAction']//a[@class='ActionButton LightBlueStyle']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//form[@id='UIUserSelector']//div[@class='UIAction']//a[@class='ActionButton LightBlueStyle']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//input[@value='john,mary,root']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@class='UIUserInGroup']//div[@title='john']</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>john</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>john</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>mary</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>root</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=test_group_label_07</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//a[@class='TreeActionIcon RemoveGroupIcon']</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmation</td> + <td>Are you sure you want to delete this group?</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09.html 2010-02-22 17:36:06 UTC (rev 1809) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09.html 2010-02-22 18:55:21 UTC (rev 1810) @@ -67,11 +67,6 @@ <td></td> </tr> <tr> - <td>verifyTextNotPresent</td> - <td>Register Portlet</td> - <td></td> -</tr> -<tr> <td>clickAt</td> <td>//div[@id='UIApplicationOrganizer']//div[@class='UIControlbar']//div[@class='IconControl ImportIcon']</td> <td>1,1</td> Copied: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10.html (from rev 1794, portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_10.html) =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10.html 2010-02-22 18:55:21 UTC (rev 1810) @@ -0,0 +1,222 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>SNF_PRL_10</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">SNF_PRL_10</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-CategoryManagement-</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Select "Application Registry"</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Application Registry</td> + <td>1,1</td> +</tr> +<tr> + <td>echo</td> + <td>--Add Category</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIApplicationOrganizer']//div[@class='UIControlbar']/div[1]</td> + <td>1,1</td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIApplicationOrganizer']//div[@class='UIControlbar']/div[1]</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>name</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>name</td> + <td>test_name_category_10</td> +</tr> +<tr> + <td>type</td> + <td>displayName</td> + <td>test_displayname_category_10</td> +</tr> +<tr> + <td>type</td> + <td>description</td> + <td>test_description_category_10</td> +</tr> +<tr> + <td>echo</td> + <td>--Select permissions</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@class='WorkingArea']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Add Permission</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Add Permission</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=manager</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=manager</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIApplicationOrganizer']//a[@class='ControlIcon EditIcon']</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>test_displayname_category_10</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>test_displayname_category_10</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Edit Category</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIApplicationOrganizer']//a[@class='ControlIcon EditIcon']</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>displayName</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>displayName</td> + <td>test_displayname_edit_10</td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>test_displayname_edit_10</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>test_displayname_edit_10</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Delete Category</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@class='SelectedTab']//a[@class='ControlIcon DeleteIcon']</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmation</td> + <td>Are you sure to delete this category and all applications on it?</td> + <td></td> +</tr> +<tr> + <td>waitForTextNotPresent</td> + <td>test_displayname_edit_10</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> + <td>test_displayname_edit_10</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11.html 2010-02-22 17:36:06 UTC (rev 1809) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11.html 2010-02-22 18:55:21 UTC (rev 1810) @@ -53,11 +53,106 @@ </tr> <tr> <td>echo</td> - <td>--Add application to Administration Category</td> + <td>--Add Category</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> + <td>//div[@id='UIApplicationOrganizer']//div[@class='UIControlbar']/div[1]</td> + <td>1,1</td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIApplicationOrganizer']//div[@class='UIControlbar']/div[1]</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>name</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>name</td> + <td>Test_cat_11</td> +</tr> +<tr> + <td>type</td> + <td>displayName</td> + <td>Test_cat_11</td> +</tr> +<tr> + <td>echo</td> + <td>--Select permissions</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@class='WorkingArea']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Add Permission</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Add Permission</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=manager</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=manager</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIApplicationOrganizer']//a[@class='ControlIcon EditIcon']</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>Test_cat_11</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>Test_cat_11</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Test_cat_11</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Add application to Test_cat_11</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//div[@class='ListContent']//div[@class='SelectedTab']//a[@class='ControlIcon CreateNewIcon']</td> <td></td> </tr> @@ -138,45 +233,75 @@ </tr> <tr> <td>waitForTextPresent</td> - <td>test_displayname_11</td> + <td>Test_cat_11</td> <td></td> </tr> <tr> <td>verifyTextPresent</td> - <td>test_displayname_11</td> + <td>Test_cat_11</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@class='IconControl ImportIcon']</td> + <td>link=Test_cat_11</td> + <td>1,1</td> +</tr> +<tr> + <td>echo</td> + <td>--Delete application</td> <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>//div[@class='ListContent']//div[@class='UIVTabContent']/div[1]//a[@class='ControlIcon DeletePortalIcon']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@class='ListContent']//div[@class='UIVTabContent']/div[1]//a[@class='ControlIcon DeletePortalIcon']</td> + <td></td> +</tr> +<tr> <td>waitForConfirmation</td> - <td>This action will automatically create categories and import all the gadgets and portlets on it.</td> + <td>Are you sure to delete this application?</td> <td></td> </tr> <tr> - <td>echo</td> - <td>--Delete application</td> + <td>waitForTextNotPresent</td> + <td>test_displayname_11</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[@class='ListContent']//div[@class='UIVTabContent']/div[8]//a[@class='ControlIcon DeletePortalIcon']</td> + <td>verifyTextNotPresent</td> + <td>test_displayname_11</td> <td></td> </tr> <tr> + <td>echo</td> + <td>--Delete Category</td> + <td></td> +</tr> +<tr> <td>clickAt</td> - <td>//div[@class='ListContent']//div[@class='UIVTabContent']/div[8]//a[@class='ControlIcon DeletePortalIcon']</td> + <td>//div[@class='SelectedTab']//a[@class='ControlIcon DeleteIcon']</td> <td></td> </tr> <tr> <td>waitForConfirmation</td> - <td>Are you sure to delete this application?</td> + <td>Are you sure to delete this category and all applications on it?</td> <td></td> </tr> <tr> + <td>waitForTextNotPresent</td> + <td>Test_cat_11</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> + <td>Test_cat_11</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Sign out</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12.html 2010-02-22 17:36:06 UTC (rev 1809) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12.html 2010-02-22 18:55:21 UTC (rev 1810) @@ -132,41 +132,6 @@ <td></td> </tr> <tr> - <td>clickAt</td> - <td>link=Integration</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>Dashboard Portlet</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>Dashboard Portlet</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Verify details of Dashboard>>Gadget Wrapper Portlet</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[2]//a</td> - <td></td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>Gadget Wrapper Portlet</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>Gadget Wrapper Portlet</td> - <td></td> -</tr> -<tr> <td>waitForElementPresent</td> <td>link=Sign out</td> <td></td> Copied: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18.html (from rev 1794, portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_18.html) =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18.html 2010-02-22 18:55:21 UTC (rev 1810) @@ -0,0 +1,222 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>SNF_PRL_18</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">SNF_PRL_18</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-CreateNewPortal-</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> + <td></td> +</tr> +<tr> + <td>open</td> + <td>/portal/private/classic/portalnavigation</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Add new portal</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UISiteManagement']//div[@class='UIAction']//div[@class='ActionButton BlueButton']</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Select portal settings</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>name</td> + <td>test_portal_18</td> +</tr> +<tr> + <td>echo</td> + <td>--Select permission settings</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[4]//div[@class='MiddleTab']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>publicMode</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Edit Permission Setting</td> + <td>1,1</td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Select Permission</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Platform</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='PermissionSelector']//a[@title='Administrators']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='PermissionSelector']//a[@title='Administrators']</td> + <td>1,1</td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='PermissionSelector']//a[@title='manager']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='PermissionSelector']//a[@title='manager']</td> + <td></td> +</tr> +<tr> + <td>waitForTextNotPresent</td> + <td>Permission Selector</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//form[@id='UIPortalForm']//div[@class='UIAction']//div[@class='ActionButton LightBlueStyle']//div[@class='ButtonMiddle']/a</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>test_portal_18</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Verify portal creation</td> + <td></td> +</tr> +<tr> + <td>verifyElementPresent</td> + <td>link=test_portal_18</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Delete new portal</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>Portal Navigation</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UISiteManagement']/table[2]//a[@class='DeleteIcon']</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UISiteManagement']/table[2]//a[@class='DeleteIcon']</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmation</td> + <td>Are you sure you want to delete this portal?</td> + <td></td> +</tr> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>Portal Navigation</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> + <td>test_portal_18</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> Deleted: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19.html 2010-02-22 17:36:06 UTC (rev 1809) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19.html 2010-02-22 18:55:21 UTC (rev 1810) @@ -1,362 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link rel="selenium.base" href="" /> -<title>SNF_PRL_19</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_19</td></tr> -</thead><tbody> -<tr> - <td>open</td> - <td>/portal/public/classic/</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>-EditPortalNavigation-</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Sign in</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>username</td> - <td>root</td> -</tr> -<tr> - <td>type</td> - <td>username</td> - <td>root</td> -</tr> -<tr> - <td>type</td> - <td>password</td> - <td>gtn</td> -</tr> -<tr> - <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Site</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Edit Portal layout, currently do not change anything</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//a[@class='EditLayoutIcon']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//a[@class='EditLayoutIcon']</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>css=div#Administration/ApplicationRegistryPortlet</td> - <td></td> -</tr> -<tr> - <td>dragAndDropToObject</td> - <td>css=div#Administration/ApplicationRegistryPortlet</td> - <td>css=div#UIPortal div.UIRowContainer</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposer']//div[@class='OverflowContainer']/a[@class='EdittedSaveButton']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIPortalComposer']//div[@class='OverflowContainer']/a[@class='CloseButton']</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>classic</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Edit nav: add node, actions ...</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Edit Navigation</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Add Node</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Add Node</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>name</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>name</td> - <td>test_nodename_19</td> -</tr> -<tr> - <td>type</td> - <td>label</td> - <td>test_node_label_19</td> -</tr> -<tr> - <td>echo</td> - <td>--Select Page</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>css=div#UISiteManagement > div.UIPopupWindow div.TabsContainer div.NormalTab div.MiddleTab</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Search and Select Page</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Search and Select Page</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Select the first page</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UIRepeater']//table//tbody/tr/td[5]/div[@class='ActionContainer']/img</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//div[@id='UIRepeater']//table//tbody/tr/td[5]/div[@class='ActionContainer']/img</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Save</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Save</td> - <td>1,1</td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Save</td> - <td>1,1</td> -</tr> -<tr> - <td>echo</td> - <td>--Edit Portal Properties</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Edit Portal's Properties</td> - <td>1,1</td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Edit Portal's Properties</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']//div[3]//div[@class='MiddleTab']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIMaskWorkspace']//div[3]//div[@class='MiddleTab']</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Edit Permission Setting</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Edit Permission Setting</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Select Permission</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Select Permission</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Platform</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Platform</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Administrators</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Administrators</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='PermissionSelector']//div[2]/a</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//form[@id='UIPortalForm']//div[@class='UIAction']//div[@class='ActionButton LightBlueStyle']</td> - <td></td> -</tr> -<tr> - <td>open</td> - <td>/portal/private/classic/</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Select new node</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=test_node_label_19</td> - <td></td> -</tr> -<tr> - <td>verifyElementPresent</td> - <td>//div[@class='SelectedNavigationTab']//a</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Delete node</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Site</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Site</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Edit Navigation</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Edit Navigation</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UINavigationManagement']</td> - <td></td> -</tr> -<tr> - <td>componentExoContextMenu</td> - <td>//a[@title='test_node_label_19']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td> - <td></td> -</tr> -<tr> - <td>waitForConfirmation</td> - <td>Are you sure you want to delete this node?</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Save</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Save</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Verify Deletion</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Home</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Home</td> - <td></td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>Demo</td> - <td></td> -</tr> -<tr> - <td>verifyTextNotPresent</td> - <td>test_node_label_19</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Sign out</td> - <td></td> -</tr> - -</tbody></table> -</body> -</html> Copied: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20.html (from rev 1794, portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_20.html) =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20.html 2010-02-22 18:55:21 UTC (rev 1810) @@ -0,0 +1,207 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>SNF_PRL_20</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">SNF_PRL_20</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-DeletePortal-</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Add new portal</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Add New Portal</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Add New Portal</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'PortalSetting');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=PortalSetting')"]</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'PortalSetting');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=PortalSetting')"]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>name</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>name</td> + <td>test_portal_name_20</td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'Properties');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=Properties')"]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>document.forms[0].elements[6]</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'PermissionSetting');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=PermissionSetting')"]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>publicMode</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>publicMode</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Edit Permission Setting</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Select Permission</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Select Permission</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=exact:*</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=exact:*</td> + <td></td> +</tr> +<tr> + <td>waitForText</td> + <td>//div[@id='UIPermissionSelector']/div/div[2]/div[1]/div[3]/div[2]</td> + <td>exact:*</td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>test_portal_name_20</td> + <td>1,1</td> +</tr> +<tr> + <td>echo</td> + <td>--Delete portal</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmation</td> + <td>Are you sure you want to delete this portal?</td> + <td></td> +</tr> +<tr> + <td>waitForTextNotPresent</td> + <td>test_portal_name_20</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> + <td>test_portal_name_20</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> Deleted: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23.html 2010-02-22 17:36:06 UTC (rev 1809) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23.html 2010-02-22 18:55:21 UTC (rev 1810) @@ -1,197 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link rel="selenium.base" href="" /> -<title>SNF_PRL_23</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_23</td></tr> -</thead><tbody> -<tr> - <td>open</td> - <td>/portal/public/classic</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>-AddNavigation-</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Sign in</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>username</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>username</td> - <td>root</td> -</tr> -<tr> - <td>type</td> - <td>password</td> - <td>gtn</td> -</tr> -<tr> - <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> - <td></td> -</tr> -<tr> - <td>open</td> - <td>/portal/private/classic/</td> - <td></td> -</tr> -<tr> - <td>clickAndWait</td> - <td>link=Group</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Add Navigation</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Add Navigation</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Cancel</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Cancel</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Edit Navigation</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Add Node</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Add Node</td> - <td></td> -</tr> -<tr> - <td>waitForText</td> - <td>name</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>name</td> - <td>test_grp_node_23</td> -</tr> -<tr> - <td>type</td> - <td>label</td> - <td>test_grp_label_23</td> -</tr> -<tr> - <td>echo</td> - <td>--Choose "Page Selector" tab</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@class='CenterHorizontalTabs']//div[@class='NormalTab']//div[@class='MiddleTab']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Search and Select Page</td> - <td>1,1</td> -</tr> -<tr> - <td>echo</td> - <td>--Select the first page from pages list</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIRepeater']//img[@class='SelectPageIcon']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Save</td> - <td>1,1</td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Save</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@ID='UIGroupNavigationGrid']//table[4]//a[@class='EditNavIcon']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@ID='UIGroupNavigationGrid']//table[4]//a[@class='EditNavIcon']</td> - <td></td> -</tr> -<tr> - <td>verifyElementPresent</td> - <td>//a[@title='test_grp_label_23']</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Delete new group navigation</td> - <td></td> -</tr> -<tr> - <td>componentExoContextMenu</td> - <td>//a[@title='test_grp_label_23']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td> - <td></td> -</tr> -<tr> - <td>waitForConfirmation</td> - <td>Are you sure you want to delete this node?</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Save</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Save</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Sign out</td> - <td></td> -</tr> - -</tbody></table> -</body> -</html> Copied: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_19.html (from rev 1794, portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19.html) =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_19.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_19.html 2010-02-22 18:55:21 UTC (rev 1810) @@ -0,0 +1,367 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>SNF_PRL_19</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">SNF_PRL_19</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-EditPortalNavigation-</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Edit Portal layout, currently do not change anything</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//a[@class='EditLayoutIcon']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//a[@class='EditLayoutIcon']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>css=div#Administration/ApplicationRegistryPortlet</td> + <td></td> +</tr> +<tr> + <td>dragAndDropToObject</td> + <td>css=div#Administration/ApplicationRegistryPortlet</td> + <td>css=div#UIPortal div.UIRowContainer</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPortalComposer']//div[@class='OverflowContainer']/a[@class='EdittedSaveButton']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIPortalComposer']//div[@class='OverflowContainer']/a[@class='CloseButton']</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>classic</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Edit nav: add node, actions ...</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Edit Navigation</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Add Node</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Add Node</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>name</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>name</td> + <td>test_nodename_19</td> +</tr> +<tr> + <td>type</td> + <td>label</td> + <td>test_node_label_19</td> +</tr> +<tr> + <td>echo</td> + <td>--Select Page</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>css=div#UISiteManagement > div.UIPopupWindow div.TabsContainer div.NormalTab div.MiddleTab</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Search and Select Page</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Search and Select Page</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Select the first page</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIRepeater']//table//tbody/tr/td[5]/div[@class='ActionContainer']/img</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIRepeater']//table//tbody/tr/td[5]/div[@class='ActionContainer']/img</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Save</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td>1,1</td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td>1,1</td> +</tr> +<tr> + <td>echo</td> + <td>--Edit Portal Properties</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Portal's Properties</td> + <td>1,1</td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Edit Portal's Properties</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIMaskWorkspace']//div[3]//div[@class='MiddleTab']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIMaskWorkspace']//div[3]//div[@class='MiddleTab']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Permission Setting</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Edit Permission Setting</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Select Permission</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Select Permission</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='PermissionSelector']//div[2]/a</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//form[@id='UIPortalForm']//div[@class='UIAction']//div[@class='ActionButton LightBlueStyle']</td> + <td></td> +</tr> +<tr> + <td>open</td> + <td>/portal/private/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Select new node</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=test_node_label_19</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=test_node_label_19</td> + <td></td> +</tr> +<tr> + <td>verifyElementPresent</td> + <td>//div[@class='SelectedNavigationTab']//a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Delete node</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UINavigationManagement']</td> + <td></td> +</tr> +<tr> + <td>componentExoContextMenu</td> + <td>//a[@title='test_node_label_19']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmation</td> + <td>Are you sure you want to delete this node?</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Verify Deletion</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Home</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Home</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>Demo</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> + <td>test_node_label_19</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> Copied: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_23.html (from rev 1794, portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23.html) =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_23.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_23.html 2010-02-22 18:55:21 UTC (rev 1810) @@ -0,0 +1,197 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>SNF_PRL_23</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">SNF_PRL_23</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-AddNavigation-</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>open</td> + <td>/portal/private/classic/</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Add Navigation</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Add Navigation</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Cancel</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Cancel</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Add Node</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Add Node</td> + <td></td> +</tr> +<tr> + <td>waitForText</td> + <td>name</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>name</td> + <td>test_grp_node_23</td> +</tr> +<tr> + <td>type</td> + <td>label</td> + <td>test_grp_label_23</td> +</tr> +<tr> + <td>echo</td> + <td>--Choose "Page Selector" tab</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@class='CenterHorizontalTabs']//div[@class='NormalTab']//div[@class='MiddleTab']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Search and Select Page</td> + <td>1,1</td> +</tr> +<tr> + <td>echo</td> + <td>--Select the first page from pages list</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIRepeater']//img[@class='SelectPageIcon']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td>1,1</td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@ID='UIGroupNavigationGrid']//table[4]//a[@class='EditNavIcon']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@ID='UIGroupNavigationGrid']//table[4]//a[@class='EditNavIcon']</td> + <td></td> +</tr> +<tr> + <td>verifyElementPresent</td> + <td>//a[@title='test_grp_label_23']</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Delete new group navigation</td> + <td></td> +</tr> +<tr> + <td>componentExoContextMenu</td> + <td>//a[@title='test_grp_label_23']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmation</td> + <td>Are you sure you want to delete this node?</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> Deleted: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_07.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_07.html 2010-02-22 17:36:06 UTC (rev 1809) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_07.html 2010-02-22 18:55:21 UTC (rev 1810) @@ -1,277 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link rel="selenium.base" href="" /> -<title>SNF_PRL_07</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_07</td></tr> -</thead><tbody> -<tr> - <td>open</td> - <td>/portal/public/classic/</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>-GroupManagement-</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>link=Sign in</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>username</td> - <td>root</td> -</tr> -<tr> - <td>type</td> - <td>username</td> - <td>root</td> -</tr> -<tr> - <td>type</td> - <td>password</td> - <td>gtn</td> -</tr> -<tr> - <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Select "Users and groups management" in menu</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Group</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Group</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Users and groups management</td> - <td></td> -</tr> -<tr> - <td>clickAndWait</td> - <td>link=Users and groups management</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIOrganizationPortlet']//div[@class='ManagementIconContainer']/a[@class='GroupButton']</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[3]/div/a</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Select "Organization" group from group tree</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIOrganizationPortlet']//div[3]//div[@class='ExpandIcon']/a</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Select "Management group" from group tree</td> - <td></td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>Management</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIOrganizationPortlet']//div[3]//div[@class='ExpandIcon']/a</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Click Add new group icon</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UIOrganizationPortlet']//div[@class='TitleBar']/a[@class='TreeActionIcon AddGroupIcon']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[2]/div[1]/div[1]/a[3]</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>groupName</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>groupName</td> - <td>test_group_name_07</td> -</tr> -<tr> - <td>type</td> - <td>label</td> - <td>test_group_label_07</td> -</tr> -<tr> - <td>type</td> - <td>description</td> - <td>test_group_description_07</td> -</tr> -<tr> - <td>echo</td> - <td>--Click "Save" to complete adding new group</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//form[@id='UIGroupForm']//div[@class='ActionButton LightBlueStyle']</td> - <td></td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>test_group_label_07</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=test_group_label_07</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Click "Select User" icon</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//form[@id='UIGroupMembershipForm']//div[@class='HorizontalLayout']//table[@class='UIFormGrid']//td[@class='FieldComponent']/a</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//td[2]/a</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//form[@id='UIUserSelector']/div[2]/div[2]/table/tbody/tr/td/a[1]/div/div/div</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>john</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>mary</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>root</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Click "Add" button</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//form[@id='UIUserSelector']//div[@class='UIAction']//a[@class='ActionButton LightBlueStyle']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//form[@id='UIUserSelector']//div[@class='UIAction']//a[@class='ActionButton LightBlueStyle']</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//input[@value='john,mary,root']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Save</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@class='UIUserInGroup']//div[@title='john']</td> - <td></td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>john</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>john</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>mary</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>root</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=test_group_label_07</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//a[@class='TreeActionIcon RemoveGroupIcon']</td> - <td></td> -</tr> -<tr> - <td>waitForConfirmation</td> - <td>Are you sure you want to delete this group?</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Sign out</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Sign out</td> - <td></td> -</tr> - -</tbody></table> -</body> -</html> Deleted: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_10.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_10.html 2010-02-22 17:36:06 UTC (rev 1809) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_10.html 2010-02-22 18:55:21 UTC (rev 1810) @@ -1,222 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link rel="selenium.base" href="" /> -<title>SNF_PRL_10</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_10</td></tr> -</thead><tbody> -<tr> - <td>open</td> - <td>/portal/public/classic/</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>-CategoryManagement-</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>link=Sign in</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>username</td> - <td>root</td> -</tr> -<tr> - <td>type</td> - <td>password</td> - <td>gtn</td> -</tr> -<tr> - <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Select "Application Registry"</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Application Registry</td> - <td>1,1</td> -</tr> -<tr> - <td>echo</td> - <td>--Add Category</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UIApplicationOrganizer']//div[@class='UIControlbar']/div[1]</td> - <td>1,1</td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIApplicationOrganizer']//div[@class='UIControlbar']/div[1]</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>name</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>name</td> - <td>test_name_category_10</td> -</tr> -<tr> - <td>type</td> - <td>displayName</td> - <td>test_displayname_category_10</td> -</tr> -<tr> - <td>type</td> - <td>description</td> - <td>test_description_category_10</td> -</tr> -<tr> - <td>echo</td> - <td>--Select permissions</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//div[@class='WorkingArea']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Add Permission</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Add Permission</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Platform</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Platform</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=manager</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=manager</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Save</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UIApplicationOrganizer']//a[@class='ControlIcon EditIcon']</td> - <td></td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>test_displayname_category_10</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>test_displayname_category_10</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Edit Category</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIApplicationOrganizer']//a[@class='ControlIcon EditIcon']</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>displayName</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>displayName</td> - <td>test_displayname_edit_10</td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Save</td> - <td></td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>test_displayname_edit_10</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>test_displayname_edit_10</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Delete Category</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@class='SelectedTab']//a[@class='ControlIcon DeleteIcon']</td> - <td></td> -</tr> -<tr> - <td>waitForConfirmation</td> - <td>Are you sure to delete this category and all applications on it?</td> - <td></td> -</tr> -<tr> - <td>waitForTextNotPresent</td> - <td>test_displayname_edit_10</td> - <td></td> -</tr> -<tr> - <td>verifyTextNotPresent</td> - <td>test_displayname_edit_10</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Sign out</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>link=Sign out</td> - <td></td> -</tr> - -</tbody></table> -</body> -</html> Deleted: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_18.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_18.html 2010-02-22 17:36:06 UTC (rev 1809) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_18.html 2010-02-22 18:55:21 UTC (rev 1810) @@ -1,222 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link rel="selenium.base" href="" /> -<title>SNF_PRL_18</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_18</td></tr> -</thead><tbody> -<tr> - <td>open</td> - <td>/portal/public/classic/</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>-CreateNewPortal-</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Sign in</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>username</td> - <td>root</td> -</tr> -<tr> - <td>type</td> - <td>username</td> - <td>root</td> -</tr> -<tr> - <td>type</td> - <td>password</td> - <td>gtn</td> -</tr> -<tr> - <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> - <td></td> -</tr> -<tr> - <td>open</td> - <td>/portal/private/classic/portalnavigation</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Add new portal</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UISiteManagement']//div[@class='UIAction']//div[@class='ActionButton BlueButton']</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Select portal settings</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>name</td> - <td>test_portal_18</td> -</tr> -<tr> - <td>echo</td> - <td>--Select permission settings</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[4]//div[@class='MiddleTab']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>publicMode</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Edit Permission Setting</td> - <td>1,1</td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Select Permission</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Platform</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='PermissionSelector']//a[@title='Administrators']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='PermissionSelector']//a[@title='Administrators']</td> - <td>1,1</td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='PermissionSelector']//a[@title='manager']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='PermissionSelector']//a[@title='manager']</td> - <td></td> -</tr> -<tr> - <td>waitForTextNotPresent</td> - <td>Permission Selector</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//form[@id='UIPortalForm']//div[@class='UIAction']//div[@class='ActionButton LightBlueStyle']//div[@class='ButtonMiddle']/a</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>test_portal_18</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Verify portal creation</td> - <td></td> -</tr> -<tr> - <td>verifyElementPresent</td> - <td>link=test_portal_18</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Delete new portal</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Site</td> - <td></td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>Portal Navigation</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']/table[2]//a[@class='DeleteIcon']</td> - <td></td> -</tr> -<tr> - <td>clickAndWait</td> - <td>//div[@id='UISiteManagement']/table[2]//a[@class='DeleteIcon']</td> - <td></td> -</tr> -<tr> - <td>waitForConfirmation</td> - <td>Are you sure you want to delete this portal?</td> - <td></td> -</tr> -<tr> - <td>open</td> - <td>/portal/public/classic/</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Site</td> - <td></td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>Portal Navigation</td> - <td></td> -</tr> -<tr> - <td>verifyTextNotPresent</td> - <td>test_portal_18</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Sign out</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Sign out</td> - <td></td> -</tr> - -</tbody></table> -</body> -</html> Deleted: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_20.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_20.html 2010-02-22 17:36:06 UTC (rev 1809) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_20.html 2010-02-22 18:55:21 UTC (rev 1810) @@ -1,207 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link rel="selenium.base" href="" /> -<title>SNF_PRL_20</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_20</td></tr> -</thead><tbody> -<tr> - <td>open</td> - <td>/portal/public/classic/</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>-DeletePortal-</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Sign in</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>username</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>username</td> - <td>root</td> -</tr> -<tr> - <td>type</td> - <td>password</td> - <td>gtn</td> -</tr> -<tr> - <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Site</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Add new portal</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Add New Portal</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Add New Portal</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'PortalSetting');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=PortalSetting')"]</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'PortalSetting');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=PortalSetting')"]</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>name</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>name</td> - <td>test_portal_name_20</td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'Properties');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=Properties')"]</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>document.forms[0].elements[6]</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'PermissionSetting');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=PermissionSetting')"]</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>publicMode</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>publicMode</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Edit Permission Setting</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Select Permission</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Select Permission</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Platform</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Platform</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=exact:*</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=exact:*</td> - <td></td> -</tr> -<tr> - <td>waitForText</td> - <td>//div[@id='UIPermissionSelector']/div/div[2]/div[1]/div[3]/div[2]</td> - <td>exact:*</td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Save</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>test_portal_name_20</td> - <td>1,1</td> -</tr> -<tr> - <td>echo</td> - <td>--Delete portal</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td> - <td></td> -</tr> -<tr> - <td>waitForConfirmation</td> - <td>Are you sure you want to delete this portal?</td> - <td></td> -</tr> -<tr> - <td>waitForTextNotPresent</td> - <td>test_portal_name_20</td> - <td></td> -</tr> -<tr> - <td>verifyTextNotPresent</td> - <td>test_portal_name_20</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Sign out</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Sign out</td> - <td></td> -</tr> - -</tbody></table> -</body> -</html>

14 years, 10 months

1
0
0 / 0

gatein SVN: r1809 - in portal/trunk: component/application-registry/src/main/java/org/exoplatform/application/gadget/impl and 10 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-02-22 12:36:06 -0500 (Mon, 22 Feb 2010) New Revision: 1809 Removed: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/ContentProviderHelper.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/HelpableContentProvider.java Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetData.java portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PortletPreferencesTask.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetContentProvider.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetState.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletContentProvider.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletState.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPContentProvider.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPState.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfoMapping.java portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js portal/trunk/pom.xml Log: GTNPORTAL-714 : Update to Chromattic 1.0.0-cr3 and mop-1.0.0-CR03 Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetData.java =================================================================== --- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetData.java 2010-02-22 16:42:03 UTC (rev 1808) +++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetData.java 2010-02-22 17:36:06 UTC (rev 1809) @@ -18,10 +18,13 @@ */ package org.exoplatform.application.gadget.impl; +import org.chromattic.api.annotations.PrimaryType; + /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ +@PrimaryType(name = "app:gadgetdata") public abstract class GadgetData { } Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java =================================================================== --- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java 2010-02-22 16:42:03 UTC (rev 1808) +++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java 2010-02-22 17:36:06 UTC (rev 1809) @@ -56,7 +56,7 @@ public abstract void setReferenceURL(String referenceURL); @OneToOne - @MappedBy("data") + @MappedBy("app:data") public abstract GadgetData getData(); public abstract void setData(GadgetData data); Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java =================================================================== --- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java 2010-02-22 16:42:03 UTC (rev 1808) +++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java 2010-02-22 17:36:06 UTC (rev 1809) @@ -55,7 +55,7 @@ public abstract void setFileName(String fileName); @OneToOne - @MappedBy("resources") + @MappedBy("app:resources") public abstract NTFolder getResources(); protected abstract void setResources(NTFolder resources); Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java =================================================================== --- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java 2010-02-22 16:42:03 UTC (rev 1808) +++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java 2010-02-22 17:36:06 UTC (rev 1809) @@ -29,7 +29,6 @@ import org.gatein.mop.api.content.ContentType; import org.gatein.mop.api.content.Customization; import org.gatein.mop.api.workspace.Workspace; -import org.gatein.mop.core.api.MOPFormatter; import java.util.Date; import java.util.List; @@ -117,12 +116,12 @@ Workspace workspace = session.getWorkspace(); // - Customization customization = workspace.getCustomization(definitionName); + Customization customization = workspace.getCustomizationContext().getCustomization(definitionName); // if (customization == null) { - workspace.customize(definitionName, contentType, contentId, null); + workspace.getCustomizationContext().customize(definitionName, contentType, contentId, null); } else if (customization.getContentId().equals(contentId)) { Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java =================================================================== --- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java 2010-02-22 16:42:03 UTC (rev 1808) +++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java 2010-02-22 17:36:06 UTC (rev 1809) @@ -76,7 +76,7 @@ POMSession session = category.registry.mopManager.getSession(); Workspace workspace = session.getWorkspace(); String name = getName(); - return workspace.getCustomization(name); + return workspace.getCustomizationContext().getCustomization(name); } Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java 2010-02-22 16:42:03 UTC (rev 1808) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java 2010-02-22 17:36:06 UTC (rev 1809) @@ -173,7 +173,7 @@ private void copy(org.gatein.mop.api.workspace.Page srcPage, org.gatein.mop.api.workspace.Page dstPage, UIContainer src, UIContainer dst) { - for (UIComponent srcChild : src) + for (UIComponent srcChild : src.getComponents()) { UIComponent dstChild = dst.add(srcChild.getObjectType(), srcChild.getObjectId()); @@ -202,11 +202,11 @@ String name = parentCtx.nameOf(parent); if (parentCtx == srcPage) { - dstParent = dstPage.getCustomization(name); + dstParent = dstPage.getCustomizationContext().getCustomization(name); if (dstParent == null) { Object state = parent.getVirtualState(); - dstParent = dstPage.customize(name, contentType, contentId, state); + dstParent = dstPage.getCustomizationContext().customize(name, contentType, contentId, state); } } if (dstParent != null) Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PortletPreferencesTask.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PortletPreferencesTask.java 2010-02-22 16:42:03 UTC (rev 1808) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PortletPreferencesTask.java 2010-02-22 17:36:06 UTC (rev 1809) @@ -136,24 +136,24 @@ String a = instanceName.substring(0, pos); String b = instanceName.substring(pos + 1); Page page = site.getRootPage().getChild("pages").getChild(b); - Customization c = page.getCustomization(a); + Customization c = page.getCustomizationContext().getCustomization(a); if (c != null) { c.destroy(); } customization = - page.customize(a, Portlet.CONTENT_TYPE, applicationName + "/" + portletName, + page.getCustomizationContext().customize(a, Portlet.CONTENT_TYPE, applicationName + "/" + portletName, new PortletBuilder().build()); } else { - Customization c = site.getCustomization(instanceName); + Customization c = site.getCustomizationContext().getCustomization(instanceName); if (c != null) { c.destroy(); } customization = - site.customize(instanceName, Portlet.CONTENT_TYPE, applicationName + "/" + portletName, + site.getCustomizationContext().customize(instanceName, Portlet.CONTENT_TYPE, applicationName + "/" + portletName, new PortletBuilder().build()); } } @@ -221,14 +221,14 @@ int pos = instanceName.indexOf('#'); if (pos == -1) { - customization = (Customization<Portlet>)site.getCustomization(instanceName); + customization = (Customization<Portlet>)site.getCustomizationContext().getCustomization(instanceName); } else { String a = instanceName.substring(0, pos); String b = instanceName.substring(pos + 1); Page page = site.getRootPage().getChild("pages").getChild(b); - customization = (Customization<Portlet>)page.getCustomization(a); + customization = (Customization<Portlet>)page.getCustomizationContext().getCustomization(a); } } Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-02-22 16:42:03 UTC (rev 1808) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-02-22 17:36:06 UTC (rev 1809) @@ -437,8 +437,8 @@ private List<ComponentData> loadChildren(UIContainer src) { if (src == null) throw new NoSuchDataException("Can not load children"); - ArrayList<ComponentData> children = new ArrayList<ComponentData>(src.size()); - for (UIComponent component : src) + ArrayList<ComponentData> children = new ArrayList<ComponentData>(); + for (UIComponent component : src.getComponents()) { // Obtain a model object from the ui component @@ -696,7 +696,7 @@ } */ boolean found = false; - for (UIComponent child : dst) + for (UIComponent child : dst.getComponents()) { if (child.getObjectId().equals(srcChildId)) { @@ -713,7 +713,7 @@ String srcId = hierarchyRelationships.get(srcChildId); // It's a move operation, so we move the node first - dst.add(dstChild); + dst.getComponents().add(dstChild); // changes.add(new ModelChange.Move(srcId, dst.getObjectId(), srcChildId)); @@ -765,7 +765,7 @@ } // Take care of move operation that could be seen as a remove otherwise - for (UIComponent dstChild : dst) + for (UIComponent dstChild : dst.getComponents()) { String dstChildId = dstChild.getObjectId(); if (!modelObjectMap.containsKey(dstChildId)) @@ -777,7 +777,7 @@ UIContainer parent = session.findObjectById(ObjectType.CONTAINER, parentId); // Perform the move - parent.add(dstChild); + parent.getComponents().add(dstChild); // changes.add(new ModelChange.Move(dst.getObjectId(), parentId, dstChildId)); @@ -790,7 +790,7 @@ } // Delete removed children - for (Iterator<UIComponent> i = dst.iterator(); i.hasNext();) + for (Iterator<UIComponent> i = dst.getComponents().iterator(); i.hasNext();) { UIComponent dstChild = i.next(); String dstChildId = dstChild.getObjectId(); @@ -803,7 +803,7 @@ // Now sort children according to the order provided by the container // need to replace that with Collections.sort once the set(int index, E element) is implemented in Chromattic lists - UIComponent[] a = dst.toArray(new UIComponent[dst.size()]); + UIComponent[] a = dst.getComponents().toArray(new UIComponent[dst.getComponents().size()]); Arrays.sort(a, new Comparator<UIComponent>() { public int compare(UIComponent o1, UIComponent o2) @@ -815,7 +815,7 @@ }); for (int j = 0; j < a.length; j++) { - dst.add(j, a[j]); + dst.getComponents().add(j, a[j]); } } @@ -961,16 +961,16 @@ // then we get its customization if (site != null) { - customization = site.getCustomization(uniqueId); + customization = site.getCustomizationContext().getCustomization(uniqueId); } else { - customization = currentSite.getCustomization(uniqueId); + customization = currentSite.getCustomizationContext().getCustomization(uniqueId); // If it does not exist we create it if (customization == null) { - customization = currentSite.customize(uniqueId, contentType, contentId, null); + customization = currentSite.getCustomizationContext().customize(uniqueId, contentType, contentId, null); } } } @@ -981,7 +981,7 @@ String a = uniqueId.substring(0, pos); String b = uniqueId.substring(pos + 1); org.gatein.mop.api.workspace.Page page = site.getRootPage().getChild("pages").getChild(b); - customization = page.getCustomization(a); + customization = page.getCustomizationContext().getCustomization(a); } } } Deleted: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/ContentProviderHelper.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/ContentProviderHelper.java 2010-02-22 16:42:03 UTC (rev 1808) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/ContentProviderHelper.java 2010-02-22 17:36:06 UTC (rev 1809) @@ -1,109 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.exoplatform.portal.pom.spi; - -import org.chromattic.api.ChromatticSession; -import org.chromattic.api.UndeclaredRepositoryException; -import org.gatein.mop.core.api.workspace.content.AbstractCustomization; -import org.gatein.mop.spi.content.StateContainer; - -import javax.jcr.Node; -import javax.jcr.RepositoryException; - -/** - * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> - * @version $Revision$ - */ -public class ContentProviderHelper -{ - /** . */ - private static final String STATE_NODE_NAME = "mop:state"; - - public static <InternalState, State> void setState(StateContainer container, State state, - HelpableContentProvider<InternalState, State> provider) - { - try - { - ChromatticSession session = ((AbstractCustomization)container).session; - String containerId = session.getId(container); - Node node = session.getJCRSession().getNodeByUUID(containerId); - - // - InternalState internalState; - if (node.hasNode(STATE_NODE_NAME)) - { - Node stateNode = node.getNode(STATE_NODE_NAME); - internalState = (InternalState)session.findById(Object.class, stateNode.getUUID()); - if (state == null) - { - session.remove(internalState); - return; - } - } - else - { - if (state == null) - { - return; - } - else - { - Node stateNode = node.addNode(STATE_NODE_NAME, provider.getNodeName()); - internalState = (InternalState)session.findById(Object.class, stateNode.getUUID()); - } - } - - // - provider.setInternalState(internalState, state); - } - catch (RepositoryException e) - { - throw new UndeclaredRepositoryException(e); - } - } - - public static <InternalState, State> State getState(StateContainer container, - HelpableContentProvider<InternalState, State> provider) - { - try - { - ChromatticSession session = ((AbstractCustomization)container).session; - String containerId = session.getId(container); - Node node = session.getJCRSession().getNodeByUUID(containerId); - - // - InternalState prefs; - if (node.hasNode(STATE_NODE_NAME)) - { - Node stateNode = node.getNode(STATE_NODE_NAME); - prefs = (InternalState)session.findById(Object.class, stateNode.getUUID()); - return provider.getState(prefs); - } - else - { - return null; - } - } - catch (RepositoryException e) - { - throw new UndeclaredRepositoryException(e); - } - } -} Deleted: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/HelpableContentProvider.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/HelpableContentProvider.java 2010-02-22 16:42:03 UTC (rev 1808) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/HelpableContentProvider.java 2010-02-22 17:36:06 UTC (rev 1809) @@ -1,33 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.exoplatform.portal.pom.spi; - -/** - * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> - * @version $Revision$ - */ -public interface HelpableContentProvider<InternalState, State> -{ - String getNodeName(); - - void setInternalState(InternalState persistedState, State updatedState); - - State getState(InternalState internalState); -} Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetContentProvider.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetContentProvider.java 2010-02-22 16:42:03 UTC (rev 1808) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetContentProvider.java 2010-02-22 17:36:06 UTC (rev 1809) @@ -19,8 +19,6 @@ package org.exoplatform.portal.pom.spi.gadget; -import org.exoplatform.portal.pom.spi.ContentProviderHelper; -import org.exoplatform.portal.pom.spi.HelpableContentProvider; import org.gatein.mop.spi.content.ContentProvider; import org.gatein.mop.spi.content.StateContainer; @@ -30,7 +28,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public class GadgetContentProvider implements ContentProvider<Gadget>, HelpableContentProvider<GadgetState, Gadget> +public class GadgetContentProvider implements ContentProvider<Gadget, GadgetState> { public Gadget combine(List<Gadget> states) @@ -38,35 +36,52 @@ throw new UnsupportedOperationException(); } - public void setState(StateContainer container, Gadget state) + public void setState(StateContainer<GadgetState> container, Gadget state) { - ContentProviderHelper.setState(container, state, this); + GadgetState prefs = container.getState(); + if (prefs != null) + { + if (state == null) + { + container.setState(null); + } + else + { + prefs.setUserPrefs(state.getUserPref()); + } + } + else + { + if (state != null) + { + prefs = container.create(); + prefs.setUserPrefs(state.getUserPref()); + } + } } - public Gadget getState(StateContainer container) + public Gadget getState(StateContainer<GadgetState> container) { - return ContentProviderHelper.getState(container, this); + GadgetState prefs = container.getState(); + if (prefs != null) + { + Gadget gadget = new Gadget(); + gadget.setUserPref(prefs.getUserPrefs()); + return gadget; + } + else + { + return null; + } } - public Class<Gadget> getStateType() + public Class<Gadget> getExternalType() { return Gadget.class; } - public String getNodeName() + public Class<GadgetState> getInternalType() { - return GadgetState.MOP_NODE_NAME; + return GadgetState.class; } - - public void setInternalState(GadgetState gadgetState, Gadget gadget) - { - gadgetState.setUserPrefs(gadget.getUserPref()); - } - - public Gadget getState(GadgetState gadgetState) - { - Gadget gadget = new Gadget(); - gadget.setUserPref(gadgetState.getUserPrefs()); - return gadget; - } } Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetState.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetState.java 2010-02-22 16:42:03 UTC (rev 1808) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetState.java 2010-02-22 17:36:06 UTC (rev 1809) @@ -21,16 +21,15 @@ import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.Property; +import org.gatein.mop.core.api.workspace.content.AbstractCustomizationState; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -@PrimaryType(name = GadgetState.MOP_NODE_NAME) -public abstract class GadgetState +@PrimaryType(name = "mop:gadget") +public abstract class GadgetState extends AbstractCustomizationState { - static final String MOP_NODE_NAME = "mop:gadget"; - @Property(name = "mop:prefs") public abstract String getUserPrefs(); Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletContentProvider.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletContentProvider.java 2010-02-22 16:42:03 UTC (rev 1808) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletContentProvider.java 2010-02-22 17:36:06 UTC (rev 1809) @@ -19,8 +19,6 @@ package org.exoplatform.portal.pom.spi.portlet; -import org.exoplatform.portal.pom.spi.ContentProviderHelper; -import org.exoplatform.portal.pom.spi.HelpableContentProvider; import org.gatein.mop.spi.content.ContentProvider; import org.gatein.mop.spi.content.StateContainer; @@ -32,8 +30,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public class PortletContentProvider implements ContentProvider<Portlet>, - HelpableContentProvider<PortletState, Portlet> +public class PortletContentProvider implements ContentProvider<Portlet, PortletState> { public PortletContentProvider() @@ -61,33 +58,52 @@ return new Portlet(entries); } - public void setState(StateContainer container, Portlet state) + public void setState(StateContainer<PortletState> container, Portlet state) { - ContentProviderHelper.setState(container, state, this); + PortletState prefs = container.getState(); + + // + if (prefs != null) + { + if (state == null) + { + container.setState(null); + } + else + { + prefs.setPayload(state); + } + } + else + { + if (state != null) + { + prefs = container.create(); + prefs.setPayload(state); + } + } } - public Portlet getState(StateContainer container) + public Portlet getState(StateContainer<PortletState> container) { - return ContentProviderHelper.getState(container, this); + PortletState prefs = container.getState(); + if (prefs != null) + { + return prefs.getPayload(); + } + else + { + return null; + } } - public Class<Portlet> getStateType() + public Class<Portlet> getExternalType() { return Portlet.class; } - public String getNodeName() + public Class<PortletState> getInternalType() { - return PortletState.MOP_NODE_NAME; + return PortletState.class; } - - public void setInternalState(PortletState portletPreferencesState, Portlet preferences) - { - portletPreferencesState.setPayload(preferences); - } - - public Portlet getState(PortletState portletPreferencesState) - { - return (Portlet)portletPreferencesState.getPayload(); - } } Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletState.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletState.java 2010-02-22 16:42:03 UTC (rev 1808) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletState.java 2010-02-22 17:36:06 UTC (rev 1809) @@ -21,7 +21,7 @@ import org.chromattic.api.annotations.*; import org.gatein.mop.core.api.MOPFormatter; -import org.gatein.mop.core.api.workspace.content.AbstractCustomization; +import org.gatein.mop.core.api.workspace.content.AbstractCustomizationState; import java.util.Map; @@ -29,14 +29,13 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -@PrimaryType(name = PortletState.MOP_NODE_NAME) +@PrimaryType(name = "mop:portletpreferences") @FormattedBy(MOPFormatter.class) -public abstract class PortletState +public abstract class PortletState extends AbstractCustomizationState { /** . */ private Portlet payload; - static final String MOP_NODE_NAME = "mop:portletpreferences"; @OneToMany public abstract Map<String, PreferenceState> getChildren(); @@ -44,13 +43,8 @@ @Create public abstract PreferenceState create(); - @OneToOne - @RelatedMappedBy("mop:state") - public abstract AbstractCustomization getCustomization(); - - private void setPayload(Portlet payload) + public void setPayload(Portlet payload) { - this.payload = payload; // @@ -66,13 +60,8 @@ } } - public void setPayload(Object payload) + public Portlet getPayload() { - setPayload((Portlet)payload); - } - - public Object getPayload() - { if (payload == null) { PortletBuilder builder = new PortletBuilder(); Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPContentProvider.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPContentProvider.java 2010-02-22 16:42:03 UTC (rev 1808) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPContentProvider.java 2010-02-22 17:36:06 UTC (rev 1809) @@ -20,8 +20,6 @@ package org.exoplatform.portal.pom.spi.wsrp; import org.exoplatform.commons.utils.Safe; -import org.exoplatform.portal.pom.spi.ContentProviderHelper; -import org.exoplatform.portal.pom.spi.HelpableContentProvider; import org.gatein.mop.spi.content.ContentProvider; import org.gatein.mop.spi.content.StateContainer; @@ -32,7 +30,7 @@ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -public class WSRPContentProvider implements ContentProvider<WSRP>, HelpableContentProvider<WSRPState, WSRP> +public class WSRPContentProvider implements ContentProvider<WSRP, WSRPState> { public WSRP combine(List<WSRP> wsrpStates) @@ -40,27 +38,54 @@ throw new UnsupportedOperationException("todo"); } - public void setState(StateContainer stateContainer, WSRP wsrpState) + public void setState(StateContainer<WSRPState> container, WSRP state) { - ContentProviderHelper.setState(stateContainer, wsrpState, this); + WSRPState wsrpState = container.getState(); + if (wsrpState != null) + { + if (state == null) + { + container.setState(null); + } + else + { + setInternalState(wsrpState, state); + } + } + else + { + if (state != null) + { + wsrpState = container.create(); + setInternalState(wsrpState, state); + } + } } - public WSRP getState(StateContainer stateContainer) + public WSRP getState(StateContainer<WSRPState> container) { - return ContentProviderHelper.getState(stateContainer, this); + WSRPState wsrpState = container.getState(); + if (wsrpState != null) + { + return getState(wsrpState); + } + else + { + return null; + } } - public Class<WSRP> getStateType() + public Class<WSRP> getExternalType() { return WSRP.class; } - public String getNodeName() + public Class<WSRPState> getInternalType() { - return WSRPState.MOP_NODE_NAME; + return WSRPState.class; } - public void setInternalState(WSRPState persistedState, WSRP updatedState) + private void setInternalState(WSRPState persistedState, WSRP updatedState) { byte[] bytes = updatedState.getState(); if (bytes != null && bytes.length > 0) @@ -72,7 +97,7 @@ persistedState.setCloned(updatedState.isCloned()); } - public WSRP getState(WSRPState state) + private WSRP getState(WSRPState state) { WSRP wsrp = new WSRP(); byte[] bytes = Safe.getBytes(state.getState()); Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPState.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPState.java 2010-02-22 16:42:03 UTC (rev 1808) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPState.java 2010-02-22 17:36:06 UTC (rev 1809) @@ -24,6 +24,7 @@ import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.Property; +import org.gatein.mop.core.api.workspace.content.AbstractCustomizationState; import java.io.InputStream; @@ -31,11 +32,9 @@ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -@PrimaryType(name = WSRPState.MOP_NODE_NAME) -public abstract class WSRPState +@PrimaryType(name = "mop:wsrpstate") +public abstract class WSRPState extends AbstractCustomizationState { - static final String MOP_NODE_NAME = "mop:wsrpstate"; - @Property(name = "mop:portletid") public abstract String getPortletId(); Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2010-02-22 16:42:03 UTC (rev 1808) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2010-02-22 17:36:06 UTC (rev 1809) @@ -187,8 +187,8 @@ // UIContainer c = testPage.getRootComponent(); assertNotNull(c); - assertEquals(2, c.size()); - Iterator<? extends UIComponent> it = c.iterator(); + assertEquals(2, c.getComponents().size()); + Iterator<? extends UIComponent> it = c.getComponents().iterator(); // UIContainer container1 = (UIContainer)it.next(); Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfoMapping.java =================================================================== --- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfoMapping.java 2010-02-22 16:42:03 UTC (rev 1808) +++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfoMapping.java 2010-02-22 17:36:06 UTC (rev 1809) @@ -23,7 +23,6 @@ package org.gatein.portal.wsrp.state.consumer.mapping; -import org.chromattic.api.annotations.DefaultValue; import org.chromattic.api.annotations.Id; import org.chromattic.api.annotations.MappedBy; import org.chromattic.api.annotations.OneToOne; @@ -60,8 +59,7 @@ public abstract void setExpirationCacheSeconds(Integer expiration); - @Property(name = "active") - @DefaultValue.Boolean(false) + @Property(name = "active", defaultValue = "false") public abstract boolean getActive(); public abstract void setActive(boolean active); Modified: portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js =================================================================== --- portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js 2010-02-22 16:42:03 UTC (rev 1808) +++ portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js 2010-02-22 17:36:06 UTC (rev 1809) @@ -113,6 +113,7 @@ addDependency(new Project("org.chromattic", "chromattic.api", "jar", chromatticVersion)). addDependency(new Project("org.chromattic", "chromattic.common", "jar", chromatticVersion)). addDependency(new Project("org.chromattic", "chromattic.spi", "jar", chromatticVersion)). + addDependency(new Project("org.chromattic", "chromattic.metamodel", "jar", chromatticVersion)). addDependency(new Project("org.chromattic", "chromattic.core", "jar", chromatticVersion)). addDependency(new Project("org.chromattic", "chromattic.apt", "jar", chromatticVersion)). addDependency(new Project("org.chromattic", "chromattic.ext", "jar", chromatticVersion)). Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2010-02-22 16:42:03 UTC (rev 1808) +++ portal/trunk/pom.xml 2010-02-22 17:36:06 UTC (rev 1809) @@ -48,12 +48,12 @@ <org.gatein.pc.version>2.1.0-CR04</org.gatein.pc.version> <org.picketlink.idm>1.1.0.Beta5</org.picketlink.idm> <org.gatein.wsrp.version>1.0.0-Beta08</org.gatein.wsrp.version> - <org.gatein.mop.version>1.0.0-CR02</org.gatein.mop.version> + <org.gatein.mop.version>1.0.0-CR03</org.gatein.mop.version> <org.slf4j.version>1.5.6</org.slf4j.version> <rhino.version>1.6R5</rhino.version> <org.codehaus.groovy.version>1.6.5</org.codehaus.groovy.version> <javax.servlet.version>2.5</javax.servlet.version> - <version.chromattic>1.0.0-cr1</version.chromattic> + <version.chromattic>1.0.0-cr2</version.chromattic> <version.reflect>1.0.0-beta5</version.reflect>

14 years, 10 months

1
0
0 / 0

gatein SVN: r1808 - in components/mop/trunk: api and 2 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-02-22 11:42:03 -0500 (Mon, 22 Feb 2010) New Revision: 1808 Modified: components/mop/trunk/api/pom.xml components/mop/trunk/core/pom.xml components/mop/trunk/pom.xml components/mop/trunk/spi/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: components/mop/trunk/api/pom.xml =================================================================== --- components/mop/trunk/api/pom.xml 2010-02-22 16:41:46 UTC (rev 1807) +++ components/mop/trunk/api/pom.xml 2010-02-22 16:42:03 UTC (rev 1808) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.0.0-CR03</version> + <version>1.0.0-CR04-SNAPSHOT</version> </parent>  Modified: components/mop/trunk/core/pom.xml =================================================================== --- components/mop/trunk/core/pom.xml 2010-02-22 16:41:46 UTC (rev 1807) +++ components/mop/trunk/core/pom.xml 2010-02-22 16:42:03 UTC (rev 1808) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.0.0-CR03</version> + <version>1.0.0-CR04-SNAPSHOT</version> </parent>  Modified: components/mop/trunk/pom.xml =================================================================== --- components/mop/trunk/pom.xml 2010-02-22 16:41:46 UTC (rev 1807) +++ components/mop/trunk/pom.xml 2010-02-22 16:42:03 UTC (rev 1808) @@ -34,16 +34,16 @@ <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.0.0-CR03</version> + <version>1.0.0-CR04-SNAPSHOT</version> <packaging>pom</packaging> <name>GateIn - MOP</name> <description>Model Object for Portal</description> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/tags/1.0.0-CR03</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.0.0-CR03</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.0.0-CR03</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url> </scm> Modified: components/mop/trunk/spi/pom.xml =================================================================== --- components/mop/trunk/spi/pom.xml 2010-02-22 16:41:46 UTC (rev 1807) +++ components/mop/trunk/spi/pom.xml 2010-02-22 16:42:03 UTC (rev 1808) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.0.0-CR03</version> + <version>1.0.0-CR04-SNAPSHOT</version> </parent>

14 years, 10 months

1
0
0 / 0

gatein SVN: r1807 - components/mop/tags.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-02-22 11:41:46 -0500 (Mon, 22 Feb 2010) New Revision: 1807 Added: components/mop/tags/1.0.0-CR03/ Log: [maven-scm] copy for tag 1.0.0-CR03 Copied: components/mop/tags/1.0.0-CR03 (from rev 1806, components/mop/trunk)

14 years, 10 months

1
0
0 / 0

gatein SVN: r1806 - in components/mop/trunk: api and 2 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-02-22 11:41:26 -0500 (Mon, 22 Feb 2010) New Revision: 1806 Modified: components/mop/trunk/api/pom.xml components/mop/trunk/core/pom.xml components/mop/trunk/pom.xml components/mop/trunk/spi/pom.xml Log: [maven-release-plugin] prepare release 1.0.0-CR03 Modified: components/mop/trunk/api/pom.xml =================================================================== --- components/mop/trunk/api/pom.xml 2010-02-22 15:50:10 UTC (rev 1805) +++ components/mop/trunk/api/pom.xml 2010-02-22 16:41:26 UTC (rev 1806) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.0.0-CR03-SNAPSHOT</version> + <version>1.0.0-CR03</version> </parent>  Modified: components/mop/trunk/core/pom.xml =================================================================== --- components/mop/trunk/core/pom.xml 2010-02-22 15:50:10 UTC (rev 1805) +++ components/mop/trunk/core/pom.xml 2010-02-22 16:41:26 UTC (rev 1806) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.0.0-CR03-SNAPSHOT</version> + <version>1.0.0-CR03</version> </parent>  Modified: components/mop/trunk/pom.xml =================================================================== --- components/mop/trunk/pom.xml 2010-02-22 15:50:10 UTC (rev 1805) +++ components/mop/trunk/pom.xml 2010-02-22 16:41:26 UTC (rev 1806) @@ -34,16 +34,16 @@ <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.0.0-CR03-SNAPSHOT</version> + <version>1.0.0-CR03</version> <packaging>pom</packaging> <name>GateIn - MOP</name> <description>Model Object for Portal</description> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/tags/1.0.0-CR03</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.0.0-CR03</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.0.0-CR03</url> </scm> Modified: components/mop/trunk/spi/pom.xml =================================================================== --- components/mop/trunk/spi/pom.xml 2010-02-22 15:50:10 UTC (rev 1805) +++ components/mop/trunk/spi/pom.xml 2010-02-22 16:41:26 UTC (rev 1806) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.0.0-CR03-SNAPSHOT</version> + <version>1.0.0-CR03</version> </parent>

14 years, 10 months

1
0
0 / 0

gatein SVN: r1805 - components/mop/trunk/core.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-02-22 10:50:10 -0500 (Mon, 22 Feb 2010) New Revision: 1805 Modified: components/mop/trunk/core/pom.xml Log: update to chromattic 1.0.0-cr2 Modified: components/mop/trunk/core/pom.xml =================================================================== --- components/mop/trunk/core/pom.xml 2010-02-22 14:43:03 UTC (rev 1804) +++ components/mop/trunk/core/pom.xml 2010-02-22 15:50:10 UTC (rev 1805) @@ -38,7 +38,7 @@ <description>Model Object for Portal Core</description> <properties> - <org.chromattic.version>1.0.0-cr2-SNAPSHOT</org.chromattic.version> + <org.chromattic.version>1.0.0-cr2</org.chromattic.version> </properties> <dependencies>

14 years, 10 months

1
0
0 / 0

gatein SVN: r1804 - in portal/trunk/testsuite/selenium-snifftests: src/main/java/org/exoplatform/portal/selenium and 3 other directories.

by do-not-reply＠jboss.org

Author: dbaeli Date: 2010-02-22 09:43:03 -0500 (Mon, 22 Feb 2010) New Revision: 1804 Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_06.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_13.html Removed: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_13.html Modified: portal/trunk/testsuite/selenium-snifftests/pom.xml portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/TestSuite_SNF_PRL.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09.html Log: GTNPORTAL-509: Selenium tests * Hudson integration, add timeout and speed as parameter * Move tests blocked by GateIn issues in issues/ directory Modified: portal/trunk/testsuite/selenium-snifftests/pom.xml =================================================================== --- portal/trunk/testsuite/selenium-snifftests/pom.xml 2010-02-22 13:36:23 UTC (rev 1803) +++ portal/trunk/testsuite/selenium-snifftests/pom.xml 2010-02-22 14:43:03 UTC (rev 1804) @@ -16,6 +16,8 @@ <org.selenium.server.version>1.0.1</org.selenium.server.version> <selenium.port>4444</selenium.port> <selenium.browser>firefox</selenium.browser> + <selenium.timeout>30000</selenium.timeout> + <selenium.speed>150</selenium.speed> <org.selenium.maven-plugin.version>1.0</org.selenium.maven-plugin.version> </properties> Modified: portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java 2010-02-22 13:36:23 UTC (rev 1803) +++ portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java 2010-02-22 14:43:03 UTC (rev 1804) @@ -90,10 +90,15 @@ private void appendCommonMethods(StringBuffer sb) { sb.append("public String speed = \"100\";\n"); + sb.append("public String timeout = \"30000\";\n"); + sb.append("public int timeoutSecInt = 30;\n"); sb.append("public String browser = \"firefox\";\n"); sb.append("public void setSpeed() {\n selenium.setSpeed(speed);\n}\n\n"); sb.append("public void setUp() throws Exception {\n"); sb.append(" browser = System.getProperty(\"selenium.browser\", browser);\n"); + sb.append(" timeout = System.getProperty(\"selenium.timeout\", timeout);\n"); + sb.append(" timeoutSecInt = Integer.parseInt(timeout)/1000;\n"); + sb.append(" speed = System.getProperty(\"selenium.speed\", speed);\n"); sb.append(" super.setUp(\"http://localhost:8080/portal/\", \"*\" + browser);\n"); sb.append("}\n\n"); } @@ -186,7 +191,7 @@ sb.append("selenium.click(\""); sb.append(param2); sb.append("\");\n"); - sb.append("selenium.waitForPageToLoad(\"30000\");\n"); + sb.append("selenium.waitForPageToLoad(timeout);\n"); } else if (param1.equals("clickAt")) { sb.append("selenium."); sb.append(param1); @@ -197,7 +202,7 @@ sb.append("selenium.clickAt(\""); sb.append(param2); sb.append("\", \"1,1\");\n"); - sb.append("selenium.waitForPageToLoad(\"30000\");\n"); + sb.append("selenium.waitForPageToLoad(timeout);\n"); } else if (param1.equals("close")) { sb.append("selenium."); sb.append(param1); @@ -221,7 +226,7 @@ sb.append("\", \""); sb.append(param3); sb.append("\");\n"); - sb.append("selenium.waitForPageToLoad(\"30000\");\n"); + sb.append("selenium.waitForPageToLoad(timeout);\n"); } else if (param1.equals("storeText")) { sb.append("String "); sb.append(param3); @@ -390,7 +395,7 @@ sb.append("selenium.check(\""); sb.append(param2); sb.append("\");\n"); - sb.append("selenium.waitForPageToLoad(\"30000\");\n"); + sb.append("selenium.waitForPageToLoad(timeout);\n"); } else if (param1.equals("echo")) { sb.append("System.out.println(\"" + param2 + "\");\n"); } else if (!param1.isEmpty()) { @@ -404,7 +409,7 @@ } private String getTimeoutMessage(String param1) { - return "if (second >= 30) fail(\"" +param1+" reached a timeout.\");\n"; + return "if (second >= timeoutSecInt)\n fail(\"" + param1 +" reached a timeout (\" + timeoutSecInt + \"s)\");\n"; } public static void writeFile(String file, String content) throws IOException { Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/TestSuite_SNF_PRL.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/TestSuite_SNF_PRL.html 2010-02-22 13:36:23 UTC (rev 1803) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/TestSuite_SNF_PRL.html 2010-02-22 14:43:03 UTC (rev 1804) @@ -12,7 +12,6 @@ <tr><td><a href="Test_SNF_PRL_03.html">SNF_PRL_03</a></td></tr> <tr><td><a href="Test_SNF_PRL_04.html">SNF_PRL_04</a></td></tr> <tr><td><a href="Test_SNF_PRL_05.html">SNF_PRL_05</a></td></tr> -<tr><td><a href="Test_SNF_PRL_06.html">SNF_PRL_06</a></td></tr> <tr><td><a href="Test_SNF_PRL_08.html">SNF_PRL_08</a></td></tr> <tr><td><a href="Test_SNF_PRL_09.html">SNF_PRL_09</a></td></tr> <tr><td><a href="Test_SNF_PRL_11.html">SNF_PRL_11</a></td></tr> @@ -30,7 +29,6 @@ <tr><td><a href="Test_SNF_PRL_35.html">SNF_PRL_35</a></td></tr> <tr><td><a href="ko/Test_SNF_PRL_07.html">SNF_PRL_07 Not stable</a></td></tr> <tr><td><a href="ko/Test_SNF_PRL_10.html">SNF_PRL_10 Not stable</a></td></tr> -<tr><td><a href="ko/Test_SNF_PRL_13.html">SNF_PRL_13 GTNPORTAL-439</a></td></tr> <tr><td><a href="ko/Test_SNF_PRL_18.html">SNF_PRL_18 Not stable</a></td></tr> <tr><td><a href="ko/Test_SNF_PRL_20.html">SNF_PRL_20 Not stable</a></td></tr> <tr><td><a href="ko/Test_SNF_PRL_21.html">SNF_PRL_21 Not java</a></td></tr> @@ -42,6 +40,8 @@ <tr><td><a href="ko/Test_SNF_PRL_28.html">SNF_PRL_28 Not working</a></td></tr> <tr><td><a href="ko/Test_SNF_PRL_29.html">SNF_PRL_29 Not working</a></td></tr> <tr><td><a href="ko/Test_SNF_PRL_30.html">SNF_PRL_30 Not working</a></td></tr> +<tr><td><a href="issues/Test_SNF_PRL_06.html">SNF_PRL_06 GTNPORTAL-270</a></td></tr> +<tr><td><a href="issues/Test_SNF_PRL_13.html">SNF_PRL_13 GTNPORTAL-439</a></td></tr> </tbody></table> </body> </html> Deleted: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06.html 2010-02-22 13:36:23 UTC (rev 1803) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06.html 2010-02-22 14:43:03 UTC (rev 1804) @@ -1,212 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link rel="selenium.base" href="http://localhost:8080/portal" /> -<title>SNF_PRL_06</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_06</td></tr> -</thead><tbody> -<tr> - <td>open</td> - <td>/portal/public/classic/</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>-UserManagement-</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>link=Sign in</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>username</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>username</td> - <td>root</td> -</tr> -<tr> - <td>type</td> - <td>password</td> - <td>gtn</td> -</tr> -<tr> - <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Group</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>link=Group</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Users and groups management</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Users and groups management</td> - <td></td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>User Name</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>Last Name</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>First Name</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>Email</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Edit fields</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIListUsersGird']//tbody/tr[3]//td[5]//div//img</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>firstName</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>firstName</td> - <td>test_user_06</td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Save</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>css=div#UIOrganizationPortlet div.ManagementTabContent > div.UIPopupWindow div.ActionButton</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>css=div#UIOrganizationPortlet div.ManagementTabContent > div.UIPopupWindow div.ActionButton</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UIUserManagement']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIUserManagement']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>user.name.given</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>user.name.given</td> - <td>test_name_given_06</td> -</tr> -<tr> - <td>type</td> - <td>user.name.family</td> - <td>test_name_family_06</td> -</tr> -<tr> - <td>type</td> - <td>user.name.nickName</td> - <td>test_name_nick_06</td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Save</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>css=div#UIOrganizationPortlet div.ManagementTabContent > div.UIPopupWindow div.ActionButton</td> - <td></td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>The user profile has been updated.</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>The user profile has been updated.</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>css=div#UIOrganizationPortlet div.ManagementTabContent > div.UIPopupWindow div.ActionButton</td> - <td>1,1</td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Cancel</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Verify changes</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>Known issue : https://jira.jboss.org/jira/browse/GTNPORTAL-270</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>test_user_06</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Sign out</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Sign out</td> - <td></td> -</tr> - -</tbody></table> -</body> -</html> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09.html 2010-02-22 13:36:23 UTC (rev 1803) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09.html 2010-02-22 14:43:03 UTC (rev 1804) @@ -52,7 +52,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickAndWait</td> <td>link=Application Registry</td> <td>1,1</td> </tr> Deleted: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13.html 2010-02-22 13:36:23 UTC (rev 1803) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13.html 2010-02-22 14:43:03 UTC (rev 1804) @@ -1,152 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link rel="selenium.base" href="" /> -<title>Test_SNF_PRL_13</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr><td rowspan="1" colspan="3">Test_SNF_PRL_13</td></tr> -</thead><tbody> -<tr> - <td>open</td> - <td>/portal/public/classic/</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>-AddGadget-</td> - <td></td> -</tr> -<tr> - <td>setSpeed</td> - <td>150</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Sign in</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>username</td> - <td>root</td> -</tr> -<tr> - <td>type</td> - <td>username</td> - <td>root</td> -</tr> -<tr> - <td>type</td> - <td>password</td> - <td>gtn</td> -</tr> -<tr> - <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Application Registry</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Gadget</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Gadget</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@class='IconControl AddNewIcon']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@class='IconControl AddNewIcon']</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>url</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>url</td> - <td>http://www.google.com/ig/modules/datetime.xml</td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Add</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>Gadget Details</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIGadgetInfo']//div[@class='UIBreadcumb']/div[@class='DownLoadIcon ControlIcon']</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>https://jira.jboss.org/jira/browse/GTNPORTAL-439</td> - <td></td> -</tr> -<tr> - <td>verifyElementNotPresent</td> - <td>//div[@class='PopupIcon ErrorMessageIcon']</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>Gadget Details</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@class='SelectedItem ItemContent']/a[2]</td> - <td></td> -</tr> -<tr> - <td>waitForConfirmation</td> - <td>Are you sure to delete this gadget?</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@class='SelectedItem ItemContent']/a[@title='Calculator']</td> - <td></td> -</tr> -<tr> - <td>verifyElementNotPresent</td> - <td>//a[@title='Date & Time']</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Sign out</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Sign out</td> - <td></td> -</tr> - -</tbody></table> -</body> -</html> Copied: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_06.html (from rev 1794, portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06.html) =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_06.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_06.html 2010-02-22 14:43:03 UTC (rev 1804) @@ -0,0 +1,212 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="http://localhost:8080/portal" /> +<title>SNF_PRL_06</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">SNF_PRL_06</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-UserManagement-</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>User Name</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>Last Name</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>First Name</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>Email</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Edit fields</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIListUsersGird']//tbody/tr[3]//td[5]//div//img</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>firstName</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>firstName</td> + <td>test_user_06</td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>css=div#UIOrganizationPortlet div.ManagementTabContent > div.UIPopupWindow div.ActionButton</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>css=div#UIOrganizationPortlet div.ManagementTabContent > div.UIPopupWindow div.ActionButton</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIUserManagement']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIUserManagement']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>user.name.given</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>user.name.given</td> + <td>test_name_given_06</td> +</tr> +<tr> + <td>type</td> + <td>user.name.family</td> + <td>test_name_family_06</td> +</tr> +<tr> + <td>type</td> + <td>user.name.nickName</td> + <td>test_name_nick_06</td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>css=div#UIOrganizationPortlet div.ManagementTabContent > div.UIPopupWindow div.ActionButton</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>The user profile has been updated.</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>The user profile has been updated.</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>css=div#UIOrganizationPortlet div.ManagementTabContent > div.UIPopupWindow div.ActionButton</td> + <td>1,1</td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Cancel</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Verify changes</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>Known issue : https://jira.jboss.org/jira/browse/GTNPORTAL-270</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>test_user_06</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> Copied: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_13.html (from rev 1794, portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13.html) =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_13.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_13.html 2010-02-22 14:43:03 UTC (rev 1804) @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>Test_SNF_PRL_13</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">Test_SNF_PRL_13</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-AddGadget-</td> + <td></td> +</tr> +<tr> + <td>setSpeed</td> + <td>150</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Application Registry</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Gadget</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Gadget</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@class='IconControl AddNewIcon']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@class='IconControl AddNewIcon']</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>url</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>url</td> + <td>http://www.google.com/ig/modules/datetime.xml</td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Add</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>Gadget Details</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIGadgetInfo']//div[@class='UIBreadcumb']/div[@class='DownLoadIcon ControlIcon']</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>https://jira.jboss.org/jira/browse/GTNPORTAL-439</td> + <td></td> +</tr> +<tr> + <td>verifyElementNotPresent</td> + <td>//div[@class='PopupIcon ErrorMessageIcon']</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>Gadget Details</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@class='SelectedItem ItemContent']/a[2]</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmation</td> + <td>Are you sure to delete this gadget?</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@class='SelectedItem ItemContent']/a[@title='Calculator']</td> + <td></td> +</tr> +<tr> + <td>verifyElementNotPresent</td> + <td>//a[@title='Date & Time']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> Deleted: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_13.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_13.html 2010-02-22 13:36:23 UTC (rev 1803) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_13.html 2010-02-22 14:43:03 UTC (rev 1804) @@ -1,151 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link rel="selenium.base" href="" /> -<title>SNF_PRL_13</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_13</td></tr> -</thead><tbody> -<tr> - <td>open</td> - <td>/portal/public/classic/</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>-AddGadget-</td> - <td></td> -</tr> -<tr> - <td>setSpeed</td> - <td>150</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Sign in</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>username</td> - <td>root</td> -</tr> -<tr> - <td>type</td> - <td>username</td> - <td>root</td> -</tr> -<tr> - <td>type</td> - <td>password</td> - <td>gtn</td> -</tr> -<tr> - <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Application Registry</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Gadget</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Gadget</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@class='IconControl AddNewIcon']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@class='IconControl AddNewIcon']</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>url</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>url</td> - <td>http://www.google.com/ig/modules/datetime.xml</td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Add</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>Gadget Details</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIGadgetInfo']//div[@class='UIBreadcumb']/div[@class='DownLoadIcon ControlIcon']</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>https://jira.jboss.org/jira/browse/GTNPORTAL-439</td> - <td></td> -</tr> -<tr> - <td>verifyElementNotPresent</td> - <td>//div[@class='PopupIcon ErrorMessageIcon']</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>Gadget Details</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@class='SelectedItem ItemContent']/a[2]</td> - <td></td> -</tr> -<tr> - <td>waitForConfirmation</td> - <td>Are you sure to delete this gadget?</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@class='SelectedItem ItemContent']/a[@title='Calculator']</td> - <td></td> -</tr> -<tr> - <td>verifyElementNotPresent</td> - <td>//a[@title='Date & Time']</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Sign out</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Sign out</td> - <td></td> -</tr> -</tbody></table> -</body> -</html>

14 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits February 2010