Removed all the replicated WicktTestCase classes. Only the one from wicket-core has been left
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c390a566 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c390a566 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c390a566 Branch: refs/heads/master Commit: c390a566411e7c945308490b679d3930e7fb45a2 Parents: b31fffd Author: Andrea Del Bene <â[email protected]â> Authored: Thu Jun 18 18:35:55 2015 +0200 Committer: Andrea Del Bene <â[email protected]â> Committed: Fri Jun 19 10:41:35 2015 +0200 ---------------------------------------------------------------------- .../wicket/util/tester/WicketTestCase.java | 202 +++++++++++++++++++ .../wicket/AttributeModifierComponentTest.java | 2 +- .../org/apache/wicket/AuthorizationTest.java | 1 + .../org/apache/wicket/BehaviorRequestTest.java | 1 + .../java/org/apache/wicket/BehaviorUrlTest.java | 1 + ...entBehaviorOverComponentTagBehaviorTest.java | 1 + .../wicket/ComponentConfigurationTest.java | 1 + .../ComponentInitializationIntegrationTest.java | 1 + .../wicket/ComponentInitializationTest.java | 1 + .../apache/wicket/ComponentOnConfigureTest.java | 1 + .../java/org/apache/wicket/ComponentTest.java | 1 + .../ComponentWithLazyModelCreationTest.java | 1 + ...ceptionMapperResourceBlockedDevModeTest.java | 1 + ...eptionMapperResourceBlockedProdModeTest.java | 1 + .../wicket/DefaultExceptionMapperTest.java | 1 + .../apache/wicket/DisabledComponentTest.java | 1 + .../org/apache/wicket/EventDispatcherTest.java | 1 + .../org/apache/wicket/ExceptionMapperTest.java | 1 + .../org/apache/wicket/FeedbackMessagesTest.java | 2 +- .../apache/wicket/FormDispatchEventTest.java | 1 + .../org/apache/wicket/MarkupContainerTest.java | 1 + .../apache/wicket/MarkupIdGeneratorTest.java | 1 + .../java/org/apache/wicket/PageFactoryTest.java | 1 + .../apache/wicket/PageMarkupLoadingTest.java | 1 + .../wicket/ParentResourceEscapePathTest.java | 1 + .../org/apache/wicket/PlaceholderTagIdTest.java | 1 + .../test/java/org/apache/wicket/RemoveTest.java | 1 + .../org/apache/wicket/RequestEncodingTest.java | 1 + .../java/org/apache/wicket/ResourceTest.java | 1 + ...ponseAtInterceptPageExceptionInAjaxTest.java | 1 + ...artResponseAtInterceptPageExceptionTest.java | 1 + .../wicket/RestartResponseExceptionTest.java | 1 + .../wicket/RestartWithMountedPageTest.java | 1 + .../org/apache/wicket/SetResponsePageTest.java | 1 + .../apache/wicket/SharedResourceUrlTest.java | 1 + .../test/java/org/apache/wicket/TesterTest.java | 1 + .../java/org/apache/wicket/VisitorTest.java | 2 +- .../java/org/apache/wicket/WicketTestCase.java | 201 ------------------ .../ajax/AjaxBehaviorAndMetaDataTest.java | 2 +- .../wicket/ajax/AjaxBehaviorEnabledTest.java | 2 +- .../wicket/ajax/AjaxCallbackFunctionTest.java | 2 +- .../org/apache/wicket/ajax/AjaxChannelTest.java | 2 +- .../ajax/AjaxComponentVisibilityTest.java | 2 +- .../wicket/ajax/AjaxEventBehaviorTest.java | 2 +- .../wicket/ajax/AjaxHeaderContributionTest.java | 2 +- .../wicket/ajax/AjaxRequestHandlerTest.java | 2 +- .../wicket/ajax/AjaxTimerBehaviorTest.java | 2 +- .../apache/wicket/ajax/DomReadyOrderTest.java | 2 +- .../ajax/GlobalUpdateAjaxAttributesTest.java | 2 +- .../InternalErrorCallsAjaxOnFailureTest.java | 2 +- ...FormChoiceComponentUpdatingBehaviorTest.java | 2 +- .../ajax/form/AjaxFormSubmitBehaviorTest.java | 2 +- .../wicket/ajax/form/AjaxFormSubmitTest.java | 2 +- .../ajax/form/OnChangeAjaxBehaviorTest.java | 2 +- .../ajax/markup/html/AjaxFallbackLinkTest.java | 2 +- .../ajax/markup/html/ajaxLink/AjaxLinkTest.java | 2 +- .../html/componentMap/SimpleTestPanelTest.java | 2 +- .../ajax/markup/html/form/AjaxButtonTest.java | 2 +- .../ComponentIsRenderedAllowedTest.java | 2 +- .../behavior/ImmutableBehaviorIdsTest.java | 2 +- .../wicket/behavior/SharedBehaviorTest.java | 2 +- .../component/replacewith/ReplaceWithTest.java | 2 +- .../ListenerInterfaceRequestHandlerTest.java | 2 +- .../mapper/AbstractBookmarkableMapperTest.java | 2 +- .../core/request/mapper/ResourceMapperTest.java | 2 +- .../checker/DifferentPageCheckerTest.java | 2 +- .../checker/OrphanComponentCheckerTest.java | 2 +- .../objects/checker/SessionCheckerTest.java | 2 +- .../resource/ClassPathResourceFinderTest.java | 2 +- .../ComponentRendererTest.java | 2 +- .../DontStoreNotRenderedPageTestCase.java | 2 +- .../wicket/feedback/FeedbackRenderTest.java | 2 +- .../InterceptDataCleanedAfterReadTest.java | 2 +- .../ComponentTagAttributeEscapingTest.java | 2 +- .../DefaultMarkupCacheKeyProviderTest.java | 2 +- .../wicket/markup/HtmlProblemFinderTest.java | 2 +- .../apache/wicket/markup/MarkupCacheTest.java | 2 +- .../wicket/markup/MarkupFragmentTest.java | 2 +- .../wicket/markup/MarkupInheritanceTest.java | 2 +- .../apache/wicket/markup/MarkupParserTest.java | 2 +- .../org/apache/wicket/markup/MarkupTest.java | 2 +- .../wicket/markup/MarkupVariationTest.java | 2 +- .../markup/RefreshingViewOnRemoveTest.java | 2 +- .../wicket/markup/WicketNamespaceTest.java | 2 +- .../wicket/markup/head/HeaderResponseTest.java | 2 +- .../filter/FilteringHeaderResponseTest.java | 2 +- .../markup/html/ComponentMarkupIdTest.java | 3 +- .../html/DecoratingHeaderResponseTest.java | 2 +- .../markup/html/HeaderContributorTest.java | 2 +- .../wicket/markup/html/MarkupHeadFirstTest.java | 2 +- .../markup/html/PackageResourceGuardTest.java | 2 +- .../wicket/markup/html/PackageResourceTest.java | 2 +- .../html/SecurePackageResourceGuardTest.java | 2 +- .../html/TransparentWebMarkupContainerTest.java | 2 +- .../apache/wicket/markup/html/WebPageTest.java | 2 +- .../wicket/markup/html/XmlDeclResponseTest.java | 2 +- .../AutocomponetsGenerationTest.java | 2 +- .../html/autolink/AutoLinkInPanelsTest.java | 2 +- .../markup/html/autolink/AutolinkTest.java | 2 +- .../markup/html/basic/HomePageRedirectTest.java | 2 +- .../wicket/markup/html/basic/LabelTest.java | 2 +- .../markup/html/basic/SimplePageTest.java | 2 +- .../html/basic/SimpleResponsePageClassTest.java | 2 +- .../wicket/markup/html/basic/XmlPageTest.java | 2 +- .../markup/html/border/ComponentBorderTest.java | 2 +- .../html/debug/WicketComponentTreeTest.java | 2 +- ...tComponentConvertEmptyStringsToNullTest.java | 2 +- .../html/form/AutoFormLabelPickupTest.java | 2 +- .../wicket/markup/html/form/AutoLabelTest.java | 2 +- .../html/form/AutoLabelWithContentTest.java | 2 +- .../html/form/AutoLabelWithinEnclosureTest.java | 2 +- .../wicket/markup/html/form/ButtonTest.java | 2 +- .../html/form/CheckBoxMultipleChoiceTest.java | 2 +- .../wicket/markup/html/form/CheckGroupTest.java | 2 +- .../html/form/CollectionFormComponentTest.java | 2 +- .../form/DisabledItemRetainingCheckBoxTest.java | 2 +- .../markup/html/form/DropDownChoiceTest.java | 2 +- .../form/FormComponentPanelProcessingTest.java | 2 +- .../markup/html/form/FormComponentTest.java | 3 +- .../form/FormParentDisabledRawInputTest.java | 2 +- .../markup/html/form/FormSubmitOrderTest.java | 2 +- .../wicket/markup/html/form/FormSubmitTest.java | 2 +- .../wicket/markup/html/form/FormTest.java | 2 +- ...FormValidationDisabledFormComponentTest.java | 2 +- .../html/form/FormWithMultipleButtonsTest.java | 2 +- .../html/form/ListMultipleChoiceTest.java | 2 +- .../html/form/LocalizedErrorMessageTest.java | 2 +- .../markup/html/form/NestedFormSubmitTest.java | 2 +- .../markup/html/form/NestedFormsTest.java | 2 +- .../markup/html/form/NumberTextFieldTest.java | 2 +- .../html/form/OnValidateModelObjectsTest.java | 2 +- .../html/form/PrimitiveTypeRequiredTest.java | 2 +- .../markup/html/form/RadioChoiceTest.java | 2 +- .../wicket/markup/html/form/RadioGroupTest.java | 2 +- .../markup/html/form/TestFormHasError.java | 2 +- .../wicket/markup/html/form/TextAreaTest.java | 2 +- .../wicket/markup/html/form/TextFieldTest.java | 2 +- .../html/form/ValidatorPropertiesTest.java | 2 +- .../markup/html/form/border/TestHomePage.java | 2 +- .../html/form/border/TestHomePage_2134.java | 2 +- .../markup/html/form/encryption/CryptTest.java | 2 +- .../html/form/feedback/FormFeedbackTest.java | 2 +- .../form/formComponentPanel/SimplePageTest.java | 2 +- .../html/form/imagebutton/ImageButtonTest.java | 2 +- .../imagebutton/InvalidImageButtonTest.java | 2 +- .../markup/html/form/login/InterceptTest.java | 2 +- .../html/form/panelBorder/TestHomePage.java | 2 +- .../form/panelBorder/TestHomePage_2134.java | 2 +- .../html/form/submitlink/TestHomePage.java | 2 +- .../html/form/upload/FileUploadErrorTest.java | 2 +- .../html/form/upload/FileUploadFieldTest.java | 2 +- .../markup/html/form/upload/FileUploadTest.java | 2 +- .../form/upload/MultiFileUploadFieldTest.java | 2 +- .../validation/FormValidatorBehaviorTest.java | 2 +- .../html/form/validation/HomePageTest.java | 2 +- .../innerfeedback/InnerFeedbackTest.java | 2 +- .../markup/html/header/HeaderScopingTest.java | 2 +- .../header/inheritance/InheritanceHeadTest.java | 2 +- .../markup/html/header/testing/HeaderTest.java | 2 +- .../markup/html/header/testing2/HeaderTest.java | 2 +- .../markup/html/header/testing3/HeaderTest.java | 2 +- .../header/threelayers/InheritanceHeadTest.java | 2 +- .../threelayers2/InheritanceHeadTest.java | 2 +- .../markup/html/image/AjaxUpdatedImageTest.java | 2 +- .../wicket/markup/html/image/ImageTest.java | 2 +- .../markup/html/image/InlineImageTest.java | 2 +- .../markup/html/image/InvalidImageTest.java | 2 +- .../markup/html/image/NonCachingImageTest.java | 2 +- .../markup/html/image/ResponsiveImageTest.java | 2 +- .../markup/html/internal/AjaxEnclosureTest.java | 2 +- .../markup/html/internal/EnclosureTest.java | 2 +- .../html/internal/HtmlHeaderContainerTest.java | 2 +- .../html/internal/InlineEnclosureTest.java | 2 +- .../markup/html/internal/TogglePageTest.java | 2 +- .../HtmlHeaderItemsContainerTest.java | 2 +- .../markup/html/link/AbstractLinkTest.java | 2 +- .../wicket/markup/html/link/AutolinkTest.java | 2 +- .../link/BookmarkableHomePageLinksTest.java | 2 +- .../html/link/BookmarkablePageLinkTest.java | 2 +- .../html/link/ClientSideImageMapTest.java | 2 +- .../markup/html/link/DownloadLinkTest.java | 2 +- .../markup/html/link/ExternalLinkTest.java | 2 +- .../wicket/markup/html/link/HrefTest.java | 2 +- .../markup/html/link/MountedPageLinkTest.java | 2 +- .../html/link/submitLink/FormPage2Test.java | 3 +- .../html/link/submitLink/FormPageTest.java | 3 +- .../list/IncrementalTableNavigationTest.java | 2 +- .../wicket/markup/html/list/ListViewTest.java | 2 +- .../html/list/PagedTableNavigatorTest.java | 2 +- ...agedTableNavigatorWithLabelProviderTest.java | 2 +- .../list/PagedTableNavigatorWithMarginTest.java | 2 +- .../wicket/markup/html/list/PagedTableTest.java | 2 +- .../markup/html/list/SimpleTableTest.java | 2 +- .../wicket/markup/html/list/TableTest.java | 2 +- .../markup/html/markupId/TestHomePage.java | 2 +- .../wicket/markup/html/media/MediaTagsTest.java | 2 +- .../paging/AbstractPagingNavigationTest.java | 2 +- .../wicket/markup/html/page/TestHomePage.java | 2 +- .../markup/html/panel/FeedbackPanelTest.java | 2 +- .../wicket/markup/html/panel/FragmentTest.java | 2 +- .../wicket/markup/html/panel/PanelTest.java | 2 +- .../markup/html/tags/InputTagNotClosedTest.java | 2 +- .../OutputTransformerContainerTest.java | 2 +- .../wicket/markup/parser/MergedMarkupTest.java | 2 +- .../parser/RelativePathPrefixHandlerTest.java | 2 +- .../wicket/markup/parser/TestHomePage.java | 2 +- .../parser/filter/DoubleHeaderPartPageTest.java | 2 +- .../markup/parser/filter/HeaderSectionTest.java | 2 +- .../markup/parser/filter/HtmlHandlerTest.java | 2 +- .../filter/HtmlHeaderSectionHandlerTest.java | 2 +- .../parser/filter/OpenCloseTagExpanderTest.java | 2 +- .../filter/StyleAndScriptIdentifierTest.java | 2 +- .../ChildFirstHeaderRenderStrategyTest.java | 2 +- .../wicket/markup/resolver/TestHomePage.java | 2 +- .../resolver/WicketContainerResolverTest.java | 2 +- .../resolver/WicketMessageResolverTest.java | 2 +- .../border/WicketMessageResolverTest.java | 2 +- .../AutoLinkResolveInParentsMarkupTest.java | 2 +- .../markup/resolver/issue3559/MyTest.java | 2 +- .../resolver/issue5569/Issue5569Test.java | 2 +- .../AbstractTransformerBehaviorTest.java | 2 +- .../markupFragments/MarkupFragmentTest.java | 16 +- .../wicket/model/CompoundPropertyModelTest.java | 2 +- .../org/apache/wicket/model/DetachableTest.java | 2 +- .../apache/wicket/model/InheritedModelTest.java | 2 +- .../model/LoadableDetachableModelTest.java | 2 +- .../apache/wicket/model/ModelToStringTest.java | 2 +- .../apache/wicket/model/PropertyModelTest.java | 2 +- .../apache/wicket/model/ResourceModelTest.java | 2 +- .../wicket/model/StringResourceModelTest.java | 2 +- .../org/apache/wicket/model/TestHomePage.java | 2 +- .../wicket/noheadnobody/NoHeadNoBodyTest.java | 2 +- .../PageExpirationRecoveryTest.java | 2 +- .../memory/HttpSessionDataStoreTest.java | 2 +- .../wicket/properties/PropertiesTest.java | 2 +- .../http/AbstractRequestLoggerTest.java | 2 +- .../protocol/http/BufferedWebResponseTest.java | 2 +- .../CsrfPreventionRequestCycleListenerTest.java | 2 +- .../protocol/http/ModifyCookiePageTest.java | 2 +- .../protocol/http/WebApplicationTest.java | 3 +- .../http/WebResponseExceptionsTest.java | 2 +- .../protocol/http/WicketTagPanelTest.java | 2 +- .../http/mock/MockHttpServletRequestTest.java | 2 +- .../CryptedUrlWebRequestCodingStrategyTest.java | 2 +- ...dRemoteAddressRequestWrapperFactoryTest.java | 2 +- .../http/servlet/WicketSessionFilterTest.java | 2 +- .../servlet/XForwardedRequestWrapperTest.java | 2 +- .../ComponentQueueingPerformanceTest.java | 2 +- .../wicket/queueing/ComponentQueueingTest.java | 2 +- ...eueingTransparentWebMarkupContainerTest.java | 2 +- .../redirect/RestartWithMountedPageTest.java | 2 +- .../redirect/abort/AbortExceptionTest.java | 2 +- .../redirect/intercept/InterceptTest.java | 2 +- .../MultiRequestCycleListenerCallOrderTest.java | 2 +- .../cycle/PageRequestHandlerTrackerTest.java | 2 +- .../request/handler/PageProviderTest.java | 2 +- .../SkipRenderWithSetResponsePageTest.java | 2 +- ...elessPageManipulatingPageParametersTest.java | 2 +- .../resource/ResourceAuthorizationTest.java | 2 +- .../request/resource/ByteArrayResourceTest.java | 2 +- .../ContextRelativeResourceReferenceTest.java | 2 +- .../resource/CssPackageResourceTest.java | 2 +- .../resource/DynamicImageResourceTest.java | 2 +- .../resource/JavaScriptPackageResourceTest.java | 2 +- .../resource/LessResourceReferenceTest.java | 2 +- .../MinifiedAwareResourceReferenceTest.java | 2 +- .../resource/PackageResourceReferenceTest.java | 2 +- .../request/resource/ResouceBundleTest.java | 2 +- .../resource/ResourceReferenceRegistryTest.java | 2 +- .../resource/UrlResourceReferenceTest.java | 2 +- .../ContextRelativeResourceCachingTest.java | 2 +- .../wicket/resource/CssUrlReplacerTest.java | 2 +- .../TextTemplateResourceReferenceTest.java | 2 +- .../UtfPropertiesFilePropertiesLoaderTest.java | 2 +- .../resource/XmlFilePropertiesLoaderTest.java | 2 +- .../ResourceAggregatorRenderTest.java | 2 +- .../aggregator/ResourceAggregatorTest.java | 2 +- .../resource/bundles/CompressBundlesTest.java | 2 +- .../loader/ClassStringResourceLoaderTest.java | 2 +- .../ComponentStringResourceLoaderTest.java | 2 +- .../loader/PackageStringResourceLoaderTest.java | 2 +- .../ValidatorStringResourceLoaderTest.java | 2 +- .../PreserveCookieForTheNextHandlerTest.java | 2 +- .../response/filter/ResponseFilterTest.java | 2 +- .../serialize/java/JavaSerializerTest.java | 2 +- .../session/BindSessionOnRedirectTest.java | 2 +- .../wicket/session/DefaultPageFactoryTest.java | 2 +- .../wicket/settings/DebugSettingsTest.java | 2 +- .../wicket/settings/ISecuritySettingsTest.java | 2 +- .../def/SetCustomResourceSettingsTest.java | 2 +- .../wicket/stateless/ImageStatelessTest.java | 2 +- .../stateless/StatelessComponentTest.java | 2 +- .../stateless/StatelessDynmicLinksTest.java | 2 +- .../wicket/stateless/StatelessFormTest.java | 2 +- .../wicket/stateless/StatelessFormUrlTest.java | 2 +- .../wicket/stateless/TemporarySessionTest.java | 2 +- .../pages/RefreshStatelessPageTest.java | 2 +- .../stateless/pages/StatelessFormTest.java | 2 +- .../wicket/util/cookies/CookieUtilsTest.java | 2 +- ...PreserveRequestCookieAfterLinkClickTest.java | 2 +- .../util/cookies/SetCookieAndRedirectTest.java | 2 +- .../iterator/AbstractHierarchyIteratorTest.java | 2 +- .../util/iterator/ComponentIteratorTest.java | 2 +- .../wicket/util/lang/PropertyResolverTest.java | 2 +- .../wicket/util/lang/WicketObjectsTest.java | 2 +- .../apache/wicket/util/resource/PathTest.java | 2 +- .../resource/ResourceStreamLocatorTest.java | 2 +- .../locator/ResourceNameIteratorTest.java | 2 +- .../util/tester/FormTesterSubmitLinkTest.java | 1 - .../wicket/util/tester/FormTesterTest.java | 1 - ...tartComponentInPageRedirectToRenderTest.java | 1 - .../WicketTesterClickExternalLinkTest.java | 1 - .../util/tester/WicketTesterCookieTest.java | 1 - .../WicketTesterLazyIsPageStatelessBase.java | 1 - .../tester/WicketTesterSessionCreationTest.java | 1 - .../WicketTesterSessionInvalidateTest.java | 1 - .../wicket/util/tester/WicketTesterTest.java | 1 - .../apache/wicket/util/tester/apps_2/Test.java | 2 +- .../util/tester/apps_3/FormTesterTest.java | 2 +- .../util/tester/apps_4/FormTesterTest.java | 2 +- .../util/tester/apps_5/AjaxLinkClickTest.java | 2 +- .../tester/apps_5/AjaxSubmitLinkClickTest.java | 2 +- .../wicket/util/tester/apps_7/TestHomePage.java | 2 +- .../validation/ValidatorBehaviorTest.java | 2 +- .../java/org/apache/wicket/WicketTestCase.java | 146 -------------- .../extensions/yui/calendar/DatePickerTest.java | 10 +- .../yui/calendar/DateTimeFieldTest.java | 2 +- .../apache/wicket/examples/WicketTestCase.java | 51 ----- .../examples/ajax/prototype/AjaxTest.java | 2 +- .../wicket/examples/compref/ComprefTest.java | 2 +- .../wicket/examples/encodings/EncodingTest.java | 2 +- .../examples/forminput/FormInputTest.java | 2 +- .../examples/guestbook/GuestbookTest.java | 2 +- .../examples/hangman/WordGeneratorTest.java | 2 +- .../examples/helloworld/HelloWorldTest.java | 2 +- .../examples/linkomatic/LinkomaticTest.java | 2 +- .../java/org/apache/wicket/WicketTestCase.java | 166 --------------- .../ajax/markup/html/AjaxEditableTest.java | 2 +- .../html/autocomplete/AutoCompleteTest.java | 2 +- .../html/AjaxLazyLoadPanelTesterTest.java | 2 +- .../markup/html/form/DateTextFieldTest.java | 2 +- .../markup/html/form/palette/PaletteTest.java | 2 +- .../markup/html/form/select/SelectTest.java | 2 +- .../resource/ThumbnailImageResourceTest.java | 2 +- .../html/repeater/data/table/DataTableTest.java | 2 +- .../markup/html/tabs/TabbedPanelTest.java | 2 +- .../html/tabs/TabbedPanelVisibilityTest.java | 2 +- .../upload/UploadFormWithProgressBarTest.java | 2 +- .../extensions/wizard/WizardModelTest.java | 2 +- 349 files changed, 550 insertions(+), 889 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTestCase.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTestCase.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTestCase.java new file mode 100644 index 0000000..5ff2115 --- /dev/null +++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTestCase.java @@ -0,0 +1,202 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.wicket.util.tester; + +import java.io.IOException; + +import org.apache.wicket.Component; +import org.apache.wicket.Page; +import org.apache.wicket.ThreadContext; +import org.apache.wicket.behavior.AbstractAjaxBehavior; +import org.apache.wicket.markup.IMarkupFragment; +import org.apache.wicket.mock.MockApplication; +import org.apache.wicket.protocol.http.WebApplication; +import org.apache.wicket.request.mapper.parameter.PageParameters; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; + +/** + * Base class for tests which require comparing wicket response with a file. + * <p> + * To create/replace the expected result file with the new content, define the system property like + * -Dwicket.replace.expected.results=true + */ +public abstract class WicketTestCase extends Assert +{ + /** */ + public WicketTester tester; + + /** + * @see junit.framework.TestCase#setUp() + */ + @Before + public void commonBefore() + { + // make sure no leaked threadlocals are present + ThreadContext.detach(); + + WebApplication application = newApplication(); + tester = newWicketTester(application); + } + + /** + * @return the application that should be used for the test + */ + protected WebApplication newApplication() + { + return new MockApplication(); + } + + /** + * In case you need to subclass WicketTester and want to be independent on possible changes in + * setUp(). + * + * @param app + * @return WIcketTester + */ + protected WicketTester newWicketTester(final WebApplication app) + { + return new WicketTester(app); + } + + /** + * + */ + @After + public void commonAfter() + { + tester.destroy(); + } + + /** + * Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected + * output file. + * + * @param <T> + * + * @param pageClass + * @param filename + * @throws Exception + */ + protected <T extends Page> void executeTest(final Class<T> pageClass, final String filename) + throws Exception + { + tester.executeTest(getClass(), pageClass, filename); + } + + /** + * Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected + * output file. + * + * @param page + * @param filename + * @throws Exception + */ + protected void executeTest(final Page page, final String filename) throws Exception + { + tester.executeTest(getClass(), page, filename); + } + + /** + * Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected + * output file. + * + * @param <T> + * + * @param pageClass + * @param parameters + * @param filename + * @throws Exception + */ + protected <T extends Page> void executeTest(final Class<T> pageClass, + PageParameters parameters, final String filename) throws Exception + { + tester.executeTest(getClass(), pageClass, parameters, filename); + } + + /** + * + * @param component + * @param filename + * @throws Exception + */ + protected void executeListener(final Component component, final String filename) + throws Exception + { + tester.executeListener(getClass(), component, filename); + } + + /** + * + * @param behavior + * @param filename + * @throws Exception + */ + protected void executeBehavior(final AbstractAjaxBehavior behavior, final String filename) + throws Exception + { + tester.executeBehavior(getClass(), behavior, filename); + } + + /** + * Returns the current Maven build directory taken from the <tt>basedir</tt> system property, or + * null if not set + * + * @return path with a trailing slash + */ + public String getBasedir() + { + return WicketTester.getBasedir(); + } + + /** + * Compare the markup provided with the file content + * + * @param markup + * @param filename + * @param scopeClass + * @throws IOException + */ + public final void compareMarkupWithFile(IMarkupFragment markup, String filename, Class<?> scopeClass) + throws IOException + { + String doc = markup.toString(true); + DiffUtil.validatePage(doc, scopeClass, filename, true); + } + + /** + * Compare the markup provided with the String + * + * @param markup + * @param testMarkup + * @throws IOException + */ + public final void compareMarkupWithString(IMarkupFragment markup, String testMarkup) + throws IOException + { + testMarkup = testMarkup.replaceAll("\r", ""); + testMarkup = testMarkup.replaceAll("\n", ""); + testMarkup = testMarkup.replaceAll("\t", ""); + + String doc = markup.toString(true); + doc = doc.replaceAll("\n", ""); + doc = doc.replaceAll("\r", ""); + doc = doc.replaceAll("\t", ""); + assertEquals(doc, testMarkup); + } +} http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/AttributeModifierComponentTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/AttributeModifierComponentTest.java b/wicket-core/src/test/java/org/apache/wicket/AttributeModifierComponentTest.java index ec8acd6..634202b 100644 --- a/wicket-core/src/test/java/org/apache/wicket/AttributeModifierComponentTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/AttributeModifierComponentTest.java @@ -17,10 +17,10 @@ package org.apache.wicket; import org.junit.Assert; - import org.apache.wicket.protocol.http.documentvalidation.HtmlDocumentValidator; import org.apache.wicket.protocol.http.documentvalidation.Tag; import org.apache.wicket.protocol.http.documentvalidation.TextContent; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Before; import org.junit.Test; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/AuthorizationTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/AuthorizationTest.java b/wicket-core/src/test/java/org/apache/wicket/AuthorizationTest.java index 3cfde0a..e5579d2 100644 --- a/wicket-core/src/test/java/org/apache/wicket/AuthorizationTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/AuthorizationTest.java @@ -28,6 +28,7 @@ import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.request.component.IRequestableComponent; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/BehaviorRequestTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/BehaviorRequestTest.java b/wicket-core/src/test/java/org/apache/wicket/BehaviorRequestTest.java index c9524d1..7f819e1 100644 --- a/wicket-core/src/test/java/org/apache/wicket/BehaviorRequestTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/BehaviorRequestTest.java @@ -30,6 +30,7 @@ import org.apache.wicket.core.request.handler.PageAndComponentProvider; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java b/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java index c0bcb93..b16ff43 100644 --- a/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java @@ -30,6 +30,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.string.StringValue; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ComponentBehaviorOverComponentTagBehaviorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ComponentBehaviorOverComponentTagBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/ComponentBehaviorOverComponentTagBehaviorTest.java index fc63347..2148583 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ComponentBehaviorOverComponentTagBehaviorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ComponentBehaviorOverComponentTagBehaviorTest.java @@ -24,6 +24,7 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.resource.loader.IStringResourceLoader; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ComponentConfigurationTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ComponentConfigurationTest.java b/wicket-core/src/test/java/org/apache/wicket/ComponentConfigurationTest.java index 7a7444e..8fcf296 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ComponentConfigurationTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ComponentConfigurationTest.java @@ -22,6 +22,7 @@ import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ComponentInitializationIntegrationTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ComponentInitializationIntegrationTest.java b/wicket-core/src/test/java/org/apache/wicket/ComponentInitializationIntegrationTest.java index 7ef1818..84cbe70 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ComponentInitializationIntegrationTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ComponentInitializationIntegrationTest.java @@ -21,6 +21,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ComponentInitializationTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ComponentInitializationTest.java b/wicket-core/src/test/java/org/apache/wicket/ComponentInitializationTest.java index 5d100b7..eb61819 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ComponentInitializationTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ComponentInitializationTest.java @@ -26,6 +26,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ComponentOnConfigureTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ComponentOnConfigureTest.java b/wicket-core/src/test/java/org/apache/wicket/ComponentOnConfigureTest.java index 4d3389d..f7651fa 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ComponentOnConfigureTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ComponentOnConfigureTest.java @@ -25,6 +25,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ComponentTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ComponentTest.java b/wicket-core/src/test/java/org/apache/wicket/ComponentTest.java index 5faf64b..a44739d 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ComponentTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ComponentTest.java @@ -25,6 +25,7 @@ import org.apache.wicket.markup.html.WebComponent; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.markup.html.link.Link; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java b/wicket-core/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java index 1fa7351..7a6a678 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java @@ -29,6 +29,7 @@ import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler; import org.apache.wicket.core.request.handler.PageAndComponentProvider; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperResourceBlockedDevModeTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperResourceBlockedDevModeTest.java b/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperResourceBlockedDevModeTest.java index 82de015..a5bd77f 100644 --- a/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperResourceBlockedDevModeTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperResourceBlockedDevModeTest.java @@ -27,6 +27,7 @@ import org.apache.wicket.request.IRequestHandler; import org.apache.wicket.request.http.handler.ErrorCodeRequestHandler; import org.apache.wicket.request.resource.PackageResource; import org.apache.wicket.settings.ExceptionSettings; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperResourceBlockedProdModeTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperResourceBlockedProdModeTest.java b/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperResourceBlockedProdModeTest.java index 3c54af5..dc6b277 100644 --- a/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperResourceBlockedProdModeTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperResourceBlockedProdModeTest.java @@ -27,6 +27,7 @@ import org.apache.wicket.request.IRequestHandler; import org.apache.wicket.request.http.handler.ErrorCodeRequestHandler; import org.apache.wicket.request.resource.PackageResource; import org.apache.wicket.settings.ExceptionSettings; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperTest.java index 7da753d..af105fc 100644 --- a/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperTest.java @@ -31,6 +31,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.settings.ExceptionSettings; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/DisabledComponentTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/DisabledComponentTest.java b/wicket-core/src/test/java/org/apache/wicket/DisabledComponentTest.java index 48522a8..0d57faf 100644 --- a/wicket-core/src/test/java/org/apache/wicket/DisabledComponentTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/DisabledComponentTest.java @@ -17,6 +17,7 @@ package org.apache.wicket; import org.apache.wicket.markup.html.link.Link; +import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.core.request.handler.ListenerInvocationNotAllowedException; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/EventDispatcherTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/EventDispatcherTest.java b/wicket-core/src/test/java/org/apache/wicket/EventDispatcherTest.java index 8e8413c..b9ab1fe 100644 --- a/wicket-core/src/test/java/org/apache/wicket/EventDispatcherTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/EventDispatcherTest.java @@ -26,6 +26,7 @@ import org.apache.wicket.behavior.Behavior; import org.apache.wicket.event.Broadcast; import org.apache.wicket.event.IEvent; import org.apache.wicket.markup.html.WebComponent; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ExceptionMapperTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ExceptionMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/ExceptionMapperTest.java index aabe9f0..3f46fb7 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ExceptionMapperTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ExceptionMapperTest.java @@ -27,6 +27,7 @@ import org.apache.wicket.util.IProvider; import org.apache.wicket.util.lang.Exceptions; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Ignore; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/FeedbackMessagesTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/FeedbackMessagesTest.java b/wicket-core/src/test/java/org/apache/wicket/FeedbackMessagesTest.java index 3f111dd..2894592 100644 --- a/wicket-core/src/test/java/org/apache/wicket/FeedbackMessagesTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/FeedbackMessagesTest.java @@ -16,8 +16,8 @@ */ package org.apache.wicket; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Assert; - import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/FormDispatchEventTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/FormDispatchEventTest.java b/wicket-core/src/test/java/org/apache/wicket/FormDispatchEventTest.java index c05e4c7..9fde63a 100644 --- a/wicket-core/src/test/java/org/apache/wicket/FormDispatchEventTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/FormDispatchEventTest.java @@ -17,6 +17,7 @@ package org.apache.wicket; import org.apache.wicket.util.tester.FormTester; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/MarkupContainerTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/MarkupContainerTest.java b/wicket-core/src/test/java/org/apache/wicket/MarkupContainerTest.java index 248cbba..4c24c02 100644 --- a/wicket-core/src/test/java/org/apache/wicket/MarkupContainerTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/MarkupContainerTest.java @@ -22,6 +22,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/MarkupIdGeneratorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/MarkupIdGeneratorTest.java b/wicket-core/src/test/java/org/apache/wicket/MarkupIdGeneratorTest.java index 0fcc91b..d1d2967 100644 --- a/wicket-core/src/test/java/org/apache/wicket/MarkupIdGeneratorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/MarkupIdGeneratorTest.java @@ -17,6 +17,7 @@ package org.apache.wicket; import org.apache.wicket.markup.html.link.Link; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/PageFactoryTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/PageFactoryTest.java b/wicket-core/src/test/java/org/apache/wicket/PageFactoryTest.java index ef13c25..c90ae0a 100644 --- a/wicket-core/src/test/java/org/apache/wicket/PageFactoryTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/PageFactoryTest.java @@ -18,6 +18,7 @@ package org.apache.wicket; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.session.DefaultPageFactory; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/PageMarkupLoadingTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/PageMarkupLoadingTest.java b/wicket-core/src/test/java/org/apache/wicket/PageMarkupLoadingTest.java index d08aa42..f86c02f 100644 --- a/wicket-core/src/test/java/org/apache/wicket/PageMarkupLoadingTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/PageMarkupLoadingTest.java @@ -19,6 +19,7 @@ package org.apache.wicket; import java.util.Locale; import org.apache.wicket.markup.html.WebPage; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ParentResourceEscapePathTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ParentResourceEscapePathTest.java b/wicket-core/src/test/java/org/apache/wicket/ParentResourceEscapePathTest.java index eac7f42..ba447cd 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ParentResourceEscapePathTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ParentResourceEscapePathTest.java @@ -22,6 +22,7 @@ import org.apache.wicket.markup.html.PackageResourceGuard; import org.apache.wicket.request.Url; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java b/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java index 65905a0..4b0550f 100644 --- a/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java @@ -23,6 +23,7 @@ import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/RemoveTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/RemoveTest.java b/wicket-core/src/test/java/org/apache/wicket/RemoveTest.java index e34c17e..7dda0a2 100644 --- a/wicket-core/src/test/java/org/apache/wicket/RemoveTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/RemoveTest.java @@ -17,6 +17,7 @@ package org.apache.wicket; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/RequestEncodingTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/RequestEncodingTest.java b/wicket-core/src/test/java/org/apache/wicket/RequestEncodingTest.java index b1985d7..edfe42d 100644 --- a/wicket-core/src/test/java/org/apache/wicket/RequestEncodingTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/RequestEncodingTest.java @@ -17,6 +17,7 @@ package org.apache.wicket; import org.apache.wicket.request.mapper.parameter.PageParameters; +import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.util.tester.WicketTester; import org.junit.After; import org.junit.Assert; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ResourceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ResourceTest.java b/wicket-core/src/test/java/org/apache/wicket/ResourceTest.java index 46c6f3b..2c2c3b4 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ResourceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ResourceTest.java @@ -27,6 +27,7 @@ import org.apache.wicket.request.resource.ResourceStreamResource; import org.apache.wicket.util.resource.FileResourceStream; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionInAjaxTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionInAjaxTest.java b/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionInAjaxTest.java index 6591f4b..c7bde8a 100644 --- a/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionInAjaxTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionInAjaxTest.java @@ -25,6 +25,7 @@ import org.apache.wicket.request.http.WebRequest; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.DummyHomePage; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionTest.java b/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionTest.java index a4cc5b2..1361d36 100644 --- a/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionTest.java @@ -20,6 +20,7 @@ import org.apache.wicket.authorization.strategies.page.AbstractPageAuthorization import org.apache.wicket.markup.html.pages.RedirectPage; import org.apache.wicket.mock.MockApplication; import org.apache.wicket.protocol.http.WebApplication; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/RestartResponseExceptionTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/RestartResponseExceptionTest.java b/wicket-core/src/test/java/org/apache/wicket/RestartResponseExceptionTest.java index fe89331..1a19385 100644 --- a/wicket-core/src/test/java/org/apache/wicket/RestartResponseExceptionTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/RestartResponseExceptionTest.java @@ -20,6 +20,7 @@ import org.apache.wicket.markup.IMarkupResourceStreamProvider; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.util.resource.AbstractStringResourceStream; import org.apache.wicket.util.resource.IResourceStream; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/RestartWithMountedPageTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/RestartWithMountedPageTest.java b/wicket-core/src/test/java/org/apache/wicket/RestartWithMountedPageTest.java index fba5e07..f44048d 100644 --- a/wicket-core/src/test/java/org/apache/wicket/RestartWithMountedPageTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/RestartWithMountedPageTest.java @@ -16,6 +16,7 @@ */ package org.apache.wicket; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/SetResponsePageTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/SetResponsePageTest.java b/wicket-core/src/test/java/org/apache/wicket/SetResponsePageTest.java index 54f267a..0f99a88 100644 --- a/wicket-core/src/test/java/org/apache/wicket/SetResponsePageTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/SetResponsePageTest.java @@ -17,6 +17,7 @@ package org.apache.wicket; import org.apache.wicket.markup.html.WebPage; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/SharedResourceUrlTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/SharedResourceUrlTest.java b/wicket-core/src/test/java/org/apache/wicket/SharedResourceUrlTest.java index 947e16b..14d5083 100644 --- a/wicket-core/src/test/java/org/apache/wicket/SharedResourceUrlTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/SharedResourceUrlTest.java @@ -20,6 +20,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.request.resource.SharedResourceReference; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/TesterTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/TesterTest.java b/wicket-core/src/test/java/org/apache/wicket/TesterTest.java index b5d5b67..3762018 100644 --- a/wicket-core/src/test/java/org/apache/wicket/TesterTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/TesterTest.java @@ -20,6 +20,7 @@ import junit.framework.AssertionFailedError; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/VisitorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/VisitorTest.java b/wicket-core/src/test/java/org/apache/wicket/VisitorTest.java index 4347eff..4260eca 100644 --- a/wicket-core/src/test/java/org/apache/wicket/VisitorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/VisitorTest.java @@ -17,9 +17,9 @@ package org.apache.wicket; import org.junit.Assert; - import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.form.FormComponent; +import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.util.visit.ClassVisitFilter; import org.apache.wicket.util.visit.IVisit; import org.apache.wicket.util.visit.IVisitor; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/WicketTestCase.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/WicketTestCase.java b/wicket-core/src/test/java/org/apache/wicket/WicketTestCase.java deleted file mode 100644 index ef86316..0000000 --- a/wicket-core/src/test/java/org/apache/wicket/WicketTestCase.java +++ /dev/null @@ -1,201 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.wicket; - -import java.io.IOException; - -import org.apache.wicket.behavior.AbstractAjaxBehavior; -import org.apache.wicket.markup.IMarkupFragment; -import org.apache.wicket.markupFragments.MyPage; -import org.apache.wicket.mock.MockApplication; -import org.apache.wicket.protocol.http.WebApplication; -import org.apache.wicket.request.mapper.parameter.PageParameters; -import org.apache.wicket.util.tester.DiffUtil; -import org.apache.wicket.util.tester.WicketTester; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; - -/** - * Base class for tests which require comparing wicket response with a file. - * <p> - * To create/replace the expected result file with the new content, define the system property like - * -Dwicket.replace.expected.results=true - */ -public abstract class WicketTestCase extends Assert -{ - /** */ - public WicketTester tester; - - /** - * @see junit.framework.TestCase#setUp() - */ - @Before - public void commonBefore() - { - // make sure no leaked threadlocals are present - ThreadContext.detach(); - - WebApplication application = newApplication(); - tester = newWicketTester(application); - } - - /** - * @return the application that should be used for the test - */ - protected WebApplication newApplication() - { - return new MockApplication(); - } - - /** - * In case you need to subclass WicketTester and want to be independent on possible changes in - * setUp(). - * - * @param app - * @return WIcketTester - */ - protected WicketTester newWicketTester(final WebApplication app) - { - return new WicketTester(app); - } - - /** - * - */ - @After - public void commonAfter() - { - tester.destroy(); - } - - /** - * Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected - * output file. - * - * @param <T> - * - * @param pageClass - * @param filename - * @throws Exception - */ - protected <T extends Page> void executeTest(final Class<T> pageClass, final String filename) - throws Exception - { - tester.executeTest(getClass(), pageClass, filename); - } - - /** - * Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected - * output file. - * - * @param page - * @param filename - * @throws Exception - */ - protected void executeTest(final Page page, final String filename) throws Exception - { - tester.executeTest(getClass(), page, filename); - } - - /** - * Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected - * output file. - * - * @param <T> - * - * @param pageClass - * @param parameters - * @param filename - * @throws Exception - */ - protected <T extends Page> void executeTest(final Class<T> pageClass, - PageParameters parameters, final String filename) throws Exception - { - tester.executeTest(getClass(), pageClass, parameters, filename); - } - - /** - * - * @param component - * @param filename - * @throws Exception - */ - protected void executeListener(final Component component, final String filename) - throws Exception - { - tester.executeListener(getClass(), component, filename); - } - - /** - * - * @param behavior - * @param filename - * @throws Exception - */ - protected void executeBehavior(final AbstractAjaxBehavior behavior, final String filename) - throws Exception - { - tester.executeBehavior(getClass(), behavior, filename); - } - - /** - * Returns the current Maven build directory taken from the <tt>basedir</tt> system property, or - * null if not set - * - * @return path with a trailing slash - */ - public String getBasedir() - { - return WicketTester.getBasedir(); - } - - /** - * Compare the markup provided with the file content - * - * @param markup - * @param filename - * @throws IOException - */ - public final void compareMarkupWithFile(IMarkupFragment markup, String filename) - throws IOException - { - String doc = markup.toString(true); - DiffUtil.validatePage(doc, MyPage.class, filename, true); - } - - /** - * Compare the markup provided with the String - * - * @param markup - * @param testMarkup - * @throws IOException - */ - public final void compareMarkupWithString(IMarkupFragment markup, String testMarkup) - throws IOException - { - testMarkup = testMarkup.replaceAll("\r", ""); - testMarkup = testMarkup.replaceAll("\n", ""); - testMarkup = testMarkup.replaceAll("\t", ""); - - String doc = markup.toString(true); - doc = doc.replaceAll("\n", ""); - doc = doc.replaceAll("\r", ""); - doc = doc.replaceAll("\t", ""); - assertEquals(doc, testMarkup); - } -} http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorAndMetaDataTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorAndMetaDataTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorAndMetaDataTest.java index c5f5717..e24a115 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorAndMetaDataTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorAndMetaDataTest.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.ajax; -import org.apache.wicket.WicketTestCase; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java index c8af758..d6f96bd 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java @@ -18,13 +18,13 @@ package org.apache.wicket.ajax; import org.apache.wicket.Component; import org.apache.wicket.Session; -import org.apache.wicket.WicketTestCase; import org.apache.wicket.authorization.Action; import org.apache.wicket.authorization.IAuthorizationStrategy; import org.apache.wicket.mock.MockApplication; import org.apache.wicket.protocol.http.WebSession; import org.apache.wicket.request.Request; import org.apache.wicket.request.Response; +import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.util.tester.WicketTester; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java index 222e638..a4f1d79 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java @@ -21,7 +21,7 @@ import static org.apache.wicket.ajax.attributes.CallbackParameter.converted; import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit; import static org.apache.wicket.ajax.attributes.CallbackParameter.resolved; -import org.apache.wicket.WicketTestCase; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxChannelTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxChannelTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxChannelTest.java index 15f2cb4..bab9eba 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxChannelTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxChannelTest.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.ajax; -import org.apache.wicket.WicketTestCase; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxComponentVisibilityTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxComponentVisibilityTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxComponentVisibilityTest.java index bda2618..9f8f591 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxComponentVisibilityTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxComponentVisibilityTest.java @@ -17,7 +17,7 @@ package org.apache.wicket.ajax; import org.apache.wicket.Component; -import org.apache.wicket.WicketTestCase; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxEventBehaviorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxEventBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxEventBehaviorTest.java index 52d9e42..8aea84c 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxEventBehaviorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxEventBehaviorTest.java @@ -21,12 +21,12 @@ import static org.hamcrest.Matchers.is; import java.util.concurrent.atomic.AtomicInteger; import org.apache.wicket.MarkupContainer; -import org.apache.wicket.WicketTestCase; import org.apache.wicket.markup.IMarkupResourceStreamProvider; import org.apache.wicket.markup.html.WebComponent; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionTest.java index 76281b4..9c0eb8e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionTest.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.ajax; -import org.apache.wicket.WicketTestCase; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxRequestHandlerTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxRequestHandlerTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxRequestHandlerTest.java index 2016766..246f860 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxRequestHandlerTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxRequestHandlerTest.java @@ -25,7 +25,6 @@ import java.util.regex.Pattern; import org.apache.wicket.Component; import org.apache.wicket.MarkupContainer; import org.apache.wicket.MockPageWithLinkAndComponent; -import org.apache.wicket.WicketTestCase; import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.event.IEvent; import org.apache.wicket.markup.IMarkupResourceStreamProvider; @@ -34,6 +33,7 @@ import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.DiffUtil; +import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.util.time.Time; import org.junit.Test; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java index 3d7f599..cf74efd 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java @@ -18,13 +18,13 @@ package org.apache.wicket.ajax; import org.apache.wicket.Component; import org.apache.wicket.MockPageWithLinkAndComponent; -import org.apache.wicket.WicketTestCase; import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.markup.html.WebComponent; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.model.Model; +import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.util.time.Duration; import org.junit.Test; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderTest.java index 77c9a8f..9f09c10 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderTest.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.ajax; -import org.apache.wicket.WicketTestCase; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ajax/GlobalUpdateAjaxAttributesTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/GlobalUpdateAjaxAttributesTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/GlobalUpdateAjaxAttributesTest.java index 39459a9..0624392 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/GlobalUpdateAjaxAttributesTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/GlobalUpdateAjaxAttributesTest.java @@ -17,7 +17,6 @@ package org.apache.wicket.ajax; import org.apache.wicket.MarkupContainer; -import org.apache.wicket.WicketTestCase; import org.apache.wicket.ajax.attributes.AjaxRequestAttributes; import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.behavior.Behavior; @@ -26,6 +25,7 @@ import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ajax/InternalErrorCallsAjaxOnFailureTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/InternalErrorCallsAjaxOnFailureTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/InternalErrorCallsAjaxOnFailureTest.java index e85d6b6..d6f089a 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/InternalErrorCallsAjaxOnFailureTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/InternalErrorCallsAjaxOnFailureTest.java @@ -16,13 +16,13 @@ */ package org.apache.wicket.ajax; -import org.apache.wicket.WicketTestCase; import org.apache.wicket.markup.html.pages.ExceptionErrorPage; import org.apache.wicket.markup.html.pages.InternalErrorPage; import org.apache.wicket.protocol.http.mock.MockHttpServletResponse; import org.apache.wicket.resource.DummyApplication; import org.apache.wicket.settings.ExceptionSettings; import org.apache.wicket.util.tester.BaseWicketTester; +import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.util.tester.WicketTester; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehaviorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehaviorTest.java index 348b291..1e8e1ab 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehaviorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehaviorTest.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.ajax.form; -import org.apache.wicket.WicketTestCase; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; public class AjaxFormChoiceComponentUpdatingBehaviorTest extends WicketTestCase http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java index 63bf7ba..1fe4dad 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.ajax.form; -import org.apache.wicket.WicketTestCase; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java index 23e0b79..90bff48 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java @@ -17,8 +17,8 @@ package org.apache.wicket.ajax.form; import org.apache.wicket.Page; -import org.apache.wicket.WicketTestCase; import org.apache.wicket.util.tester.FormTester; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTest.java index e04e064..60036e8 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTest.java @@ -18,7 +18,7 @@ package org.apache.wicket.ajax.form; import java.util.Locale; -import org.apache.wicket.WicketTestCase; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLinkTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLinkTest.java index 37d8397..ac047dc 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLinkTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLinkTest.java @@ -17,13 +17,13 @@ package org.apache.wicket.ajax.markup.html; import org.apache.wicket.MarkupContainer; -import org.apache.wicket.WicketTestCase; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.markup.IMarkupResourceStreamProvider; import org.apache.wicket.markup.MarkupException; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkTest.java index 5b99e11..e18fa29 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkTest.java @@ -18,9 +18,9 @@ package org.apache.wicket.ajax.markup.html.ajaxLink; import org.apache.wicket.Component; import org.apache.wicket.Page; -import org.apache.wicket.WicketTestCase; import org.apache.wicket.behavior.AbstractAjaxBehavior; import org.apache.wicket.util.tester.TagTester; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelTest.java index cad76bc..e3bf94c 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelTest.java @@ -17,8 +17,8 @@ package org.apache.wicket.ajax.markup.html.componentMap; import org.apache.wicket.Page; -import org.apache.wicket.WicketTestCase; import org.apache.wicket.util.tester.DiffUtil; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/AjaxButtonTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/AjaxButtonTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/AjaxButtonTest.java index 121927c..18bd35a 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/AjaxButtonTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/AjaxButtonTest.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.ajax.markup.html.form; -import org.apache.wicket.WicketTestCase; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/authorization/ComponentIsRenderedAllowedTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/authorization/ComponentIsRenderedAllowedTest.java b/wicket-core/src/test/java/org/apache/wicket/authorization/ComponentIsRenderedAllowedTest.java index d18a069..e6ac55c 100644 --- a/wicket-core/src/test/java/org/apache/wicket/authorization/ComponentIsRenderedAllowedTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/authorization/ComponentIsRenderedAllowedTest.java @@ -18,7 +18,6 @@ package org.apache.wicket.authorization; import org.apache.wicket.Component; import org.apache.wicket.MarkupContainer; -import org.apache.wicket.WicketTestCase; import org.apache.wicket.markup.IMarkupResourceStreamProvider; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.WebPage; @@ -26,6 +25,7 @@ import org.apache.wicket.mock.MockApplication; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java b/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java index add6c97..2698efc 100644 --- a/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java @@ -21,7 +21,6 @@ import java.util.List; import org.apache.wicket.AttributeModifier; import org.apache.wicket.Component; import org.apache.wicket.MarkupContainer; -import org.apache.wicket.WicketTestCase; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.IMarkupResourceStreamProvider; import org.apache.wicket.markup.html.WebMarkupContainer; @@ -29,6 +28,7 @@ import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** IBehavior array management tests */ http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/behavior/SharedBehaviorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/behavior/SharedBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/behavior/SharedBehaviorTest.java index 27409f2..6b94bb0 100644 --- a/wicket-core/src/test/java/org/apache/wicket/behavior/SharedBehaviorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/behavior/SharedBehaviorTest.java @@ -18,7 +18,6 @@ package org.apache.wicket.behavior; import org.apache.wicket.Component; import org.apache.wicket.MarkupContainer; -import org.apache.wicket.WicketTestCase; import org.apache.wicket.markup.IMarkupResourceStreamProvider; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.StringHeaderItem; @@ -26,6 +25,7 @@ import org.apache.wicket.markup.html.WebComponent; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceWithTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceWithTest.java b/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceWithTest.java index 5908bd1..71a2e31 100644 --- a/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceWithTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceWithTest.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.component.replacewith; -import org.apache.wicket.WicketTestCase; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException;
