You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2006/07/15 20:19:12 UTC
svn commit: r422275 [2/2] - in /tapestry/tapestry4/trunk/tapestry-portlet:
./ src/test/org/apache/tapestry/portlet/
Modified: tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestPortletWebResponse.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestPortletWebResponse.java?rev=422275&r1=422274&r2=422275&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestPortletWebResponse.java (original)
+++ tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestPortletWebResponse.java Sat Jul 15 11:19:11 2006
@@ -14,10 +14,13 @@
package org.apache.tapestry.portlet;
-import javax.portlet.PortletResponse;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
import org.apache.tapestry.util.ContentType;
-import org.easymock.MockControl;
+import org.testng.annotations.Test;
+
+import javax.portlet.PortletResponse;
/**
* Tests for {@link org.apache.tapestry.portlet.PortletWebResponse}.
@@ -25,18 +28,19 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestPortletWebResponse extends BasePortletWebTestCase
{
private PortletResponse newResponse()
{
- return (PortletResponse) newMock(PortletResponse.class);
+ return newMock(PortletResponse.class);
}
public void testGetOutputStreamUnsupported() throws Exception
{
PortletResponse response = newResponse();
- replayControls();
+ replay();
PortletWebResponse pwr = new PortletWebResponse(response);
@@ -50,27 +54,27 @@
// Expected.
}
- verifyControls();
+ verify();
}
public void testGetNamespace() throws Exception
{
PortletResponse response = newResponse();
- replayControls();
+ replay();
PortletWebResponse pwr = new PortletWebResponse(response);
assertEquals("", pwr.getNamespace());
- verifyControls();
+ verify();
}
public void testResetUnsupported()
{
PortletResponse response = newResponse();
- replayControls();
+ replay();
PortletWebResponse pwr = new PortletWebResponse(response);
@@ -84,14 +88,14 @@
// Expected.
}
- verifyControls();
+ verify();
}
public void testSetDateHeaderUnsupported()
{
PortletResponse response = newResponse();
- replayControls();
+ replay();
PortletWebResponse pwr = new PortletWebResponse(response);
@@ -105,14 +109,14 @@
// Expected.
}
- verifyControls();
+ verify();
}
public void testSetHeaderUnsupported()
{
PortletResponse response = newResponse();
- replayControls();
+ replay();
PortletWebResponse pwr = new PortletWebResponse(response);
@@ -126,14 +130,14 @@
// Expected.
}
- verifyControls();
+ verify();
}
public void testSetIntHeaderUnsupported()
{
PortletResponse response = newResponse();
- replayControls();
+ replay();
PortletWebResponse pwr = new PortletWebResponse(response);
@@ -147,14 +151,14 @@
// Expected.
}
- verifyControls();
+ verify();
}
public void testSendErrorUnsupported() throws Exception
{
PortletResponse response = newResponse();
- replayControls();
+ replay();
PortletWebResponse pwr = new PortletWebResponse(response);
@@ -168,23 +172,21 @@
// Expected.
}
- verifyControls();
+ verify();
}
public void testEncodeURL()
{
- MockControl control = newControl(PortletResponse.class);
- PortletResponse response = (PortletResponse) control.getMock();
-
- response.encodeURL("/foo");
- control.setReturnValue("/foo;encoded");
-
- replayControls();
-
+ PortletResponse response = newMock(PortletResponse.class);
+
+ expect(response.encodeURL("/foo")).andReturn("/foo;encoded");
+
+ replay();
+
PortletWebResponse pwr = new PortletWebResponse(response);
-
+
assertEquals("/foo;encoded", pwr.encodeURL("/foo"));
- verifyControls();
+ verify();
}
-}
\ No newline at end of file
+}
Modified: tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestRenderService.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestRenderService.java?rev=422275&r1=422274&r2=422275&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestRenderService.java (original)
+++ tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestRenderService.java Sat Jul 15 11:19:11 2006
@@ -14,14 +14,17 @@
package org.apache.tapestry.portlet;
-import javax.portlet.PortletMode;
-import javax.portlet.PortletRequest;
-import javax.portlet.WindowState;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.services.ServiceConstants;
-import org.easymock.MockControl;
+import org.testng.annotations.Test;
+
+import javax.portlet.PortletMode;
+import javax.portlet.PortletRequest;
+import javax.portlet.WindowState;
/**
* Test for {@link org.apache.tapestry.portlet.RenderService}.
@@ -29,7 +32,8 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestRenderService extends HiveMindTestCase
+@Test
+public class TestRenderService extends BaseComponentTestCase
{
public void testGetLinkUnsupported()
{
@@ -49,25 +53,22 @@
public void testNormal() throws Exception
{
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
+ IRequestCycle cycle = newCycle();
+ PortletRequest request = newMock(PortletRequest.class);
- MockControl requestc = newControl(PortletRequest.class);
- PortletRequest request = (PortletRequest) requestc.getMock();
+ PortletRenderer renderer = newMock(PortletRenderer.class);
+
+ trainGetParameter(cycle, PortletConstants.PORTLET_MODE, "view");
+ trainGetParameter(cycle, PortletConstants.WINDOW_STATE, "normal");
- PortletRenderer renderer = (PortletRenderer) newMock(PortletRenderer.class);
+ trainGetPortletMode(request, PortletMode.VIEW);
+ trainGetWindowState(request, WindowState.NORMAL);
- trainGetParameter(cyclec, cycle, PortletConstants.PORTLET_MODE, "view");
- trainGetParameter(cyclec, cycle, PortletConstants.WINDOW_STATE, "normal");
-
- trainGetPortletMode(requestc, request, PortletMode.VIEW);
- trainGetWindowState(requestc, request, WindowState.NORMAL);
-
- trainGetParameter(cyclec, cycle, ServiceConstants.PAGE, "Fred");
+ trainGetParameter(cycle, ServiceConstants.PAGE, "Fred");
renderer.renderPage(cycle, "Fred");
- replayControls();
+ replay();
RenderService rs = new RenderService();
rs.setPortletRenderer(renderer);
@@ -75,29 +76,26 @@
rs.service(cycle);
- verifyControls();
+ verify();
}
public void testPortletModeChanged() throws Exception
{
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- MockControl requestc = newControl(PortletRequest.class);
- PortletRequest request = (PortletRequest) requestc.getMock();
+ IRequestCycle cycle = newCycle();
+ PortletRequest request = newMock(PortletRequest.class);
- PortletRenderer renderer = (PortletRenderer) newMock(PortletRenderer.class);
+ PortletRenderer renderer = newMock(PortletRenderer.class);
+
+ trainGetParameter(cycle, PortletConstants.PORTLET_MODE, "view");
+ trainGetParameter(cycle, PortletConstants.WINDOW_STATE, "normal");
+ trainGetPortletMode(request, PortletMode.EDIT);
+
PortletPageResolver resolver = newResolver(cycle, "Barney");
-
- trainGetParameter(cyclec, cycle, PortletConstants.PORTLET_MODE, "view");
- trainGetParameter(cyclec, cycle, PortletConstants.WINDOW_STATE, "normal");
-
- trainGetPortletMode(requestc, request, PortletMode.EDIT);
-
+
renderer.renderPage(cycle, "Barney");
-
- replayControls();
+
+ replay();
RenderService rs = new RenderService();
rs.setPortletRenderer(renderer);
@@ -106,30 +104,27 @@
rs.service(cycle);
- verifyControls();
+ verify();
}
public void testWindowStateChanged() throws Exception
{
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- MockControl requestc = newControl(PortletRequest.class);
- PortletRequest request = (PortletRequest) requestc.getMock();
-
- PortletRenderer renderer = (PortletRenderer) newMock(PortletRenderer.class);
+ IRequestCycle cycle = newCycle();
+ PortletRequest request = newMock(PortletRequest.class);
+ PortletRenderer renderer = newMock(PortletRenderer.class);
+
+ trainGetParameter(cycle, PortletConstants.PORTLET_MODE, "view");
+ trainGetParameter(cycle, PortletConstants.WINDOW_STATE, "normal");
+
+ trainGetPortletMode(request, PortletMode.VIEW);
+ trainGetWindowState(request, WindowState.MAXIMIZED);
+
PortletPageResolver resolver = newResolver(cycle, "Wilma");
-
- trainGetParameter(cyclec, cycle, PortletConstants.PORTLET_MODE, "view");
- trainGetParameter(cyclec, cycle, PortletConstants.WINDOW_STATE, "normal");
-
- trainGetPortletMode(requestc, request, PortletMode.VIEW);
- trainGetWindowState(requestc, request, WindowState.MAXIMIZED);
-
+
renderer.renderPage(cycle, "Wilma");
-
- replayControls();
+
+ replay();
RenderService rs = new RenderService();
rs.setPortletRenderer(renderer);
@@ -138,36 +133,25 @@
rs.service(cycle);
- verifyControls();
+ verify();
}
private PortletPageResolver newResolver(IRequestCycle cycle, String pageName)
{
- MockControl control = newControl(PortletPageResolver.class);
- PortletPageResolver resolver = (PortletPageResolver) control.getMock();
-
- resolver.getPageNameForRequest(cycle);
- control.setReturnValue(pageName);
-
+ PortletPageResolver resolver = newMock(PortletPageResolver.class);
+
+ expect(resolver.getPageNameForRequest(cycle)).andReturn(pageName);
+
return resolver;
}
- private void trainGetWindowState(MockControl control, PortletRequest request, WindowState state)
- {
- request.getWindowState();
- control.setReturnValue(state);
- }
-
- private void trainGetPortletMode(MockControl control, PortletRequest request, PortletMode mode)
+ private void trainGetWindowState(PortletRequest request, WindowState state)
{
- request.getPortletMode();
- control.setReturnValue(mode);
+ expect(request.getWindowState()).andReturn(state);
}
- private void trainGetParameter(MockControl control, IRequestCycle cycle, String name,
- String value)
+ private void trainGetPortletMode(PortletRequest request, PortletMode mode)
{
- cycle.getParameter(name);
- control.setReturnValue(value);
+ expect(request.getPortletMode()).andReturn(mode);
}
}
Modified: tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestRenderWebResponse.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestRenderWebResponse.java?rev=422275&r1=422274&r2=422275&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestRenderWebResponse.java (original)
+++ tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestRenderWebResponse.java Sat Jul 15 11:19:11 2006
@@ -14,10 +14,13 @@
package org.apache.tapestry.portlet;
-import javax.portlet.RenderResponse;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
import org.apache.tapestry.util.ContentType;
-import org.easymock.MockControl;
+import org.testng.annotations.Test;
+
+import javax.portlet.RenderResponse;
/**
* Tests for {@link org.apache.tapestry.portlet.RenderWebResponse}.
@@ -25,11 +28,12 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestRenderWebResponse extends BasePortletWebTestCase
{
private RenderResponse newResponse()
{
- return (RenderResponse) newMock(RenderResponse.class);
+ return newMock(RenderResponse.class);
}
public void testReset()
@@ -38,20 +42,20 @@
response.reset();
- replayControls();
+ replay();
RenderWebResponse rwr = new RenderWebResponse(response);
rwr.reset();
- verifyControls();
+ verify();
}
public void testGetOutputStream() throws Exception
{
- MockControl control = newControl(RenderResponse.class);
- RenderResponse response = (RenderResponse) control.getMock();
- replayControls();
+ RenderResponse response = newMock(RenderResponse.class);
+
+ replay();
RenderWebResponse rwr = new RenderWebResponse(response);
@@ -65,23 +69,21 @@
// Expected.
}
- verifyControls();
+ verify();
}
public void testGetNamespace()
{
- MockControl control = newControl(RenderResponse.class);
- RenderResponse response = (RenderResponse) control.getMock();
-
- response.getNamespace();
- control.setReturnValue("_NAMESPACE_");
-
- replayControls();
+ RenderResponse response = newMock(RenderResponse.class);
+
+ expect(response.getNamespace()).andReturn("_NAMESPACE_");
+
+ replay();
RenderWebResponse rwr = new RenderWebResponse(response);
assertEquals("_NAMESPACE_", rwr.getNamespace());
- verifyControls();
+ verify();
}
-}
\ No newline at end of file
+}