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/08/22 01:00:25 UTC
svn commit: r433412 [1/3] - in /tapestry/tapestry4/trunk: ./
tapestry-annotations/src/test/org/apache/tapestry/annotations/
tapestry-contrib/src/test/org/apache/tapestry/contrib/components/
tapestry-contrib/src/test/org/apache/tapestry/contrib/palette/...
Author: jkuhnert
Date: Mon Aug 21 16:00:16 2006
New Revision: 433412
URL: http://svn.apache.org/viewvc?rev=433412&view=rev
Log:
Fixed imports now that we're using the updated tapestry-testng snapshot tests.
Fixed tiny issue in IE to stop all of the bleating on the users list ;)
Modified:
tapestry/tapestry4/trunk/pom.xml
tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/InitialValueAnnotationWorkerTest.java
tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/MessagesTarget.java
tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/MetaAnnotationWorkerTest.java
tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/PersistAnnotationWorkerTest.java
tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestAnnotationUtils.java
tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestAssetAnnotationWorker.java
tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestBeanAnnotationWorker.java
tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestComponentAnnotationWorker.java
tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestComponentClassAnnotationWorker.java
tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestEventListenerAnnotationWorker.java
tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestInjectAssetAnnotationWorker.java
tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestInjectComponentAnnotationWorker.java
tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestInjectObjectAnnotationWorker.java
tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestMessageAnnotationWorker.java
tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestParameterAnnotationWorker.java
tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestSimpleAnnotationWorkers.java
tapestry/tapestry4/trunk/tapestry-contrib/src/test/org/apache/tapestry/contrib/components/TestDumpObject.java
tapestry/tapestry4/trunk/tapestry-contrib/src/test/org/apache/tapestry/contrib/palette/PaletteValidationTest.java
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/Fields.html
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Border.html
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Fields.page
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/FieldsResults.page
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/fields/Fields.java
tapestry/tapestry4/trunk/tapestry-framework/pom.xml
tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/form.js
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/TapestryUtilsTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/TestAbstractComponent.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/TestBaseSessionStoreOptimized.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/TestComponentMessageAccess.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ContextAssetFactoryTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestAssetSource.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestDefaultAssetFactory.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestResourceDigestSource.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/bean/TestBeanProvider.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/StateBindingTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestAssetBinding.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestBeanBinding.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestComponentBinding.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestExpressionBinding.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestHiveMindBinding.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestListenerMethodBinding.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestLiteralBinding.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestMessageBinding.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/callback/TestDirectCallback.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/callback/TestExternalCallback.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/callback/TestPageCallback.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestTypeConverterWrapper.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestValueConverter.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestAny.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestBlock.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestInsert.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestInvokeListener.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/data/TestNullDataSqueezerFilter.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/describe/CookieStrategyTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/describe/HTMLDescriptionReceiverTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/describe/TestLocationRenderStrategy.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/form/TestAutocompleter.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/DirectEventServiceTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/EngineServiceLinkTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/EngineUtilsTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/ExternalServiceTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/PageServiceTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/RequestCycleTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/ResetServiceTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/RestartServiceTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/ServiceTestCase.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/state/TestApplicationStateManager.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/state/TestSOMRegistry.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/enhance/InjectAssetWorkerTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/enhance/InjectStateFlagWorkerTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/enhance/TestDeferredScript.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/enhance/TestEnhanceUtils.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/enhance/TestEnhancementOperation.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/enhance/TestInjectObjectWorker.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/enhance/TestInjectPageWorker.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/error/BaseErrorTestCase.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/error/TestExceptionPresenter.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/event/ReportStatusEventTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/AbstractFormComponentTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/BeanPropertySelectionModelTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormSupportTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/LabeledPropertySelectionModelTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/LinkSubmitTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestCheckbox.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestImageSubmit.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestListEditMap.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestSubmit.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestTextArea.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestTextField.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestTranslatedFieldSupportImpl.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestValidatableFieldSupportImpl.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestValidationMessages.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestDateTranslator.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestStringTranslator.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestTranslatorBinding.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestEmail.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMax.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxDate.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxLength.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMin.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinDate.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinLength.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestPattern.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestRequired.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestValidatorFactory.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestValidatorWrapper.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestValidatorsBinding.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/html/ScriptTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/html/TestImage.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/html/TestInsertText.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/html/TestPageEvents.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/html/TestRelation.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/html/TestShell.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/internal/event/ComponentEventPropertyTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/json/TestJsonProperties.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TapestryTestCase.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TestComponentMessages.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TestLocalizedProperties.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TestMultipart.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TestStaticLink.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TestTapestryCheckMethodInvocation.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TestTapestryGetClassName.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/TestMockApplications.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/parse/TestSpecificationParser.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/spec/TestApplicationSpecification.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/spec/TestComponentSpecification.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/utils/TestDataSqueezer.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/utils/TestIdAllocator.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/utils/TestRegexpMatcher.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/l10n/DefaultResourceLocalizerTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/link/DefaultLinkRendererTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/listener/TestListenerMap.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/listener/TestListenerMapSource.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/markup/TestJSONWriter.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/markup/TestMarkupWriter.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/multipart/TestMultipartDecoderFilter.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/multipart/TestUploadFormParametersWrapper.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/pageload/PageLoaderTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/pageload/TestNamespaceClassSearchComponentClassProvider.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/pageload/TestVerifyRequiredParametersVisitor.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/ClientPropertyPersistenceStrategyTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/PageClientPropertyPersistenceScopeTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/PersistentPropertyDataEncoderTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/PropertyPersistenceStrategySourceTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/SessionPropertyPersistenceStrategyTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/TestPageRecorder.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/TestPersistentPropertyData.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/request/TestDecodedRequestInjector.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/request/TestDecodedRequestWrapper.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/resolver/PageSpecificationResolverTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/resolver/TestComponentSpecificationResolver.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/script/TestForeachToken.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/script/TestIfToken.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/ComponentEventConnectionWorkerTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/ComponentEventInvokerTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/CookieSourceTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/EngineFactoryTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/EngineServiceInnerProxyTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/EngineServiceOuterProxyTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/LinkFactoryTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestAbsoluteURLBuilder.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestApplicationSpecificationInitializer.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestBaseTagWriter.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestBasicInfrastructure.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestBindingSource.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestDeferredObjectTranslator.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestEngineManager.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestEngineServiceObjectProvider.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestExpressionEvaluator.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestExtensionLookupFactory.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestInfrastructure.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestLocalizedPropertySource.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestNamespaceResources.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestRequestLocaleManager.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestServiceMap.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestSetupRequestEncoding.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/WebContextInitializerTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/spec/TestComponentSpecification.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/test/TestCreator.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/test/mock/MockResponse.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/DefaultPrimaryKeyConverterTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/ScriptUtilsTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/StrftimeTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/TestDescribedLocation.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/TestObjectIdentityMap.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/TestPageRenderSupport.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/TestQueryParameterMap.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/io/TestBinaryDumpOutputStream.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/FieldLabelTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestDateValidator.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestEmailValidator.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestIntValidator.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestNumberValidator.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestPatternValidator.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestStringValidator.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestUrlValidator.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestValidField.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestValidatorBindingFactory.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/ValidationDelegateTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/web/BaseWebTestCase.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/web/ServletWebResponseTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/web/ServletWebSessionTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/web/TestServletWebContext.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/web/TestServletWebRequest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/web/WebContextResourceTest.java
tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/BasePortletWebTestCase.java
tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/PortletWebSessionTest.java
tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestApplicationPortlet.java
tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestMatchingPortletPageResolver.java
tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestPortletApplicationSpecificationInitializer.java
tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestPortletHomeService.java
tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestPortletLink.java
tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestPortletServicerBridges.java
tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestPortletWebActivator.java
tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestPortletWebContext.java
tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestPortletWebRequest.java
tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestPortletWebResponse.java
tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestRenderService.java
tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestRenderWebResponse.java
tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/bindings/TestUserAttributeBinding.java
Modified: tapestry/tapestry4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/pom.xml?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/pom.xml (original)
+++ tapestry/tapestry4/trunk/pom.xml Mon Aug 21 16:00:16 2006
@@ -191,7 +191,7 @@
<dependency>
<groupId>com.javaforge.tapestry</groupId>
<artifactId>tapestry-testng</artifactId>
- <version>0.0.1</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -222,6 +222,8 @@
<value>en_US</value>
</property>
</systemProperties>
+ <threadCount>2</threadCount>
+ <parallel>true</parallel>
</configuration>
</plugin>
<plugin>
Modified: tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/InitialValueAnnotationWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/InitialValueAnnotationWorkerTest.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/InitialValueAnnotationWorkerTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/InitialValueAnnotationWorkerTest.java Mon Aug 21 16:00:16 2006
@@ -14,7 +14,6 @@
package org.apache.tapestry.annotations;
-import static org.testng.AssertJUnit.*;
import java.lang.reflect.Method;
import org.apache.hivemind.Location;
Modified: tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/MessagesTarget.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/MessagesTarget.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/MessagesTarget.java (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/MessagesTarget.java Mon Aug 21 16:00:16 2006
@@ -14,7 +14,6 @@
package org.apache.tapestry.annotations;
import org.apache.tapestry.AbstractComponent;
-import org.apache.tapestry.annotations.Message;
/**
* Target "component" used to test the
Modified: tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/MetaAnnotationWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/MetaAnnotationWorkerTest.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/MetaAnnotationWorkerTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/MetaAnnotationWorkerTest.java Mon Aug 21 16:00:16 2006
@@ -14,7 +14,6 @@
package org.apache.tapestry.annotations;
-import static org.testng.AssertJUnit.*;
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
import org.apache.tapestry.enhance.EnhancementOperation;
Modified: tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/PersistAnnotationWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/PersistAnnotationWorkerTest.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/PersistAnnotationWorkerTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/PersistAnnotationWorkerTest.java Mon Aug 21 16:00:16 2006
@@ -14,7 +14,6 @@
package org.apache.tapestry.annotations;
-import static org.testng.AssertJUnit.*;
import java.lang.reflect.Method;
import org.apache.hivemind.Location;
Modified: tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestAnnotationUtils.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestAnnotationUtils.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestAnnotationUtils.java (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestAnnotationUtils.java Mon Aug 21 16:00:16 2006
@@ -14,7 +14,6 @@
package org.apache.tapestry.annotations;
-import static org.testng.AssertJUnit.*;
import java.lang.reflect.Method;
import org.apache.hivemind.ApplicationRuntimeException;
Modified: tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestAssetAnnotationWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestAssetAnnotationWorker.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestAssetAnnotationWorker.java (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestAssetAnnotationWorker.java Mon Aug 21 16:00:16 2006
@@ -14,7 +14,6 @@
package org.apache.tapestry.annotations;
-import static org.testng.AssertJUnit.*;
import java.lang.reflect.Method;
import org.apache.hivemind.Location;
Modified: tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestBeanAnnotationWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestBeanAnnotationWorker.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestBeanAnnotationWorker.java (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestBeanAnnotationWorker.java Mon Aug 21 16:00:16 2006
@@ -15,9 +15,6 @@
package org.apache.tapestry.annotations;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNull;
-import static org.testng.AssertJUnit.assertSame;
import java.lang.reflect.Method;
import java.util.HashMap;
Modified: tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestComponentAnnotationWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestComponentAnnotationWorker.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestComponentAnnotationWorker.java (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestComponentAnnotationWorker.java Mon Aug 21 16:00:16 2006
@@ -14,7 +14,6 @@
package org.apache.tapestry.annotations;
-import static org.testng.AssertJUnit.*;
import java.lang.reflect.Method;
import org.apache.hivemind.Location;
Modified: tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestComponentClassAnnotationWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestComponentClassAnnotationWorker.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestComponentClassAnnotationWorker.java (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestComponentClassAnnotationWorker.java Mon Aug 21 16:00:16 2006
@@ -14,8 +14,6 @@
package org.apache.tapestry.annotations;
-import static org.testng.AssertJUnit.*;
-
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
import org.apache.tapestry.enhance.EnhancementOperation;
Modified: tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestEventListenerAnnotationWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestEventListenerAnnotationWorker.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestEventListenerAnnotationWorker.java (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestEventListenerAnnotationWorker.java Mon Aug 21 16:00:16 2006
@@ -13,11 +13,6 @@
// limitations under the License.
package org.apache.tapestry.annotations;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertFalse;
-import static org.testng.AssertJUnit.assertNotNull;
-import static org.testng.AssertJUnit.assertTrue;
-
import java.lang.reflect.Method;
import java.util.List;
Modified: tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestInjectAssetAnnotationWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestInjectAssetAnnotationWorker.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestInjectAssetAnnotationWorker.java (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestInjectAssetAnnotationWorker.java Mon Aug 21 16:00:16 2006
@@ -14,8 +14,9 @@
package org.apache.tapestry.annotations;
-import static org.easymock.EasyMock.*;
-import static org.testng.AssertJUnit.assertNotNull;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.isA;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
Modified: tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestInjectComponentAnnotationWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestInjectComponentAnnotationWorker.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestInjectComponentAnnotationWorker.java (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestInjectComponentAnnotationWorker.java Mon Aug 21 16:00:16 2006
@@ -14,8 +14,6 @@
package org.apache.tapestry.annotations;
-import static org.testng.AssertJUnit.assertNotNull;
-
import org.apache.hivemind.Location;
import org.apache.tapestry.enhance.EnhancementOperation;
import org.apache.tapestry.enhance.InjectComponentWorker;
Modified: tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestInjectObjectAnnotationWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestInjectObjectAnnotationWorker.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestInjectObjectAnnotationWorker.java (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestInjectObjectAnnotationWorker.java Mon Aug 21 16:00:16 2006
@@ -14,8 +14,6 @@
package org.apache.tapestry.annotations;
-import static org.testng.AssertJUnit.assertNotNull;
-
import java.lang.reflect.Method;
import org.apache.hivemind.Location;
Modified: tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestMessageAnnotationWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestMessageAnnotationWorker.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestMessageAnnotationWorker.java (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestMessageAnnotationWorker.java Mon Aug 21 16:00:16 2006
@@ -14,8 +14,9 @@
package org.apache.tapestry.annotations;
-import static org.easymock.EasyMock.*;
-import static org.testng.AssertJUnit.assertEquals;
+import static org.easymock.EasyMock.aryEq;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
Modified: tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestParameterAnnotationWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestParameterAnnotationWorker.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestParameterAnnotationWorker.java (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestParameterAnnotationWorker.java Mon Aug 21 16:00:16 2006
@@ -15,8 +15,6 @@
package org.apache.tapestry.annotations;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertSame;
import java.lang.reflect.Method;
Modified: tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestSimpleAnnotationWorkers.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestSimpleAnnotationWorkers.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestSimpleAnnotationWorkers.java (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestSimpleAnnotationWorkers.java Mon Aug 21 16:00:16 2006
@@ -14,9 +14,6 @@
package org.apache.tapestry.annotations;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertSame;
-
import java.lang.reflect.Method;
import org.apache.hivemind.Location;
Modified: tapestry/tapestry4/trunk/tapestry-contrib/src/test/org/apache/tapestry/contrib/components/TestDumpObject.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/test/org/apache/tapestry/contrib/components/TestDumpObject.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/src/test/org/apache/tapestry/contrib/components/TestDumpObject.java (original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/src/test/org/apache/tapestry/contrib/components/TestDumpObject.java Mon Aug 21 16:00:16 2006
@@ -14,8 +14,6 @@
package org.apache.tapestry.contrib.components;
-import static org.testng.AssertJUnit.assertEquals;
-
import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.InputStream;
Modified: tapestry/tapestry4/trunk/tapestry-contrib/src/test/org/apache/tapestry/contrib/palette/PaletteValidationTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/test/org/apache/tapestry/contrib/palette/PaletteValidationTest.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/src/test/org/apache/tapestry/contrib/palette/PaletteValidationTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/src/test/org/apache/tapestry/contrib/palette/PaletteValidationTest.java Mon Aug 21 16:00:16 2006
@@ -16,7 +16,6 @@
import static org.easymock.EasyMock.aryEq;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertEquals;
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IMarkupWriter;
Modified: tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/Fields.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/Fields.html?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/Fields.html (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/Fields.html Mon Aug 21 16:00:16 2006
@@ -17,7 +17,7 @@
<span jwcid="showError"/>
-<form jwcid="form@Form" success="listener:doSubmit" delegate="bean:delegate"
+<form jwcid="@Form" success="listener:doSubmit" delegate="bean:delegate"
clientValidationEnabled="ognl:clientValidationEnabled" >
<table class="form">
Modified: tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Border.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Border.html?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Border.html (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Border.html Mon Aug 21 16:00:16 2006
@@ -24,7 +24,7 @@
<br/>
-<form jwcid="form@Form" focus="false">
+<form jwcid="@Form" focus="false">
<table class="requestDebug" cellspacing="0">
<tr class="control">
Modified: tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Fields.page
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Fields.page?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Fields.page (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Fields.page Mon Aug 21 16:00:16 2006
@@ -21,12 +21,10 @@
<page-specification class="org.apache.tapestry.workbench.fields.Fields">
- <inject type="state" property="visit" object="session-data" />
-
<property name="clientValidationEnabled" persist="client" initial-value="true"/>
<bean name="required" class="org.apache.tapestry.form.validator.Required"/>
- <bean name="delegate" class="org.apache.tapestry.workbench.WorkbenchValidationDelegate" property="delegate"/>
+ <bean name="delegate" class="org.apache.tapestry.workbench.WorkbenchValidationDelegate" />
<bean name="dateValidator" lifecycle="render" class="org.apache.tapestry.form.validator.MinDate">
<set name="minDate" value="new java.util.Date()"/>
Modified: tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/FieldsResults.page
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/FieldsResults.page?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/FieldsResults.page (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/FieldsResults.page Mon Aug 21 16:00:16 2006
@@ -21,8 +21,6 @@
<page-specification class="org.apache.tapestry.workbench.fields.FieldsResults">
- <inject type="state" property="visit" object="session-data" />
-
<component id="backRollover" type="Rollover">
<binding name="image" value="asset:back"/>
<binding name="mouseOver" value="asset:backFocus"/>
Modified: tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/fields/Fields.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/fields/Fields.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/fields/Fields.java (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/fields/Fields.java Mon Aug 21 16:00:16 2006
@@ -18,8 +18,9 @@
import org.apache.tapestry.IPage;
import org.apache.tapestry.annotations.InjectPage;
+import org.apache.tapestry.annotations.InjectState;
import org.apache.tapestry.html.BasePage;
-import org.apache.tapestry.valid.IValidationDelegate;
+import org.apache.tapestry.workbench.Visit;
/**
* @author Howard Lewis Ship
@@ -60,11 +61,7 @@
{
getResultsPage().setByLink(true);
}
-
- /**
- * Injected.
- *
- * @since 4.0
- */
- public abstract IValidationDelegate getDelegate();
+
+ @InjectState("session-data")
+ public abstract Visit getVisit();
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/pom.xml?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/pom.xml Mon Aug 21 16:00:16 2006
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>5.0.2</version>
+ <version>5.1</version>
<classifier>jdk15</classifier>
<scope>test</scope>
</dependency>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/form.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/form.js?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/form.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/form.js Mon Aug 21 16:00:16 2006
@@ -102,10 +102,6 @@
}
},
- getFormId:function(form){
- return (form.getAttribute("id") ) ? form.getAttribute("id") : form.getAttribute("name");
- },
-
/**
* Registers the form with the local <code>forms</code> property so
* that there is a central reference of all tapestry forms.
@@ -123,7 +119,7 @@
}
// make sure id is correct just in case node passed in has only name
- id=this.getFormId(form);
+ id=form.getAttribute("id");
if (!this.forms[id]) {
this.forms[id]={};
@@ -151,10 +147,7 @@
}
dojo.event.connect(form, "onsubmit", function(e) {
- if (dojo.event.browser.isEvent(e)){
- dojo.event.browser.stopEvent(e);
- }
-
+ dojo.event.browser.stopEvent(e);
tapestry.form.submitAsync(form);
});
}
@@ -207,7 +200,7 @@
inputClicked:function(e){
var node = e.currentTarget;
if(node.disabled || dj_undef("form", node)) { return; }
- this.forms[this.getFormId(node.form)].clickedButton = node;
+ this.forms[node.form.getAttribute("id")].clickedButton = node;
},
/**
@@ -235,7 +228,7 @@
return;
}
- var id=this.getFormId(evt.target);
+ var id=evt.target.getAttribute("id");
if (!id) {
dojo.log.warn("Form had no id attribute.");
return;
@@ -327,7 +320,7 @@
dojo.raise("Form not found with id " + id);
return;
}
- var formId=this.getFormId(form);
+ var formId=form.getAttribute("id");
if (!tapestry.form.validation.validateForm(form, this.forms[formId])) {
dojo.log.debug("Form validation failed for form with id " + formId);
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/TapestryUtilsTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/TapestryUtilsTest.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/TapestryUtilsTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/TapestryUtilsTest.java Mon Aug 21 16:00:16 2006
@@ -15,8 +15,6 @@
package org.apache.tapestry;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertSame;
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/TestAbstractComponent.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/TestAbstractComponent.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/TestAbstractComponent.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/TestAbstractComponent.java Mon Aug 21 16:00:16 2006
@@ -14,9 +14,6 @@
package org.apache.tapestry;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertSame;
-
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.tapestry.spec.IContainedComponent;
import org.apache.tapestry.test.Creator;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/TestBaseSessionStoreOptimized.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/TestBaseSessionStoreOptimized.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/TestBaseSessionStoreOptimized.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/TestBaseSessionStoreOptimized.java Mon Aug 21 16:00:16 2006
@@ -14,12 +14,10 @@
package org.apache.tapestry;
-import static org.testng.AssertJUnit.assertEquals;
+import org.testng.annotations.Test;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionBindingEvent;
-
-import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.BaseSessionStoreOptimized}.
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/TestComponentMessageAccess.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/TestComponentMessageAccess.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/TestComponentMessageAccess.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/TestComponentMessageAccess.java Mon Aug 21 16:00:16 2006
@@ -15,7 +15,6 @@
package org.apache.tapestry;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertEquals;
import org.apache.hivemind.Messages;
import org.apache.tapestry.test.Creator;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java Mon Aug 21 16:00:16 2006
@@ -14,10 +14,6 @@
package org.apache.tapestry.asset;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertSame;
-import static org.testng.AssertJUnit.assertTrue;
-
import java.util.Locale;
import org.apache.hivemind.ApplicationRuntimeException;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ContextAssetFactoryTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ContextAssetFactoryTest.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ContextAssetFactoryTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ContextAssetFactoryTest.java Mon Aug 21 16:00:16 2006
@@ -15,9 +15,6 @@
package org.apache.tapestry.asset;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertSame;
-import static org.testng.AssertJUnit.assertTrue;
import java.net.URL;
import java.util.Locale;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestAssetSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestAssetSource.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestAssetSource.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestAssetSource.java Mon Aug 21 16:00:16 2006
@@ -15,7 +15,6 @@
package org.apache.tapestry.asset;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertSame;
import java.util.Collections;
import java.util.List;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestDefaultAssetFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestDefaultAssetFactory.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestDefaultAssetFactory.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestDefaultAssetFactory.java Mon Aug 21 16:00:16 2006
@@ -14,9 +14,6 @@
package org.apache.tapestry.asset;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertSame;
-
import org.apache.hivemind.Location;
import org.apache.tapestry.BaseComponentTestCase;
import org.testng.annotations.Test;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestResourceDigestSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestResourceDigestSource.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestResourceDigestSource.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestResourceDigestSource.java Mon Aug 21 16:00:16 2006
@@ -15,7 +15,6 @@
package org.apache.tapestry.asset;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertEquals;
import java.net.URL;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java Mon Aug 21 16:00:16 2006
@@ -14,11 +14,10 @@
package org.apache.tapestry.asset;
-import static org.easymock.EasyMock.*;
-import static org.testng.AssertJUnit.assertEquals;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.isA;
import static org.testng.AssertJUnit.assertFalse;
-import static org.testng.AssertJUnit.assertNull;
-import static org.testng.AssertJUnit.assertTrue;
import java.util.ArrayList;
import java.util.List;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/bean/TestBeanProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/bean/TestBeanProvider.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/bean/TestBeanProvider.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/bean/TestBeanProvider.java Mon Aug 21 16:00:16 2006
@@ -15,8 +15,6 @@
package org.apache.tapestry.bean;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertSame;
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.ClassResolver;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/StateBindingTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/StateBindingTest.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/StateBindingTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/StateBindingTest.java Mon Aug 21 16:00:16 2006
@@ -15,8 +15,6 @@
package org.apache.tapestry.binding;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertSame;
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestAssetBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestAssetBinding.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestAssetBinding.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestAssetBinding.java Mon Aug 21 16:00:16 2006
@@ -15,8 +15,6 @@
package org.apache.tapestry.binding;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertSame;
import org.apache.hivemind.Location;
import org.apache.tapestry.BindingException;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestBeanBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestBeanBinding.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestBeanBinding.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestBeanBinding.java Mon Aug 21 16:00:16 2006
@@ -15,8 +15,6 @@
package org.apache.tapestry.binding;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertSame;
import org.apache.hivemind.Location;
import org.apache.tapestry.BaseComponentTestCase;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestComponentBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestComponentBinding.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestComponentBinding.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestComponentBinding.java Mon Aug 21 16:00:16 2006
@@ -15,8 +15,6 @@
package org.apache.tapestry.binding;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertSame;
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestExpressionBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestExpressionBinding.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestExpressionBinding.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestExpressionBinding.java Mon Aug 21 16:00:16 2006
@@ -16,8 +16,6 @@
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertSame;
import org.apache.hivemind.Location;
import org.apache.tapestry.BindingException;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestHiveMindBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestHiveMindBinding.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestHiveMindBinding.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestHiveMindBinding.java Mon Aug 21 16:00:16 2006
@@ -15,7 +15,6 @@
package org.apache.tapestry.binding;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertSame;
import org.apache.hivemind.Location;
import org.apache.tapestry.IBinding;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestListenerMethodBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestListenerMethodBinding.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestListenerMethodBinding.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestListenerMethodBinding.java Mon Aug 21 16:00:16 2006
@@ -16,7 +16,6 @@
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
-import static org.testng.AssertJUnit.*;
import org.apache.hivemind.Location;
import org.apache.tapestry.BindingException;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestLiteralBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestLiteralBinding.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestLiteralBinding.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestLiteralBinding.java Mon Aug 21 16:00:16 2006
@@ -15,9 +15,6 @@
package org.apache.tapestry.binding;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNull;
-import static org.testng.AssertJUnit.assertSame;
import java.util.Date;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestMessageBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestMessageBinding.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestMessageBinding.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/TestMessageBinding.java Mon Aug 21 16:00:16 2006
@@ -15,8 +15,6 @@
package org.apache.tapestry.binding;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertSame;
import org.apache.hivemind.Location;
import org.apache.hivemind.Messages;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/callback/TestDirectCallback.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/callback/TestDirectCallback.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/callback/TestDirectCallback.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/callback/TestDirectCallback.java Mon Aug 21 16:00:16 2006
@@ -15,8 +15,6 @@
package org.apache.tapestry.callback;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertSame;
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/callback/TestExternalCallback.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/callback/TestExternalCallback.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/callback/TestExternalCallback.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/callback/TestExternalCallback.java Mon Aug 21 16:00:16 2006
@@ -15,7 +15,6 @@
package org.apache.tapestry.callback;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertEquals;
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.tapestry.BaseComponentTestCase;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/callback/TestPageCallback.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/callback/TestPageCallback.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/callback/TestPageCallback.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/callback/TestPageCallback.java Mon Aug 21 16:00:16 2006
@@ -14,8 +14,6 @@
package org.apache.tapestry.callback;
-import static org.testng.AssertJUnit.assertEquals;
-
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IPage;
import org.apache.tapestry.IRequestCycle;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestTypeConverterWrapper.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestTypeConverterWrapper.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestTypeConverterWrapper.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestTypeConverterWrapper.java Mon Aug 21 16:00:16 2006
@@ -15,8 +15,6 @@
package org.apache.tapestry.coerce;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertNull;
-import static org.testng.AssertJUnit.assertSame;
import java.util.Collections;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestValueConverter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestValueConverter.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestValueConverter.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestValueConverter.java Mon Aug 21 16:00:16 2006
@@ -15,9 +15,6 @@
package org.apache.tapestry.coerce;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNull;
-import static org.testng.AssertJUnit.assertSame;
import java.util.Collections;
import java.util.Date;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestAny.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestAny.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestAny.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestAny.java Mon Aug 21 16:00:16 2006
@@ -15,8 +15,6 @@
package org.apache.tapestry.components;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertSame;
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestBlock.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestBlock.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestBlock.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestBlock.java Mon Aug 21 16:00:16 2006
@@ -15,8 +15,6 @@
package org.apache.tapestry.components;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertNull;
-import static org.testng.AssertJUnit.assertSame;
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IBinding;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestInsert.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestInsert.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestInsert.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestInsert.java Mon Aug 21 16:00:16 2006
@@ -15,8 +15,6 @@
package org.apache.tapestry.components;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertSame;
import java.text.DateFormat;
import java.text.Format;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestInvokeListener.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestInvokeListener.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestInvokeListener.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestInvokeListener.java Mon Aug 21 16:00:16 2006
@@ -16,7 +16,6 @@
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
-import static org.testng.AssertJUnit.assertSame;
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IActionListener;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/data/TestNullDataSqueezerFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/data/TestNullDataSqueezerFilter.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/data/TestNullDataSqueezerFilter.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/data/TestNullDataSqueezerFilter.java Mon Aug 21 16:00:16 2006
@@ -14,8 +14,6 @@
package org.apache.tapestry.data;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNull;
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.services.DataSqueezer;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/describe/CookieStrategyTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/describe/CookieStrategyTest.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/describe/CookieStrategyTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/describe/CookieStrategyTest.java Mon Aug 21 16:00:16 2006
@@ -14,9 +14,9 @@
package org.apache.tapestry.describe;
-import javax.servlet.http.Cookie;
-
import org.testng.annotations.Test;
+
+import javax.servlet.http.Cookie;
/**
* Tests for {@link org.apache.tapestry.describe.CookieStrategy}.
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/describe/HTMLDescriptionReceiverTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/describe/HTMLDescriptionReceiverTest.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/describe/HTMLDescriptionReceiverTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/describe/HTMLDescriptionReceiverTest.java Mon Aug 21 16:00:16 2006
@@ -15,7 +15,6 @@
package org.apache.tapestry.describe;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertEquals;
import java.util.Arrays;
import java.util.Collection;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/describe/TestLocationRenderStrategy.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/describe/TestLocationRenderStrategy.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/describe/TestLocationRenderStrategy.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/describe/TestLocationRenderStrategy.java Mon Aug 21 16:00:16 2006
@@ -14,7 +14,8 @@
package org.apache.tapestry.describe;
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.checkOrder;
+import static org.easymock.EasyMock.expect;
import java.net.URL;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/form/TestAutocompleter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/form/TestAutocompleter.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/form/TestAutocompleter.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/form/TestAutocompleter.java Mon Aug 21 16:00:16 2006
@@ -18,7 +18,6 @@
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.isA;
-import static org.testng.AssertJUnit.assertEquals;
import java.util.ArrayList;
import java.util.List;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/DirectEventServiceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/DirectEventServiceTest.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/DirectEventServiceTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/DirectEventServiceTest.java Mon Aug 21 16:00:16 2006
@@ -17,8 +17,6 @@
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.isA;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertSame;
import java.util.HashMap;
import java.util.Map;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java Mon Aug 21 16:00:16 2006
@@ -14,9 +14,9 @@
package org.apache.tapestry.engine;
-import static org.easymock.EasyMock.*;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertSame;
+import static org.easymock.EasyMock.checkOrder;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.isA;
import java.util.Collections;
import java.util.HashMap;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/EngineServiceLinkTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/EngineServiceLinkTest.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/EngineServiceLinkTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/EngineServiceLinkTest.java Mon Aug 21 16:00:16 2006
@@ -14,8 +14,6 @@
package org.apache.tapestry.engine;
-import static org.testng.AssertJUnit.assertEquals;
-
import java.util.HashMap;
import java.util.Map;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/EngineUtilsTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/EngineUtilsTest.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/EngineUtilsTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/EngineUtilsTest.java Mon Aug 21 16:00:16 2006
@@ -14,8 +14,6 @@
package org.apache.tapestry.engine;
-import static org.testng.AssertJUnit.assertEquals;
-
import org.apache.tapestry.web.WebRequest;
import org.testng.annotations.Test;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/ExternalServiceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/ExternalServiceTest.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/ExternalServiceTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/ExternalServiceTest.java Mon Aug 21 16:00:16 2006
@@ -14,9 +14,6 @@
package org.apache.tapestry.engine;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertSame;
-
import java.util.HashMap;
import java.util.Map;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/PageServiceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/PageServiceTest.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/PageServiceTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/PageServiceTest.java Mon Aug 21 16:00:16 2006
@@ -14,8 +14,6 @@
package org.apache.tapestry.engine;
-import static org.testng.AssertJUnit.assertSame;
-
import java.util.HashMap;
import java.util.Map;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/RequestCycleTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/RequestCycleTest.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/RequestCycleTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/RequestCycleTest.java Mon Aug 21 16:00:16 2006
@@ -16,8 +16,6 @@
import static org.easymock.EasyMock.checkOrder;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertSame;
import org.apache.hivemind.ErrorHandler;
import org.apache.tapestry.BaseComponentTestCase;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/ResetServiceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/ResetServiceTest.java?rev=433412&r1=433411&r2=433412&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/ResetServiceTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/ResetServiceTest.java Mon Aug 21 16:00:16 2006
@@ -14,9 +14,6 @@
package org.apache.tapestry.engine;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertSame;
-
import java.util.HashMap;
import java.util.Map;