Author: nbelaevski
Date: 2010-02-24 18:29:56 -0500 (Wed, 24 Feb 2010)
New Revision: 16491
Modified:
root/cdk/trunk/plugins/maven-cdk-plugin/
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/renderer-template-test/src/test/java/org/richfaces/cdk/BaseRendererTest.java
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/renderer-template-test/src/test/java/org/richfaces/cdk/CoercionsTest.java
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/renderer-template-test/src/test/java/org/richfaces/cdk/GridRendererTest.java
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/renderer-template-test/src/test/java/org/richfaces/cdk/InputRendererTest.java
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/renderer-template-test/src/test/java/org/richfaces/cdk/LinkRendererTest.java
root/framework/trunk/commons/src/test/java/org/richfaces/renderkit/RenderKitUtilsTest.java
Log:
JSFMock unit tests updated
Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin
___________________________________________________________________
Name: svn:ignore
- target
.settings
.project
.classpath
.clover
+ target
.settings
.project
.classpath
.clover
bin
Modified:
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/renderer-template-test/src/test/java/org/richfaces/cdk/BaseRendererTest.java
===================================================================
---
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/renderer-template-test/src/test/java/org/richfaces/cdk/BaseRendererTest.java 2010-02-24
19:36:02 UTC (rev 16490)
+++
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/renderer-template-test/src/test/java/org/richfaces/cdk/BaseRendererTest.java 2010-02-24
23:29:56 UTC (rev 16491)
@@ -24,17 +24,14 @@
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.same;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import javax.faces.component.UIComponent;
+import javax.faces.component.UIComponentBase;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import org.easymock.IAnswer;
-import org.jboss.test.faces.mock.FacesMock;
import org.jboss.test.faces.mock.MockFacesEnvironment;
import org.junit.After;
import org.junit.Before;
@@ -57,45 +54,25 @@
protected Map<String, Object> componentAttributes;
- protected List<UIComponent> childrenList;
-
- protected void replayAll() throws Exception {
- FacesMock.replay(environment, responseWriter, component);
- }
-
- protected void verifyAll() throws Exception {
- FacesMock.verify(environment, responseWriter, component);
- }
-
@Before
public void setUp() throws Exception {
environment = MockFacesEnvironment.createEnvironment();
facesContext = environment.getFacesContext();
- component = FacesMock.createMock(UIComponent.class);
+ component = environment.createMock(UIComponentBase.class);
componentAttributes = new HashMap<String, Object>();
expect(component.getAttributes()).andStubReturn(componentAttributes);
expect(component.getClientId(same(environment.getFacesContext()))).andStubReturn(CLIENT_ID);
- childrenList = new ArrayList<UIComponent>();
- expect(component.getChildCount()).andAnswer(new IAnswer<Integer>() {
- @Override
- public Integer answer() throws Throwable {
- return childrenList.size();
- }
- }).anyTimes();
- expect(component.getChildren()).andStubReturn(childrenList);
-
- responseWriter = FacesMock.createMock(ResponseWriter.class);
+ responseWriter = environment.createMock(ResponseWriter.class);
expect(environment.getFacesContext().getResponseWriter()).andStubReturn(responseWriter);
expect(responseWriter.getContentType()).andStubReturn("text/html");
}
@After
public void tearDown() throws Exception {
- verifyAll();
-
+ environment.verify();
environment.release();
environment = null;
@@ -103,7 +80,6 @@
facesContext = null;
component = null;
componentAttributes = null;
- childrenList = null;
}
}
Modified:
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/renderer-template-test/src/test/java/org/richfaces/cdk/CoercionsTest.java
===================================================================
---
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/renderer-template-test/src/test/java/org/richfaces/cdk/CoercionsTest.java 2010-02-24
19:36:02 UTC (rev 16490)
+++
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/renderer-template-test/src/test/java/org/richfaces/cdk/CoercionsTest.java 2010-02-24
23:29:56 UTC (rev 16491)
@@ -43,7 +43,7 @@
public void testEncodeEnd() throws Exception {
responseWriter.writeText(eq("0"), EasyMock.<String>isNull());
- replayAll();
+ environment.replay();
CoercedRenderer renderer = new CoercedRenderer();
renderer.encodeEnd(facesContext, component);
@@ -55,7 +55,7 @@
responseWriter.writeText(eq(String.valueOf("test value".length())),
EasyMock.<String>isNull());
- replayAll();
+ environment.replay();
CoercedRenderer renderer = new CoercedRenderer();
renderer.encodeEnd(facesContext, component);
@@ -69,7 +69,7 @@
responseWriter.writeText(eq("AnotherFlag"),
EasyMock.<String>isNull());
responseWriter.writeText(eq("0"), EasyMock.<String>isNull());
- replayAll();
+ environment.replay();
CoercedRenderer renderer = new CoercedRenderer();
renderer.encodeEnd(facesContext, component);
@@ -83,7 +83,7 @@
responseWriter.writeText(eq("Flag"), EasyMock.<String>isNull());
responseWriter.writeText(eq("0"), EasyMock.<String>isNull());
- replayAll();
+ environment.replay();
CoercedRenderer renderer = new CoercedRenderer();
renderer.encodeEnd(facesContext, component);
Modified:
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/renderer-template-test/src/test/java/org/richfaces/cdk/GridRendererTest.java
===================================================================
---
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/renderer-template-test/src/test/java/org/richfaces/cdk/GridRendererTest.java 2010-02-24
19:36:02 UTC (rev 16490)
+++
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/renderer-template-test/src/test/java/org/richfaces/cdk/GridRendererTest.java 2010-02-24
23:29:56 UTC (rev 16491)
@@ -24,6 +24,8 @@
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.same;
+import java.util.List;
+
import javax.faces.component.UIComponent;
import org.easymock.EasyMock;
@@ -40,8 +42,10 @@
@Before
public void setUp() throws Exception {
super.setUp();
- childrenList.add(new HtmlOutputTextStub("First child"));
- childrenList.add(new HtmlOutputTextStub("Second child"));
+
+ List<UIComponent> children = component.getChildren();
+ children.add(new HtmlOutputTextStub("First child"));
+ children.add(new HtmlOutputTextStub("Second child"));
}
@Test
@@ -50,7 +54,7 @@
responseWriter.writeAttribute(eq("id"), eq(CLIENT_ID),
EasyMock.<String>isNull());
responseWriter.startElement(eq("tbody"), same(component));
- replayAll();
+ environment.replay();
GridRenderer renderer = new GridRenderer();
renderer.encodeBegin(facesContext, component);
@@ -79,7 +83,7 @@
responseWriter.endElement(eq("td"));
responseWriter.endElement(eq("tr"));
- replayAll();
+ environment.replay();
GridRenderer renderer = new GridRenderer();
renderer.encodeChildren(facesContext, component);
@@ -90,7 +94,7 @@
responseWriter.endElement(eq("tbody"));
responseWriter.endElement(eq("table"));
- replayAll();
+ environment.replay();
GridRenderer renderer = new GridRenderer();
renderer.encodeEnd(facesContext, component);
Modified:
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/renderer-template-test/src/test/java/org/richfaces/cdk/InputRendererTest.java
===================================================================
---
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/renderer-template-test/src/test/java/org/richfaces/cdk/InputRendererTest.java 2010-02-24
19:36:02 UTC (rev 16490)
+++
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/renderer-template-test/src/test/java/org/richfaces/cdk/InputRendererTest.java 2010-02-24
23:29:56 UTC (rev 16491)
@@ -24,6 +24,10 @@
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.same;
+import java.util.List;
+
+import javax.faces.component.UIComponent;
+
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
@@ -39,7 +43,9 @@
@Before
public void setUp() throws Exception {
super.setUp();
- childrenList.add(new HtmlOutputTextStub("Single child"));
+
+ List<UIComponent> children = component.getChildren();
+ children.add(new HtmlOutputTextStub("Single child"));
}
@Test
@@ -47,7 +53,7 @@
responseWriter.startElement(eq("span"), same(component));
responseWriter.writeAttribute(eq("id"), eq(CLIENT_ID),
EasyMock.<String>isNull());
- replayAll();
+ environment.replay();
InputRenderer renderer = new InputRenderer();
renderer.encodeBegin(facesContext, component);
@@ -57,7 +63,7 @@
public void testEncodeChildrenDefaultComponent() throws Exception {
responseWriter.writeText(eq("Single child"),
EasyMock.<String>isNull());
- replayAll();
+ environment.replay();
InputRenderer renderer = new InputRenderer();
renderer.encodeChildren(facesContext, component);
@@ -74,7 +80,7 @@
responseWriter.endElement(eq("span"));
- replayAll();
+ environment.replay();
InputRenderer renderer = new InputRenderer();
renderer.encodeEnd(facesContext, component);
@@ -91,7 +97,7 @@
responseWriter.endElement(eq("span"));
- replayAll();
+ environment.replay();
InputRenderer renderer = new InputRenderer();
renderer.encodeEnd(facesContext, component);
@@ -113,7 +119,7 @@
responseWriter.endElement(eq("span"));
- replayAll();
+ environment.replay();
InputRenderer renderer = new InputRenderer();
renderer.encodeEnd(facesContext, component);
@@ -135,7 +141,7 @@
responseWriter.endElement(eq("span"));
- replayAll();
+ environment.replay();
InputRenderer renderer = new InputRenderer();
renderer.encodeEnd(facesContext, component);
Modified:
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/renderer-template-test/src/test/java/org/richfaces/cdk/LinkRendererTest.java
===================================================================
---
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/renderer-template-test/src/test/java/org/richfaces/cdk/LinkRendererTest.java 2010-02-24
19:36:02 UTC (rev 16490)
+++
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/renderer-template-test/src/test/java/org/richfaces/cdk/LinkRendererTest.java 2010-02-24
23:29:56 UTC (rev 16491)
@@ -24,6 +24,10 @@
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.same;
+import java.util.List;
+
+import javax.faces.component.UIComponent;
+
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
@@ -41,7 +45,9 @@
@Before
public void setUp() throws Exception {
super.setUp();
- childrenList.add(new HtmlOutputTextStub("Child text"));
+
+ List<UIComponent> children = component.getChildren();
+ children.add(new HtmlOutputTextStub("Child text"));
}
private void initializeBasePathAttributes() {
@@ -61,7 +67,7 @@
public void testEncodeBeginBasePath() throws Exception {
initializeBasePathAttributes();
- replayAll();
+ environment.replay();
CommandLinkRenderer renderer = new CommandLinkRenderer();
renderer.encodeBegin(facesContext, component);
@@ -73,7 +79,7 @@
responseWriter.writeText(eq("Child text"),
EasyMock.<String>isNull());
- replayAll();
+ environment.replay();
CommandLinkRenderer renderer = new CommandLinkRenderer();
renderer.encodeChildren(facesContext, component);
@@ -103,7 +109,7 @@
responseWriter.endElement(eq("a"));
- replayAll();
+ environment.replay();
CommandLinkRenderer renderer = new CommandLinkRenderer();
renderer.encodeEnd(facesContext, component);
@@ -111,7 +117,7 @@
@Test
public void testEncodeBeginShortPath() throws Exception {
- replayAll();
+ environment.replay();
CommandLinkRenderer renderer = new CommandLinkRenderer();
renderer.encodeBegin(facesContext, component);
@@ -121,7 +127,7 @@
public void testEncodeChildrenShortPath() throws Exception {
responseWriter.writeText(eq("Child text"),
EasyMock.<String>isNull());
- replayAll();
+ environment.replay();
CommandLinkRenderer renderer = new CommandLinkRenderer();
renderer.encodeChildren(facesContext, component);
@@ -137,7 +143,7 @@
responseWriter.writeText(eq("value: ; differentValue: ; anotherValue:
;"), EasyMock.<String>isNull());
responseWriter.endElement(eq("a"));
- replayAll();
+ environment.replay();
CommandLinkRenderer renderer = new CommandLinkRenderer();
renderer.encodeEnd(facesContext, component);
Modified:
root/framework/trunk/commons/src/test/java/org/richfaces/renderkit/RenderKitUtilsTest.java
===================================================================
---
root/framework/trunk/commons/src/test/java/org/richfaces/renderkit/RenderKitUtilsTest.java 2010-02-24
19:36:02 UTC (rev 16490)
+++
root/framework/trunk/commons/src/test/java/org/richfaces/renderkit/RenderKitUtilsTest.java 2010-02-24
23:29:56 UTC (rev 16491)
@@ -90,7 +90,7 @@
facesContext = facesEnvironment.getFacesContext();
externalContext = facesEnvironment.getExternalContext();
- responseWriter = FacesMock.createMock(ResponseWriter.class);
+ responseWriter = facesEnvironment.createMock(ResponseWriter.class);
expect(facesContext.getResponseWriter()).andStubReturn(responseWriter);
expect(responseWriter.getContentType()).andStubReturn("application/xhtml+xml");
@@ -112,28 +112,8 @@
this.createdMocks = null;
}
- private void replay(Object... objects) {
- FacesMock.replay(facesEnvironment, responseWriter);
- for (Object object : createdMocks) {
- FacesMock.replay(object);
- }
- for (Object object : objects) {
- FacesMock.replay(object);
- }
- }
-
- private void verify(Object... objects) {
- FacesMock.verify(facesEnvironment, responseWriter);
- for (Object object : createdMocks) {
- FacesMock.verify(object);
- }
- for (Object object : objects) {
- FacesMock.verify(object);
- }
- }
-
private UIComponent createMockComponent() {
- UIComponent component = FacesMock.createMock(UIComponent.class);
+ UIComponent component = facesEnvironment.createMock(UIComponent.class);
expect(component.getAttributes()).andStubReturn(componentAttributes);
expect(component.getClientId(same(facesContext))).andStubReturn(CLIENT_ID);
createdMocks.add(component);
@@ -141,7 +121,7 @@
}
private ClientBehaviorHolder createMockClientBehaviorHolder() {
- UIComponent component = FacesMock.createMock(MockClientBehaviorHolder.class);
+ UIComponent component =
facesEnvironment.createMock(MockClientBehaviorHolder.class);
expect(component.getClientId(same(facesContext))).andStubReturn(CLIENT_ID);
expect(component.getAttributes()).andStubReturn(componentAttributes);
ClientBehaviorHolder behaviorHolder = (ClientBehaviorHolder) component;
@@ -253,15 +233,15 @@
responseWriter.writeAttribute(eq("xml:lang"), eq("ru"),
EasyMock.<String>isNull());
responseWriter.writeAttribute(eq("class"),
eq("rich-component"), EasyMock.<String>isNull());
- replay();
+ facesEnvironment.replay();
RenderKitUtils.renderPassThroughAttributes(facesContext, component,
knownAttributes);
- verify();
+ facesEnvironment.verify();
}
private ClientBehavior createClientBehavior(String handlerData,
Set<ClientBehaviorHint> hints) {
- ClientBehavior behavior = FacesMock.createMock(ClientBehavior.class);
+ ClientBehavior behavior = facesEnvironment.createMock(ClientBehavior.class);
expect(behavior.getScript(EasyMock.<ClientBehaviorContext>
notNull())).andStubReturn(
MessageFormat.format("prompt({0})", handlerData));
@@ -308,11 +288,11 @@
responseWriter.writeAttribute(eq("onmousemove"),
eq("alert(mousemove)"), EasyMock.<String>isNull());
responseWriter.writeAttribute(eq("oncontextmenu"),
eq("prompt(contextmenu)"), EasyMock.<String>isNull());
- replay();
+ facesEnvironment.replay();
RenderKitUtils.renderPassThroughAttributes(facesContext, component,
knownAttributes);
- verify();
+ facesEnvironment.verify();
}
private UIComponent setupBehaviorsTestForDisabledComponent() throws IOException {
@@ -343,11 +323,11 @@
responseWriter.writeAttribute(eq("style"), eq("color:green"),
EasyMock.<String>isNull());
- replay();
+ facesEnvironment.replay();
RenderKitUtils.renderPassThroughAttributes(facesContext, component,
knownAttributes);
- verify();
+ facesEnvironment.verify();
}
@Test
@@ -361,20 +341,20 @@
eq("alert(mousemove)"), EasyMock.<String>isNull());
responseWriter.writeAttribute(eq("style"), eq("color:green"),
EasyMock.<String>isNull());
- replay();
+ facesEnvironment.replay();
RenderKitUtils.renderPassThroughAttributes(facesContext, component,
knownAttributes);
- verify();
+ facesEnvironment.verify();
}
public void checkDisabled(Object attributeValue, boolean expectedValue) throws
Exception {
componentAttributes.put("disabled", attributeValue);
UIComponent component = createMockComponent();
- replay();
+ facesEnvironment.replay();
assertTrue(expectedValue == RenderKitUtils.isDisabled(component));
- verify();
+ facesEnvironment.verify();
}
@Test
@@ -431,11 +411,11 @@
expectLastCall();
}
- replay();
+ facesEnvironment.replay();
RenderKitUtils.decodeBehaviors(facesContext, component);
- verify();
+ facesEnvironment.verify();
}
@Test
@@ -448,11 +428,11 @@
expectLastCall();
}
- replay();
+ facesEnvironment.replay();
RenderKitUtils.decodeBehaviors(facesContext, component);
- verify();
+ facesEnvironment.verify();
}
@Test
@@ -461,11 +441,11 @@
//nothing should be called - clientId is not matched
- replay();
+ facesEnvironment.replay();
RenderKitUtils.decodeBehaviors(facesContext, component);
- verify();
+ facesEnvironment.verify();
}
@Test
@@ -474,11 +454,11 @@
//nothing should be called - no behavior event information was submitted
- replay();
+ facesEnvironment.replay();
RenderKitUtils.decodeBehaviors(facesContext, component);
- verify();
+ facesEnvironment.verify();
}
@Test
@@ -487,10 +467,10 @@
//nothing should be called - no context menu behaviors were created
- replay();
+ facesEnvironment.replay();
RenderKitUtils.decodeBehaviors(facesContext, component);
- verify();
+ facesEnvironment.verify();
}
}
\ No newline at end of file