Author: maksimkaszynski Date: 2008-03-25 12:19:06 -0400 (Tue, 25 Mar 2008) New Revision: 7199 Modified: trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java Log: http://jira.jboss.com/jira/browse/RF-2726 Modified: trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java =================================================================== --- trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java 2008-03-25 16:19:02 UTC (rev 7198) +++ trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java 2008-03-25 16:19:06 UTC (rev 7199) @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Set; @@ -44,19 +43,18 @@ import javax.faces.el.MethodNotFoundException; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; -import org.apache.commons.lang.StringUtils; +import org.ajax4jsf.tests.HtmlTestUtils; import org.richfaces.event.DataScrollerEvent; import com.gargoylesoftware.htmlunit.html.HtmlAnchor; import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlPage; -import com.gargoylesoftware.htmlunit.html.HtmlScript; /** * Unit test for Datascroller component. */ public class DatascrollerComponentTest extends AbstractAjax4JsfTestCase { - private static Set javaScripts = new HashSet(); + private static Set<String> javaScripts = new HashSet<String>(); static { javaScripts.add("org.ajax4jsf.javascript.AjaxScript"); @@ -293,7 +291,7 @@ public void testRenderStyle() throws Exception { HtmlPage page = renderView(); assertNotNull(page); - List links = page.getDocumentElement().getHtmlElementsByTagName("link"); + List links = page.getDocumentHtmlElement().getHtmlElementsByTagName("link"); assertEquals(1, links.size()); HtmlElement link = (HtmlElement) links.get(0); @@ -308,26 +306,16 @@ public void testRenderScript() throws Exception { HtmlPage page = renderView(); assertNotNull(page); - List scripts = page.getDocumentElement().getHtmlElementsByTagName("script"); - - for (Iterator it = scripts.iterator(); it.hasNext();) { - HtmlScript item = (HtmlScript) it.next(); - String srcAttr = item.getSrcAttribute(); - - if (StringUtils.isNotBlank(srcAttr)) { - boolean found = false; - for (Iterator srcIt = javaScripts.iterator(); srcIt.hasNext();) - { - String src = (String) srcIt.next(); - - found = srcAttr.contains(src); - if (found) { - break; - } - } - - assertTrue(found); + List<String> scriptSources = HtmlTestUtils.extractScriptSources(page); + for (String javascript : javaScripts) { + boolean found = false; + for (String script : scriptSources) { + if (script.indexOf(javascript) >= 0) { + found = true; + break; + } } + assertTrue("Component script " + javascript + " is not found in the response", found); } }