http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest.java index f702a20..5bddd9c 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest.java @@ -17,6 +17,8 @@ package org.apache.wicket.resource.aggregator; import static org.apache.wicket.markup.head.JavaScriptHeaderItem.forReference; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.ArrayList; import java.util.Arrays; @@ -29,15 +31,15 @@ import org.apache.wicket.markup.head.ResourceAggregator; import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.resource.CircularDependencyException; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for the {@link org.apache.wicket.markup.head.ResourceAggregator} class. * * @author Hielke Hoeve */ -public class ResourceAggregatorTest extends WicketTestCase +class ResourceAggregatorTest extends WicketTestCase { private void assertItems(ResourceReference... references) { @@ -65,8 +67,8 @@ public class ResourceAggregatorTest extends WicketTestCase * Setup the testcase, creating a new header response stub and wrapping it in a resource * aggregator */ - @Before - public void setup() + @BeforeEach + void setup() { responseStub = new TestHeaderResponse(); aggregator = new ResourceAggregator(responseStub); @@ -76,7 +78,7 @@ public class ResourceAggregatorTest extends WicketTestCase * render [b->a], should render [a,b] */ @Test - public void testDependency() + void testDependency() { aggregator.render(forReference(new ResourceReferenceB())); assertItems(new ResourceReferenceA(), new ResourceReferenceB()); @@ -86,7 +88,7 @@ public class ResourceAggregatorTest extends WicketTestCase * render [b->a, c->a], should render [a,b,c] */ @Test - public void test2RefsWithDependency() + void test2RefsWithDependency() { aggregator.render(forReference(new ResourceReferenceB())); aggregator.render(forReference(new ResourceReferenceC())); @@ -97,7 +99,7 @@ public class ResourceAggregatorTest extends WicketTestCase * render [d->c->a], should render [a, c, d] */ @Test - public void testTransitiveDependencies() + void testTransitiveDependencies() { aggregator.render(forReference(new ResourceReferenceD())); assertItems(new ResourceReferenceA(), new ResourceReferenceC(), new ResourceReferenceD()); @@ -107,7 +109,7 @@ public class ResourceAggregatorTest extends WicketTestCase * bundle {a, b->a}, render [a], should render [ab] */ @Test - public void testBundle() + void testBundle() { HeaderItem bundleAB = Application.get() .getResourceBundles() @@ -121,7 +123,7 @@ public class ResourceAggregatorTest extends WicketTestCase * bundle {a, b->a}, render [b], should render [ab] */ @Test - public void testBundleRenderingOther() + void testBundleRenderingOther() { HeaderItem bundleAB = Application.get() .getResourceBundles() @@ -135,7 +137,7 @@ public class ResourceAggregatorTest extends WicketTestCase * bundle {a, b->a}, render [a, b], should render [ab] */ @Test - public void testBundleRenderingBoth() + void testBundleRenderingBoth() { HeaderItem bundleAB = Application.get() .getResourceBundles() @@ -150,7 +152,7 @@ public class ResourceAggregatorTest extends WicketTestCase * bundle {a, b->a}, render [d->c->a], should render [ab, c, d] */ @Test - public void testBundleRenderedAsDependency() + void testBundleRenderedAsDependency() { HeaderItem bundleAB = Application.get() .getResourceBundles() @@ -165,7 +167,7 @@ public class ResourceAggregatorTest extends WicketTestCase * bundle {c->a, d->c->a}, render [d], should render [a, cd] */ @Test - public void testBundleWithDependencies() + void testBundleWithDependencies() { HeaderItem bundleCD = Application.get() .getResourceBundles() @@ -180,7 +182,7 @@ public class ResourceAggregatorTest extends WicketTestCase * bundle {a, b->a} and {c->a, d->c->a}, render [d], should render [ab, cd] */ @Test - public void testTwoBundlesWithDependencies() + void testTwoBundlesWithDependencies() { HeaderItem bundleAB = Application.get() .getResourceBundles() @@ -199,7 +201,7 @@ public class ResourceAggregatorTest extends WicketTestCase * cd] */ @Test - public void testTwoBundlesWithDependenciesAndPriority() + void testTwoBundlesWithDependenciesAndPriority() { HeaderItem bundleAB = Application.get() .getResourceBundles() @@ -217,33 +219,37 @@ public class ResourceAggregatorTest extends WicketTestCase /** * bundle {a, b->a} and {a, c->a}, should give exception */ - @Test(expected = IllegalArgumentException.class) - public void testTwoBundlesProvidingSameResource() + @Test + void testTwoBundlesProvidingSameResource() { - Application.get() - .getResourceBundles() - .addJavaScriptBundle(Application.class, "ab.js", new ResourceReferenceA(), - new ResourceReferenceB()); - Application.get() - .getResourceBundles() - .addJavaScriptBundle(Application.class, "ac.js", new ResourceReferenceA(), - new ResourceReferenceC()); + assertThrows(IllegalArgumentException.class, () -> { + Application.get() + .getResourceBundles() + .addJavaScriptBundle(Application.class, "ab.js", new ResourceReferenceA(), + new ResourceReferenceB()); + Application.get() + .getResourceBundles() + .addJavaScriptBundle(Application.class, "ac.js", new ResourceReferenceA(), + new ResourceReferenceC()); + }); } /** * render [circ1->circ2->circ1->...], should give exception */ - @Test(expected = CircularDependencyException.class) - public void testCircularDependency() + @Test + void testCircularDependency() { - aggregator.render(forReference(new ResourceReferenceCirc1())); + assertThrows(CircularDependencyException.class, () -> { + aggregator.render(forReference(new ResourceReferenceCirc1())); + }); } /** * bundle {bun1 -> x, bun2 -> y}, render [bun1], should render [x, y, bun12] */ @Test - public void testTwoResourcesWithBundleAsDependency() + void testTwoResourcesWithBundleAsDependency() { HeaderItem bundle12 = Application.get() .getResourceBundles() @@ -258,7 +264,7 @@ public class ResourceAggregatorTest extends WicketTestCase * bundle {a, b -> a}, render [x, priority(a)], should render [priority(ab), x] */ @Test - public void testBundleWithPriority() + void testBundleWithPriority() { HeaderItem bundleAB = Application.get() .getResourceBundles()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest1Page.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest1Page.java b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest1Page.java index ae7b249..3e62249 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest1Page.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest1Page.java @@ -32,7 +32,7 @@ public class ResourceAggregatorTest1Page extends WebPage /** * */ - public static String javascript = "alert('Hello World!');"; + private static String javascript = "alert('Hello World!');"; /** * Construct. http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/TestHeaderResponse.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/TestHeaderResponse.java b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/TestHeaderResponse.java index 6887be5..94f39e8 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/TestHeaderResponse.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/TestHeaderResponse.java @@ -23,8 +23,8 @@ import java.util.Set; import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; -import org.apache.wicket.request.Response; import org.apache.wicket.markup.head.NoHeaderItem; +import org.apache.wicket.request.Response; import org.apache.wicket.response.StringResponse; /** @@ -32,7 +32,7 @@ import org.apache.wicket.response.StringResponse; * * @author papegaaij */ -public class TestHeaderResponse implements IHeaderResponse +class TestHeaderResponse implements IHeaderResponse { private StringResponse response = new StringResponse(); private Set<Object> rendered = new HashSet<Object>(); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/bundles/CompressBundlesTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/bundles/CompressBundlesTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/bundles/CompressBundlesTest.java index e8c9e7c..99c1ef9 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/bundles/CompressBundlesTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/bundles/CompressBundlesTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.resource.bundles; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.wicket.MarkupContainer; import org.apache.wicket.javascript.DefaultJavaScriptCompressor; import org.apache.wicket.markup.IMarkupResourceStreamProvider; @@ -28,18 +30,18 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference; 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; /** * A test case for https://issues.apache.org/jira/browse/WICKET-4902 */ -public class CompressBundlesTest extends WicketTestCase +class CompressBundlesTest extends WicketTestCase { /** * Asserts that the bundle response is compressed */ @Test - public void compressBundle() + void compressBundle() { tester.startPage(new CompressBundleTestPage()); tester.assertRenderedPage(CompressBundleTestPage.class); @@ -75,7 +77,7 @@ public class CompressBundlesTest extends WicketTestCase { private static final long serialVersionUID = 1L; - public CompressBundleTestPage() {} + CompressBundleTestPage() {} @Override public void renderHead(IHeaderResponse response) http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/loader/ClassStringResourceLoaderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/loader/ClassStringResourceLoaderTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/loader/ClassStringResourceLoaderTest.java index 73b275c..153eb1c 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/loader/ClassStringResourceLoaderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/loader/ClassStringResourceLoaderTest.java @@ -16,23 +16,25 @@ */ package org.apache.wicket.resource.loader; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.wicket.Component; import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.validation.IValidatable; import org.apache.wicket.validation.IValidator; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * */ -public class ClassStringResourceLoaderTest extends WicketTestCase +class ClassStringResourceLoaderTest extends WicketTestCase { /** * */ @Test - public void validator1() + void validator1() { ClassStringResourceLoader loader = new ClassStringResourceLoader(MyValidator.class); tester.getApplication().getResourceSettings().getStringResourceLoaders().add(loader); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/loader/ComponentStringResourceLoaderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/loader/ComponentStringResourceLoaderTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/loader/ComponentStringResourceLoaderTest.java index b06b045..2e6b596 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/loader/ComponentStringResourceLoaderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/loader/ComponentStringResourceLoaderTest.java @@ -24,19 +24,19 @@ import org.apache.wicket.resource.IsoPropertiesFilePropertiesLoader; import org.apache.wicket.resource.Properties; import org.apache.wicket.resource.PropertiesFactory; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * */ -public class ComponentStringResourceLoaderTest extends WicketTestCase +class ComponentStringResourceLoaderTest extends WicketTestCase { /** * @throws Exception */ @Test - public void renderHomePage_1() throws Exception + void renderHomePage_1() throws Exception { // The xml markup file and the search for an xml properties // file get in the way @@ -47,7 +47,7 @@ public class ComponentStringResourceLoaderTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_2() throws Exception + void renderHomePage_2() throws Exception { // Avoid the conflict by limiting the search for properties files // to *.properties @@ -62,7 +62,7 @@ public class ComponentStringResourceLoaderTest extends WicketTestCase * @throws Exception */ @Test - public void disabledCache() throws Exception + void disabledCache() throws Exception { IPropertiesFactory myFac = new DisabledCachePropertiesFactory(tester.getApplication() .getResourceSettings()); @@ -83,7 +83,7 @@ public class ComponentStringResourceLoaderTest extends WicketTestCase * * @param context */ - public MyPropertiesFactory(IPropertiesFactoryContext context) + MyPropertiesFactory(IPropertiesFactoryContext context) { super(context); @@ -102,7 +102,7 @@ public class ComponentStringResourceLoaderTest extends WicketTestCase * * @param context */ - public DisabledCachePropertiesFactory(IPropertiesFactoryContext context) + DisabledCachePropertiesFactory(IPropertiesFactoryContext context) { super(context); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer.java b/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer.java index 59d363a..3bf6695 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer.java @@ -22,7 +22,7 @@ import org.apache.wicket.IInitializer; /** * */ -public class FooInitializer implements IInitializer +class FooInitializer implements IInitializer { @Override public void init(Application application) http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/loader/InitializerStringResourceLoaderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/loader/InitializerStringResourceLoaderTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/loader/InitializerStringResourceLoaderTest.java index 7a798ab..db07adb 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/loader/InitializerStringResourceLoaderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/loader/InitializerStringResourceLoaderTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.resource.loader; +import static org.junit.jupiter.api.Assertions.assertNull; + import java.util.Arrays; import org.apache.wicket.IInitializer; http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/loader/NestedStringResourceLoaderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/loader/NestedStringResourceLoaderTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/loader/NestedStringResourceLoaderTest.java index 19f357e..7360c6f 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/loader/NestedStringResourceLoaderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/loader/NestedStringResourceLoaderTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.resource.loader; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.List; import java.util.regex.Pattern; @@ -25,19 +27,19 @@ import org.apache.wicket.resource.loader.ClassStringResourceLoaderTest.MyValidat import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.validation.IValidatable; import org.apache.wicket.validation.IValidator; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the nested string resource loader */ -public class NestedStringResourceLoaderTest extends WicketTestCase +class NestedStringResourceLoaderTest extends WicketTestCase { /** * Tests the nested string resource loader */ @Test - public void testNestedStrings(){ + void testNestedStrings(){ List<IStringResourceLoader> loaders = tester.getApplication().getResourceSettings().getStringResourceLoaders(); ClassStringResourceLoader classStringResourceLoader = new ClassStringResourceLoader(MyValidator.class); loaders.add(classStringResourceLoader); @@ -53,7 +55,7 @@ public class NestedStringResourceLoaderTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-6393 */ @Test - public void whenAnyKeyIsMissing_thenUseTheDefaultValue(){ + void whenAnyKeyIsMissing_thenUseTheDefaultValue(){ List<IStringResourceLoader> loaders = tester.getApplication().getResourceSettings().getStringResourceLoaders(); ClassStringResourceLoader classStringResourceLoader = new ClassStringResourceLoader(NestedWithMissingKeyValidator.class); loaders.add(classStringResourceLoader); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/loader/PackageStringResourceLoaderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/loader/PackageStringResourceLoaderTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/loader/PackageStringResourceLoaderTest.java index 212498e..a1bdee7 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/loader/PackageStringResourceLoaderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/loader/PackageStringResourceLoaderTest.java @@ -16,21 +16,24 @@ */ package org.apache.wicket.resource.loader; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + import org.apache.wicket.Page; import org.apache.wicket.resource.loader.pages.Test1; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * */ -public class PackageStringResourceLoaderTest extends WicketTestCase +class PackageStringResourceLoaderTest extends WicketTestCase { /** * */ @Test - public void packageFileInComponentPackage() + void packageFileInComponentPackage() { Page page = new Test1(); PackageStringResourceLoader loader = new PackageStringResourceLoader(); @@ -42,7 +45,7 @@ public class PackageStringResourceLoaderTest extends WicketTestCase * */ @Test - public void packageFileInParentPackage() + void packageFileInParentPackage() { Page page = new Test1(); PackageStringResourceLoader loader = new PackageStringResourceLoader(); @@ -54,7 +57,7 @@ public class PackageStringResourceLoaderTest extends WicketTestCase * */ @Test - public void notFound() + void notFound() { Page page = new Test1(); PackageStringResourceLoader loader = new PackageStringResourceLoader(); @@ -65,7 +68,7 @@ public class PackageStringResourceLoaderTest extends WicketTestCase * @throws Exception */ @Test - public void test_1() throws Exception + void test_1() throws Exception { executeTest(Test1.class, "PackageTestPageExpectedResult_1.html"); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/loader/PropertiesResolverTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/loader/PropertiesResolverTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/loader/PropertiesResolverTest.java index bcd718c..f1d88da 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/loader/PropertiesResolverTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/loader/PropertiesResolverTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.resource.loader; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.wicket.Component; import org.apache.wicket.Page; import org.apache.wicket.markup.html.WebMarkupContainer; @@ -25,8 +27,7 @@ import org.apache.wicket.markup.repeater.RepeatingView; import org.apache.wicket.model.StringResourceModel; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.util.tester.WicketTester; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * test hierarchic lookup of properties from component property files @@ -34,13 +35,13 @@ import org.junit.Test; * @author Peter Ertl * */ -public class PropertiesResolverTest extends Assert +class PropertiesResolverTest { /** * */ @Test - public void resolveProperties() + void resolveProperties() { WicketTester tester = new WicketTester(new App()); @@ -51,7 +52,7 @@ public class PropertiesResolverTest extends Assert /** */ - public static class App extends WebApplication + static class App extends WebApplication { @Override public Class<? extends Page> getHomePage() @@ -69,7 +70,7 @@ public class PropertiesResolverTest extends Assert /** * Construct. */ - public MyPage() + public MyPage() { MyRepeatingView repeater = new MyRepeatingView("repeater"); add(repeater); @@ -125,25 +126,25 @@ public class PropertiesResolverTest extends Assert } } - public static class MyRepeatingView extends RepeatingView + static class MyRepeatingView extends RepeatingView { - public MyRepeatingView(String id) + MyRepeatingView(String id) { super(id); } } - public static class MyContainer extends WebMarkupContainer + static class MyContainer extends WebMarkupContainer { - public MyContainer(String id) + MyContainer(String id) { super(id); } } - public static class MyLabel extends Label + static class MyLabel extends Label { - public MyLabel(String id) + MyLabel(String id) { super(id); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/loader/ValidatorStringResourceLoaderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/loader/ValidatorStringResourceLoaderTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/loader/ValidatorStringResourceLoaderTest.java index 0fefa31..8c8ef83 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/loader/ValidatorStringResourceLoaderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/loader/ValidatorStringResourceLoaderTest.java @@ -34,14 +34,14 @@ import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.validation.IValidatable; import org.apache.wicket.validation.IValidator; import org.apache.wicket.validation.ValidationError; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for ValidatorStringResourceLoader * * @since 1.5.5 */ -public class ValidatorStringResourceLoaderTest extends WicketTestCase +class ValidatorStringResourceLoaderTest extends WicketTestCase { /** * Tests that resource bundle is properly loaded for implementations of @@ -50,7 +50,7 @@ public class ValidatorStringResourceLoaderTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-4379 */ @Test - public void interfaceValidator() + void interfaceValidator() { tester.startPage(new ValidatorLoaderPage(new InterfaceValidator())); FormTester formTester = tester.newFormTester("form"); @@ -67,7 +67,7 @@ public class ValidatorStringResourceLoaderTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-4379 */ @Test - public void classValidator() + void classValidator() { tester.startPage(new ValidatorLoaderPage(new ClassValidator())); FormTester formTester = tester.newFormTester("form"); @@ -78,7 +78,7 @@ public class ValidatorStringResourceLoaderTest extends WicketTestCase } @Test - public void formValidator() + void formValidator() { tester.startPage(new FormValidatorPage()); FormTester formTester = tester.newFormTester("form"); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/loader/XmlPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/loader/XmlPage.java b/wicket-core/src/test/java/org/apache/wicket/resource/loader/XmlPage.java index 9336eed..a27ca74 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/loader/XmlPage.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/loader/XmlPage.java @@ -30,7 +30,7 @@ public class XmlPage extends WebPage /** * Construct. */ - public XmlPage() + XmlPage() { } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/response/PreserveCookieForTheNextHandlerTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/response/PreserveCookieForTheNextHandlerTest.java b/wicket-core/src/test/java/org/apache/wicket/response/PreserveCookieForTheNextHandlerTest.java index 68c7931..bcd29f1 100644 --- a/wicket-core/src/test/java/org/apache/wicket/response/PreserveCookieForTheNextHandlerTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/response/PreserveCookieForTheNextHandlerTest.java @@ -16,8 +16,9 @@ */ package org.apache.wicket.response; -import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import java.util.List; import javax.servlet.http.Cookie; import org.apache.wicket.MarkupContainer; @@ -28,12 +29,12 @@ import org.apache.wicket.util.cookies.CookieUtils; 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; /** * @since 1.5.8 */ -public class PreserveCookieForTheNextHandlerTest extends WicketTestCase +class PreserveCookieForTheNextHandlerTest extends WicketTestCase { /** * Verifies that any meta data actions set to a BufferedWebResponse during page rendering @@ -42,7 +43,7 @@ public class PreserveCookieForTheNextHandlerTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-4358 */ @Test - public void preserveCookie() + void preserveCookie() { tester.startPage(StartPage.class); tester.assertRenderedPage(StartPage.class); @@ -55,9 +56,9 @@ public class PreserveCookieForTheNextHandlerTest extends WicketTestCase assertEquals("value", cookies.get(0).getValue()); } - public static final class StartPage extends WebPage implements IMarkupResourceStreamProvider + public static final class StartPage extends WebPage implements IMarkupResourceStreamProvider { - public StartPage() + public StartPage() { add(new BookmarkablePageLink<Void>("link", SetCookiePage.class)); } @@ -69,7 +70,7 @@ public class PreserveCookieForTheNextHandlerTest extends WicketTestCase } } - public static final class SetCookiePage extends WebPage implements IMarkupResourceStreamProvider + public static final class SetCookiePage extends WebPage implements IMarkupResourceStreamProvider { @Override protected void onBeforeRender() http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/response/filter/ResponseFilterTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/response/filter/ResponseFilterTest.java b/wicket-core/src/test/java/org/apache/wicket/response/filter/ResponseFilterTest.java index 495c1ab..cd61482 100644 --- a/wicket-core/src/test/java/org/apache/wicket/response/filter/ResponseFilterTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/response/filter/ResponseFilterTest.java @@ -16,9 +16,11 @@ */ package org.apache.wicket.response.filter; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Assert; import org.apache.wicket.MockPageWithLink; import org.apache.wicket.ajax.AjaxEventBehavior; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -28,8 +30,8 @@ import org.apache.wicket.resource.DummyApplication; import org.apache.wicket.util.string.AppendingStringBuffer; import org.apache.wicket.util.tester.DummyHomePage; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; /** * Test case for <a href="https://issues.apache.org/jira/browse/WICKET-3280";>WICKET-3280</a> @@ -37,7 +39,7 @@ import org.junit.Test; * {@link IResponseFilter}s must be called for both Ajax and non-Ajax responses */ @SuppressWarnings("serial") -public class ResponseFilterTest extends WicketTestCase +class ResponseFilterTest extends WicketTestCase { private final AtomicInteger counter = new AtomicInteger(0); @@ -71,8 +73,8 @@ public class ResponseFilterTest extends WicketTestCase /** * after() */ - @After - public void after() + @AfterEach + void after() { counter.set(0); } @@ -81,17 +83,17 @@ public class ResponseFilterTest extends WicketTestCase * WICKET-3620 */ @Test - public void filterAddCommentFilter() + void filterAddCommentFilter() { tester.startPage(DummyHomePage.class); - Assert.assertTrue(tester.getLastResponseAsString().contains(AppendCommentFilter.COMMENT)); + assertTrue(tester.getLastResponseAsString().contains(AppendCommentFilter.COMMENT)); } /** * WICKET-3620 */ @Test - public void addCommentFilterInAjaxResponse() + void addCommentFilterInAjaxResponse() { DummyHomePage testPage = new DummyHomePage(); testPage.getTestPageLink().add(new AjaxEventBehavior("event") @@ -103,7 +105,7 @@ public class ResponseFilterTest extends WicketTestCase }); tester.startPage(testPage); tester.executeAjaxEvent(testPage.getTestPageLink(), "event"); - Assert.assertTrue(tester.getLastResponseAsString().contains(AppendCommentFilter.COMMENT)); + assertTrue(tester.getLastResponseAsString().contains(AppendCommentFilter.COMMENT)); } private static class AppendCommentFilter implements IResponseFilter @@ -122,7 +124,7 @@ public class ResponseFilterTest extends WicketTestCase * normalRequest() */ @Test - public void normalRequest() + void normalRequest() { tester.startPage(DummyHomePage.class); @@ -133,7 +135,7 @@ public class ResponseFilterTest extends WicketTestCase * ajaxRequest() */ @Test - public void ajaxRequest() + void ajaxRequest() { AjaxPage page = new AjaxPage(counter); tester.startPage(page); @@ -149,7 +151,7 @@ public class ResponseFilterTest extends WicketTestCase /** * Test page for ajax request */ - public static class AjaxPage extends MockPageWithLink + static class AjaxPage extends MockPageWithLink { boolean ajaxCalled = false; @@ -158,7 +160,7 @@ public class ResponseFilterTest extends WicketTestCase * * @param counter */ - public AjaxPage(final AtomicInteger counter) + AjaxPage(final AtomicInteger counter) { add(new AjaxLink<Void>(MockPageWithLink.LINK_ID) { http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/response/filter/XmlCleaningResponseFilterTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/response/filter/XmlCleaningResponseFilterTest.java b/wicket-core/src/test/java/org/apache/wicket/response/filter/XmlCleaningResponseFilterTest.java index 9bc9e1a..2209b14 100644 --- a/wicket-core/src/test/java/org/apache/wicket/response/filter/XmlCleaningResponseFilterTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/response/filter/XmlCleaningResponseFilterTest.java @@ -18,24 +18,26 @@ package org.apache.wicket.response.filter; import static org.apache.wicket.page.XmlPartialPageUpdate.END_ROOT_ELEMENT; import static org.apache.wicket.page.XmlPartialPageUpdate.START_ROOT_ELEMENT; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.apache.wicket.util.string.AppendingStringBuffer; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for XmlCleaningResponseFilter */ -public class XmlCleaningResponseFilterTest extends Assert { +class XmlCleaningResponseFilterTest { /** * Tests that invalid XML characters are removed * @throws Exception */ @Test - public void filterInvalid() throws Exception + void filterInvalid() throws Exception { XmlCleaningResponseFilter filter = new XmlCleaningResponseFilter(); int[] invalidChars = new int[] {0x0008, 0x0010, 0xD800, 0xDDDD, 0xFFFE}; @@ -45,8 +47,7 @@ public class XmlCleaningResponseFilterTest extends Assert { CharSequence text = createText(invalidChar); AppendingStringBuffer filtered = filter.filter(new AppendingStringBuffer(text)); - assertEquals(String.format("checking Unicode codepoint 0x%X:", invalidChar), - START_ROOT_ELEMENT+END_ROOT_ELEMENT, filtered.toString()); + assertEquals(START_ROOT_ELEMENT+END_ROOT_ELEMENT, filtered.toString(), String.format("checking Unicode codepoint 0x%X:", invalidChar)); } } @@ -55,7 +56,7 @@ public class XmlCleaningResponseFilterTest extends Assert { * @throws Exception */ @Test - public void filterMultipleInvalid() throws Exception + void filterMultipleInvalid() throws Exception { XmlCleaningResponseFilter filter = new XmlCleaningResponseFilter(); CharSequence text = new StringBuilder() @@ -76,7 +77,7 @@ public class XmlCleaningResponseFilterTest extends Assert { * @throws Exception */ @Test - public void filterValid() throws Exception + void filterValid() throws Exception { XmlCleaningResponseFilter filter = new XmlCleaningResponseFilter(); int[] validChars = new int[] {0x9, 0xA, 'a', 0xE000, 0xFFFC, 0x10400}; @@ -86,8 +87,7 @@ public class XmlCleaningResponseFilterTest extends Assert { CharSequence text = createText(validChar); AppendingStringBuffer filtered = filter.filter(new AppendingStringBuffer(text)); - assertEquals(String.format("checking Unicode codepoint 0x%X:", validChar), - text.toString(), filtered.toString()); + assertEquals(text.toString(), filtered.toString(), String.format("checking Unicode codepoint 0x%X:", validChar)); } } @@ -107,7 +107,7 @@ public class XmlCleaningResponseFilterTest extends Assert { * @throws Exception */ @Test - public void shouldFilter() throws Exception + void shouldFilter() throws Exception { XmlFilter filter = new XmlFilter(); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/serialize/java/JavaSerializerTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/serialize/java/JavaSerializerTest.java b/wicket-core/src/test/java/org/apache/wicket/serialize/java/JavaSerializerTest.java index c90414c..560c495 100644 --- a/wicket-core/src/test/java/org/apache/wicket/serialize/java/JavaSerializerTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/serialize/java/JavaSerializerTest.java @@ -16,9 +16,11 @@ */ package org.apache.wicket.serialize.java; -import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.fail; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -36,12 +38,12 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.util.io.IOUtils; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * */ -public class JavaSerializerTest extends WicketTestCase +class JavaSerializerTest extends WicketTestCase { /** * https://issues.apache.org/jira/browse/WICKET-4812 @@ -51,7 +53,7 @@ public class JavaSerializerTest extends WicketTestCase * in the object tree. */ @Test - public void notDetachedModel() + void notDetachedModel() { JavaSerializer serializer = new JavaSerializer("JavaSerializerTest") { @@ -67,7 +69,7 @@ public class JavaSerializerTest extends WicketTestCase model.getObject(); WebComponent component = new WebComponent("id", model); byte[] serialized = serializer.serialize(component); - assertNull("The produced byte[] must be null if there was an error", serialized); + assertNull(serialized, "The produced byte[] must be null if there was an error"); } /** @@ -89,19 +91,19 @@ public class JavaSerializerTest extends WicketTestCase * JavaSerializer and some object in the tree is not Serializable */ @Test - public void notSerializable() + void notSerializable() { JavaSerializer serializer = new JavaSerializer("JavaSerializerTest"); WebComponent component = new NotSerializableComponent("id"); byte[] serialized = serializer.serialize(component); - assertNull("The produced byte[] must be null if there was an error", serialized); + assertNull(serialized, "The produced byte[] must be null if there was an error"); } private static class NotSerializableComponent extends WebComponent { private final NotSerializableObject member = new NotSerializableObject(); - public NotSerializableComponent(final String id) + NotSerializableComponent(final String id) { super(id); } @@ -110,7 +112,7 @@ public class JavaSerializerTest extends WicketTestCase private static class NotSerializableObject {} @Test - public void normal() + void normal() { JavaSerializer serializer = new JavaSerializer("JavaSerializerTest-normal") { @Override @@ -127,7 +129,7 @@ public class JavaSerializerTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-5667 */ @Test - public void preserveTheOriginalException() + void preserveTheOriginalException() { JavaSerializer serializer = new JavaSerializer("JavaSerializerTest-aa") { @@ -173,15 +175,15 @@ public class JavaSerializerTest extends WicketTestCase catch (Exception x) { Throwable cause0 = x.getCause(); - assertThat(cause0, is(instanceOf(WicketRuntimeException.class))); + assertThat(cause0, instanceOf(WicketRuntimeException.class)); WicketRuntimeException wrx = (WicketRuntimeException) cause0; Throwable cause1 = wrx.getCause(); - assertThat(cause1, is(instanceOf(IllegalStateException.class))); - assertThat(cause1.getMessage(), is(equalTo("Cannot serialize me twice!"))); + assertThat(cause1, instanceOf(IllegalStateException.class)); + assertEquals("Cannot serialize me twice!", cause1.getMessage()); Throwable cause2 = cause1.getCause(); - assertThat(cause2, is(instanceOf(NotSerializableException.class))); + assertThat(cause2, instanceOf(NotSerializableException.class)); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/session/BindSessionOnRedirectTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/session/BindSessionOnRedirectTest.java b/wicket-core/src/test/java/org/apache/wicket/session/BindSessionOnRedirectTest.java index 74fd33e..feae5aa 100644 --- a/wicket-core/src/test/java/org/apache/wicket/session/BindSessionOnRedirectTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/session/BindSessionOnRedirectTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket.session; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.MarkupContainer; import org.apache.wicket.markup.IMarkupResourceStreamProvider; import org.apache.wicket.markup.html.WebPage; @@ -23,18 +26,18 @@ import org.apache.wicket.markup.html.link.StatelessLink; 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-5165 */ -public class BindSessionOnRedirectTest extends WicketTestCase +class BindSessionOnRedirectTest extends WicketTestCase { - public static final String SESSION_FEEDBACK_MESSAGE = "Session message"; + private static final String SESSION_FEEDBACK_MESSAGE = "Session message"; @Test - public void bindSessionWhenThereAreFeedbackMessages() + void bindSessionWhenThereAreFeedbackMessages() { tester.startPage(FirstPage.class); assertTrue(tester.getSession().isTemporary()); @@ -47,9 +50,9 @@ public class BindSessionOnRedirectTest extends WicketTestCase tester.assertInfoMessages(SESSION_FEEDBACK_MESSAGE); } - public static class FirstPage extends WebPage implements IMarkupResourceStreamProvider + static class FirstPage extends WebPage implements IMarkupResourceStreamProvider { - public FirstPage() + FirstPage() { add(new StatelessLink<Void>("link") { @@ -69,9 +72,9 @@ public class BindSessionOnRedirectTest extends WicketTestCase } } - public static class SecondPage extends WebPage implements IMarkupResourceStreamProvider + static class SecondPage extends WebPage implements IMarkupResourceStreamProvider { - public SecondPage() + SecondPage() { } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java b/wicket-core/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java index c7e5055..d481887 100644 --- a/wicket-core/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java @@ -16,6 +16,11 @@ */ package org.apache.wicket.session; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.fail; + import org.apache.wicket.IPageFactory; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.markup.html.WebPage; @@ -23,18 +28,143 @@ import org.apache.wicket.request.flow.ResetResponseException; import org.apache.wicket.request.handler.EmptyRequestHandler; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; - +import org.junit.jupiter.api.Test; /** * Default page factory tests * * @author ivaynberg */ -public class DefaultPageFactoryTest extends WicketTestCase +class DefaultPageFactoryTest extends WicketTestCase { + final private IPageFactory pageFactory = new DefaultPageFactory(); + + @Test + void throwExceptionInConstructor() + { + Exception e = assertThrows(WicketRuntimeException.class, () -> { + pageFactory.newPage(ThrowExceptionInConstructorPage.class); + }); + + assertEquals( + "Can't instantiate page using constructor 'public org.apache.wicket.session.DefaultPageFactoryTest$ThrowExceptionInConstructorPage()'. An exception has been thrown during construction!", + e.getMessage()); + } + + @Test + void privateConstructor() + { + Exception e = assertThrows(WicketRuntimeException.class, () -> { + pageFactory.newPage(PrivateDefaultConstructorPage.class); + }); + + assertEquals( + "Can't instantiate page using constructor 'private org.apache.wicket.session.DefaultPageFactoryTest$PrivateDefaultConstructorPage()'. This constructor is private!", + e.getMessage()); + } + + @Test + void privateConstructorWithParameters() + { + + PageParameters parameters = new PageParameters(); + parameters.add("key", "value"); + + + Exception e = assertThrows(WicketRuntimeException.class, () -> { + pageFactory.newPage(PrivateConstructorWithParametersPage.class, parameters); + }); + + assertEquals( + "Can't instantiate page using constructor 'private org.apache.wicket.session.DefaultPageFactoryTest$PrivateConstructorWithParametersPage(org.apache.wicket.request.mapper.parameter.PageParameters)' and argument 'key=[value]'. This constructor is private!", + e.getMessage()); + } + + @Test + void nonDefaultConstructor() + { + Exception e = assertThrows(WicketRuntimeException.class, () -> { + pageFactory.newPage(NonDefaultConstructorPage.class); + }); + + assertEquals( + "Unable to create page from class org.apache.wicket.session.DefaultPageFactoryTest$NonDefaultConstructorPage. Class does not have a visible default constructor.", + e.getMessage()); + } + + /** + * Verifies page factory bubbles ResetResponseException + */ + @Test + void abortAndRespondContract() + { + try + { + pageFactory.newPage(AbortAndRespondPage1.class); + fail(); + } + catch (ResetResponseException e) + { + // noop + } + + try + { + pageFactory.newPage(AbortAndRespondPage2.class); + fail(); + } + catch (ResetResponseException e) + { + // noop + } + + try + { + pageFactory.newPage(AbortAndRespondPage2.class, new PageParameters()); + fail(); + } + catch (ResetResponseException e) + { + // noop + } + + try + { + pageFactory.newPage(AbortAndRespondPage3.class); + fail(); + } + catch (ResetResponseException e) + { + // noop + } + + try + { + pageFactory.newPage(AbortAndRespondPage3.class, new PageParameters()); + fail(); + } + catch (ResetResponseException e) + { + // noop + } + + try + { + pageFactory.newPage(PageThrowingCheckedException.class); + fail(); + } + catch (WicketRuntimeException e) + { + assertNotNull(e.getCause()); + assertNotNull(e.getCause().getCause()); + assertEquals(PageThrowingCheckedException.EXCEPTION, e.getCause().getCause()); + } + catch (Exception e) + { + fail(); + } + } + /** * @author ivaynberg */ @@ -45,7 +175,7 @@ public class DefaultPageFactoryTest extends WicketTestCase /** * Construct. */ - public AbortAndRespondPage1() + AbortAndRespondPage1() { throw new ResetResponseException(new EmptyRequestHandler()) { @@ -63,10 +193,10 @@ public class DefaultPageFactoryTest extends WicketTestCase /** * Construct. - * + * * @param params */ - public AbortAndRespondPage2(PageParameters params) + AbortAndRespondPage2(PageParameters params) { throw new ResetResponseException(new EmptyRequestHandler()) { @@ -85,7 +215,7 @@ public class DefaultPageFactoryTest extends WicketTestCase /** * Construct. */ - public AbortAndRespondPage3() + AbortAndRespondPage3() { throw new ResetResponseException(new EmptyRequestHandler()) { @@ -95,10 +225,10 @@ public class DefaultPageFactoryTest extends WicketTestCase /** * Construct. - * + * * @param params */ - public AbortAndRespondPage3(PageParameters params) + AbortAndRespondPage3(PageParameters params) { throw new ResetResponseException(new EmptyRequestHandler()) { @@ -112,163 +242,50 @@ public class DefaultPageFactoryTest extends WicketTestCase */ public static class PageThrowingCheckedException extends WebPage { - private static final long serialVersionUID = 1L; - /** */ - public static final Exception EXCEPTION = new Exception("a checked exception"); + static final Exception EXCEPTION = new Exception("a checked exception"); + private static final long serialVersionUID = 1L; /** * Construct. - * + * * @throws Exception */ - public PageThrowingCheckedException() throws Exception + PageThrowingCheckedException() throws Exception { throw EXCEPTION; } } - public static class PrivateDefaultConstructorPage extends WebPage + public static class PrivateDefaultConstructorPage extends WebPage { private PrivateDefaultConstructorPage() - {} + { + } } - public static class PrivateConstructorWithParametersPage extends WebPage + public static class PrivateConstructorWithParametersPage extends WebPage { - private PrivateConstructorWithParametersPage(PageParameters parameters) + private PrivateConstructorWithParametersPage(PageParameters parameters) { super(parameters); } } - public static class NonDefaultConstructorPage extends WebPage + public static class NonDefaultConstructorPage extends WebPage { - public NonDefaultConstructorPage(String aa) { + public NonDefaultConstructorPage(String aa) + { super(); } } - public static class ThrowExceptionInConstructorPage extends WebPage + public static class ThrowExceptionInConstructorPage extends WebPage { - public ThrowExceptionInConstructorPage() + public ThrowExceptionInConstructorPage() { throw new RuntimeException("exception!"); } } - - final private IPageFactory pageFactory = new DefaultPageFactory(); - - @Rule - public ExpectedException expectedException = ExpectedException.none(); - - - @Test - public void throwExceptionInConstructor() - { - expectedException.expect(WicketRuntimeException.class); - expectedException.expectMessage("Can't instantiate page using constructor 'public org.apache.wicket.session.DefaultPageFactoryTest$ThrowExceptionInConstructorPage()'. An exception has been thrown during construction!"); - - pageFactory.newPage(ThrowExceptionInConstructorPage.class); - } - - @Test - public void privateConstructor() { - expectedException.expect(WicketRuntimeException.class); - expectedException.expectMessage("Can't instantiate page using constructor 'private org.apache.wicket.session.DefaultPageFactoryTest$PrivateDefaultConstructorPage()'. This constructor is private!"); - - pageFactory.newPage(PrivateDefaultConstructorPage.class); - } - - @Test - public void privateConstructorWithParameters() { - expectedException.expect(WicketRuntimeException.class); - expectedException.expectMessage("Can't instantiate page using constructor 'private org.apache.wicket.session.DefaultPageFactoryTest$PrivateConstructorWithParametersPage(org.apache.wicket.request.mapper.parameter.PageParameters)' and argument 'key=[value]'. This constructor is private!"); - - PageParameters parameters = new PageParameters(); - parameters.add("key", "value"); - pageFactory.newPage(PrivateConstructorWithParametersPage.class, parameters); - } - - @Test - public void nonDefaultConstructor() { - expectedException.expect(WicketRuntimeException.class); - expectedException.expectMessage("Unable to create page from class org.apache.wicket.session.DefaultPageFactoryTest$NonDefaultConstructorPage. Class does not have a visible default constructor."); - - pageFactory.newPage(NonDefaultConstructorPage.class); - } - - /** - * Verifies page factory bubbles ResetResponseException - */ - @Test - public void abortAndRespondContract() - { - try - { - pageFactory.newPage(AbortAndRespondPage1.class); - fail(); - } - catch (ResetResponseException e) - { - // noop - } - - try - { - pageFactory.newPage(AbortAndRespondPage2.class); - fail(); - } - catch (ResetResponseException e) - { - // noop - } - - try - { - pageFactory.newPage(AbortAndRespondPage2.class, new PageParameters()); - fail(); - } - catch (ResetResponseException e) - { - // noop - } - - try - { - pageFactory.newPage(AbortAndRespondPage3.class); - fail(); - } - catch (ResetResponseException e) - { - // noop - } - - try - { - pageFactory.newPage(AbortAndRespondPage3.class, new PageParameters()); - fail(); - } - catch (ResetResponseException e) - { - // noop - } - - try - { - pageFactory.newPage(PageThrowingCheckedException.class); - fail(); - } - catch (WicketRuntimeException e) - { - assertNotNull(e.getCause()); - assertNotNull(e.getCause().getCause()); - assertEquals(PageThrowingCheckedException.EXCEPTION, e.getCause().getCause()); - } - catch (Exception e) - { - fail(); - } - } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/settings/DebugSettingsTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/settings/DebugSettingsTest.java b/wicket-core/src/test/java/org/apache/wicket/settings/DebugSettingsTest.java index c05c042..2b54ba4 100644 --- a/wicket-core/src/test/java/org/apache/wicket/settings/DebugSettingsTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/settings/DebugSettingsTest.java @@ -16,23 +16,25 @@ */ package org.apache.wicket.settings; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.wicket.Component; import org.apache.wicket.MockPageWithLink; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.util.tester.TagTester; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for DebugSettings */ -public class DebugSettingsTest extends WicketTestCase +class DebugSettingsTest extends WicketTestCase { /** * https://issues.apache.org/jira/browse/WICKET-5498 */ @Test - public void setComponentPathAttributeName() + void setComponentPathAttributeName() { String attributeName = "data-wicket-path"; tester.getApplication().getDebugSettings().setComponentPathAttributeName(attributeName); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/settings/ExceptionSettingsNotRenderableErrorStrategyTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/settings/ExceptionSettingsNotRenderableErrorStrategyTest.java b/wicket-core/src/test/java/org/apache/wicket/settings/ExceptionSettingsNotRenderableErrorStrategyTest.java index 7ab3aed..169b7e3 100644 --- a/wicket-core/src/test/java/org/apache/wicket/settings/ExceptionSettingsNotRenderableErrorStrategyTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/settings/ExceptionSettingsNotRenderableErrorStrategyTest.java @@ -16,6 +16,11 @@ */ package org.apache.wicket.settings; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.fail; + import org.apache.wicket.MarkupContainer; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.markup.IMarkupResourceStreamProvider; @@ -24,22 +29,19 @@ import org.apache.wicket.markup.html.basic.Label; 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; - -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for {@link ExceptionSettings#notRenderableErrorStrategy} */ -public class ExceptionSettingsNotRenderableErrorStrategyTest extends WicketTestCase { +class ExceptionSettingsNotRenderableErrorStrategyTest extends WicketTestCase { private WicketTagTestPage wicketTagTestPage; private RenderBodyOnlyTestPage renderBodyOnlyTestPage; - @Before - public void before() + @BeforeEach + void before() { ExceptionSettings exceptionSettings = tester.getApplication().getExceptionSettings(); exceptionSettings.setNotRenderableErrorStrategy(ExceptionSettings.NotRenderableErrorStrategy.THROW_EXCEPTION); @@ -49,7 +51,7 @@ public class ExceptionSettingsNotRenderableErrorStrategyTest extends WicketTestC } @Test - public void notRenderableErrorStrategy_whenWicketTagAndOutputId_throwException() { + void notRenderableErrorStrategy_whenWicketTagAndOutputId_throwException() { try { wicketTagTestPage.component.setOutputMarkupId(true); @@ -61,7 +63,7 @@ public class ExceptionSettingsNotRenderableErrorStrategyTest extends WicketTestC } @Test - public void notRenderableErrorStrategy_whenWicketTagAndOutputPlaceholder_throwException() { + void notRenderableErrorStrategy_whenWicketTagAndOutputPlaceholder_throwException() { try { wicketTagTestPage.component.setOutputMarkupPlaceholderTag(true); @@ -73,7 +75,7 @@ public class ExceptionSettingsNotRenderableErrorStrategyTest extends WicketTestC } @Test - public void notRenderableErrorStrategy_whenRenderBodyOnlyAndOutputId_throwException() { + void notRenderableErrorStrategy_whenRenderBodyOnlyAndOutputId_throwException() { try { renderBodyOnlyTestPage.component.setOutputMarkupId(true); @@ -85,7 +87,7 @@ public class ExceptionSettingsNotRenderableErrorStrategyTest extends WicketTestC } @Test - public void notRenderableErrorStrategy_whenRenderBodyOnlyAndOutputPlaceholder_throwException() { + void notRenderableErrorStrategy_whenRenderBodyOnlyAndOutputPlaceholder_throwException() { try { renderBodyOnlyTestPage.component.setOutputMarkupPlaceholderTag(true); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/settings/ISecuritySettingsTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/settings/ISecuritySettingsTest.java b/wicket-core/src/test/java/org/apache/wicket/settings/ISecuritySettingsTest.java index d0b64c2..dfa768c 100644 --- a/wicket-core/src/test/java/org/apache/wicket/settings/ISecuritySettingsTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/settings/ISecuritySettingsTest.java @@ -16,6 +16,10 @@ */ package org.apache.wicket.settings; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.MockPageWithLink; import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler; import org.apache.wicket.core.request.handler.PageProvider; @@ -30,20 +34,19 @@ import org.apache.wicket.protocol.https.HttpsMapper; import org.apache.wicket.request.IRequestHandler; import org.apache.wicket.request.flow.RedirectToUrlException; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link SecuritySettings} */ -public class ISecuritySettingsTest extends WicketTestCase +class ISecuritySettingsTest extends WicketTestCase { /** * https://issues.apache.org/jira/browse/WICKET-3849 */ @Test - public void enforceMounts() + void enforceMounts() { MockPageWithLink pageWithLink = new MockPageWithLink(); pageWithLink.add(new Link<Void>(MockPageWithLink.LINK_ID) @@ -53,8 +56,8 @@ public class ISecuritySettingsTest extends WicketTestCase @Override public void onClick() { - throw new RedirectToUrlException("/wicket/bookmarkable/" + - UnknownPage.class.getName()); + throw new RedirectToUrlException( + "/wicket/bookmarkable/" + UnknownPage.class.getName()); } }); @@ -68,32 +71,37 @@ public class ISecuritySettingsTest extends WicketTestCase tester.startPage(pageWithLink); tester.assertRenderedPage(MockPageWithLink.class); tester.clickLink(MockPageWithLink.LINK_ID); - Assert.assertNull(tester.getLastRenderedPage()); + assertNull(tester.getLastRenderedPage()); /* - * Test that mounts are enforced when the root compound mapper does not directly contain the mounted mapper. + * Test that mounts are enforced when the root compound mapper does not directly contain the + * mounted mapper. */ - tester.getApplication().setRootRequestMapper(new HttpsMapper(tester.getApplication().getRootRequestMapper(), new HttpsConfig())); + tester.getApplication().setRootRequestMapper( + new HttpsMapper(tester.getApplication().getRootRequestMapper(), new HttpsConfig())); tester.startPage(pageWithLink); tester.assertRenderedPage(MockPageWithLink.class); tester.clickLink(MockPageWithLink.LINK_ID); - Assert.assertNull(tester.getLastRenderedPage()); + assertNull(tester.getLastRenderedPage()); } /** * https://issues.apache.org/jira/browse/WICKET-5560 */ @Test - public void enforceMountsWithCryptoMapper() + void enforceMountsWithCryptoMapper() { WebApplication app = tester.getApplication(); - IRequestHandler handler = new BookmarkablePageRequestHandler(new PageProvider(UnknownPage.class)); + IRequestHandler handler = new BookmarkablePageRequestHandler( + new PageProvider(UnknownPage.class)); String plainTextNonMountedUrl = tester.urlFor(handler).toString(); - assertTrue("Plain text non mounted url should start with wicket/bookmarkable/: " + plainTextNonMountedUrl, plainTextNonMountedUrl.startsWith("wicket/bookmarkable/")); + assertTrue(plainTextNonMountedUrl.startsWith("wicket/bookmarkable/"), + "Plain text non mounted url should start with wicket/bookmarkable/: " + + plainTextNonMountedUrl); tester.executeUrl(plainTextNonMountedUrl); tester.assertRenderedPage(UnknownPage.class); @@ -107,7 +115,8 @@ public class ISecuritySettingsTest extends WicketTestCase String encryptedNonMountedUrl = tester.urlFor(handler).toString(); - assertFalse("Encrypted URL should not start with wicket/bookmarkable/" + encryptedNonMountedUrl, encryptedNonMountedUrl.startsWith("wicket/bookmarkable/")); + assertFalse(encryptedNonMountedUrl.startsWith("wicket/bookmarkable/"), + "Encrypted URL should not start with wicket/bookmarkable/" + encryptedNonMountedUrl); tester.executeUrl(plainTextNonMountedUrl); assertNull(tester.getLastRenderedPage()); @@ -128,7 +137,7 @@ public class ISecuritySettingsTest extends WicketTestCase tester.executeUrl(encryptedNonMountedUrl); assertNull(tester.getLastRenderedPage()); } - + /** * Dummy page for testing BookmarkableMapper */ http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/settings/def/SetCustomResourceSettingsTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/settings/def/SetCustomResourceSettingsTest.java b/wicket-core/src/test/java/org/apache/wicket/settings/def/SetCustomResourceSettingsTest.java index 91384c7..3f96e31 100644 --- a/wicket-core/src/test/java/org/apache/wicket/settings/def/SetCustomResourceSettingsTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/settings/def/SetCustomResourceSettingsTest.java @@ -16,8 +16,7 @@ */ package org.apache.wicket.settings.def; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -25,20 +24,19 @@ import org.apache.wicket.mock.MockApplication; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.settings.ResourceSettings; import org.apache.wicket.util.tester.WicketTestCase; -import org.apache.wicket.util.time.Duration; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Test for https://issues.apache.org/jira/browse/WICKET-5625 */ -public class SetCustomResourceSettingsTest extends WicketTestCase +class SetCustomResourceSettingsTest extends WicketTestCase { - final String expected = "~!@"; - ResourceSettings resSettings; + private final String expected = "~!@"; + private ResourceSettings resSettings; @Override - @Before + @BeforeEach public void commonBefore() { resSettings = mock(ResourceSettings.class); when(resSettings.getParentFolderPlaceholder()).thenReturn(expected); @@ -47,9 +45,9 @@ public class SetCustomResourceSettingsTest extends WicketTestCase } @Test - public void check() { + void check() { ResourceSettings settings = tester.getApplication().getResourceSettings(); - assertThat(settings.getParentFolderPlaceholder(), is(equalTo(expected))); + assertEquals(expected, settings.getParentFolderPlaceholder()); } @Override http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/stateless/ImageStatelessTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/ImageStatelessTest.java b/wicket-core/src/test/java/org/apache/wicket/stateless/ImageStatelessTest.java index dbc40c1..05558c3 100644 --- a/wicket-core/src/test/java/org/apache/wicket/stateless/ImageStatelessTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/stateless/ImageStatelessTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.stateless; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.MarkupContainer; import org.apache.wicket.markup.IMarkupResourceStreamProvider; import org.apache.wicket.markup.html.WebPage; @@ -25,37 +27,37 @@ import org.apache.wicket.request.resource.PackageResourceReference; 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; /** * @author jcompagner */ -public class ImageStatelessTest extends WicketTestCase +class ImageStatelessTest extends WicketTestCase { /** * */ @Test - public void resourceReference() + void resourceReference() { ImageStatelessPage page = new ImageStatelessPage(); final Image i = new Image("test", new PackageResourceReference("test")); page.add(i); tester.startPage(page); - assertTrue("image with resource reference should be stateless", i.isStateless()); + assertTrue(i.isStateless(), "image with resource reference should be stateless"); } /** * */ @Test - public void resource() + void resource() { ImageStatelessPage page = new ImageStatelessPage(); final Image i = new Image("test", new ByteArrayResource("text/text", new byte[0])); page.add(i); tester.startPage(page); - assertTrue("image with resource should be stateful", !i.isStateless()); + assertTrue(!i.isStateless(), "image with resource should be stateful"); } private static class ImageStatelessPage extends WebPage implements IMarkupResourceStreamProvider http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java index 91d95e8..85f5241 100644 --- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java @@ -16,22 +16,25 @@ */ package org.apache.wicket.stateless; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; + import org.apache.wicket.request.Url; import org.apache.wicket.request.mapper.parameter.INamedParameters; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author jcompagner */ -public class StatelessComponentTest extends WicketTestCase +class StatelessComponentTest extends WicketTestCase { /** * @throws Exception */ @Test - public void statelessComponentPage() throws Exception + void statelessComponentPage() throws Exception { executeTest(StatelessComponentPage.class, "StatelessComponentPage_result.html"); @@ -54,7 +57,7 @@ public class StatelessComponentTest extends WicketTestCase * @throws Exception */ @Test - public void statelessComponentPageWithMount() throws Exception + void statelessComponentPageWithMount() throws Exception { tester.getApplication().mountPage("/stateless", StatelessComponentPage.class); // test is always the home page. it doesn't work then @@ -77,7 +80,7 @@ public class StatelessComponentTest extends WicketTestCase * @throws Exception */ @Test - public void statelessComponentPageWithParams() throws Exception + void statelessComponentPageWithParams() throws Exception { PageParameters params = new PageParameters(); params.set("testParam1", "testValue1", INamedParameters.Type.QUERY_STRING); @@ -105,7 +108,7 @@ public class StatelessComponentTest extends WicketTestCase * @throws Exception */ @Test - public void statelessComponentPageWithParamsWithMount() throws Exception + void statelessComponentPageWithParamsWithMount() throws Exception { PageParameters params = new PageParameters(); params.set("testParam1", "testValue1", INamedParameters.Type.QUERY_STRING); @@ -132,7 +135,7 @@ public class StatelessComponentTest extends WicketTestCase * @throws Exception */ @Test - public void statelessComponentPageWithParamsWithIndexMount() throws Exception + void statelessComponentPageWithParamsWithIndexMount() throws Exception { PageParameters params = new PageParameters(); params.set(0, "testValue1"); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java index f5f5284..7b1549b 100644 --- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java @@ -16,20 +16,22 @@ */ package org.apache.wicket.stateless; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.request.Url; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author svenmeier */ -public class StatelessDynmicLinksTest extends WicketTestCase +class StatelessDynmicLinksTest extends WicketTestCase { /** * WICKET-5460 */ @Test - public void foo() throws Exception + void foo() throws Exception { tester.getApplication().mountPage("/stateless", StatelessPageWithDynamicLinks.class); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java index 1c0389d..77861a5 100644 --- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket.stateless; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.Page; import org.apache.wicket.mock.MockApplication; import org.apache.wicket.protocol.http.WebApplication; @@ -24,13 +27,13 @@ import org.apache.wicket.stateless.pages.HomePage; import org.apache.wicket.stateless.pages.LoginPage; import org.apache.wicket.util.tester.FormTester; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * * @author marrink */ -public class StatelessFormTest extends WicketTestCase +class StatelessFormTest extends WicketTestCase { private final Class<? extends Page> HOME = HomePage.class; private final Class<? extends Page> LOGIN = LoginPage.class; @@ -52,7 +55,7 @@ public class StatelessFormTest extends WicketTestCase * Login through the login page. */ @Test - public void login() + void login() { tester.startPage(LOGIN); tester.assertRenderedPage(LOGIN); @@ -67,7 +70,7 @@ public class StatelessFormTest extends WicketTestCase * test initialization of component on stateless components */ @Test - public void onInitializationForStatelessComponents() + void onInitializationForStatelessComponents() { LoginPage page = new LoginPage(); assertFalse(page.isPageInitialized()); @@ -96,7 +99,7 @@ public class StatelessFormTest extends WicketTestCase * @throws Exception */ @Test - public void pageWithParameters() throws Exception + void pageWithParameters() throws Exception { PageParameters parameters = new PageParameters(); parameters.add("first", "foo"); @@ -109,7 +112,7 @@ public class StatelessFormTest extends WicketTestCase * stateless form */ @Test - public void submitStatelessFormDoesntBindSession() + void submitStatelessFormDoesntBindSession() { StatelessPageWithForm.FORM_SUBMITTED.set(false); try http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessFormUrlTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessFormUrlTest.java b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessFormUrlTest.java index 17b3f8d..5a6aea9 100644 --- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessFormUrlTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessFormUrlTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.stateless; +import static org.junit.jupiter.api.Assertions.assertFalse; + import org.apache.wicket.MarkupContainer; import org.apache.wicket.Page; import org.apache.wicket.markup.IMarkupResourceStreamProvider; @@ -30,12 +32,12 @@ 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; +import org.junit.jupiter.api.Test; /** * @author Pedro Santos */ -public class StatelessFormUrlTest extends WicketTestCase +class StatelessFormUrlTest extends WicketTestCase { @Override protected WebApplication newApplication() @@ -53,7 +55,7 @@ public class StatelessFormUrlTest extends WicketTestCase * Preventing WICKET-3438 */ @Test - public void submitLinkInputNameNotEncodedIntoFormAction() + void submitLinkInputNameNotEncodedIntoFormAction() { tester.executeUrl("?0-1.IFormSubmitListener-form&text=newValue&submitLink=x"); assertFalse(tester.getLastResponseAsString().contains("submitLink=x")); @@ -63,7 +65,7 @@ public class StatelessFormUrlTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-4365 */ @Test - public void formComponentNameNotEncodedIntoFormAction() + void formComponentNameNotEncodedIntoFormAction() { tester.executeUrl("?0-1.IFormSubmitListener-form&text=newValue"); assertFalse(tester.getLastResponseAsString().contains("text=newValue")); @@ -78,7 +80,7 @@ public class StatelessFormUrlTest extends WicketTestCase /** * @param pageParameters */ - public TestPage(PageParameters pageParameters) + public TestPage(PageParameters pageParameters) { super(pageParameters); StatelessForm<Void> form = new StatelessForm<>("form"); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithFeedbackTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithFeedbackTest.java b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithFeedbackTest.java index 14bfc88..40f870b 100644 --- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithFeedbackTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithFeedbackTest.java @@ -16,18 +16,18 @@ */ package org.apache.wicket.stateless; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.Page; import org.apache.wicket.mock.MockApplication; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Simple test using the WicketTester */ -public class StatelessPageWithFeedbackTest extends WicketTestCase +class StatelessPageWithFeedbackTest extends WicketTestCase { @Override protected WebApplication newApplication() @@ -46,13 +46,13 @@ public class StatelessPageWithFeedbackTest extends WicketTestCase * After submit, both feedbackmessages (from onInitialize and onSubmit) must be visible */ @Test - public void wicket6529() + void wicket6529() { tester.startPage(StatelessPageWithFeedback.class); tester.assertFeedback("feedback", "error in onInitialize"); tester.clickLink("form:submit"); String response = tester.getLastResponseAsString(); - Assert.assertTrue("onInitialize", response.contains("error in onInitialize")); - Assert.assertTrue("onSubmit", response.contains("error in onSubmit")); + assertTrue(response.contains("error in onInitialize"), "onInitialize"); + assertTrue(response.contains("error in onSubmit"), "onSubmit"); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java b/wicket-core/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java index f376161..f1614d4 100644 --- a/wicket-core/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket.stateless; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.Page; import org.apache.wicket.Session; import org.apache.wicket.mock.MockApplication; @@ -24,7 +27,7 @@ import org.apache.wicket.stateless.pages.HomePage; import org.apache.wicket.stateless.pages.LoginPage; import org.apache.wicket.util.tester.FormTester; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * A test to detect temporary sessions. However since the http stack has been mocked for this test, @@ -33,7 +36,7 @@ import org.junit.Test; * * @author marrink */ -public class TemporarySessionTest extends WicketTestCase +class TemporarySessionTest extends WicketTestCase { @Override protected WebApplication newApplication() @@ -53,7 +56,7 @@ public class TemporarySessionTest extends WicketTestCase * Test if we can keep a session temporary. */ @Test - public void sessionIsTemporary() + void sessionIsTemporary() { tester.startPage(LoginPage.class); assertTrue(tester.getSession().isTemporary()); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/stateless/pages/RefreshStatelessPageTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/pages/RefreshStatelessPageTest.java b/wicket-core/src/test/java/org/apache/wicket/stateless/pages/RefreshStatelessPageTest.java index 2626370..48fa5e8 100644 --- a/wicket-core/src/test/java/org/apache/wicket/stateless/pages/RefreshStatelessPageTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/stateless/pages/RefreshStatelessPageTest.java @@ -24,19 +24,19 @@ 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; +import org.junit.jupiter.api.Test; /** * https://issues.apache.org/jira/browse/WICKET-3965 */ -public class RefreshStatelessPageTest extends WicketTestCase +class RefreshStatelessPageTest extends WicketTestCase { /** * https://issues.apache.org/jira/browse/WICKET-3965 */ @Test - public void refreshStatelessPage() + void refreshStatelessPage() { tester.startPage(new StatefulPage()); tester.clickLink("link", false); @@ -73,7 +73,7 @@ public class RefreshStatelessPageTest extends WicketTestCase private static class StatelessPage extends WebPage implements IMarkupResourceStreamProvider { - public StatelessPage() + StatelessPage() { setStatelessHint(true); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/stateless/pages/StatelessFormTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/pages/StatelessFormTest.java b/wicket-core/src/test/java/org/apache/wicket/stateless/pages/StatelessFormTest.java index 0b384da..41ea6d1 100644 --- a/wicket-core/src/test/java/org/apache/wicket/stateless/pages/StatelessFormTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/stateless/pages/StatelessFormTest.java @@ -21,13 +21,13 @@ import org.apache.wicket.mock.MockApplication; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.request.Url; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * User: Anatoly Kupriyanov ([email protected]) Date: 12-Feb-2009 Time: 22:27:08 Bugfix for * http://issues.apache.org/jira/browse/WICKET-1897 */ -public class StatelessFormTest extends WicketTestCase +class StatelessFormTest extends WicketTestCase { @Override protected WebApplication newApplication() @@ -55,7 +55,7 @@ public class StatelessFormTest extends WicketTestCase * testBug() */ @Test - public void bug() + void bug() { { tester.getRequest().setUrl(Url.parse("page2")); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/stateless/pages/UsernamePasswordSignInPanel.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/pages/UsernamePasswordSignInPanel.java b/wicket-core/src/test/java/org/apache/wicket/stateless/pages/UsernamePasswordSignInPanel.java index 2e73b39..c082e9d 100644 --- a/wicket-core/src/test/java/org/apache/wicket/stateless/pages/UsernamePasswordSignInPanel.java +++ b/wicket-core/src/test/java/org/apache/wicket/stateless/pages/UsernamePasswordSignInPanel.java @@ -60,7 +60,7 @@ public class UsernamePasswordSignInPanel extends Panel * @param password * @return whether signin is successful */ - public boolean signIn(String username, String password) + private boolean signIn(String username, String password) { return username.equals(password); } @@ -85,7 +85,7 @@ public class UsernamePasswordSignInPanel extends Panel * id of the form component * @param panel */ - public SignInForm(final String id, UsernamePasswordSignInPanel panel) + SignInForm(final String id, UsernamePasswordSignInPanel panel) { super(id, new CompoundPropertyModel<IValueMap>(new ValueMap())); this.panel = panel;
