Author: maksimkaszynski Date: 2008-03-25 12:19:11 -0400 (Tue, 25 Mar 2008) New Revision: 7200 Modified: trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java trunk/ui/tree/src/test/java/org/richfaces/component/TreeModelTest.java Log: http://jira.jboss.com/jira/browse/RF-2726 Modified: trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java =================================================================== --- trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2008-03-25 16:19:06 UTC (rev 7199) +++ trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2008-03-25 16:19:11 UTC (rev 7200) @@ -39,29 +39,29 @@ import javax.faces.event.PhaseId; import javax.servlet.http.HttpServletResponse; -import org.richfaces.event.DragEvent; -import org.richfaces.event.DragListener; -import org.richfaces.event.DropEvent; -import org.richfaces.event.DropListener; import org.ajax4jsf.resource.InternetResource; import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.resource.ResourceBuilderImpl; import org.ajax4jsf.resource.image.ImageInfo; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; +import org.ajax4jsf.tests.HtmlTestUtils; import org.apache.commons.lang.StringUtils; +import org.richfaces.component.state.events.ExpandAllCommandEvent; +import org.richfaces.component.xml.XmlTreeDataBuilder; +import org.richfaces.event.DragEvent; +import org.richfaces.event.DragListener; +import org.richfaces.event.DropEvent; +import org.richfaces.event.DropListener; import org.richfaces.event.NodeExpandedEvent; import org.richfaces.event.NodeExpandedListener; import org.richfaces.event.NodeSelectedEvent; import org.richfaces.event.NodeSelectedListener; -import org.richfaces.component.state.events.ExpandAllCommandEvent; -import org.richfaces.component.xml.XmlTreeDataBuilder; import org.xml.sax.InputSource; import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlLink; import com.gargoylesoftware.htmlunit.html.HtmlPage; -import com.gargoylesoftware.htmlunit.html.HtmlScript; /** * Unit test for simple Component. @@ -69,7 +69,7 @@ public class TreeComponentTest extends AbstractAjax4JsfTestCase { - private static Set javaScripts = new HashSet(); + private static Set<String> javaScripts = new HashSet<String>(); static { javaScripts.add("org/richfaces/renderkit/html/scripts/json/json-dom.js"); @@ -226,26 +226,18 @@ } 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); + HtmlPage page = renderView(); + assertNotNull(page); + 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); } } Modified: trunk/ui/tree/src/test/java/org/richfaces/component/TreeModelTest.java =================================================================== --- trunk/ui/tree/src/test/java/org/richfaces/component/TreeModelTest.java 2008-03-25 16:19:06 UTC (rev 7199) +++ trunk/ui/tree/src/test/java/org/richfaces/component/TreeModelTest.java 2008-03-25 16:19:11 UTC (rev 7200) @@ -112,10 +112,10 @@ } }, null, null); - model.setRowKey(new ListRowKey("testId:displayName")); + model.setRowKey(new ListRowKey<String>("testId:displayName")); assertEquals("tree-demo", ((XmlNodeData) model.getRowData()).getText()); - model.setRowKey(new ListRowKey("testId:1:1")); + model.setRowKey(new ListRowKey<String>("testId:1:1")); assertEquals(".xhtml", ((XmlNodeData) model.getRowData()).getText()); }