[richfaces-svn-commits] JBoss Rich Faces SVN: r12325 - in trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces: testng and 1 other directory.

[richfaces-svn-commits at lists.jboss.org]

Author: andrei_exadel
Date: 2009-01-19 04:14:56 -0500 (Mon, 19 Jan 2009)
New Revision: 12325

Modified:
   trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java
   trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataScrollerTest.java
Log:
Fix dataScroller Test

Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java	2009-01-18 11:23:28 UTC (rev 12324)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java	2009-01-19 09:14:56 UTC (rev 12325)
@@ -1237,7 +1237,13 @@
      * @param isId       - Pass true if ID is string, false - if ID is expression to load appropriate DOM element  
      */
     public void assertClassNames(String id, String[] classNames, String message, boolean isId) {
-    	String clazz = runScript(((isId) ? "document.getElementById('"+id+"')" : id) + ".className");
+    	//String clazz = runScript(((isId) ? "document.getElementById('"+id+"')" : id) + ".className");
+    	String clazz = null;
+    	if (isId) {
+    		clazz = selenium.getAttribute("//*[@id='" + id + "']/@class");
+    	}else {
+    		clazz = selenium.getAttribute(id + "/@class");
+    	}
     	List<String> classes  = (clazz != null) ? Arrays.asList(clazz.split(" ")) : new ArrayList<String>();
         for (String s : classNames) {
             boolean result = classes.contains(s);

Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataScrollerTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataScrollerTest.java	2009-01-18 11:23:28 UTC (rev 12324)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataScrollerTest.java	2009-01-19 09:14:56 UTC (rev 12325)
@@ -398,29 +398,23 @@
 		dataScrollerInFacetId = parentId + "_data:tbl:scroller";
 		dataScrollerTableInFacetId = parentId + "_data:tbl:scroller_table";
 		
-		//FIXME: currently dataTableId is invalid (dataTableId + ':0'). May be it's cause of problem with component state storing inside dataTable.
-		dataTableId = (!template.getName().equals(Template.DATA_TABLE.getName())) ? parentId + "_data:tbl" : parentId + "_data:tbl:0";
+		dataTableId =  parentId + "_data:tbl";
 	}
 	
 	private void testHTMLEvent(String id) {
-		List<String> event = new ArrayList<String>();
-		event.add("onclick");
-		event.add("onmousedown");
-		event.add("onmousemove");
-		event.add("onmouseout");
-		event.add("onmouseover");
-		event.add("onmouseup");
-		
-		clickById(id);	
+		selenium.click(id);	
 		selenium.mouseDown(id);
 		selenium.mouseMove(id);
 		selenium.mouseOut(id);
 		selenium.mouseOver(id);
 		selenium.mouseUp(id);
 		
-		assertEvents(event);
-		
-		
+		assertEvent("onclick");
+		assertEvent("onmousedown");
+		assertEvent("onmousemove");
+		assertEvent("onmouseout");
+		assertEvent("onmouseover");
+		assertEvent("onmouseup");
 	}
 	
 	private void testRendering() {
@@ -514,30 +508,17 @@
 	}
 	
 	private String getPageLinkRefScript(int n, String dataScrollerTableId) {
-		StringBuffer b = new StringBuffer(WINDOW_JS_RESOLVER);
-		b.append("$('");
-		b.append(dataScrollerTableId);
-		b.append("').rows[0].cells[");
-		b.append(n);
-		b.append("]");
-		return b.toString();
+		return "//*[@id='" + dataScrollerTableId + "']/tbody/tr/td[" + (n + 1) + "]";
 	}
 	
 	private void clickControl(int n, String dataScrollerTableId) {
-		StringBuffer b = new StringBuffer();
-		b.append(getPageLinkRefScript(n, dataScrollerTableId));
-		b.append(".onclick();");
-		selenium.getEval(b.toString());		
+		selenium.click(getPageLinkRefScript(n, dataScrollerTableId));
 		waitForAjaxCompletion();
-		assertEvents(events);
+		assertEvent("onpagechange");
 	}
 		
 	private void clickControlNotWait(int n) {
-		StringBuffer b = new StringBuffer();
-		b.append(getPageLinkRefScript(n, dataScrollerTableId));
-		b.append(".onclick();");
-		selenium.getEval(b.toString());		
-	}
+		selenium.click(getPageLinkRefScript(n, dataScrollerTableId));	}
 	
 	/* (non-Javadoc)
 	 * @see org.richfaces.SeleniumTestBase#getTestUrl()