[richfaces-svn-commits] JBoss Rich Faces SVN: r14729 - in branches/community/3.3.X/examples/photoalbum: tests/src/test/java/org/richfaces/photoalbum and 1 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Thu Jun 25 17:43:52 EDT 2009
Author: prabhat.jha at jboss.com
Date: 2009-06-25 17:43:51 -0400 (Thu, 25 Jun 2009)
New Revision: 14729
Modified:
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/index/header.xhtml
branches/community/3.3.X/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java
branches/community/3.3.X/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/testng/SearchTest.java
Log:
synching test cases with app and fix some ids
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/index/header.xhtml
===================================================================
(Binary files differ)
Modified: branches/community/3.3.X/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java
===================================================================
--- branches/community/3.3.X/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java 2009-06-25 18:46:52 UTC (rev 14728)
+++ branches/community/3.3.X/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java 2009-06-25 21:43:51 UTC (rev 14729)
@@ -59,14 +59,14 @@
public static interface LogInOutArea {
String PATH = "xpath=id('logInOutMenu')";
- String LOGIN_ID = "loginPanelShowlink";
+ String LOGIN_ID = "login-form:loginPanelShowlink";
String REGISTER_PATH = PATH + "/descendant::a[2]";
String LOGOUT_PATH = REGISTER_PATH;
String USER_INFO_PATH = "//a[@class='logged-user']";
}
public static interface ToolBarArea {
- String PATH = "//*[@class='dr-toolbar-int rich-toolbar-item main-menu-toolbar-content']";
+ String PATH = "//*[@class='rich-toolbar-item main-menu-toolbar-content']";
String VIEW_SHELFS_PATH = PATH + "/div[2]";
String VIEW_ALBUMS_PATH = PATH + "/div[3]";
String VIEW_IMAGES_PATH = PATH + "/div[4]";
@@ -156,15 +156,15 @@
}
public static interface TreeArea {
- String CHILDREN_PATH = "//*[@id='treeform:tree']/*[@class='dr-tree rich-tree']/*[contains(@id, 'childs')]";
+ String CHILDREN_PATH = "//*[@id='treeform:tree']/*[@class='rich-tree']/*[contains(@id, 'childs')]";
String SHELF_PATH_PART = CHILDREN_PATH + "/*[not(contains(@class, 'rich-tree-node-children'))]";
String ALBUM_PATH_PART = CHILDREN_PATH + "/*[contains(@class, 'rich-tree-node-children')]";
String TEXT_PATH_SUFFIX = "/descendant::*[contains(@id, 'text')]";
}
public static interface ResizeSlider {
- String TRACK_SLIDER = "//td[./div[@class='dr-insldr-track rich-inslider-track']]";
- String SLIDER_INPUT = "//*[@class='dr-insldr rich-slider']//input[@type='hidden']";
+ String TRACK_SLIDER = "//td[./div[@class='rich-inslider-track']]";
+ String SLIDER_INPUT = "//*[@class='rich-inslider rich-slider']//input[@type='hidden']";
}
public static interface Search {
@@ -172,11 +172,11 @@
String SEARCH_BUTTON = "//*[@class='search-find-button']";
String SEARCH_OPTION = "//*[@class='search-option-link']";
- String INACTIVE_TAB = "//*[@class='dr-tbpnl-tb rich-tab-header dr-tbpnl-tb-inact rich-tab-inactive']";
- String ACTIVE_TAB = "//*[@class='dr-tbpnl-tbcell-act rich-tabhdr-cell-active']";
+ String INACTIVE_TAB = "//*[@class='rich-tab-header rich-tab-inactive bold']";
+ String ACTIVE_TAB = "//*[@class='rich-tab-header rich-tab-active bold']";
- String SEARCH_CRITERIA_KEYWORDS = "//*[@class='search-criteria'][2]";
- String SEARCH_CRITERIA_OBJECTS = "//*[@class='search-criteria'][1]/strong";
+ String SEARCH_CRITERIA_KEYWORDS = "//*[@class='search-keyword']";
+ String SEARCH_CRITERIA_OBJECTS = "//*[@class='search-criteria'][1]";
String OBJECTS_MY = "//*[@class='search-options-div1']/input[1]";
String OBJECTS_SHARED = "//*[@class='search-options-div1']/input[2]";
Modified: branches/community/3.3.X/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/testng/SearchTest.java
===================================================================
--- branches/community/3.3.X/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/testng/SearchTest.java 2009-06-25 18:46:52 UTC (rev 14728)
+++ branches/community/3.3.X/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/testng/SearchTest.java 2009-06-25 21:43:51 UTC (rev 14729)
@@ -7,7 +7,7 @@
import static org.richfaces.photoalbum.RealWorldHelper.HtmlConstants.Search.*;
-/**
+/**ss
* @user: akolonitsky
* Date: Apr 29, 2009
*/
@@ -15,11 +15,12 @@
private static final String NATURE = "nature";
private static final String SPORT = "sport";
- private static final String OBJECTS_ALL = "Shelves,Albums,Images,Users,Tag";
- private static final String OBJECT_TAG = "Tag";
+ private static final String OBJECTS_ALL = "Shelves, Albums, Images, Users, Tags";
+ private static final String OBJECT_TAG = "Tags";
private static final String SHELF_HEADER = "//*[@class='shelf-header-table']";
private static final String KEYWORDS = "Keywords: ";
+ private static final String SEARCH_CRITERIA="Search criteria: ";
@Test
@@ -86,18 +87,17 @@
checkResult(SPORT, 0, 0, OBJECT_TAG);
- Assert.assertEquals(1, selenium.getXpathCount("//*[@class='dr-tbpnl-cntnt rich-tabpanel-content']//a"));
+ Assert.assertEquals(1, selenium.getXpathCount("//*[@class='rich-tabpanel-content bold']"));
}
private void checkResult(final String searchValue, final int shelfCount, final int inactiveTabCount, final String searchObjects) {
selenium.type(SEARCH_INPUT, searchValue);
selenium.click(SEARCH_BUTTON);
- waitForAjaxCompletion();
+ waitForAjaxCompletion();
Assert.assertEquals(1, selenium.getXpathCount(ACTIVE_TAB));
-
- Assert.assertEquals(searchObjects, selenium.getText(SEARCH_CRITERIA_OBJECTS).trim());
+ Assert.assertEquals(SEARCH_CRITERIA + searchObjects, selenium.getText(SEARCH_CRITERIA_OBJECTS).trim());
Assert.assertEquals(KEYWORDS + searchValue, selenium.getText(SEARCH_CRITERIA_KEYWORDS).trim());
Assert.assertEquals(shelfCount, selenium.getXpathCount(SHELF_HEADER));
@@ -108,7 +108,7 @@
// @Test
// public void testClickOnFirstAlbum() {
-// renderPage();
+// renderPage();hindi songs 2009 hits
//
// RealWorldHelper.login(selenium);
//
More information about the richfaces-svn-commits
mailing list