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/06/27 20:21:40 UTC
svn commit: r417545 [12/12] - in /tapestry/tapestry4/trunk: ./
examples/TimeTracker/src/context/ framework/
framework/src/java/org/apache/tapestry/form/validator/
framework/src/java/org/apache/tapestry/json/
framework/src/java/org/apache/tapestry/valid...
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/ServletWebSessionTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/ServletWebSessionTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/ServletWebSessionTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/ServletWebSessionTest.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,10 @@
package org.apache.tapestry.web;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import java.util.List;
import javax.servlet.http.HttpSession;
@@ -30,10 +34,9 @@
{
HttpSession session = newSession();
- session.getAttributeNames();
- setReturnValue(session, newEnumeration());
+ expect(session.getAttributeNames()).andReturn(newEnumeration());
- replayControls();
+ replay();
WebSession ws = new ServletWebSession(session);
@@ -41,7 +44,7 @@
checkList(l);
- verifyControls();
+ verify();
}
private HttpSession newSession()
@@ -55,16 +58,15 @@
HttpSession session = newSession();
- session.getAttribute("attr");
- setReturnValue(session, attribute);
+ expect(session.getAttribute("attr")).andReturn(attribute);
- replayControls();
+ replay();
WebSession ws = new ServletWebSession(session);
assertSame(attribute, ws.getAttribute("attr"));
- verifyControls();
+ verify();
}
public void testSetAttribute()
@@ -75,13 +77,13 @@
session.setAttribute("name", attribute);
- replayControls();
+ replay();
WebSession ws = new ServletWebSession(session);
ws.setAttribute("name", attribute);
- verifyControls();
+ verify();
}
public void testSetAttributeToNull()
@@ -90,29 +92,28 @@
session.removeAttribute("tonull");
- replayControls();
+ replay();
WebSession ws = new ServletWebSession(session);
ws.setAttribute("tonull", null);
- verifyControls();
+ verify();
}
public void testGetId()
{
HttpSession session = newSession();
- session.getId();
- setReturnValue(session, "abc");
+ expect(session.getId()).andReturn("abc");
- replayControls();
+ replay();
WebSession ws = new ServletWebSession(session);
assertEquals("abc", ws.getId());
- verifyControls();
+ verify();
}
public void testInvalidate()
@@ -121,12 +122,12 @@
session.invalidate();
- replayControls();
+ replay();
WebSession ws = new ServletWebSession(session);
ws.invalidate();
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/TestServletWebContext.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/TestServletWebContext.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/TestServletWebContext.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/TestServletWebContext.java Tue Jun 27 11:21:31 2006
@@ -14,16 +14,16 @@
package org.apache.tapestry.web;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertNull;
+import static org.testng.AssertJUnit.assertSame;
+
import java.net.MalformedURLException;
import java.net.URL;
import java.util.List;
import javax.servlet.ServletContext;
-import org.apache.tapestry.web.ServletWebContext;
-import org.apache.tapestry.web.WebContext;
-import org.easymock.MockControl;
-
/**
* Tests for {@link org.apache.tapestry.web.ServletWebContext}.
*
@@ -35,13 +35,11 @@
public void testGetInitParameterNames()
{
- MockControl control = newControl(ServletContext.class);
- ServletContext context = (ServletContext) control.getMock();
+ ServletContext context = newMock(ServletContext.class);
- context.getInitParameterNames();
- control.setReturnValue(newEnumeration());
+ expect(context.getInitParameterNames()).andReturn(newEnumeration());
- replayControls();
+ replay();
WebContext wc = new ServletWebContext(context);
@@ -49,37 +47,33 @@
checkList(l);
- verifyControls();
+ verify();
}
public void testGetInitParameterValue()
{
String value = "William Orbit";
- MockControl control = newControl(ServletContext.class);
- ServletContext context = (ServletContext) control.getMock();
+ ServletContext context = newMock(ServletContext.class);
- context.getInitParameter("artist");
- control.setReturnValue(value);
+ expect(context.getInitParameter("artist")).andReturn(value);
- replayControls();
+ replay();
WebContext wc = new ServletWebContext(context);
assertSame(value, wc.getInitParameterValue("artist"));
- verifyControls();
+ verify();
}
public void testGetAttributeNames()
{
- MockControl control = newControl(ServletContext.class);
- ServletContext context = (ServletContext) control.getMock();
+ ServletContext context = newMock(ServletContext.class);
- context.getAttributeNames();
- control.setReturnValue(newEnumeration());
+ expect(context.getAttributeNames()).andReturn(newEnumeration());
- replayControls();
+ replay();
WebContext wc = new ServletWebContext(context);
@@ -87,101 +81,93 @@
checkList(l);
- verifyControls();
+ verify();
}
public void testGetAttribute()
{
Object attribute = new Object();
- MockControl control = newControl(ServletContext.class);
- ServletContext context = (ServletContext) control.getMock();
+ ServletContext context = newMock(ServletContext.class);
- context.getAttribute("attr");
- control.setReturnValue(attribute);
+ expect(context.getAttribute("attr")).andReturn(attribute);
- replayControls();
+ replay();
WebContext wc = new ServletWebContext(context);
assertSame(attribute, wc.getAttribute("attr"));
- verifyControls();
+ verify();
}
public void testSetAttribute()
{
Object attribute = new Object();
- MockControl control = newControl(ServletContext.class);
- ServletContext context = (ServletContext) control.getMock();
+ ServletContext context = newMock(ServletContext.class);
context.setAttribute("name", attribute);
- replayControls();
+ replay();
WebContext wc = new ServletWebContext(context);
wc.setAttribute("name", attribute);
- verifyControls();
+ verify();
}
public void testSetAttributeToNull()
{
- MockControl control = newControl(ServletContext.class);
- ServletContext context = (ServletContext) control.getMock();
+ ServletContext context = newMock(ServletContext.class);
context.removeAttribute("tonull");
- replayControls();
+ replay();
WebContext wc = new ServletWebContext(context);
wc.setAttribute("tonull", null);
- verifyControls();
+ verify();
}
public void testGetResource() throws Exception
{
URL url = new URL("http://jakarta.apache.org/tapestry");
- MockControl control = newControl(ServletContext.class);
- ServletContext context = (ServletContext) control.getMock();
+ ServletContext context = newMock(ServletContext.class);
- context.getResource("/tapestry");
- control.setReturnValue(url);
+ expect(context.getResource("/tapestry")).andReturn(url);
- replayControls();
+ replay();
WebContext wc = new ServletWebContext(context);
assertSame(url, wc.getResource("/tapestry"));
- verifyControls();
+ verify();
}
public void testGetResourceFailure() throws Exception
{
Throwable t = new MalformedURLException("Like this ever happens.");
- MockControl control = newControl(ServletContext.class);
- ServletContext context = (ServletContext) control.getMock();
+ ServletContext context = newMock(ServletContext.class);
- context.getResource("/tapestry");
- control.setThrowable(t);
+ expect(context.getResource("/tapestry")).andThrow(t);
- replayControls();
+ replay();
- interceptLogging(ServletWebContext.class.getName());
+ // interceptLogging(ServletWebContext.class.getName());
WebContext wc = new ServletWebContext(context);
assertNull(wc.getResource("/tapestry"));
- verifyControls();
-
- assertLoggedMessage("Error getting context resource '/tapestry': Like this ever happens.");
+ verify();
+
+ // assertLoggedMessage("Error getting context resource '/tapestry': Like this ever happens.");
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/TestServletWebRequest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/TestServletWebRequest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/TestServletWebRequest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/TestServletWebRequest.java Tue Jun 27 11:21:31 2006
@@ -16,6 +16,9 @@
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
+import static org.testng.AssertJUnit.assertSame;
import java.io.IOException;
import java.util.List;
@@ -36,7 +39,7 @@
*/
public class TestServletWebRequest extends BaseWebTestCase
{
- private HttpServletRequest newRequest()
+ private HttpServletRequest newHttpRequest()
{
return (HttpServletRequest) newMock(HttpServletRequest.class);
}
@@ -53,12 +56,12 @@
public void testGetParameterNames()
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
HttpServletResponse response = newResponse();
expect(request.getParameterNames()).andReturn(newEnumeration());
- replayControls();
+ replay();
WebRequest wr = new ServletWebRequest(request, response);
@@ -66,30 +69,30 @@
checkList(l);
- verifyControls();
+ verify();
}
public void testGetParameterValue()
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
HttpServletResponse response = newResponse();
String value = "William Orbit";
expect(request.getParameter("artist")).andReturn(value);
- replayControls();
+ replay();
WebRequest wr = new ServletWebRequest(request, response);
assertSame(value, wr.getParameterValue("artist"));
- verifyControls();
+ verify();
}
public void testGetParameterValues()
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
HttpServletResponse response = newResponse();
String[] values =
@@ -97,39 +100,39 @@
expect(request.getParameterValues("artist")).andReturn(values);
- replayControls();
+ replay();
WebRequest wr = new ServletWebRequest(request, response);
assertSame(values, wr.getParameterValues("artist"));
- verifyControls();
+ verify();
}
public void testGetContextPath()
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
HttpServletResponse response = newResponse();
expect(request.getContextPath()).andReturn("/foo");
- replayControls();
+ replay();
WebRequest wr = new ServletWebRequest(request, response);
assertEquals("/foo", wr.getContextPath());
- verifyControls();
+ verify();
}
public void testGetAttributeNames()
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
HttpServletResponse response = newResponse();
expect(request.getAttributeNames()).andReturn(newEnumeration());
- replayControls();
+ replay();
WebRequest wr = new ServletWebRequest(request, response);
@@ -137,64 +140,64 @@
checkList(l);
- verifyControls();
+ verify();
}
public void testGetAttribute()
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
HttpServletResponse response = newResponse();
Object attribute = new Object();
expect(request.getAttribute("attr")).andReturn(attribute);
- replayControls();
+ replay();
WebRequest wr = new ServletWebRequest(request, response);
assertSame(attribute, wr.getAttribute("attr"));
- verifyControls();
+ verify();
}
public void testSetAttribute()
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
HttpServletResponse response = newResponse();
Object attribute = new Object();
request.setAttribute("name", attribute);
- replayControls();
+ replay();
WebRequest wr = new ServletWebRequest(request, response);
wr.setAttribute("name", attribute);
- verifyControls();
+ verify();
}
public void testSetAttributeToNull()
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
HttpServletResponse response = newResponse();
request.removeAttribute("tonull");
- replayControls();
+ replay();
WebRequest wr = new ServletWebRequest(request, response);
wr.setAttribute("tonull", null);
- verifyControls();
+ verify();
}
public void testGetSession()
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
HttpServletResponse response = newResponse();
HttpSession session = newSession();
@@ -202,32 +205,32 @@
// Get it, doesn't exist, wreate false
- replayControls();
+ replay();
WebRequest wr = new ServletWebRequest(request, response);
assertNull(wr.getSession(false));
- verifyControls();
+ verify();
trainGetSession(request, true, session);
// #2: Get it, wreate is true, it is wreated.
- replayControls();
+ replay();
WebSession cs = wr.getSession(true);
- verifyControls();
+ verify();
// #3: Cached in local variable, make sure same
// think returned.
- replayControls();
+ replay();
assertSame(cs, wr.getSession(false));
- verifyControls();
+ verify();
}
private void trainGetSession(HttpServletRequest request, boolean create, HttpSession session)
@@ -242,71 +245,71 @@
public void testGetScheme()
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
HttpServletResponse response = newResponse();
expect(request.getScheme()).andReturn("http");
- replayControls();
+ replay();
WebRequest wr = new ServletWebRequest(request, response);
assertEquals("http", wr.getScheme());
- verifyControls();
+ verify();
}
public void testGetServerName()
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
HttpServletResponse response = newResponse();
expect(request.getServerName()).andReturn("www.myhost.com");
- replayControls();
+ replay();
WebRequest wr = new ServletWebRequest(request, response);
assertEquals("www.myhost.com", wr.getServerName());
- verifyControls();
+ verify();
}
public void testGetServerPort()
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
HttpServletResponse response = newResponse();
expect(request.getServerPort()).andReturn(80);
- replayControls();
+ replay();
WebRequest wr = new ServletWebRequest(request, response);
assertEquals(80, wr.getServerPort());
- verifyControls();
+ verify();
}
public void testGetRequestURI()
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
HttpServletResponse response = newResponse();
expect(request.getRequestURI()).andReturn("/foo/bar");
- replayControls();
+ replay();
WebRequest wr = new ServletWebRequest(request, response);
assertEquals("/foo/bar", wr.getRequestURI());
- verifyControls();
+ verify();
}
public void testForwardInternal() throws Exception
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
HttpServletResponse response = newResponse();
RequestDispatcher dispatcher = newDispatcher();
@@ -314,18 +317,18 @@
dispatcher.forward(request, response);
- replayControls();
+ replay();
WebRequest wr = new ServletWebRequest(request, response);
wr.forward("local.html");
- verifyControls();
+ verify();
}
public void testForwardNull() throws Exception
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
HttpServletResponse response = newResponse();
RequestDispatcher dispatcher = newDispatcher();
@@ -333,13 +336,13 @@
dispatcher.forward(request, response);
- replayControls();
+ replay();
WebRequest wr = new ServletWebRequest(request, response);
wr.forward(null);
- verifyControls();
+ verify();
}
private void trainGetRequestDispatcher(HttpServletRequest request, String path,
@@ -350,12 +353,12 @@
public void testForwardInternalNoDispatcher() throws Exception
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
HttpServletResponse response = newResponse();
trainGetRequestDispatcher(request, "/local.html", null);
- replayControls();
+ replay();
WebRequest wr = new ServletWebRequest(request, response);
@@ -371,12 +374,12 @@
ex.getMessage());
}
- verifyControls();
+ verify();
}
public void testForwardInternalFailure() throws Exception
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
HttpServletResponse response = newResponse();
RequestDispatcher dispatcher = newDispatcher();
@@ -387,7 +390,7 @@
dispatcher.forward(request, response);
expectLastCall().andThrow(t1);
- replayControls();
+ replay();
WebRequest wr = new ServletWebRequest(request, response);
@@ -404,7 +407,7 @@
assertSame(t1, ex.getRootCause());
}
- verifyControls();
+ verify();
Throwable t2 = new IOException("Mock IO Exception");
@@ -413,7 +416,7 @@
dispatcher.forward(request, response);
expectLastCall().andThrow(t2);
- replayControls();
+ replay();
try
{
@@ -428,30 +431,30 @@
assertSame(t2, ex.getRootCause());
}
- verifyControls();
+ verify();
}
public void testForwardExternal() throws Exception
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
HttpServletResponse response = newResponse();
expect(response.encodeRedirectURL("http://foo.bar")).andReturn("<encoded: http://foo.bar>");
response.sendRedirect("<encoded: http://foo.bar>");
- replayControls();
+ replay();
WebRequest wr = new ServletWebRequest(request, response);
wr.forward("http://foo.bar");
- verifyControls();
+ verify();
}
public void testForwardExternalFailure() throws Exception
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
HttpServletResponse response = (HttpServletResponse)newMock(HttpServletResponse.class);
Throwable t = new IOException("Mock IO Exception");
@@ -461,7 +464,7 @@
response.sendRedirect("<encoded: http://foo.bar>");
expectLastCall().andThrow(t);
- replayControls();
+ replay();
WebRequest wr = new ServletWebRequest(request, response);
@@ -476,38 +479,38 @@
assertSame(t, ex.getRootCause());
}
- verifyControls();
+ verify();
}
public void testGetActivationPath()
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
HttpServletResponse response = newResponse();
expect(request.getServletPath()).andReturn("/foo");
- replayControls();
+ replay();
WebRequest wr = new ServletWebRequest(request, response);
assertEquals("/foo", wr.getActivationPath());
- verifyControls();
+ verify();
}
public void testGetPathInfo()
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
HttpServletResponse response = newResponse();
expect(request.getPathInfo()).andReturn("bar/baz");
- replayControls();
+ replay();
WebRequest wr = new ServletWebRequest(request, response);
assertEquals("bar/baz", wr.getPathInfo());
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/TestWebUtils.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/TestWebUtils.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/TestWebUtils.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/TestWebUtils.java Tue Jun 27 11:21:31 2006
@@ -20,7 +20,6 @@
import java.util.List;
import org.apache.hivemind.test.HiveMindTestCase;
-import org.apache.tapestry.web.WebUtils;
/**
* Tests for {@link org.apache.tapestry.web.WebUtils}.
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/WebContextResourceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/WebContextResourceTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/WebContextResourceTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/WebContextResourceTest.java Tue Jun 27 11:21:31 2006
@@ -14,11 +14,16 @@
package org.apache.tapestry.web;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
+import static org.testng.AssertJUnit.assertSame;
+
import java.net.URL;
import java.util.Locale;
import org.apache.hivemind.Resource;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
/**
* Tests for {@link org.apache.tapestry.web.WebContextResource}.
@@ -26,7 +31,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class WebContextResourceTest extends HiveMindTestCase
+public class WebContextResourceTest extends BaseComponentTestCase
{
private WebContext newContext()
{
@@ -37,7 +42,7 @@
{
WebContext context = newContext();
- replayControls();
+ replay();
Resource r = new WebContextResource(context, "/foo/bar/baz_en.html", Locale.ENGLISH);
@@ -49,7 +54,7 @@
assertEquals(Locale.ENGLISH, r.getLocale());
- verifyControls();
+ verify();
}
public void testLocalizationExists() throws Exception
@@ -58,7 +63,7 @@
trainGetResource(context, "/foo/bar/baz_en.html", new URL("http://foo.com"));
- replayControls();
+ replay();
Resource r1 = new WebContextResource(context, "/foo/bar/baz.html");
@@ -67,13 +72,12 @@
assertEquals("/foo/bar/baz_en.html", r2.getPath());
assertEquals(Locale.ENGLISH, r2.getLocale());
- verifyControls();
+ verify();
}
private void trainGetResource(WebContext context, String path, URL url)
{
- context.getResource(path);
- setReturnValue(context, url);
+ expect(context.getResource(path)).andReturn(url);
}
public void testLocalizationSame() throws Exception
@@ -83,7 +87,7 @@
trainGetResource(context, "/foo/bar/baz_en.html", null);
trainGetResource(context, "/foo/bar/baz.html", new URL("http://foo.com"));
- replayControls();
+ replay();
Resource r1 = new WebContextResource(context, "/foo/bar/baz.html");
@@ -91,7 +95,7 @@
assertSame(r2, r1);
- verifyControls();
+ verify();
}
public void testLocalizationMissing() throws Exception
@@ -101,27 +105,27 @@
trainGetResource(context, "/foo/bar/baz_en.html", null);
trainGetResource(context, "/foo/bar/baz.html", null);
- replayControls();
+ replay();
Resource r1 = new WebContextResource(context, "/foo/bar/baz.html");
assertNull(r1.getLocalization(Locale.ENGLISH));
- verifyControls();
+ verify();
}
public void testGetRelativeResource()
{
WebContext context = newContext();
- replayControls();
+ replay();
Resource r1 = new WebContextResource(context, "/foo/bar/baz.html");
Resource r2 = r1.getRelativeResource("baz.gif");
assertEquals("/foo/bar/baz.gif", r2.getPath());
- verifyControls();
+ verify();
}
public void testGetExtensionlessResource() throws Exception
@@ -130,7 +134,7 @@
trainGetResource(context, "/foo/bar/baz_en", new URL("http://foo.com"));
- replayControls();
+ replay();
Resource r1 = new WebContextResource(context, "/foo/bar/baz");
@@ -139,6 +143,6 @@
assertEquals("/foo/bar/baz_en", r2.getPath());
assertEquals(Locale.ENGLISH, r2.getLocale());
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/pom.xml?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/pom.xml (original)
+++ tapestry/tapestry4/trunk/pom.xml Tue Jun 27 11:21:31 2006
@@ -172,6 +172,12 @@
<artifactId>commons-lang</artifactId>
<version>2.1</version>
</dependency>
+ <dependency>
+ <groupId>com.javaforge.tapestry</groupId>
+ <artifactId>tapestry-testng</artifactId>
+ <version>0.0.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
<build>
@@ -228,6 +234,10 @@
<repository>
<id>apache.snapshots</id>
<url>http://cvs.apache.org/maven-snapshot-repository</url>
+ </repository>
+ <repository>
+ <id>tapestry.javaforge</id>
+ <url>http://howardlewisship.com/repository</url>
</repository>
</repositories>
</project>