[richfaces-svn-commits] JBoss Rich Faces SVN: r2738 - trunk/ui/datascroller/src/test/java/org/richfaces/component.

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

Author: abelevich
Date: 2007-09-04 11:26:24 -0400 (Tue, 04 Sep 2007)
New Revision: 2738

Modified:
   trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java
Log:
fix test

Modified: trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java
===================================================================
--- trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java	2007-09-04 14:55:48 UTC (rev 2737)
+++ trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java	2007-09-04 15:26:24 UTC (rev 2738)
@@ -27,6 +27,7 @@
 import java.util.List;
 import java.util.Set;
 
+import javax.faces.FacesException;
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UICommand;
 import javax.faces.component.UIComponent;
@@ -230,36 +231,41 @@
 		scroller.processDecodes(facesContext);
 		scroller.processValidators(facesContext);
 		scroller.processUpdates(facesContext);
+		
 		scroller.setFor("xxx");
+		
 		try {
 			page = renderView();
 			assertTrue(false);
-		} catch(Exception ex) {
-		}               
-		scroller.processDecodes(facesContext);
-		scroller.processValidators(facesContext);
-		scroller.processUpdates(facesContext);
+		}catch(FacesException ex) {
+		}catch(IllegalArgumentException ex){
+		}
+		
 		scroller.setFor("form");
+		
 		try {
 			page = renderView();
 			assertTrue(false);
-		} catch(Exception ex) {
+		}catch(FacesException ex) {
+		}catch(IllegalArgumentException ex){
 		}
+		
+		scroller.setFor(data.getId());
 		scroller.processDecodes(facesContext);
 		scroller.processValidators(facesContext);
-		scroller.processUpdates(facesContext);        
-		scroller.setFor(data.getId());
+		scroller.processUpdates(facesContext);
 	}
 
 	public void testNotRender() throws Exception {
 		data.setRows(25);
 		scroller.setRenderIfSinglePage(false);
 
-		HtmlPage page = renderView();        
+		HtmlPage page = renderView();
+		
 		assertNotNull(page);
 		System.out.println(page.asXml());
 		try {
-			page.getHtmlElementById(scroller.getClientId(facesContext));
+			page.getHtmlElementById(scroller.getClientId(facesContext)+"_table");
 			assertTrue(false);
 		} catch(Exception ex) {
 		}