gatein-commits February 2010

gatein-commits@lists.jboss.org

1 participants
424 discussions

gatein SVN: r1793 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.

by do-not-reply＠jboss.org

Author: dbaeli Date: 2010-02-21 21:38:07 -0500 (Sun, 21 Feb 2010) New Revision: 1793 Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/TestSuite_SNF_PRL.html Log: GTNPORTAL-509: Selenium Tests implementation * Separate failing tests from working ones 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 02:30:22 UTC (rev 1792) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/TestSuite_SNF_PRL.html 2010-02-22 02:38:07 UTC (rev 1793) @@ -22,7 +22,6 @@ <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_21.html">SNF_PRL_21</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_29.html">SNF_PRL_29</a></td></tr> <tr><td><a href="Test_SNF_PRL_31.html">SNF_PRL_31</a></td></tr> @@ -30,11 +29,12 @@ <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</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> <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>

14 years, 10 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: dbaeli Date: 2010-02-21 21:30:22 -0500 (Sun, 21 Feb 2010) New Revision: 1792 Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/ 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_13.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 portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_21.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_25.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_26.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_27.html 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_30.html Removed: 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/Test_SNF_PRL_21.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_27.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_28.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_30.html Modified: portal/trunk/testsuite/selenium-snifftests/ 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_02.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05.html 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_08.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 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_14.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17.html 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/Test_SNF_PRL_29.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_34.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35.html Log: GTNPORTAL-509: Selenium Tests implementation * Separate failing tests from working ones Property changes on: portal/trunk/testsuite/selenium-snifftests ___________________________________________________________________ Name: svn:ignore - target .classpath .project + target .classpath .project profiles.xml Modified: portal/trunk/testsuite/selenium-snifftests/pom.xml =================================================================== --- portal/trunk/testsuite/selenium-snifftests/pom.xml 2010-02-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/pom.xml 2010-02-22 02:30:22 UTC (rev 1792) @@ -96,7 +96,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>selenium-maven-plugin</artifactId> - <version>${org.selenium.maven-plugin.version}</version> <executions> <execution> <phase>pre-integration-test</phase> @@ -128,6 +127,7 @@  + <includes><include>**/selenium/Test_*.java</include></includes> <systemProperties> <property> <name>selenium.port</name> 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-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java 2010-02-22 02:30:22 UTC (rev 1792) @@ -3,6 +3,8 @@ import java.io.File; import java.io.IOException; +import junit.framework.TestCase; + import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringEscapeUtils; @@ -69,6 +71,7 @@ StringBuffer sb = new StringBuffer(); sb.append("package " + testPackagePath + ";\n\n"); // sb.append("import org.exoplatform.util.selenium.BaseTestCase;\n"); + sb.append("import junit.framework.TestCase;\n"); sb.append("import com.thoughtworks.selenium.*;\n"); sb.append("public class " + testName + " extends SeleneseTestCase {\n"); @@ -151,23 +154,23 @@ sb.append("\n //" + count + ": " + param1 + " | " + param2 + " | " + param3 + "\n"); if (param1.equals("assertConfirmation")) { param2 = replace(param2, "?", "[\\\\s\\\\S]"); - sb.append("assertTrue(selenium.getConfirmation().matches(\"^"); + sb.append("TestCase.assertTrue(selenium.getConfirmation().matches(\"^"); sb.append(param2); sb.append("$\"));\n"); } else if (param1.equals("assertElementPresent") || param1.equals("assertElementNotPresent")) { if (param1.equals("assertElementPresent")) { - sb.append("assertTrue"); + sb.append("TestCase.assertTrue"); } else if (param1.equals("assertElementNotPresent")) { - sb.append("assertFalse"); + sb.append("TestCase.assertFalse"); } sb.append("(selenium.isElementPresent(\""); sb.append(param2); sb.append("\"));\n"); } else if (param1.equals("assertTextPresent") || param1.equals("assertTextNotPresent")) { if (param1.equals("assertTextPresent")) { - sb.append("assertTrue"); + sb.append("TestCase.assertTrue"); } else if (param1.equals("assertTextNotPresent")) { - sb.append("assertFalse"); + sb.append("TestCase.assertFalse"); } sb.append("(selenium.isTextPresent(\""); sb.append(param2); @@ -232,24 +235,24 @@ sb.append(");\n"); } else if (param1.equals("verifyElementPresent") || param1.equals("verifyElementNotPresent")) { if (param1.equals("verifyElementPresent")) { - sb.append("assertTrue"); + sb.append("TestCase.assertTrue"); } else if (param1.equals("verifyElementNotPresent")) { - sb.append("assertFalse"); + sb.append("TestCase.assertFalse"); } sb.append("(selenium.isElementPresent(\""); sb.append(param2); sb.append("\"));\n"); } else if (param1.equals("verifyTextPresent") || param1.equals("verifyTextNotPresent")) { if (param1.equals("verifyTextPresent")) { - sb.append("assertTrue"); + sb.append("TestCase.assertTrue"); } else if (param1.equals("verifyTextNotPresent")) { - sb.append("assertFalse"); + sb.append("TestCase.assertFalse"); } sb.append("(selenium.isTextPresent(\""); sb.append(param2); sb.append("\"));\n"); } else if (param1.equals("verifyTitle")) { - sb.append("assertEquals(\""); + sb.append("TestCase.assertEquals(\""); sb.append(param2); sb.append("\", selenium.getTitle());\n"); } else if (param1.equals("waitForElementNotPresent") || param1.equals("waitForTextNotPresent")) { @@ -294,7 +297,7 @@ sb.append(param3); sb.append("\");\n"); } else if (param1.equals("verifyValue")) { - sb.append("assertEquals(\""); + sb.append("TestCase.assertEquals(\""); sb.append(param3); sb.append("\", selenium.getValue(\""); sb.append(param2); @@ -313,7 +316,7 @@ sb.append("Thread.sleep(1000);\n"); sb.append("}\n"); } else if (param1.equals("verifyEval")) { - sb.append("assertEquals(\""); + sb.append("TestCase.assertEquals(\""); sb.append(param3); sb.append("\", selenium.getEval(\""); sb.append(param2); @@ -325,7 +328,7 @@ sb.append(param2); sb.append("\");\n"); } else if (param1.equals("assertVisible")) { - sb.append("assertTrue(selenium.isVisible"); + sb.append("TestCase.assertTrue(selenium.isVisible"); sb.append("(\""); sb.append(param2); sb.append("\"));\n"); @@ -335,14 +338,14 @@ sb.append(param2); sb.append("\"));\n"); } else if (param1.equals("assertNotVisible")) { - sb.append("assertFalse(selenium.isVisible"); + sb.append("TestCase.assertFalse(selenium.isVisible"); sb.append("(\""); sb.append(param2); sb.append("\"));\n"); } else if (param1.equals("waitForNotSpeed")) { sb.append("waitForNotSpeed();\n"); } else if (param1.equals("assertValue")) { - sb.append("assertEquals(\""); + sb.append("TestCase.assertEquals(\""); sb.append(param3); sb.append("\", selenium.getValue(\""); sb.append(param2); 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-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/TestSuite_SNF_PRL.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -11,37 +11,37 @@ <tr><td><a href="Test_SNF_PRL_02.html">SNF_PRL_02</a></td></tr> <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_07.html">SNF_PRL_07</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_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_13.html">SNF_PRL_13</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_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_19.html">SNF_PRL_19</a></td></tr> <tr><td><a href="Test_SNF_PRL_21.html">SNF_PRL_21</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_24.html">SNF_PRL_24</a></td></tr> -<tr><td><a href="Test_SNF_PRL_25.html">SNF_PRL_25</a></td></tr> -<tr><td><a href="Test_SNF_PRL_26.html">SNF_PRL_26</a></td></tr> -<tr><td><a href="Test_SNF_PRL_27.html">SNF_PRL_27</a></td></tr> -<tr><td><a href="Test_SNF_PRL_30.html">SNF_PRL_30</a></td></tr> +<tr><td><a href="Test_SNF_PRL_29.html">SNF_PRL_29</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_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_19.html">SNF_PRL_19</a></td></tr> -<tr><td><a href="Test_SNF_PRL_28.html">SNF_PRL_28</a></td></tr> -<tr><td><a href="Test_SNF_PRL_29.html">SNF_PRL_29</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_11.html">SNF_PRL_11</a></td></tr> -<tr><td><a href="Test_SNF_PRL_22.html">SNF_PRL_22</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</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_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="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_30.html">SNF_PRL_30 Not working</a></td></tr> </tbody></table> </body> </html> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_02.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_02.html 2010-02-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_02.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -22,11 +22,6 @@ <td></td> </tr> <tr> - <td>setSpeed</td> - <td>150</td> - <td></td> -</tr> -<tr> <td>echo</td> <td>--Register new account</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03.html 2010-02-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -22,11 +22,6 @@ <td></td> </tr> <tr> - <td>setSpeed</td> - <td>150</td> - <td></td> -</tr> -<tr> <td>clickAt</td> <td>//a[@class='Language']</td> <td>1,1</td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04.html 2010-02-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -22,11 +22,6 @@ <td></td> </tr> <tr> - <td>setSpeed</td> - <td>150</td> - <td></td> -</tr> -<tr> <td>click</td> <td>link=Sign in</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05.html 2010-02-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -22,11 +22,6 @@ <td></td> </tr> <tr> - <td>setSpeed</td> - <td>150</td> - <td></td> -</tr> -<tr> <td>clickAt</td> <td>link=Sign in</td> <td></td> @@ -48,7 +43,7 @@ </tr> <tr> <td>echo</td> - <td>--Check "remember my login"</td> + <td>--Check "remember my login"</td> <td></td> </tr> <tr> @@ -77,11 +72,6 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>Congratulations!</td> - <td></td> -</tr> -<tr> <td>echo</td> <td>--Errase JSESSION Cookie to simulate leaving the browser</td> <td></td> Modified: 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-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -22,11 +22,6 @@ <td></td> </tr> <tr> - <td>setSpeed</td> - <td>150</td> - <td></td> -</tr> -<tr> <td>click</td> <td>link=Sign in</td> <td></td> Deleted: 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-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -1,282 +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>setSpeed</td> - <td>150</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='root,john,mary']</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_08.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08.html 2010-02-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -22,16 +22,16 @@ <td></td> </tr> <tr> - <td>setSpeed</td> - <td>150</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> @@ -48,7 +48,7 @@ </tr> <tr> <td>echo</td> - <td>--Select "Users and groups management" in menu</td> + <td>--Select "Users and groups management" in menu</td> <td></td> </tr> <tr> @@ -57,7 +57,7 @@ <td></td> </tr> <tr> - <td>click</td> + <td>clickAndWait</td> <td>link=Group</td> <td></td> </tr> @@ -73,7 +73,7 @@ </tr> <tr> <td>echo</td> - <td>--Choose "Memebership Management" tab</td> + <td>--Choose "Memebership Management" tab</td> <td></td> </tr> <tr> @@ -142,16 +142,11 @@ <td>1,1</td> </tr> <tr> - <td>waitForTextPresent</td> - <td>test_description_edit_08</td> - <td></td> + <td>clickAt</td> + <td>//table[@class='UIGrid']//tbody/tr[1]/td[5]//img[@class='EditMembershipIcon']</td> + <td>1,1</td> </tr> <tr> - <td>verifyTextPresent</td> - <td>test_description_edit_08</td> - <td></td> -</tr> -<tr> <td>echo</td> <td>--Delete membership</td> <td></td> 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-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -4,12 +4,12 @@ <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/" /> -<title>Test_SNF_PRL_09</title> +<title>SNF_PRL_09</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">Test_SNF_PRL_09</td></tr> +<tr><td rowspan="1" colspan="3">SNF_PRL_09</td></tr> </thead><tbody> <tr> <td>open</td> @@ -22,11 +22,6 @@ <td></td> </tr> <tr> - <td>setSpeed</td> - <td>150</td> - <td></td> -</tr> -<tr> <td>clickAt</td> <td>link=Sign in</td> <td></td> @@ -73,7 +68,7 @@ </tr> <tr> <td>verifyTextNotPresent</td> - <td>WSRP Admin Portlet</td> + <td>WSRP Configuration</td> <td></td> </tr> <tr> @@ -88,22 +83,22 @@ </tr> <tr> <td>waitForTextPresent</td> - <td>WSRP Admin Portlet</td> + <td>WSRP Configuration</td> <td></td> </tr> <tr> <td>verifyTextPresent</td> - <td>WSRP Admin Portlet</td> + <td>WSRP Configuration</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//a[contains(@onclick,'op=RemoveApplication&objectId=WSRPAdminPortlet&ajaxRequest=true')]</td> + <td>//a[contains(@onclick,'op=RemoveApplication&objectId=WSRPConfigurationPortlet&ajaxRequest=true')]</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//a[contains(@onclick,'op=RemoveApplication&objectId=WSRPAdminPortlet&ajaxRequest=true')]</td> + <td>//a[contains(@onclick,'op=RemoveApplication&objectId=WSRPConfigurationPortlet&ajaxRequest=true')]</td> <td></td> </tr> <tr> @@ -113,7 +108,7 @@ </tr> <tr> <td>verifyTextNotPresent</td> - <td>WSRP Admin Portlet</td> + <td>WSRP Configuration</td> <td></td> </tr> <tr> Deleted: 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-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -1,227 +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>setSpeed</td> - <td>150</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-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -4,12 +4,12 @@ <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_11</title> +<title>SNF_PRL_11</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">Test_SNF_PRL_11</td></tr> +<tr><td rowspan="1" colspan="3">SNF_PRL_11</td></tr> </thead><tbody> <tr> <td>open</td> @@ -22,11 +22,6 @@ <td></td> </tr> <tr> - <td>setSpeed</td> - <td>150</td> - <td></td> -</tr> -<tr> <td>clickAt</td> <td>link=Sign in</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-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -22,11 +22,6 @@ <td></td> </tr> <tr> - <td>setSpeed</td> - <td>150</td> - <td></td> -</tr> -<tr> <td>clickAt</td> <td>link=Sign in</td> <td></td> @@ -73,12 +68,12 @@ </tr> <tr> <td>waitForTextPresent</td> - <td>ApplicationRegistryPortlet</td> + <td>Application Registry</td> <td></td> </tr> <tr> <td>verifyTextPresent</td> - <td>ApplicationRegistryPortlet</td> + <td>Application Registry</td> <td></td> </tr> <tr> @@ -93,12 +88,12 @@ </tr> <tr> <td>waitForTextPresent</td> - <td>OrganizationPortlet</td> + <td>Organization Management</td> <td></td> </tr> <tr> <td>verifyTextPresent</td> - <td>OrganizationPortlet</td> + <td>Organization Management</td> <td></td> </tr> <tr> @@ -113,12 +108,12 @@ </tr> <tr> <td>waitForTextPresent</td> - <td>AccountPortlet</td> + <td>New Account</td> <td></td> </tr> <tr> <td>verifyTextPresent</td> - <td>AccountPortlet</td> + <td>New Account</td> <td></td> </tr> <tr> @@ -137,13 +132,18 @@ <td></td> </tr> <tr> + <td>clickAt</td> + <td>link=Integration</td> + <td>1,1</td> +</tr> +<tr> <td>waitForTextPresent</td> - <td>DashboardPortlet</td> + <td>Dashboard Portlet</td> <td></td> </tr> <tr> <td>verifyTextPresent</td> - <td>DashboardPortlet</td> + <td>Dashboard Portlet</td> <td></td> </tr> <tr> @@ -158,20 +158,15 @@ </tr> <tr> <td>waitForTextPresent</td> - <td>GadgetPortlet</td> + <td>Gadget Wrapper Portlet</td> <td></td> </tr> <tr> <td>verifyTextPresent</td> - <td>GadgetPortlet</td> + <td>Gadget Wrapper Portlet</td> <td></td> </tr> <tr> - <td>echo</td> - <td>--It is possible to verify all portlets.......</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_13.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13.html 2010-02-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -4,12 +4,12 @@ <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> +<title>Test_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> +<tr><td rowspan="1" colspan="3">Test_SNF_PRL_13</td></tr> </thead><tbody> <tr> <td>open</td> @@ -102,8 +102,8 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[@class='PopupIcon ErrorMessageIcon']</td> + <td>echo</td> + <td>https://jira.jboss.org/jira/browse/GTNPORTAL-439</td> <td></td> </tr> <tr> @@ -112,11 +112,6 @@ <td></td> </tr> <tr> - <td>echo</td> - <td>https://jira.jboss.org/jira/browse/GTNPORTAL-439</td> - <td></td> -</tr> -<tr> <td>verifyTextPresent</td> <td>Gadget Details</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14.html 2010-02-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -22,11 +22,6 @@ <td></td> </tr> <tr> - <td>setSpeed</td> - <td>150</td> - <td></td> -</tr> -<tr> <td>clickAt</td> <td>link=Sign in</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15.html 2010-02-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -22,11 +22,6 @@ <td></td> </tr> <tr> - <td>setSpeed</td> - <td>150</td> - <td></td> -</tr> -<tr> <td>clickAt</td> <td>link=Sign in</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16.html 2010-02-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -22,11 +22,6 @@ <td></td> </tr> <tr> - <td>setSpeed</td> - <td>150</td> - <td></td> -</tr> -<tr> <td>clickAt</td> <td>link=Sign in</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17.html 2010-02-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -22,11 +22,6 @@ <td></td> </tr> <tr> - <td>setSpeed</td> - <td>150</td> - <td></td> -</tr> -<tr> <td>click</td> <td>link=Sign in</td> <td></td> Deleted: 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_18.html 2010-02-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -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>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>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>clickAt</td> - <td>//div[@id='UISiteManagement']/table[2]//a[@class='DeleteIcon']</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']/table/tbody/tr/td[2]/div</td> - <td></td> -</tr> -<tr> - <td>waitForConfirmation</td> - <td>Are you sure you want to delete this 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>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> Modified: 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-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -22,11 +22,6 @@ <td></td> </tr> <tr> - <td>setSpeed</td> - <td>150</td> - <td></td> -</tr> -<tr> <td>clickAt</td> <td>link=Sign in</td> <td></td> @@ -282,6 +277,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>link=Site</td> <td></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-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -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="" /> -<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>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></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[@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[@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[@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[@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_21.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21.html 2010-02-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -1,227 +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_21</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_21</td></tr> -</thead><tbody> -<tr> - <td>open</td> - <td>/portal/public/classic/</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>-ChangePortal-</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></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[@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[@onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'PortalSetting');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=PortalSetting')"]</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>name</td> - <td>test_portal_name_21</td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'Properties');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=Properties')"]</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'PermissionSetting');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=PermissionSetting')"]</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>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_21</td> - <td>1,1</td> -</tr> -<tr> - <td>echo</td> - <td>--View new portal</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=test_portal_name_21</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Site</td> - <td></td> -</tr> -<tr> - <td>open</td> - <td>/portal/private/classic/</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>echo</td> - <td>--Delete new portal</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']/table[2]//td[3]/a[4]</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UISiteManagement']/table[2]//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_21</td> - <td></td> -</tr> -<tr> - <td>verifyTextNotPresent</td> - <td>test_portal_name_21</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_22.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22.html 2010-02-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -1,237 +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>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></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> Modified: 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-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -22,11 +22,6 @@ <td></td> </tr> <tr> - <td>setSpeed</td> - <td>150</td> - <td></td> -</tr> -<tr> <td>clickAt</td> <td>link=Sign in</td> <td></td> @@ -113,7 +108,7 @@ </tr> <tr> <td>echo</td> - <td>--Choose "Page Selector" tab</td> + <td>--Choose "Page Selector" tab</td> <td></td> </tr> <tr> Deleted: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24.html 2010-02-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -1,267 +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_24</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr><td rowspan="1" colspan="3">Test_SNF_PRL_24</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>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></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>description</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>description</td> - <td>test_description_edit_24</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>verifyTextPresent</td> - <td>Description: test_description_edit_24</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/Test_SNF_PRL_25.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25.html 2010-02-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -1,387 +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/" /> -<title>SNF_PRL_25</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_25</td></tr> -</thead><tbody> -<tr> - <td>open</td> - <td>/portal/public/classic</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>-EditNavActions_Rightclickmenu-</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></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>echo</td> - <td>--Add new group node</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Group</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>link=Add Node</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Add Node</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>name</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>name</td> - <td>test_grp_node_25</td> -</tr> -<tr> - <td>type</td> - <td>label</td> - <td>test_grp_label_25</td> -</tr> -<tr> - <td>clickAt</td> - <td>css=div#UIGroupNavigationManagement div.UIPopupWindow div.TabsContainer div.NormalTab div.MiddleTab</td> - <td></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>waitForElementPresent</td> - <td>//img[@title='Select Page']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//img[@title='Select Page']</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=Save</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=test_grp_label_25</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Edit node's page</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]//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>//div[@class='UIPopupWindow UIDragObject' and contains(@style,'width: 400px; display: block; visibility: visible')]//a[@title='test_grp_label_25']</td> - <td></td> -</tr> -<tr> - <td>componentExoContextMenu</td> - <td>//a[@title='test_grp_label_25']</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--------To fast</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon EditPageNode16x16Icon']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon EditPageNode16x16Icon']</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=View Page properties</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=View Page properties</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//input[@class='checkbox']</td> - <td></td> -</tr> -<tr> - <td>check</td> - <td>//input[@class='checkbox']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Save</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//a[@class='EdittedSaveButton']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//a[@class='EdittedSaveButton']</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>--Delete new group navigation and page edit</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]//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>//div[@class='UIPopupWindow UIDragObject' and contains(@style,'width: 400px; display: block; visibility: visible')]//a[@title='test_grp_label_25']</td> - <td></td> -</tr> -<tr> - <td>componentExoContextMenu</td> - <td>//a[@title='test_grp_label_25']</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--------To fast</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon EditPageNode16x16Icon']</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=View Page properties</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=View Page properties</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//input[@class='checkbox']</td> - <td></td> -</tr> -<tr> - <td>uncheck</td> - <td>//input[@class='checkbox']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Save</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//a[@class='EdittedSaveButton']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//a[@class='EdittedSaveButton']</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=Group</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>//div[@class='UIPopupWindow UIDragObject' and contains(@style,'width: 400px; display: block; visibility: visible')]//a[@title='test_grp_label_25']</td> - <td></td> -</tr> -<tr> - <td>componentExoContextMenu</td> - <td>//a[@title='test_grp_label_25']</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--------To fast</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>waitForElementNotPresent</td> - <td>link=test_grp_label_25</td> - <td></td> -</tr> -<tr> - <td>verifyElementNotPresent</td> - <td>link=test_grp_label_25</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_26.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26.html 2010-02-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -1,312 +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_26_2</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr><td rowspan="1" colspan="3">Test_SNF_PRL_26_2</td></tr> -</thead><tbody> -<tr> - <td>open</td> - <td>/portal/public/classic</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>-MoveUp/DownNode-</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>verifyElementPresent</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>echo</td> - <td>--Create node</td> - <td></td> -</tr> -<tr> - <td>clickAndWait</td> - <td>link=Group</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>waitForElementPresent</td> - <td>name</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>name</td> - <td>test_grp_node_26</td> -</tr> -<tr> - <td>type</td> - <td>label</td> - <td>test_grp_label_26</td> -</tr> -<tr> - <td>clickAt</td> - <td>css=div#UIGroupNavigationManagement div.UIPopupWindow div.TabsContainer div.NormalTab div.MiddleTab</td> - <td></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>waitForElementPresent</td> - <td>//img[@title='Select Page']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//img[@title='Select Page']</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=Save</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=test_grp_label_26</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>echo</td> - <td>--Edit node's position</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Group</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Move node up</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>verifyElementPresent</td> - <td>//a[@title='test_grp_label_26']</td> - <td></td> -</tr> -<tr> - <td>storeXpathCount</td> - <td>//div[@class='TreeContainer JSContainer']/div/div</td> - <td>nodeLvl</td> -</tr> -<tr> - <td>echo</td> - <td>Node is at level ${nodeLvl}</td> - <td></td> -</tr> -<tr> - <td>componentExoContextMenu</td> - <td>//a[@title='test_grp_label_26']</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon MoveUp16x16Icon']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon MoveUp16x16Icon']</td> - <td></td> -</tr> -<tr> - <td>verifyElementNotPresent</td> - <td>//div[@class='TreeContainer JSContainer']/div/div[${nodeLvl}]/div/a[@title='test_grp_label_26']</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>Node is at level ${nodeLvl}</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Move node down</td> - <td></td> -</tr> -<tr> - <td>componentExoContextMenu</td> - <td>//a[@title='test_grp_label_26']</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon MoveDown16x16Icon']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon MoveDown16x16Icon']</td> - <td></td> -</tr> -<tr> - <td>verifyElementPresent</td> - <td>//div[@class='TreeContainer JSContainer']/div/div[${nodeLvl}]/div/a[@title='test_grp_label_26']</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>Node is at level ${nodeLvl}</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Save</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]//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_26']</td> - <td></td> -</tr> -<tr> - <td>componentExoContextMenu</td> - <td>//a[@title='test_grp_label_26']</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</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>waitForElementNotPresent</td> - <td>link=test_grp_label_26</td> - <td></td> -</tr> -<tr> - <td>verifyElementNotPresent</td> - <td>link=test_grp_label_26</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_27.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_27.html 2010-02-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_27.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -1,427 +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_27</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_27</td></tr> -</thead><tbody> -<tr> - <td>open</td> - <td>/portal/public/classic</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>-AddEditGroupPageWizard-</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>clickAt</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Page Management</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Page Management</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UIPageBrowser']</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Create new</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Add New Page</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>pageName</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>pageName</td> - <td>test_page_27</td> -</tr> -<tr> - <td>type</td> - <td>pageDisplayName</td> - <td>test_page_name_27</td> -</tr> -<tr> - <td>echo</td> - <td>--Click "Next" to move to step2 to choose page layout</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIPageCreationWizard']//div[@class='UIAction']//div[2]</td> - <td>1,1</td> -</tr> -<tr> - <td>echo</td> - <td>--Keep "Empty layout" and Click "Next" to move to step 3</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIPageCreationWizard']//div[@class='UIAction']//div[2]</td> - <td>1,1</td> -</tr> -<tr> - <td>echo</td> - <td>--Open Page Editor pane</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='Administration/AccountPortlet']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=View Page properties</td> - <td>1,1</td> -</tr> -<tr> - <td>echo</td> - <td>--Select Permission Setting tab</td> - <td></td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>Show Max Window</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIMaskWorkspace']//div[3]//div[@class='MiddleTab']</td> - <td>1,1</td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Edit Permission Setting</td> - <td>1,1</td> -</tr> -<tr> - <td>echo</td> - <td>--Do not change anything in Page properties</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Cancel</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Click Save to complete adding new page by wizard with no content (no portlet)</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Edit Page</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Edit Page</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Show form to edit page by wizard</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=View Page properties</td> - <td>1,1</td> -</tr> -<tr> - <td>echo</td> - <td>--Select Permission Setting tab</td> - <td></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>1,1</td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Add Permission</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Platform</td> - <td>1,1</td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Administrators</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIPageFormPopupGroupMembershipSelector']//div[@class='MembershipSelector']//a</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Save</td> - <td>1,1</td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Edit layout</td> - <td></td> -</tr> -<tr> - <td>open</td> - <td>/portal/private/classic/</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Edit Layout</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>select</td> - <td>locale</td> - <td>label=French (France)</td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Save</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Edit Layout</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>verifyTextPresent</td> - <td>French (France)</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Cancel</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[1]</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Delete page</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Group</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@class='UIComponentBlock']//a[@class='EditNavIcon']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@class='UIComponentBlock']//a[@class='EditNavIcon']</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UIGroupNavigationGrid']/table[4]/tbody/tr/td[3]/a[1]</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIGroupNavigationGrid']/table[4]/tbody/tr/td[3]/a[1]</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@class='TreeContainer JSContainer']/div/div[2]//a</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@class='TreeContainer JSContainer']/div/div[2]//a</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@class='TreeContainer JSContainer']/div/div[2]//a[@title='Page Management']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@class='TreeContainer JSContainer']/div/div[2]//a[@title='Page Management']</td> - <td></td> -</tr> -<tr> - <td>verifyElementPresent</td> - <td>//a[@title='test_page_name_27']</td> - <td></td> -</tr> -<tr> - <td>componentExoContextMenu</td> - <td>//a[@title='test_page_name_27']</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--------To fast</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</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>waitForElementNotPresent</td> - <td>link=test_page_name_27</td> - <td></td> -</tr> -<tr> - <td>verifyElementNotPresent</td> - <td>link=test_page_name_27</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_28.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_28.html 2010-02-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_28.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -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_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>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/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> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29.html 2010-02-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -22,11 +22,6 @@ <td></td> </tr> <tr> - <td>setSpeed</td> - <td>150</td> - <td></td> -</tr> -<tr> <td>clickAt</td> <td>link=Sign in</td> <td></td> @@ -62,11 +57,6 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>Click & Type Page Name</td> - <td></td> -</tr> -<tr> <td>waitForElementPresent</td> <td>link=Add New Page</td> <td></td> @@ -78,7 +68,7 @@ </tr> <tr> <td>echo</td> - <td>--Choose "root" node</td> + <td>--Choose "root" node</td> <td></td> </tr> <tr> @@ -263,12 +253,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'Properties');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=Properties')"]</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>clickAt</td> - <td>//div[@onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'Properties');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=Properties')"]</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> Deleted: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_30.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_30.html 2010-02-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_30.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -1,327 +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_30</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_30</td></tr> -</thead><tbody> -<tr> - <td>open</td> - <td>/portal/public/classic</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>-DashboardSiteManagement-</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></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></td> -</tr> -<tr> - <td>echo</td> - <td>--Add new page in dashboard</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UITabPaneDashboard']/div/div/div/div/div/div[1]/div/div/div/div/span</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Add New Page</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Add New Page</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Choose "root" node</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>pageName</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>pageName</td> - <td>test_dashboardpage_30</td> -</tr> -<tr> - <td>type</td> - <td>pageDisplayName</td> - <td>test_dashboardpage_name_30</td> -</tr> -<tr> - <td>echo</td> - <td>--Click Next to move to step 2</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIPageCreationWizard']//div[@class='UIAction']//div[2]</td> - <td>1,1</td> -</tr> -<tr> - <td>echo</td> - <td>--Click Next to move to step 3, keep Empty layout</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']//div[@class='UIAction']//div[2]</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIPageCreationWizard']//div[@class='UIAction']//div[2]</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Click Save to complete adding page</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UITabPaneDashboard']/div/div/div/div/div/div[2]/div/div/div/div/span</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--------To fast</td> - <td></td> -</tr> -<tr> - <td>verifyElementPresent</td> - <td>//div[@id='UITabPaneDashboard']/div/div/div/div/div/div[2]/div/div/div/div/span</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>test_dashboardpage_name_30</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Edit page in dashboard</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Edit Page</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=View Page properties</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=View Page properties</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>title</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>title</td> - <td>test_dashboardpage_edit_30</td> -</tr> -<tr> - <td>clickAt</td> - <td>css=form#UIPageForm div.ActionButton</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>css=a.EdittedSaveButton</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Page Management</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Verify page edit</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Edit Page</td> - <td>1,1</td> -</tr> -<tr> - <td>clickAt</td> - <td>link=View Page properties</td> - <td>1,1</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>title</td> - <td></td> -</tr> -<tr> - <td>verifyElementPresent</td> - <td>//input[@value='test_dashboardpage_edit_30']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Cancel</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>css=a.CloseButton</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Page Management</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>--Edit Dashboard layout</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=test_dashboardpage_name_30</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>link=Edit Layout</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Edit Layout</td> - <td>1,1</td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Portal Properties</td> - <td>1,1</td> -</tr> -<tr> - <td>select</td> - <td>locale</td> - <td>label=English</td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'Properties');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=Properties')"]</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>link=Save</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposer']//a[@class='EdittedSaveButton']</td> - <td>1,1</td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@id='UIPortalComposer']//a[@class='EdittedSaveButton']</td> - <td>1,1</td> -</tr> -<tr> - <td>echo</td> - <td>--Delete page</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@class='SelectedTab']//img[@class='CloseIcon']</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>//div[@class='SelectedTab']//img[@class='CloseIcon']</td> - <td></td> -</tr> -<tr> - <td>waitForConfirmation</td> - <td>Really want to remove this dashboard?</td> - <td></td> -</tr> -<tr> - <td>verifyTextNotPresent</td> - <td>test_dashboardpage_name_30</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_31.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31.html 2010-02-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -22,11 +22,6 @@ <td></td> </tr> <tr> - <td>setSpeed</td> - <td>150</td> - <td></td> -</tr> -<tr> <td>clickAt</td> <td>link=Sign in</td> <td></td> @@ -98,12 +93,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=anglais</td> + <td>link=Anglais</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>link=anglais</td> + <td>link=Anglais</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32.html 2010-02-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -22,11 +22,6 @@ <td></td> </tr> <tr> - <td>setSpeed</td> - <td>150</td> - <td></td> -</tr> -<tr> <td>clickAt</td> <td>link=Sign in</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33.html 2010-02-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -22,11 +22,6 @@ <td></td> </tr> <tr> - <td>setSpeed</td> - <td>150</td> - <td></td> -</tr> -<tr> <td>echo</td> <td>--Register new account</td> <td></td> @@ -92,6 +87,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> <td>type</td> <td>username</td> <td>test_user_33</td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_34.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_34.html 2010-02-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_34.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -22,11 +22,6 @@ <td></td> </tr> <tr> - <td>setSpeed</td> - <td>150</td> - <td></td> -</tr> -<tr> <td>clickAt</td> <td>link=Sign in</td> <td></td> @@ -62,11 +57,6 @@ <td></td> </tr> <tr> - <td>verifyTitle</td> - <td>Click & Type Page Name</td> - <td></td> -</tr> -<tr> <td>clickAt</td> <td>link=Edit Layout</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35.html 2010-02-21 18:51:13 UTC (rev 1791) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -22,11 +22,6 @@ <td></td> </tr> <tr> - <td>setSpeed</td> - <td>150</td> - <td></td> -</tr> -<tr> <td>clickAt</td> <td>link=Sign in</td> <td></td> @@ -53,7 +48,7 @@ </tr> <tr> <td>echo</td> - <td>--Create new user using "New Staff" portlet</td> + <td>--Create new user using "New Staff" portlet</td> <td></td> </tr> <tr> Copied: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_07.html (from rev 1785, 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/ko/Test_SNF_PRL_07.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_07.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -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> Copied: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_10.html (from rev 1785, 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/ko/Test_SNF_PRL_10.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_10.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -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> Copied: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_13.html (from rev 1785, 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 (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_13.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -0,0 +1,151 @@ +<?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> Copied: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_18.html (from rev 1785, 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/ko/Test_SNF_PRL_18.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_18.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -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> Copied: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_20.html (from rev 1785, 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_20.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_20.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -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> Copied: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_21.html (from rev 1785, portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21.html) =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_21.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_21.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -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_21</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">SNF_PRL_21</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-ChangePortal-</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>type</td> + <td>name</td> + <td>test_portal_name_21</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>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>clickAt</td> + <td>publicMode</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Edit Permission Setting</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_21</td> + <td>1,1</td> +</tr> +<tr> + <td>echo</td> + <td>--View new portal</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=test_portal_name_21</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>open</td> + <td>/portal/private/classic/</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>echo</td> + <td>--Delete new portal</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UISiteManagement']/table[2]//td[3]/a[4]</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UISiteManagement']/table[2]//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_21</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> + <td>test_portal_name_21</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/ko/Test_SNF_PRL_22.html (from rev 1785, portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22.html) =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_22.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_22.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -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</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> Copied: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_24.html (from rev 1785, portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24.html) =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_24.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_24.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -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> Copied: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_25.html (from rev 1785, portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25.html) =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_25.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_25.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -0,0 +1,387 @@ +<?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/" /> +<title>SNF_PRL_25</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">SNF_PRL_25</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-EditNavActions_Rightclickmenu-</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></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>echo</td> + <td>--Add new group node</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Group</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>link=Add Node</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Add Node</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>name</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>name</td> + <td>test_grp_node_25</td> +</tr> +<tr> + <td>type</td> + <td>label</td> + <td>test_grp_label_25</td> +</tr> +<tr> + <td>clickAt</td> + <td>css=div#UIGroupNavigationManagement div.UIPopupWindow div.TabsContainer div.NormalTab div.MiddleTab</td> + <td></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>waitForElementPresent</td> + <td>//img[@title='Select Page']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//img[@title='Select Page']</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=Save</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=test_grp_label_25</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Edit node's page</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]//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>//div[@class='UIPopupWindow UIDragObject' and contains(@style,'width: 400px; display: block; visibility: visible')]//a[@title='test_grp_label_25']</td> + <td></td> +</tr> +<tr> + <td>componentExoContextMenu</td> + <td>//a[@title='test_grp_label_25']</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--------To fast</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon EditPageNode16x16Icon']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon EditPageNode16x16Icon']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=View Page properties</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=View Page properties</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//input[@class='checkbox']</td> + <td></td> +</tr> +<tr> + <td>check</td> + <td>//input[@class='checkbox']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//a[@class='EdittedSaveButton']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//a[@class='EdittedSaveButton']</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>--Delete new group navigation and page edit</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]//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>//div[@class='UIPopupWindow UIDragObject' and contains(@style,'width: 400px; display: block; visibility: visible')]//a[@title='test_grp_label_25']</td> + <td></td> +</tr> +<tr> + <td>componentExoContextMenu</td> + <td>//a[@title='test_grp_label_25']</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--------To fast</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon EditPageNode16x16Icon']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=View Page properties</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=View Page properties</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//input[@class='checkbox']</td> + <td></td> +</tr> +<tr> + <td>uncheck</td> + <td>//input[@class='checkbox']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//a[@class='EdittedSaveButton']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//a[@class='EdittedSaveButton']</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=Group</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>//div[@class='UIPopupWindow UIDragObject' and contains(@style,'width: 400px; display: block; visibility: visible')]//a[@title='test_grp_label_25']</td> + <td></td> +</tr> +<tr> + <td>componentExoContextMenu</td> + <td>//a[@title='test_grp_label_25']</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--------To fast</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>waitForElementNotPresent</td> + <td>link=test_grp_label_25</td> + <td></td> +</tr> +<tr> + <td>verifyElementNotPresent</td> + <td>link=test_grp_label_25</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/ko/Test_SNF_PRL_26.html (from rev 1785, portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26.html) =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_26.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_26.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -0,0 +1,307 @@ +<?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_26</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">SNF_PRL_26</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-MoveUp/DownNode-</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>verifyElementPresent</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>echo</td> + <td>--Create node</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Group</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>waitForElementPresent</td> + <td>name</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>name</td> + <td>test_grp_node_26</td> +</tr> +<tr> + <td>type</td> + <td>label</td> + <td>test_grp_label_26</td> +</tr> +<tr> + <td>clickAt</td> + <td>css=div#UIGroupNavigationManagement div.UIPopupWindow div.TabsContainer div.NormalTab div.MiddleTab</td> + <td></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>waitForElementPresent</td> + <td>//img[@title='Select Page']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//img[@title='Select Page']</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=Save</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=test_grp_label_26</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>echo</td> + <td>--Edit node's position</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Move node up</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>verifyElementPresent</td> + <td>//a[@title='test_grp_label_26']</td> + <td></td> +</tr> +<tr> + <td>storeXpathCount</td> + <td>//div[@class='TreeContainer JSContainer']/div/div</td> + <td>nodeLvl</td> +</tr> +<tr> + <td>echo</td> + <td>Node is at level ${nodeLvl}</td> + <td></td> +</tr> +<tr> + <td>componentExoContextMenu</td> + <td>//a[@title='test_grp_label_26']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon MoveUp16x16Icon']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon MoveUp16x16Icon']</td> + <td></td> +</tr> +<tr> + <td>verifyElementNotPresent</td> + <td>//div[@class='TreeContainer JSContainer']/div/div[${nodeLvl}]/div/a[@title='test_grp_label_26']</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>Node is at level ${nodeLvl}</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Move node down</td> + <td></td> +</tr> +<tr> + <td>componentExoContextMenu</td> + <td>//a[@title='test_grp_label_26']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon MoveDown16x16Icon']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon MoveDown16x16Icon']</td> + <td></td> +</tr> +<tr> + <td>verifyElementPresent</td> + <td>//div[@class='TreeContainer JSContainer']/div/div[${nodeLvl}]/div/a[@title='test_grp_label_26']</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>Node is at level ${nodeLvl}</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</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]//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_26']</td> + <td></td> +</tr> +<tr> + <td>componentExoContextMenu</td> + <td>//a[@title='test_grp_label_26']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</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>waitForElementNotPresent</td> + <td>link=test_grp_label_26</td> + <td></td> +</tr> +<tr> + <td>verifyElementNotPresent</td> + <td>link=test_grp_label_26</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/ko/Test_SNF_PRL_27.html (from rev 1785, portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_27.html) =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_27.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_27.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -0,0 +1,422 @@ +<?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_27</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">SNF_PRL_27</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-AddEditGroupPageWizard-</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>clickAt</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Page Management</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Page Management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPageBrowser']</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Create new</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Add New Page</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>pageName</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>pageName</td> + <td>test_page_27</td> +</tr> +<tr> + <td>type</td> + <td>pageDisplayName</td> + <td>test_page_name_27</td> +</tr> +<tr> + <td>echo</td> + <td>--Click "Next" to move to step2 to choose page layout</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIPageCreationWizard']//div[@class='UIAction']//div[2]</td> + <td>1,1</td> +</tr> +<tr> + <td>echo</td> + <td>--Keep "Empty layout" and Click "Next" to move to step 3</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIPageCreationWizard']//div[@class='UIAction']//div[2]</td> + <td>1,1</td> +</tr> +<tr> + <td>echo</td> + <td>--Open Page Editor pane</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='Administration/AccountPortlet']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=View Page properties</td> + <td>1,1</td> +</tr> +<tr> + <td>echo</td> + <td>--Select Permission Setting tab</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>Show Max Window</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIMaskWorkspace']//div[3]//div[@class='MiddleTab']</td> + <td>1,1</td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Edit Permission Setting</td> + <td>1,1</td> +</tr> +<tr> + <td>echo</td> + <td>--Do not change anything in Page properties</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Cancel</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Click Save to complete adding new page by wizard with no content (no portlet)</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Page</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Edit Page</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Show form to edit page by wizard</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=View Page properties</td> + <td>1,1</td> +</tr> +<tr> + <td>echo</td> + <td>--Select Permission Setting tab</td> + <td></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>1,1</td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Add Permission</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Platform</td> + <td>1,1</td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIPageFormPopupGroupMembershipSelector']//div[@class='MembershipSelector']//a</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td>1,1</td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Edit layout</td> + <td></td> +</tr> +<tr> + <td>open</td> + <td>/portal/private/classic/</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Layout</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>select</td> + <td>locale</td> + <td>label=French (France)</td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Layout</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>verifyTextPresent</td> + <td>French (France)</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Cancel</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[1]</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Delete page</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@class='UIComponentBlock']//a[@class='EditNavIcon']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@class='UIComponentBlock']//a[@class='EditNavIcon']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIGroupNavigationGrid']/table[4]/tbody/tr/td[3]/a[1]</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIGroupNavigationGrid']/table[4]/tbody/tr/td[3]/a[1]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@class='TreeContainer JSContainer']/div/div[2]//a</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@class='TreeContainer JSContainer']/div/div[2]//a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@class='TreeContainer JSContainer']/div/div[2]//a[@title='Page Management']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@class='TreeContainer JSContainer']/div/div[2]//a[@title='Page Management']</td> + <td></td> +</tr> +<tr> + <td>verifyElementPresent</td> + <td>//a[@title='test_page_name_27']</td> + <td></td> +</tr> +<tr> + <td>componentExoContextMenu</td> + <td>//a[@title='test_page_name_27']</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--------To fast</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</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>waitForElementNotPresent</td> + <td>link=test_page_name_27</td> + <td></td> +</tr> +<tr> + <td>verifyElementNotPresent</td> + <td>link=test_page_name_27</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/ko/Test_SNF_PRL_28.html (from rev 1785, portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_28.html) =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_28.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_28.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -0,0 +1,192 @@ +<?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/ko/Test_SNF_PRL_30.html (from rev 1785, portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_30.html) =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_30.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_30.html 2010-02-22 02:30:22 UTC (rev 1792) @@ -0,0 +1,322 @@ +<?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_30</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">SNF_PRL_30</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-DashboardSiteManagement-</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>clickAtAndWait</td> + <td>link=Dashboard</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Add new page in dashboard</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UITabPaneDashboard']/div/div/div/div/div/div[1]/div/div/div/div/span</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Add New Page</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Add New Page</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Choose "root" node</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>pageName</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>pageName</td> + <td>test_dashboardpage_30</td> +</tr> +<tr> + <td>type</td> + <td>pageDisplayName</td> + <td>test_dashboardpage_name_30</td> +</tr> +<tr> + <td>echo</td> + <td>--Click Next to move to step 2</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIPageCreationWizard']//div[@class='UIAction']//div[2]</td> + <td>1,1</td> +</tr> +<tr> + <td>echo</td> + <td>--Click Next to move to step 3, keep Empty layout</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPageCreationWizard']//div[@class='UIAction']//div[2]</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIPageCreationWizard']//div[@class='UIAction']//div[2]</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Click Save to complete adding page</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UITabPaneDashboard']/div/div/div/div/div/div[2]/div/div/div/div/span</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--------To fast</td> + <td></td> +</tr> +<tr> + <td>verifyElementPresent</td> + <td>//div[@id='UITabPaneDashboard']/div/div/div/div/div/div[2]/div/div/div/div/span</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>test_dashboardpage_name_30</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Edit page in dashboard</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Edit Page</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=View Page properties</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=View Page properties</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>title</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>title</td> + <td>test_dashboardpage_edit_30</td> +</tr> +<tr> + <td>clickAt</td> + <td>css=form#UIPageForm div.ActionButton</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>css=a.EdittedSaveButton</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Page Management</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Verify page edit</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Edit Page</td> + <td>1,1</td> +</tr> +<tr> + <td>clickAt</td> + <td>link=View Page properties</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>title</td> + <td></td> +</tr> +<tr> + <td>verifyElementPresent</td> + <td>//input[@value='test_dashboardpage_edit_30']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Cancel</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>css=a.CloseButton</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Page Management</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Edit Dashboard layout</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=test_dashboardpage_name_30</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Layout</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Edit Layout</td> + <td>1,1</td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Portal Properties</td> + <td>1,1</td> +</tr> +<tr> + <td>select</td> + <td>locale</td> + <td>label=English</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>clickAt</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPortalComposer']//a[@class='EdittedSaveButton']</td> + <td>1,1</td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIPortalComposer']//a[@class='EdittedSaveButton']</td> + <td>1,1</td> +</tr> +<tr> + <td>echo</td> + <td>--Delete page</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@class='SelectedTab']//img[@class='CloseIcon']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@class='SelectedTab']//img[@class='CloseIcon']</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmation</td> + <td>Really want to remove this dashboard?</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> + <td>test_dashboardpage_name_30</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: r1791 - in components/mop/trunk/core/src: main/java/org/gatein/mop/core/api/workspace/content and 1 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-02-21 13:51:13 -0500 (Sun, 21 Feb 2010) New Revision: 1791 Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSiteContainer.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageContainer.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSiteContainer.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIWindowImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSiteContainer.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceCustomizationContextImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomization.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/CustomizationContainer.java components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/portlet/PortletPreferencesState.java Log: update to chromattic trunk Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSiteContainer.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSiteContainer.java 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSiteContainer.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -29,7 +29,7 @@ public abstract class GroupSiteContainer extends SiteContainer<GroupSite> { - @RelatedMappedBy("groupsites") + @RelatedMappedBy("mop:groupsites") public abstract WorkspaceImpl getWorkspace(); } Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -39,7 +39,7 @@ { @OneToOne - @RelatedMappedBy("children") + @RelatedMappedBy("mop:children") public abstract NavigationImpl getOwner(); @OneToMany Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationImpl.java 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationImpl.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -44,18 +44,18 @@ { @OneToOne - @RelatedMappedBy("rootnavigation") + @RelatedMappedBy("mop:rootnavigation") public abstract SiteImpl getParentSite(); @OneToOne - @MappedBy("children") + @MappedBy("mop:children") public abstract NavigationContainer getChildrenContainer(); @ManyToOne public abstract NavigationContainer getParentContainer(); @OneToOne - @MappedBy("link") + @MappedBy("mop:link") public abstract LinkImpl getLink(); public abstract LinkImpl setLink(LinkImpl target); Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageContainer.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageContainer.java 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageContainer.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -38,7 +38,7 @@ { @OneToOne - @RelatedMappedBy("children") + @RelatedMappedBy("mop:children") public abstract PageImpl getOwner(); @OneToMany Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -85,18 +85,18 @@ public abstract Collection<? extends WorkspaceObject> getTemplatizedObjects(); @OneToOne - @MappedBy("children") + @MappedBy("mop:children") public abstract PageContainer getChildrenContainer(); @ManyToOne public abstract PageContainer getParentContainer(); @OneToOne - @RelatedMappedBy("rootpage") + @RelatedMappedBy("mop:rootpage") public abstract SiteImpl getSiteParent(); @OneToOne - @MappedBy("rootcomponent") + @MappedBy("mop:rootcomponent") public abstract UIContainerImpl getRootComponent(); @Destroy Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSiteContainer.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSiteContainer.java 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSiteContainer.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -29,7 +29,7 @@ public abstract class PortalSiteContainer extends SiteContainer<PortalSite> { - @RelatedMappedBy("portalsites") + @RelatedMappedBy("mop:portalsites") public abstract WorkspaceImpl getWorkspace(); Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteImpl.java 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteImpl.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -40,11 +40,11 @@ { @OneToOne - @MappedBy("rootpage") + @MappedBy("mop:rootpage") public abstract PageImpl getRoot(); @OneToOne - @MappedBy("rootnavigation") + @MappedBy("mop:rootnavigation") public abstract NavigationImpl getRootNavigation(); @ManyToOne Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIWindowImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIWindowImpl.java 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIWindowImpl.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -48,7 +48,7 @@ // Abstract ********************************************************************************************************** @OneToOne - @MappedBy("customization") + @MappedBy("mop:customization") public abstract WorkspaceCustomization getCustomization(); public abstract void setCustomization(WorkspaceCustomization customization); Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSiteContainer.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSiteContainer.java 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSiteContainer.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -29,7 +29,7 @@ public abstract class UserSiteContainer extends SiteContainer<UserSite> { - @RelatedMappedBy("usersites") + @RelatedMappedBy("mop:usersites") public abstract WorkspaceImpl getWorkspace(); } \ No newline at end of file Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceCustomizationContextImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceCustomizationContextImpl.java 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceCustomizationContextImpl.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -40,7 +40,7 @@ public abstract WorkspaceObjectImpl getOwner(); @OneToOne - @MappedBy("customizations") + @MappedBy("mop:customizations") public abstract CustomizationContainer getCustomizations(); public String getContextType() Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -49,15 +49,15 @@ // Abstract ********************************************************************************************************** @OneToOne - @MappedBy("portalsites") + @MappedBy("mop:portalsites") public abstract PortalSiteContainer getPortalSites(); @OneToOne - @MappedBy("groupsites") + @MappedBy("mop:groupsites") public abstract GroupSiteContainer getGroupSites(); @OneToOne - @MappedBy("usersites") + @MappedBy("mop:usersites") public abstract UserSiteContainer getUserSites(); @OneToOne(type = RelationshipType.EMBEDDED) Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomization.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomization.java 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomization.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -75,7 +75,7 @@ public abstract String getId(); @OneToOne - @MappedBy("contexttypes") + @MappedBy("mop:contexttypes") abstract ContextTypeContainer getContextTypes(); @Create Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/CustomizationContainer.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/CustomizationContainer.java 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/CustomizationContainer.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -42,7 +42,7 @@ { @OneToOne - @RelatedMappedBy("customizations") + @RelatedMappedBy("mop:customizations") public abstract WorkspaceCustomizationContextImpl getOwner(); @OneToMany Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/portlet/PortletPreferencesState.java =================================================================== --- components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/portlet/PortletPreferencesState.java 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/portlet/PortletPreferencesState.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -45,7 +45,7 @@ public abstract PortletPreferenceState create(); @OneToOne - @RelatedMappedBy("state") + @RelatedMappedBy("mop:state") public abstract AbstractCustomization getCustomization(); private void setPayload(Preferences payload)

