Author: vrockai
Date: 2009-04-06 10:33:48 -0400 (Mon, 06 Apr 2009)
New Revision: 13165
Removed:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSelenium.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSUserInterfaceTestCase.java
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileUploadTestCase.java
Log:
[selenium] - more javadoc
Deleted:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSelenium.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSelenium.java 2009-04-06
13:03:58 UTC (rev 13164)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSelenium.java 2009-04-06
14:33:48 UTC (rev 13165)
@@ -1,172 +0,0 @@
-package org.jboss.portal.test.selenium;
-
-import java.io.BufferedWriter;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-
-import com.thoughtworks.selenium.DefaultSelenium;
-import com.thoughtworks.selenium.SeleniumException;
-
-public class JBossSelenium extends DefaultSelenium {
-
- protected static String PAGE_LOAD= "500000";
- protected static int count;
-
- @Override
- public void click(String locator) {
- try {
- try {
- super.click(locator);
- }
- catch (SeleniumException e){
-
- String name = "E_";
- Pattern methodname =
Pattern.compile("^org.jboss.portal.test.selenium\\S+test\\S+\\(\\S+\\)");
- for(int i=0;i<e.getStackTrace().length;i++){
- String input = e.getStackTrace()[i].toString();
- Matcher match = methodname.matcher(input);
- if (match.matches()){
- input = input.replace("org.jboss.portal.test.selenium","");
- input = input.replaceAll("\\(.*\\)","");
- name += input;
- }
- }
- name += "."+count;
- try {
- PrintWriter out = new PrintWriter(new BufferedWriter(new
FileWriter(name+".html")));
- out.println(getHtmlSource());
- out.close();
- } catch (IOException e1) {
- e1.printStackTrace();
- }
- try {
- windowMaximize();
- captureScreenshot(name + ".jpg");
- } catch (SeleniumException e2) {
- e2.printStackTrace();
- }
- count++;
-
- throw new SeleniumException(e);
- }
- } catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
- @Override
- public void open(String locator) {
- try {
- super.open(locator);
- }
- catch (SeleniumException e){
- try {
- PrintWriter out = new PrintWriter(new BufferedWriter(new
FileWriter("html"+count+".html")));
- out.println(getHtmlSource());
- out.close();
- } catch (IOException e1) {
- e1.printStackTrace();
- }
- windowMaximize();
- captureScreenshot("shot"+ count +".jpg");
- count++;
- throw new SeleniumException(e);
- }
- }
-
- @Override
- public boolean isElementPresent(String locator){
- try {
- return super.isElementPresent(locator);
- }
- catch (SeleniumException e){
- try {
- PrintWriter out = new PrintWriter(new BufferedWriter(new
FileWriter("html"+count+".html")));
- out.println(getHtmlSource());
- out.close();
- } catch (IOException e1) {
- e1.printStackTrace();
- }
- windowMaximize();
- captureScreenshot("shot"+ count +".jpg");
- count++;
- throw new SeleniumException(e);
- }
- }
-
-
-
- public JBossSelenium(String serverHost, int serverPort, String browserStartCommand,
String browserURL, String timeout) {
- super(serverHost, serverPort, browserStartCommand, browserURL);
- PAGE_LOAD = timeout;
- }
-
- public JBossSelenium(String serverHost, int serverPort, String browserStartCommand,
String browserURL) {
- super(serverHost, serverPort, browserStartCommand, browserURL);
- }
-
- protected void clickAndWait(String locator) {
- click(locator);
- waitForPageToLoad(PAGE_LOAD);
- }
-
- protected void clickAndWait(String locator, String timeout) {
- click(locator);
- waitForPageToLoad(timeout);
- }
-
- protected void clickAndWaitIfVisible(String id) {
-
- if (isElementPresent(id)) {
- click(id);
-
- waitForPageToLoad(PAGE_LOAD);
- }
- }
-
- public void clickIfVisible(String id) {
-
- if (isElementPresent(id)){
- click(id);
-
- waitForPageToLoad(PAGE_LOAD);
- }
- }
- protected boolean findLink(String id) {
- for (String link : getAllLinks()) {
- if (link.equals(id)) {
- return true;
- }
- }
- for (String link : getAllFields()) {
- if (link.equals(id)) {
- return true;
- }
- }
-
- return false;
- }
-
- protected int findTableRow(String tableLocation, String searchName, int searchCol) {
- return Integer.valueOf(getEval("selenium.findTableRow(\"" +
tableLocation + "\",'" + searchName + "'," + searchCol +
")"));
- }
-
- protected int countTableRows(String tableLocation) {
- return Integer.valueOf(getEval("selenium.countTableRows(\"" +
tableLocation + "\")"));
- }
-
- protected void waitFor(long time){
- try {
- Thread.sleep(2000);
- } catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
-}
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java 2009-04-06
13:03:58 UTC (rev 13164)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java 2009-04-06
14:33:48 UTC (rev 13165)
@@ -24,13 +24,13 @@
public final String TBL_FILE_PENDING = getProp(casePfx + "tbl.file.pending",
"//div[@id='center']/div/div/table[2]");
@BeforeMethod(groups = { "log" })
- public void loginBeforeTest() {
+ protected void loginBeforeTest() {
logoutIfPossible();
login("admin", "admin");
}
@AfterMethod(groups = { "log" })
- public void logoutAfterTest() {
+ protected void logoutAfterTest() {
}
@@ -169,7 +169,8 @@
}
/**
- * Editing of a file.
+ * Editing of a file. File name "file2edit" is created and then edited.
Nothing is changed, but the file is saved again. It is asserted, that the version
+ * got incremented.
*/
@Test(enabled = true, description = "Editing of a file.")
public void testEditFile() {
@@ -210,7 +211,8 @@
}
/**
- * Creation of an existing file.
+ * Creation of an existing file. The file named "existingFile" is created.
Then the system tries to create the same file again.
+ * It is asserted that instead of creating a new instance of such a file, only its
version is updated.
*/
@Test(enabled = true, dependsOnMethods = "testDeleteFile", description =
"Creation of an existing file.")
public void testCreateExistingFile() {
@@ -244,7 +246,8 @@
}
/**
- * File creation and moving to default directory.
+ * File creation and moving to default directory. File named "fileToMove" is
created in the root directory. Then the file is moved into the default directory.
+ * At the end it is asserted, that file is appearing in the "default"
directory, but it's not existing in the root directory.
*/
@Test(enabled = true, description = "File creation and moving to default
directory.")
public void testMoveFile() {
@@ -291,7 +294,8 @@
}
/**
- * File creation and copying to default directory.
+ * File creation and copying to default directory. File named "file2copy" is
created in the root directory. Then the file is copied into the default directory.
+ * At the end it is asserted, that file is appearing in the both of "default"
and the root directory.
*/
@Test(enabled = true, description = "File creation and copying to default
directory.")
public void testCopyFile() {
@@ -357,8 +361,10 @@
}
/**
- * Simple file delete.
+ * Simple file delete. The file created by the {@link CMSFileTestCase#testCreateFile()}
method is used to test the delete function.
+ * The test tries to delete the file, firstly canceling the deletion and then confirming
the deletion in the second attempt.
*/
+ //TODO assert that file is deleted in the end
@Test(enabled = true, dependsOnMethods = "testCreateFile", description =
"Simple file delete.")
public void testDeleteFile() {
selenium.click("link=Admin");
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileUploadTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileUploadTestCase.java 2009-04-06
13:03:58 UTC (rev 13164)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileUploadTestCase.java 2009-04-06
14:33:48 UTC (rev 13165)
@@ -7,34 +7,48 @@
import org.testng.annotations.Test;
/**
+ * CMSFileUploadTestCase is responsible for testing of file uploading.
+ *
* @author <a href="mailto:vrockai@redhat.com">Viliam Rockai</a>
*/
@Test(groups = { "cms_file_upload" }, enabled = true)
public class CMSFileUploadTestCase extends JBossPortalSeleniumTestCase {
- /* uncomment following lines and set the right path to the workspace in the case
- * you want to use this test case locally from eclipse */
/*
- {
-
System.setProperty("workspace","/home/vrockai/workspace/selenium/selenium/"
- ); }
- */
+ * uncomment following lines and set the right path to the workspace in the
+ * case you want to use this test case locally from eclipse
+ */
+ /*
+ * {
+ *
System.setProperty("workspace","/home/vrockai/workspace/selenium/selenium/"
+ * ); }
+ */
+
+ /** prefix for locator properties = cms.file.up. */
private final String casePfx = "cms.file.up.";
- private final String CMS_FILE_TABLE =
getProp(casePfx+"cms.file.table","//div[@id='center']/div/div/div[3]/table");
+ private final String CMS_FILE_TABLE = getProp(casePfx + "cms.file.table",
"//div[@id='center']/div/div/div[3]/table");
private final String WORKSPACE = System.getProperty("workspace");
@BeforeMethod(groups = { "log" })
- public void loginBeforeTest() {
+ protected void loginBeforeTest() {
logoutIfPossible();
login("admin", "admin");
}
@AfterMethod(groups = { "log" })
- public void logoutAfterTest() {
-
+ protected void logoutAfterTest() {
+
}
+ /**
+ * Canceling of file upload. The form for uploading file is filled with
+ * relevant values and the file located in "test_files/testFile.txt" is
+ * chosen for uploading into the default directory. Instead of submit
+ * button, the cancel button is pressed. The assertion are made to count the
+ * number of rows in file tables asserting the number of rows didn't change
+ * after canceling of upload.
+ */
@Test(enabled = true, description = "canceling of file upload")
public void testFileUploadCancel() {
selenium.click("link=Admin");
@@ -58,6 +72,7 @@
selenium.type("description", "myFile");
selenium.type("title", "file to upload");
selenium.select("language", "label=Afar");
+ selenium.type("response", WORKSPACE + "/test_files/testFile.txt");
selenium.click("link=default");
selenium.click("cancel");
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -76,9 +91,16 @@
Assert.assertEquals(rc_d_after, rc_d_before, "The row count in CMS file table has
changes after canceling the upload of file in the default dir.");
}
+ /**
+ * File upload test. The form for uploading file is filled with relevant
+ * values and the file located in "test_files/testFile.txt" is chosen for
+ * uploading into the root directory. Submit button is pressed and the
+ * upload should take the action. The existence of the file in root
+ * directory is asserted.
+ */
@Test(enabled = true, description = "File upload test")
public void testFileUpload() {
-
+
selenium.click("link=Admin");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=CMS");
@@ -90,14 +112,13 @@
selenium.type("description", "myFile");
selenium.type("title", "file to upload");
selenium.select("language", "label=Afar");
-
selenium.type("response", WORKSPACE + "/test_files/testFile.txt");
selenium.click("submit");
selenium.waitForPageToLoad(PAGE_LOAD);
-/*
- selenium.click("link=Approve");
- selenium.waitForPageToLoad(PAGE_LOAD);
-*/
+ /*
+ * selenium.click("link=Approve");
+ * selenium.waitForPageToLoad(PAGE_LOAD);
+ */
Assert.assertEquals(selenium.getText("//div[@id='center']/div/div/ul/li[3]"),
"testFile.txt");
Assert.assertTrue(selenium.isElementPresent("link=text/plain"));
Assert.assertTrue(selenium.isElementPresent("//div[@id='center']/div/div/table/tbody/tr[4]/td[3]"));
@@ -111,5 +132,5 @@
Assert.assertEquals(selenium.getText("link=testFile.txt"),
"testFile.txt");
}
-
+
}
Deleted:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSUserInterfaceTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSUserInterfaceTestCase.java 2009-04-06
13:03:58 UTC (rev 13164)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSUserInterfaceTestCase.java 2009-04-06
14:33:48 UTC (rev 13165)
@@ -1,21 +0,0 @@
-package org.jboss.portal.test.selenium.cms;
-import org.jboss.portal.test.selenium.JBossPortalSeleniumTestCase;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import com.thoughtworks.selenium.DefaultSelenium;
-import com.thoughtworks.selenium.Selenium;
-
-/**
- * @author <a href="mailto:vrockai@redhat.com">Viliam Rockai</a>
- */
-
-@Test(groups = { "cms_gui" }, enabled = true)
-
-public class CMSUserInterfaceTestCase {
-
-}