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 20:56:40 UTC
svn commit: r417554 [1/3] - in
/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry: binding/
callback/ coerce/ components/ describe/ dojo/form/ engine/ engine/encoders/
engine/state/ enhance/ error/ event/ form/ form/translator/ form/valid...
Author: jkuhnert
Date: Tue Jun 27 11:56:34 2006
New Revision: 417554
URL: http://svn.apache.org/viewvc?rev=417554&view=rev
Log:
Fixing casts/annotations
Modified:
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestLiteralBinding.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestMessageBinding.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestDirectCallback.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestExternalCallback.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestPageCallback.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/StringToPropertySelectionModelConverterTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestBooleanConverters.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestIteratorConverters.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestMisc.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestStringConverters.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestTypeConverterWrapper.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestValueConverter.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestAny.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestBlock.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestConditional.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestIfElse.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInsert.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInvokeListener.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestRenderBlock.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/CookieStrategyTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/HTMLDescriptionReceiverTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/ObjectArrayRenderStrategyTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/PreformattedRenderableStrategyTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/ReportStatusHubTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/TestLocationRenderStrategy.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/TestRenderStrategy.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/dojo/form/TestAutocompleter.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectEventServiceTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/EngineServiceLinkTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/EngineUtilsTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ExternalServiceTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/PageServiceTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/RequestCycleTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ResetServiceTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/RestartServiceTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ServiceTestCase.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/TestServiceEncoding.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/AssetEncoderTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestDirectServiceEncoder.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestPageServiceEncoder.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestServiceExtensionEncoder.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestApplicationStateManager.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestInstantiateClassStateObjectFactory.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestNamedClassStateObjectFactory.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSOMRegistry.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/BaseEnhancementTestCase.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/EnhancedClassValidatorTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/InjectAssetWorkerTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/InjectStateFlagWorkerTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestAbstractPropertyWorker.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestAutowireWorker.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestDeferredScript.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestDispatchToInjectWorker.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestEnhanceUtils.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestEnhancementOperation.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectBeanWorker.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectComponentWorker.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectEventInvokerWorker.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectListenerRegistrationWorker.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectMessagesWorker.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectMetaWorker.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectObjectWorker.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectPageWorker.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectScriptWorker.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectSpecificationWorker.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectStateWorker.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestParameterPropertyWorker.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestSpecifiedPropertyWorker.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/error/BaseErrorTestCase.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/error/StaleSessionExceptionPresenterTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/error/TestExceptionPresenter.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/event/ReportStatusEventTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/AbstractFormComponentTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/BaseFormComponentTestCase.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/BeanPropertySelectionModelTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/FormComponentContributorTestCase.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/FormFixture.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/FormSupportTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/FormTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/LabeledPropertySelectionModelTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/LinkSubmitTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestButton.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestCheckbox.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestFormComponentContributorContext.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestImageSubmit.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestListEditMap.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestSubmit.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestTextArea.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestTextField.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestTranslatedFieldSupportImpl.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestValidatableFieldSupportImpl.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestValidationMessages.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TestDateTranslator.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TestStringTranslator.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TestTranslatorBinding.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TranslatorTestCase.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/BaseValidatorTestCase.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestEmail.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMax.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMaxDate.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMaxLength.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMin.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMinDate.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMinLength.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestPattern.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestRequired.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestValidatorFactory.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestValidatorWrapper.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestValidatorsBinding.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/BodyTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/DescribeTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/FrameTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/ScriptTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestImage.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestInsertText.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestPageEvents.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestShell.java
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestLiteralBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestLiteralBinding.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestLiteralBinding.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestLiteralBinding.java Tue Jun 27 11:56:34 2006
@@ -24,6 +24,7 @@
import org.apache.hivemind.Location;
import org.apache.tapestry.BindingException;
import org.apache.tapestry.coerce.ValueConverter;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.binding.LiteralBinding}. It also tests some common
@@ -32,6 +33,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestLiteralBinding extends BindingTestCase
{
public void testGetObject()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestMessageBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestMessageBinding.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestMessageBinding.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestMessageBinding.java Tue Jun 27 11:56:34 2006
@@ -21,6 +21,7 @@
import org.apache.hivemind.Messages;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.coerce.ValueConverter;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.binding.MessageBinding}.
@@ -28,6 +29,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestMessageBinding extends BindingTestCase
{
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestDirectCallback.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestDirectCallback.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestDirectCallback.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestDirectCallback.java Tue Jun 27 11:56:34 2006
@@ -25,10 +25,12 @@
import org.apache.tapestry.IDirect;
import org.apache.tapestry.IPage;
import org.apache.tapestry.IRequestCycle;
+import org.testng.annotations.Test;
/**
* @author Howard M. Lewis Ship
*/
+@Test
public class TestDirectCallback extends BaseComponentTestCase
{
public void testNoParams()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestExternalCallback.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestExternalCallback.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestExternalCallback.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestExternalCallback.java Tue Jun 27 11:56:34 2006
@@ -22,6 +22,7 @@
import org.apache.tapestry.IExternalPage;
import org.apache.tapestry.IPage;
import org.apache.tapestry.IRequestCycle;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.callback.ExternalCallback}.
@@ -29,11 +30,12 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestExternalCallback extends BaseComponentTestCase
{
private IExternalPage newExternalPage()
{
- return (IExternalPage) newMock(IExternalPage.class);
+ return newMock(IExternalPage.class);
}
private IExternalPage newExternalPage(String pageName)
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestPageCallback.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestPageCallback.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestPageCallback.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestPageCallback.java Tue Jun 27 11:56:34 2006
@@ -19,6 +19,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.callback.PageCallback}.
@@ -26,11 +27,12 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestPageCallback extends BaseComponentTestCase
{
public void testByString()
{
- IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
+ IRequestCycle cycle = newMock(IRequestCycle.class);
cycle.activate("Fred");
@@ -47,7 +49,7 @@
public void testByPage()
{
- IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
+ IRequestCycle cycle = newMock(IRequestCycle.class);
IPage page = newPage("Barney");
cycle.activate("Barney");
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/StringToPropertySelectionModelConverterTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/StringToPropertySelectionModelConverterTest.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/StringToPropertySelectionModelConverterTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/StringToPropertySelectionModelConverterTest.java Tue Jun 27 11:56:34 2006
@@ -16,6 +16,7 @@
import org.apache.hivemind.test.HiveMindTestCase;
import org.apache.tapestry.form.IPropertySelectionModel;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.coerce.StringToPropertySelectionModelConverter} and
@@ -24,6 +25,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class StringToPropertySelectionModelConverterTest extends HiveMindTestCase
{
private IPropertySelectionModel newModel(String value)
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestBooleanConverters.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestBooleanConverters.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestBooleanConverters.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestBooleanConverters.java Tue Jun 27 11:56:34 2006
@@ -21,6 +21,7 @@
import java.util.Map;
import org.apache.hivemind.test.HiveMindTestCase;
+import org.testng.annotations.Test;
/**
* Tests several implementations of {@link org.apache.tapestry.coerce.TypeConverter}that return
@@ -29,6 +30,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestBooleanConverters extends HiveMindTestCase
{
public void testStringToBoolean()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestIteratorConverters.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestIteratorConverters.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestIteratorConverters.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestIteratorConverters.java Tue Jun 27 11:56:34 2006
@@ -19,11 +19,13 @@
import java.util.List;
import org.apache.hivemind.test.HiveMindTestCase;
+import org.testng.annotations.Test;
/**
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestIteratorConverters extends HiveMindTestCase
{
public void testObjectToIterator()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestMisc.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestMisc.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestMisc.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestMisc.java Tue Jun 27 11:56:34 2006
@@ -17,6 +17,7 @@
import java.util.Iterator;
import org.apache.hivemind.test.HiveMindTestCase;
+import org.testng.annotations.Test;
/**
* Tests for random, simple converters.
@@ -24,6 +25,7 @@
* @author Howard Lewis Ship
* @since 4.0
*/
+@Test
public class TestMisc extends HiveMindTestCase
{
public void testCharArrayToIteratorConverter()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestStringConverters.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestStringConverters.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestStringConverters.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestStringConverters.java Tue Jun 27 11:56:34 2006
@@ -15,11 +15,13 @@
package org.apache.tapestry.coerce;
import org.apache.hivemind.test.HiveMindTestCase;
+import org.testng.annotations.Test;
/**
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestStringConverters extends HiveMindTestCase
{
public void testObjectToString()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestTypeConverterWrapper.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestTypeConverterWrapper.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestTypeConverterWrapper.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestTypeConverterWrapper.java Tue Jun 27 11:56:34 2006
@@ -21,6 +21,7 @@
import java.util.Collections;
import org.apache.tapestry.BaseComponentTestCase;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.coerce.TypeConverterWrapper}.
@@ -28,6 +29,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestTypeConverterWrapper extends BaseComponentTestCase
{
public void testNonNull()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestValueConverter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestValueConverter.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestValueConverter.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestValueConverter.java Tue Jun 27 11:56:34 2006
@@ -24,6 +24,7 @@
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.tapestry.BaseComponentTestCase;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.coerce.ValueConverterImpl}.
@@ -31,6 +32,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestValueConverter extends BaseComponentTestCase
{
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestAny.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestAny.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestAny.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestAny.java Tue Jun 27 11:56:34 2006
@@ -25,6 +25,7 @@
import org.apache.tapestry.IRender;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.spec.ComponentSpecification;
+import org.testng.annotations.Test;
/**
* Tests for the {@link org.apache.tapestry.components.Any} component.
@@ -32,18 +33,19 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestAny extends BaseComponentTestCase
{
public void testElementNull()
{
IMarkupWriter writer = newWriter();
- IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
+ IRequestCycle cycle = newMock(IRequestCycle.class);
Location l = newLocation();
replay();
- Any any = (Any) newInstance(Any.class, new Object[] { "location", l });
+ Any any = newInstance(Any.class, new Object[] { "location", l });
try
{
@@ -74,7 +76,7 @@
replay();
- Any any = (Any) newInstance(Any.class,
+ Any any = newInstance(Any.class,
new Object[] { "element", "span" });
any.addBody(body);
@@ -100,7 +102,7 @@
replay();
- Any any = (Any) newInstance(Any.class, new Object[] { "element",
+ Any any = newInstance(Any.class, new Object[] { "element",
"span", "specification", new ComponentSpecification() });
any.addBody(body);
@@ -121,7 +123,7 @@
replay();
- Any any = (Any) newInstance(Any.class,
+ Any any = newInstance(Any.class,
new Object[] { "element", "span" });
any.addBody(body);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestBlock.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestBlock.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestBlock.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestBlock.java Tue Jun 27 11:56:34 2006
@@ -24,6 +24,7 @@
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRender;
import org.apache.tapestry.IRequestCycle;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.components.Block}.
@@ -31,6 +32,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestBlock extends BaseComponentTestCase
{
public void testRender()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestConditional.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestConditional.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestConditional.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestConditional.java Tue Jun 27 11:56:34 2006
@@ -20,6 +20,7 @@
import org.apache.tapestry.IRender;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.spec.IComponentSpecification;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.components.Conditional} component.
@@ -27,11 +28,12 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestConditional extends BaseComponentTestCase
{
private IRender newRender(IMarkupWriter writer, IRequestCycle cycle)
{
- IRender render = (IRender) newMock(IRender.class);
+ IRender render = newMock(IRender.class);
render.render(writer, cycle);
@@ -40,7 +42,7 @@
public void testFalseAndFalse()
{
- Conditional conditional = (Conditional) newInstance(Conditional.class, new Object[]
+ Conditional conditional = newInstance(Conditional.class, new Object[]
{ "condition", Boolean.FALSE, "invert", Boolean.FALSE });
conditional.renderComponent(null, null);
@@ -48,7 +50,7 @@
public void testTrueAndTrue()
{
- Conditional conditional = (Conditional) newInstance(Conditional.class, new Object[]
+ Conditional conditional = newInstance(Conditional.class, new Object[]
{ "condition", Boolean.TRUE, "invert", Boolean.TRUE });
conditional.renderComponent(null, null);
@@ -62,7 +64,7 @@
replay();
- Conditional conditional = (Conditional) newInstance(Conditional.class, new Object[]
+ Conditional conditional = newInstance(Conditional.class, new Object[]
{ "condition", Boolean.TRUE });
conditional.addBody(body);
@@ -79,7 +81,7 @@
replay();
- Conditional conditional = (Conditional) newInstance(Conditional.class, new Object[]
+ Conditional conditional = newInstance(Conditional.class, new Object[]
{ "condition", Boolean.TRUE, "element", "div" });
conditional.addBody(body);
@@ -110,7 +112,7 @@
replay();
- Conditional conditional = (Conditional) newInstance(Conditional.class, new Object[]
+ Conditional conditional = newInstance(Conditional.class, new Object[]
{ "condition", Boolean.TRUE, "element", "div", "specification", spec });
conditional.addBody(body);
conditional.setBinding("informal", informal);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestIfElse.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestIfElse.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestIfElse.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestIfElse.java Tue Jun 27 11:56:34 2006
@@ -26,6 +26,7 @@
import org.apache.tapestry.services.DataSqueezer;
import org.apache.tapestry.spec.IComponentSpecification;
import org.apache.tapestry.util.io.DataSqueezerUtil;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.components.If}
@@ -35,11 +36,12 @@
* @author Mindbridge
* @since 4.0
*/
+@Test
public class TestIfElse extends BaseComponentTestCase
{
private IRender newRender(IMarkupWriter writer, IRequestCycle cycle)
{
- IRender render = (IRender) newMock(IRender.class);
+ IRender render = newMock(IRender.class);
render.render(writer, cycle);
@@ -48,7 +50,7 @@
public void testRenderPlainTrue()
{
- IRequestCycle cycle = (IRequestCycle) newMock(IRequestCycle.class);
+ IRequestCycle cycle = newMock(IRequestCycle.class);
IMarkupWriter writer = newWriter();
@@ -67,7 +69,7 @@
replay();
- IfBean conditional = (IfBean) newInstance(IfBean.class, new Object[]
+ IfBean conditional = newInstance(IfBean.class, new Object[]
{ "condition", Boolean.TRUE });
conditional.addBody(body);
@@ -102,7 +104,7 @@
replay();
- IfBean conditional = (IfBean) newInstance(IfBean.class, new Object[]
+ IfBean conditional = newInstance(IfBean.class, new Object[]
{ "condition", Boolean.FALSE });
conditional.addBody(body);
conditional.render(writer, cycle);
@@ -118,7 +120,7 @@
{
IMarkupWriter writer = newWriter();
- IfBean conditional = (IfBean) newInstance(TestIfBean.class,
+ IfBean conditional = newInstance(TestIfBean.class,
new Object[] { "condition", Boolean.TRUE });
IForm form = newMock(IForm.class);
@@ -158,7 +160,7 @@
{
IMarkupWriter writer = newWriter();
- IfBean conditional = (IfBean) newInstance(TestIfBean.class,
+ IfBean conditional = newInstance(TestIfBean.class,
new Object[] { "condition", Boolean.FALSE });
IRequestCycle cycle = newCycle();
@@ -200,7 +202,7 @@
{
IMarkupWriter writer = newWriter();
- IfBean conditional = (IfBean) newInstance(TestIfBean.class,
+ IfBean conditional = newInstance(TestIfBean.class,
new Object[] { "condition", Boolean.TRUE, "element", "div" });
IForm form = newMock(IForm.class);
@@ -241,7 +243,7 @@
{
IMarkupWriter writer = newWriter();
- IfBean conditional = (IfBean) newInstance(TestIfBean.class,
+ IfBean conditional = newInstance(TestIfBean.class,
new Object[] { "condition", Boolean.TRUE, "element", "div" });
IForm form = newMock(IForm.class);
@@ -307,7 +309,7 @@
replay();
- IfBean conditional = (IfBean) newInstance(TestIfBean.class, new Object[]
+ IfBean conditional = newInstance(TestIfBean.class, new Object[]
{ "condition", Boolean.TRUE, "element", "div", "specification", spec });
conditional.addBody(body);
conditional.setBinding("informal", informal);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInsert.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInsert.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInsert.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInsert.java Tue Jun 27 11:56:34 2006
@@ -30,6 +30,7 @@
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.html.BasePage;
import org.apache.tapestry.spec.IComponentSpecification;
+import org.testng.annotations.Test;
/**
* Tests for the {@link org.apache.tapestry.components.Insert} component.
@@ -37,6 +38,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestInsert extends BaseComponentTestCase
{
/**
@@ -71,7 +73,7 @@
replay();
- Insert insert = (Insert) newInstance(Insert.class, new Object[]
+ Insert insert = newInstance(Insert.class, new Object[]
{ "value", null });
insert.render(null, cycle);
@@ -88,7 +90,7 @@
replay();
- Insert insert = (Insert) newInstance(Insert.class, new Object[]
+ Insert insert = newInstance(Insert.class, new Object[]
{ "value", new Integer(42) });
insert.render(writer, cycle);
@@ -109,7 +111,7 @@
replay();
- Insert insert = (Insert) newInstance(Insert.class, new Object[]
+ Insert insert = newInstance(Insert.class, new Object[]
{ "value", date, "format", format });
insert.render(writer, cycle);
@@ -132,7 +134,7 @@
replay();
- Insert insert = (Insert) newInstance(Insert.class, new Object[]
+ Insert insert = newInstance(Insert.class, new Object[]
{ "value", value, "format", format });
insert.setBinding("format", binding);
insert.setId("fred");
@@ -165,7 +167,7 @@
replay();
- Insert insert = (Insert) newInstance(Insert.class, new Object[]
+ Insert insert = newInstance(Insert.class, new Object[]
{ "value", new Integer(42), "raw", Boolean.TRUE });
insert.render(writer, cycle);
@@ -189,7 +191,7 @@
replay();
- Insert insert = (Insert) newInstance(Insert.class, new Object[]
+ Insert insert = newInstance(Insert.class, new Object[]
{ "value", "42", "specification", spec, "styleClass", "paisley" });
insert.setBinding("informal", informal);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInvokeListener.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInvokeListener.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInvokeListener.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInvokeListener.java Tue Jun 27 11:56:34 2006
@@ -22,6 +22,7 @@
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.listener.ListenerInvoker;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.components.InvokeListener}.
@@ -29,29 +30,30 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestInvokeListener extends BaseComponentTestCase
{
private IActionListener newListener()
{
- return (IActionListener) newMock(IActionListener.class);
+ return newMock(IActionListener.class);
}
private ListenerInvoker newInvoker()
{
- return (ListenerInvoker) newMock(ListenerInvoker.class);
+ return newMock(ListenerInvoker.class);
}
public void testSuccess()
{
IMarkupWriter writer = newWriter();
- IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
+ IRequestCycle cycle = newMock(IRequestCycle.class);
IActionListener listener = newListener();
ListenerInvoker invoker = newInvoker();
Object[] parameters = new Object[0];
- InvokeListener component = (InvokeListener) newInstance(InvokeListener.class, new Object[]
+ InvokeListener component = newInstance(InvokeListener.class, new Object[]
{ "listener", listener, "parameters", parameters, "listenerInvoker", invoker, });
cycle.setListenerParameters(parameters);
@@ -68,7 +70,7 @@
public void testEnsureParametersClearedAfterException()
{
IMarkupWriter writer = newWriter();
- IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
+ IRequestCycle cycle = newMock(IRequestCycle.class);
IActionListener listener = newListener();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestRenderBlock.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestRenderBlock.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestRenderBlock.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestRenderBlock.java Tue Jun 27 11:56:34 2006
@@ -17,6 +17,7 @@
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRequestCycle;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.components.RenderBlock} component.
@@ -24,6 +25,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestRenderBlock extends BaseComponentTestCase
{
public void testNullBlock()
@@ -31,7 +33,7 @@
RenderBlock rb = (RenderBlock) newInstance(RenderBlock.class);
IMarkupWriter writer = newWriter();
- IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
+ IRequestCycle cycle = newMock(IRequestCycle.class);
replay();
@@ -44,11 +46,11 @@
{
Block b = newMock(Block.class);
- RenderBlock rb = (RenderBlock) newInstance(RenderBlock.class, new Object[]
+ RenderBlock rb = newInstance(RenderBlock.class, new Object[]
{ "block", b });
IMarkupWriter writer = newWriter();
- IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
+ IRequestCycle cycle = newMock(IRequestCycle.class);
b.renderForComponent(writer, cycle, rb);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/CookieStrategyTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/CookieStrategyTest.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/CookieStrategyTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/CookieStrategyTest.java Tue Jun 27 11:56:34 2006
@@ -16,11 +16,14 @@
import javax.servlet.http.Cookie;
+import org.testng.annotations.Test;
+
/**
* Tests for {@link org.apache.tapestry.describe.CookieStrategy}.
*
* @author Howard M. Lewis Ship
*/
+@Test
public class CookieStrategyTest extends BaseDescribeTestCase
{
public void testDescribeObject()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/HTMLDescriptionReceiverTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/HTMLDescriptionReceiverTest.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/HTMLDescriptionReceiverTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/HTMLDescriptionReceiverTest.java Tue Jun 27 11:56:34 2006
@@ -22,6 +22,7 @@
import java.util.Collections;
import org.apache.tapestry.IMarkupWriter;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.describe.HTMLDescriptionReceiver}and
@@ -30,11 +31,12 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class HTMLDescriptionReceiverTest extends BaseDescribeTestCase
{
protected DescribableStrategy newStrategy()
{
- return (DescribableStrategy) newMock(DescribableStrategy.class);
+ return newMock(DescribableStrategy.class);
}
private void trainForTitle(IMarkupWriter writer, String title)
@@ -432,7 +434,7 @@
protected RootDescriptionReceiverFactory newReceiverFactory()
{
- return (RootDescriptionReceiverFactory) newMock(RootDescriptionReceiverFactory.class);
+ return newMock(RootDescriptionReceiverFactory.class);
}
public void testDescribeAlternate()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/ObjectArrayRenderStrategyTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/ObjectArrayRenderStrategyTest.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/ObjectArrayRenderStrategyTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/ObjectArrayRenderStrategyTest.java Tue Jun 27 11:56:34 2006
@@ -55,7 +55,7 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
- RenderStrategy strategy = (RenderStrategy) newMock(RenderStrategy.class);
+ RenderStrategy strategy = newMock(RenderStrategy.class);
// Alas; this doesn't *prove* that the code executes
// in the right order, just that the messages for
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/PreformattedRenderableStrategyTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/PreformattedRenderableStrategyTest.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/PreformattedRenderableStrategyTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/PreformattedRenderableStrategyTest.java Tue Jun 27 11:56:34 2006
@@ -16,12 +16,14 @@
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRequestCycle;
+import org.testng.annotations.Test;
/**
* Tests for {@link PreformattedRenderStrategy}.
*
* @author Howard M. Lewis Ship
*/
+@Test
public class PreformattedRenderableStrategyTest extends BaseDescribeTestCase
{
public void testRenderObject()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/ReportStatusHubTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/ReportStatusHubTest.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/ReportStatusHubTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/ReportStatusHubTest.java Tue Jun 27 11:56:34 2006
@@ -19,6 +19,7 @@
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.event.ReportStatusEvent;
import org.apache.tapestry.event.ReportStatusListener;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.describe.ReportStatusHubImpl}.
@@ -26,6 +27,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class ReportStatusHubTest extends BaseDescribeTestCase
{
public RootDescriptionReceiverFactory newReceiverFactory(IMarkupWriter writer,
@@ -40,7 +42,7 @@
protected RootDescriptionReceiverFactory newReceiverFactory()
{
- return (RootDescriptionReceiverFactory) newMock(RootDescriptionReceiverFactory.class);
+ return newMock(RootDescriptionReceiverFactory.class);
}
public static class ListenerFixture implements ReportStatusListener
@@ -99,6 +101,6 @@
protected RootDescriptionReciever newRootReceiver()
{
- return (RootDescriptionReciever) newMock(RootDescriptionReciever.class);
+ return newMock(RootDescriptionReciever.class);
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/TestLocationRenderStrategy.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/TestLocationRenderStrategy.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/TestLocationRenderStrategy.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/TestLocationRenderStrategy.java Tue Jun 27 11:56:34 2006
@@ -24,6 +24,7 @@
import org.apache.hivemind.util.URLResource;
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRequestCycle;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.describe.LocationRenderStrategy}.
@@ -31,6 +32,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestLocationRenderStrategy extends BaseDescribeTestCase
{
private Resource newResource(URL url)
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/TestRenderStrategy.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/TestRenderStrategy.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/TestRenderStrategy.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/TestRenderStrategy.java Tue Jun 27 11:56:34 2006
@@ -17,6 +17,7 @@
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRender;
import org.apache.tapestry.IRequestCycle;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.describe.RenderableAdapterFactoryImpl},
@@ -26,11 +27,12 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestRenderStrategy extends BaseDescribeTestCase
{
private RenderStrategy newStrategy()
{
- return (RenderStrategy) newMock(RenderStrategy.class);
+ return newMock(RenderStrategy.class);
}
public void testRenderBridge()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/dojo/form/TestAutocompleter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/dojo/form/TestAutocompleter.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/dojo/form/TestAutocompleter.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/dojo/form/TestAutocompleter.java Tue Jun 27 11:56:34 2006
@@ -36,6 +36,7 @@
import org.apache.tapestry.json.IJSONWriter;
import org.apache.tapestry.valid.IValidationDelegate;
import org.apache.tapestry.valid.ValidatorException;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.form.TextField}.
@@ -43,19 +44,20 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestAutocompleter extends BaseFormComponentTestCase
{
public void testRewind()
{
String[] values = { "red", "green", "blue" };
StringPropertySelectionModel model = new StringPropertySelectionModel(values);
- ValidatableFieldSupport vfs = (ValidatableFieldSupport)newMock(ValidatableFieldSupport.class);
+ ValidatableFieldSupport vfs = newMock(ValidatableFieldSupport.class);
- Autocompleter component = (Autocompleter) newInstance(Autocompleter.class, new Object[]
+ Autocompleter component = newInstance(Autocompleter.class, new Object[]
{ "model", model, "validatableFieldSupport", vfs });
- IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
- IForm form = (IForm) newMock(IForm.class);
+ IRequestCycle cycle = newMock(IRequestCycle.class);
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newWriter();
@@ -97,8 +99,8 @@
{
Autocompleter component = (Autocompleter) newInstance(Autocompleter.class);
- IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
- IForm form = (IForm) newMock(IForm.class);
+ IRequestCycle cycle = newMock(IRequestCycle.class);
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newWriter();
@@ -126,10 +128,10 @@
String[] values = { "red", "green", "blue" };
StringPropertySelectionModel model = new StringPropertySelectionModel(values);
- ValidatableFieldSupport vfs = (ValidatableFieldSupport) newMock(ValidatableFieldSupport.class);
+ ValidatableFieldSupport vfs = newMock(ValidatableFieldSupport.class);
- IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
- IForm form = (IForm) newMock(IForm.class);
+ IRequestCycle cycle = newMock(IRequestCycle.class);
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newBufferWriter();
@@ -138,9 +140,9 @@
IEngineService engine = newEngineService();
ILink link = newLink();
- IScript script = (IScript)newMock(IScript.class);
+ IScript script = newMock(IScript.class);
- Autocompleter component = (Autocompleter) newInstance(Autocompleter.class, new Object[]
+ Autocompleter component = newInstance(Autocompleter.class, new Object[]
{ "name", "fred", "model", model,
"directService", engine,
"script", script,
@@ -192,11 +194,11 @@
String[] values = { "red", "green", "blue", "yellow" };
StringPropertySelectionModel model = new StringPropertySelectionModel(values);
- IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
+ IRequestCycle cycle = newMock(IRequestCycle.class);
IJSONWriter json = newBufferJSONWriter();
- Autocompleter component = (Autocompleter) newInstance(Autocompleter.class, new Object[]
+ Autocompleter component = newInstance(Autocompleter.class, new Object[]
{ "name", "fred", "model", model,
"filter", "l" });
@@ -213,9 +215,9 @@
public void testIsRequired()
{
- ValidatableFieldSupport support = (ValidatableFieldSupport)newMock(ValidatableFieldSupport.class);
+ ValidatableFieldSupport support = newMock(ValidatableFieldSupport.class);
- Autocompleter field = (Autocompleter) newInstance(Autocompleter.class, new Object[]
+ Autocompleter field = newInstance(Autocompleter.class, new Object[]
{ "validatableFieldSupport", support, });
expect(support.isRequired(field)).andReturn(true);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java Tue Jun 27 11:56:34 2006
@@ -33,6 +33,7 @@
import org.apache.tapestry.services.ServiceConstants;
import org.apache.tapestry.web.WebRequest;
import org.apache.tapestry.web.WebSession;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.engine.ActionService}.
@@ -40,6 +41,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class ActionServiceTest extends ServiceTestCase
{
public void testGetLinkSimple()
@@ -192,7 +194,7 @@
private IAction newAction()
{
- return (IAction) newMock(IAction.class);
+ return newMock(IAction.class);
}
public void testSeviceActiveSession() throws Exception
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectEventServiceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectEventServiceTest.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectEventServiceTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectEventServiceTest.java Tue Jun 27 11:56:34 2006
@@ -35,6 +35,7 @@
import org.apache.tapestry.services.ServiceConstants;
import org.apache.tapestry.web.WebRequest;
import org.apache.tapestry.web.WebSession;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.engine.DirectService}.
@@ -42,11 +43,12 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class DirectEventServiceTest extends ServiceTestCase
{
protected IDirectEvent newDirect()
{
- return (IDirectEvent) newMock(IDirectEvent.class);
+ return newMock(IDirectEvent.class);
}
public void testGetLinkOnSamePage()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java Tue Jun 27 11:56:34 2006
@@ -33,6 +33,7 @@
import org.apache.tapestry.services.ServiceConstants;
import org.apache.tapestry.web.WebRequest;
import org.apache.tapestry.web.WebSession;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.engine.DirectService}.
@@ -40,11 +41,12 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class DirectServiceTest extends ServiceTestCase
{
protected IDirect newDirect()
{
- return (IDirect) newMock(IDirect.class);
+ return newMock(IDirect.class);
}
public void testGetLinkOnSamePage()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/EngineServiceLinkTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/EngineServiceLinkTest.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/EngineServiceLinkTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/EngineServiceLinkTest.java Tue Jun 27 11:56:34 2006
@@ -24,6 +24,7 @@
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.services.ServiceConstants;
import org.apache.tapestry.web.WebRequest;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.engine.EngineServiceLink}.
@@ -31,6 +32,7 @@
* @author Howard Lewis Ship
* @since 3.0
*/
+@Test
public class EngineServiceLinkTest extends BaseComponentTestCase
{
private URLCodec _urlCodec = new URLCodec();
@@ -116,7 +118,7 @@
public void testGetURLWithAnchor()
{
WebRequest request = newRequest();
- IRequestCycle rc = (IRequestCycle) newMock(IRequestCycle.class);
+ IRequestCycle rc = newMock(IRequestCycle.class);
EngineServiceLink l = new EngineServiceLink(rc, "/context/servlet", ENCODING, _urlCodec,
request, buildParameters("myservice", null), false);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/EngineUtilsTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/EngineUtilsTest.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/EngineUtilsTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/EngineUtilsTest.java Tue Jun 27 11:56:34 2006
@@ -17,6 +17,7 @@
import static org.testng.AssertJUnit.assertEquals;
import org.apache.tapestry.web.WebRequest;
+import org.testng.annotations.Test;
/**
* Tests for code inside {@link org.apache.tapestry.engine.EngineUtils}.
@@ -24,6 +25,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class EngineUtilsTest extends ServiceTestCase
{
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ExternalServiceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ExternalServiceTest.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ExternalServiceTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ExternalServiceTest.java Tue Jun 27 11:56:34 2006
@@ -28,6 +28,7 @@
import org.apache.tapestry.services.LinkFactory;
import org.apache.tapestry.services.ResponseRenderer;
import org.apache.tapestry.services.ServiceConstants;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.engine.ExternalService}.
@@ -35,6 +36,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class ExternalServiceTest extends ServiceTestCase
{
public void testGetLink()
@@ -64,7 +66,7 @@
public void testService() throws Exception
{
IRequestCycle cycle = newCycle();
- IExternalPage page = (IExternalPage) newMock(IExternalPage.class);
+ IExternalPage page = newMock(IExternalPage.class);
Object[] parameters = new Object[0];
LinkFactory lf = newLinkFactory();
ResponseRenderer rr = newResponseRenderer();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/PageServiceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/PageServiceTest.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/PageServiceTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/PageServiceTest.java Tue Jun 27 11:56:34 2006
@@ -23,11 +23,13 @@
import org.apache.tapestry.services.LinkFactory;
import org.apache.tapestry.services.ResponseRenderer;
import org.apache.tapestry.services.ServiceConstants;
+import org.testng.annotations.Test;
/**
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class PageServiceTest extends ServiceTestCase
{
public void testGetLink()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/RequestCycleTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/RequestCycleTest.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/RequestCycleTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/RequestCycleTest.java Tue Jun 27 11:56:34 2006
@@ -29,6 +29,7 @@
import org.apache.tapestry.services.Infrastructure;
import org.apache.tapestry.services.ServiceMap;
import org.apache.tapestry.util.QueryParameterMap;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.engine.RequestCycle}. Mostly just tests changes for 4.0
@@ -37,6 +38,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class RequestCycleTest extends HiveMindTestCase
{
private IEngine newEngine()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ResetServiceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ResetServiceTest.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ResetServiceTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ResetServiceTest.java Tue Jun 27 11:56:34 2006
@@ -26,6 +26,7 @@
import org.apache.tapestry.services.ResetEventHub;
import org.apache.tapestry.services.ResponseRenderer;
import org.apache.tapestry.services.ServiceConstants;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.engine.ResetService}.
@@ -33,6 +34,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class ResetServiceTest extends ServiceTestCase
{
public void testGetLink()
@@ -64,7 +66,7 @@
public void testService() throws Exception
{
IRequestCycle cycle = newCycle();
- ResetEventHub hub = (ResetEventHub) newMock(ResetEventHub.class);
+ ResetEventHub hub = newMock(ResetEventHub.class);
ResponseRenderer rr = newResponseRenderer();
trainGetParameter(cycle, ServiceConstants.PAGE, "TargetPage");
@@ -90,7 +92,7 @@
public void testServiceNotEnabled() throws Exception
{
IRequestCycle cycle = newCycle();
- ResetEventHub hub = (ResetEventHub) newMock(ResetEventHub.class);
+ ResetEventHub hub = newMock(ResetEventHub.class);
ResponseRenderer rr = newResponseRenderer();
trainGetParameter(cycle, ServiceConstants.PAGE, "TargetPage");
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/RestartServiceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/RestartServiceTest.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/RestartServiceTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/RestartServiceTest.java Tue Jun 27 11:56:34 2006
@@ -23,6 +23,7 @@
import org.apache.commons.logging.Log;
import org.apache.tapestry.IRequestCycle;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.engine.RestartService}.
@@ -30,6 +31,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class RestartServiceTest extends ServiceTestCase
{
public void testNoSession() throws Exception
@@ -64,12 +66,12 @@
private HttpServletResponse newServletResponse()
{
- return (HttpServletResponse) newMock(HttpServletResponse.class);
+ return newMock(HttpServletResponse.class);
}
private HttpServletRequest newServletRequest()
{
- return (HttpServletRequest) newMock(HttpServletRequest.class);
+ return newMock(HttpServletRequest.class);
}
public void testWithSession() throws Exception
@@ -104,7 +106,7 @@
private HttpSession newHttpSession()
{
- return (HttpSession) newMock(HttpSession.class);
+ return newMock(HttpSession.class);
}
public void testErrorInvalidatingSession() throws Exception
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ServiceTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ServiceTestCase.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ServiceTestCase.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ServiceTestCase.java Tue Jun 27 11:56:34 2006
@@ -30,6 +30,7 @@
import org.apache.tapestry.services.ResponseRenderer;
import org.apache.tapestry.web.WebRequest;
import org.apache.tapestry.web.WebSession;
+import org.testng.annotations.Test;
/**
* Common utilities for building tests for {@link org.apache.tapestry.engine.IEngineService}s.
@@ -37,12 +38,13 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public abstract class ServiceTestCase extends BaseComponentTestCase
{
protected IPage newPage(String name)
{
- IPage result = (IPage) newMock(IPage.class);
+ IPage result = newMock(IPage.class);
expect(result.getPageName()).andReturn(name);
return result;
@@ -50,7 +52,7 @@
protected HttpServletRequest newRequest(HttpSession session)
{
- HttpServletRequest result = (HttpServletRequest) newMock(HttpServletRequest.class);
+ HttpServletRequest result = newMock(HttpServletRequest.class);
expect(result.getSession()).andReturn(session);
@@ -59,7 +61,7 @@
protected WebRequest newWebRequest(WebSession session)
{
- WebRequest result = (WebRequest) newMock(WebRequest.class);
+ WebRequest result = newMock(WebRequest.class);
expect(result.getSession(false)).andReturn(session);
@@ -68,7 +70,7 @@
protected HttpServletRequest newRequest(boolean create, HttpSession session)
{
- HttpServletRequest result = (HttpServletRequest) newMock(HttpServletRequest.class);
+ HttpServletRequest result = newMock(HttpServletRequest.class);
expect(result.getSession(create)).andReturn(session);
@@ -77,7 +79,7 @@
protected WebRequest newWebRequest(boolean create, WebSession session)
{
- WebRequest result = (WebRequest) newMock(WebRequest.class);
+ WebRequest result = newMock(WebRequest.class);
expect(result.getSession(create)).andReturn(session);
@@ -104,22 +106,22 @@
protected HttpSession newSession()
{
- return (HttpSession) newMock(HttpSession.class);
+ return newMock(HttpSession.class);
}
protected WebSession newWebSession()
{
- return (WebSession) newMock(WebSession.class);
+ return newMock(WebSession.class);
}
protected ILink newLink()
{
- return (ILink) newMock(ILink.class);
+ return newMock(ILink.class);
}
protected LinkFactory newLinkFactory(Map parameters, boolean stateful, ILink link)
{
- LinkFactory lf = (LinkFactory) newMock(LinkFactory.class);
+ LinkFactory lf = newMock(LinkFactory.class);
expect(lf.constructLink(null, false, parameters, stateful)).andReturn(link);
@@ -128,7 +130,7 @@
protected ResponseRenderer newResponseRenderer()
{
- return (ResponseRenderer) newMock(ResponseRenderer.class);
+ return newMock(ResponseRenderer.class);
}
protected void trainConstructLink(LinkFactory linkFactory, IEngineService service,
@@ -139,7 +141,7 @@
protected LinkFactory newLinkFactory()
{
- return (LinkFactory) newMock(LinkFactory.class);
+ return newMock(LinkFactory.class);
}
protected void trainGetPage(IRequestCycle cycle, IPage page)
@@ -169,7 +171,7 @@
protected Log newLog()
{
- return (Log) newMock(Log.class);
+ return newMock(Log.class);
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/TestServiceEncoding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/TestServiceEncoding.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/TestServiceEncoding.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/TestServiceEncoding.java Tue Jun 27 11:56:34 2006
@@ -18,12 +18,14 @@
import java.util.Map;
import org.apache.hivemind.test.HiveMindTestCase;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.engine.ServiceEncodingImpl}.
*
* @author Howard M. Lewis Ship
*/
+@Test
public class TestServiceEncoding extends HiveMindTestCase
{
public void testSetServletPath()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/AssetEncoderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/AssetEncoderTest.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/AssetEncoderTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/AssetEncoderTest.java Tue Jun 27 11:56:34 2006
@@ -20,6 +20,7 @@
import org.apache.tapestry.asset.AssetService;
import org.apache.tapestry.engine.ServiceEncoding;
import org.apache.tapestry.services.ServiceConstants;
+import org.testng.annotations.Test;
import com.javaforge.tapestry.testng.TestBase;
@@ -29,6 +30,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class AssetEncoderTest extends TestBase
{
public void testWrongService()
@@ -51,7 +53,7 @@
protected ServiceEncoding newEncoding()
{
- return (ServiceEncoding) newMock(ServiceEncoding.class);
+ return newMock(ServiceEncoding.class);
}
public void testWrongPath()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestDirectServiceEncoder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestDirectServiceEncoder.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestDirectServiceEncoder.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestDirectServiceEncoder.java Tue Jun 27 11:56:34 2006
@@ -20,6 +20,7 @@
import org.apache.tapestry.Tapestry;
import org.apache.tapestry.engine.ServiceEncoding;
import org.apache.tapestry.services.ServiceConstants;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.engine.encoders.DirectServiceEncoder}.
@@ -27,6 +28,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestDirectServiceEncoder extends BaseComponentTestCase
{
private ServiceEncoding newEncoding(String servletPath)
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestPageServiceEncoder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestPageServiceEncoder.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestPageServiceEncoder.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestPageServiceEncoder.java Tue Jun 27 11:56:34 2006
@@ -19,6 +19,7 @@
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.engine.ServiceEncoding;
import org.apache.tapestry.services.ServiceConstants;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.engine.encoders.PageServiceEncoder}.
@@ -26,6 +27,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestPageServiceEncoder extends BaseComponentTestCase
{
public void testEncodeOtherService()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestServiceExtensionEncoder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestServiceExtensionEncoder.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestServiceExtensionEncoder.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestServiceExtensionEncoder.java Tue Jun 27 11:56:34 2006
@@ -19,6 +19,7 @@
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.engine.ServiceEncoding;
import org.apache.tapestry.services.ServiceConstants;
+import org.testng.annotations.Test;
/**
* Tests {@link org.apache.tapestry.engine.encoders.ServiceExtensionEncoder}.
@@ -26,6 +27,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestServiceExtensionEncoder extends BaseComponentTestCase
{
public void testEncode()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestApplicationStateManager.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestApplicationStateManager.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestApplicationStateManager.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestApplicationStateManager.java Tue Jun 27 11:56:34 2006
@@ -19,6 +19,7 @@
import static org.testng.AssertJUnit.assertSame;
import org.apache.tapestry.BaseComponentTestCase;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.engine.state.ApplicationStateManagerImpl}.
@@ -26,6 +27,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestApplicationStateManager extends BaseComponentTestCase
{
private StateObjectManagerRegistry newRegistry(String name,
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestInstantiateClassStateObjectFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestInstantiateClassStateObjectFactory.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestInstantiateClassStateObjectFactory.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestInstantiateClassStateObjectFactory.java Tue Jun 27 11:56:34 2006
@@ -19,6 +19,7 @@
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
import org.apache.hivemind.test.HiveMindTestCase;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.engine.state.InstantiateClassStateObjectFactory}.
@@ -26,6 +27,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestInstantiateClassStateObjectFactory extends HiveMindTestCase
{
public void testSuccess()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestNamedClassStateObjectFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestNamedClassStateObjectFactory.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestNamedClassStateObjectFactory.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestNamedClassStateObjectFactory.java Tue Jun 27 11:56:34 2006
@@ -21,11 +21,13 @@
import org.apache.hivemind.Location;
import org.apache.hivemind.impl.DefaultClassResolver;
import org.apache.hivemind.test.HiveMindTestCase;
+import org.testng.annotations.Test;
/**
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestNamedClassStateObjectFactory extends HiveMindTestCase
{
public void testSuccess()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSOMRegistry.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSOMRegistry.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSOMRegistry.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSOMRegistry.java Tue Jun 27 11:56:34 2006
@@ -26,6 +26,7 @@
import org.apache.hivemind.ErrorLog;
import org.apache.hivemind.Location;
import org.apache.tapestry.BaseComponentTestCase;
+import org.testng.annotations.Test;
/**
* Tests {@link TestSOMRegistry}.
@@ -33,6 +34,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestSOMRegistry extends BaseComponentTestCase
{
public void testInitializeAndGet()
@@ -74,7 +76,7 @@
public void testInitializeUnknownScope()
{
Location l = fabricateLocation(55);
- ErrorLog log = (ErrorLog) newMock(ErrorLog.class);
+ ErrorLog log = newMock(ErrorLog.class);
StateObjectContribution c = new StateObjectContribution();
c.setName("fred");
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java Tue Jun 27 11:56:34 2006
@@ -22,6 +22,7 @@
import org.apache.tapestry.SessionStoreOptimized;
import org.apache.tapestry.web.WebRequest;
import org.apache.tapestry.web.WebSession;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.engine.state.SessionScopeManager}.
@@ -29,11 +30,12 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestSessionScopeManager extends BaseComponentTestCase
{
private WebRequest newRequest(boolean create, WebSession session)
{
- WebRequest request = (WebRequest)newMock(WebRequest.class);
+ WebRequest request = newMock(WebRequest.class);
expect(request.getSession(create)).andReturn(session);
@@ -42,7 +44,7 @@
private WebRequest newRequest(WebSession session)
{
- WebRequest request = (WebRequest)newMock(WebRequest.class);
+ WebRequest request = newMock(WebRequest.class);
expect(request.getSession(true)).andReturn(session);
@@ -60,7 +62,7 @@
private StateObjectFactory newFactory(Object stateObject)
{
- StateObjectFactory factory = (StateObjectFactory)newMock(StateObjectFactory.class);
+ StateObjectFactory factory = newMock(StateObjectFactory.class);
expect(factory.createStateObject()).andReturn(stateObject);
@@ -182,12 +184,12 @@
protected WebSession newSession()
{
- return (WebSession) newMock(WebSession.class);
+ return newMock(WebSession.class);
}
protected SessionStoreOptimized newOptimized(boolean dirty)
{
- SessionStoreOptimized optimized = (SessionStoreOptimized) newMock(SessionStoreOptimized.class);
+ SessionStoreOptimized optimized = newMock(SessionStoreOptimized.class);
expect(optimized.isStoreToSessionNeeded()).andReturn(dirty);
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=417554&r1=417553&r2=417554&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 11:56:34 2006
@@ -20,6 +20,7 @@
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.
@@ -27,6 +28,7 @@
* @author Howard Lewis Ship
* @since 4.0
*/
+@Test
public abstract class BaseEnhancementTestCase extends BaseComponentTestCase
{
public IComponentSpecification newSpec(Location location)
@@ -40,7 +42,7 @@
protected EnhancementOperation newOp()
{
- return (EnhancementOperation) newMock(EnhancementOperation.class);
+ return newMock(EnhancementOperation.class);
}
protected void trainAddInjectedField(EnhancementOperation op, String fieldName,
@@ -53,12 +55,12 @@
protected ApplicationStateManager newApplicationStateManager()
{
- return (ApplicationStateManager) newMock(ApplicationStateManager.class);
+ return newMock(ApplicationStateManager.class);
}
protected EnhancementOperation newEnhancementOp()
{
- return (EnhancementOperation) newMock(EnhancementOperation.class);
+ return newMock(EnhancementOperation.class);
}
protected void trainGetAccessorMethodName(EnhancementOperation op, String propertyName,
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/EnhancedClassValidatorTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/EnhancedClassValidatorTest.java?rev=417554&r1=417553&r2=417554&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/EnhancedClassValidatorTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/EnhancedClassValidatorTest.java Tue Jun 27 11:56:34 2006
@@ -19,6 +19,7 @@
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.spec.ComponentSpecification;
import org.apache.tapestry.spec.IComponentSpecification;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.enhance.EnhancedClassValidatorImpl}.
@@ -26,6 +27,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class EnhancedClassValidatorTest extends BaseComponentTestCase
{
/**
@@ -102,7 +104,7 @@
private ErrorLog newErrorLog()
{
- return (ErrorLog) newMock(ErrorLog.class);
+ return newMock(ErrorLog.class);
}
/**
@@ -116,4 +118,4 @@
v.validate(Object.class, Object.class, new ComponentSpecification());
}
-}
\ No newline at end of file
+}