[seam-commits] Seam SVN: r10104 - branches/enterprise/JBPAPP_4_3_FP01/src/test/ftest/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/selenium.

[seam-commits at lists.jboss.org]

Author: manaRH
Date: 2009-03-02 11:31:34 -0500 (Mon, 02 Mar 2009)
New Revision: 10104

Modified:
   branches/enterprise/JBPAPP_4_3_FP01/src/test/ftest/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/selenium/ArtistsTest.java
   branches/enterprise/JBPAPP_4_3_FP01/src/test/ftest/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/selenium/DiscsTest.java
   branches/enterprise/JBPAPP_4_3_FP01/src/test/ftest/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/selenium/SeleniumSeamDiscsTest.java
Log:
JBPAPP-1700 - added fix for the seamdiscs example

Modified: branches/enterprise/JBPAPP_4_3_FP01/src/test/ftest/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/selenium/ArtistsTest.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/test/ftest/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/selenium/ArtistsTest.java	2009-03-02 15:48:18 UTC (rev 10103)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/test/ftest/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/selenium/ArtistsTest.java	2009-03-02 16:31:34 UTC (rev 10104)
@@ -44,12 +44,12 @@
       browser.clickAndWait(MANAGE_ARTISTS);
    }
 
- /*  @Test(dependsOnMethods = {"createWithDiscsTest"})
+   @Test(dependsOnMethods = {"createWithDiscsTest"})
    public void paginationTest() 
    {
       findAndClickArtist("Fairport Convention"); // should be on second page
       checkDisc(1, "Liege and Lief", "", "The first folk-rock album ever made in the UK, this was the only studio recording of the classic line up of Sandy Denny, Richard Thompson, Dave Swarbick, Ashley Hutchings and Simon Nicol");
-   }*/
+   }
 
    @Test(dependsOnMethods = {"createWithDiscsTest"})
    public void filterTest() 

Modified: branches/enterprise/JBPAPP_4_3_FP01/src/test/ftest/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/selenium/DiscsTest.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/test/ftest/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/selenium/DiscsTest.java	2009-03-02 15:48:18 UTC (rev 10103)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/test/ftest/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/selenium/DiscsTest.java	2009-03-02 16:31:34 UTC (rev 10104)
@@ -43,14 +43,14 @@
    }
 
    @Test(dependsOnMethods = {"editDiscsTest"})
-/*   public void discPaginationTest() 
+   public void discPaginationTest() 
    {
       findAndClickDisc("Rock and Roll Heart"); // should not be on the first page
       checkDiscDetail("Rock and Roll Heart", "1976", "", "Lou Reed");
-   }*/
+   }
 
 
- /*  @Test(dependsOnMethods = {"editDiscsTest"})
+   @Test(dependsOnMethods = {"editDiscsTest"})
    public void editDiscTest() 
    {
       // correct Rock and Roll Heart description
@@ -76,7 +76,7 @@
       checkDisc(1, "Sally Can't Dance", "1974", EMPTY_DISC_DESCRIPTION);
       checkDisc(2, "Metal Machine Music", "1975", EMPTY_DISC_DESCRIPTION);
       checkDisc(3, "Rock and Roll Heart", "1976", "A sensitive and revealing look into the prince of darkness.");
-   }*/
+   }
    
    @Test(dependsOnMethods = {"editDiscTest"})
    public void addDiscTest()

Modified: branches/enterprise/JBPAPP_4_3_FP01/src/test/ftest/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/selenium/SeleniumSeamDiscsTest.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/test/ftest/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/selenium/SeleniumSeamDiscsTest.java	2009-03-02 15:48:18 UTC (rev 10103)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/test/ftest/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/selenium/SeleniumSeamDiscsTest.java	2009-03-02 16:31:34 UTC (rev 10104)
@@ -66,7 +66,7 @@
    public static String ARTIST_NTH_DISC_YEAR = ARTIST_NTH_DISC + "/td[3]//input";
    public static String ARTIST_NTH_DISC_DETAIL = ARTIST_NTH_DISC + "/td";
    public static String ARTISTS_FIRST_ARTIST_LINK = "xpath=id(\"artists\")//table/tbody/tr/td/table/tbody/tr[2]/td[2]/a";
-   public static String ARTISTS_NEXT_PAGE_LINK = "xpath=id(\"artists\")//td[1]//td[7]/a";
+   public static String ARTISTS_NEXT_PAGE_LINK = "xpath=id(\"artists\")//td[1]//td[2]//td[5]/a";
    public static String ARTIST_TABLE_ROW_BY_NAME = "xpath=id(\"artists\")//tr[normalize-space(td/a/text())=\"{0}\"]";
    // these locators can only be used catenated with ARTIST_TABLE_ROW_BY_NAME
    public static String ARTIST_TABLE_ROW_LINK = ARTIST_TABLE_ROW_BY_NAME + "/td[2]/a";
@@ -76,13 +76,13 @@
    public static String CREATE_DISC_BUTTON = "id=addDisc";
    public static String DISC_DETAIL_TITLE = "xpath=id(\"disc\")//tr//tr[2]/td[2]/input";
    public static String DISC_DETAIL_RELEASE_DATE = "xpath=id(\"disc\")//tr//tr[3]/td[2]//input";
-   public static String DISC_DETAIL_ARTIST = "xpath=id(\"disc\")//tr//tr[5]//select";
+   public static String DISC_DETAIL_ARTIST = "xpath=id(\"disc\")//tr//tr[4]//select";
    public static String DISC_DETAIL_DESCRIPTION = "id=description";
    public static String DISC_DETAIL_UPDATE = "id=update";
    public static String DISC_DETAIL_PERSIST = "id=persist";
    public static String DISC_DETAIL_REMOVE = "id=remove";
    public static String DISC_DETAIL_CANCEL = "id=cancel";
-   public static String DISCS_NEXT_PAGE_LINK = "xpath=id(\"discs\")//td[1]//td[7]/a";
+   public static String DISCS_NEXT_PAGE_LINK = "xpath=id(\"discs\")//td[1]//td[2]//td[5]/a";
    public static String DISC_TABLE_ROW_BY_NAME = "xpath=id(\"discs\")//tr[normalize-space(td/a/text())=\"{0}\"]";
    // these locators can only be used catenated with DISC_TABLE_ROW_BY_NAME
    public static String DISC_TABLE_ROW_LINK = DISC_TABLE_ROW_BY_NAME + "/td[2]/a";