wicket-core: Migrate to Junit 5
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/645f239c Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/645f239c Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/645f239c Branch: refs/heads/master Commit: 645f239cda3a9c94c5ab65a5a0b78fb24fd99b0c Parents: 28dd483 Author: renoth <[email protected]> Authored: Fri Aug 31 23:25:41 2018 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Sep 26 15:37:45 2018 +0300 ---------------------------------------------------------------------- pom.xml | 19 +- wicket-core/pom.xml | 15 + .../wicket/util/tester/BaseWicketTester.java | 15 +- .../org/apache/wicket/util/tester/DiffUtil.java | 5 +- .../apache/wicket/util/tester/FormTester.java | 8 +- .../wicket/util/tester/WicketTestCase.java | 21 +- .../apache/wicket/util/tester/WicketTester.java | 183 +++--- .../util/tester/WicketTesterExtension.java | 71 ++ .../wicket/util/tester/WicketTesterHelper.java | 15 +- .../wicket/util/tester/WicketTesterScope.java | 73 --- .../AddChildToParentInOnInitializeTest.java | 18 +- .../apache/wicket/ApplicationSettingsTest.java | 86 +-- .../apache/wicket/AttributeModifierTest.java | 60 +- .../org/apache/wicket/AuthorizationTest.java | 28 +- .../org/apache/wicket/BehaviorRequestTest.java | 27 +- .../java/org/apache/wicket/BehaviorUrlTest.java | 24 +- .../wicket/CachingDisabledLocalizerTest.java | 6 +- .../wicket/ClassAttributeModifierTest.java | 14 +- ...entBehaviorOverComponentTagBehaviorTest.java | 6 +- .../wicket/ComponentConfigurationTest.java | 19 +- .../org/apache/wicket/ComponentEventsTest.java | 130 ++-- .../ComponentInitializationIntegrationTest.java | 14 +- .../wicket/ComponentInitializationTest.java | 27 +- .../apache/wicket/ComponentOnConfigureTest.java | 30 +- .../java/org/apache/wicket/ComponentTest.java | 22 +- .../ComponentWithLazyModelCreationTest.java | 19 +- .../org/apache/wicket/ConverterLocatorTest.java | 12 +- ...ceptionMapperResourceBlockedDevModeTest.java | 14 +- ...eptionMapperResourceBlockedProdModeTest.java | 14 +- .../wicket/DefaultExceptionMapperTest.java | 14 +- .../apache/wicket/DisabledComponentTest.java | 19 +- .../org/apache/wicket/EventDispatcherTest.java | 15 +- .../org/apache/wicket/ExceptionMapperTest.java | 15 +- .../org/apache/wicket/FeedbackMessagesTest.java | 11 +- .../apache/wicket/FormDispatchEventTest.java | 12 +- .../java/org/apache/wicket/LocalizerTest.java | 168 ++--- .../org/apache/wicket/MarkupContainerTest.java | 653 ++++++++++--------- .../apache/wicket/MarkupIdGeneratorTest.java | 10 +- .../java/org/apache/wicket/MetaDataTest.java | 11 +- .../java/org/apache/wicket/MockComponent.java | 8 +- .../apache/wicket/MockPageParametersAware.java | 2 +- .../java/org/apache/wicket/OnReAddTest.java | 42 +- .../java/org/apache/wicket/PageFactoryTest.java | 34 +- .../apache/wicket/PageMarkupLoadingTest.java | 16 +- .../wicket/ParentResourceEscapePathTest.java | 16 +- .../org/apache/wicket/PlaceholderTagIdTest.java | 8 +- .../org/apache/wicket/RedirectApplication.java | 2 +- .../test/java/org/apache/wicket/RemoveTest.java | 34 +- .../java/org/apache/wicket/RemoveTestPage.java | 4 +- .../org/apache/wicket/RequestEncodingTest.java | 25 +- .../java/org/apache/wicket/ResourceTest.java | 11 +- ...ponseAtInterceptPageExceptionInAjaxTest.java | 10 +- ...artResponseAtInterceptPageExceptionTest.java | 6 +- .../wicket/RestartResponseExceptionTest.java | 6 +- .../wicket/RestartWithMountedPageTest.java | 6 +- .../org/apache/wicket/SetResponsePageTest.java | 10 +- .../apache/wicket/SharedResourceUrlTest.java | 10 +- .../wicket/StyleAttributeModifierTest.java | 14 +- .../test/java/org/apache/wicket/TesterTest.java | 11 +- .../java/org/apache/wicket/VisitorTest.java | 39 +- .../ajax/AbstractDefaultAjaxBehaviorTest.java | 9 +- .../ajax/AjaxBehaviorAndMetaDataTest.java | 6 +- .../wicket/ajax/AjaxBehaviorEnabledPage.java | 8 +- .../wicket/ajax/AjaxBehaviorEnabledTest.java | 12 +- .../wicket/ajax/AjaxCallbackFunctionTest.java | 19 +- .../org/apache/wicket/ajax/AjaxChannelTest.java | 8 +- .../ajax/AjaxComponentVisibilityTest.java | 15 +- .../wicket/ajax/AjaxEventBehaviorTest.java | 57 +- .../wicket/ajax/AjaxHeaderContributionTest.java | 8 +- .../wicket/ajax/AjaxRequestHandlerTest.java | 56 +- .../wicket/ajax/AjaxTimerBehaviorTest.java | 19 +- .../apache/wicket/ajax/DomReadyOrderPage.java | 2 +- .../apache/wicket/ajax/DomReadyOrderTest.java | 10 +- .../ajax/GlobalUpdateAjaxAttributesTest.java | 6 +- .../java/org/apache/wicket/ajax/HomePage.java | 2 +- .../InternalErrorCallsAjaxOnFailureTest.java | 11 +- .../org/apache/wicket/ajax/StatelessPage.java | 10 +- .../ajax/attributes/AjaxAttributeNameTest.java | 18 +- ...FormChoiceComponentUpdatingBehaviorTest.java | 10 +- .../ajax/form/AjaxFormSubmitBehaviorTest.java | 21 +- .../wicket/ajax/form/AjaxFormSubmitTest.java | 16 +- .../ajax/form/AjaxFormSubmitTestPage.java | 2 +- .../form/AjaxFormValidatingBehaviorTest.java | 8 +- .../AjaxFormValidatingBehaviorTestPage.java | 2 +- .../wicket/ajax/form/ChoiceComponentPage.java | 2 +- .../ajax/form/OnChangeAjaxBehaviorTest.java | 8 +- .../apache/wicket/ajax/json/JsonUtilsTest.java | 9 +- .../ajax/markup/html/AjaxFallbackLinkTest.java | 28 +- .../ajax/markup/html/ComponentNotOnPage.java | 2 +- .../markup/html/ComponentNotOnPageTest.java | 43 +- ...telessAjaxFallbackLinkDoNotRecreatePage.java | 2 +- ...telessAjaxFallbackLinkDoNotRecreateTest.java | 14 +- .../html/StatelessAjaxFallbackLinkTest.java | 24 +- .../ajax/markup/html/ajaxLink/AjaxLinkTest.java | 17 +- .../html/componentMap/SimpleTestPanelBase.java | 4 +- .../html/componentMap/SimpleTestPanelTest.java | 6 +- .../ajax/markup/html/form/AjaxButtonTest.java | 8 +- .../html/form/StatelessAjaxSubmitLinkTest.java | 62 +- .../ComponentIsRenderedAllowedTest.java | 18 +- .../wicket/behavior/AjaxCallbackUrlTest.java | 17 +- .../apache/wicket/behavior/BehaviorTest.java | 25 +- .../behavior/ImmutableBehaviorIdsTest.java | 19 +- .../wicket/behavior/SharedBehaviorTest.java | 6 +- .../replacewith/BaseReplaceWithPanel.java | 4 +- .../wicket/component/replacewith/PanelB.java | 2 +- .../replacewith/ReplaceInConstructorPanel.java | 2 +- .../ReplaceInOnBeforeRenderPanel.java | 2 +- .../replacewith/ReplaceInOnConfigurePanel.java | 2 +- .../replacewith/ReplaceInOnInitializePanel.java | 2 +- .../component/replacewith/ReplaceWithTest.java | 29 +- .../handler/ListenerRequestHandlerTest.java | 105 ++- .../mapper/AbstractBookmarkableMapperTest.java | 36 +- .../core/request/mapper/AbstractMapperTest.java | 13 +- .../AbstractResourceReferenceMapperOwnTest.java | 11 +- .../AbstractResourceReferenceMapperTest.java | 38 +- .../BasicResourceReferenceMapperTest.java | 134 ++-- .../request/mapper/BookmarkableMapperTest.java | 114 ++-- .../core/request/mapper/CryptoMapperTest.java | 272 ++++---- .../mapper/LocaleAwarePageParametersTest.java | 36 +- .../MoreSpecificResourceMountPathTest.java | 153 +++-- .../core/request/mapper/MountedMapperTest.java | 301 +++++---- .../core/request/mapper/PackageMapperTest.java | 226 ++++--- .../request/mapper/PageInstanceMapperTest.java | 52 +- .../core/request/mapper/ResourceMapperTest.java | 32 +- ...esourceMapperWithDecoratedResourcesTest.java | 36 +- .../core/request/mapper/TestMapperContext.java | 10 +- .../wicket/core/request/mapper/UrlInfoTest.java | 9 +- .../util/license/ApacheLicenceHeaderTest.java | 4 +- .../checker/AbstractObjectCheckerTest.java | 9 +- .../checker/DifferentPageCheckerTest.java | 12 +- .../checker/OrphanComponentCheckerTest.java | 8 +- .../objects/checker/SessionCheckerTest.java | 12 +- .../resource/ClassPathResourceFinderTest.java | 12 +- .../wicket/core/util/string/CssUtilsTest.java | 9 +- .../core/util/string/JavaScriptUtilsTest.java | 15 +- .../ComponentRendererInstanceTest.java | 20 +- .../ComponentRendererTest.java | 10 +- .../wicket/dontstoreunrendered/BasePage.java | 2 +- ...ntStoreNotRenderedPageOnePassRenderTest.java | 2 +- ...toreNotRenderedPageRedirectToBufferTest.java | 2 +- ...toreNotRenderedPageRedirectToRenderTest.java | 2 +- .../DontStoreNotRenderedPageTestCase.java | 19 +- .../wicket/feedback/FeedbackRenderTest.java | 10 +- .../InterceptDataCleanedAfterReadTest.java | 6 +- .../wicket/intercept/Wicket4066Application.java | 2 +- .../ComponentTagAttributeEscapingTest.java | 44 +- .../DefaultMarkupCacheKeyProviderTest.java | 8 +- .../wicket/markup/HtmlProblemFinderTest.java | 16 +- .../apache/wicket/markup/MarkupCacheTest.java | 20 +- .../wicket/markup/MarkupFragmentTest.java | 23 +- .../markup/MarkupInheritanceBaseBase_11.java | 2 +- .../markup/MarkupInheritanceBaseBase_13.java | 2 +- .../markup/MarkupInheritanceBaseBase_3.java | 2 +- .../markup/MarkupInheritanceBasePanel_6.java | 2 +- .../markup/MarkupInheritanceBasePanel_9.java | 2 +- .../wicket/markup/MarkupInheritanceBase_1.java | 2 +- .../wicket/markup/MarkupInheritanceBase_10.java | 2 +- .../wicket/markup/MarkupInheritanceBase_11.java | 2 +- .../wicket/markup/MarkupInheritanceBase_12.java | 2 +- .../wicket/markup/MarkupInheritanceBase_13.java | 2 +- .../wicket/markup/MarkupInheritanceBase_2.java | 2 +- .../wicket/markup/MarkupInheritanceBase_3.java | 2 +- .../wicket/markup/MarkupInheritanceBase_4.java | 2 +- .../wicket/markup/MarkupInheritanceBase_5.java | 2 +- .../wicket/markup/MarkupInheritanceBase_7.java | 2 +- .../wicket/markup/MarkupInheritanceBase_8.java | 2 +- .../wicket/markup/MarkupInheritanceTest.java | 35 +- .../apache/wicket/markup/MarkupParserTest.java | 119 ++-- .../org/apache/wicket/markup/MarkupTest.java | 11 +- .../apache/wicket/markup/MarkupTest_Find_1.java | 2 +- .../apache/wicket/markup/MarkupTest_Find_2.java | 2 +- .../apache/wicket/markup/MarkupTest_Find_3.java | 2 +- .../wicket/markup/MarkupVariationTest.java | 10 +- .../markup/RefreshingViewOnRemoveTest.java | 22 +- .../wicket/markup/WicketNamespaceTest.java | 24 +- .../wicket/markup/head/HeaderResponseTest.java | 8 +- .../markup/head/HtmlImportHeaderItemTest.java | 37 +- .../markup/head/MetaDataHeaderItemTest.java | 12 +- .../filter/FilteringHeaderResponseTest.java | 37 +- .../markup/html/ComponentMarkupIdTest.java | 43 +- .../html/DecoratingHeaderResponseTest.java | 11 +- .../markup/html/HeaderContributorTest.java | 19 +- .../wicket/markup/html/MarkupHeadFirstTest.java | 8 +- .../MarkupInheritanceResolverTestPage1.java | 2 +- .../MarkupInheritanceResolverTestPage2.java | 2 +- .../markup/html/PackageResourceGuardTest.java | 14 +- .../wicket/markup/html/PackageResourceTest.java | 46 +- .../html/SecurePackageResourceGuardTest.java | 37 +- .../html/TransparentWebMarkupContainerTest.java | 49 +- .../apache/wicket/markup/html/WebPageTest.java | 15 +- .../wicket/markup/html/XmlDeclResponseTest.java | 16 +- .../AutocomponetsGenerationTest.java | 12 +- .../markup/html/autocomponent/UniqueIdTest.java | 4 +- .../html/autolink/AutoLinkInPanelsTest.java | 14 +- .../markup/html/autolink/AutolinkTest.java | 12 +- .../wicket/markup/html/autolink/BasePage.java | 2 +- .../markup/html/autolink/QuickStartPage.java | 2 +- .../markup/html/autolink/sub/BasePage.java | 2 +- .../html/basic/EnclosureContainerTest.java | 8 +- .../markup/html/basic/HomePageRedirectTest.java | 10 +- .../wicket/markup/html/basic/LabelTest.java | 8 +- .../markup/html/basic/SimplePageTest.java | 81 ++- .../wicket/markup/html/basic/SimplePage_9.java | 2 +- .../html/basic/SimpleResponsePageClassTest.java | 10 +- .../wicket/markup/html/basic/XmlBasePage.java | 2 +- .../wicket/markup/html/basic/XmlPageTest.java | 12 +- .../markup/html/border/BorderWithForm.java | 2 +- .../markup/html/border/ComponentBorderTest.java | 70 +- .../markup/html/border/ExtedableBorder.java | 2 +- .../html/debug/WicketComponentTreeTest.java | 6 +- .../html/form/AbstractCheckGroupTestPage.java | 2 +- ...tComponentConvertEmptyStringsToNullTest.java | 13 +- .../html/form/AutoFormLabelPickupTest.java | 36 +- .../wicket/markup/html/form/AutoLabelTest.java | 40 +- .../html/form/AutoLabelWithContentTest.java | 8 +- .../html/form/AutoLabelWithinEnclosureTest.java | 12 +- .../wicket/markup/html/form/ButtonTest.java | 39 +- .../html/form/CheckBoxMultipleChoiceTest.java | 31 +- .../wicket/markup/html/form/CheckGroupTest.java | 58 +- .../html/form/CollectionFormComponentTest.java | 49 +- .../form/DisabledItemRetainingCheckBoxTest.java | 18 +- .../markup/html/form/DropDownChoiceTest.java | 18 +- .../html/form/EnumChoiceRendererTest.java | 8 +- .../form/EscapeAttributesInChoicesTest.java | 13 +- .../form/FormComponentPanelProcessingTest.java | 17 +- .../markup/html/form/FormComponentTest.java | 32 +- .../markup/html/form/FormHasErrorPage.java | 6 +- .../html/form/FormMethodMismatchTest.java | 46 +- .../markup/html/form/FormMultiPartTest.java | 30 +- .../form/FormParentDisabledRawInputTest.java | 23 +- .../markup/html/form/FormSubmitOrderTest.java | 14 +- .../wicket/markup/html/form/FormSubmitTest.java | 41 +- .../wicket/markup/html/form/FormTest.java | 29 +- ...FormValidationDisabledFormComponentTest.java | 21 +- .../markup/html/form/FormValidationTest.java | 27 +- .../html/form/FormWithMultipleButtonsTest.java | 16 +- .../html/form/ListMultipleChoiceTest.java | 23 +- .../html/form/LocalizedErrorMessageTest.java | 10 +- .../markup/html/form/LocalizedMessagePage.java | 2 +- .../markup/html/form/MultiPartFormPage.java | 4 +- .../markup/html/form/NestedFormSubmitTest.java | 50 +- .../markup/html/form/NestedFormsPage.java | 6 +- .../markup/html/form/NestedFormsTest.java | 10 +- .../markup/html/form/NumberTextFieldTest.java | 19 +- .../html/form/OnValidateModelObjectsTest.java | 12 +- .../markup/html/form/PasswordTextFieldTest.java | 18 +- .../html/form/PrimitiveTypeRequiredTest.java | 10 +- .../markup/html/form/RadioChoiceTest.java | 12 +- .../wicket/markup/html/form/RadioGroupTest.java | 26 +- .../markup/html/form/TestFormHasError.java | 10 +- .../wicket/markup/html/form/TextAreaTest.java | 10 +- .../wicket/markup/html/form/TextFieldTest.java | 17 +- .../html/form/ValidatorPropertiesTest.java | 16 +- .../markup/html/form/border/TestHomePage.java | 14 +- .../html/form/border/TestHomePage_2134.java | 12 +- .../markup/html/form/encryption/CryptTest.java | 12 +- .../html/form/feedback/FormFeedbackTest.java | 8 +- .../form/formComponentPanel/SimplePageTest.java | 12 +- .../html/form/imagebutton/ImageButtonTest.java | 6 +- .../imagebutton/InvalidImageButtonTest.java | 6 +- .../html/form/imagebutton/PubApplication.java | 2 +- .../markup/html/form/login/InterceptTest.java | 21 +- .../markup/html/form/login/MockLoginPage.java | 2 +- .../OnFormValidateModelObjectsPage.java | 4 +- .../html/form/panelBorder/TestHomePage.java | 8 +- .../form/panelBorder/TestHomePage_2134.java | 12 +- .../markup/html/form/submitlink/HomePage.java | 16 +- .../html/form/submitlink/TestHomePage.java | 40 +- .../html/form/upload/FileUploadErrorTest.java | 32 +- .../html/form/upload/FileUploadFieldTest.java | 19 +- .../form/upload/FileUploadServletPartTest.java | 29 +- .../markup/html/form/upload/FileUploadTest.java | 13 +- .../upload/MockPageWithFormAndUploadField.java | 4 +- .../form/upload/MultiFileUploadFieldTest.java | 19 +- .../validation/FormValidatorBehaviorTest.java | 21 +- .../markup/html/form/validation/HomePage.java | 2 +- .../html/form/validation/HomePageTest.java | 34 +- .../markup/html/form/validation/MyBorder.java | 2 +- .../form/validation/innerfeedback/BasePage.java | 2 +- .../innerfeedback/InnerFeedbackTest.java | 6 +- .../wicket/markup/html/header/BasePanel.java | 2 +- .../markup/html/header/HeaderScopingTest.java | 8 +- .../header/inheritance/InheritanceHeadTest.java | 8 +- .../html/header/response/PanelWithHeader.java | 2 +- .../markup/html/header/testing/HeaderTest.java | 6 +- .../html/header/testing/TestBasePanel.java | 2 +- .../markup/html/header/testing2/HeaderTest.java | 8 +- .../html/header/testing2/TestBasePage.java | 2 +- .../markup/html/header/testing3/HeaderTest.java | 6 +- .../markup/html/header/testing3/TestPage.java | 2 +- .../header/threelayers/AbstractBasePage.java | 2 +- .../header/threelayers/AbstractMeldingPage.java | 2 +- .../header/threelayers/AbstractSecurePage.java | 2 +- .../header/threelayers/InheritanceHeadTest.java | 6 +- .../header/threelayers2/AbstractBasePage.java | 2 +- .../threelayers2/AbstractMeldingPage.java | 2 +- .../header/threelayers2/AbstractSecurePage.java | 2 +- .../threelayers2/InheritanceHeadTest.java | 6 +- .../markup/html/image/AjaxUpdatedImageTest.java | 19 +- .../markup/html/image/ExternalImageTest.java | 30 +- .../html/image/ExternalImageTestPage.java | 2 +- .../wicket/markup/html/image/ImageTest.java | 6 +- .../markup/html/image/InlineImageTest.java | 15 +- .../markup/html/image/InvalidImageTest.java | 6 +- .../markup/html/image/NonCachingImageTest.java | 8 +- .../markup/html/image/PubApplication.java | 2 +- .../markup/html/image/ResponsiveImageTest.java | 41 +- .../markup/html/internal/AjaxEnclosureTest.java | 29 +- .../wicket/markup/html/internal/BasePage.java | 2 +- .../markup/html/internal/EnclosurePage_9.java | 2 +- .../markup/html/internal/EnclosureTest.java | 57 +- .../html/internal/HeaderResponseTest.java | 58 +- .../html/internal/HtmlHeaderContainerTest.java | 10 +- .../html/internal/InlineEnclosureTest.java | 21 +- .../InlineEnclosureWithWicketMessagePage.java | 2 +- .../html/internal/ListViewInContainerPage.java | 4 +- .../markup/html/internal/TogglePageTest.java | 26 +- .../internal/TraditionalEnclosureAjaxPage.java | 14 +- .../html/internal/headeritems/BasePage.java | 2 +- .../headeritems/BasePageWithHeaderItems.java | 2 +- .../HtmlHeaderItemsContainerTest.java | 158 +++-- .../PageExtendingBasePageWithHeaderItems.java | 2 +- .../html/internal/headeritems/PanelA.java | 2 +- .../markup/html/link/AbstractLinkTest.java | 17 +- .../wicket/markup/html/link/AutolinkTest.java | 16 +- .../link/BookmarkableHomePageLinksTest.java | 6 +- .../html/link/BookmarkablePageLinkTest.java | 17 +- .../html/link/ClientSideImageMapTest.java | 6 +- .../markup/html/link/DownloadLinkTest.java | 19 +- .../markup/html/link/ExternalLinkTest.java | 8 +- .../wicket/markup/html/link/HrefTest.java | 12 +- .../markup/html/link/MountedPageLinkTest.java | 96 +-- .../wicket/markup/html/link/PageWithLink.java | 5 +- .../html/link/submitLink/FormPage2Test.java | 38 +- .../html/link/submitLink/FormPageTest.java | 38 +- .../list/IncrementalTableNavigationTest.java | 6 +- .../wicket/markup/html/list/ListViewTest.java | 14 +- .../html/list/PagedTableNavigatorTest.java | 10 +- ...agedTableNavigatorWithLabelProviderTest.java | 10 +- .../list/PagedTableNavigatorWithMarginTest.java | 10 +- .../markup/html/list/SimpleTableTest.java | 12 +- .../wicket/markup/html/list/TableTest.java | 11 +- .../markup/html/markupId/TestHomePage.java | 6 +- .../markup/html/markupId/WicketApplication.java | 2 +- .../html/media/MediaComponentsApplication.java | 2 +- .../wicket/markup/html/media/MediaTagsTest.java | 25 +- .../paging/AbstractPagingNavigationTest.java | 13 +- .../PagingNavigationIncrementLinkTest.java | 21 +- .../paging/PagingNavigationLinkTest.java | 65 +- .../wicket/markup/html/page/TestHomePage.java | 6 +- .../markup/html/panel/FeedbackPanelTest.java | 10 +- .../html/panel/FencedFeedbackPanelTest.java | 27 +- .../wicket/markup/html/panel/FragmentTest.java | 9 +- .../markup/html/panel/FragmentTestPanel.java | 2 +- .../markup/html/panel/FragmentTestPanel_2.java | 2 +- .../markup/html/panel/InlinePanelPage_5.java | 2 +- .../markup/html/panel/InlinePanelPage_8.java | 4 +- .../wicket/markup/html/panel/PanelTest.java | 40 +- .../markup/html/tags/InputTagNotClosedTest.java | 8 +- .../OutputTransformerContainerTest.java | 10 +- .../wicket/markup/parser/MergedMarkupTest.java | 10 +- .../parser/RelativePathPrefixHandlerTest.java | 10 +- .../wicket/markup/parser/TestHomePage.java | 6 +- .../wicket/markup/parser/XmlPullParserTest.java | 35 +- .../parser/filter/AbstractTest14WebPage.java | 2 +- .../markup/parser/filter/CustomMarkupLabel.java | 4 +- .../parser/filter/DoubleHeaderPartPageTest.java | 6 +- .../parser/filter/HeaderSectionBasePage_12.java | 2 +- .../parser/filter/HeaderSectionPage_20.java | 4 +- .../markup/parser/filter/HeaderSectionTest.java | 57 +- .../markup/parser/filter/HtmlHandlerTest.java | 6 +- .../filter/HtmlHeaderSectionHandlerTest.java | 17 +- .../parser/filter/OpenCloseTagExpanderTest.java | 23 +- .../filter/StyleAndScriptIdentifierTest.java | 13 +- .../ChildFirstHeaderRenderStrategyTest.java | 26 +- .../markup/resolver/AutoLinkResolverTest.java | 9 +- .../markup/resolver/SimpleBasePage_6.java | 2 +- .../wicket/markup/resolver/TestHomePage.java | 8 +- .../resolver/WicketContainerResolverTest.java | 6 +- .../resolver/WicketMessageResolverTest.java | 25 +- .../wicket/markup/resolver/border/BasePage.java | 4 +- .../border/WicketMessageResolverTest.java | 6 +- .../AutoLinkResolveInParentsMarkupTest.java | 6 +- .../markup/resolver/issue3559/BasePage.java | 2 +- .../markup/resolver/issue3559/MyTest.java | 8 +- .../resolver/issue3559/WicketApplication.java | 2 +- .../resolver/issue3989/Issue3989Test.java | 6 +- .../markup/resolver/issue5569/HomePage.java | 2 +- .../resolver/issue5569/Issue5569Test.java | 6 +- .../AbstractTransformerBehaviorTest.java | 10 +- .../markupFragments/MarkupFragmentTest.java | 22 +- .../AbstractPropertyModelObjectClassTest.java | 17 +- .../apache/wicket/model/ChainingModelTest.java | 27 +- .../wicket/model/CompoundPropertyModelTest.java | 6 +- .../CompoundPropertyModelTwoLevelsDeepPage.java | 6 +- .../org/apache/wicket/model/DetachableTest.java | 9 +- .../java/org/apache/wicket/model/HomePage.java | 2 +- .../org/apache/wicket/model/IModelTest.java | 129 ++-- .../apache/wicket/model/InheritedModelTest.java | 14 +- .../apache/wicket/model/LambdaModelTest.java | 39 +- .../model/LoadableDetachableModelTest.java | 44 +- .../apache/wicket/model/ModelDetachTest.java | 41 +- .../apache/wicket/model/ModelToStringTest.java | 18 +- .../apache/wicket/model/PropertyModelTest.java | 38 +- .../wicket/model/PropertyModelWithListTest.java | 21 +- .../apache/wicket/model/ResourceModelTest.java | 12 +- .../wicket/model/StringResourceModelTest.java | 156 +++-- .../org/apache/wicket/model/TestHomePage.java | 6 +- .../wicket/noheadnobody/NoHeadNoBodyTest.java | 13 +- .../wicket/page/PageAccessSynchronizerTest.java | 46 +- .../wicket/page/PersistentPageManagerTest.java | 28 +- .../wicket/page/XmlPartialPageUpdateTest.java | 15 +- .../PageExpirationRecoveryTest.java | 75 ++- .../persistent/disk/PageWindowManagerTest.java | 26 +- .../wicket/pageStore/AbstractPageStoreTest.java | 46 +- .../pageStore/AsynchronousDataStoreTest.java | 8 +- .../pageStore/AsynchronousPageStoreTest.java | 26 +- .../wicket/pageStore/DiskDataStoreTest.java | 31 +- .../apache/wicket/pageStore/NoopDataStore.java | 2 +- .../pageStore/PerSessionPageStoreTest.java | 8 +- .../memory/DummyPageManagerContext.java | 4 +- .../memory/HttpSessionDataStoreTest.java | 34 +- .../memory/MemorySizeEvictionStrategyTest.java | 23 +- .../memory/PageNumberEvictionStrategyTest.java | 25 +- .../wicket/pageStore/memory/PageTableTest.java | 12 +- .../wicket/properties/MyTesterApplication.java | 2 +- .../wicket/properties/PropertiesTest.java | 10 +- .../org/apache/wicket/properties/TestPage.java | 2 +- .../http/AbstractRequestLoggerTest.java | 8 +- .../protocol/http/BufferedWebResponseTest.java | 7 +- .../protocol/http/ClientPropertiesTest.java | 25 +- .../CsrfPreventionRequestCycleListenerTest.java | 66 +- .../http/HeaderBufferingWebResponseTest.java | 14 +- .../protocol/http/ModifyCookiePageTest.java | 10 +- .../http/RequestLoggerLiveSessionsTest.java | 17 +- .../wicket/protocol/http/RequestUtilsTest.java | 35 +- .../protocol/http/ResponseIOExceptionTest.java | 32 +- .../protocol/http/SessionDestroyTest.java | 16 +- .../protocol/http/StoredResponsesMapTest.java | 38 +- .../protocol/http/WebApplicationTest.java | 191 +++--- .../protocol/http/WebExternalResourceTest.java | 25 +- .../http/WebResponseExceptionsTest.java | 16 +- .../wicket/protocol/http/WebSessionTest.java | 9 +- .../wicket/protocol/http/WicketFilterTest.java | 77 +-- .../wicket/protocol/http/WicketURLTest.java | 15 +- .../wicket/protocol/http/mock/CookiesTest.java | 10 +- .../http/mock/MockHttpServletRequestTest.java | 44 +- .../http/mock/MockHttpServletResponseTest.java | 25 +- .../CryptedUrlWebRequestCodingStrategyTest.java | 12 +- .../http/request/WebClientInfoTest.java | 43 +- ...dRemoteAddressRequestWrapperFactoryTest.java | 9 +- .../http/servlet/ServletWebRequestTest.java | 27 +- .../http/servlet/ServletWebResponseTest.java | 19 +- .../http/servlet/WicketSessionFilterTest.java | 23 +- .../servlet/XForwardedRequestWrapperTest.java | 31 +- .../protocol/https/HttpsMapperApplication.java | 2 +- .../https/HttpsMapperApplicationTest.java | 22 +- .../wicket/protocol/https/HttpsMapperTest.java | 66 +- .../ComponentQueueingPerformanceTest.java | 40 +- .../wicket/queueing/ComponentQueueingTest.java | 153 ++--- .../java/org/apache/wicket/queueing/Path.java | 6 +- .../wicket/queueing/bodyisachild/FormGroup.java | 22 +- .../queueing/bodyisachild/LoginPanel.java | 6 +- .../queueing/transparentresolvers/BasePage.java | 2 +- ...eueingTransparentWebMarkupContainerTest.java | 10 +- .../queueing/transparentresolvers/HtmlTag.java | 2 +- .../redirect/RestartWithMountedPageTest.java | 6 +- .../redirect/abort/AbortExceptionTest.java | 20 +- .../redirect/intercept/InterceptTest.java | 8 +- ...equestCycleListenerCallOrderApplication.java | 2 +- .../MultiRequestCycleListenerCallOrderTest.java | 19 +- .../cycle/PageRequestHandlerTrackerTest.java | 23 +- .../RequestCycleListenerDetachOrderTest.java | 10 +- .../request/cycle/RequestCycleListenerTest.java | 30 +- .../request/cycle/RequestCycleUrlForTest.java | 26 +- .../cycle/RequestHandlerExecutorTest.java | 6 +- .../wicket/request/cycle/RerenderPageTest.java | 9 +- .../wicket/request/cycle/UrlRendererTest.java | 105 +-- .../request/handler/PageIdPoliticTest.java | 28 +- .../request/handler/PageProviderTest.java | 31 +- .../handler/render/AbstractVariations.java | 4 +- .../render/ShouldRedirectToTargetUrl.java | 16 +- ...uldRenderPageAndWriteResponseVariations.java | 18 +- .../SkipRenderWithSetResponsePageTest.java | 12 +- ...elessPageManipulatingPageParametersTest.java | 14 +- .../request/handler/render/TestVariations.java | 37 +- .../handler/render/VariationIterator.java | 4 +- .../handler/render/WebPageRendererTest.java | 129 ++-- .../resource/ResourceAuthorizationTest.java | 33 +- .../request/mapper/CustomHomePageTest.java | 8 +- .../request/mapper/info/ComponentInfoTest.java | 30 +- .../mapper/info/PageComponentInfoTest.java | 17 +- .../request/resource/ByteArrayResourceTest.java | 17 +- .../resource/CharSequenceResourceTest.java | 19 +- .../ContextRelativeResourceReferenceTest.java | 30 +- .../resource/CssPackageResourceTest.java | 12 +- .../resource/DynamicImageResourceTest.java | 14 +- .../resource/JavaScriptPackageResourceTest.java | 14 +- .../resource/LessResourceReferenceTest.java | 15 +- .../MetaInfStaticResourceReferenceTest.java | 34 +- .../MinifiedAwareResourceReferenceTest.java | 22 +- .../resource/PackageResourceReferenceTest.java | 71 +- .../request/resource/ResouceBundleTest.java | 18 +- .../resource/ResourceReferenceLambdaTest.java | 8 +- .../resource/ResourceReferenceLocatingTest.java | 192 +++--- .../resource/ResourceReferenceRegistryTest.java | 23 +- .../resource/UrlResourceReferenceTest.java | 27 +- .../request/resource/WriteCallbackTest.java | 12 +- .../ContextRelativeResourceCachingTest.java | 14 +- ...eWithVersionResourceCachingStrategyTest.java | 17 +- ...gWithVersionResourceCachingStrategyTest.java | 18 +- .../ApplicationStringResourceLoaderTest.java | 8 +- .../BundleStringResourceLoaderTest.java | 20 +- .../ComponentStringResourceLoaderTest.java | 48 +- .../wicket/resource/CssUrlReplacerTest.java | 36 +- .../FileSystemResourceReferenceTest.java | 35 +- .../wicket/resource/PageWithUTF8Properties.java | 2 +- .../wicket/resource/PageWithXmlProperties.java | 2 +- .../wicket/resource/ResourceUtilTest.java | 17 +- .../resource/StringResourceLoaderTestBase.java | 53 +- .../TextTemplateResourceReferenceTest.java | 9 +- .../UtfPropertiesFilePropertiesLoaderTest.java | 6 +- .../resource/XmlFilePropertiesLoaderTest.java | 7 +- .../ResourceAggregatorRenderTest.java | 8 +- .../aggregator/ResourceAggregatorTest.java | 66 +- .../aggregator/ResourceAggregatorTest1Page.java | 2 +- .../resource/aggregator/TestHeaderResponse.java | 4 +- .../resource/bundles/CompressBundlesTest.java | 10 +- .../loader/ClassStringResourceLoaderTest.java | 8 +- .../ComponentStringResourceLoaderTest.java | 14 +- .../wicket/resource/loader/FooInitializer.java | 2 +- .../InitializerStringResourceLoaderTest.java | 2 + .../loader/NestedStringResourceLoaderTest.java | 10 +- .../loader/PackageStringResourceLoaderTest.java | 15 +- .../resource/loader/PropertiesResolverTest.java | 25 +- .../ValidatorStringResourceLoaderTest.java | 10 +- .../apache/wicket/resource/loader/XmlPage.java | 2 +- .../PreserveCookieForTheNextHandlerTest.java | 15 +- .../response/filter/ResponseFilterTest.java | 30 +- .../filter/XmlCleaningResponseFilterTest.java | 22 +- .../serialize/java/JavaSerializerTest.java | 32 +- .../session/BindSessionOnRedirectTest.java | 19 +- .../wicket/session/DefaultPageFactoryTest.java | 293 +++++---- .../wicket/settings/DebugSettingsTest.java | 8 +- ...nSettingsNotRenderableErrorStrategyTest.java | 26 +- .../wicket/settings/ISecuritySettingsTest.java | 39 +- .../def/SetCustomResourceSettingsTest.java | 20 +- .../wicket/stateless/ImageStatelessTest.java | 14 +- .../stateless/StatelessComponentTest.java | 17 +- .../stateless/StatelessDynmicLinksTest.java | 8 +- .../wicket/stateless/StatelessFormTest.java | 15 +- .../wicket/stateless/StatelessFormUrlTest.java | 12 +- .../StatelessPageWithFeedbackTest.java | 14 +- .../wicket/stateless/TemporarySessionTest.java | 9 +- .../pages/RefreshStatelessPageTest.java | 8 +- .../stateless/pages/StatelessFormTest.java | 6 +- .../pages/UsernamePasswordSignInPanel.java | 4 +- .../apache/wicket/util/ExceptionTestBase.java | 41 +- .../apache/wicket/util/Log4jEventHistory.java | 2 +- .../wicket/util/cookies/CookieUtilsTest.java | 25 +- .../cookies/CookieValuePersisterTestPage.java | 2 +- ...PreserveRequestCookieAfterLinkClickTest.java | 14 +- .../SetCookieAndRedirectStatefullTestPage.java | 2 +- .../SetCookieAndRedirectStatelessTestPage.java | 2 +- .../util/cookies/SetCookieAndRedirectTest.java | 11 +- .../util/file/WebApplicationPathTest.java | 12 +- .../wicket/util/io/SerializableCheckerTest.java | 70 +- .../org/apache/wicket/util/lang/Country2.java | 2 +- .../org/apache/wicket/util/lang/Document.java | 2 +- .../wicket/util/lang/PropertyResolverTest.java | 108 +-- .../wicket/util/lang/WicketObjectsTest.java | 27 +- .../util/markup/xhtml/WellFormedXmlTest.java | 4 +- .../apache/wicket/util/resource/PathTest.java | 68 +- .../resource/ResourceStreamLocatorTest.java | 20 +- .../util/resource/UrlResourceStreamTest.java | 15 +- .../CachingResourceStreamLocatorTest.java | 39 +- .../locator/ResourceNameIteratorTest.java | 19 +- .../util/string/JavaScriptStripperTest.java | 37 +- .../PropertyVariableInterpolatorTest.java | 15 +- .../wicket/util/template/CssTemplateTest.java | 6 +- .../apache/wicket/util/tester/CookiePage.java | 5 +- .../util/tester/FormTesterSubmitLinkTest.java | 15 +- .../wicket/util/tester/FormTesterTest.java | 85 +-- .../wicket/util/tester/MockFormSubmitsPage.java | 4 +- ...ckPageWithFormAndAjaxFormSubmitBehavior.java | 2 +- .../tester/MockPageWithLabelInEnclosure.java | 3 +- .../util/tester/MockResourceLinkPage.java | 2 +- ...tartComponentInPageRedirectToRenderTest.java | 6 +- .../wicket/util/tester/TagTesterTest.java | 79 +-- .../WicketTesterClickExternalLinkTest.java | 6 +- .../util/tester/WicketTesterCookieTest.java | 324 +++++---- .../WicketTesterLazyIsPageStatelessBase.java | 8 +- ...ketTesterLazyIsPageStatelessOnePassTest.java | 2 +- ...LazyIsPageStatelessRedirectToBufferTest.java | 6 +- ...LazyIsPageStatelessRedirectToRenderTest.java | 2 +- .../tester/WicketTesterSessionCreationTest.java | 10 +- .../WicketTesterSessionInvalidateTest.java | 11 +- .../wicket/util/tester/WicketTesterTest.java | 238 ++++--- .../wicket/util/tester/apps_1/CreateBook.java | 2 +- .../apache/wicket/util/tester/apps_2/Test.java | 11 +- .../util/tester/apps_3/FormTesterTest.java | 30 +- .../util/tester/apps_4/FormTesterTest.java | 11 +- .../util/tester/apps_5/AjaxLinkClickTest.java | 21 +- .../tester/apps_5/AjaxSubmitLinkClickTest.java | 19 +- .../wicket/util/tester/apps_7/TestHomePage.java | 6 +- .../util/tester/apps_7/WicketApplication.java | 2 +- .../apps_8/TestResourceProvidingLabel.java | 2 +- .../validation/CompoundValidatorTest.java | 6 +- .../wicket/validation/ValidationErrorTest.java | 15 +- .../validation/ValidatorBehaviorTest.java | 16 +- .../validator/CreditCardValidatorTest.java | 15 +- .../validator/EmailValidatorTest.java | 16 +- .../validator/RangeValidatorTest.java | 18 +- .../validation/validator/UrlValidatorTest.java | 58 +- .../wicket/versioning/PageVersioningTest.java | 24 +- 615 files changed, 7717 insertions(+), 6806 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8edc8af..df3df06 100644 --- a/pom.xml +++ b/pom.xml @@ -500,6 +500,23 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-params</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <version>3.11.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>java-hamcrest</artifactId> + <version>2.0.0.0</version> + </dependency> + <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-jmx</artifactId> <version>${jetty.version}</version> @@ -1190,7 +1207,7 @@ <artifactId>maven-surefire-plugin</artifactId> <inherited>true</inherited> <configuration> - <excludedGroups>org.apache.wicket.util.SlowTests</excludedGroups> + <excludedGroups>org.apache.wicket.util.WicketTestTag</excludedGroups> </configuration> </plugin> <plugin> http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml index e19d904..7963d34 100644 --- a/wicket-core/pom.xml +++ b/wicket-core/pom.xml @@ -52,6 +52,21 @@ <artifactId>openjson</artifactId> </dependency> <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-params</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>java-hamcrest</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-request</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java index a835c6c..532cd10 100644 --- a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java +++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java @@ -16,6 +16,9 @@ */ package org.apache.wicket.util.tester; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.fail; + import java.io.IOException; import java.io.Serializable; import java.lang.reflect.Constructor; @@ -31,7 +34,6 @@ import java.util.Map; import java.util.Set; import java.util.UUID; import java.util.regex.Pattern; - import javax.servlet.FilterConfig; import javax.servlet.ServletContext; import javax.servlet.http.Cookie; @@ -132,11 +134,10 @@ import org.apache.wicket.util.string.Strings; import org.apache.wicket.util.time.Duration; import org.apache.wicket.util.visit.IVisit; import org.apache.wicket.util.visit.IVisitor; +import org.opentest4j.AssertionFailedError; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import junit.framework.AssertionFailedError; - /** * A helper class to ease unit testing of Wicket applications without the need for a servlet * container. See javadoc of <code>WicketTester</code> for example usage. This class can be used as @@ -724,7 +725,7 @@ public class BaseWicketTester { if (redirectCount++ >= 100) { - fail("Possible infinite redirect detected. Bailing out."); + throw new AssertionFailedError("Possible infinite redirect detected. Bailing out."); } Url newUrl = Url.parse(lastResponse.getRedirectLocation(), @@ -1085,7 +1086,6 @@ public class BaseWicketTester * (with an optional redirect - depending on {@link RenderStrategy}). * * @param component - * @param listener */ public void executeListener(final Component component) { @@ -1122,7 +1122,6 @@ public class BaseWicketTester * (with an optional redirect - depending on {@link RenderStrategy}). * * @param component - * @param listener */ public void invokeListener(final Component component) { @@ -1144,7 +1143,7 @@ public class BaseWicketTester * (with an optional redirect - depending on {@link RenderStrategy}). * * @param component - * @param listener + * @param behavior */ public void invokeListener(Component component, final Behavior behavior) { @@ -2510,7 +2509,7 @@ public class BaseWicketTester { // The form that needs to be "submitted". Form<?> form = behavior.getForm(); - assertNotNull("No form attached to the submitlink.", form); + assertNotNull(form, "No form attached to the submitlink."); checkUsability(form, true); serializeFormToRequest(form); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/main/java/org/apache/wicket/util/tester/DiffUtil.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/DiffUtil.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/DiffUtil.java index 1d8aa02..309653e 100644 --- a/wicket-core/src/main/java/org/apache/wicket/util/tester/DiffUtil.java +++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/DiffUtil.java @@ -16,13 +16,14 @@ */ package org.apache.wicket.util.tester; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; import java.net.URL; -import org.junit.Assert; import org.apache.wicket.markup.MarkupParser; import org.apache.wicket.markup.MarkupStream; import org.apache.wicket.util.diff.Diff; @@ -157,7 +158,7 @@ public final class DiffUtil if (failWithAssert) { - Assert.assertEquals(filename, reference, document); + assertEquals(reference, document, filename); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java index d1780ea..e5d71a6 100644 --- a/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java +++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java @@ -16,6 +16,7 @@ */ package org.apache.wicket.util.tester; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -33,12 +34,12 @@ import org.apache.wicket.markup.html.form.Check; import org.apache.wicket.markup.html.form.CheckGroup; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.FormComponent; +import org.apache.wicket.markup.html.form.FormComponentUpdatingBehavior; import org.apache.wicket.markup.html.form.IChoiceRenderer; import org.apache.wicket.markup.html.form.IFormSubmittingComponent; import org.apache.wicket.markup.html.form.ListMultipleChoice; import org.apache.wicket.markup.html.form.Radio; import org.apache.wicket.markup.html.form.RadioGroup; -import org.apache.wicket.markup.html.form.FormComponentUpdatingBehavior; import org.apache.wicket.markup.html.form.upload.FileUploadField; import org.apache.wicket.markup.html.form.upload.MultiFileUploadField; import org.apache.wicket.protocol.http.mock.MockHttpServletRequest; @@ -49,8 +50,6 @@ import org.apache.wicket.util.string.Strings; import org.apache.wicket.util.visit.IVisit; import org.apache.wicket.util.visit.IVisitor; -import static org.junit.jupiter.api.Assertions.assertNotNull; - /** * A helper class for testing validation and submission of <code>FormComponent</code>s. * @@ -581,8 +580,7 @@ public class FormTester public FormTester setValue(final String formComponentId, final String value) { Component component = workingForm.get(formComponentId); - assertNotNull("Unable to set value. Couldn't find component with name: " + - formComponentId, component); + assertNotNull(component, "Unable to set value. Couldn't find component with name: " + formComponentId); return setValue(component, value); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/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 index 43169e1..294b111 100644 --- 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 @@ -16,6 +16,8 @@ */ package org.apache.wicket.util.tester; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.io.IOException; import java.util.Locale; @@ -27,9 +29,8 @@ 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; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; /** * Base class for tests which require comparing wicket response with a file. @@ -37,15 +38,14 @@ import org.junit.Before; * 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 abstract class WicketTestCase { /** */ public WicketTester tester; /** - * @see junit.framework.TestCase#setUp() */ - @Before + @BeforeEach public void commonBefore() { // make sure no leaked threadlocals are present @@ -83,7 +83,7 @@ public abstract class WicketTestCase extends Assert /** * */ - @After + @AfterEach public void commonAfter() { tester.destroy(); @@ -178,7 +178,7 @@ public abstract class WicketTestCase extends Assert * @param scopeClass * @throws IOException */ - public final void compareMarkupWithFile(IMarkupFragment markup, String filename, Class<?> scopeClass) + protected final void compareMarkupWithFile(IMarkupFragment markup, String filename, Class<?> scopeClass) throws IOException { String doc = markup.toString(true); @@ -190,11 +190,8 @@ public abstract class WicketTestCase extends Assert * * @param markup * @param testMarkup - * @throws IOException */ - public final void compareMarkupWithString(IMarkupFragment markup, String testMarkup) - throws IOException - { + protected final void compareMarkupWithString(IMarkupFragment markup, String testMarkup) { testMarkup = testMarkup.replaceAll("\r", ""); testMarkup = testMarkup.replaceAll("\n", ""); testMarkup = testMarkup.replaceAll("\t", ""); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java index f94304f..7420526 100644 --- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java +++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java @@ -16,6 +16,18 @@ */ package org.apache.wicket.util.tester; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Locale; +import javax.servlet.ServletContext; + import org.apache.commons.collections4.CollectionUtils; import org.apache.wicket.Component; import org.apache.wicket.MarkupContainer; @@ -42,18 +54,6 @@ import org.opentest4j.AssertionFailedError; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.ServletContext; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Locale; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - /** * A helper class to ease unit testing of Wicket applications without the need for a servlet * container. To start a test, either use <code>startPage</code> or <code>startPanel</code>: @@ -147,16 +147,14 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * * Cookie handling: * - * There are some expectations about wicket tester cookie handling which should match as best as - * it can be with a real client server request response cycle: - * - all valid cookies set before a request is made (tester.getRequest().addCookie()) should - * appear in the page request - * - all cookies set in the response should appear in the last response (tester.getLastResponse()) - * after the request is made (expired cookies and others) - * - all cookies set in the response should appear even after a redirect response is made - * until the final response (tester.getLastResponse()) is written to the client (wicket tester) - * - all valid cookies (maxAge!=0) from the last response should be added to - * the next request cookies (tester.getRequest().getCookies()) + * There are some expectations about wicket tester cookie handling which should match as best as it + * can be with a real client server request response cycle: - all valid cookies set before a request + * is made (tester.getRequest().addCookie()) should appear in the page request - all cookies set in + * the response should appear in the last response (tester.getLastResponse()) after the request is + * made (expired cookies and others) - all cookies set in the response should appear even after a + * redirect response is made until the final response (tester.getLastResponse()) is written to the + * client (wicket tester) - all valid cookies (maxAge!=0) from the last response should be added to + * the next request cookies (tester.getRequest().getCookies()) * * * TODO General: Example usage of FormTester @@ -259,19 +257,41 @@ public class WicketTester extends BaseWicketTester } /** + * 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 static String getBasedir() + { + String basedir = System.getProperty("basedir"); + if (basedir != null) + { + basedir = basedir + "/"; + } + else + { + basedir = ""; + } + return basedir; + } + + /** * Asserts that the Ajax location header is present. */ public void assertAjaxLocation() { if (null != getLastResponse().getHeader("Location")) { - throw new AssertionFailedError("Location header should *not* be present when using Ajax"); + throw new AssertionFailedError( + "Location header should *not* be present when using Ajax"); } String ajaxLocation = getLastResponse().getHeader("Ajax-Location"); if (null == ajaxLocation) { - throw new AssertionFailedError("Ajax-Location header should be present when using Ajax"); + throw new AssertionFailedError( + "Ajax-Location header should be present when using Ajax"); } int statusCode = getLastResponse().getStatus(); @@ -295,8 +315,7 @@ public class WicketTester extends BaseWicketTester } /** - * Asserts that the <code>Component</code> a the given path has a behavior - * of the given type. + * Asserts that the <code>Component</code> a the given path has a behavior of the given type. * * @param path * path to <code>Component</code> @@ -310,14 +329,14 @@ public class WicketTester extends BaseWicketTester Component component = assertExists(path); List<? extends Behavior> behaviors = component.getBehaviors(expectedBehaviorClass); final String message = String.format("Component '%s' has no behaviors of type '%s'", - component.getPageRelativePath(), expectedBehaviorClass); + component.getPageRelativePath(), expectedBehaviorClass); assertResult(new Result(CollectionUtils.isEmpty(behaviors), message)); } /** * Tests that a <code>Component</code> has been added to a <code>AjaxRequestTarget</code>, using - * {@link org.apache.wicket.ajax.AjaxRequestTarget#add(Component...)}. This method actually tests that a - * <code>Component</code> is on the Ajax response sent back to the client. + * {@link org.apache.wicket.ajax.AjaxRequestTarget#add(Component...)}. This method actually + * tests that a <code>Component</code> is on the Ajax response sent back to the client. * <p> * PLEASE NOTE! This method doesn't actually insert the <code>Component</code> in the client DOM * tree, using JavaScript. But it shouldn't be needed because you just have to trust that Wicket @@ -334,8 +353,8 @@ public class WicketTester extends BaseWicketTester /** * Tests that a <code>Component</code> has been added to a <code>AjaxRequestTarget</code>, using - * {@link org.apache.wicket.ajax.AjaxRequestTarget#add(Component...)}. This method actually tests that a - * <code>Component</code> is on the Ajax response sent back to the client. + * {@link org.apache.wicket.ajax.AjaxRequestTarget#add(Component...)}. This method actually + * tests that a <code>Component</code> is on the Ajax response sent back to the client. * <p> * PLEASE NOTE! This method doesn't actually insert the <code>Component</code> in the client DOM * tree, using JavaScript. But it shouldn't be needed because you just have to trust that Wicket @@ -376,9 +395,9 @@ public class WicketTester extends BaseWicketTester * Asserts that a component's markup has loaded with the given variation * * @param component - * The component which markup to check + * The component which markup to check * @param expectedVariation - * The expected variation of the component's markup + * The expected variation of the component's markup */ public void assertMarkupVariation(Component component, String expectedVariation) { @@ -388,7 +407,8 @@ public class WicketTester extends BaseWicketTester String actualVariation = markup.getMarkupResourceStream().getVariation(); if (Objects.equal(expectedVariation, actualVariation) == false) { - result = Result.fail(String.format("Wrong variation for component '%s'. Actual: '%s', expected: '%s'", + result = Result.fail( + String.format("Wrong variation for component '%s'. Actual: '%s', expected: '%s'", component.getPageRelativePath(), actualVariation, expectedVariation)); } @@ -399,10 +419,10 @@ public class WicketTester extends BaseWicketTester * Asserts that a component's markup has loaded with the given style. * * @param component - * The component which markup to check + * The component which markup to check * @param expectedStyle - * The expected style of the component's markup. - * For example: <em>green</em> in <code>MyPanel_green.html</code> + * The expected style of the component's markup. For example: <em>green</em> in + * <code>MyPanel_green.html</code> */ public void assertMarkupStyle(Component component, String expectedStyle) { @@ -412,7 +432,8 @@ public class WicketTester extends BaseWicketTester String actualStyle = markup.getMarkupResourceStream().getStyle(); if (Objects.equal(expectedStyle, actualStyle) == false) { - result = Result.fail(String.format("Wrong style for component '%s'. Actual: '%s', expected: '%s'", + result = Result + .fail(String.format("Wrong style for component '%s'. Actual: '%s', expected: '%s'", component.getPageRelativePath(), actualStyle, expectedStyle)); } @@ -423,9 +444,9 @@ public class WicketTester extends BaseWicketTester * Asserts that a component's markup has loaded with the given locale * * @param component - * The component which markup to check + * The component which markup to check * @param expectedLocale - * The expected locale of the component's markup + * The expected locale of the component's markup */ public void assertMarkupLocale(Component component, Locale expectedLocale) { @@ -435,7 +456,8 @@ public class WicketTester extends BaseWicketTester Locale actualLocale = markup.getMarkupResourceStream().getLocale(); if (Objects.equal(expectedLocale, actualLocale) == false) { - result = Result.fail(String.format("Wrong locale for component '%s'. Actual: '%s', expected: '%s'", + result = Result + .fail(String.format("Wrong locale for component '%s'. Actual: '%s', expected: '%s'", component.getPageRelativePath(), actualLocale, expectedLocale)); } @@ -447,7 +469,7 @@ public class WicketTester extends BaseWicketTester IMarkupFragment markup = null; if (component instanceof MarkupContainer) { - markup = ((MarkupContainer) component).getAssociatedMarkup(); + markup = ((MarkupContainer)component).getAssociatedMarkup(); } if (markup == null) @@ -457,7 +479,8 @@ public class WicketTester extends BaseWicketTester if (markup == null) { - throw new AssertionFailedError(String.format("Cannot find the markup of component: %s", component.getPageRelativePath())); + throw new AssertionFailedError(String.format("Cannot find the markup of component: %s", + component.getPageRelativePath())); } return markup; @@ -471,7 +494,8 @@ public class WicketTester extends BaseWicketTester */ public void assertErrorMessages(Serializable... expectedErrorMessages) { - assertFeedbackMessages(new ExactLevelFeedbackMessageFilter(FeedbackMessage.ERROR), expectedErrorMessages); + assertFeedbackMessages(new ExactLevelFeedbackMessageFilter(FeedbackMessage.ERROR), + expectedErrorMessages); } /** @@ -482,7 +506,8 @@ public class WicketTester extends BaseWicketTester */ public void assertInfoMessages(Serializable... expectedInfoMessages) { - assertFeedbackMessages(new ExactLevelFeedbackMessageFilter(FeedbackMessage.INFO), expectedInfoMessages); + assertFeedbackMessages(new ExactLevelFeedbackMessageFilter(FeedbackMessage.INFO), + expectedInfoMessages); } /** @@ -493,7 +518,8 @@ public class WicketTester extends BaseWicketTester * @param expectedMessages * expected feedback messages */ - public void assertFeedbackMessages(IFeedbackMessageFilter filter, Serializable... expectedMessages) + public void assertFeedbackMessages(IFeedbackMessageFilter filter, + Serializable... expectedMessages) { List<FeedbackMessage> feedbackMessages = getFeedbackMessages(filter); List<Serializable> actualMessages = getActualFeedbackMessages(feedbackMessages); @@ -504,31 +530,33 @@ public class WicketTester extends BaseWicketTester * Asserts that there is a feedback message provided by a given component * * @param component - * the component that provided the expected feedback message. Optional. + * the component that provided the expected feedback message. Optional. * @param key - * the resource key for the feedback message. Mandatory. + * the resource key for the feedback message. Mandatory. * @param model - * the model used for interpolating the feedback message. Optional. + * the model used for interpolating the feedback message. Optional. * @param filter - * the filter that decides in which messages to look in. E.g. with a specific - * level, rendered or not, etc. + * the filter that decides in which messages to look in. E.g. with a specific level, + * rendered or not, etc. */ - public void assertComponentFeedbackMessage(Component component, String key, IModel<?> model, IFeedbackMessageFilter filter) + public void assertComponentFeedbackMessage(Component component, String key, IModel<?> model, + IFeedbackMessageFilter filter) { Args.notNull(key, "key"); - String expectedMessage = getApplication().getResourceSettings().getLocalizer().getString(key, component, model); + String expectedMessage = getApplication().getResourceSettings().getLocalizer().getString( + key, component, model); List<FeedbackMessage> feedbackMessages = getFeedbackMessages(filter); List<Serializable> actualMessages = getActualFeedbackMessages(feedbackMessages); - assertTrue(actualMessages.contains(expectedMessage), - String.format("Feedback message with key '%s' cannot be found in %s", key, actualMessages)); + assertTrue(actualMessages.contains(expectedMessage), String + .format("Feedback message with key '%s' cannot be found in %s", key, actualMessages)); } /** - * Extracts the actual messages from the passed feedback messages. - * Specially handles ValidationErrorFeedback messages by extracting their String message + * Extracts the actual messages from the passed feedback messages. Specially handles + * ValidationErrorFeedback messages by extracting their String message * * @param feedbackMessages * the feedback messages @@ -571,12 +599,14 @@ public class WicketTester extends BaseWicketTester final List<FeedbackMessage> renderedMessages = model.getObject(); if (renderedMessages == null) { - throw new AssertionFailedError(String.format("feedback panel at path [%s] returned null messages", path)); + throw new AssertionFailedError( + String.format("feedback panel at path [%s] returned null messages", path)); } if (messages.length != renderedMessages.size()) { - throw new AssertionFailedError(String.format("you expected '%d' messages for the feedback panel [%s], but there were actually '%d'", - messages.length, path, renderedMessages.size())); + throw new AssertionFailedError(String.format( + "you expected '%d' messages for the feedback panel [%s], but there were actually '%d'", + messages.length, path, renderedMessages.size())); } for (int i = 0; i < messages.length && i < renderedMessages.size(); i++) { @@ -832,15 +862,16 @@ public class WicketTester extends BaseWicketTester } catch (ClassCastException e) { - throw new IllegalArgumentException("Component with id:" + id + - " is not a BookmarkablePageLink"); + throw new IllegalArgumentException( + "Component with id:" + id + " is not a BookmarkablePageLink"); } - assertEquals(pageClass, - pageLink.getPageClass(), "BookmarkablePageLink: " + id + " is pointing to the wrong page"); + assertEquals(pageClass, pageLink.getPageClass(), + "BookmarkablePageLink: " + id + " is pointing to the wrong page"); - assertEquals(parameters, pageLink.getPageParameters(), "One or more of the parameters associated with the BookmarkablePageLink: " + - id + " do not match"); + assertEquals(parameters, pageLink.getPageParameters(), + "One or more of the parameters associated with the BookmarkablePageLink: " + id + + " do not match"); } /** @@ -968,24 +999,4 @@ public class WicketTester extends BaseWicketTester String actualRedirectUrl = getLastResponse().getRedirectLocation(); assertEquals(expectedRedirectUrl, actualRedirectUrl); } - - /** - * 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 static String getBasedir() - { - String basedir = System.getProperty("basedir"); - if (basedir != null) - { - basedir = basedir + "/"; - } - else - { - basedir = ""; - } - return basedir; - } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterExtension.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterExtension.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterExtension.java new file mode 100644 index 0000000..ed7b240 --- /dev/null +++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterExtension.java @@ -0,0 +1,71 @@ +/* + * 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 org.junit.jupiter.api.extension.AfterTestExecutionCallback; +import org.junit.jupiter.api.extension.BeforeTestExecutionCallback; +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.TestExecutionExceptionHandler; + +/** + * Manages {@link WicketTester} instance + * + * @author igor + */ +public class WicketTesterExtension implements BeforeTestExecutionCallback, AfterTestExecutionCallback, TestExecutionExceptionHandler +{ + private WicketTester tester; + + /** + * Allows setup of the tester instance + * + * @return tester + */ + protected WicketTester create() + { + return new WicketTester(); + } + + /** + * Gets the tester instance. + * + * @return tester instance or {@code null} if called outside the rule's scope + */ + public WicketTester getTester() + { + return tester; + } + + @Override + public void beforeTestExecution(ExtensionContext context) { + tester = create(); + } + + @Override + public void afterTestExecution(ExtensionContext context) { + tester.destroy(); + tester = null; + } + + @Override + public void handleTestExecutionException(ExtensionContext context, Throwable throwable) throws Throwable { + tester.destroy(); + tester = null; + + throw throwable; + } +} http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterHelper.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterHelper.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterHelper.java index 1905cb8..2bd94e4 100644 --- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterHelper.java +++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterHelper.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.util.tester; +import static org.junit.jupiter.api.Assertions.fail; + import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; @@ -30,7 +32,6 @@ import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.string.Strings; import org.apache.wicket.util.visit.IVisit; import org.apache.wicket.util.visit.IVisitor; -import org.junit.Assert; /** * A <code>WicketTester</code>-specific helper class. @@ -42,7 +43,7 @@ public class WicketTesterHelper { /** * <code>ComponentData</code> class. - * + * * @author Ingram Chen * @since 1.2.6 */ @@ -69,7 +70,7 @@ public class WicketTesterHelper /** * Gets recursively all <code>Component</code>s of a given <code>Page</code>, extracts the * information relevant to us, and adds them to a <code>List</code>. - * + * * @param page * the <code>Page</code> to analyze * @return a <code>List</code> of <code>Component</code> data objects @@ -119,7 +120,7 @@ public class WicketTesterHelper /** * Asserts that both <code>Collection</code>s contain the same elements. - * + * * @param expects * a <code>Collection</code> object * @param actuals @@ -136,7 +137,7 @@ public class WicketTesterHelper /** * Fails with a verbose error message. - * + * * @param expects * a <code>Collection</code> object * @param actuals @@ -145,13 +146,13 @@ public class WicketTesterHelper public static void failWithVerboseMessage(final Collection<?> expects, final Collection<?> actuals) { - Assert.fail("\nexpect (" + expects.size() + "):\n" + asLined(expects) + "\nbut was (" + + fail("\nexpect (" + expects.size() + "):\n" + asLined(expects) + "\nbut was (" + actuals.size() + "):\n" + asLined(actuals)); } /** * A <code>toString</code> method for the given <code>Collection</code>. - * + * * @param objects * a <code>Collection</code> object * @return a <code>String</code> representation of the <code>Collection</code> http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterScope.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterScope.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterScope.java deleted file mode 100644 index 49f7632..0000000 --- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterScope.java +++ /dev/null @@ -1,73 +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.util.tester; - -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - -/** - * Manages {@link WicketTester} instance - * - * @author igor - */ -public class WicketTesterScope implements TestRule -{ - private WicketTester tester; - - @Override - public Statement apply(final Statement base, Description description) - { - return new Statement() - { - @Override - public void evaluate() throws Throwable - { - tester = create(); - try - { - base.evaluate(); - } - finally - { - tester.destroy(); - tester = null; - } - } - }; - } - - /** - * Allows setup of the tester instance - * - * @return tester - */ - protected WicketTester create() - { - return new WicketTester(); - } - - /** - * Gets the tester instance. - * - * @return tester instance or {@code null} if called outside the rule's scope - */ - public WicketTester getTester() - { - return tester; - } -} http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/AddChildToParentInOnInitializeTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/AddChildToParentInOnInitializeTest.java b/wicket-core/src/test/java/org/apache/wicket/AddChildToParentInOnInitializeTest.java index 336ecd4..a5a9007 100644 --- a/wicket-core/src/test/java/org/apache/wicket/AddChildToParentInOnInitializeTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/AddChildToParentInOnInitializeTest.java @@ -22,15 +22,15 @@ 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; +import org.junit.jupiter.api.Test; /** * https://issues.apache.org/jira/browse/WICKET-6021 */ -public class AddChildToParentInOnInitializeTest extends WicketTestCase +class AddChildToParentInOnInitializeTest extends WicketTestCase { @Test - public void addChildToParentInOnInitialize() + void addChildToParentInOnInitialize() { tester.startPage(TestPage.class); tester.assertRenderedPage(TestPage.class); @@ -40,10 +40,10 @@ public class AddChildToParentInOnInitializeTest extends WicketTestCase public static class TestPage extends WebPage implements IMarkupResourceStreamProvider { - public static final String FIRST_CHILD_ID = "firstChild"; - public static final String PARENT_ID = "parentContainer"; - public static final String SECOND_CHILD_ID = "thirdChild"; - public static final String THIRD_CHILD_ID = "fourthChild"; + static final String FIRST_CHILD_ID = "firstChild"; + static final String PARENT_ID = "parentContainer"; + static final String SECOND_CHILD_ID = "thirdChild"; + static final String THIRD_CHILD_ID = "fourthChild"; @Override protected void onInitialize() @@ -71,7 +71,7 @@ public class AddChildToParentInOnInitializeTest extends WicketTestCase private static class Parent extends WebMarkupContainer { - public Parent() + Parent() { super(TestPage.PARENT_ID); @@ -82,7 +82,7 @@ public class AddChildToParentInOnInitializeTest extends WicketTestCase private static class SecondChild extends WebMarkupContainer { - public SecondChild() + SecondChild() { super(TestPage.SECOND_CHILD_ID); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ApplicationSettingsTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ApplicationSettingsTest.java b/wicket-core/src/test/java/org/apache/wicket/ApplicationSettingsTest.java index 92bd112..52e3a64 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ApplicationSettingsTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ApplicationSettingsTest.java @@ -16,7 +16,10 @@ */ package org.apache.wicket; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; @@ -31,23 +34,22 @@ import org.apache.wicket.resource.loader.PackageStringResourceLoader; import org.apache.wicket.resource.loader.ValidatorStringResourceLoader; import org.apache.wicket.settings.FrameworkSettings; import org.apache.wicket.settings.ResourceSettings; -import org.junit.After; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; /** * Test cases for the <code>ApplicationSettings</code> class. * * @author Chris Turner */ -public class ApplicationSettingsTest +class ApplicationSettingsTest { /** * detaches thread context */ - @After - public void detachThreadContext() + @AfterEach + void detachThreadContext() { ThreadContext.detach(); } @@ -56,7 +58,7 @@ public class ApplicationSettingsTest * */ @Test - public void testFrameworkVersion() + void testFrameworkVersion() { FrameworkSettings settings = new FrameworkSettings(new MockApplication()); assertEquals("n/a", settings.getVersion()); @@ -66,93 +68,93 @@ public class ApplicationSettingsTest * @throws Exception */ @Test - public void testExceptionOnMissingResourceDefaultValue() throws Exception + void testExceptionOnMissingResourceDefaultValue() throws Exception { ResourceSettings settings = new ResourceSettings(new MockApplication()); - Assert.assertTrue("exceptionOnMissingResource should default to true", - settings.getThrowExceptionOnMissingResource()); + assertTrue(settings.getThrowExceptionOnMissingResource(), + "exceptionOnMissingResource should default to true"); } /** * @throws Exception */ @Test - public void testExceptionOnMissingResourceSetsCorrectly() throws Exception + void testExceptionOnMissingResourceSetsCorrectly() throws Exception { ResourceSettings settings = new ResourceSettings(new MockApplication()); settings.setThrowExceptionOnMissingResource(false); - Assert.assertFalse("exceptionOnMissingResource should have been set to false", - settings.getThrowExceptionOnMissingResource()); + assertFalse(settings.getThrowExceptionOnMissingResource(), + "exceptionOnMissingResource should have been set to false"); } /** * @throws Exception */ @Test - public void testUseDefaultOnMissingResourceDefaultValue() throws Exception + void testUseDefaultOnMissingResourceDefaultValue() throws Exception { ResourceSettings settings = new ResourceSettings(new MockApplication()); - Assert.assertTrue("useDefaultOnMissingResource should default to true", - settings.getUseDefaultOnMissingResource()); + assertTrue(settings.getUseDefaultOnMissingResource(), + "useDefaultOnMissingResource should default to true"); } /** * @throws Exception */ @Test - public void testUseDefaultOnMissingResourceSetsCorrectly() throws Exception + void testUseDefaultOnMissingResourceSetsCorrectly() throws Exception { ResourceSettings settings = new ResourceSettings(new MockApplication()); settings.setUseDefaultOnMissingResource(false); - Assert.assertFalse("useDefaultOnMissingResource should have been set to false", - settings.getUseDefaultOnMissingResource()); + assertFalse(settings.getUseDefaultOnMissingResource(), + "useDefaultOnMissingResource should have been set to false"); } /** * */ @Test - public void testDefaultStringResourceLoaderSetup() + void testDefaultStringResourceLoaderSetup() { ResourceSettings settings = new ResourceSettings(new MockApplication()); List<IStringResourceLoader> loaders = settings.getStringResourceLoaders(); - Assert.assertEquals("There should be 5 default loaders", 5, loaders.size()); - Assert.assertTrue("First loader one should be the component one", - loaders.get(0) instanceof ComponentStringResourceLoader); - Assert.assertTrue("Second loader should be the package one", - loaders.get(1) instanceof PackageStringResourceLoader); - Assert.assertTrue("Third loader should be the application one", - loaders.get(2) instanceof ClassStringResourceLoader); - Assert.assertTrue("Fourth loader should be the validator one", - loaders.get(3) instanceof ValidatorStringResourceLoader); - Assert.assertTrue("Fifth should be the initializer one", - loaders.get(4) instanceof InitializerStringResourceLoader); + assertEquals(5, loaders.size(), "There should be 5 default loaders"); + assertTrue(loaders.get(0) instanceof ComponentStringResourceLoader, + "First loader one should be the component one"); + assertTrue(loaders.get(1) instanceof PackageStringResourceLoader, + "Second loader should be the package one"); + assertTrue(loaders.get(2) instanceof ClassStringResourceLoader, + "Third loader should be the application one"); + assertTrue(loaders.get(3) instanceof ValidatorStringResourceLoader, + "Fourth loader should be the validator one"); + assertTrue(loaders.get(4) instanceof InitializerStringResourceLoader, + "Fifth should be the initializer one"); } /** * */ @Test - public void testOverrideStringResourceLoaderSetup() + void testOverrideStringResourceLoaderSetup() { ResourceSettings settings = new ResourceSettings(new MockApplication()); settings.getStringResourceLoaders().clear(); - settings.getStringResourceLoaders().add( - new BundleStringResourceLoader("org.apache.wicket.resource.DummyResources")); + settings.getStringResourceLoaders() + .add(new BundleStringResourceLoader("org.apache.wicket.resource.DummyResources")); settings.getStringResourceLoaders().add(new ComponentStringResourceLoader()); List<IStringResourceLoader> loaders = settings.getStringResourceLoaders(); - Assert.assertEquals("There should be 2 overridden loaders", 2, loaders.size()); - Assert.assertTrue("First loader one should be the bundle one", - loaders.get(0) instanceof BundleStringResourceLoader); - Assert.assertTrue("Second loader should be the component one", - loaders.get(1) instanceof ComponentStringResourceLoader); + assertEquals(2, loaders.size(), "There should be 2 overridden loaders"); + assertTrue(loaders.get(0) instanceof BundleStringResourceLoader, + "First loader one should be the bundle one"); + assertTrue(loaders.get(1) instanceof ComponentStringResourceLoader, + "Second loader should be the component one"); } /** * */ @Test - public void testLocalizer() + void testLocalizer() { MockApplication dummy = new MockApplication(); dummy.setName("test-app"); @@ -160,7 +162,7 @@ public class ApplicationSettingsTest ThreadContext.setApplication(dummy); dummy.initApplication(); Localizer localizer = dummy.getResourceSettings().getLocalizer(); - Assert.assertNotNull("Localizer should be available", localizer); + assertNotNull(localizer, "Localizer should be available"); dummy.internalDestroy(); } }
