[richfaces-svn-commits] JBoss Rich Faces SVN: r386 - in trunk/richfaces/separator/src: test/java/org/richfaces/component and 1 other directory.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Thu Apr 12 12:11:53 EDT 2007
Author: A.Skokov
Date: 2007-04-12 12:11:53 -0400 (Thu, 12 Apr 2007)
New Revision: 386
Modified:
trunk/richfaces/separator/src/main/java/org/richfaces/renderkit/html/images/BevelSeparatorImage.java
trunk/richfaces/separator/src/main/java/org/richfaces/renderkit/html/images/SimpleSeparatorImage.java
trunk/richfaces/separator/src/test/java/org/richfaces/component/SeparatorComponentTest.java
Log:
test updated
Modified: trunk/richfaces/separator/src/main/java/org/richfaces/renderkit/html/images/BevelSeparatorImage.java
===================================================================
--- trunk/richfaces/separator/src/main/java/org/richfaces/renderkit/html/images/BevelSeparatorImage.java 2007-04-12 15:08:59 UTC (rev 385)
+++ trunk/richfaces/separator/src/main/java/org/richfaces/renderkit/html/images/BevelSeparatorImage.java 2007-04-12 16:11:53 UTC (rev 386)
@@ -21,18 +21,6 @@
package org.richfaces.renderkit.html.images;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.GradientPaint;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.Shape;
-import java.awt.geom.Rectangle2D;
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.faces.context.FacesContext;
-
import org.ajax4jsf.framework.resource.GifRenderer;
import org.ajax4jsf.framework.resource.InternetResourceBuilder;
import org.ajax4jsf.framework.resource.Java2Dresource;
@@ -43,141 +31,153 @@
import org.ajax4jsf.framework.util.HtmlDimensions;
import org.richfaces.component.UISeparator;
+import javax.faces.context.FacesContext;
+import java.awt.*;
+import java.awt.geom.Rectangle2D;
+import java.io.Serializable;
+import java.util.Date;
+
/**
* @author Maksim Kaszynski, Filip Antonov
- *
*/
public class BevelSeparatorImage extends Java2Dresource {
-
- public BevelSeparatorImage() {
- setRenderer(new GifRenderer());
- setLastModified(new Date(InternetResourceBuilder.getInstance().getStartTime()));
- }
-
- public Dimension getDimensions(FacesContext facesContext, Object data) {
- return calculateDimensions(getDataToStore(facesContext, data));
- }
- protected Dimension getDimensions(ResourceContext resourceContext) {
- return calculateDimensions(restoreData(resourceContext));
- }
-
- protected Dimension calculateDimensions(Object data) {
- return new Dimension(1, ((SeparatorData) data).getHeight());
- }
-
- protected void paint(ResourceContext context, Graphics2D g2d) {
- SeparatorData stored = (SeparatorData) restoreData(context);
- Color bg = new Color(stored.getBgColor());
- Color grad = new Color(stored.getGradColor());
- float [] grads = grad.getRGBComponents(null);
- int level3D = (stored.getLevel3D());
+
+ public BevelSeparatorImage() {
+ setRenderer(new GifRenderer());
+ setLastModified(new Date(InternetResourceBuilder.getInstance().getStartTime()));
+ }
+
+ public Dimension getDimensions(FacesContext facesContext, Object data) {
+ return calculateDimensions(getDataToStore(facesContext, data));
+ }
+
+ protected Dimension getDimensions(ResourceContext resourceContext) {
+ return calculateDimensions(restoreData(resourceContext));
+ }
+
+ protected Dimension calculateDimensions(Object data) {
+ return new Dimension(1, ((SeparatorData) data).getHeight());
+ }
+
+ protected void paint(ResourceContext context, Graphics2D g2d) {
+ SeparatorData stored = (SeparatorData) restoreData(context);
+ Color bg = new Color(stored.getBgColor());
+ Color grad = new Color(stored.getGradColor());
+ float [] grads = grad.getRGBComponents(null);
+ int level3D = (stored.getLevel3D());
Dimension dim = calculateDimensions(stored);
float height = (float) dim.getHeight();
float width = (float) dim.getWidth();
-
- g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
- g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
- g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE);
-
- Rectangle2D rect = new Rectangle2D.Double(0.0, 0.0, width, height);
- g2d.setColor(bg);
- g2d.fill(rect);
-
- if(level3D > 0){
- g2d.translate(0d, height / 18d);
- // Vertical cradient.
- float verticalOpacity = ((float)(level3D + 1)* 0.1f);
- if(verticalOpacity < 0) {
- verticalOpacity = 0;
- } else if(verticalOpacity > 1){
- verticalOpacity = 1;
- }
- g2d.setPaint(
- new GradientPaint(
- width / 2,
- 0f,
- new Color(
- grads[0],
- grads[1],
- grads[2],
- verticalOpacity),
- width / 2,
- height / 2,
- new Color(
- 1f,
- 1f,
- 1f,
- 0f)));
- g2d.fill(rect);
- verticalOpacity = ((float)(level3D - 1)* 0.1f);
- if(verticalOpacity < 0) {
- verticalOpacity = 0;
- } else if(verticalOpacity > 1){
- verticalOpacity = 1;
- }
- //XXX by nick - fantonov - get rid of get*() - store values in local var
- g2d.setPaint(new GradientPaint(width / 2, height /2, new Color(1f, 1f, 1f, 0f),
- width / 2, height * 0.75f, new Color(grads[0], grads[1], grads[2], verticalOpacity), true));
- Shape currentClip = g2d.getClip();
- Rectangle2D.Double clipRect = new Rectangle2D.Double(0, height /2, width * 2, height);
- g2d.setClip(clipRect);
- g2d.fill(rect);
- g2d.setClip(currentClip);
- }
-
- }
-
- protected Object getDataToStore(FacesContext context, Object data) {
- SeparatorData separatorData = new SeparatorData();
- Skin skin = SkinFactory.getInstance().getSkin(context);
-
- //XXX by nick - fantonov - ((UISeparator)data).getHeight() ?
- String tmp = (String) ((UISeparator) data).getHeight();
- separatorData.setHeight(HtmlDimensions.decode( tmp == null ? "6" : tmp ).intValue());
-
- tmp = (String) skin.getParameter(context, "interfaceLevel3D");
- separatorData.setLevel3D(HtmlDimensions.decode( tmp == null ? "5" : tmp ).intValue());
-
- tmp = (String) skin.getParameter(context, "headerBackgroundColor");
- separatorData.setBgColor(HtmlColor.decode( tmp == null ? "#4169E1" : tmp ).getRGB());
-
- tmp = (String) skin.getParameter(context, "overAllBackground");
- separatorData.setGradColor(HtmlColor.decode( tmp == null ? "#FFFFFF" : tmp ).getRGB());
-
- return separatorData;
- }
-
- protected static class SeparatorData implements Serializable{
- private static final long serialVersionUID = -6368074056069548706L;
- private int height;
- private int level3D;
- private int bgColor;
- private int gradColor;
-
- public int getBgColor() {
- return bgColor;
- }
- public void setBgColor(int bgColor) {
- this.bgColor = bgColor;
- }
- public int getGradColor() {
- return gradColor;
- }
- public void setGradColor(int gradColor) {
- this.gradColor = gradColor;
- }
- public int getHeight() {
- return height;
- }
- public void setHeight(int height) {
- this.height = height;
- }
- public int getLevel3D() {
- return level3D;
- }
- public void setLevel3D(int level3D) {
- this.level3D = level3D;
- }
- }
+ g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+ g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
+ g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE);
+
+ Rectangle2D rect = new Rectangle2D.Double(0.0, 0.0, width, height);
+ g2d.setColor(bg);
+ g2d.fill(rect);
+
+ if (level3D > 0) {
+ g2d.translate(0d, height / 18d);
+ // Vertical cradient.
+ float verticalOpacity = ((float) (level3D + 1) * 0.1f);
+ if (verticalOpacity < 0) {
+ verticalOpacity = 0;
+ } else if (verticalOpacity > 1) {
+ verticalOpacity = 1;
+ }
+ g2d.setPaint(
+ new GradientPaint(
+ width / 2,
+ 0f,
+ new Color(
+ grads[0],
+ grads[1],
+ grads[2],
+ verticalOpacity),
+ width / 2,
+ height / 2,
+ new Color(
+ 1f,
+ 1f,
+ 1f,
+ 0f)));
+ g2d.fill(rect);
+ verticalOpacity = ((float) (level3D - 1) * 0.1f);
+ if (verticalOpacity < 0) {
+ verticalOpacity = 0;
+ } else if (verticalOpacity > 1) {
+ verticalOpacity = 1;
+ }
+ //XXX by nick - fantonov - get rid of get*() - store values in local var
+ g2d.setPaint(new GradientPaint(width / 2, height / 2, new Color(1f, 1f, 1f, 0f),
+ width / 2, height * 0.75f, new Color(grads[0], grads[1], grads[2], verticalOpacity), true));
+ Shape currentClip = g2d.getClip();
+ Rectangle2D.Double clipRect = new Rectangle2D.Double(0, height / 2, width * 2, height);
+ g2d.setClip(clipRect);
+ g2d.fill(rect);
+ g2d.setClip(currentClip);
+ }
+
+ }
+
+ protected Object getDataToStore(FacesContext context, Object data) {
+ SeparatorData separatorData = new SeparatorData();
+ Skin skin = SkinFactory.getInstance().getSkin(context);
+
+ //XXX by nick - fantonov - ((UISeparator)data).getHeight() ?
+ String tmp = (String) ((UISeparator) data).getHeight();
+ separatorData.setHeight(HtmlDimensions.decode(tmp == null ? "6" : tmp).intValue());
+
+ tmp = (String) skin.getParameter(context, "interfaceLevel3D");
+ separatorData.setLevel3D(HtmlDimensions.decode(tmp == null ? "5" : tmp).intValue());
+
+ tmp = (String) skin.getParameter(context, "headerBackgroundColor");
+ separatorData.setBgColor(HtmlColor.decode(tmp == null ? "#4169E1" : tmp).getRGB());
+
+ tmp = (String) skin.getParameter(context, "overAllBackground");
+ separatorData.setGradColor(HtmlColor.decode(tmp == null ? "#FFFFFF" : tmp).getRGB());
+
+ return separatorData;
+ }
+
+ protected static class SeparatorData implements Serializable {
+ private static final long serialVersionUID = -6368074056069548706L;
+ private int height;
+ private int level3D;
+ private int bgColor;
+ private int gradColor;
+
+ public int getBgColor() {
+ return bgColor;
+ }
+
+ public void setBgColor(int bgColor) {
+ this.bgColor = bgColor;
+ }
+
+ public int getGradColor() {
+ return gradColor;
+ }
+
+ public void setGradColor(int gradColor) {
+ this.gradColor = gradColor;
+ }
+
+ public int getHeight() {
+ return height;
+ }
+
+ public void setHeight(int height) {
+ this.height = height;
+ }
+
+ public int getLevel3D() {
+ return level3D;
+ }
+
+ public void setLevel3D(int level3D) {
+ this.level3D = level3D;
+ }
+ }
}
Modified: trunk/richfaces/separator/src/main/java/org/richfaces/renderkit/html/images/SimpleSeparatorImage.java
===================================================================
--- trunk/richfaces/separator/src/main/java/org/richfaces/renderkit/html/images/SimpleSeparatorImage.java 2007-04-12 15:08:59 UTC (rev 385)
+++ trunk/richfaces/separator/src/main/java/org/richfaces/renderkit/html/images/SimpleSeparatorImage.java 2007-04-12 16:11:53 UTC (rev 386)
@@ -21,16 +21,6 @@
package org.richfaces.renderkit.html.images;
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.image.BufferedImage;
-import java.awt.image.RenderedImage;
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-
import org.ajax4jsf.framework.resource.GifRenderer;
import org.ajax4jsf.framework.resource.InternetResourceBuilder;
import org.ajax4jsf.framework.resource.Java2Dresource;
@@ -41,123 +31,131 @@
import org.ajax4jsf.framework.util.HtmlDimensions;
import org.richfaces.component.UISeparator;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.awt.image.RenderedImage;
+import java.io.Serializable;
+import java.util.Date;
+
/**
* @author Konstantin Mishin, Filip Antonov
- *
*/
public class SimpleSeparatorImage extends Java2Dresource {
-
- //line type may be dotted, dashed, double or solid.
- private static final int LINE_TYPE_DOTTED = 1;
- private static final int LINE_TYPE_DASHED = 2;
- private static final int LINE_TYPE_DOUBLE = 3;
- private static final int LINE_TYPE_SOLID = 4;
-
- public SimpleSeparatorImage() {
- setRenderer(new GifRenderer());
- setLastModified(new Date(InternetResourceBuilder.getInstance().getStartTime()));
- }
-
- protected RenderedImage getImage(ResourceContext context) {
- SimpleSeparatorData separatorData = (SimpleSeparatorData) restoreData(context);
- Color color = new Color(separatorData.getColor());
- int height = separatorData.getHeight();
- int lineType = separatorData.getLineType();
- if (height<=0) height = 1;
- Graphics2D g2d = null;
-
- //XXX by nick - fantonov - please use switch-case blocks here
- switch (lineType) {
- case LINE_TYPE_DOTTED:
- BufferedImage bufferedImage = new BufferedImage(3*height, height, BufferedImage.TYPE_INT_ARGB);
- g2d = (Graphics2D) bufferedImage.createGraphics();
- g2d.setColor(color);
- g2d.fillRect(0, 0, height, height);
-/* for (int i = 0; i < height; i++)
- for (int j = 0; j < height; j++)
- bufferedImage.setRGB(i, j, color); */
- return bufferedImage;
-
- case LINE_TYPE_DASHED:
- bufferedImage = new BufferedImage(4*height, height, BufferedImage.TYPE_INT_ARGB);
- g2d = (Graphics2D) bufferedImage.createGraphics();
- g2d.setColor(color);
- g2d.fillRect(0, 0, 3*height, height);
-/* for (int i = 0; i < height*3; i++)
- for (int j = 0; j < height; j++)
- bufferedImage.setRGB(i, j, color); */
- return bufferedImage;
-
- case LINE_TYPE_DOUBLE:
- bufferedImage = new BufferedImage(1, height, BufferedImage.TYPE_INT_ARGB);
- int lineHeight = Math.round((float) height/3);
- g2d = (Graphics2D) bufferedImage.createGraphics();
- g2d.setColor(color);
- g2d.fillRect(0, 0, 1, lineHeight);
- g2d.fillRect(0, height-lineHeight, 1, lineHeight);
+
+ //line type may be dotted, dashed, double or solid.
+ private static final int LINE_TYPE_DOTTED = 1;
+ private static final int LINE_TYPE_DASHED = 2;
+ private static final int LINE_TYPE_DOUBLE = 3;
+ private static final int LINE_TYPE_SOLID = 4;
+
+ public SimpleSeparatorImage() {
+ setRenderer(new GifRenderer());
+ setLastModified(new Date(InternetResourceBuilder.getInstance().getStartTime()));
+ }
+
+ protected RenderedImage getImage(ResourceContext context) {
+ SimpleSeparatorData separatorData = (SimpleSeparatorData) restoreData(context);
+ Color color = new Color(separatorData.getColor());
+ int height = separatorData.getHeight();
+ int lineType = separatorData.getLineType();
+ if (height <= 0) height = 1;
+ Graphics2D g2d = null;
+
+ //XXX by nick - fantonov - please use switch-case blocks here
+ switch (lineType) {
+ case LINE_TYPE_DOTTED:
+ BufferedImage bufferedImage = new BufferedImage(3 * height, height, BufferedImage.TYPE_INT_ARGB);
+ g2d = (Graphics2D) bufferedImage.createGraphics();
+ g2d.setColor(color);
+ g2d.fillRect(0, 0, height, height);
+ return bufferedImage;
+
+ case LINE_TYPE_DASHED:
+ bufferedImage = new BufferedImage(4 * height, height, BufferedImage.TYPE_INT_ARGB);
+ g2d = (Graphics2D) bufferedImage.createGraphics();
+ g2d.setColor(color);
+ g2d.fillRect(0, 0, 3 * height, height);
+ return bufferedImage;
+
+ case LINE_TYPE_DOUBLE:
+ bufferedImage = new BufferedImage(1, height, BufferedImage.TYPE_INT_ARGB);
+ int lineHeight = Math.round((float) height / 3);
+ g2d = (Graphics2D) bufferedImage.createGraphics();
+ g2d.setColor(color);
+ g2d.fillRect(0, 0, 1, lineHeight);
+ g2d.fillRect(0, height - lineHeight, 1, lineHeight);
// for (int i = 0; i < lineHeight; i++) bufferedImage.setRGB(0, i, color);
// for (int i = height-lineHeight; i < height; i++) bufferedImage.setRGB(0, i, color);
- return bufferedImage;
-
- case LINE_TYPE_SOLID:
- bufferedImage = new BufferedImage(1, height, BufferedImage.TYPE_INT_ARGB);
- g2d = (Graphics2D) bufferedImage.createGraphics();
- g2d.setColor(color);
- g2d.fillRect(0, 0, 1, height);
+ return bufferedImage;
+
+ case LINE_TYPE_SOLID:
+ bufferedImage = new BufferedImage(1, height, BufferedImage.TYPE_INT_ARGB);
+ g2d = (Graphics2D) bufferedImage.createGraphics();
+ g2d.setColor(color);
+ g2d.fillRect(0, 0, 1, height);
// for (int i = 0; i < height; i++) bufferedImage.setRGB(0, i, color);
- return bufferedImage;
- }
- return null;
- }
-
- protected Object getDataToStore(FacesContext context, Object data) {
- SimpleSeparatorData separatorData = new SimpleSeparatorData();
- Skin skin = SkinFactory.getInstance().getSkin(context);
-
- String tmp = (String) ((UIComponent) data).getAttributes().get("height");
- separatorData.setHeight(HtmlDimensions.decode( tmp == null ? "6" : tmp ).intValue());
-
- tmp = (String) skin.getParameter(context, "headerBackgroundColor");
- separatorData.setColor(HtmlColor.decode( tmp == null ? "#4169E1" : tmp ).getRGB());
-
- //XXX by nick - fantonov - ((UISeparator)data).getLineType() ?
- tmp = (String) ((UISeparator)data).getLineType();
- int lineType = LINE_TYPE_SOLID;
- if (tmp.equalsIgnoreCase(UISeparator.LINE_TYPE_DOTTED)) {lineType = LINE_TYPE_DOTTED;}
- else if (tmp.equalsIgnoreCase(UISeparator.LINE_TYPE_DASHED)) {lineType = LINE_TYPE_DASHED;}
- else if (tmp.equalsIgnoreCase(UISeparator.LINE_TYPE_DOUBLE) && separatorData.getHeight() > 2)
- {lineType = LINE_TYPE_DOUBLE;}
- separatorData.setLineType(lineType);
- return separatorData;
- }
-
- protected static class SimpleSeparatorData implements Serializable{
-
- /**
- *
- */
- private static final long serialVersionUID = -4420043779436390358L;
- private int height;
- private int color;
- private int lineType;
-
- public int getHeight() {
- return height;
- }
- public void setHeight(int height) {
- this.height = height;
- }
- public int getColor() {
- return color;
- }
- public void setColor(int color) {
- this.color = color;
- }
- public int getLineType() {
- return lineType;
- }
- public void setLineType(int lineType) {
- this.lineType = lineType;
- }
- }
+ return bufferedImage;
+ }
+ return null;
+ }
+
+ protected Object getDataToStore(FacesContext context, Object data) {
+ SimpleSeparatorData separatorData = new SimpleSeparatorData();
+ Skin skin = SkinFactory.getInstance().getSkin(context);
+
+ String tmp = (String) ((UIComponent) data).getAttributes().get("height");
+ separatorData.setHeight(HtmlDimensions.decode(tmp == null ? "6" : tmp).intValue());
+
+ tmp = (String) skin.getParameter(context, "headerBackgroundColor");
+ separatorData.setColor(HtmlColor.decode(tmp == null ? "#4169E1" : tmp).getRGB());
+
+ //XXX by nick - fantonov - ((UISeparator)data).getLineType() ?
+ tmp = (String) ((UISeparator) data).getLineType();
+ int lineType = LINE_TYPE_SOLID;
+ if (tmp.equalsIgnoreCase(UISeparator.LINE_TYPE_DOTTED)) {
+ lineType = LINE_TYPE_DOTTED;
+ } else if (tmp.equalsIgnoreCase(UISeparator.LINE_TYPE_DASHED)) {
+ lineType = LINE_TYPE_DASHED;
+ } else
+ if (tmp.equalsIgnoreCase(UISeparator.LINE_TYPE_DOUBLE) && separatorData.getHeight() > 2)
+ {
+ lineType = LINE_TYPE_DOUBLE;
+ }
+ separatorData.setLineType(lineType);
+ return separatorData;
+ }
+
+ protected static class SimpleSeparatorData implements Serializable {
+
+ private static final long serialVersionUID = -4420043779436390358L;
+ private int height;
+ private int color;
+ private int lineType;
+
+ public int getHeight() {
+ return height;
+ }
+
+ public void setHeight(int height) {
+ this.height = height;
+ }
+
+ public int getColor() {
+ return color;
+ }
+
+ public void setColor(int color) {
+ this.color = color;
+ }
+
+ public int getLineType() {
+ return lineType;
+ }
+
+ public void setLineType(int lineType) {
+ this.lineType = lineType;
+ }
+ }
}
Modified: trunk/richfaces/separator/src/test/java/org/richfaces/component/SeparatorComponentTest.java
===================================================================
--- trunk/richfaces/separator/src/test/java/org/richfaces/component/SeparatorComponentTest.java 2007-04-12 15:08:59 UTC (rev 385)
+++ trunk/richfaces/separator/src/test/java/org/richfaces/component/SeparatorComponentTest.java 2007-04-12 16:11:53 UTC (rev 386)
@@ -23,13 +23,19 @@
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.Page;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
+import org.ajax4jsf.framework.resource.InternetResourceBuilder;
+import org.ajax4jsf.framework.resource.ResourceBuilderImpl;
+import org.ajax4jsf.framework.resource.InternetResource;
+import org.ajax4jsf.framework.util.image.ImageInfo;
import org.richfaces.renderkit.html.SeparatorRendererBase;
import javax.faces.component.UIComponent;
import javax.faces.component.UIOutput;
import javax.faces.component.html.HtmlForm;
import javax.faces.component.html.HtmlOutputText;
+import javax.servlet.http.HttpServletResponse;
/**
* Unit test for Separator component.
@@ -105,4 +111,34 @@
String styleAttr = div2.getAttributeValue("style");
assertTrue(styleAttr.contains("org.richfaces.renderkit.html.images.BevelSeparatorImage"));
}
+
+ public void testRenderImage() throws Exception {
+ InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
+
+ ui.setLineType(UISeparator.LINE_TYPE_BEVEL);
+ renderView();
+ InternetResource resource = builder.getResource("org.richfaces.renderkit.html.images.BevelSeparatorImage");
+ assertNotNull(resource);
+ String uri = "http:" + resource.getUri(facesContext, ui);
+ 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());
+
+ ui.setLineType(UISeparator.LINE_TYPE_SOLID);
+ renderView();
+ resource = builder.getResource("org.richfaces.renderkit.html.images.SimpleSeparatorImage");
+ assertNotNull(resource);
+ uri = "http:" + resource.getUri(facesContext, ui);
+ page = webClient.getPage(uri);
+ assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
+ info = new ImageInfo();
+ info.setInput(page.getWebResponse().getContentAsStream());
+ //image recognizable?
+ assertTrue(info.check());
+ assertEquals(ImageInfo.FORMAT_GIF, info.getFormat());
+ }
}
More information about the richfaces-svn-commits
mailing list