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 [1/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...
Author: jkuhnert
Date: Tue Jun 27 13:38:40 2006
New Revision: 417583
URL: http://svn.apache.org/viewvc?rev=417583&view=rev
Log:
More fixes for unit tests
Modified:
tapestry/tapestry4/trunk/framework/pom.xml
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/TestAbstractComponent.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/TestBaseSessionStoreOptimized.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/TestComponentMessageAccess.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/BaseEnhancementTestCase.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestAutowireWorker.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/LabeledPropertySelectionModelTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/internal/event/ComponentEventPropertyTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/ContentTypeTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TapestryTestCase.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestComponent.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestComponentMessages.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestLocalizedProperties.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestMultipart.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestStaticLink.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestTapestryCheckMethodInvocation.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestTapestryGetClassName.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestSpecificationParser.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/script/TestScript.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/spec/TestApplicationSpecification.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/spec/TestComponentSpecification.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/utils/TestDataSqueezer.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/utils/TestIdAllocator.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/utils/TestRegexpMatcher.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/l10n/DefaultResourceLocalizerTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/link/DefaultLinkRendererTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/listener/TestListenerMap.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/listener/TestListenerMapSource.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/markup/TestJSONWriter.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/markup/TestMarkupWriter.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/multipart/TestMultipartDecoderFilter.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/multipart/TestUploadFormParametersWrapper.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/PageLoaderTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/TestNamespaceClassSearchComponentClassProvider.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/TestVerifyRequiredParametersVisitor.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/ClientPropertyPersistenceStrategyTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PageClientPropertyPersistenceScopeTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PageFixture.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PersistentPropertyDataEncoderTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PropertyPersistenceStrategySourceTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/SessionPropertyPersistenceStrategyTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestChangeKey.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestPageRecorder.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestPersistentPropertyData.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestPropertyChange.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/request/TestDecodedRequestInjector.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/request/TestDecodedRequestWrapper.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/AbstractSpecificationResolverTestCase.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/PageSpecificationResolverTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/TestComponentSpecificationResolver.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/script/TestForeachToken.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/script/TestIfToken.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/TestDataSqueezer.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/AbstractEngineServiceProxyTestCase.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/ComponentEventConnectionWorkerTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/ComponentEventInvokerTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/CookieSourceTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/EngineFactoryTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/EngineServiceInnerProxyTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/EngineServiceOuterProxyTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/LinkFactoryTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestAbsoluteURLBuilder.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestApplicationSpecificationInitializer.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestBaseTagWriter.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestBasicInfrastructure.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestBindingSource.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestDeferredObjectTranslator.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestDisableCachingFilter.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestEngineManager.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestEngineServiceObjectProvider.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestExpressionCache.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestExpressionEvaluator.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestExtensionLookupFactory.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestInfrastructure.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestLocalizedPropertySource.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestNamespaceResources.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestObjectPool.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestRequestLocaleManager.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestServiceMap.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestSetupRequestEncoding.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/WebContextInitializerTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/spec/TestComponentSpecification.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/test/TestCreator.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/DefaultPrimaryKeyConverterTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/ScriptUtilsTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/StrftimeTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/TestDescribedLocation.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/TestObjectIdentityMap.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/TestPageRenderSupport.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/TestQueryParameterMap.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/io/TestBinaryDumpOutputStream.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/BaseValidatorTestCase.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/FieldLabelTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestDateValidator.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestEmailValidator.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestIntValidator.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestNumberValidator.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestPatternValidator.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestStringValidator.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestUrlValidator.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestValidField.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestValidatorBindingFactory.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/ValidationDelegateTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/ServletWebResponseTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/ServletWebSessionTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/TestServletWebContext.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/TestServletWebRequest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/TestWebUtils.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/WebContextResourceTest.java
tapestry/tapestry4/trunk/pom.xml
Modified: tapestry/tapestry4/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/pom.xml?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/pom.xml (original)
+++ tapestry/tapestry4/trunk/framework/pom.xml Tue Jun 27 13:38:40 2006
@@ -51,12 +51,6 @@
</dependency>
<!-- Override parent pom: needed at compile time. -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
@@ -165,7 +159,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.2</version>
<configuration>
- <testSourceDirectory>src/test</testSourceDirectory>
</configuration>
</plugin>
<plugin>
@@ -266,7 +259,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>
</repositories>
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/TestAbstractComponent.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/TestAbstractComponent.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/TestAbstractComponent.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/TestAbstractComponent.java Tue Jun 27 13:38:40 2006
@@ -40,7 +40,8 @@
}
}
-
+
+ @Test
public void testUnimplementedMethods()
{
IComponent component = new ConcreteComponent();
@@ -69,6 +70,7 @@
}
}
+ @Test
public void testContainedComponent()
{
Creator creator = new Creator();
@@ -86,6 +88,7 @@
verify();
}
+ @Test
public void testContainedComponentConflict()
{
Creator creator = new Creator();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/TestBaseSessionStoreOptimized.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/TestBaseSessionStoreOptimized.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/TestBaseSessionStoreOptimized.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/TestBaseSessionStoreOptimized.java Tue Jun 27 13:38:40 2006
@@ -30,6 +30,7 @@
@Test
public class TestBaseSessionStoreOptimized extends BaseComponentTestCase
{
+ @Test
public void testMarkDirty()
{
BaseSessionStoreOptimized object = new BaseSessionStoreOptimized();
@@ -41,6 +42,7 @@
assertEquals(true, object.isStoreToSessionNeeded());
}
+ @Test
public void testMarkClean()
{
HttpSession session = newMock(HttpSession.class);
@@ -58,6 +60,7 @@
verify();
}
+ @Test
public void testUnboundDoesNothing()
{
HttpSession session = newMock(HttpSession.class);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/TestComponentMessageAccess.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/TestComponentMessageAccess.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/TestComponentMessageAccess.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/TestComponentMessageAccess.java Tue Jun 27 13:38:40 2006
@@ -40,6 +40,7 @@
{ "messages", messages });
}
+ @Test
public void testGetMessage()
{
Messages m = newMock(Messages.class);
@@ -55,6 +56,7 @@
verify();
}
+ @Test
public void testFormat()
{
Messages m = newMock(Messages.class);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/BaseEnhancementTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/BaseEnhancementTestCase.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/BaseEnhancementTestCase.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/BaseEnhancementTestCase.java Tue Jun 27 13:38:40 2006
@@ -20,7 +20,6 @@
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.engine.state.ApplicationStateManager;
import org.apache.tapestry.spec.IComponentSpecification;
-import org.testng.annotations.Test;
/**
* Base class for common utilities when testing enhancement workers.
@@ -28,7 +27,6 @@
* @author Howard Lewis Ship
* @since 4.0
*/
-@Test
public abstract class BaseEnhancementTestCase extends BaseComponentTestCase
{
public IComponentSpecification newSpec(Location location)
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestAutowireWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestAutowireWorker.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestAutowireWorker.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestAutowireWorker.java Tue Jun 27 13:38:40 2006
@@ -31,22 +31,22 @@
* @author James Carman
*
*/
-@Test
public class TestAutowireWorker extends BaseEnhancementTestCase
{
private static final String HELLO_SERVICE_PROPERTY = "helloService";
+ @Test
public void testWithNoService() throws Exception
{
assertNotAutowired( RegistryBuilder.constructDefaultRegistry() );
}
-
+ @Test
public void testWithManyServices() throws Exception
{
assertNotAutowired( buildFrameworkRegistry("autowire-multiple.xml" ) );
}
-
+ @Test
public void testWithOneService() throws Exception
{
final Registry registry = buildFrameworkRegistry("autowire-single.xml" );
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/LabeledPropertySelectionModelTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/LabeledPropertySelectionModelTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/LabeledPropertySelectionModelTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/LabeledPropertySelectionModelTest.java Tue Jun 27 13:38:40 2006
@@ -14,9 +14,11 @@
package org.apache.tapestry.form;
-import org.testng.annotations.Test;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
-import junit.framework.TestCase;
+import org.apache.tapestry.BaseComponentTestCase;
+import org.testng.annotations.Test;
/**
* Test case for {@link org.apache.tapestry.form.LabeledPropertySelectionModel}.
@@ -25,7 +27,7 @@
* @since 4.0
*/
@Test
-public class LabeledPropertySelectionModelTest extends TestCase
+public class LabeledPropertySelectionModelTest extends BaseComponentTestCase
{
public void testNullValue()
{
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/internal/event/ComponentEventPropertyTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/internal/event/ComponentEventPropertyTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/internal/event/ComponentEventPropertyTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/internal/event/ComponentEventPropertyTest.java Tue Jun 27 13:38:40 2006
@@ -17,6 +17,7 @@
import org.apache.hivemind.test.HiveMindTestCase;
import org.apache.tapestry.event.BrowserEvent;
+import org.testng.annotations.Test;
/**
@@ -24,6 +25,7 @@
*
* @author jkuhnert
*/
+@Test
public class ComponentEventPropertyTest extends HiveMindTestCase
{
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/ContentTypeTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/ContentTypeTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/ContentTypeTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/ContentTypeTest.java Tue Jun 27 13:38:40 2006
@@ -18,6 +18,7 @@
import static org.testng.AssertJUnit.assertTrue;
import org.apache.tapestry.util.ContentType;
+import org.testng.annotations.Test;
/**
* Test the functionality of {@link org.apache.tapestry.util.ContentType}
@@ -25,7 +26,7 @@
* @author Mindbridge
* @since 3.0
*/
-
+@Test
public class ContentTypeTest extends TapestryTestCase
{
public void testEquals()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TapestryTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TapestryTestCase.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TapestryTestCase.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TapestryTestCase.java Tue Jun 27 13:38:40 2006
@@ -40,6 +40,7 @@
import org.apache.tapestry.spec.IComponentSpecification;
import org.apache.tapestry.spec.ILibrarySpecification;
import org.apache.tapestry.util.IPropertyHolder;
+import org.testng.annotations.Test;
/**
* Base class for Tapestry test cases.
@@ -47,7 +48,7 @@
* @author Howard Lewis Ship
* @since 2.2
*/
-
+@Test
public abstract class TapestryTestCase extends BaseComponentTestCase
{
protected static final boolean IS_JDK13 = System.getProperty("java.specification.version")
@@ -185,6 +186,6 @@
protected IComponent newComponent()
{
- return (IComponent) newMock(IComponent.class);
+ return newMock(IComponent.class);
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestComponent.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestComponent.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestComponent.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestComponent.java Tue Jun 27 13:38:40 2006
@@ -26,6 +26,7 @@
import org.apache.tapestry.services.ResponseBuilder;
import org.apache.tapestry.services.impl.DefaultResponseBuilder;
import org.apache.tapestry.test.Creator;
+import org.testng.annotations.Test;
/**
* Test a few random things in {@link org.apache.tapestry.AbstractComponent}and
@@ -34,7 +35,7 @@
* @author Howard Lewis Ship
* @since 3.0
*/
-
+@Test
public class TestComponent extends BaseComponentTestCase
{
private static class TestRender implements IRender
@@ -69,7 +70,7 @@
public void testOuter() throws Exception
{
IMarkupWriter writer = new NullWriter();
- IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
+ IRequestCycle cycle = newMock(IRequestCycle.class);
Creator creator = new Creator();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestComponentMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestComponentMessages.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestComponentMessages.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestComponentMessages.java Tue Jun 27 13:38:40 2006
@@ -43,6 +43,7 @@
import org.apache.tapestry.spec.IComponentSpecification;
import org.apache.tapestry.spec.ILibrarySpecification;
import org.apache.tapestry.spec.LibrarySpecification;
+import org.testng.annotations.Test;
/**
* Tests the class {@link org.apache.tapestry.services.impl.ComponentMessagesSourceImpl}.
@@ -53,7 +54,7 @@
* @author Howard Lewis Ship
* @since 2.0.4
*/
-
+@Test
public class TestComponentMessages extends TapestryTestCase
{
private Location _locationFixture = new Location()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestLocalizedProperties.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestLocalizedProperties.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestLocalizedProperties.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestLocalizedProperties.java Tue Jun 27 13:38:40 2006
@@ -21,6 +21,7 @@
import java.util.Properties;
import org.apache.tapestry.util.text.LocalizedProperties;
+import org.testng.annotations.Test;
/**
* Tests to ensure that LocalizedProperties are fully backward compatible with java.util.Properties
@@ -29,6 +30,7 @@
* @author mb
* @since 4.0
*/
+@Test
public class TestLocalizedProperties extends TapestryTestCase
{
private void ensureEquivalence(String fileName)
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestMultipart.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestMultipart.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestMultipart.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestMultipart.java Tue Jun 27 13:38:40 2006
@@ -17,6 +17,7 @@
import static org.testng.AssertJUnit.assertEquals;
import org.apache.tapestry.multipart.ValuePart;
+import org.testng.annotations.Test;
/**
* A few tests to fill in the code coverage of {@link org.apache.tapestry.multipart.ValuePart}and
@@ -25,6 +26,7 @@
* @author Howard Lewis Ship
* @since 3.0
*/
+@Test
public class TestMultipart extends TapestryTestCase
{
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestStaticLink.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestStaticLink.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestStaticLink.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestStaticLink.java Tue Jun 27 13:38:40 2006
@@ -18,6 +18,7 @@
import org.apache.tapestry.engine.ILink;
import org.apache.tapestry.link.StaticLink;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.link.StaticLink}.
@@ -25,7 +26,7 @@
* @author Howard Lewis Ship
* @since 3.0
*/
-
+@Test
public class TestStaticLink extends TapestryTestCase
{
private static final String URL = "http://host/path";
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestTapestryCheckMethodInvocation.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestTapestryCheckMethodInvocation.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestTapestryCheckMethodInvocation.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestTapestryCheckMethodInvocation.java Tue Jun 27 13:38:40 2006
@@ -18,6 +18,7 @@
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.tapestry.Tapestry;
+import org.testng.annotations.Test;
/**
* Tests for the methods
@@ -28,6 +29,7 @@
* @author Howard Lewis Ship
* @since 3.0
*/
+@Test
public class TestTapestryCheckMethodInvocation extends TapestryTestCase
{
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestTapestryGetClassName.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestTapestryGetClassName.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestTapestryGetClassName.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestTapestryGetClassName.java Tue Jun 27 13:38:40 2006
@@ -17,6 +17,7 @@
import static org.testng.AssertJUnit.assertEquals;
import org.apache.tapestry.Tapestry;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.Tapestry#getClassName(Class)}.
@@ -24,6 +25,7 @@
* @author Howard Lewis Ship
* @since 3.0
*/
+@Test
public class TestTapestryGetClassName extends TapestryTestCase
{
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestSpecificationParser.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestSpecificationParser.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestSpecificationParser.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestSpecificationParser.java Tue Jun 27 13:38:40 2006
@@ -45,6 +45,7 @@
import org.apache.tapestry.spec.InjectSpecification;
import org.apache.tapestry.spec.SpecFactory;
import org.apache.tapestry.util.xml.DocumentParseException;
+import org.testng.annotations.Test;
/**
* Tests the specification parser (which reads page and component specifications). Came into being
@@ -53,7 +54,7 @@
* @author Howard Lewis Ship
* @since 2.0.4
*/
-
+@Test
public class TestSpecificationParser extends TapestryTestCase
{
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java Tue Jun 27 13:38:40 2006
@@ -14,18 +14,22 @@
package org.apache.tapestry.junit.parse;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertTrue;
+import static org.testng.AssertJUnit.fail;
+
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.apache.commons.io.IOUtils;
import org.apache.hivemind.Location;
import org.apache.hivemind.Resource;
import org.apache.hivemind.impl.DefaultClassResolver;
import org.apache.hivemind.util.ClasspathResource;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.parse.ITemplateParserDelegate;
import org.apache.tapestry.parse.LocalizationToken;
import org.apache.tapestry.parse.OpenToken;
@@ -35,14 +39,15 @@
import org.apache.tapestry.parse.TemplateTokenFactory;
import org.apache.tapestry.parse.TextToken;
import org.apache.tapestry.parse.TokenType;
+import org.testng.annotations.Test;
/**
* Tests for the Tapestry HTML template parser.
*
* @author Howard Lewis Ship
*/
-
-public class TestTemplateParser extends TestCase
+@Test
+public class TestTemplateParser extends BaseComponentTestCase
{
private static class ParserDelegate implements ITemplateParserDelegate
{
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/script/TestScript.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/script/TestScript.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/script/TestScript.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/script/TestScript.java Tue Jun 27 13:38:40 2006
@@ -37,6 +37,7 @@
import org.apache.tapestry.services.impl.ExpressionCacheImpl;
import org.apache.tapestry.services.impl.ExpressionEvaluatorImpl;
import org.apache.tapestry.util.xml.DocumentParseException;
+import org.testng.annotations.Test;
/**
* A collection of tests for Tapestry scripting.
@@ -44,7 +45,7 @@
* @author Howard Lewis Ship
* @since 2.2
*/
-
+@Test
public class TestScript extends TapestryTestCase
{
private MockScriptProcessor _processor = new MockScriptProcessor();
@@ -75,7 +76,7 @@
{
IScript script = read(file);
- IRequestCycle cycle = (IRequestCycle) newMock(IRequestCycle.class);
+ IRequestCycle cycle = newMock(IRequestCycle.class);
replay();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/spec/TestApplicationSpecification.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/spec/TestApplicationSpecification.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/spec/TestApplicationSpecification.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/spec/TestApplicationSpecification.java Tue Jun 27 13:38:40 2006
@@ -21,6 +21,7 @@
import org.apache.tapestry.junit.TapestryTestCase;
import org.apache.tapestry.spec.IApplicationSpecification;
import org.apache.tapestry.spec.IExtensionSpecification;
+import org.testng.annotations.Test;
/**
* Tests related to {@link org.apache.tapestry.spec.ApplicationSpecification}.
@@ -28,7 +29,7 @@
* @author Howard Lewis Ship
* @since 2.2
*/
-
+@Test
public class TestApplicationSpecification extends TapestryTestCase
{
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/spec/TestComponentSpecification.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/spec/TestComponentSpecification.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/spec/TestComponentSpecification.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/spec/TestComponentSpecification.java Tue Jun 27 13:38:40 2006
@@ -28,6 +28,7 @@
import org.apache.tapestry.spec.IContainedComponent;
import org.apache.tapestry.spec.IParameterSpecification;
import org.apache.tapestry.spec.ParameterSpecification;
+import org.testng.annotations.Test;
/**
* Test cases for page and component specifications.
@@ -35,7 +36,7 @@
* @author Howard Lewis Ship
* @since 2.2
*/
-
+@Test
public class TestComponentSpecification extends TapestryTestCase
{
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/utils/TestDataSqueezer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/utils/TestDataSqueezer.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/utils/TestDataSqueezer.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/utils/TestDataSqueezer.java Tue Jun 27 13:38:40 2006
@@ -14,6 +14,9 @@
package org.apache.tapestry.junit.utils;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
+
import java.io.File;
import java.io.Serializable;
import java.math.BigDecimal;
@@ -23,31 +26,31 @@
import java.util.Map;
import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.ClassResolver;
import org.apache.hivemind.impl.DefaultClassResolver;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.services.DataSqueezer;
import org.apache.tapestry.util.ComponentAddress;
import org.apache.tapestry.util.io.DataSqueezerImpl;
import org.apache.tapestry.util.io.DataSqueezerUtil;
import org.apache.tapestry.util.io.SerializableAdaptor;
import org.apache.tapestry.util.io.SqueezeAdaptor;
+import org.testng.annotations.Test;
/**
* A series of tests for {@link DataSqueezerImpl} and friends.
*
* @author Howard Lewis Ship
*/
-
-public class TestDataSqueezer extends TestCase
+@Test
+public class TestDataSqueezer extends BaseComponentTestCase
{
private DataSqueezerImpl ds = DataSqueezerUtil.createUnitTestSqueezer();
public TestDataSqueezer(String name)
{
- super(name);
}
private void attempt(Object input, String expectedEncoding)
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/utils/TestIdAllocator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/utils/TestIdAllocator.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/utils/TestIdAllocator.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/utils/TestIdAllocator.java Tue Jun 27 13:38:40 2006
@@ -18,6 +18,7 @@
import org.apache.tapestry.junit.TapestryTestCase;
import org.apache.tapestry.util.IdAllocator;
+import org.testng.annotations.Test;
/**
* Tests the {@link org.apache.tapestry.util.IdAllocator}class.
@@ -25,7 +26,7 @@
* @author Howard Lewis Ship
* @since 3.0
*/
-
+@Test
public class TestIdAllocator extends TapestryTestCase
{
public void testSimple()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/utils/TestRegexpMatcher.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/utils/TestRegexpMatcher.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/utils/TestRegexpMatcher.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/utils/TestRegexpMatcher.java Tue Jun 27 13:38:40 2006
@@ -21,6 +21,7 @@
import org.apache.tapestry.junit.TapestryTestCase;
import org.apache.tapestry.util.RegexpMatch;
import org.apache.tapestry.util.RegexpMatcher;
+import org.testng.annotations.Test;
/**
* Simple test case for {@link org.apache.tapestry.util.RegexpMatcher}.
@@ -28,6 +29,7 @@
* @author Howard Lewis Ship
* @since 3.0
*/
+@Test
public class TestRegexpMatcher extends TapestryTestCase
{
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/l10n/DefaultResourceLocalizerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/l10n/DefaultResourceLocalizerTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/l10n/DefaultResourceLocalizerTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/l10n/DefaultResourceLocalizerTest.java Tue Jun 27 13:38:40 2006
@@ -21,6 +21,7 @@
import org.apache.hivemind.Resource;
import org.apache.tapestry.BaseComponentTestCase;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.l10n.DefaultResourceLocalizer}.
@@ -28,6 +29,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class DefaultResourceLocalizerTest extends BaseComponentTestCase
{
public void testLocalizer()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/link/DefaultLinkRendererTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/link/DefaultLinkRendererTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/link/DefaultLinkRendererTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/link/DefaultLinkRendererTest.java Tue Jun 27 13:38:40 2006
@@ -27,6 +27,7 @@
import org.apache.tapestry.Tapestry;
import org.apache.tapestry.components.ILinkComponent;
import org.apache.tapestry.engine.ILink;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.link.DefaultLinkRenderer}.
@@ -34,6 +35,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class DefaultLinkRendererTest extends BaseComponentTestCase
{
class RendererFixture extends DefaultLinkRenderer
@@ -116,7 +118,7 @@
protected ILinkComponent newComponent()
{
- return (ILinkComponent) newMock(ILinkComponent.class);
+ return newMock(ILinkComponent.class);
}
public void testNoNesting()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/listener/TestListenerMap.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/listener/TestListenerMap.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/listener/TestListenerMap.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/listener/TestListenerMap.java Tue Jun 27 13:38:40 2006
@@ -25,6 +25,7 @@
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IActionListener;
import org.apache.tapestry.IRequestCycle;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.listener.ListenerMapImpl}.
@@ -32,6 +33,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestListenerMap extends BaseComponentTestCase
{
public void testGetListener()
@@ -137,6 +139,6 @@
private ListenerMethodInvoker newInvoker()
{
- return (ListenerMethodInvoker) newMock(ListenerMethodInvoker.class);
+ return newMock(ListenerMethodInvoker.class);
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/listener/TestListenerMapSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/listener/TestListenerMapSource.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/listener/TestListenerMapSource.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/listener/TestListenerMapSource.java Tue Jun 27 13:38:40 2006
@@ -27,6 +27,7 @@
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.engine.ILink;
import org.apache.tapestry.event.BrowserEvent;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.listener.ListenerMapSourceImpl} and
@@ -35,6 +36,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestListenerMapSource extends BaseComponentTestCase
{
@@ -227,7 +229,7 @@
public void testReturnPageInstance()
{
- IPage page = (IPage) newMock(IPage.class);
+ IPage page = newMock(IPage.class);
IRequestCycle cycle = newLCycle(null);
ListenerMethodHolder holder = new ListenerMethodHolder(page);
@@ -370,6 +372,6 @@
private ListenerMethodHolder newHolder()
{
- return (ListenerMethodHolder) newMock(ListenerMethodHolder.class);
+ return newMock(ListenerMethodHolder.class);
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/markup/TestJSONWriter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/markup/TestJSONWriter.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/markup/TestJSONWriter.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/markup/TestJSONWriter.java Tue Jun 27 13:38:40 2006
@@ -18,6 +18,7 @@
import org.apache.hivemind.test.HiveMindTestCase;
import org.apache.tapestry.json.IJSONWriter;
+import org.testng.annotations.Test;
/**
@@ -25,6 +26,7 @@
*
* @author jkuhnert
*/
+@Test
public class TestJSONWriter extends HiveMindTestCase
{
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/markup/TestMarkupWriter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/markup/TestMarkupWriter.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/markup/TestMarkupWriter.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/markup/TestMarkupWriter.java Tue Jun 27 13:38:40 2006
@@ -23,6 +23,7 @@
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IMarkupWriter;
import org.testng.annotations.Configuration;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.markup.MarkupWriterImpl}.
@@ -30,6 +31,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestMarkupWriter extends BaseComponentTestCase
{
private static CharArrayWriter _writer;
@@ -58,7 +60,7 @@
private MarkupFilter newFilter()
{
- return (MarkupFilter) newMock(MarkupFilter.class);
+ return newMock(MarkupFilter.class);
}
private PrintWriter newPrintWriter()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/multipart/TestMultipartDecoderFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/multipart/TestMultipartDecoderFilter.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/multipart/TestMultipartDecoderFilter.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/multipart/TestMultipartDecoderFilter.java Tue Jun 27 13:38:40 2006
@@ -25,6 +25,7 @@
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.services.ServletRequestServicer;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.multipart.MultipartDecoderFilter}.
@@ -32,6 +33,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestMultipartDecoderFilter extends BaseComponentTestCase
{
private static class MockServicer implements ServletRequestServicer
@@ -56,7 +58,7 @@
private HttpServletResponse newResponse()
{
- return (HttpServletResponse) newMock(HttpServletResponse.class);
+ return newMock(HttpServletResponse.class);
}
public void testNormalRequest() throws Exception
@@ -81,7 +83,7 @@
{
HttpServletRequest request = newRequest("multipart/form-data");
HttpServletResponse response = newResponse();
- HttpServletRequest decoded = (HttpServletRequest) newMock(HttpServletRequest.class);
+ HttpServletRequest decoded = newMock(HttpServletRequest.class);
ServletMultipartDecoder decoder = newMock(ServletMultipartDecoder.class);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/multipart/TestUploadFormParametersWrapper.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/multipart/TestUploadFormParametersWrapper.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/multipart/TestUploadFormParametersWrapper.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/multipart/TestUploadFormParametersWrapper.java Tue Jun 27 13:38:40 2006
@@ -26,6 +26,7 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.tapestry.BaseComponentTestCase;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.multipart.UploadFormParametersWrapper}.
@@ -33,11 +34,12 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestUploadFormParametersWrapper extends BaseComponentTestCase
{
private HttpServletRequest newHttpRequest()
{
- return (HttpServletRequest) newMock(HttpServletRequest.class);
+ return newMock(HttpServletRequest.class);
}
public void testMapIsNotModifiable()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/PageLoaderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/PageLoaderTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/PageLoaderTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/PageLoaderTest.java Tue Jun 27 13:38:40 2006
@@ -32,6 +32,7 @@
import org.apache.tapestry.spec.ContainedComponent;
import org.apache.tapestry.spec.IComponentSpecification;
import org.apache.tapestry.spec.ParameterSpecification;
+import org.testng.annotations.Test;
/**
* Additional tests for {@link org.apache.tapestry.pageload.PageLoader}. Ultimately, testing this
@@ -40,6 +41,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class PageLoaderTest extends BaseComponentTestCase
{
@@ -134,7 +136,7 @@
protected BindingSource newBindingSource()
{
- return (BindingSource) newMock(BindingSource.class);
+ return newMock(BindingSource.class);
}
public void testBindDeprecated()
@@ -189,6 +191,6 @@
protected ComponentPropertySource newPropertySource()
{
- return (ComponentPropertySource) newMock(ComponentPropertySource.class);
+ return newMock(ComponentPropertySource.class);
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/TestNamespaceClassSearchComponentClassProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/TestNamespaceClassSearchComponentClassProvider.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/TestNamespaceClassSearchComponentClassProvider.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/TestNamespaceClassSearchComponentClassProvider.java Tue Jun 27 13:38:40 2006
@@ -22,6 +22,7 @@
import org.apache.tapestry.INamespace;
import org.apache.tapestry.services.ClassFinder;
import org.apache.tapestry.spec.IComponentSpecification;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.pageload.NamespaceClassSearchComponentClassProvider}.
@@ -29,6 +30,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestNamespaceClassSearchComponentClassProvider extends BaseComponentTestCase
{
private INamespace newNamespace(String key, String prefixes)
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/TestVerifyRequiredParametersVisitor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/TestVerifyRequiredParametersVisitor.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/TestVerifyRequiredParametersVisitor.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/TestVerifyRequiredParametersVisitor.java Tue Jun 27 13:38:40 2006
@@ -26,6 +26,7 @@
import org.apache.tapestry.spec.ComponentSpecification;
import org.apache.tapestry.spec.IComponentSpecification;
import org.apache.tapestry.spec.ParameterSpecification;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.pageload.VerifyRequiredParametersVisitor}.
@@ -33,6 +34,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestVerifyRequiredParametersVisitor extends BaseComponentTestCase
{
private IComponent newComponent(IComponentSpecification spec)
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/ClientPropertyPersistenceStrategyTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/ClientPropertyPersistenceStrategyTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/ClientPropertyPersistenceStrategyTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/ClientPropertyPersistenceStrategyTest.java Tue Jun 27 13:38:40 2006
@@ -27,6 +27,7 @@
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.engine.ServiceEncoding;
import org.apache.tapestry.web.WebRequest;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.record.ClientPropertyPersistenceStrategy}.
@@ -34,6 +35,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class ClientPropertyPersistenceStrategyTest extends HiveMindTestCase
{
private IRequestCycle newCycle()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PageClientPropertyPersistenceScopeTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PageClientPropertyPersistenceScopeTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PageClientPropertyPersistenceScopeTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PageClientPropertyPersistenceScopeTest.java Tue Jun 27 13:38:40 2006
@@ -20,6 +20,7 @@
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IPage;
import org.apache.tapestry.IRequestCycle;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.record.PageClientPropertyPersistenceScope}.
@@ -27,16 +28,17 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class PageClientPropertyPersistenceScopeTest extends BaseComponentTestCase
{
protected IRequestCycle newCycle()
{
- return (IRequestCycle) newMock(IRequestCycle.class);
+ return newMock(IRequestCycle.class);
}
protected IPage newPage()
{
- return (IPage) newMock(IPage.class);
+ return newMock(IPage.class);
}
public void testConstructParameterName()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PageFixture.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PageFixture.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PageFixture.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PageFixture.java Tue Jun 27 13:38:40 2006
@@ -15,12 +15,13 @@
package org.apache.tapestry.record;
import org.apache.tapestry.html.BasePage;
+import org.testng.annotations.Test;
/**
* @author Howard Lewis Ship
* @since 4.0
*/
-
+@Test
public abstract class PageFixture extends BasePage
{
public abstract String getCartoonName();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PersistentPropertyDataEncoderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PersistentPropertyDataEncoderTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PersistentPropertyDataEncoderTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PersistentPropertyDataEncoderTest.java Tue Jun 27 13:38:40 2006
@@ -26,6 +26,7 @@
import org.apache.hivemind.ClassResolver;
import org.apache.hivemind.impl.DefaultClassResolver;
import org.apache.hivemind.test.HiveMindTestCase;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.record.PersistentPropertyDataEncoderImpl}.
@@ -33,6 +34,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class PersistentPropertyDataEncoderTest extends HiveMindTestCase
{
/**
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PropertyPersistenceStrategySourceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PropertyPersistenceStrategySourceTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PropertyPersistenceStrategySourceTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PropertyPersistenceStrategySourceTest.java Tue Jun 27 13:38:40 2006
@@ -25,6 +25,7 @@
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.engine.ServiceEncoding;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.record.PropertyPersistenceStrategySourceImpl}.
@@ -32,11 +33,12 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class PropertyPersistenceStrategySourceTest extends BaseComponentTestCase
{
private PropertyPersistenceStrategy newStrategy()
{
- return (PropertyPersistenceStrategy) newMock(PropertyPersistenceStrategy.class);
+ return newMock(PropertyPersistenceStrategy.class);
}
private List newContributions(String name, PropertyPersistenceStrategy strategy)
@@ -109,7 +111,7 @@
private PropertyChange newChange()
{
- return (PropertyChange) newMock(PropertyChange.class);
+ return newMock(PropertyChange.class);
}
public void testAddParameters()
@@ -138,7 +140,7 @@
private ServiceEncoding newEncoding()
{
- return (ServiceEncoding) newMock(ServiceEncoding.class);
+ return newMock(ServiceEncoding.class);
}
public void testDiscardStoredChanges()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/SessionPropertyPersistenceStrategyTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/SessionPropertyPersistenceStrategyTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/SessionPropertyPersistenceStrategyTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/SessionPropertyPersistenceStrategyTest.java Tue Jun 27 13:38:40 2006
@@ -28,6 +28,7 @@
import org.apache.tapestry.engine.ServiceEncoding;
import org.apache.tapestry.web.WebRequest;
import org.apache.tapestry.web.WebSession;
+import org.testng.annotations.Test;
/**
* Tests for {@link SessionPropertyPersistenceStrategy}.
@@ -35,16 +36,17 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class SessionPropertyPersistenceStrategyTest extends BaseComponentTestCase
{
private ServiceEncoding newEncoding()
{
- return (ServiceEncoding) newMock(ServiceEncoding.class);
+ return newMock(ServiceEncoding.class);
}
private WebRequest newRequest(boolean create, WebSession session)
{
- WebRequest request = (WebRequest) newMock(WebRequest.class);
+ WebRequest request = newMock(WebRequest.class);
expect(request.getSession(create)).andReturn(session);
@@ -53,7 +55,7 @@
private WebSession newSession()
{
- return (WebSession) newMock(WebSession.class);
+ return newMock(WebSession.class);
}
private WebSession newSession(String attributeName, boolean remove)
@@ -70,7 +72,7 @@
private WebSession newSession(String attributeName, Object value)
{
- WebSession session = (WebSession) newMock(WebSession.class);
+ WebSession session = newMock(WebSession.class);
expect(session.getAttributeNames()).andReturn(Collections.singletonList(attributeName));
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestChangeKey.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestChangeKey.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestChangeKey.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestChangeKey.java Tue Jun 27 13:38:40 2006
@@ -15,6 +15,7 @@
package org.apache.tapestry.record;
import org.apache.hivemind.test.HiveMindTestCase;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.record.ChangeKey}.
@@ -22,6 +23,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestChangeKey extends HiveMindTestCase
{
public void testSetters()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestPageRecorder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestPageRecorder.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestPageRecorder.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestPageRecorder.java Tue Jun 27 13:38:40 2006
@@ -34,6 +34,7 @@
import org.apache.tapestry.spec.IComponentSpecification;
import org.apache.tapestry.spec.IPropertySpecification;
import org.apache.tapestry.test.Creator;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.record.PageRecorderImpl}.
@@ -41,11 +42,12 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestPageRecorder extends BaseComponentTestCase
{
private ErrorLog newErrorLog()
{
- return (ErrorLog) newMock(ErrorLog.class);
+ return newMock(ErrorLog.class);
}
public void testGetChanges()
@@ -181,7 +183,7 @@
IPage page = newPage();
- IComponent component = (IComponent) newMock(IComponent.class);
+ IComponent component = newMock(IComponent.class);
PropertyPersistenceStrategySource source = newMock(PropertyPersistenceStrategySource.class);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestPersistentPropertyData.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestPersistentPropertyData.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestPersistentPropertyData.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestPersistentPropertyData.java Tue Jun 27 13:38:40 2006
@@ -23,6 +23,7 @@
import java.util.List;
import org.apache.tapestry.BaseComponentTestCase;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.record.PersistentPropertyData}.
@@ -30,6 +31,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestPersistentPropertyData extends BaseComponentTestCase
{
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestPropertyChange.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestPropertyChange.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestPropertyChange.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestPropertyChange.java Tue Jun 27 13:38:40 2006
@@ -15,6 +15,7 @@
package org.apache.tapestry.record;
import org.apache.hivemind.test.HiveMindTestCase;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.record.PropertyChangeImpl}.
@@ -22,6 +23,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestPropertyChange extends HiveMindTestCase
{
public void testAccessors()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/request/TestDecodedRequestInjector.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/request/TestDecodedRequestInjector.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/request/TestDecodedRequestInjector.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/request/TestDecodedRequestInjector.java Tue Jun 27 13:38:40 2006
@@ -27,6 +27,7 @@
import org.apache.tapestry.Tapestry;
import org.apache.tapestry.services.ServletRequestServicer;
import org.apache.tapestry.spec.ILibrarySpecification;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.request.DecodedRequestInjector}.
@@ -34,6 +35,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestDecodedRequestInjector extends BaseComponentTestCase
{
private static class ServicerFixture implements ServletRequestServicer
@@ -49,12 +51,12 @@
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 ILibrarySpecification newSpec(boolean exists, IRequestDecoder decoder)
@@ -78,7 +80,7 @@
HttpServletResponse response = newResponse();
ILibrarySpecification spec = newSpec(false, null);
- ServletRequestServicer servicer = (ServletRequestServicer) newMock(ServletRequestServicer.class);
+ ServletRequestServicer servicer = newMock(ServletRequestServicer.class);
servicer.service(request, response);
@@ -124,4 +126,4 @@
verify();
}
-}
\ No newline at end of file
+}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/request/TestDecodedRequestWrapper.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/request/TestDecodedRequestWrapper.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/request/TestDecodedRequestWrapper.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/request/TestDecodedRequestWrapper.java Tue Jun 27 13:38:40 2006
@@ -20,6 +20,7 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.tapestry.BaseComponentTestCase;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.request.DecodedRequestWrapper}and
@@ -28,11 +29,12 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestDecodedRequestWrapper extends BaseComponentTestCase
{
private HttpServletRequest newHttpRequest()
{
- return (HttpServletRequest) newMock(HttpServletRequest.class);
+ return newMock(HttpServletRequest.class);
}
public void testInterceptedMethods()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/AbstractSpecificationResolverTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/AbstractSpecificationResolverTestCase.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/AbstractSpecificationResolverTestCase.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/AbstractSpecificationResolverTestCase.java Tue Jun 27 13:38:40 2006
@@ -26,6 +26,7 @@
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.engine.ISpecificationSource;
import org.apache.tapestry.spec.IComponentSpecification;
+import org.testng.annotations.Test;
/**
* Base class for testing specification resolvers.
@@ -33,17 +34,18 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public abstract class AbstractSpecificationResolverTestCase extends BaseComponentTestCase
{
protected IComponentSpecification newSpecification()
{
- return (IComponentSpecification) newMock(IComponentSpecification.class);
+ return newMock(IComponentSpecification.class);
}
protected IRequestCycle newCycle()
{
- return (IRequestCycle) newMock(IRequestCycle.class);
+ return newMock(IRequestCycle.class);
}
protected URL newURL(String file)
@@ -53,7 +55,7 @@
protected Resource newResource(URL url)
{
- Resource resource = (Resource)newMock(Resource.class);
+ Resource resource = newMock(Resource.class);
expect(resource.getResourceURL()).andReturn(url);
@@ -74,17 +76,17 @@
protected Log newLog()
{
- return (Log) newMock(Log.class);
+ return newMock(Log.class);
}
protected INamespace newNamespace()
{
- return (INamespace) newMock(INamespace.class);
+ return newMock(INamespace.class);
}
protected ISpecificationSource newSource()
{
- return (ISpecificationSource) newMock(ISpecificationSource.class);
+ return newMock(ISpecificationSource.class);
}
protected void trainContainsPage(INamespace namespace, String pageName, boolean containsPage)
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/PageSpecificationResolverTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/PageSpecificationResolverTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/PageSpecificationResolverTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/PageSpecificationResolverTest.java Tue Jun 27 13:38:40 2006
@@ -33,6 +33,7 @@
import org.apache.tapestry.spec.ComponentSpecification;
import org.apache.tapestry.spec.IComponentSpecification;
import org.apache.tapestry.spec.ILibrarySpecification;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.resolver.PageSpecificationResolverImpl}.
@@ -40,6 +41,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class PageSpecificationResolverTest extends AbstractSpecificationResolverTestCase
{
private static class MockApplicationNamespace implements INamespace
@@ -154,7 +156,7 @@
private ISpecificationResolverDelegate newDelegate()
{
- return (ISpecificationResolverDelegate) newMock(ISpecificationResolverDelegate.class);
+ return newMock(ISpecificationResolverDelegate.class);
}
private INamespace newNamespace(String pageName, IComponentSpecification spec)
@@ -171,7 +173,7 @@
private ComponentPropertySource newPropertySource(INamespace namespace)
{
- ComponentPropertySource source = (ComponentPropertySource) newMock(ComponentPropertySource.class);
+ ComponentPropertySource source = newMock(ComponentPropertySource.class);
expect(source.getNamespaceProperty(namespace, Tapestry.TEMPLATE_EXTENSION_PROPERTY))
.andReturn("html");
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/TestComponentSpecificationResolver.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/TestComponentSpecificationResolver.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/TestComponentSpecificationResolver.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/TestComponentSpecificationResolver.java Tue Jun 27 13:38:40 2006
@@ -28,6 +28,7 @@
import org.apache.tapestry.engine.ISpecificationSource;
import org.apache.tapestry.services.ClassFinder;
import org.apache.tapestry.spec.IComponentSpecification;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.resolver.ComponentSpecificationResolverImpl}.
@@ -35,6 +36,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestComponentSpecificationResolver extends AbstractSpecificationResolverTestCase
{
private void trainIsDeprecated(IComponentSpecification spec,
@@ -111,7 +113,7 @@
trainIsDeprecated(spec, true);
- Log log = (Log) newMock(Log.class);
+ Log log = newMock(Log.class);
log
.warn("Component 'MyComponent' (at classpath:/org/apache/tapestry/resolver/TestComponentSpecificationResolver, line 1) is deprecated, and will likely be removed in a later release. Consult its documentation to find a replacement component.");
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/script/TestForeachToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/script/TestForeachToken.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/script/TestForeachToken.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/script/TestForeachToken.java Tue Jun 27 13:38:40 2006
@@ -23,6 +23,7 @@
import java.util.Map;
import org.apache.tapestry.BaseComponentTestCase;
+import org.testng.annotations.Test;
/**
* Tests {@link org.apache.tapestry.script.ForeachToken}.
@@ -30,6 +31,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestForeachToken extends BaseComponentTestCase
{
private static class EchoToken extends AbstractToken
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/script/TestIfToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/script/TestIfToken.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/script/TestIfToken.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/script/TestIfToken.java Tue Jun 27 13:38:40 2006
@@ -21,6 +21,7 @@
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
import org.apache.tapestry.BaseComponentTestCase;
+import org.testng.annotations.Test;
/**
* Tests {@link org.apache.tapestry.script.IfToken}, the basis for the <if> and
@@ -29,6 +30,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestIfToken extends BaseComponentTestCase
{
public void testEvaluateTrue()
@@ -57,7 +59,7 @@
{
ScriptSession s = newMock(ScriptSession.class);
- IScriptToken nested = (IScriptToken) newMock(IScriptToken.class);
+ IScriptToken nested = newMock(IScriptToken.class);
expect(s.evaluate("EXPRESSION", Boolean.class)).andReturn(Boolean.FALSE);
@@ -77,7 +79,7 @@
{
ScriptSession s = newMock(ScriptSession.class);
- IScriptToken nested = (IScriptToken) newMock(IScriptToken.class);
+ IScriptToken nested = newMock(IScriptToken.class);
expect(s.evaluate("EXPRESSION", Boolean.class)).andReturn(Boolean.FALSE);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/TestDataSqueezer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/TestDataSqueezer.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/TestDataSqueezer.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/TestDataSqueezer.java Tue Jun 27 13:38:40 2006
@@ -15,12 +15,14 @@
import org.apache.hivemind.Registry;
import org.apache.hivemind.test.HiveMindTestCase;
+import org.testng.annotations.Test;
/**
*
*
*/
+@Test
public class TestDataSqueezer extends HiveMindTestCase {
public void testPipeline() throws Exception {
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/AbstractEngineServiceProxyTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/AbstractEngineServiceProxyTestCase.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/AbstractEngineServiceProxyTestCase.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/AbstractEngineServiceProxyTestCase.java Tue Jun 27 13:38:40 2006
@@ -30,7 +30,7 @@
{
protected IEngineService newEngineService()
{
- return (IEngineService) newMock(IEngineService.class);
+ return newMock(IEngineService.class);
}
protected void trainGetLink(IEngineService service, boolean post, Object parameter, ILink link)
@@ -40,7 +40,7 @@
protected ILink newLink()
{
- return (ILink) newMock(ILink.class);
+ return newMock(ILink.class);
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/ComponentEventConnectionWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/ComponentEventConnectionWorkerTest.java?rev=417583&r1=417582&r2=417583&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/ComponentEventConnectionWorkerTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/ComponentEventConnectionWorkerTest.java Tue Jun 27 13:38:40 2006
@@ -44,6 +44,7 @@
import org.apache.tapestry.html.Body;
import org.easymock.MockControl;
import org.easymock.classextension.MockClassControl;
+import org.testng.annotations.Test;
/**
@@ -51,6 +52,7 @@
*
* @author jkuhnert
*/
+@Test
public class ComponentEventConnectionWorkerTest extends BaseComponentTestCase
{
@@ -59,14 +61,14 @@
ClassResolver resolver = new DefaultClassResolver();
ComponentEventInvoker invoker = new ComponentEventInvoker();
- IEngineService engine = (IEngineService)newMock(IEngineService.class);
+ IEngineService engine = newMock(IEngineService.class);
IRequestCycle cycle = newCycle();
- IScriptSource scriptSource = (IScriptSource)newMock(IScriptSource.class);
- IScript script = (IScript)newMock(IScript.class);
+ IScriptSource scriptSource = newMock(IScriptSource.class);
+ IScript script = newMock(IScript.class);
PageRenderSupport prs = newPageRenderSupport();
- ILink link = (ILink)newMock(ILink.class);
+ ILink link = newMock(ILink.class);
String compScript = "/org/apache/tapestry/ComponentEvent.script";
String widScript = "/org/apache/tapestry/dojo/html/WidgetEvent.script";
@@ -82,8 +84,8 @@
worker.setEventEngine(engine);
worker.setScriptSource(scriptSource);
- IDirectEvent component = (IDirectEvent)newMock(IDirectEvent.class);
- IWidget widget = (IWidget)newMock(IWidget.class);
+ IDirectEvent component = newMock(IDirectEvent.class);
+ IWidget widget = newMock(IWidget.class);
assertNotNull(worker.getScript(component));
assertEquals(compScript, worker.getScript(component).getPath());
@@ -182,7 +184,7 @@
public void testDeferredConnection()
{
ComponentEventInvoker invoker = new ComponentEventInvoker();
- IEngineService engine = (IEngineService)newMock(IEngineService.class);
+ IEngineService engine = newMock(IEngineService.class);
IRequestCycle cycle = newCycle();
PageRenderSupport prs = newPageRenderSupport();
@@ -190,7 +192,7 @@
worker.setComponentEventInvoker(invoker);
worker.setEventEngine(engine);
- IDirectEvent component = (IDirectEvent)newMock(IDirectEvent.class);
+ IDirectEvent component = newMock(IDirectEvent.class);
// now test render
invoker.addEventListener("comp1", new String[] {"onclick"},
@@ -236,10 +238,10 @@
ClassResolver resolver = new DefaultClassResolver();
ComponentEventInvoker invoker = new ComponentEventInvoker();
- IEngineService engine = (IEngineService)newMock(IEngineService.class);
+ IEngineService engine = newMock(IEngineService.class);
IRequestCycle cycle = newCycle();
- IScriptSource scriptSource = (IScriptSource)newMock(IScriptSource.class);
- IScript script = (IScript)newMock(IScript.class);
+ IScriptSource scriptSource = newMock(IScriptSource.class);
+ IScript script = newMock(IScript.class);
PageRenderSupport prs = newPageRenderSupport();
@@ -253,8 +255,8 @@
worker.setEventEngine(engine);
worker.setScriptSource(scriptSource);
- IDirectEvent component = (IDirectEvent)newMock(IDirectEvent.class);
- IForm form = (IForm)newMock(IForm.class);
+ IDirectEvent component = newMock(IDirectEvent.class);
+ IForm form = newMock(IForm.class);
// now test render
invoker.addEventListener("comp1", new String[] {"onclick"},
@@ -331,8 +333,8 @@
worker.setWidgetScript(widScript);
worker.setElementScript(elementScript);
- IDirectEvent component = (IDirectEvent)newMock(IDirectEvent.class);
- IWidget widget = (IWidget)newMock(IWidget.class);
+ IDirectEvent component = newMock(IDirectEvent.class);
+ IWidget widget = newMock(IWidget.class);
MockControl bodyControl = MockClassControl.createControl(Body.class);
Body body = (Body) bodyControl.getMock();