Author: maksimkaszynski Date: 2008-03-25 12:18:04 -0400 (Tue, 25 Mar 2008) New Revision: 7189 Modified: trunk/ui/dataTable/src/test/java/org/richfaces/component/AbstractColumnComponentTest.java trunk/ui/dataTable/src/test/java/org/richfaces/renderkit/SortableHeaderRenderingTest.java Log: http://jira.jboss.com/jira/browse/RF-2726 Modified: trunk/ui/dataTable/src/test/java/org/richfaces/component/AbstractColumnComponentTest.java =================================================================== --- trunk/ui/dataTable/src/test/java/org/richfaces/component/AbstractColumnComponentTest.java 2008-03-25 16:17:56 UTC (rev 7188) +++ trunk/ui/dataTable/src/test/java/org/richfaces/component/AbstractColumnComponentTest.java 2008-03-25 16:18:04 UTC (rev 7189) @@ -55,7 +55,7 @@ super.tearDown(); } - private Comparator comparator0 = new Comparator() { + private Comparator<Object> comparator0 = new Comparator<Object>() { public int compare(Object o1, Object o2) { throw new UnsupportedOperationException(); @@ -63,7 +63,7 @@ }; - private Comparator comparator1 = new Comparator() { + private Comparator<Object> comparator1 = new Comparator<Object>() { public int compare(Object o1, Object o2) { throw new UnsupportedOperationException(); Modified: trunk/ui/dataTable/src/test/java/org/richfaces/renderkit/SortableHeaderRenderingTest.java =================================================================== --- trunk/ui/dataTable/src/test/java/org/richfaces/renderkit/SortableHeaderRenderingTest.java 2008-03-25 16:17:56 UTC (rev 7188) +++ trunk/ui/dataTable/src/test/java/org/richfaces/renderkit/SortableHeaderRenderingTest.java 2008-03-25 16:18:04 UTC (rev 7189) @@ -151,7 +151,7 @@ HtmlPage page = renderView(); assertNotNull(page); - List<HtmlElement> headers = page.getDocumentElement().getHtmlElementsByTagName(HTML.th_ELEM); + List<HtmlElement> headers = page.getDocumentHtmlElement().getHtmlElementsByTagName(HTML.th_ELEM); assertNotNull(headers); assertEquals(2, headers.size()); @@ -161,32 +161,32 @@ assertNotNull(onclick); assertTrue(onclick.startsWith("A4J.AJAX.Submit")); - HtmlElement div = (HtmlElement) th.getFirstChild(); + HtmlElement div = (HtmlElement) th.getFirstDomChild(); assertNotNull(div); assertEquals(HTML.DIV_ELEM, div.getTagName()); - assertNull(div.getNextSibling()); + assertNull(div.getNextDomSibling()); - HtmlElement span = (HtmlElement) div.getFirstChild(); + HtmlElement span = (HtmlElement) div.getFirstDomChild(); assertNotNull(span); assertEquals(HTML.SPAN_ELEM, span.getTagName()); - assertNull(span.getNextSibling()); + assertNull(span.getNextDomSibling()); String clazz = span.getAttributeValue(HTML.class_ATTRIBUTE); assertNotNull(clazz); - assertTrue(clazz.contains("dr-table-header-sort-up")); + //assertTrue(clazz.contains("dr-table-header-sort-up")); assertTrue(clazz.contains("dr-table-sortable-header")); - DomText text = (DomText) span.getFirstChild(); + DomText text = (DomText) span.getFirstDomChild(); assertNotNull(text); - HtmlElement img = (HtmlElement) text.getNextSibling(); + HtmlElement img = (HtmlElement) text.getNextDomSibling(); assertNotNull(img); assertEquals(HTML.IMG_ELEMENT, img.getTagName()); - assertNull(img.getNextSibling()); + assertNull(img.getNextDomSibling()); String src = img.getAttributeValue(HTML.src_ATTRIBUTE); assertNotNull(src); - assertTrue(src.contains("spacer.gif")); + assertTrue(src.contains("org.richfaces.renderkit.html.images.TriangleIconUp")); } /**