[richfaces-svn-commits] JBoss Rich Faces SVN: r446 - in trunk/richfaces/menu-components/src: test/java/org/richfaces/component and 1 other directory.

[richfaces-svn-commits at lists.jboss.org]

Author: a.izobov
Date: 2007-04-19 04:27:50 -0400 (Thu, 19 Apr 2007)
New Revision: 446

Modified:
   trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java
   trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java
   trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java
Log:
test rendering images added

Modified: trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java
===================================================================
--- trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java	2007-04-18 18:27:02 UTC (rev 445)
+++ trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java	2007-04-19 08:27:50 UTC (rev 446)
@@ -42,16 +42,14 @@
         int intValue;
         
         tmp = (String) skin.getParameter(context,"headerBackgroundColor");
-        if (tmp != null) {
-            intValue = HtmlColor.decode(tmp).getRGB();
-            mnd.setGeneralColor(new Integer(intValue));
-        } else mnd.setGeneralColor(null);
+        if (tmp == null) tmp = "#4A75B5";
+        intValue = HtmlColor.decode(tmp).getRGB();
+        mnd.setGeneralColor(new Integer(intValue));
         
         tmp = (String) skin.getParameter(context,"tabDisabledTextColor");
-        if (tmp != null) {
-            intValue = HtmlColor.decode(tmp).getRGB();
-            mnd.setDisabledColor(new Integer(intValue));
-        } else mnd.setDisabledColor(null);
+        if (tmp == null) tmp = "#6A92CF";
+        intValue = HtmlColor.decode(tmp).getRGB();
+        mnd.setDisabledColor(new Integer(intValue));
         
         return mnd;
     }

Modified: trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java
===================================================================
--- trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java	2007-04-18 18:27:02 UTC (rev 445)
+++ trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java	2007-04-19 08:27:50 UTC (rev 446)
@@ -30,13 +30,20 @@
 import javax.faces.component.UIForm;
 import javax.faces.component.html.HtmlForm;
 import javax.faces.component.html.HtmlOutputText;
+import javax.servlet.http.HttpServletResponse;
 
 import org.richfaces.component.html.HtmlMenuGroup;
+import org.richfaces.renderkit.html.images.MenuNodeImage;
 
+import com.gargoylesoftware.htmlunit.Page;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
 import com.gargoylesoftware.htmlunit.html.HtmlScript;
 
+import org.ajax4jsf.framework.resource.InternetResource;
+import org.ajax4jsf.framework.resource.InternetResourceBuilder;
+import org.ajax4jsf.framework.resource.ResourceBuilderImpl;
+import org.ajax4jsf.framework.util.image.ImageInfo;
 import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
 
 import org.apache.commons.lang.StringUtils;
@@ -269,4 +276,19 @@
         }
     }
 
+    public void testRenderImages() throws Exception {
+        renderView();
+        InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
+        InternetResource resource = builder.createResource(null, MenuNodeImage.class.getName());
+        assertNotNull(resource);
+        String uri = "http:" + resource.getUri(facesContext, null);
+        Page page = webClient.getPage(uri);
+        assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
+        ImageInfo info = new ImageInfo();
+        info.setInput(page.getWebResponse().getContentAsStream());
+        //image recognizable?
+        assertTrue(info.check());
+        assertEquals(ImageInfo.FORMAT_GIF, info.getFormat());
+    }
+    
 }

Modified: trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java
===================================================================
--- trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java	2007-04-18 18:27:02 UTC (rev 445)
+++ trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java	2007-04-19 08:27:50 UTC (rev 446)
@@ -34,6 +34,7 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.richfaces.component.html.HtmlMenuItem;
+import org.richfaces.renderkit.html.images.background.MenuItemBackground;
 
 import com.gargoylesoftware.htmlunit.Page;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
@@ -362,4 +363,19 @@
         assertEquals(ImageInfo.FORMAT_GIF, info.getFormat());
     }
 
+    public void testRenderImages() throws Exception {
+        renderView();
+        InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
+        InternetResource resource = builder.createResource(null, MenuItemBackground.class.getName());
+        assertNotNull(resource);
+        String uri = "http:" + resource.getUri(facesContext, null);
+        Page page = webClient.getPage(uri);
+        assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
+        ImageInfo info = new ImageInfo();
+        info.setInput(page.getWebResponse().getContentAsStream());
+        //image recognizable?
+        assertTrue(info.check());
+        assertEquals(ImageInfo.FORMAT_GIF, info.getFormat());
+    }
+    
 }