Author: akushunin Date: 2007-08-31 13:06:54 -0400 (Fri, 31 Aug 2007) New Revision: 2673 Modified: trunk/ui/separator/src/test/java/org/richfaces/component/SeparatorComponentTest.java trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java trunk/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java trunk/ui/suggestionbox/src/test/java/org/richfaces/renderkit/html/SuggestionBoxRendererTest.java trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java trunk/ui/toolBar/src/test/java/org/richfaces/component/ToolBarComponentTest.java trunk/ui/toolBar/src/test/java/org/richfaces/component/UIToolBarGroupTest.java trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java trunk/ui/treeModel/src/test/java/org/richfaces/component/TreeModelComponentTest.java Log: RF-759 Modified: trunk/ui/separator/src/test/java/org/richfaces/component/SeparatorComponentTest.java =================================================================== --- trunk/ui/separator/src/test/java/org/richfaces/component/SeparatorComponentTest.java 2007-08-31 16:46:06 UTC (rev 2672) +++ trunk/ui/separator/src/test/java/org/richfaces/component/SeparatorComponentTest.java 2007-08-31 17:06:54 UTC (rev 2673) @@ -107,7 +107,7 @@ public void testRender() throws Exception { HtmlPage page = renderView(); assertNotNull(page); - System.out.println(page.asXml()); + //System.out.println(page.asXml()); HtmlElement div1 = page.getHtmlElementById(ui.getClientId(facesContext)); assertNotNull(div1); Modified: trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java =================================================================== --- trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2007-08-31 16:46:06 UTC (rev 2672) +++ trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2007-08-31 17:06:54 UTC (rev 2673) @@ -152,7 +152,7 @@ public void testRender() throws Exception { HtmlPage page = renderView(); assertNotNull(page); - System.out.println(page.asXml()); + //System.out.println(page.asXml()); HtmlElement div1 = page.getHtmlElementById(stp1.getClientId(facesContext)); assertNotNull(div1); @@ -170,10 +170,14 @@ assertTrue(classAttr2.contains("dr-stglpnl-h")); assertTrue(classAttr2.contains("rich-stglpanel-header")); - HtmlElement div3 = page.getHtmlElementById(stp1.getClientId(facesContext) + "_switch"); + HtmlElement div3 = page.getHtmlElementById(stp1.getClientId(facesContext) + "_switch_on"); assertNotNull(div3); assertEquals("div", div3.getNodeName()); - + + HtmlElement div5 = page.getHtmlElementById(stp1.getClientId(facesContext) + "_switch_off"); + assertNotNull(div5); + assertEquals("div", div5.getNodeName()); + HtmlElement div4 = page.getHtmlElementById(stp1.getClientId(facesContext) + "_body"); assertNotNull(div4); assertEquals("div", div4.getNodeName()); @@ -247,7 +251,7 @@ assertTrue(stp1.isOpened()); HtmlPage page = renderView(); - System.out.println(page.asXml()); + //System.out.println(page.asXml()); externalContext.addRequestParameterMap(stp1.getClientId(facesContext), ""); Modified: trunk/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java =================================================================== --- trunk/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java 2007-08-31 16:46:06 UTC (rev 2672) +++ trunk/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java 2007-08-31 17:06:54 UTC (rev 2673) @@ -102,7 +102,7 @@ public void testRender() throws Exception { HtmlPage page = renderView(); assertNotNull(page); - System.out.println(page.asXml()); + //System.out.println(page.asXml()); HtmlElement div = page.getHtmlElementById(sb.getClientId(facesContext)); assertNotNull(div); @@ -142,7 +142,7 @@ public void testRenderScript() throws Exception { HtmlPage page = renderView(); assertNotNull(page); - System.out.println(page.asXml()); + //System.out.println(page.asXml()); List scripts = page.getDocumentElement().getHtmlElementsByTagName("script"); for (Iterator it = scripts.iterator(); it.hasNext();) { HtmlScript item = (HtmlScript) it.next(); Modified: trunk/ui/suggestionbox/src/test/java/org/richfaces/renderkit/html/SuggestionBoxRendererTest.java =================================================================== --- trunk/ui/suggestionbox/src/test/java/org/richfaces/renderkit/html/SuggestionBoxRendererTest.java 2007-08-31 16:46:06 UTC (rev 2672) +++ trunk/ui/suggestionbox/src/test/java/org/richfaces/renderkit/html/SuggestionBoxRendererTest.java 2007-08-31 17:06:54 UTC (rev 2673) @@ -108,10 +108,10 @@ public void testShadowDepth() throws Exception { String shadowDepth = renderer.shadowDepth(facesContext, sb); - assertEquals("top: 4; left: 4", shadowDepth); + assertEquals("top: 4px; left: 4px; ", shadowDepth); sb.getAttributes().put("shadowDepth", "2"); shadowDepth = renderer.shadowDepth(facesContext, sb); - assertEquals("top: 2; left: 2", shadowDepth); + assertEquals("top: 2px; left: 2px; ", shadowDepth); } } Modified: trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java =================================================================== --- trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java 2007-08-31 16:46:06 UTC (rev 2672) +++ trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java 2007-08-31 17:06:54 UTC (rev 2673) @@ -114,7 +114,7 @@ public void testRender() throws Exception { HtmlPage page = renderView(); assertNotNull(page); - System.out.println(page.asXml()); + //System.out.println(page.asXml()); HtmlElement table = page.getHtmlElementById(tabPanel.getClientId(facesContext)); assertNotNull(table); @@ -217,7 +217,7 @@ public void testRenderImages() throws Exception { HtmlPage view = renderView(); assertNotNull(view); - System.out.println(view.asXml()); + //System.out.println(view.asXml()); InternetResourceBuilder builder = ResourceBuilderImpl.getInstance(); InternetResource resource = builder.getResource("css/tabPanel.xcss"); Modified: trunk/ui/toolBar/src/test/java/org/richfaces/component/ToolBarComponentTest.java =================================================================== --- trunk/ui/toolBar/src/test/java/org/richfaces/component/ToolBarComponentTest.java 2007-08-31 16:46:06 UTC (rev 2672) +++ trunk/ui/toolBar/src/test/java/org/richfaces/component/ToolBarComponentTest.java 2007-08-31 17:06:54 UTC (rev 2673) @@ -129,7 +129,7 @@ public void testRender() throws Exception { HtmlPage page = renderView(); assertNotNull(page); - System.out.println(page.asXml()); + //System.out.println(page.asXml()); HtmlElement table = page.getHtmlElementById(form.getId() + ":" + toolBar.getId()); assertNotNull(table); Modified: trunk/ui/toolBar/src/test/java/org/richfaces/component/UIToolBarGroupTest.java =================================================================== --- trunk/ui/toolBar/src/test/java/org/richfaces/component/UIToolBarGroupTest.java 2007-08-31 16:46:06 UTC (rev 2672) +++ trunk/ui/toolBar/src/test/java/org/richfaces/component/UIToolBarGroupTest.java 2007-08-31 17:06:54 UTC (rev 2673) @@ -69,15 +69,13 @@ } public void testGetToolBar1() throws Exception { - assertNull(toolBarGroup.getToolBar()); - + toolBar.getChildren().add(toolBarGroup); assertTrue(toolBarGroup.getToolBar() instanceof UIToolBar); } public void testGetToolBar2() throws Exception { - assertNull(toolBarGroup.getToolBar()); - + form.getChildren().add(toolBarGroup); try { Modified: trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java =================================================================== --- trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2007-08-31 16:46:06 UTC (rev 2672) +++ trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2007-08-31 17:06:54 UTC (rev 2673) @@ -308,7 +308,7 @@ tagNames.add("img"); tagNames.add("div"); List chldList = htmlTree.getHtmlElementsByTagNames(tagNames); - System.out.println(chldList); + //System.out.println(chldList); for (Iterator it = chldList.iterator(); it.hasNext();) { HtmlElement element = (HtmlElement) it.next(); Modified: trunk/ui/treeModel/src/test/java/org/richfaces/component/TreeModelComponentTest.java =================================================================== --- trunk/ui/treeModel/src/test/java/org/richfaces/component/TreeModelComponentTest.java 2007-08-31 16:46:06 UTC (rev 2672) +++ trunk/ui/treeModel/src/test/java/org/richfaces/component/TreeModelComponentTest.java 2007-08-31 17:06:54 UTC (rev 2673) @@ -190,10 +190,10 @@ //skip text siblings Node nextSibling = element.getNextSibling(); - System.out.println(table); - System.out.println(handleCell); - System.out.println(textCell.asText() + " " + textCell); - System.out.println(element); + //System.out.println(table); + //System.out.println(handleCell); + //System.out.println(textCell.asText() + " " + textCell); + //System.out.println(element); if (nextSibling == null) { assertTrue(handleCell.getAttributeValue("class").contains("dr-tree-h-ic-line-last"));