Author: maksimkaszynski Date: 2008-03-25 12:19:27 -0400 (Tue, 25 Mar 2008) New Revision: 7203 Modified: trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java Log: http://jira.jboss.com/jira/browse/RF-2726 Modified: trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java =================================================================== --- trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2008-03-25 16:19:22 UTC (rev 7202) +++ trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2008-03-25 16:19:27 UTC (rev 7203) @@ -26,6 +26,7 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.html.HtmlScript; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; +import org.ajax4jsf.tests.HtmlTestUtils; import org.apache.commons.lang.StringUtils; import javax.faces.component.UICommand; @@ -44,7 +45,7 @@ */ public class SimpleTogglePanelComponentTest extends AbstractAjax4JsfTestCase { - private static Set javaScripts = new HashSet(); + private static Set<String> javaScripts = new HashSet<String>(); static { javaScripts.add("org.ajax4jsf.javascript.AjaxScript"); @@ -221,27 +222,20 @@ 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(); + 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); + } - 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); - } - } - } - /** * Test simpleTogglePanel switch *