[richfaces-svn-commits] JBoss Rich Faces SVN: r4735 - branches/3.1.x/ui/message/src/test/java/org/richfaces/renderer.

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

Author: nbelaevski
Date: 2007-12-11 14:17:50 -0500 (Tue, 11 Dec 2007)
New Revision: 4735

Modified:
   branches/3.1.x/ui/message/src/test/java/org/richfaces/renderer/RichMessagesRendererTest.java
Log:
Message renderer test fixed

Modified: branches/3.1.x/ui/message/src/test/java/org/richfaces/renderer/RichMessagesRendererTest.java
===================================================================
--- branches/3.1.x/ui/message/src/test/java/org/richfaces/renderer/RichMessagesRendererTest.java	2007-12-11 18:37:35 UTC (rev 4734)
+++ branches/3.1.x/ui/message/src/test/java/org/richfaces/renderer/RichMessagesRendererTest.java	2007-12-11 19:17:50 UTC (rev 4735)
@@ -13,6 +13,7 @@
 import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
 import org.richfaces.component.html.HtmlRichMessages;
 
+import com.gargoylesoftware.htmlunit.html.DomNode;
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 
@@ -134,10 +135,10 @@
 		messages2.setInfoMarkerClass("infoMarkerClass");
 		messages2.setWarnMarkerClass("warnMarkerClass");
 		
-		messages2.getFacets().put("errorMarker", output1);
-		messages2.getFacets().put("warnMarker", output2);
-		messages2.getFacets().put("fatalMarker", output3);
-		messages2.getFacets().put("infoMarker", output4);
+//		messages2.getFacets().put("errorMarker", output1);
+//		messages2.getFacets().put("warnMarker", output2);
+//		messages2.getFacets().put("fatalMarker", output3);
+//		messages2.getFacets().put("infoMarker", output4);
 		
 		FacesMessage facesMessage = new FacesMessage();
 	
@@ -236,29 +237,37 @@
 	    	
 	    	classAttr = tr.getAttributeValue("class");
 	    	
-			assertTrue(classAttr.contains("errorClass")||classAttr.contains("fatalClass") 
-					   ||classAttr.contains("warnClass") ||classAttr.contains("infoClass"));
-			
 			Iterator tdIter = tr.getChildIterator();
 			for (;tdIter.hasNext();) {
 				
 				HtmlElement td = (HtmlElement)tdIter.next();
 				assertNotNull(td);
 		    	assertEquals(td.getNodeName().toLowerCase(), "td");
+
+		    	String classAttribute = td.getAttributeValue("class");
 		    	
-		    	if(td.getAttributeValue("class")!= null){
-		    		classAttr = td.getAttributeValue("class");
+				assertTrue(classAttribute.contains("errorClass")|| classAttribute.contains("fatalClass") 
+						   || classAttribute.contains("warnClass") || classAttribute.contains("infoClass"));
+				
+		    	HtmlElement elem = (HtmlElement)td.getFirstChild();
+		    	assertNotNull(elem);
+		    	
+		    	if(elem.getNodeName().equals("span")){
+		    		classAttr = elem.getAttributeValue("class");
 		    		
 		    		assertTrue(classAttr.contains("rich-messages-marker"));
 		    		assertTrue(classAttr.contains("errorMarkerClass") || classAttr.contains("fatalMarkerClass") 
 			    			   || classAttr.contains("infoMarkerClass") || classAttr.contains("warnMarkerClass"));
 		    	}
+
+		    	DomNode node = elem.getNextSibling();
+		    	while (!(node instanceof HtmlElement)) {
+		    		node = node.getNextSibling();
+		    	}
 		    	
-		    	HtmlElement elem = (HtmlElement)td.getFirstChild();
-		    	assertNotNull(elem);
-		    	
-		    	if(elem.getNodeName().equals("span")){
-		    		classAttr = tr.getAttributeValue("class");
+		    	HtmlElement label = (HtmlElement) node;
+		    	if(label.getNodeName().equals("span")){
+		    		classAttr = label.getAttributeValue("class");
 		    		
 		    		assertTrue(classAttr.contains("rich-messages-label"));
 			    	assertTrue(classAttr.contains("errorLabelClass") || classAttr.contains("infoLabelClass")