Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Further changes for SWF-700. Adding unit tests to fully exercise the renderer output for the various component configurations.

Browse Source
This commit is contained in:
Jeremy Grelle
2008-05-27 19:59:40 +00:00
parent 6542e3ae2f
commit 26789c7d73
3 changed files with 165 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveCommandButtonRenderer.java
View File

@@ -84,7 +84,7 @@ public class ProgressiveCommandButtonRenderer extends BaseDojoComponentRenderer
}
onclick.append("Spring.remoting.submitForm('" + component.getClientId(context) + "', ");
onclick.append("'" + RendererUtils.getFormId(context, component) + "', ");
onclick.append("{processIds: '" + processIds + "'" + encodeParams(context, component)
onclick.append("{processIds: '" + processIds + "'" + encodeParamsAsObject(context, component)
+ "}); return false;");
} else {
onclick.append(getOnClickNoAjax(context, component));
@@ -143,23 +143,18 @@ public class ProgressiveCommandButtonRenderer extends BaseDojoComponentRenderer
return true;
}
protected String encodeParams(FacesContext context, UIComponent component) {
StringBuffer paramArray = new StringBuffer();
paramArray.append("[");
protected String encodeParamsAsObject(FacesContext context, UIComponent component) {
StringBuffer paramObj = new StringBuffer();
for (int i = 0; i < component.getChildCount(); i++) {
if (component.getChildren().get(i) instanceof UIParameter) {
UIParameter param = (UIParameter) component.getChildren().get(i);
Assert.hasText(param.getName(),
"UIParameter requires a name when used as a child of a UICommand component");
if (paramArray.length() > 1) {
paramArray.append(", ");
}
paramArray.append("{name : '" + param.getName() + "'");
paramArray.append(", value : '" + param.getValue() + "'}");
paramObj.append(", " + param.getName() + " : '" + param.getValue() + "'");
}
}
paramArray.append("]");
return paramArray.toString();
return paramObj.toString();
}
}

23
spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveCommandLinkRenderer.java
View File