14 years, 10 months

1
0
0 / 0

gatein SVN: r1790 - components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-02-20 20:15:09 -0500 (Sat, 20 Feb 2010) New Revision: 1790 Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/CustomizationContainer.java Log: fix bug related to wrong child name in @OneToOne hierarchical relatioship Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/CustomizationContainer.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/CustomizationContainer.java 2010-02-21 00:58:50 UTC (rev 1789) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/CustomizationContainer.java 2010-02-21 01:15:09 UTC (rev 1790) @@ -42,7 +42,7 @@ { @OneToOne - @RelatedMappedBy("mop:customizations") + @RelatedMappedBy("customizations") public abstract WorkspaceCustomizationContextImpl getOwner(); @OneToMany

14 years, 10 months

1
0
0 / 0

gatein SVN: r1789 - in components/mop/trunk: core/src/main/java/org/gatein/mop/core/api/workspace and 1 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-02-20 19:58:50 -0500 (Sat, 20 Feb 2010) New Revision: 1789 Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Page.java components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Site.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceCustomizationContextImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/content/CustomizationTestCase.java Log: remove redundant code Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Page.java =================================================================== --- components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Page.java 2010-02-20 17:47:58 UTC (rev 1788) +++ components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Page.java 2010-02-21 00:58:50 UTC (rev 1789) @@ -32,7 +32,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public interface Page extends TemplatizedObject, WorkspaceCustomizationContext +public interface Page extends TemplatizedObject { /** @@ -124,4 +124,10 @@ */ <T extends TemplatizedObject> Collection<? extends T> getTemplatizedObjects(ObjectType<T> templatizedType); + /** + * Returns the customization context of this object; + * + * @return the customization context + */ + WorkspaceCustomizationContext getCustomizationContext(); } Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Site.java =================================================================== --- components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Site.java 2010-02-20 17:47:58 UTC (rev 1788) +++ components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Site.java 2010-02-21 00:58:50 UTC (rev 1789) @@ -24,7 +24,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public interface Site extends WorkspaceObject, WorkspaceCustomizationContext +public interface Site extends WorkspaceObject { /** @@ -67,4 +67,10 @@ */ void destroy(); + /** + * Returns the customization context of this object; + * + * @return the customization context + */ + WorkspaceCustomizationContext getCustomizationContext(); } Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java 2010-02-20 17:47:58 UTC (rev 1788) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java 2010-02-21 00:58:50 UTC (rev 1789) @@ -31,11 +31,7 @@ import org.gatein.mop.api.workspace.Navigation; import org.gatein.mop.api.workspace.WorkspaceObject; import org.gatein.mop.api.workspace.TemplatizedObject; -import org.gatein.mop.api.workspace.WorkspaceCustomizationContext; import org.gatein.mop.api.workspace.link.PageLink; -import org.gatein.mop.api.content.CustomizationContext; -import org.gatein.mop.api.content.Customization; -import org.gatein.mop.api.content.ContentType; import org.gatein.mop.api.Attributes; import org.gatein.mop.core.util.AbstractAttributes; @@ -48,7 +44,7 @@ * @version $Revision$ */ @PrimaryType(name = "mop:page") -public abstract class PageImpl extends WorkspaceObjectImpl implements Page, WorkspaceCustomizationContext +public abstract class PageImpl extends WorkspaceObjectImpl implements Page { /** . */ @@ -109,43 +105,6 @@ @OneToOne(type = RelationshipType.EMBEDDED) public abstract WorkspaceCustomizationContextImpl getCustomizationContext(); - // WorkspaceCustomizationContext implementation ********************************************************************** - - public String getContextType() - { - return getCustomizationContext().getContextType(); - } - - public String getContextId() - { - return getCustomizationContext().getContextId(); - } - - public boolean contains(CustomizationContext that) - { - return getCustomizationContext().contains(that); - } - - public Customization<?> getCustomization(String name) - { - return getCustomizationContext().getCustomization(name); - } - - public <S> Customization<S> customize(String name, ContentType<S> contentType, String contentId, S state) - { - return getCustomizationContext().customize(name, contentType, contentId, state); - } - - public <S> Customization<S> customize(String name, Customization<S> customization) - { - return getCustomizationContext().customize(name, customization); - } - - public String nameOf(Customization customization) - { - return getCustomizationContext().nameOf(customization); - } - // ******************************************************************************************************************* public <T extends TemplatizedObject> Collection<? extends T> getTemplatizedObjects(ObjectType<T> templatizedType) Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteImpl.java 2010-02-20 17:47:58 UTC (rev 1788) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteImpl.java 2010-02-21 00:58:50 UTC (rev 1789) @@ -28,10 +28,6 @@ import org.gatein.mop.api.workspace.Site; import org.gatein.mop.api.workspace.Page; import org.gatein.mop.api.workspace.ObjectType; -import org.gatein.mop.api.workspace.WorkspaceCustomizationContext; -import org.gatein.mop.api.content.CustomizationContext; -import org.gatein.mop.api.content.Customization; -import org.gatein.mop.api.content.ContentType; import org.gatein.mop.core.api.MOPFormatter; /** @@ -40,7 +36,7 @@ */ @FormattedBy(MOPFormatter.class) @PrimaryType(name = "mop:site") -public abstract class SiteImpl<C extends SiteContainer> extends WorkspaceObjectImpl implements Site, WorkspaceCustomizationContext +public abstract class SiteImpl<C extends SiteContainer> extends WorkspaceObjectImpl implements Site { @OneToOne @@ -74,41 +70,4 @@ { return getRoot(); } - - // WorkspaceCustomizationContext implementation ********************************************************************** - - public String getContextType() - { - return getCustomizationContext().getContextType(); - } - - public String getContextId() - { - return getCustomizationContext().getContextId(); - } - - public boolean contains(CustomizationContext that) - { - return getCustomizationContext().contains(that); - } - - public Customization<?> getCustomization(String name) - { - return getCustomizationContext().getCustomization(name); - } - - public <S> Customization<S> customize(String name, ContentType<S> contentType, String contentId, S state) - { - return getCustomizationContext().customize(name, contentType, contentId, state); - } - - public <S> Customization<S> customize(String name, Customization<S> customization) - { - return getCustomizationContext().customize(name, customization); - } - - public String nameOf(Customization customization) - { - return getCustomizationContext().nameOf(customization); - } } Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceCustomizationContextImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceCustomizationContextImpl.java 2010-02-20 17:47:58 UTC (rev 1788) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceCustomizationContextImpl.java 2010-02-21 00:58:50 UTC (rev 1789) @@ -23,7 +23,6 @@ import org.chromattic.api.annotations.MappedBy; import org.chromattic.api.annotations.OneToOne; import org.chromattic.api.annotations.PrimaryType; -import org.chromattic.api.annotations.RelatedMappedBy; import org.gatein.mop.api.content.ContentType; import org.gatein.mop.api.content.Customization; import org.gatein.mop.api.content.CustomizationContext; Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java 2010-02-20 17:47:58 UTC (rev 1788) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java 2010-02-21 00:58:50 UTC (rev 1789) @@ -176,12 +176,12 @@ else if (contained instanceof PageImpl) { PageImpl page = (PageImpl)contained; - return contains(container, page.getSite()); + return contains(container, page.getSite().getCustomizationContext()); } else if (contained instanceof UIWindowImpl) { UIWindowImpl window = (UIWindowImpl)contained; - return contains(container, window.getPage()); + return contains(container, window.getPage().getCustomizationContext()); } } if (container instanceof SiteImpl) @@ -189,12 +189,12 @@ if (contained instanceof PageImpl) { PageImpl page = (PageImpl)contained; - return contains(container, page.getSite()); + return contains(container, page.getSite().getCustomizationContext()); } else if (contained instanceof UIWindowImpl) { UIWindowImpl window = (UIWindowImpl)contained; - return contains(container, window.getPage()); + return contains(container, window.getPage().getCustomizationContext()); } } if (container instanceof PageImpl) @@ -202,7 +202,7 @@ if (contained instanceof UIWindowImpl) { UIWindowImpl window = (UIWindowImpl)contained; - return contains(container, window.getPage()); + return contains(container, window.getPage().getCustomizationContext()); } } return false; Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/content/CustomizationTestCase.java =================================================================== --- components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/content/CustomizationTestCase.java 2010-02-20 17:47:58 UTC (rev 1788) +++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/content/CustomizationTestCase.java 2010-02-21 00:58:50 UTC (rev 1789) @@ -128,12 +128,12 @@ UIWindow window = layout.add(ObjectType.WINDOW, "window"); // - Customization<Preferences> workspaceCustomization = portal.customize("marseille", Preferences.CONTENT_TYPE, "WeatherPortlet", marseille); + Customization<Preferences> workspaceCustomization = portal.getCustomizationContext().customize("marseille", Preferences.CONTENT_TYPE, "WeatherPortlet", marseille); Customization<Preferences> windowCustomization = window.customize(workspaceCustomization); // assertNotNull(windowCustomization); - assertEquals(Arrays.<CustomizationContext>asList(window, portal), new ArrayList<CustomizationContext>(windowCustomization.getContexts())); + assertEquals(Arrays.<CustomizationContext>asList(window, portal.getCustomizationContext()), new ArrayList<CustomizationContext>(windowCustomization.getContexts())); assertSame(windowCustomization, window.getCustomization()); assertTrue(((Customization)windowCustomization) instanceof WorkspaceSpecialization); @@ -163,7 +163,7 @@ UIWindow window = layout.add(ObjectType.WINDOW, "window"); // - Customization<Preferences> workspaceCustomization = portal.customize("marseille", Preferences.CONTENT_TYPE, "WeatherPortlet", marseille); + Customization<Preferences> workspaceCustomization = portal.getCustomizationContext().customize("marseille", Preferences.CONTENT_TYPE, "WeatherPortlet", marseille); Customization<Preferences> windowCustomization = window.customize(workspaceCustomization); // @@ -182,7 +182,7 @@ UIWindow window = layout.add(ObjectType.WINDOW, "window"); // - Customization<Preferences> workspaceCustomization = portal.customize("marseille", Preferences.CONTENT_TYPE, "WeatherPortlet", marseille); + Customization<Preferences> workspaceCustomization = portal.getCustomizationContext().customize("marseille", Preferences.CONTENT_TYPE, "WeatherPortlet", marseille); Customization<Preferences> windowCustomization = window.customize(workspaceCustomization); //

14 years, 10 months

1
0
0 / 0

gatein SVN: r1788 - in components/mop/trunk: api/src/main/java/org/gatein/mop/api/workspace and 7 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-02-20 12:47:58 -0500 (Sat, 20 Feb 2010) New Revision: 1788 Added: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceCustomizationContextImpl.java Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/composer/ComponentIterator.java components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Workspace.java components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/ui/UIContainer.java components/mop/trunk/core/pom.xml components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSite.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/LinkImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageContainer.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSite.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIComponentImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIContainerImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSite.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomization.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/CustomizationContainer.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/WorkspaceCustomization.java components/mop/trunk/core/src/main/resources/conf/mop-nodetypes.xml components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/WorkspaceTestCase.java components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/content/CustomizationTestCase.java Log: update to chromattic trunk snapshot Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/composer/ComponentIterator.java =================================================================== --- components/mop/trunk/api/src/main/java/org/gatein/mop/api/composer/ComponentIterator.java 2010-02-19 21:37:44 UTC (rev 1787) +++ components/mop/trunk/api/src/main/java/org/gatein/mop/api/composer/ComponentIterator.java 2010-02-20 17:47:58 UTC (rev 1788) @@ -70,7 +70,7 @@ if (current instanceof UIContainer) { UIContainer container = (UIContainer)current; - Iterator<? extends UIComponent> iterator = container.iterator(); + Iterator<UIComponent> iterator = container.getComponents().iterator(); if (iterator.hasNext()) { stack.add(new ContainerVisit(container, iterator)); Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Workspace.java =================================================================== --- components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Workspace.java 2010-02-19 21:37:44 UTC (rev 1787) +++ components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Workspace.java 2010-02-20 17:47:58 UTC (rev 1788) @@ -26,7 +26,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public interface Workspace extends WorkspaceObject, WorkspaceCustomizationContext +public interface Workspace extends WorkspaceObject { /** @@ -62,4 +62,11 @@ */ <S extends Site> S addSite(ObjectType<S> siteType, String name); + /** + * Returns the customization context of this object; + * + * @return the customization context + */ + WorkspaceCustomizationContext getCustomizationContext(); + } Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/ui/UIContainer.java =================================================================== --- components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/ui/UIContainer.java 2010-02-19 21:37:44 UTC (rev 1787) +++ components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/ui/UIContainer.java 2010-02-20 17:47:58 UTC (rev 1788) @@ -26,7 +26,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public interface UIContainer extends UIComponent, List<UIComponent> +public interface UIContainer extends UIComponent { <T extends UIComponent> T add(ObjectType<T> componentType, String componentName); @@ -35,4 +35,7 @@ UIComponent get(String componentName); + List<UIComponent> getComponents(); + + } Modified: components/mop/trunk/core/pom.xml =================================================================== --- components/mop/trunk/core/pom.xml 2010-02-19 21:37:44 UTC (rev 1787) +++ components/mop/trunk/core/pom.xml 2010-02-20 17:47:58 UTC (rev 1788) @@ -38,7 +38,7 @@ <description>Model Object for Portal Core</description> <properties> - <org.chromattic.version>1.0.0-cr1</org.chromattic.version> + <org.chromattic.version>1.0.0-cr2-SNAPSHOT</org.chromattic.version> </properties> <dependencies> Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSite.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSite.java 2010-02-19 21:37:44 UTC (rev 1787) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSite.java 2010-02-20 17:47:58 UTC (rev 1788) @@ -27,7 +27,7 @@ * @version $Revision$ */ @PrimaryType(name = "mop:groupsite") -public abstract class GroupSite extends SiteImpl +public abstract class GroupSite extends SiteImpl<GroupSiteContainer> { // Site implementation *********************************************************************************************** Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/LinkImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/LinkImpl.java 2010-02-19 21:37:44 UTC (rev 1787) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/LinkImpl.java 2010-02-20 17:47:58 UTC (rev 1788) @@ -18,6 +18,7 @@ */ package org.gatein.mop.core.api.workspace; +import org.chromattic.api.annotations.PrimaryType; import org.gatein.mop.api.workspace.link.Link; import org.gatein.mop.api.workspace.ObjectType; @@ -25,6 +26,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ +@PrimaryType(name = "mop:link") public abstract class LinkImpl extends WorkspaceObjectImpl implements Link { Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java 2010-02-19 21:37:44 UTC (rev 1787) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java 2010-02-20 17:47:58 UTC (rev 1788) @@ -39,7 +39,7 @@ { @OneToOne - @RelatedMappedBy("navigations") + @RelatedMappedBy("children") public abstract NavigationImpl getOwner(); @OneToMany Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageContainer.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageContainer.java 2010-02-19 21:37:44 UTC (rev 1787) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageContainer.java 2010-02-20 17:47:58 UTC (rev 1788) @@ -38,7 +38,7 @@ { @OneToOne - @RelatedMappedBy("pages") + @RelatedMappedBy("children") public abstract PageImpl getOwner(); @OneToMany Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java 2010-02-19 21:37:44 UTC (rev 1787) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java 2010-02-20 17:47:58 UTC (rev 1788) @@ -38,7 +38,6 @@ import org.gatein.mop.api.content.ContentType; import org.gatein.mop.api.Attributes; import org.gatein.mop.core.util.AbstractAttributes; -import org.gatein.mop.core.api.workspace.content.CustomizationContainer; import java.util.Collection; import java.util.ArrayList; @@ -93,8 +92,7 @@ @MappedBy("children") public abstract PageContainer getChildrenContainer(); - @OneToOne - @RelatedMappedBy("children") + @ManyToOne public abstract PageContainer getParentContainer(); @OneToOne @@ -108,45 +106,44 @@ @Destroy public abstract void destroy(); - @OneToOne - @MappedBy("customizations") - public abstract CustomizationContainer getCustomizations(); + @OneToOne(type = RelationshipType.EMBEDDED) + public abstract WorkspaceCustomizationContextImpl getCustomizationContext(); // WorkspaceCustomizationContext implementation ********************************************************************** public String getContextType() { - return WorkspaceCustomizationContext.TYPE; + return getCustomizationContext().getContextType(); } public String getContextId() { - return getObjectId(); + return getCustomizationContext().getContextId(); } public boolean contains(CustomizationContext that) { - return contains(this, that); + return getCustomizationContext().contains(that); } public Customization<?> getCustomization(String name) { - return getCustomizations().getCustomization(name); + return getCustomizationContext().getCustomization(name); } public <S> Customization<S> customize(String name, ContentType<S> contentType, String contentId, S state) { - return getCustomizations().customize(name, contentType, contentId, state); + return getCustomizationContext().customize(name, contentType, contentId, state); } public <S> Customization<S> customize(String name, Customization<S> customization) { - return getCustomizations().customize(name, customization); + return getCustomizationContext().customize(name, customization); } public String nameOf(Customization customization) { - return getCustomizations().nameOf(customization); + return getCustomizationContext().nameOf(customization); } // ******************************************************************************************************************* Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSite.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSite.java 2010-02-19 21:37:44 UTC (rev 1787) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSite.java 2010-02-20 17:47:58 UTC (rev 1788) @@ -27,7 +27,7 @@ * @version $Revision$ */ @PrimaryType(name = "mop:portalsite") -public abstract class PortalSite extends SiteImpl +public abstract class PortalSite extends SiteImpl<PortalSiteContainer> { // Site implementation *********************************************************************************************** Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteImpl.java 2010-02-19 21:37:44 UTC (rev 1787) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteImpl.java 2010-02-20 17:47:58 UTC (rev 1788) @@ -18,11 +18,13 @@ */ package org.gatein.mop.core.api.workspace; +import org.chromattic.api.RelationshipType; import org.chromattic.api.annotations.FormattedBy; import org.chromattic.api.annotations.ManyToOne; import org.chromattic.api.annotations.OneToOne; import org.chromattic.api.annotations.MappedBy; import org.chromattic.api.annotations.Destroy; +import org.chromattic.api.annotations.PrimaryType; import org.gatein.mop.api.workspace.Site; import org.gatein.mop.api.workspace.Page; import org.gatein.mop.api.workspace.ObjectType; @@ -31,14 +33,14 @@ import org.gatein.mop.api.content.Customization; import org.gatein.mop.api.content.ContentType; import org.gatein.mop.core.api.MOPFormatter; -import org.gatein.mop.core.api.workspace.content.CustomizationContainer; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ @FormattedBy(MOPFormatter.class) -public abstract class SiteImpl extends WorkspaceObjectImpl implements Site, WorkspaceCustomizationContext +@PrimaryType(name = "mop:site") +public abstract class SiteImpl<C extends SiteContainer> extends WorkspaceObjectImpl implements Site, WorkspaceCustomizationContext { @OneToOne @@ -50,14 +52,13 @@ public abstract NavigationImpl getRootNavigation(); @ManyToOne - public abstract SiteContainer getSites(); + public abstract C getSites(); @Destroy public abstract void destroy(); - @OneToOne - @MappedBy("customizations") - public abstract CustomizationContainer getCustomizations(); + @OneToOne(type = RelationshipType.EMBEDDED) + public abstract WorkspaceCustomizationContextImpl getCustomizationContext(); public abstract ObjectType<? extends Site> getObjectType(); @@ -78,36 +79,36 @@ public String getContextType() { - return WorkspaceCustomizationContext.TYPE; + return getCustomizationContext().getContextType(); } public String getContextId() { - return getObjectId(); + return getCustomizationContext().getContextId(); } public boolean contains(CustomizationContext that) { - return contains(this, that); + return getCustomizationContext().contains(that); } public Customization<?> getCustomization(String name) { - return getCustomizations().getCustomization(name); + return getCustomizationContext().getCustomization(name); } public <S> Customization<S> customize(String name, ContentType<S> contentType, String contentId, S state) { - return getCustomizations().customize(name, contentType, contentId, state); + return getCustomizationContext().customize(name, contentType, contentId, state); } public <S> Customization<S> customize(String name, Customization<S> customization) { - return getCustomizations().customize(name, customization); + return getCustomizationContext().customize(name, customization); } public String nameOf(Customization customization) { - return getCustomizations().nameOf(customization); + return getCustomizationContext().nameOf(customization); } } Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIComponentImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIComponentImpl.java 2010-02-19 21:37:44 UTC (rev 1787) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIComponentImpl.java 2010-02-20 17:47:58 UTC (rev 1788) @@ -18,6 +18,7 @@ */ package org.gatein.mop.core.api.workspace; +import org.chromattic.api.annotations.PrimaryType; import org.gatein.mop.api.workspace.ui.UIComponent; import org.gatein.mop.api.workspace.ObjectType; import org.chromattic.api.annotations.ManyToOne; @@ -27,6 +28,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ +@PrimaryType(name = "mop:uicomponent") public abstract class UIComponentImpl extends WorkspaceObjectImpl implements UIComponent { Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIContainerImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIContainerImpl.java 2010-02-19 21:37:44 UTC (rev 1787) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIContainerImpl.java 2010-02-20 17:47:58 UTC (rev 1788) @@ -20,7 +20,6 @@ import org.chromattic.api.annotations.OneToMany; import org.chromattic.api.annotations.Create; -import org.chromattic.api.annotations.Name; import org.chromattic.api.annotations.PrimaryType; import org.gatein.mop.api.workspace.ui.UIContainer; import org.gatein.mop.api.workspace.ui.UIComponent; @@ -53,7 +52,7 @@ public abstract Map<String, UIComponentImpl> getComponentMap(); @OneToMany - public abstract List<UIComponent> getComponentList(); + public abstract List<UIComponentImpl> getComponentList(); public ObjectType<? extends UIContainer> getObjectType() { @@ -110,125 +109,133 @@ throw new UnsupportedOperationException(); } child.setName(name); - List<UIComponent> children = getComponentList(); + List<UIComponentImpl> children = getComponentList(); children.add(index, child); return componentType.cast(child); } + public List<UIComponent> getComponents() { + // We have to do that + return (List)components; + } + // List<UIComponent> implementation ********************************************************************************** - public int size() - { - return getComponentList().size(); - } + private final List<UIComponentImpl> components = new List<UIComponentImpl>() { - public boolean isEmpty() - { - return getComponentList().isEmpty(); - } + public int size() + { + return getComponentList().size(); + } - public boolean contains(Object o) - { - return getComponentList().contains(o); - } + public boolean isEmpty() + { + return getComponentList().isEmpty(); + } - public Iterator<UIComponent> iterator() - { - return getComponentList().iterator(); - } + public boolean contains(Object o) + { + return getComponentList().contains(o); + } - public Object[] toArray() - { - return new Object[0]; - } + public Iterator<UIComponentImpl> iterator() + { + return getComponentList().iterator(); + } - public <T> T[] toArray(T[] a) - { - return getComponentList().toArray(a); - } + public Object[] toArray() + { + return new Object[0]; + } - public boolean add(UIComponent uiComponent) - { - return getComponentList().add(uiComponent); - } + public <T> T[] toArray(T[] a) + { + return getComponentList().toArray(a); + } - public boolean remove(Object o) - { - return getComponentList().remove(o); - } + public boolean add(UIComponentImpl uiComponent) + { + return getComponentList().add(uiComponent); + } - public boolean containsAll(Collection<?> c) - { - return getComponentList().containsAll(c); - } + public boolean remove(Object o) + { + return getComponentList().remove(o); + } - public boolean addAll(Collection<? extends UIComponent> c) - { - return getComponentList().addAll(c); - } + public boolean containsAll(Collection<?> c) + { + return getComponentList().containsAll(c); + } - public boolean addAll(int index, Collection<? extends UIComponent> c) - { - return getComponentList().addAll(index, c); - } + public boolean addAll(Collection<? extends UIComponentImpl> c) + { + return getComponentList().addAll(c); + } - public boolean removeAll(Collection<?> c) - { - return getComponentList().removeAll(c); - } + public boolean addAll(int index, Collection<? extends UIComponentImpl> c) + { + return getComponentList().addAll(index, c); + } - public boolean retainAll(Collection<?> c) - { - return getComponentList().retainAll(c); - } + public boolean removeAll(Collection<?> c) + { + return getComponentList().removeAll(c); + } - public void clear() - { - getComponentList().clear(); - } + public boolean retainAll(Collection<?> c) + { + return getComponentList().retainAll(c); + } - public UIComponent get(int index) - { - return getComponentList().get(index); - } + public void clear() + { + getComponentList().clear(); + } - public UIComponent set(int index, UIComponent element) - { - return getComponentList().set(index, element); - } + public UIComponentImpl get(int index) + { + return getComponentList().get(index); + } - public void add(int index, UIComponent element) - { - getComponentList().add(index, element); - } + public UIComponentImpl set(int index, UIComponentImpl element) + { + return getComponentList().set(index, element); + } - public UIComponent remove(int index) - { - return getComponentList().remove(index); - } + public void add(int index, UIComponentImpl element) + { + getComponentList().add(index, element); + } - public int indexOf(Object o) - { - return getComponentList().indexOf(o); - } + public UIComponentImpl remove(int index) + { + return getComponentList().remove(index); + } - public int lastIndexOf(Object o) - { - return getComponentList().lastIndexOf(o); - } + public int indexOf(Object o) + { + return getComponentList().indexOf(o); + } - public ListIterator<UIComponent> listIterator() - { - return getComponentList().listIterator(); - } + public int lastIndexOf(Object o) + { + return getComponentList().lastIndexOf(o); + } - public ListIterator<UIComponent> listIterator(int index) - { - return getComponentList().listIterator(index); - } + public ListIterator<UIComponentImpl> listIterator() + { + return getComponentList().listIterator(); + } - public List<UIComponent> subList(int fromIndex, int toIndex) - { - return getComponentList().subList(fromIndex, toIndex); - } + public ListIterator<UIComponentImpl> listIterator(int index) + { + return getComponentList().listIterator(index); + } + + public List<UIComponentImpl> subList(int fromIndex, int toIndex) + { + return getComponentList().subList(fromIndex, toIndex); + } + }; } Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSite.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSite.java 2010-02-19 21:37:44 UTC (rev 1787) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSite.java 2010-02-20 17:47:58 UTC (rev 1788) @@ -28,7 +28,7 @@ * @version $Revision$ */ @PrimaryType(name = "mop:usersite") -public abstract class UserSite extends SiteImpl +public abstract class UserSite extends SiteImpl<UserSiteContainer> { // Site implementation *********************************************************************************************** Added: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceCustomizationContextImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceCustomizationContextImpl.java (rev 0) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceCustomizationContextImpl.java 2010-02-20 17:47:58 UTC (rev 1788) @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2010 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.gatein.mop.core.api.workspace; + +import org.chromattic.api.RelationshipType; +import org.chromattic.api.annotations.MappedBy; +import org.chromattic.api.annotations.OneToOne; +import org.chromattic.api.annotations.PrimaryType; +import org.chromattic.api.annotations.RelatedMappedBy; +import org.gatein.mop.api.content.ContentType; +import org.gatein.mop.api.content.Customization; +import org.gatein.mop.api.content.CustomizationContext; +import org.gatein.mop.api.workspace.WorkspaceCustomizationContext; +import org.gatein.mop.core.api.workspace.content.CustomizationContainer; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +@PrimaryType(name = "mop:customizationcontext") +public abstract class WorkspaceCustomizationContextImpl implements WorkspaceCustomizationContext { + + @OneToOne(type = RelationshipType.EMBEDDED) + public abstract WorkspaceObjectImpl getOwner(); + + @OneToOne + @MappedBy("customizations") + public abstract CustomizationContainer getCustomizations(); + + public String getContextType() + { + return WorkspaceCustomizationContext.TYPE; + } + + public String getContextId() + { + return getOwner().getObjectId(); + } + + public boolean contains(CustomizationContext that) + { + return WorkspaceObjectImpl.contains(this, that); + } + + public Customization<?> getCustomization(String name) + { + return getCustomizations().getCustomization(name); + } + + public <S> Customization<S> customize(String name, ContentType<S> contentType, String contentId, S state) + { + return getCustomizations().customize(name, contentType, contentId, state); + } + + public <S> Customization<S> customize(String name, Customization<S> customization) + { + return getCustomizations().customize(name, customization); + } + + public String nameOf(Customization customization) + { + return getCustomizations().nameOf(customization); + } +} Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java 2010-02-19 21:37:44 UTC (rev 1787) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java 2010-02-20 17:47:58 UTC (rev 1788) @@ -18,6 +18,7 @@ */ package org.gatein.mop.core.api.workspace; +import org.chromattic.api.RelationshipType; import org.chromattic.api.annotations.OneToOne; import org.chromattic.api.annotations.MappedBy; import org.chromattic.api.annotations.FindById; @@ -29,7 +30,6 @@ import org.gatein.mop.api.content.CustomizationContext; import org.gatein.mop.api.content.Customization; import org.gatein.mop.api.content.ContentType; -import org.gatein.mop.core.api.workspace.content.CustomizationContainer; import java.util.Collection; @@ -38,7 +38,7 @@ * @version $Revision$ */ @PrimaryType(name = "mop:workspace") -public abstract class WorkspaceImpl extends WorkspaceObjectImpl implements Workspace, WorkspaceCustomizationContext +public abstract class WorkspaceImpl extends WorkspaceObjectImpl implements Workspace { public ObjectType<? extends Workspace> getObjectType() @@ -60,52 +60,14 @@ @MappedBy("usersites") public abstract UserSiteContainer getUserSites(); - @OneToOne - @MappedBy("customizations") - public abstract CustomizationContainer getCustomizations(); + @OneToOne(type = RelationshipType.EMBEDDED) + public abstract WorkspaceCustomizationContextImpl getCustomizationContext(); // CustomizationContextResolver implementation *********************************************************************** @FindById public abstract CustomizationContext resolveContext(String contextId); - // WorkspaceCustomizationContext implementation ********************************************************************** - - public String getContextType() - { - return WorkspaceCustomizationContext.TYPE; - } - - public String getContextId() - { - return getObjectId(); - } - - public boolean contains(CustomizationContext that) - { - return contains(this, that); - } - - public Customization<?> getCustomization(String name) - { - return getCustomizations().getCustomization(name); - } - - public <S> Customization<S> customize(String name, ContentType<S> contentType, String contentId, S state) - { - return getCustomizations().customize(name, contentType, contentId, state); - } - - public <S> Customization<S> customize(String name, Customization<S> customization) - { - return getCustomizations().customize(name, customization); - } - - public String nameOf(Customization customization) - { - return getCustomizations().nameOf(customization); - } - // Workspace implementation ****************************************************************************************** @SuppressWarnings("unchecked") Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java 2010-02-19 21:37:44 UTC (rev 1787) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java 2010-02-20 17:47:58 UTC (rev 1788) @@ -18,7 +18,7 @@ */ package org.gatein.mop.core.api.workspace; -import org.chromattic.api.annotations.FormattedBy; +import org.chromattic.api.annotations.*; import org.chromattic.common.collection.AbstractFilterIterator; import org.gatein.mop.api.workspace.WorkspaceObject; import org.gatein.mop.api.workspace.ObjectType; @@ -27,9 +27,6 @@ import org.gatein.mop.core.api.MOPFormatter; import org.gatein.mop.core.api.ModelImpl; import org.gatein.mop.core.util.AbstractAttributes; -import org.chromattic.api.annotations.Id; -import org.chromattic.api.annotations.Name; -import org.chromattic.api.annotations.Properties; import java.util.Map; import java.util.Set; @@ -41,6 +38,7 @@ * @version $Revision$ */ @FormattedBy(MOPFormatter.class) +@PrimaryType(name = "mop:workspaceobject") public abstract class WorkspaceObjectImpl implements WorkspaceObject { @@ -147,6 +145,11 @@ static boolean contains(CustomizationContext container, CustomizationContext contained) { + return contains(((WorkspaceCustomizationContextImpl)container).getOwner(), contained); + } + + private static boolean contains(WorkspaceObjectImpl container, CustomizationContext contained) + { if (container == null) { throw new NullPointerException("No null container accepted"); @@ -156,6 +159,8 @@ throw new NullPointerException("No null contained accepted"); } + + // if (container == contained) { @@ -166,7 +171,7 @@ if (contained instanceof SiteImpl) { SiteImpl site = (SiteImpl)contained; - return contains(container, site.getWorkspace()); + return contains(container, site.getWorkspace().getCustomizationContext()); } else if (contained instanceof PageImpl) { Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomization.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomization.java 2010-02-19 21:37:44 UTC (rev 1787) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomization.java 2010-02-20 17:47:58 UTC (rev 1788) @@ -19,6 +19,7 @@ package org.gatein.mop.core.api.workspace.content; import org.chromattic.api.annotations.FormattedBy; +import org.chromattic.api.annotations.PrimaryType; import org.gatein.mop.api.content.Customization; import org.gatein.mop.api.content.CustomizationContext; import org.gatein.mop.api.content.ContentType; @@ -47,6 +48,7 @@ * @version $Revision$ */ @FormattedBy(MOPFormatter.class) +@PrimaryType(name = "mop:customization") public abstract class AbstractCustomization implements Customization<Object>, StateContainer { Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/CustomizationContainer.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/CustomizationContainer.java 2010-02-19 21:37:44 UTC (rev 1787) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/CustomizationContainer.java 2010-02-20 17:47:58 UTC (rev 1788) @@ -28,6 +28,7 @@ import org.chromattic.api.annotations.OneToMany; import org.chromattic.api.annotations.RelatedMappedBy; import org.gatein.mop.core.api.MOPFormatter; +import org.gatein.mop.core.api.workspace.WorkspaceCustomizationContextImpl; import java.util.Map; @@ -42,7 +43,7 @@ @OneToOne @RelatedMappedBy("mop:customizations") - public abstract WorkspaceCustomizationContext getOwner(); + public abstract WorkspaceCustomizationContextImpl getOwner(); @OneToMany public abstract Map<String, WorkspaceCustomization> getCustomizations(); Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/WorkspaceCustomization.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/WorkspaceCustomization.java 2010-02-19 21:37:44 UTC (rev 1787) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/WorkspaceCustomization.java 2010-02-20 17:47:58 UTC (rev 1788) @@ -20,6 +20,7 @@ import org.chromattic.api.annotations.ManyToOne; import org.chromattic.api.annotations.Destroy; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.Property; import org.gatein.mop.api.content.CustomizationContext; import org.gatein.mop.api.content.ContentType; @@ -30,6 +31,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ +@PrimaryType(name = "mop:workspacecustomization") public abstract class WorkspaceCustomization extends AbstractCustomization { Modified: components/mop/trunk/core/src/main/resources/conf/mop-nodetypes.xml =================================================================== --- components/mop/trunk/core/src/main/resources/conf/mop-nodetypes.xml 2010-02-19 21:37:44 UTC (rev 1787) +++ components/mop/trunk/core/src/main/resources/conf/mop-nodetypes.xml 2010-02-20 17:47:58 UTC (rev 1788) @@ -132,9 +132,10 @@ </childNodeDefinitions> </nodeType> - <nodeType name="mop:customizationcontext" isMixin="true" hasOrderableChildNodes="false" primaryItemName=""> + <nodeType name="mop:customizationcontext" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> <supertypes> <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> </supertypes> <childNodeDefinitions> <childNodeDefinition name="mop:customizations" defaultPrimaryType="mop:customizationcontainer" autoCreated="true" mandatory="false" Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/WorkspaceTestCase.java =================================================================== --- components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/WorkspaceTestCase.java 2010-02-19 21:37:44 UTC (rev 1787) +++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/WorkspaceTestCase.java 2010-02-20 17:47:58 UTC (rev 1788) @@ -18,6 +18,7 @@ */ package org.gatein.mop.core.api.workspace; +import org.gatein.mop.api.workspace.ui.UIComponent; import org.gatein.mop.core.util.Tools; import org.gatein.mop.api.workspace.ObjectType; import org.gatein.mop.api.workspace.Site; @@ -32,6 +33,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.Collections; +import java.util.List; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> @@ -231,22 +233,24 @@ container.add(ObjectType.WINDOW, "2"); container.add(0, ObjectType.WINDOW, "0"); - assertEquals("0", container.get(0).getName()); - assertEquals("2", container.get(1).getName()); - assertEquals(2, container.size()); + List<UIComponent> components = container.getComponents(); + assertEquals("0", components.get(0).getName()); + assertEquals("2", components.get(1).getName()); + assertEquals(2, components.size()); + container.add(1, ObjectType.WINDOW, "1"); - assertEquals("0", container.get(0).getName()); - assertEquals("1", container.get(1).getName()); - assertEquals("2", container.get(2).getName()); - assertEquals(3, container.size()); + assertEquals("0", components.get(0).getName()); + assertEquals("1", components.get(1).getName()); + assertEquals("2", components.get(2).getName()); + assertEquals(3, components.size()); - container.add(0, container.get(2)); + components.add(0, components.get(2)); - assertEquals("2", container.get(0).getName()); - assertEquals("0", container.get(1).getName()); - assertEquals("1", container.get(2).getName()); - assertEquals(3, container.size()); + assertEquals("2", components.get(0).getName()); + assertEquals("0", components.get(1).getName()); + assertEquals("1", components.get(2).getName()); + assertEquals(3, components.size()); } } \ No newline at end of file Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/content/CustomizationTestCase.java =================================================================== --- components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/content/CustomizationTestCase.java 2010-02-19 21:37:44 UTC (rev 1787) +++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/content/CustomizationTestCase.java 2010-02-20 17:47:58 UTC (rev 1788) @@ -54,8 +54,8 @@ public void testVirtualCustomization() { Workspace workspace = pomService.getModel().getWorkspace(); - Customization<Preferences> customization1 = workspace.customize("marseille", Preferences.CONTENT_TYPE, "WeatherPortlet", marseille); - Customization<Preferences> customization2 = workspace.customize("paris", customization1); + Customization<Preferences> customization1 = workspace.getCustomizationContext().customize("marseille", Preferences.CONTENT_TYPE, "WeatherPortlet", marseille); + Customization<Preferences> customization2 = workspace.getCustomizationContext().customize("paris", customization1); // customization2.setState(paris); @@ -76,15 +76,15 @@ public void testCustomizeWorkspace() { Workspace workspace = pomService.getModel().getWorkspace(); - assertNull(workspace.getCustomization("marseille")); - Customization<Preferences> customization = workspace.customize("marseille", Preferences.CONTENT_TYPE, "WeatherPortlet", marseille); + assertNull(workspace.getCustomizationContext().getCustomization("marseille")); + Customization<Preferences> customization = workspace.getCustomizationContext().customize("marseille", Preferences.CONTENT_TYPE, "WeatherPortlet", marseille); assertNotNull(customization); Preferences b = customization.getState(); assertEquals(marseille, b); assertEquals(0, customization.getContexts().size()); assertEquals("WeatherPortlet", customization.getContentId()); assertEquals(Preferences.CONTENT_TYPE, customization.getType()); - assertEquals("marseille", workspace.nameOf(customization)); + assertEquals("marseille", workspace.getCustomizationContext().nameOf(customization)); } public void testCustomizeWindow()

14 years, 10 months

1
0
0 / 0

gatein SVN: r1787 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application.

by do-not-reply＠jboss.org

Author: mwringe Date: 2010-02-19 16:37:44 -0500 (Fri, 19 Feb 2010) New Revision: 1787 Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java Log: Throw a error message if we receive a non-text content type that contains no bytes of data. If chars exist, these may represent an error message and these chars will be printed in the error message. Related to GTNPORTAL-630. Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2010-02-19 18:26:44 UTC (rev 1786) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2010-02-19 21:37:44 UTC (rev 1787) @@ -366,8 +366,24 @@ else { response.setContentType(contentType); - OutputStream stream = response.getOutputStream(); - stream.write(piResponse.getBytes()); + if (piResponse.getBytes() != null) + { + OutputStream stream = response.getOutputStream(); + stream.write(piResponse.getBytes()); + } + else + { + if (piResponse.getChars() != null) + { + log.error("Received a content type of " + contentType + " but it contains no bytes of data. Chars were unexpectantly returned instead : " + piResponse.getChars()); + } + else + { + log.error("Received a content type of " + contentType + " but it contains no bytes of data."); + } + } + + } context.getResponse().flushBuffer();

14 years, 10 months

1
0
0 / 0

gatein SVN: r1786 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation.

by do-not-reply＠jboss.org

Author: mwringe Date: 2010-02-19 13:26:44 -0500 (Fri, 19 Feb 2010) New Revision: 1786 Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java Log: GTNPORTAL-689: save the current edited navigational page instead of just re-saving the old page. This will fix the issues where the navigation is not persisted after logging out of the portal. Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java 2010-02-19 15:16:44 UTC (rev 1785) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java 2010-02-19 18:26:44 UTC (rev 1786) @@ -125,7 +125,7 @@ UserPortalConfig portalConfig = portalConfigService.getUserPortalConfig(navigation.getOwnerId(), prContext.getRemoteUser()); if(portalConfig != null) { - dataService.save(persistNavigation); + dataService.save(navigation); } else { UIApplication uiApp = Util.getPortalRequestContext().getUIApplication(); uiApp.addMessage(new ApplicationMessage("UIPortalForm.msg.notExistAnymore", null));

14 years, 10 months

1
0
0 / 0

gatein SVN: r1785 - in portal/trunk/component/wsrp: src/main/java/org/gatein/portal/wsrp and 1 other directory.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-02-19 10:16:44 -0500 (Fri, 19 Feb 2010) New Revision: 1785 Modified: portal/trunk/component/wsrp/pom.xml portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/ExoKernelIntegration.java Log: - GTNPORTAL-646: use a WCI WebAppListener to inject services needed by the WSRP admin GUI. This should really be done with CDI. Modified: portal/trunk/component/wsrp/pom.xml =================================================================== --- portal/trunk/component/wsrp/pom.xml 2010-02-19 14:52:25 UTC (rev 1784) +++ portal/trunk/component/wsrp/pom.xml 2010-02-19 15:16:44 UTC (rev 1785) @@ -1,6 +1,6 @@  -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> @@ -110,6 +111,11 @@ <version>${project.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + <version>${org.gatein.wci.version}</version> + </dependency> </dependencies> <build> Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/ExoKernelIntegration.java =================================================================== --- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/ExoKernelIntegration.java 2010-02-19 14:52:25 UTC (rev 1784) +++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/ExoKernelIntegration.java 2010-02-19 15:16:44 UTC (rev 1785) @@ -43,6 +43,13 @@ import org.gatein.registration.RegistrationManager; import org.gatein.registration.RegistrationPersistenceManager; import org.gatein.registration.impl.RegistrationManagerImpl; +import org.gatein.wci.ServletContainer; +import org.gatein.wci.ServletContainerFactory; +import org.gatein.wci.WebApp; +import org.gatein.wci.WebAppEvent; +import org.gatein.wci.WebAppLifeCycleEvent; +import org.gatein.wci.WebAppListener; +import org.gatein.wci.impl.DefaultServletContainerFactory; import org.gatein.wsrp.api.SessionEvent; import org.gatein.wsrp.api.SessionEventBroadcaster; import org.gatein.wsrp.api.SessionEventListener; @@ -53,6 +60,7 @@ import org.gatein.wsrp.producer.config.ProducerConfigurationService; import org.picocontainer.Startable; +import javax.servlet.ServletContext; import java.io.InputStream; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -61,7 +69,7 @@ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -public class ExoKernelIntegration implements Startable +public class ExoKernelIntegration implements Startable, WebAppListener { private static final Logger log = LoggerFactory.getLogger(ExoKernelIntegration.class); @@ -76,6 +84,7 @@ private ConsumerRegistry consumerRegistry; private ExoContainer container; private final boolean bypass; + private static final String WSRP_ADMIN_GUI_CONTEXT_PATH = "/wsrp-admin-gui"; public ExoKernelIntegration(ExoContainerContext context, InitParams params, ConfigurationManager configurationManager, org.exoplatform.portal.pc.ExoKernelIntegration pc) throws Exception @@ -123,6 +132,12 @@ { startProducer(); startConsumers(); + + // listen for web app events so that we can inject services into WSRP admin UI "cleanly" + // todo: this service injection should really be done using CDI... :/ + ServletContainerFactory factory = DefaultServletContainerFactory.getInstance(); + ServletContainer servletContainer = factory.getServletContainer(); + servletContainer.addWebAppListener(this); } } @@ -213,6 +228,11 @@ { if (!bypass) { + // stop listening to web app events + ServletContainerFactory factory = DefaultServletContainerFactory.getInstance(); + ServletContainer servletContainer = factory.getServletContainer(); + servletContainer.removeWebAppListener(this); + stopProducer(); stopConsumers(); } @@ -239,6 +259,33 @@ consumerRegistry = null; } + public void onEvent(WebAppEvent event) + { + if (event instanceof WebAppLifeCycleEvent) + { + WebAppLifeCycleEvent lifeCycleEvent = (WebAppLifeCycleEvent)event; + WebApp webApp = event.getWebApp(); + ServletContext context = webApp.getServletContext(); + + // if we see the WSRP admin GUI being deployed or undeployed, inject or remove services + if (WSRP_ADMIN_GUI_CONTEXT_PATH.equals(webApp.getContextPath())) + { + switch (lifeCycleEvent.getType()) + { + case WebAppLifeCycleEvent.ADDED: + + context.setAttribute("ConsumerRegistry", consumerRegistry); + context.setAttribute("ProducerConfigurationService", producer.getConfigurationService()); + break; + case WebAppLifeCycleEvent.REMOVED: + context.removeAttribute("ConsumerRegistry"); + context.removeAttribute("ProducerConfigurationService"); + break; + } + } + } + } + private static class SimpleSessionEventBroadcaster implements SessionEventBroadcaster { private Map<String, SessionEventListener> listeners = new ConcurrentHashMap<String, SessionEventListener>();

14 years, 10 months

1
0
0 / 0

gatein SVN: r1784 - in components/wsrp/trunk/admin-gui: src/main/java/org/gatein/wsrp/admin/ui and 1 other directory.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-02-19 09:52:25 -0500 (Fri, 19 Feb 2010) New Revision: 1784 Modified: components/wsrp/trunk/admin-gui/pom.xml components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerManagerBean.java components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ProducerBean.java Log: - GTNWSRP-3: Removed dependency on eXo kernel as services should be injected at the integration point, not component level. Modified: components/wsrp/trunk/admin-gui/pom.xml =================================================================== --- components/wsrp/trunk/admin-gui/pom.xml 2010-02-19 14:47:04 UTC (rev 1783) +++ components/wsrp/trunk/admin-gui/pom.xml 2010-02-19 14:52:25 UTC (rev 1784) @@ -21,7 +21,8 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> @@ -80,12 +81,6 @@ <artifactId>jsf-facelets</artifactId> <version>1.1.15</version> </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.container</artifactId> - <scope>provided</scope> - <version>2.2.0-Beta06</version> - </dependency> </dependencies>  Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java =================================================================== --- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java 2010-02-19 14:47:04 UTC (rev 1783) +++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java 2010-02-19 14:52:25 UTC (rev 1784) @@ -23,7 +23,6 @@ package org.gatein.wsrp.admin.ui; -import org.exoplatform.container.ExoContainerContext; import org.gatein.wsrp.WSRPConsumer; import org.gatein.wsrp.consumer.EndpointConfigurationInfo; import org.gatein.wsrp.consumer.ProducerInfo; @@ -478,11 +477,6 @@ public ConsumerRegistry getRegistry() { - // todo: fix this, the registry needs to be injected more cleanly - if (registry == null) - { - registry = (ConsumerRegistry)ExoContainerContext.getCurrentContainer().getComponentInstanceOfType(ConsumerRegistry.class); - } return registry; } } Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerManagerBean.java =================================================================== --- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerManagerBean.java 2010-02-19 14:47:04 UTC (rev 1783) +++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerManagerBean.java 2010-02-19 14:52:25 UTC (rev 1784) @@ -23,7 +23,6 @@ package org.gatein.wsrp.admin.ui; -import org.exoplatform.container.ExoContainerContext; import org.gatein.common.util.ParameterValidation; import org.gatein.pc.api.PortletInvokerException; import org.gatein.wsrp.WSRPConsumer; @@ -63,11 +62,6 @@ public ConsumerRegistry getRegistry() { - // todo: fix this, the registry needs to be injected more cleanly - if (registry == null) - { - registry = (ConsumerRegistry)ExoContainerContext.getCurrentContainer().getComponentInstanceOfType(ConsumerRegistry.class); - } return registry; } Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ProducerBean.java =================================================================== --- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ProducerBean.java 2010-02-19 14:47:04 UTC (rev 1783) +++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ProducerBean.java 2010-02-19 14:52:25 UTC (rev 1784) @@ -23,7 +23,6 @@ package org.gatein.wsrp.admin.ui; -import org.exoplatform.container.ExoContainerContext; import org.gatein.registration.RegistrationPolicy; import org.gatein.registration.policies.DefaultRegistrationPolicy; import org.gatein.wsrp.producer.config.ProducerConfiguration; @@ -57,11 +56,6 @@ public ProducerConfigurationService getConfigurationService() { - // todo: fix this, the configuration service needs to be injected more cleanly - if (configurationService == null) - { - configurationService = (ProducerConfigurationService)ExoContainerContext.getCurrentContainer().getComponentInstanceOfType(ProducerConfigurationService.class); - } return configurationService; }

14 years, 10 months

1
0
0 / 0

← Newer
1
...
9
10
11
12
13
14
15
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits February 2010