You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2006/06/27 22:38:45 UTC
svn commit: r417583 [2/2] - in /tapestry/tapestry4/trunk: ./ framework/
framework/src/test/org/apache/tapestry/
framework/src/test/org/apache/tapestry/enhance/
framework/src/test/org/apache/tapestry/form/
framework/src/test/org/apache/tapestry/internal...
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/ComponentEventInvokerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/ComponentEventInvokerTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/ComponentEventInvokerTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/ComponentEventInvokerTest.java Tue Jun 27 13:38:40 2006
@@ -34,6 +34,7 @@
import org.apache.tapestry.internal.event.ComponentEventProperty;
import org.apache.tapestry.listener.ListenerInvoker;
import org.apache.tapestry.listener.ListenerMap;
+import org.testng.annotations.Test;
/**
@@ -41,6 +42,7 @@
*
* @author jkuhnert
*/
+@Test
public class ComponentEventInvokerTest extends BaseComponentTestCase
{
@@ -70,9 +72,9 @@
{
IRequestCycle cycle = newCycle();
IComponent comp = newComponent();
- ListenerInvoker listenerInvoker = (ListenerInvoker)newMock(ListenerInvoker.class);
- ListenerMap listenerMap = (ListenerMap)newMock(ListenerMap.class);
- IActionListener listener = (IActionListener)newMock(IActionListener.class);
+ ListenerInvoker listenerInvoker = newMock(ListenerInvoker.class);
+ ListenerMap listenerMap = newMock(ListenerMap.class);
+ IActionListener listener = newMock(IActionListener.class);
Map tprops = new HashMap();
tprops.put("id", "testId");
@@ -105,9 +107,9 @@
{
IRequestCycle cycle = newCycle();
IComponent comp = newComponent();
- ListenerInvoker listenerInvoker = (ListenerInvoker)newMock(ListenerInvoker.class);
- ListenerMap listenerMap = (ListenerMap)newMock(ListenerMap.class);
- IActionListener listener = (IActionListener)newMock(IActionListener.class);
+ ListenerInvoker listenerInvoker = newMock(ListenerInvoker.class);
+ ListenerMap listenerMap = newMock(ListenerMap.class);
+ IActionListener listener = newMock(IActionListener.class);
Map tprops = new HashMap();
tprops.put("id", "testId");
@@ -138,11 +140,11 @@
{
IRequestCycle cycle = newCycle();
IForm form = newForm();
- FormSupport formSupport = (FormSupport) newMock(FormSupport.class);
+ FormSupport formSupport = newMock(FormSupport.class);
- ListenerInvoker listenerInvoker = (ListenerInvoker)newMock(ListenerInvoker.class);
- ListenerMap listenerMap = (ListenerMap)newMock(ListenerMap.class);
- IActionListener listener = (IActionListener)newMock(IActionListener.class);
+ ListenerInvoker listenerInvoker = newMock(ListenerInvoker.class);
+ ListenerMap listenerMap = newMock(ListenerMap.class);
+ IActionListener listener = newMock(IActionListener.class);
Map tprops = new HashMap();
tprops.put("id", "testId");
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/CookieSourceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/CookieSourceTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/CookieSourceTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/CookieSourceTest.java Tue Jun 27 13:38:40 2006
@@ -25,6 +25,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.tapestry.BaseComponentTestCase;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.services.impl.CookieSourceImpl}.
@@ -32,6 +33,7 @@
* @author Howard Lewis Ship
* @since 4.0
*/
+@Test
public class CookieSourceTest extends BaseComponentTestCase
{
// In seconds
@@ -91,7 +93,7 @@
protected HttpServletRequest newHttpRequest()
{
- return (HttpServletRequest) newMock(HttpServletRequest.class);
+ return newMock(HttpServletRequest.class);
}
private void attempt(String name, String expected, String[] nameValues)
@@ -187,7 +189,7 @@
private HttpServletResponse newResponse()
{
- return (HttpServletResponse) newMock(HttpServletResponse.class);
+ return newMock(HttpServletResponse.class);
}
public void testRemoveCookie()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java Tue Jun 27 13:38:40 2006
@@ -31,6 +31,7 @@
import org.apache.tapestry.markup.UTFMarkupFilter;
import org.apache.tapestry.services.ResponseBuilder;
import org.testng.annotations.Configuration;
+import org.testng.annotations.Test;
/**
@@ -39,6 +40,7 @@
* @author jkuhnert
*/
@SuppressWarnings("cast")
+@Test
public class DefaultResponseBuilderTest extends BaseComponentTestCase
{
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java Tue Jun 27 13:38:40 2006
@@ -36,6 +36,7 @@
import org.apache.tapestry.markup.UTFMarkupFilter;
import org.apache.tapestry.services.ResponseBuilder;
import org.testng.annotations.Configuration;
+import org.testng.annotations.Test;
/**
@@ -44,6 +45,7 @@
* @author jkuhnert
*/
@SuppressWarnings("cast")
+@Test
public class DojoAjaxResponseBuilderTest extends BaseComponentTestCase
{
@@ -74,8 +76,8 @@
public void testNullRender()
{
- IRender render = (IRender)newMock(IRender.class);
- IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
+ IRender render = newMock(IRender.class);
+ IRequestCycle cycle = newMock(IRequestCycle.class);
ResponseBuilder builder = new DojoAjaxResponseBuilder(null, null);
@@ -92,9 +94,9 @@
public void testNormalRender()
{
- IRender render = (IRender)newMock(IRender.class);
- IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
- IMarkupWriter writer = (IMarkupWriter)newMock(IMarkupWriter.class);
+ IRender render = newMock(IRender.class);
+ IRequestCycle cycle = newMock(IRequestCycle.class);
+ IMarkupWriter writer = newMock(IMarkupWriter.class);
ResponseBuilder builder = new DojoAjaxResponseBuilder(writer, null);
@@ -122,12 +124,12 @@
public void testPartialRender()
{
- IRender render = (IRender)newMock(IRender.class);
+ IRender render = newMock(IRender.class);
- IComponent comp1 = (IComponent)newMock(IComponent.class);
- IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
- IMarkupWriter writer = (IMarkupWriter)newMock(IMarkupWriter.class);
- NestedMarkupWriter nested = (NestedMarkupWriter)newMock(NestedMarkupWriter.class);
+ IComponent comp1 = newMock(IComponent.class);
+ IRequestCycle cycle = newMock(IRequestCycle.class);
+ IMarkupWriter writer = newMock(IMarkupWriter.class);
+ NestedMarkupWriter nested = newMock(NestedMarkupWriter.class);
List parts = new ArrayList();
parts.add("id1");
@@ -162,7 +164,7 @@
public void testAllowedScripts()
{
- IComponent comp = (IComponent)newMock(IComponent.class);
+ IComponent comp = newMock(IComponent.class);
List parts = new ArrayList();
parts.add("comp1");
@@ -187,7 +189,7 @@
{
MarkupFilter filter = new UTFMarkupFilter();
PrintWriter writer = newPrintWriter();
- IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
+ IRequestCycle cycle = newMock(IRequestCycle.class);
replay();
@@ -235,7 +237,7 @@
{
MarkupFilter filter = new UTFMarkupFilter();
PrintWriter writer = newPrintWriter();
- IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
+ IRequestCycle cycle = newMock(IRequestCycle.class);
replay();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/EngineFactoryTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/EngineFactoryTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/EngineFactoryTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/EngineFactoryTest.java Tue Jun 27 13:38:40 2006
@@ -28,6 +28,7 @@
import org.apache.tapestry.engine.AbstractEngine;
import org.apache.tapestry.engine.BaseEngine;
import org.apache.tapestry.spec.IApplicationSpecification;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.services.impl.EngineFactoryImpl}.
@@ -35,6 +36,7 @@
* @author Howard Lewis Ship
* @since 4.0
*/
+@Test
public class EngineFactoryTest extends BaseComponentTestCase
{
public void testUseDefault()
@@ -70,7 +72,7 @@
private IApplicationSpecification newAppSpec()
{
- return (IApplicationSpecification) newMock(IApplicationSpecification.class);
+ return newMock(IApplicationSpecification.class);
}
public void testDefinedInSpec()
@@ -134,7 +136,7 @@
trainGetEngineClassName(spec, "foo.XyzzYx");
- ErrorLog log = (ErrorLog) newMock(ErrorLog.class);
+ ErrorLog log = newMock(ErrorLog.class);
log.error("Engine class 'foo.XyzzYx' not found.", null, null);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/EngineServiceInnerProxyTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/EngineServiceInnerProxyTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/EngineServiceInnerProxyTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/EngineServiceInnerProxyTest.java Tue Jun 27 13:38:40 2006
@@ -21,6 +21,7 @@
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.engine.IEngineService;
import org.apache.tapestry.engine.ILink;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.services.impl.EngineServiceInnerProxy}.
@@ -28,6 +29,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class EngineServiceInnerProxyTest extends AbstractEngineServiceProxyTestCase
{
private EngineServiceSource newSource(String name, IEngineService service)
@@ -56,7 +58,7 @@
protected EngineServiceSource newSource()
{
- return (EngineServiceSource) newMock(EngineServiceSource.class);
+ return newMock(EngineServiceSource.class);
}
public void testGetLinkNonPost()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/EngineServiceOuterProxyTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/EngineServiceOuterProxyTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/EngineServiceOuterProxyTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/EngineServiceOuterProxyTest.java Tue Jun 27 13:38:40 2006
@@ -20,6 +20,7 @@
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.engine.IEngineService;
import org.apache.tapestry.engine.ILink;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.services.impl.EngineServiceOuterProxy}.
@@ -27,6 +28,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class EngineServiceOuterProxyTest extends AbstractEngineServiceProxyTestCase
{
public void testToString()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/LinkFactoryTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/LinkFactoryTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/LinkFactoryTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/LinkFactoryTest.java Tue Jun 27 13:38:40 2006
@@ -40,6 +40,7 @@
import org.apache.tapestry.services.ServiceConstants;
import org.apache.tapestry.util.io.DataSqueezerUtil;
import org.apache.tapestry.web.WebRequest;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.services.impl.LinkFactoryImpl}.
@@ -47,6 +48,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class LinkFactoryTest extends BaseComponentTestCase
{
private ErrorLog newErrorLog()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestAbsoluteURLBuilder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestAbsoluteURLBuilder.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestAbsoluteURLBuilder.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestAbsoluteURLBuilder.java Tue Jun 27 13:38:40 2006
@@ -20,6 +20,7 @@
import org.apache.tapestry.junit.TapestryTestCase;
import org.apache.tapestry.services.AbsoluteURLBuilder;
import org.apache.tapestry.web.WebRequest;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.services.impl.AbsoluteURLBuilderImpl}.
@@ -27,6 +28,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestAbsoluteURLBuilder extends TapestryTestCase
{
private void attempt(String expected, String URI, String scheme, String server, int port)
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestApplicationSpecificationInitializer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestApplicationSpecificationInitializer.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestApplicationSpecificationInitializer.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestApplicationSpecificationInitializer.java Tue Jun 27 13:38:40 2006
@@ -38,6 +38,7 @@
import org.apache.tapestry.services.ApplicationInitializer;
import org.apache.tapestry.spec.ApplicationSpecification;
import org.apache.tapestry.spec.IApplicationSpecification;
+import org.testng.annotations.Test;
/**
* Tests for the {@link org.apache.tapestry.services.impl.ApplicationSpecificationInitializer}.
@@ -45,6 +46,7 @@
* @author Howard Lewis Ship
* @since 4.0
*/
+@Test
public class TestApplicationSpecificationInitializer extends BaseComponentTestCase
{
public void testOnClasspath() throws Exception
@@ -55,7 +57,7 @@
ApplicationSpecificationInitializer i = new ApplicationSpecificationInitializer();
- Log log = (Log) newMock(Log.class);
+ Log log = newMock(Log.class);
i.setLog(log);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestBaseTagWriter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestBaseTagWriter.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestBaseTagWriter.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestBaseTagWriter.java Tue Jun 27 13:38:40 2006
@@ -21,6 +21,7 @@
import org.apache.tapestry.INamespace;
import org.apache.tapestry.IPage;
import org.apache.tapestry.IRequestCycle;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.services.impl.BaseTagWriter}.
@@ -28,6 +29,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestBaseTagWriter extends BaseComponentTestCase
{
private IMarkupWriter newWriter(String url)
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestBasicInfrastructure.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestBasicInfrastructure.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestBasicInfrastructure.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestBasicInfrastructure.java Tue Jun 27 13:38:40 2006
@@ -33,6 +33,7 @@
import org.apache.tapestry.services.ClasspathResourceFactory;
import org.apache.tapestry.services.Infrastructure;
import org.apache.tapestry.services.ResetEventHub;
+import org.testng.annotations.Test;
/**
* Tests for:
@@ -46,14 +47,15 @@
* @author Howard Lewis Ship
* @since 4.0
*/
+@Test
public class TestBasicInfrastructure extends BaseComponentTestCase
{
public void testRequestGlobals()
{
RequestGlobalsImpl si = new RequestGlobalsImpl();
- HttpServletRequest r = (HttpServletRequest) newMock(HttpServletRequest.class);
- HttpServletResponse p = (HttpServletResponse) newMock(HttpServletResponse.class);
+ HttpServletRequest r = newMock(HttpServletRequest.class);
+ HttpServletResponse p = newMock(HttpServletResponse.class);
replay();
@@ -148,7 +150,7 @@
{
Infrastructure ifr = newMock(Infrastructure.class);
- ResetEventHub coord = (ResetEventHub) newMock(ResetEventHub.class);
+ ResetEventHub coord = newMock(ResetEventHub.class);
expect(ifr.getResetEventHub()).andReturn(coord);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestBindingSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestBindingSource.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestBindingSource.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestBindingSource.java Tue Jun 27 13:38:40 2006
@@ -25,6 +25,7 @@
import org.apache.tapestry.IComponent;
import org.apache.tapestry.binding.BindingConstants;
import org.apache.tapestry.binding.BindingFactory;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.services.impl.BindingSourceImpl}.
@@ -32,6 +33,7 @@
* @author Howard Lewis Ship
* @since 4.0
*/
+@Test
public class TestBindingSource extends BaseComponentTestCase
{
public void testNoPrefix()
@@ -171,6 +173,6 @@
protected BindingFactory newFactory()
{
- return (BindingFactory) newMock(BindingFactory.class);
+ return newMock(BindingFactory.class);
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestDeferredObjectTranslator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestDeferredObjectTranslator.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestDeferredObjectTranslator.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestDeferredObjectTranslator.java Tue Jun 27 13:38:40 2006
@@ -21,6 +21,7 @@
import org.apache.hivemind.internal.Module;
import org.apache.hivemind.schema.Translator;
import org.apache.tapestry.BaseComponentTestCase;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.services.impl.DeferredObjectImpl} and
@@ -29,11 +30,12 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestDeferredObjectTranslator extends BaseComponentTestCase
{
private Module newModule()
{
- return (Module) newMock(Module.class);
+ return newMock(Module.class);
}
private Translator newTranslator(Module module, String objectReference, Location location,
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestDisableCachingFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestDisableCachingFilter.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestDisableCachingFilter.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestDisableCachingFilter.java Tue Jun 27 13:38:40 2006
@@ -24,6 +24,7 @@
import org.apache.tapestry.services.WebRequestServicer;
import org.apache.tapestry.web.WebRequest;
import org.apache.tapestry.web.WebResponse;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.services.impl.DisableCachingFilter}.
@@ -31,21 +32,22 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestDisableCachingFilter extends BaseComponentTestCase
{
private WebResponse newResponse()
{
- return (WebResponse) newMock(WebResponse.class);
+ return newMock(WebResponse.class);
}
private WebRequestServicer newServicer()
{
- return (WebRequestServicer) newMock(WebRequestServicer.class);
+ return newMock(WebRequestServicer.class);
}
private ResetEventHub newREC()
{
- return (ResetEventHub) newMock(ResetEventHub.class);
+ return newMock(ResetEventHub.class);
}
public void testNormal() throws Exception
@@ -75,7 +77,7 @@
WebRequestServicer servicer = newServicer();
ResetEventHub rec = newMock(ResetEventHub.class);
- ErrorLog log = (ErrorLog) newMock(ErrorLog.class);
+ ErrorLog log = newMock(ErrorLog.class);
Location l = fabricateLocation(99);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestEngineManager.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestEngineManager.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestEngineManager.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestEngineManager.java Tue Jun 27 13:38:40 2006
@@ -24,6 +24,7 @@
import org.apache.tapestry.services.EngineFactory;
import org.apache.tapestry.services.ObjectPool;
import org.apache.tapestry.services.RequestLocaleManager;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.services.impl.EngineManagerImpl}.
@@ -31,6 +32,7 @@
* @author Howard Lewis Ship
* @since 4.0
*/
+@Test
public class TestEngineManager extends BaseComponentTestCase
{
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestEngineServiceObjectProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestEngineServiceObjectProvider.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestEngineServiceObjectProvider.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestEngineServiceObjectProvider.java Tue Jun 27 13:38:40 2006
@@ -20,12 +20,14 @@
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.engine.IEngineService;
import org.apache.tapestry.services.ServiceMap;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.services.impl.EngineServiceObjectProvider}.
*
* @author Howard M. Lewis Ship
*/
+@Test
public class TestEngineServiceObjectProvider extends BaseComponentTestCase
{
public void testProvideObject()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestExpressionCache.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestExpressionCache.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestExpressionCache.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestExpressionCache.java Tue Jun 27 13:38:40 2006
@@ -16,6 +16,7 @@
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.test.HiveMindTestCase;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.services.impl.ExpressionCacheImpl}.
@@ -23,6 +24,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestExpressionCache extends HiveMindTestCase
{
public void testValidExpression()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestExpressionEvaluator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestExpressionEvaluator.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestExpressionEvaluator.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestExpressionEvaluator.java Tue Jun 27 13:38:40 2006
@@ -33,12 +33,13 @@
import org.apache.tapestry.services.ExpressionCache;
import org.apache.tapestry.services.ExpressionEvaluator;
import org.apache.tapestry.spec.IApplicationSpecification;
-import org.easymock.AbstractMatcher;
+import org.testng.annotations.Test;
/**
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestExpressionEvaluator extends BaseComponentTestCase
{
private ExpressionEvaluatorImpl create()
@@ -50,24 +51,6 @@
result.setExpressionCache(cache);
return result;
- }
-
- private static class NullMeansIgnoreMatcher extends AbstractMatcher
- {
- public boolean matches(Object[] expected, Object[] actual)
- {
- for (int i = 0; i < expected.length; i++)
- {
- if (expected[i] == null)
- continue;
-
- if (!argumentMatches(expected[i], actual[i]))
- return false;
- }
-
- return true;
- }
-
}
public static class Fixture
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestExtensionLookupFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestExtensionLookupFactory.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestExtensionLookupFactory.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestExtensionLookupFactory.java Tue Jun 27 13:38:40 2006
@@ -26,6 +26,7 @@
import org.apache.hivemind.lib.DefaultImplementationBuilder;
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.spec.IApplicationSpecification;
+import org.testng.annotations.Test;
/**
* Tests {@link org.apache.tapestry.services.impl.ExtensionLookupFactory}.
@@ -33,6 +34,7 @@
* @author Howard Lewis Ship
* @since 4.0
*/
+@Test
public class TestExtensionLookupFactory extends BaseComponentTestCase
{
private List createParameters(String extensionName)
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestInfrastructure.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestInfrastructure.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestInfrastructure.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestInfrastructure.java Tue Jun 27 13:38:40 2006
@@ -25,6 +25,7 @@
import org.apache.hivemind.ErrorLog;
import org.apache.hivemind.Location;
import org.apache.tapestry.BaseComponentTestCase;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.services.impl.InfrastructureImpl}.
@@ -32,6 +33,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestInfrastructure extends BaseComponentTestCase
{
private static class DeferredObjectFixture implements DeferredObject
@@ -203,7 +205,7 @@
public void testDuplicate()
{
- ErrorLog log = (ErrorLog) newMock(ErrorLog.class);
+ ErrorLog log = newMock(ErrorLog.class);
Location l1 = fabricateLocation(99);
Location l2 = fabricateLocation(132);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestLocalizedPropertySource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestLocalizedPropertySource.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestLocalizedPropertySource.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestLocalizedPropertySource.java Tue Jun 27 13:38:40 2006
@@ -22,6 +22,7 @@
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.engine.IPropertySource;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.services.impl.LocalizedPropertySource}.
@@ -29,6 +30,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestLocalizedPropertySource extends BaseComponentTestCase
{
public void testFound()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestNamespaceResources.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestNamespaceResources.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestNamespaceResources.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestNamespaceResources.java Tue Jun 27 13:38:40 2006
@@ -28,6 +28,7 @@
import org.apache.tapestry.services.NamespaceResources;
import org.apache.tapestry.spec.IComponentSpecification;
import org.apache.tapestry.spec.ILibrarySpecification;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.services.impl.NamespaceResourcesImpl}.
@@ -35,11 +36,12 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestNamespaceResources extends BaseComponentTestCase
{
protected Resource newResource()
{
- return (Resource) newMock(Resource.class);
+ return newMock(Resource.class);
}
protected void trainGetRelativeResource(Resource parent, String path, Resource child)
@@ -54,17 +56,17 @@
protected ISpecificationSource newSource()
{
- return (ISpecificationSource) newMock(ISpecificationSource.class);
+ return newMock(ISpecificationSource.class);
}
protected ILibrarySpecification newLSpec()
{
- return (ILibrarySpecification) newMock(ILibrarySpecification.class);
+ return newMock(ILibrarySpecification.class);
}
protected AssetSource newAssetSource()
{
- return (AssetSource) newMock(AssetSource.class);
+ return newMock(AssetSource.class);
}
public void testFindChildLibrarySpecification()
@@ -102,7 +104,7 @@
protected IAsset newAsset()
{
- return (IAsset) newMock(IAsset.class);
+ return newMock(IAsset.class);
}
protected URL newURL()
@@ -118,7 +120,7 @@
protected IComponentSpecification newComponentSpec()
{
- return (IComponentSpecification) newMock(IComponentSpecification.class);
+ return newMock(IComponentSpecification.class);
}
public void testGetPageSpecification()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestObjectPool.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestObjectPool.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestObjectPool.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestObjectPool.java Tue Jun 27 13:38:40 2006
@@ -19,6 +19,7 @@
import org.apache.hivemind.test.HiveMindTestCase;
import org.apache.tapestry.services.ObjectPool;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.services.impl.ObjectPoolImpl}.
@@ -26,6 +27,7 @@
* @author Howard Lewis Ship
* @since 4.0
*/
+@Test
public class TestObjectPool extends HiveMindTestCase
{
public void testStoreAndGet()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestRequestLocaleManager.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestRequestLocaleManager.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestRequestLocaleManager.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestRequestLocaleManager.java Tue Jun 27 13:38:40 2006
@@ -25,6 +25,7 @@
import org.apache.tapestry.TapestryConstants;
import org.apache.tapestry.services.CookieSource;
import org.apache.tapestry.web.WebRequest;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.services.impl.RequestLocaleManagerImpl}.
@@ -32,11 +33,12 @@
* @author Howard Lewis Ship
* @since 4.0
*/
+@Test
public class TestRequestLocaleManager extends BaseComponentTestCase
{
private ThreadLocale newThreadLocale()
{
- return (ThreadLocale) newMock(ThreadLocale.class);
+ return newMock(ThreadLocale.class);
}
private ThreadLocale newThreadLocale(Locale locale)
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestServiceMap.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestServiceMap.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestServiceMap.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestServiceMap.java Tue Jun 27 13:38:40 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.services.impl;
-import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.*;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertSame;
@@ -28,6 +28,7 @@
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.engine.IEngineService;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.services.impl.ServiceMapImpl}.
@@ -35,12 +36,14 @@
* @author Howard Lewis Ship
* @since 4.0
*/
+@Test
public class TestServiceMap extends BaseComponentTestCase
{
private IEngineService newService(String name)
{
IEngineService service = newMock(IEngineService.class);
-
+ checkOrder(service, false);
+
expect(service.getName()).andReturn(name);
return service;
@@ -48,7 +51,7 @@
private IEngineService newService()
{
- return (IEngineService) newMock(IEngineService.class);
+ return newMock(IEngineService.class);
}
private EngineServiceContribution constructService(String name, IEngineService service)
@@ -224,17 +227,17 @@
EngineServiceContribution firstc = constructService("duplicate", first);
firstc.setLocation(l);
-
+
EngineServiceContribution secondc = constructService("duplicate", second);
-
+
List list = new ArrayList();
list.add(firstc);
list.add(secondc);
- ErrorLog log = (ErrorLog) newMock(ErrorLog.class);
+ ErrorLog log = newMock(ErrorLog.class);
first.service(cycle);
-
+
log.error(ImplMessages.dupeService("duplicate", firstc), l, null);
replay();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestSetupRequestEncoding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestSetupRequestEncoding.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestSetupRequestEncoding.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestSetupRequestEncoding.java Tue Jun 27 13:38:40 2006
@@ -27,6 +27,7 @@
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.services.ServletRequestServicer;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.services.impl.SetupRequestEncoding}.
@@ -34,6 +35,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestSetupRequestEncoding extends BaseComponentTestCase
{
private HttpServletRequest newRequest(String encoding)
@@ -47,12 +49,12 @@
private HttpServletResponse newResponse()
{
- return (HttpServletResponse) newMock(HttpServletResponse.class);
+ return newMock(HttpServletResponse.class);
}
private ServletRequestServicer newServicer()
{
- return (ServletRequestServicer) newMock(ServletRequestServicer.class);
+ return newMock(ServletRequestServicer.class);
}
public void testEncodingNotNull() throws Exception
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/WebContextInitializerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/WebContextInitializerTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/WebContextInitializerTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/WebContextInitializerTest.java Tue Jun 27 13:38:40 2006
@@ -23,6 +23,7 @@
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.services.ApplicationGlobals;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.services.impl.WebContextInitializer}.
@@ -30,13 +31,14 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class WebContextInitializerTest extends BaseComponentTestCase
{
public void testInitializer()
{
- HttpServlet servlet = (HttpServlet) newMock(HttpServlet.class);
- ServletContext servletContext = (ServletContext) newMock(ServletContext.class);
+ HttpServlet servlet = newMock(HttpServlet.class);
+ ServletContext servletContext = newMock(ServletContext.class);
expect(servlet.getServletContext()).andReturn(servletContext);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/spec/TestComponentSpecification.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/spec/TestComponentSpecification.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/spec/TestComponentSpecification.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/spec/TestComponentSpecification.java Tue Jun 27 13:38:40 2006
@@ -17,6 +17,7 @@
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
import org.apache.hivemind.test.HiveMindTestCase;
+import org.testng.annotations.Test;
/**
* Tests a number of <em>failure</em> cases in
@@ -27,6 +28,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestComponentSpecification extends HiveMindTestCase
{
public void testClaimPropertyOK()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/test/TestCreator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/test/TestCreator.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/test/TestCreator.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/test/TestCreator.java Tue Jun 27 13:38:40 2006
@@ -25,6 +25,7 @@
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.spec.IComponentSpecification;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.test.Creator}.
@@ -32,6 +33,7 @@
* @author Howard Lewis Ship
* @since 4.0
*/
+@Test
public class TestCreator extends BaseComponentTestCase
{
@@ -136,7 +138,7 @@
public void testSpecificationProperty()
{
- IComponentSpecification spec = (IComponentSpecification) newMock(IComponentSpecification.class);
+ IComponentSpecification spec = newMock(IComponentSpecification.class);
replay();
@@ -152,7 +154,7 @@
public void testMessagesProperty()
{
- Messages messages = (Messages) newMock(Messages.class);
+ Messages messages = newMock(Messages.class);
replay();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/DefaultPrimaryKeyConverterTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/DefaultPrimaryKeyConverterTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/DefaultPrimaryKeyConverterTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/DefaultPrimaryKeyConverterTest.java Tue Jun 27 13:38:40 2006
@@ -18,6 +18,7 @@
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.test.HiveMindTestCase;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.util.DefaultPrimaryKeyConverter}.
@@ -25,6 +26,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class DefaultPrimaryKeyConverterTest extends HiveMindTestCase
{
/**
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/ScriptUtilsTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/ScriptUtilsTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/ScriptUtilsTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/ScriptUtilsTest.java Tue Jun 27 13:38:40 2006
@@ -16,6 +16,7 @@
import org.apache.hivemind.test.HiveMindTestCase;
import org.apache.oro.text.perl.Perl5Util;
import org.apache.oro.text.regex.MatchResult;
+import org.testng.annotations.Test;
/**
@@ -23,6 +24,7 @@
*
* @author jkuhnert
*/
+@Test
public class ScriptUtilsTest extends HiveMindTestCase
{
protected static final String JAVASCRIPT_NOCOMMENT =
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/StrftimeTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/StrftimeTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/StrftimeTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/StrftimeTest.java Tue Jun 27 13:38:40 2006
@@ -14,6 +14,7 @@
package org.apache.tapestry.util;
import org.apache.hivemind.test.HiveMindTestCase;
+import org.testng.annotations.Test;
/**
@@ -22,6 +23,7 @@
* @see {@linkplain http://www.opengroup.org/onlinepubs/007908799/xsh/strftime.html} for list of assertions
* @author jkuhnert
*/
+@Test
public class StrftimeTest extends HiveMindTestCase
{
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/TestDescribedLocation.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/TestDescribedLocation.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/TestDescribedLocation.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/TestDescribedLocation.java Tue Jun 27 13:38:40 2006
@@ -19,6 +19,7 @@
import org.apache.hivemind.Resource;
import org.apache.tapestry.BaseComponentTestCase;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.util.DescribedLocation}.
@@ -26,11 +27,12 @@
* @author Howard Lewis Ship
* @since 4.0
*/
+@Test
public class TestDescribedLocation extends BaseComponentTestCase
{
public void testLineRowAreZero()
{
- Resource r = (Resource) newMock(Resource.class);
+ Resource r = newMock(Resource.class);
replay();
@@ -48,8 +50,8 @@
public void testEquals()
{
- Resource r = (Resource) newMock(Resource.class);
- Resource r2 = (Resource) newMock(Resource.class);
+ Resource r = newMock(Resource.class);
+ Resource r2 = newMock(Resource.class);
replay();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/TestObjectIdentityMap.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/TestObjectIdentityMap.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/TestObjectIdentityMap.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/TestObjectIdentityMap.java Tue Jun 27 13:38:40 2006
@@ -14,7 +14,11 @@
package org.apache.tapestry.util;
-import junit.framework.TestCase;
+import static org.testng.AssertJUnit.assertNull;
+import static org.testng.AssertJUnit.assertSame;
+
+import org.apache.tapestry.BaseComponentTestCase;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.util.ObjectIdentityMap}
@@ -22,8 +26,9 @@
* @author Howard Lewis Ship
* @since 4.0
*/
-public class TestObjectIdentityMap extends TestCase
+public class TestObjectIdentityMap extends BaseComponentTestCase
{
+ @Test
public void testGetNotFound()
{
ObjectIdentityMap map = new ObjectIdentityMap();
@@ -32,7 +37,8 @@
assertNull(map.get("foe"));
}
-
+
+ @Test
public void testGetFound()
{
ObjectIdentityMap map = new ObjectIdentityMap();
@@ -45,6 +51,7 @@
assertSame(value, map.get(key));
}
+ @Test
public void testGetWhenEmpty()
{
ObjectIdentityMap map = new ObjectIdentityMap();
@@ -52,6 +59,7 @@
assertNull(map.get(null));
}
+ @Test
public void testStoreNull()
{
ObjectIdentityMap map = new ObjectIdentityMap();
@@ -63,6 +71,7 @@
assertSame(value, map.get(null));
}
+ @Test
public void testStoreMany()
{
ObjectIdentityMap map = new ObjectIdentityMap();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/TestPageRenderSupport.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/TestPageRenderSupport.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/TestPageRenderSupport.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/TestPageRenderSupport.java Tue Jun 27 13:38:40 2006
@@ -32,6 +32,7 @@
import org.apache.tapestry.markup.MarkupWriterImpl;
import org.apache.tapestry.services.ResponseBuilder;
import org.apache.tapestry.services.impl.DefaultResponseBuilder;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.util.PageRenderSupportImpl}.
@@ -39,11 +40,12 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestPageRenderSupport extends BaseComponentTestCase
{
private AssetFactory newAssetFactory()
{
- return (AssetFactory) newMock(AssetFactory.class);
+ return newMock(AssetFactory.class);
}
private IAsset newAsset(IRequestCycle cycle, String url)
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/TestQueryParameterMap.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/TestQueryParameterMap.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/TestQueryParameterMap.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/TestQueryParameterMap.java Tue Jun 27 13:38:40 2006
@@ -18,6 +18,7 @@
import java.util.Map;
import org.apache.hivemind.test.HiveMindTestCase;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.util.QueryParameterMap}.
@@ -25,6 +26,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestQueryParameterMap extends HiveMindTestCase
{
public void testUnknownKey()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/io/TestBinaryDumpOutputStream.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/io/TestBinaryDumpOutputStream.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/io/TestBinaryDumpOutputStream.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/io/TestBinaryDumpOutputStream.java Tue Jun 27 13:38:40 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.util.io;
+import static org.testng.AssertJUnit.assertEquals;
+
import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.CharArrayWriter;
@@ -25,7 +27,8 @@
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestCase;
+import org.apache.tapestry.BaseComponentTestCase;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.util.io.BinaryDumpOutputStream}.
@@ -33,7 +36,8 @@
* @author Howard Lewis Ship
* @since 4.0
*/
-public class TestBinaryDumpOutputStream extends TestCase
+@Test
+public class TestBinaryDumpOutputStream extends BaseComponentTestCase
{
/**
* Reads the content of a file, and forms a string. Converts line-number endings in the file
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/BaseValidatorTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/BaseValidatorTestCase.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/BaseValidatorTestCase.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/BaseValidatorTestCase.java Tue Jun 27 13:38:40 2006
@@ -21,6 +21,7 @@
import org.apache.tapestry.IPage;
import org.apache.tapestry.form.IFormComponent;
import org.apache.tapestry.junit.TapestryTestCase;
+import org.testng.annotations.Test;
/**
* Base class for tests of different {@link org.apache.tapestry.valid.IValidator}implementations.
@@ -28,12 +29,13 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public abstract class BaseValidatorTestCase extends TapestryTestCase
{
protected IFormComponent newField()
{
- return (IFormComponent) newMock(IFormComponent.class);
+ return newMock(IFormComponent.class);
}
protected IFormComponent newField(String displayName)
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/FieldLabelTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/FieldLabelTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/FieldLabelTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/FieldLabelTest.java Tue Jun 27 13:38:40 2006
@@ -27,6 +27,7 @@
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.form.BaseFormComponentTestCase;
import org.apache.tapestry.form.IFormComponent;
+import org.testng.annotations.Test;
/**
* Tests for the {@link org.apache.tapestry.valid.FieldLabel} component.
@@ -34,11 +35,12 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class FieldLabelTest extends BaseFormComponentTestCase
{
private IForm newForm(IValidationDelegate delegate)
{
- IForm form = (IForm) newMock(IForm.class);
+ IForm form = newMock(IForm.class);
trainGetDelegate(delegate, form);
@@ -52,7 +54,7 @@
private IPage newFred()
{
- IPage page = (IPage) newMock(IPage.class);
+ IPage page = newMock(IPage.class);
trainGetPageName(page, "Fred");
@@ -68,7 +70,7 @@
private IFormComponent newField(String displayName, String clientId)
{
- IFormComponent field = (IFormComponent) newMock(IFormComponent.class);
+ IFormComponent field = newMock(IFormComponent.class);
trainGetDisplayName(field, displayName);
@@ -103,7 +105,7 @@
replay();
- FieldLabel fl = (FieldLabel) newInstance(FieldLabel.class, new Object[]
+ FieldLabel fl = newInstance(FieldLabel.class, new Object[]
{ "field", field, "location", l, "prerender", true });
fl.render(writer, cycle);
@@ -211,7 +213,7 @@
trainIsRewinding(cycle, false);
- FieldLabel fl = (FieldLabel) newInstance(FieldLabel.class, new Object[]
+ FieldLabel fl = newInstance(FieldLabel.class, new Object[]
{ "location", l, "field", field, "prerender", true });
form.prerenderField(writer, field, l);
@@ -243,7 +245,7 @@
trainIsRewinding(cycle, false);
- FieldLabel fl = (FieldLabel) newInstance(FieldLabel.class, new Object[]
+ FieldLabel fl = newInstance(FieldLabel.class, new Object[]
{ "location", l, "field", field });
trainGetDelegate(form, delegate);
@@ -273,7 +275,7 @@
trainIsRewinding(cycle, false);
- FieldLabel fl = (FieldLabel) newInstance(FieldLabel.class, new Object[]
+ FieldLabel fl = newInstance(FieldLabel.class, new Object[]
{ "location", l, "field", field, "prerender", true });
form.prerenderField(writer, field, l);
@@ -304,7 +306,7 @@
Location l = newLocation();
IPage page = newFred();
- FieldLabel fl = (FieldLabel) newInstance(FieldLabel.class, new Object[]
+ FieldLabel fl = newInstance(FieldLabel.class, new Object[]
{ "id", "label", "location", l, "field", field, "page", page, "container", page,
"prerender", true });
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestDateValidator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestDateValidator.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestDateValidator.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestDateValidator.java Tue Jun 27 13:38:40 2006
@@ -24,6 +24,7 @@
import java.util.Locale;
import org.apache.tapestry.form.IFormComponent;
+import org.testng.annotations.Test;
/**
* Tests the {@link DateValidator}class.
@@ -31,7 +32,7 @@
* @author Howard Lewis Ship
* @since 1.0.8
*/
-
+@Test
public class TestDateValidator extends BaseValidatorTestCase
{
private Calendar calendar = new GregorianCalendar();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestEmailValidator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestEmailValidator.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestEmailValidator.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestEmailValidator.java Tue Jun 27 13:38:40 2006
@@ -17,6 +17,7 @@
import static org.testng.AssertJUnit.assertEquals;
import org.apache.tapestry.form.IFormComponent;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.valid.EmailValidator}.
@@ -24,7 +25,7 @@
* @author Howard Lewis Ship
* @since 3.0
*/
-
+@Test
public class TestEmailValidator extends BaseValidatorTestCase
{
private EmailValidator v = new EmailValidator();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestIntValidator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestIntValidator.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestIntValidator.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestIntValidator.java Tue Jun 27 13:38:40 2006
@@ -21,6 +21,7 @@
import java.util.Map;
import org.apache.tapestry.form.IFormComponent;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.valid.IntValidator}.
@@ -28,6 +29,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestIntValidator extends BaseValidatorTestCase
{
public void testToStringNull()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestNumberValidator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestNumberValidator.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestNumberValidator.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestNumberValidator.java Tue Jun 27 13:38:40 2006
@@ -20,6 +20,7 @@
import java.math.BigInteger;
import org.apache.tapestry.form.IFormComponent;
+import org.testng.annotations.Test;
/**
* Test the {@link NumberValidator}.
@@ -27,7 +28,7 @@
* @author Howard Lewis Ship
* @since 1.0.8
*/
-
+@Test
public class TestNumberValidator extends BaseValidatorTestCase
{
private NumberValidator v = new NumberValidator();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestPatternValidator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestPatternValidator.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestPatternValidator.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestPatternValidator.java Tue Jun 27 13:38:40 2006
@@ -22,6 +22,7 @@
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
import org.apache.tapestry.form.IFormComponent;
+import org.testng.annotations.Test;
/**
* Test cases for PatternValidator.
@@ -29,6 +30,7 @@
* @author Harish Krishnaswamy
* @since 3.0
*/
+@Test
public class TestPatternValidator extends BaseValidatorTestCase
{
PatternValidator pv = new PatternValidator();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestStringValidator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestStringValidator.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestStringValidator.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestStringValidator.java Tue Jun 27 13:38:40 2006
@@ -18,6 +18,7 @@
import static org.testng.AssertJUnit.assertNull;
import org.apache.tapestry.form.IFormComponent;
+import org.testng.annotations.Test;
/**
* Tests the {@link StringValidator}class.
@@ -25,7 +26,7 @@
* @author Howard Lewis Ship
* @since 1.0.8
*/
-
+@Test
public class TestStringValidator extends BaseValidatorTestCase
{
private StringValidator v = new StringValidator();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestUrlValidator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestUrlValidator.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestUrlValidator.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestUrlValidator.java Tue Jun 27 13:38:40 2006
@@ -21,6 +21,7 @@
import org.apache.tapestry.IPage;
import org.apache.tapestry.form.IFormComponent;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.valid.EmailValidator}.
@@ -29,7 +30,7 @@
* @author Jimmy Dyson
* @since 3.0
*/
-
+@Test
public class TestUrlValidator extends BaseValidatorTestCase
{
private UrlValidator v = new UrlValidator();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestValidField.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestValidField.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestValidField.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestValidField.java Tue Jun 27 13:38:40 2006
@@ -29,6 +29,7 @@
import org.apache.tapestry.form.IFormComponent;
import org.apache.tapestry.form.MockDelegate;
import org.apache.tapestry.html.BasePage;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.valid.ValidField}.
@@ -36,6 +37,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestValidField extends BaseFormComponentTestCase
{
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestValidatorBindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestValidatorBindingFactory.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestValidatorBindingFactory.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestValidatorBindingFactory.java Tue Jun 27 13:38:40 2006
@@ -23,6 +23,7 @@
import org.apache.tapestry.IBinding;
import org.apache.tapestry.coerce.ValueConverter;
import org.apache.tapestry.engine.IScriptSource;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.valid.ValidatorBindingFactory}.
@@ -30,16 +31,17 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestValidatorBindingFactory extends BaseComponentTestCase
{
public void testFactory()
{
- IValidator validator = (IValidator) newMock(IValidator.class);
- ValueConverter vc = (ValueConverter) newMock(ValueConverter.class);
+ IValidator validator = newMock(IValidator.class);
+ ValueConverter vc = newMock(ValueConverter.class);
BeanFactory vbf = newMock(BeanFactory.class);
- IScriptSource scriptSource = (IScriptSource)newMock(IScriptSource.class);
+ IScriptSource scriptSource = newMock(IScriptSource.class);
expect(vbf.get("foo,bar=baz")).andReturn(validator);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/ValidationDelegateTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/ValidationDelegateTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/ValidationDelegateTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/ValidationDelegateTest.java Tue Jun 27 13:38:40 2006
@@ -25,6 +25,7 @@
import org.apache.tapestry.IRender;
import org.apache.tapestry.form.IFormComponent;
+import org.testng.annotations.Test;
/**
* Test the class {@link ValidationDelegate}.
@@ -32,7 +33,7 @@
* @author Howard Lewis Ship
* @since 1.0.8
*/
-
+@Test
public class ValidationDelegateTest extends BaseValidatorTestCase
{
protected IFormComponent newField(String name, int count)
@@ -303,7 +304,7 @@
IFormComponent f1 = newField("monty", 2);
IFormComponent f2 = newField("python", 3);
- IRender f2ErrorRenderer = (IRender) newMock(IRender.class);
+ IRender f2ErrorRenderer = newMock(IRender.class);
replay();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/ServletWebResponseTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/ServletWebResponseTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/ServletWebResponseTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/ServletWebResponseTest.java Tue Jun 27 13:38:40 2006
@@ -29,6 +29,7 @@
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.util.ContentType;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.web.ServletWebResponse}.
@@ -36,6 +37,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class ServletWebResponseTest extends BaseComponentTestCase
{
private static class MockServletOutputStream extends ServletOutputStream
@@ -255,7 +257,7 @@
private HttpServletResponse newResponse()
{
- return (HttpServletResponse) newMock(HttpServletResponse.class);
+ return newMock(HttpServletResponse.class);
}
public void testSetHeaderMethods() throws Exception
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=417583&r1=417582&r2=417583&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 13:38:40 2006
@@ -22,12 +22,15 @@
import javax.servlet.http.HttpSession;
+import org.testng.annotations.Test;
+
/**
* Tests for {@link org.apache.tapestry.web.ServletWebSession}.
*
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class ServletWebSessionTest extends BaseWebTestCase
{
public void testGetAttributeNames()
@@ -49,7 +52,7 @@
private HttpSession newSession()
{
- return (HttpSession) newMock(HttpSession.class);
+ return newMock(HttpSession.class);
}
public void testGetAttribute()
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=417583&r1=417582&r2=417583&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 13:38:40 2006
@@ -24,12 +24,15 @@
import javax.servlet.ServletContext;
+import org.testng.annotations.Test;
+
/**
* Tests for {@link org.apache.tapestry.web.ServletWebContext}.
*
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestServletWebContext extends BaseWebTestCase
{
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=417583&r1=417582&r2=417583&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 13:38:40 2006
@@ -30,6 +30,7 @@
import javax.servlet.http.HttpSession;
import org.apache.hivemind.ApplicationRuntimeException;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.web.ServletWebRequest}.
@@ -37,21 +38,22 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestServletWebRequest extends BaseWebTestCase
{
private HttpServletRequest newHttpRequest()
{
- return (HttpServletRequest) newMock(HttpServletRequest.class);
+ return newMock(HttpServletRequest.class);
}
private HttpServletResponse newResponse()
{
- return (HttpServletResponse) newMock(HttpServletResponse.class);
+ return newMock(HttpServletResponse.class);
}
private RequestDispatcher newDispatcher()
{
- return (RequestDispatcher) newMock(RequestDispatcher.class);
+ return newMock(RequestDispatcher.class);
}
public void testGetParameterNames()
@@ -240,7 +242,7 @@
private HttpSession newSession()
{
- return (HttpSession) newMock(HttpSession.class);
+ return newMock(HttpSession.class);
}
public void testGetScheme()
@@ -455,7 +457,7 @@
public void testForwardExternalFailure() throws Exception
{
HttpServletRequest request = newHttpRequest();
- HttpServletResponse response = (HttpServletResponse)newMock(HttpServletResponse.class);
+ HttpServletResponse response = newMock(HttpServletResponse.class);
Throwable t = new IOException("Mock IO Exception");
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=417583&r1=417582&r2=417583&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 13:38:40 2006
@@ -20,6 +20,7 @@
import java.util.List;
import org.apache.hivemind.test.HiveMindTestCase;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.web.WebUtils}.
@@ -27,6 +28,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestWebUtils extends HiveMindTestCase
{
public void testToSortedList()
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=417583&r1=417582&r2=417583&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 13:38:40 2006
@@ -24,6 +24,7 @@
import org.apache.hivemind.Resource;
import org.apache.tapestry.BaseComponentTestCase;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.web.WebContextResource}.
@@ -31,11 +32,12 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class WebContextResourceTest extends BaseComponentTestCase
{
private WebContext newContext()
{
- return (WebContext) newMock(WebContext.class);
+ return newMock(WebContext.class);
}
public void testConstructor()
Modified: tapestry/tapestry4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/pom.xml?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/pom.xml (original)
+++ tapestry/tapestry4/trunk/pom.xml Tue Jun 27 13:38:40 2006
@@ -233,7 +233,7 @@
<repositories>
<repository>
<id>apache.snapshots</id>
- <url>http://cvs.apache.org/maven-snapshot-repository</url>
+ <url>http://apache.org/maven-snapshot-repository</url>
</repository>
<repository>
<id>tapestry.javaforge</id>