@@ -26,12 +26,14 @@ import java.util.ListIterator;
import java.util.Map;
import javax.faces.component.UIComponent;
import javax.faces.component.UIParameter;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import javax.faces.render.Renderer;
import org.springframework.beans.BeanUtils;
import org.springframework.faces.webflow.JsfUtils;
import org.springframework.util.Assert;
/**
* {@link Renderer} for the {@code <sf:commandLink>} tag.
@@ -162,13 +164,32 @@ public class ProgressiveCommandLinkRenderer extends ProgressiveCommandButtonRend
}
protected String getOnClickNoAjax(FacesContext context, UIComponent component) {
String params = encodeParams(context, component);
String params = encodeParamsAsArray(context, component);
StringBuffer onclick = new StringBuffer();
onclick.append("this.submitFormFromLink('" + RendererUtils.getFormId(context, component) + "','"
+ component.getClientId(context) + "', " + params + "); return false;");
return onclick.toString();
}
protected String encodeParamsAsArray(FacesContext context, UIComponent component) {
StringBuffer paramArray = new StringBuffer();
paramArray.append("[");
for (int i = 0; i < component.getChildCount(); i++) {
if (component.getChildren().get(i) instanceof UIParameter) {
UIParameter param = (UIParameter) component.getChildren().get(i);
Assert.hasText(param.getName(),
"UIParameter requires a name when used as a child of a UICommand component");
if (paramArray.length() > 1) {
paramArray.append(", ");
}
paramArray.append("{name : '" + param.getName() + "'");
paramArray.append(", value : '" + param.getValue() + "'}");
}
}
paramArray.append("]");
return paramArray.toString();
}
private class DoubleQuoteEscapingWriter extends ResponseWriter {
private ResponseWriter original;

137
spring-faces/src/test/java/org/springframework/faces/ui/ProgressiveCommandLinkRendererTests.java Normal file
View File

@@ -0,0 +1,137 @@
package org.springframework.faces.ui;
import java.io.StringWriter;
import javax.faces.component.UIForm;
import javax.faces.component.UIParameter;
import junit.framework.TestCase;
import org.apache.shale.test.mock.MockResponseWriter;
import org.springframework.faces.webflow.JSFMockHelper;
public class ProgressiveCommandLinkRendererTests extends TestCase {
JSFMockHelper jsf = new JSFMockHelper();
ProgressiveCommandLinkRenderer renderer = new ProgressiveCommandLinkRenderer();
StringWriter output = new StringWriter();
public void setUp() throws Exception {
jsf.setUp();
jsf.facesContext().setResponseWriter(new MockResponseWriter(output, null, null));
}
public void tearDown() throws Exception {
System.out.println(output);
jsf.tearDown();
}
public void testRenderOnClick_AjaxEnabled_NoParams() throws Exception {
String expected = "<a onclick=\"Spring.remoting.submitForm(&apos;myForm:foo&apos;, &apos;myForm&apos;, "
+ "{processIds: &apos;myForm:foo&apos;}); return false;\"/>";
UIForm form = new UIForm();
form.setId("myForm");
ProgressiveUICommand link = new ProgressiveUICommand();
link.setId("foo");
form.getChildren().add(link);
RenderAttributeCallback callback = (RenderAttributeCallback) renderer.getAttributeCallbacks(link)
.get("onclick");
jsf.facesContext().getResponseWriter().startElement("a", link);
callback.doRender(jsf.facesContext(), jsf.facesContext().getResponseWriter(), link, "onclick", null, "onclick");
jsf.facesContext().getResponseWriter().endElement("a");
assertEquals(expected, output.toString());
}
public void testRenderOnClick_AjaxEnabled_WithParams() throws Exception {
String expected = "<a onclick=\"Spring.remoting.submitForm(&apos;myForm:foo&apos;, &apos;myForm&apos;, "
+ "{processIds: &apos;myForm:foo&apos;, foo : &apos;bar&apos;, zoo : &apos;baz&apos;}"
+ "); return false;\"/>";
UIForm form = new UIForm();
form.setId("myForm");
ProgressiveUICommand link = new ProgressiveUICommand();
link.setId("foo");
form.getChildren().add(link);
UIParameter param1 = new UIParameter();
param1.setName("foo");
param1.setValue("bar");
UIParameter param2 = new UIParameter();
param2.setName("zoo");
param2.setValue("baz");
link.getChildren().add(param1);
link.getChildren().add(param2);
RenderAttributeCallback callback = (RenderAttributeCallback) renderer.getAttributeCallbacks(link)
.get("onclick");
jsf.facesContext().getResponseWriter().startElement("a", link);
callback.doRender(jsf.facesContext(), jsf.facesContext().getResponseWriter(), link, "onclick", null, "onclick");
jsf.facesContext().getResponseWriter().endElement("a");
assertEquals(expected, output.toString());
}
public void testRenderOnClick_AjaxDisabled_NoParams() throws Exception {
String expected = "<a onclick=\"this.submitFormFromLink(&apos;myForm&apos;,&apos;myForm:foo&apos;, []); return false;\"/>";
UIForm form = new UIForm();
form.setId("myForm");
ProgressiveUICommand link = new ProgressiveUICommand();
link.setId("foo");
link.setAjaxEnabled(Boolean.FALSE);
form.getChildren().add(link);
RenderAttributeCallback callback = (RenderAttributeCallback) renderer.getAttributeCallbacks(link)
.get("onclick");
jsf.facesContext().getResponseWriter().startElement("a", link);
callback.doRender(jsf.facesContext(), jsf.facesContext().getResponseWriter(), link, "onclick", null, "onclick");
jsf.facesContext().getResponseWriter().endElement("a");
assertEquals(expected, output.toString());
}
public void testRenderOnClick_AjaxDisabled_WithParams() throws Exception {
String expected = "<a onclick=\"this.submitFormFromLink(&apos;myForm&apos;,&apos;myForm:foo&apos;, ["
+ "{name : &apos;foo&apos;, value : &apos;bar&apos;}, {name : &apos;zoo&apos;, value : &apos;baz&apos;}"
+ "]); return false;\"/>";
UIForm form = new UIForm();
form.setId("myForm");
ProgressiveUICommand link = new ProgressiveUICommand();
link.setId("foo");
link.setAjaxEnabled(Boolean.FALSE);
form.getChildren().add(link);
UIParameter param1 = new UIParameter();
param1.setName("foo");
param1.setValue("bar");
UIParameter param2 = new UIParameter();
param2.setName("zoo");
param2.setValue("baz");
link.getChildren().add(param1);
link.getChildren().add(param2);
RenderAttributeCallback callback = (RenderAttributeCallback) renderer.getAttributeCallbacks(link)
.get("onclick");
jsf.facesContext().getResponseWriter().startElement("a", link);
callback.doRender(jsf.facesContext(), jsf.facesContext().getResponseWriter(), link, "onclick", null, "onclick");
jsf.facesContext().getResponseWriter().endElement("a");
assertEquals(expected, output.toString());
}
}