http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/AttributeModifierTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/AttributeModifierTest.java b/wicket-core/src/test/java/org/apache/wicket/AttributeModifierTest.java index c0b5f3e..a01ff29 100644 --- a/wicket-core/src/test/java/org/apache/wicket/AttributeModifierTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/AttributeModifierTest.java @@ -16,8 +16,13 @@ */ package org.apache.wicket; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.sameInstance; +import static org.assertj.core.api.Assertions.assertThat; +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.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Map; @@ -26,8 +31,7 @@ import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.parser.XmlTag; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test case for the component tag attribute modifer test. @@ -35,22 +39,24 @@ import org.junit.Test; * @author Chris Turner * @author Eelco Hillenius */ -public class AttributeModifierTest extends Assert +class AttributeModifierTest { /** * Test constructors. */ - @Test(expected = IllegalArgumentException.class) - public void nullAttributeFailsConstruction() + @Test + void nullAttributeFailsConstruction() { - new AttributeModifier(null, new Model<>("model")); + assertThrows(IllegalArgumentException.class, () -> { + new AttributeModifier(null, new Model<>("model")); + }); } /** * Test constructors. */ @Test - public void nullValueDoesntFailConstruction() + void nullValueDoesntFailConstruction() { new AttributeModifier("test", null); } @@ -59,7 +65,7 @@ public class AttributeModifierTest extends Assert * Test that a null model does not throw null pointers. */ @Test - public void nullModelDoesNotThrowNullPointerExceptions() + void nullModelDoesNotThrowNullPointerExceptions() { AttributeModifier modifier = new AttributeModifier("test", null); XmlTag xmlTag = new XmlTag(); @@ -75,7 +81,7 @@ public class AttributeModifierTest extends Assert * Test overriding newValue (and using a null model). */ @Test - public void testNewValue() + void testNewValue() { AttributeModifier modifier = new AttributeModifier("test", null) { @@ -103,7 +109,7 @@ public class AttributeModifierTest extends Assert * Test simple model replacement. */ @Test - public void testModelReplacement() + void testModelReplacement() { AttributeModifier modifier = new AttributeModifier("test", Model.of("Ellioth Smith Rocks")); XmlTag xmlTag = new XmlTag(); @@ -122,7 +128,7 @@ public class AttributeModifierTest extends Assert * Test that the current attribute is overwritten by the one that the model provides. */ @Test - public void testModelReplacementOverwritingExistingAttributeValue() + void testModelReplacementOverwritingExistingAttributeValue() { AttributeModifier modifier = new AttributeModifier("test", Model.of("Ellioth Smith Rocks")); XmlTag xmlTag = new XmlTag(); @@ -141,7 +147,7 @@ public class AttributeModifierTest extends Assert * Test that that the attribute modifier does nothing with not enabled. */ @Test - public void testNoNewValueWhenNotEnabled() + void testNoNewValueWhenNotEnabled() { AttributeModifier modifier = new AttributeModifier("test", Model.of("Ellioth Smith Rocks")) { @@ -168,7 +174,7 @@ public class AttributeModifierTest extends Assert * Test using newValue for appending to the model value. */ @Test - public void testNewValueForModelValue() + void testNewValueForModelValue() { AttributeModifier modifier = new AttributeModifier("test", Model.of("happy")) { @@ -196,7 +202,7 @@ public class AttributeModifierTest extends Assert * Test using newValue for appending to the current attribute value. */ @Test - public void testNewValueForAttributeValue() + void testNewValueForAttributeValue() { AttributeModifier modifier = new AttributeModifier("test", null) { @@ -224,7 +230,7 @@ public class AttributeModifierTest extends Assert * Test */ @Test - public void testNewValue1Append() + void testNewValue1Append() { AttributeModifier appender = AttributeModifier.append("attr", null); assertEquals("oldvalue newvalue", appender.newValue("oldvalue", "newvalue")); @@ -239,7 +245,7 @@ public class AttributeModifierTest extends Assert * Test */ @Test - public void testNewValue1Prepend() + void testNewValue1Prepend() { AttributeModifier prepender = AttributeModifier.prepend("attr", null); assertEquals("newvalue oldvalue", prepender.newValue("oldvalue", "newvalue")); @@ -254,7 +260,7 @@ public class AttributeModifierTest extends Assert * Test */ @Test - public void testNewValue2Append() + void testNewValue2Append() { AttributeModifier appender = AttributeModifier.append("attr", null).setSeparator(";"); assertEquals("oldvalue;newvalue", appender.newValue("oldvalue", "newvalue")); @@ -269,7 +275,7 @@ public class AttributeModifierTest extends Assert * Test */ @Test - public void testNewValue2Prepend() + void testNewValue2Prepend() { AttributeModifier appender = AttributeModifier.prepend("attr", null).setSeparator(";"); assertEquals("newvalue;oldvalue", appender.newValue("oldvalue", "newvalue")); @@ -285,7 +291,7 @@ public class AttributeModifierTest extends Assert * https://issues.apache.org/jira/browse/WICKET-3884 */ @Test - public void nullModelDoesNotAppendEmptyAttribute() + void nullModelDoesNotAppendEmptyAttribute() { AttributeModifier appender = AttributeModifier.append("class", null); XmlTag xmlTag = new XmlTag(); @@ -301,7 +307,7 @@ public class AttributeModifierTest extends Assert * https://issues.apache.org/jira/browse/WICKET-3934 */ @Test - public void removeAttribute() + void removeAttribute() { AttributeModifier appender = AttributeModifier.remove("class"); XmlTag xmlTag = new XmlTag(); @@ -319,7 +325,7 @@ public class AttributeModifierTest extends Assert * https://issues.apache.org/jira/browse/WICKET-3934 */ @Test - public void appendSpecialAttribute() + void appendSpecialAttribute() { String attrName = "attrName"; AttributeModifier appender = AttributeModifier.append(attrName, "VA_REMOVE"); @@ -336,12 +342,12 @@ public class AttributeModifierTest extends Assert * https://issues.apache.org/jira/browse/WICKET-6279 */ @Test - public void deserializeAdd() + void deserializeAdd() { AttributeModifier appender = AttributeModifier.append("class", AttributeModifier.VALUELESS_ATTRIBUTE_ADD); final AttributeModifier copy = WicketObjects.cloneObject(appender); final IModel<?> replaceModel = copy.getReplaceModel(); - assertThat(replaceModel.getObject(), is(sameInstance(AttributeModifier.VALUELESS_ATTRIBUTE_ADD))); + assertThat(replaceModel.getObject()).isEqualToComparingFieldByField(AttributeModifier.VALUELESS_ATTRIBUTE_ADD); } @@ -349,11 +355,11 @@ public class AttributeModifierTest extends Assert * https://issues.apache.org/jira/browse/WICKET-6279 */ @Test - public void deserializeRemove() + void deserializeRemove() { AttributeModifier appender = AttributeModifier.append("class", AttributeModifier.VALUELESS_ATTRIBUTE_REMOVE); final AttributeModifier copy = WicketObjects.cloneObject(appender); final IModel<?> replaceModel = copy.getReplaceModel(); - assertThat(replaceModel.getObject(), is(sameInstance(AttributeModifier.VALUELESS_ATTRIBUTE_REMOVE))); + assertThat(replaceModel.getObject()).isEqualToComparingFieldByField(AttributeModifier.VALUELESS_ATTRIBUTE_REMOVE); } }
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/AuthorizationTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/AuthorizationTest.java b/wicket-core/src/test/java/org/apache/wicket/AuthorizationTest.java index e5579d2..d3550ef 100644 --- a/wicket-core/src/test/java/org/apache/wicket/AuthorizationTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/AuthorizationTest.java @@ -16,6 +16,11 @@ */ package org.apache.wicket; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + import java.io.Serializable; import org.apache.wicket.authorization.Action; @@ -29,8 +34,7 @@ import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.request.component.IRequestableComponent; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; - +import org.junit.jupiter.api.Test; /** * Authorization tests. @@ -45,7 +49,7 @@ public class AuthorizationTest extends WicketTestCase * @throws Exception */ @Test - public void createAllowedComponent() throws Exception + void createAllowedComponent() throws Exception { new WebComponent("component"); } @@ -56,7 +60,7 @@ public class AuthorizationTest extends WicketTestCase * @throws Exception */ @Test - public void testCreateDisallowedComponent() throws Exception + void testCreateDisallowedComponent() throws Exception { tester.getApplication() .getSecuritySettings() @@ -87,7 +91,7 @@ public class AuthorizationTest extends WicketTestCase * @throws Exception */ @Test - public void testRenderAllowedComponent() throws Exception + void testRenderAllowedComponent() throws Exception { tester.getApplication() .getSecuritySettings() @@ -104,7 +108,7 @@ public class AuthorizationTest extends WicketTestCase * @throws Exception */ @Test - public void testRenderDisallowedComponent() throws Exception + void testRenderDisallowedComponent() throws Exception { tester.getApplication() .getSecuritySettings() @@ -135,7 +139,7 @@ public class AuthorizationTest extends WicketTestCase * @throws Exception */ @Test - public void testEnabledAllowedComponent() throws Exception + void testEnabledAllowedComponent() throws Exception { tester.getApplication() .getSecuritySettings() @@ -159,7 +163,7 @@ public class AuthorizationTest extends WicketTestCase * @throws Exception */ @Test - public void testEnabledDisallowedComponent() throws Exception + void testEnabledDisallowedComponent() throws Exception { tester.getApplication() .getSecuritySettings() @@ -221,7 +225,7 @@ public class AuthorizationTest extends WicketTestCase * * @return the test model */ - public Input getTestModel() + Input getTestModel() { return input; } @@ -231,7 +235,7 @@ public class AuthorizationTest extends WicketTestCase * * @return whether the form was submitted */ - public boolean isSubmitted() + boolean isSubmitted() { return submitted; } @@ -246,7 +250,7 @@ public class AuthorizationTest extends WicketTestCase * * @param id */ - public TestForm(String id) + TestForm(String id) { super(id); setDefaultModel(new CompoundPropertyModel<Input>(input = new Input())); @@ -276,7 +280,7 @@ public class AuthorizationTest extends WicketTestCase * * @return stringInput */ - public String getStringInput() + String getStringInput() { return stringInput; } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/BehaviorRequestTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/BehaviorRequestTest.java b/wicket-core/src/test/java/org/apache/wicket/BehaviorRequestTest.java index 1e5227c..0bed9ec 100644 --- a/wicket-core/src/test/java/org/apache/wicket/BehaviorRequestTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/BehaviorRequestTest.java @@ -16,10 +16,14 @@ */ package org.apache.wicket; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + import org.apache.wicket.behavior.Behavior; import org.apache.wicket.core.request.handler.IPageAndComponentProvider; -import org.apache.wicket.core.request.handler.ListenerRequestHandler; import org.apache.wicket.core.request.handler.ListenerInvocationNotAllowedException; +import org.apache.wicket.core.request.handler.ListenerRequestHandler; import org.apache.wicket.core.request.handler.PageAndComponentProvider; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.IMarkupResourceStreamProvider; @@ -30,22 +34,21 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Before; -import org.junit.Test; - +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * See issue <a href="https://issues.apache.org/jira/browse/WICKET-3098";>WICKET-3098</a> */ -public class BehaviorRequestTest extends WicketTestCase +class BehaviorRequestTest extends WicketTestCase { private TestPage page; /** * */ - @Before - public void before() + @BeforeEach + void before() { page = new TestPage(); tester.startPage(page); @@ -55,7 +58,7 @@ public class BehaviorRequestTest extends WicketTestCase * */ @Test - public void enabledBehaviorRequest() + void enabledBehaviorRequest() { tester.executeUrl(urlForBehavior(page.enabledBehavior)); assertTrue(page.enabledBehavior.wasCalled()); @@ -65,7 +68,7 @@ public class BehaviorRequestTest extends WicketTestCase * */ @Test - public void disabledBehaviorRequest() + void disabledBehaviorRequest() { try { @@ -101,7 +104,7 @@ public class BehaviorRequestTest extends WicketTestCase /** * Construct. */ - public TestPage() + TestPage() { enabledBehavior = new TestCallbackBehavior(); enabledBehavior.setEnabled(true); @@ -143,7 +146,7 @@ public class BehaviorRequestTest extends WicketTestCase called = true; } - public void setEnabled(boolean enabled) + void setEnabled(boolean enabled) { this.enabled = enabled; } @@ -154,7 +157,7 @@ public class BehaviorRequestTest extends WicketTestCase return component.isEnabledInHierarchy() && enabled; } - public boolean wasCalled() + boolean wasCalled() { return called; } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java b/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java index 0e57f3c..0c4f1fc 100644 --- a/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.ajax.AjaxEventBehavior; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.behavior.Behavior; @@ -30,18 +33,17 @@ import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.string.StringValue; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; - +import org.junit.jupiter.api.Test; /** */ -public class BehaviorUrlTest extends WicketTestCase +class BehaviorUrlTest extends WicketTestCase { /** * https://issues.apache.org/jira/browse/WICKET-3097 */ @Test - public void urlRemainsStable() + void urlRemainsStable() { TestPage page = new TestPage(); @@ -52,8 +54,7 @@ public class BehaviorUrlTest extends WicketTestCase page = (TestPage)tester.getLastRenderedPage(); int indexAfterRender = page.container.getBehaviorId(page.callbackBehavior); - assertEquals("index of behavior in the raw list should not have changed", - indexBeforeRender, indexAfterRender); + assertEquals(indexBeforeRender, indexAfterRender, "index of behavior in the raw list should not have changed"); } @@ -63,7 +64,7 @@ public class BehaviorUrlTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-3142 */ @Test - public void urlRemainsStableAfterComponentReceiveAnModel() + void urlRemainsStableAfterComponentReceiveAnModel() { TestPage page = new TestPage(); @@ -73,8 +74,7 @@ public class BehaviorUrlTest extends WicketTestCase int indexAfterRender = page.container.getBehaviorId(page.callbackBehavior); - assertEquals("index of behavior in the raw list should not have changed", - indexBeforeRender, indexAfterRender); + assertEquals(indexBeforeRender, indexAfterRender, "index of behavior in the raw list should not have changed"); } @@ -90,7 +90,7 @@ public class BehaviorUrlTest extends WicketTestCase /** * Construct. */ - public TestPage() + TestPage() { callbackBehavior = new TestCallbackBehavior(); @@ -144,7 +144,7 @@ public class BehaviorUrlTest extends WicketTestCase @Test - public void testBehaviorUrlNotDoubleEscaped() + void testBehaviorUrlNotDoubleEscaped() { tester.startPage(EscapeTestPage.class); @@ -164,7 +164,7 @@ public class BehaviorUrlTest extends WicketTestCase { private static final long serialVersionUID = 1L; /** */ - public static final String TEST_QUERY_STRING = "&query_p_1=value_1"; + static final String TEST_QUERY_STRING = "&query_p_1=value_1"; /** */ public EscapeTestPage() http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/CachingDisabledLocalizerTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/CachingDisabledLocalizerTest.java b/wicket-core/src/test/java/org/apache/wicket/CachingDisabledLocalizerTest.java index 4061fe1..daf806b 100644 --- a/wicket-core/src/test/java/org/apache/wicket/CachingDisabledLocalizerTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/CachingDisabledLocalizerTest.java @@ -16,7 +16,7 @@ */ package org.apache.wicket; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; /** @@ -31,8 +31,8 @@ public class CachingDisabledLocalizerTest extends LocalizerTest * @throws Exception */ @Override - @Before - public void setUp() throws Exception + @BeforeEach + void setUp() throws Exception { super.setUp(); localizer.setEnableCache(false); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ClassAttributeModifierTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ClassAttributeModifierTest.java b/wicket-core/src/test/java/org/apache/wicket/ClassAttributeModifierTest.java index 7cde80c..419ca85 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ClassAttributeModifierTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ClassAttributeModifierTest.java @@ -16,24 +16,26 @@ */ package org.apache.wicket; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + import java.util.Map; import java.util.Set; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.parser.XmlTag; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for ClassAttributeModifier */ -public class ClassAttributeModifierTest extends Assert +class ClassAttributeModifierTest { /** * Adds two values */ @Test - public void addCssClasses() + void addCssClasses() { ClassAttributeModifier cam = new ClassAttributeModifier() { @@ -59,7 +61,7 @@ public class ClassAttributeModifierTest extends Assert * Adds 'three' and removes 'two' */ @Test - public void addRemoveCssClasses() + void addRemoveCssClasses() { ClassAttributeModifier cam = new ClassAttributeModifier() { @@ -87,7 +89,7 @@ public class ClassAttributeModifierTest extends Assert * Removes all CSS class values */ @Test - public void removeAllCssClasses() + void removeAllCssClasses() { ClassAttributeModifier cam = new ClassAttributeModifier() { http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ComponentBehaviorOverComponentTagBehaviorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ComponentBehaviorOverComponentTagBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/ComponentBehaviorOverComponentTagBehaviorTest.java index 2148583..e3484df 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ComponentBehaviorOverComponentTagBehaviorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ComponentBehaviorOverComponentTagBehaviorTest.java @@ -25,7 +25,7 @@ import org.apache.wicket.resource.loader.IStringResourceLoader; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that behaviors added to a Component has precedence @@ -35,7 +35,7 @@ import org.junit.Test; * * @since 1.5.5 */ -public class ComponentBehaviorOverComponentTagBehaviorTest extends WicketTestCase +class ComponentBehaviorOverComponentTagBehaviorTest extends WicketTestCase { /** * Verifies that the Label's title attribute comes from the @@ -43,7 +43,7 @@ public class ComponentBehaviorOverComponentTagBehaviorTest extends WicketTestCas * WicketMessageTagHandler) */ @Test - public void runtimeBehaviorOverMarkupBehavior() + void runtimeBehaviorOverMarkupBehavior() { tester.getApplication().getResourceSettings().getStringResourceLoaders().add(new TestStringResourceLoader()); WicketMessage page = new WicketMessage(); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ComponentConfigurationTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ComponentConfigurationTest.java b/wicket-core/src/test/java/org/apache/wicket/ComponentConfigurationTest.java index 92a3534..68063a2 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ComponentConfigurationTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ComponentConfigurationTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; + import org.apache.wicket.markup.IMarkupResourceStreamProvider; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.WebPage; @@ -23,20 +26,20 @@ 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; /** * Tests {@link Component#onInitialize()} contract * * @author igor */ -public class ComponentConfigurationTest extends WicketTestCase +class ComponentConfigurationTest extends WicketTestCase { /** * testOnlyOncePerRequest() */ @Test - public void onlyOncePerRequest() + void onlyOncePerRequest() { TestComponent t1 = new TestComponent("t1"); assertEquals(0, t1.getTotalCount()); @@ -59,7 +62,7 @@ public class ComponentConfigurationTest extends WicketTestCase * testConfiguration() */ @Test - public void configuration() + void configuration() { tester.startPage(TestPage.class); TestPage page = (TestPage)tester.getLastRenderedPage(); @@ -144,7 +147,7 @@ public class ComponentConfigurationTest extends WicketTestCase private int totalCount = 0; private int beforeRenderCount = 0; - public TestComponent(String id) + TestComponent(String id) { super(id); } @@ -165,18 +168,18 @@ public class ComponentConfigurationTest extends WicketTestCase super.onBeforeRender(); } - public int getBeforeRenderCount() + int getBeforeRenderCount() { return beforeRenderCount; } - public int getRequestCount() + int getRequestCount() { return requestCount; } - public int getTotalCount() + int getTotalCount() { return totalCount; } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ComponentEventsTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ComponentEventsTest.java b/wicket-core/src/test/java/org/apache/wicket/ComponentEventsTest.java index 71dea8d..403f59b 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ComponentEventsTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ComponentEventsTest.java @@ -16,7 +16,7 @@ */ package org.apache.wicket; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; import java.util.Arrays; @@ -35,10 +35,9 @@ import org.apache.wicket.request.Response; import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.cycle.RequestCycleContext; import org.apache.wicket.util.tester.WicketTester; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** @@ -65,8 +64,8 @@ public class ComponentEventsTest private Object stop; /** */ - @Before - public void setup() + @BeforeEach + void setup() { tester = new WicketTester(new TestApplication()); @@ -96,15 +95,15 @@ public class ComponentEventsTest } /** */ - @After - public void destroy() + @AfterEach + void destroy() { tester.destroy(); } /** */ @Test - public void testBreadth_Application() + void testBreadth_Application() { page.send(tester.getApplication(), Broadcast.BREADTH, new Payload()); assertPath(application, session, cycle, page, c1, c12, c13, c134, c135, c6); @@ -112,7 +111,7 @@ public class ComponentEventsTest /** */ @Test - public void testBreadth_Session() + void testBreadth_Session() { page.send(tester.getSession(), Broadcast.BREADTH, new Payload()); assertPath(session, cycle, page, c1, c12, c13, c134, c135, c6); @@ -120,7 +119,7 @@ public class ComponentEventsTest /** */ @Test - public void testBreadth_Cycle() + void testBreadth_Cycle() { page.send(tester.getRequestCycle(), Broadcast.BREADTH, new Payload()); assertPath(cycle, page, c1, c12, c13, c134, c135, c6); @@ -128,7 +127,7 @@ public class ComponentEventsTest /** */ @Test - public void testBreadth_Page() + void testBreadth_Page() { page.send(page, Broadcast.BREADTH, new Payload()); assertPath(page, c1, c12, c13, c134, c135, c6); @@ -136,7 +135,7 @@ public class ComponentEventsTest /** */ @Test - public void testBreadth_Container() + void testBreadth_Container() { page.send(c13, Broadcast.BREADTH, new Payload()); assertPath(c13, c134, c135); @@ -144,7 +143,7 @@ public class ComponentEventsTest /** */ @Test - public void testBreadth_Component() + void testBreadth_Component() { page.send(c6, Broadcast.BREADTH, new Payload()); assertPath(c6); @@ -153,7 +152,7 @@ public class ComponentEventsTest /** */ @Test - public void testBreadth_Application_Stop() + void testBreadth_Application_Stop() { stop = application; page.send(application, Broadcast.BREADTH, new Payload()); @@ -162,7 +161,7 @@ public class ComponentEventsTest /** */ @Test - public void testBreadth_Session_Stop() + void testBreadth_Session_Stop() { stop = session; page.send(application, Broadcast.BREADTH, new Payload()); @@ -171,7 +170,7 @@ public class ComponentEventsTest /** */ @Test - public void testBreadth_Cycle_Stop() + void testBreadth_Cycle_Stop() { stop = cycle; page.send(application, Broadcast.BREADTH, new Payload()); @@ -180,7 +179,7 @@ public class ComponentEventsTest /** */ @Test - public void testBreadth_Page_Stop() + void testBreadth_Page_Stop() { stop = page; page.send(application, Broadcast.BREADTH, new Payload()); @@ -189,7 +188,7 @@ public class ComponentEventsTest /** */ @Test - public void testBreadth_Component_Stop() + void testBreadth_Component_Stop() { stop = c13; page.send(application, Broadcast.BREADTH, new Payload()); @@ -199,7 +198,7 @@ public class ComponentEventsTest /** */ @Test - public void testDepth_Application() + void testDepth_Application() { page.send(application, Broadcast.DEPTH, new Payload()); assertPath(c12, c134, c135, c13, c1, c6, page, cycle, session, application); @@ -207,7 +206,7 @@ public class ComponentEventsTest /** */ @Test - public void testDepth_Session() + void testDepth_Session() { page.send(session, Broadcast.DEPTH, new Payload()); assertPath(c12, c134, c135, c13, c1, c6, page, cycle, session); @@ -215,7 +214,7 @@ public class ComponentEventsTest /** */ @Test - public void testDepth_Cycle() + void testDepth_Cycle() { page.send(cycle, Broadcast.DEPTH, new Payload()); assertPath(c12, c134, c135, c13, c1, c6, page, cycle); @@ -223,7 +222,7 @@ public class ComponentEventsTest /** */ @Test - public void testDepth_Page() + void testDepth_Page() { page.send(page, Broadcast.DEPTH, new Payload()); assertPath(c12, c134, c135, c13, c1, c6, page); @@ -231,7 +230,7 @@ public class ComponentEventsTest /** */ @Test - public void testDepth_Container() + void testDepth_Container() { page.send(c1, Broadcast.DEPTH, new Payload()); assertPath(c12, c134, c135, c13, c1); @@ -239,7 +238,7 @@ public class ComponentEventsTest /** */ @Test - public void testDepth_Component() + void testDepth_Component() { page.send(c6, Broadcast.DEPTH, new Payload()); assertPath(c6); @@ -248,7 +247,7 @@ public class ComponentEventsTest /** */ @Test - public void testDepth_Session_Stop() + void testDepth_Session_Stop() { stop = session; page.send(application, Broadcast.DEPTH, new Payload()); @@ -257,7 +256,7 @@ public class ComponentEventsTest /** */ @Test - public void testDepth_Cycle_Stop() + void testDepth_Cycle_Stop() { stop = cycle; page.send(application, Broadcast.DEPTH, new Payload()); @@ -266,7 +265,7 @@ public class ComponentEventsTest /** */ @Test - public void testDepth_Page_Stop() + void testDepth_Page_Stop() { stop = page; page.send(application, Broadcast.DEPTH, new Payload()); @@ -275,7 +274,7 @@ public class ComponentEventsTest /** */ @Test - public void testDepth_Component_Stop() + void testDepth_Component_Stop() { stop = c1; page.send(application, Broadcast.DEPTH, new Payload()); @@ -287,7 +286,7 @@ public class ComponentEventsTest * */ @Test - public void testBubble_Component() + void testBubble_Component() { c6.send(c135, Broadcast.BUBBLE, new Payload()); assertPath(c135, c13, c1, page, cycle, session, application); @@ -295,7 +294,7 @@ public class ComponentEventsTest /** */ @Test - public void testBubble_Page() + void testBubble_Page() { c6.send(page, Broadcast.BUBBLE, new Payload()); assertPath(page, cycle, session, application); @@ -303,7 +302,7 @@ public class ComponentEventsTest /** */ @Test - public void testBubble_Cycle() + void testBubble_Cycle() { c6.send(cycle, Broadcast.BUBBLE, new Payload()); assertPath(cycle, session, application); @@ -311,7 +310,7 @@ public class ComponentEventsTest /** */ @Test - public void testBubble_Session() + void testBubble_Session() { c6.send(session, Broadcast.BUBBLE, new Payload()); assertPath(session, application); @@ -320,7 +319,7 @@ public class ComponentEventsTest /** */ @Test - public void testBubble_Application() + void testBubble_Application() { c6.send(application, Broadcast.BUBBLE, new Payload()); assertPath(application); @@ -328,7 +327,7 @@ public class ComponentEventsTest /** */ @Test - public void testBubble_Component_Stop() + void testBubble_Component_Stop() { stop = c1; c6.send(c135, Broadcast.BUBBLE, new Payload()); @@ -337,7 +336,7 @@ public class ComponentEventsTest /** */ @Test - public void testBubble_Component_Page() + void testBubble_Component_Page() { stop = page; c6.send(c135, Broadcast.BUBBLE, new Payload()); @@ -346,7 +345,7 @@ public class ComponentEventsTest /** */ @Test - public void testBubble_Cycle_Stop() + void testBubble_Cycle_Stop() { stop = cycle; c6.send(c135, Broadcast.BUBBLE, new Payload()); @@ -355,7 +354,7 @@ public class ComponentEventsTest /** */ @Test - public void testBubble_Session_Stop() + void testBubble_Session_Stop() { stop = session; c6.send(c135, Broadcast.BUBBLE, new Payload()); @@ -363,7 +362,7 @@ public class ComponentEventsTest } @Test - public void testBehaviorBreadth() + void testBehaviorBreadth() { TestComponent c = new TestComponent("c"); TestBehavior b1 = new TestBehavior(); @@ -381,7 +380,7 @@ public class ComponentEventsTest } @Test - public void testBehaviorExact() + void testBehaviorExact() { TestComponent c = new TestComponent("c"); TestBehavior b1 = new TestBehavior(); @@ -399,7 +398,7 @@ public class ComponentEventsTest } @Test - public void testPageExact() + void testPageExact() { TestComponent c = new TestComponent("c"); TestBehavior b1 = new TestBehavior(); @@ -420,7 +419,7 @@ public class ComponentEventsTest } @Test - public void testApplicationExact() + void testApplicationExact() { TestComponent c = new TestComponent("c"); TestBehavior b1 = new TestBehavior(); @@ -438,7 +437,7 @@ public class ComponentEventsTest } @Test - public void testSessionExact() + void testSessionExact() { TestComponent c = new TestComponent("c"); TestBehavior b1 = new TestBehavior(); @@ -456,7 +455,7 @@ public class ComponentEventsTest } @Test - public void testRequestCycleExact() + void testRequestCycleExact() { TestComponent c = new TestComponent("c"); TestBehavior b1 = new TestBehavior(); @@ -474,7 +473,7 @@ public class ComponentEventsTest } @Test - public void testBehavior_stop() + void testBehavior_stop() { TestComponent c = new TestComponent("c"); TestBehavior b1 = new TestBehavior() @@ -502,7 +501,7 @@ public class ComponentEventsTest for (int i = 0; i < testables.length; i++) { - Assert.assertEquals("checking path element " + i, i, testables[i].getSequence()); + assertEquals(i, testables[i].getSequence(), "checking path element " + i); remaining.remove(testables[i]); } @@ -513,8 +512,8 @@ public class ComponentEventsTest { name += "#" + ((Component)testable).getId(); } - Assert.assertEquals(name + " should not have been visited, but was.", -1, - testable.getSequence()); + assertEquals(-1, testable.getSequence(), + name + " should not have been visited, but was."); } } @@ -523,6 +522,15 @@ public class ComponentEventsTest int getSequence(); } + private static class Payload + { + private int counter; + + int next() + { + return counter++; + } + } private class TestApplication extends MockApplication implements Testable { @@ -566,7 +574,7 @@ public class ComponentEventsTest int sequence = -1; - public TestSession(Request request) + TestSession(Request request) { super(request); } @@ -595,7 +603,7 @@ public class ComponentEventsTest { int sequence = -1; - public TestRequestCycle(RequestCycleContext context) + TestRequestCycle(RequestCycleContext context) { super(context); } @@ -620,14 +628,13 @@ public class ComponentEventsTest } } - private class TestPage extends WebPage implements Testable { private static final long serialVersionUID = 1L; int sequence = -1; - public TestPage() + TestPage() { } @@ -653,14 +660,13 @@ public class ComponentEventsTest } - private class TestContainer extends WebMarkupContainer implements Testable { private static final long serialVersionUID = 1L; int sequence = -1; - public TestContainer(String id) + TestContainer(String id) { super(id); } @@ -692,7 +698,7 @@ public class ComponentEventsTest int sequence = -1; - public TestComponent(String id) + TestComponent(String id) { super(id); } @@ -718,7 +724,6 @@ public class ComponentEventsTest } } - private class TestBehavior extends Behavior implements Testable { private static final long serialVersionUID = 1L; @@ -748,15 +753,4 @@ public class ComponentEventsTest } } - - private static class Payload - { - private int counter; - - public int next() - { - return counter++; - } - } - } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ComponentInitializationIntegrationTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ComponentInitializationIntegrationTest.java b/wicket-core/src/test/java/org/apache/wicket/ComponentInitializationIntegrationTest.java index 84cbe70..22a8ddf 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ComponentInitializationIntegrationTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ComponentInitializationIntegrationTest.java @@ -16,23 +16,25 @@ */ package org.apache.wicket; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.wicket.markup.IMarkupResourceStreamProvider; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** */ -public class ComponentInitializationIntegrationTest extends WicketTestCase +class ComponentInitializationIntegrationTest extends WicketTestCase { /** * initialization() */ @Test - public void initialization() + void initialization() { TestPage page = new TestPage(); TestComponent t1 = new TestComponent("t1"); @@ -66,7 +68,7 @@ public class ComponentInitializationIntegrationTest extends WicketTestCase count++; } - public int getCount() + int getCount() { return count; } @@ -79,7 +81,7 @@ public class ComponentInitializationIntegrationTest extends WicketTestCase private int count = 0; - public TestComponent(String id) + TestComponent(String id) { super(id); } @@ -91,7 +93,7 @@ public class ComponentInitializationIntegrationTest extends WicketTestCase count++; } - public int getCount() + int getCount() { return count; } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ComponentInitializationTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ComponentInitializationTest.java b/wicket-core/src/test/java/org/apache/wicket/ComponentInitializationTest.java index eb61819..e90b297 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ComponentInitializationTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ComponentInitializationTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.ArrayList; import java.util.List; @@ -27,20 +30,20 @@ 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; /** * Tests {@link Component#onInitialize()} contract * * @author igor */ -public class ComponentInitializationTest extends WicketTestCase +class ComponentInitializationTest extends WicketTestCase { /** * testPropagation() */ @Test - public void propagation() + void propagation() { TestPage page = new TestPage(); @@ -85,7 +88,7 @@ public class ComponentInitializationTest extends WicketTestCase * testAtomicity() */ @Test - public void atomicity() + void atomicity() { TestPage page = new TestPage(); @@ -119,7 +122,7 @@ public class ComponentInitializationTest extends WicketTestCase * testOnInitializeSuperVerified() */ @Test - public void onInitializeSuperVerified() + void onInitializeSuperVerified() { TestPage page = new TestPage(); page.internalInitialize(); @@ -140,7 +143,7 @@ public class ComponentInitializationTest extends WicketTestCase * testInitListeners() */ @Test - public void initListeners() + void initListeners() { TestInitListener listener1 = new TestInitListener(); TestInitListener listener2 = new TestInitListener(); @@ -171,7 +174,7 @@ public class ComponentInitializationTest extends WicketTestCase * testInitializationOrder() */ @Test - public void initializationOrder() + void initializationOrder() { TestInitListener listener1 = new TestInitListener(); tester.getApplication().getComponentInitializationListeners().add(listener1); @@ -221,7 +224,7 @@ public class ComponentInitializationTest extends WicketTestCase count++; } - public int getCount() + int getCount() { return count; } @@ -233,7 +236,7 @@ public class ComponentInitializationTest extends WicketTestCase private int count = 0; - public TestComponent(String id) + TestComponent(String id) { super(id); } @@ -245,7 +248,7 @@ public class ComponentInitializationTest extends WicketTestCase count++; } - public int getCount() + int getCount() { return count; } @@ -258,7 +261,7 @@ public class ComponentInitializationTest extends WicketTestCase private static final long serialVersionUID = 1L; private final boolean initialized = false; - public InvalidComponent(String id) + InvalidComponent(String id) { super(id); } @@ -281,7 +284,7 @@ public class ComponentInitializationTest extends WicketTestCase components.add(component); } - public List<Component> getComponents() + List<Component> getComponents() { return components; } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ComponentOnConfigureTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ComponentOnConfigureTest.java b/wicket-core/src/test/java/org/apache/wicket/ComponentOnConfigureTest.java index f7651fa..f1f80ae 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ComponentOnConfigureTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ComponentOnConfigureTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.concurrent.atomic.AtomicInteger; import org.apache.wicket.application.IComponentOnConfigureListener; @@ -26,12 +28,12 @@ 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; /** * Tests {@link Component#onConfigure()} */ -public class ComponentOnConfigureTest extends WicketTestCase +class ComponentOnConfigureTest extends WicketTestCase { private static final AtomicInteger COUNTER = new AtomicInteger(0); private static final AtomicInteger PAGE = new AtomicInteger(0); @@ -43,20 +45,21 @@ public class ComponentOnConfigureTest extends WicketTestCase * testOrder() */ @Test - public void order() + void order() { tester.getApplication().getComponentOnConfigureListeners().add(new TestInitListener()); tester.startPage(new TestPage()); - assertEquals("Page must be configured first!", 0, PAGE.get()); -// assertEquals("Application listener for page must be configured second!", 1, APPLICATION_LISTENER.get()); - assertEquals("Component must be configured third!", 2, COMPONENT.get()); - assertEquals("The behavior must be configured fourth!", 3, BEHAVIOR.get()); -// assertEquals("Application listener for HtmlHeaderContainer must be configured second!", -// 4, APPLICATION_LISTENER.get()); - assertEquals("The application listener for the component must be configured fifth!", - 5, APPLICATION_LISTENER.get()); + assertEquals(0, PAGE.get(), "Page must be configured first!"); +// assertEquals("Application listener for page must be configured second!", 1, +// APPLICATION_LISTENER.get()); + assertEquals(2, COMPONENT.get(), "Component must be configured third!"); + assertEquals(3, BEHAVIOR.get(), "The behavior must be configured fourth!"); +// assertEquals("Application listener for HtmlHeaderContainer must be configured second!", +// 4, APPLICATION_LISTENER.get()); + assertEquals(5, APPLICATION_LISTENER.get(), + "The application listener for the component must be configured fifth!"); } private static class TestPage extends WebPage implements IMarkupResourceStreamProvider @@ -70,7 +73,8 @@ public class ComponentOnConfigureTest extends WicketTestCase public IResourceStream getMarkupResourceStream(MarkupContainer container, Class<?> containerClass) { - return new StringResourceStream("<html><body><span wicket:id='c'></span></body></html>"); + return new StringResourceStream( + "<html><body><span wicket:id='c'></span></body></html>"); } @Override @@ -83,7 +87,7 @@ public class ComponentOnConfigureTest extends WicketTestCase private static class TestComponent extends WebMarkupContainer { - public TestComponent(String id) + TestComponent(String id) { super(id); add(new TestBehavior()); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ComponentTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ComponentTest.java b/wicket-core/src/test/java/org/apache/wicket/ComponentTest.java index d3c0dc2..12ba73e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ComponentTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ComponentTest.java @@ -16,6 +16,10 @@ */ package org.apache.wicket; +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 java.util.concurrent.atomic.AtomicBoolean; import org.apache.wicket.ajax.AjaxEventBehavior; @@ -25,14 +29,14 @@ import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for ajax handler. * * @author Juergen Donnerstag */ -public class ComponentTest extends WicketTestCase +class ComponentTest extends WicketTestCase { /** @@ -42,7 +46,7 @@ public class ComponentTest extends WicketTestCase * @throws Exception */ @Test - public void detachPage() throws Exception + void detachPage() throws Exception { executeTest(TestDetachPage.class, "TestDetachPageExpectedResult.html"); TestDetachPage page = (TestDetachPage)tester.getLastRenderedPage(); @@ -63,7 +67,7 @@ public class ComponentTest extends WicketTestCase * @throws Exception */ @Test - public void detachPageAjaxRequest() throws Exception + void detachPageAjaxRequest() throws Exception { executeTest(TestDetachPage.class, "TestDetachPageExpectedResult.html"); TestDetachPage page = (TestDetachPage)tester.getLastRenderedPage(); @@ -93,7 +97,7 @@ public class ComponentTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_1() throws Exception + void renderHomePage_1() throws Exception { executeTest(TestPage_1.class, "TestPageExpectedResult_1.html"); } @@ -109,7 +113,7 @@ public class ComponentTest extends WicketTestCase * </ol> */ @Test - public void isStateless() + void isStateless() { Behavior statefulBehavior = new Behavior() { @@ -200,7 +204,7 @@ public class ComponentTest extends WicketTestCase * is different that the old one. The same as setDefaultModelObject(). */ @Test - public void modelChange() + void modelChange() { final AtomicBoolean modelChanging = new AtomicBoolean(false); final AtomicBoolean modelChanged = new AtomicBoolean(false); @@ -237,7 +241,7 @@ public class ComponentTest extends WicketTestCase } @Test - public void pageIsInitiallyStateless() + void pageIsInitiallyStateless() { FlagReserved5Component component = new FlagReserved5Component("test"); assertTrue(component.getFlagReserved5()); @@ -249,7 +253,7 @@ public class ComponentTest extends WicketTestCase private static class FlagReserved5Component extends Component { - public FlagReserved5Component(final String id) { + FlagReserved5Component(final String id) { super(id); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java b/wicket-core/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java index 9361351..645eb1c 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.behavior.Behavior; import org.apache.wicket.core.request.handler.ListenerRequestHandler; import org.apache.wicket.core.request.handler.PageAndComponentProvider; @@ -29,12 +32,12 @@ import org.apache.wicket.request.IRequestHandler; 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; /** * @see <a href="https://issues.apache.org/jira/browse/WICKET3142";>WICKET3142</a> */ -public class ComponentWithLazyModelCreationTest extends WicketTestCase +class ComponentWithLazyModelCreationTest extends WicketTestCase { private static final String LABEL_VALUE = "some value"; /** just an property to be reached by the CompoundPropertyModel */ @@ -45,7 +48,7 @@ public class ComponentWithLazyModelCreationTest extends WicketTestCase * data has its position incremented after its ULR get encoded. */ @Test - public void urlReferingSomeBehavior() + void urlReferingSomeBehavior() { TestPage page = new TestPage(new CompoundPropertyModel<ComponentWithLazyModelCreationTest>( this)); @@ -54,7 +57,7 @@ public class ComponentWithLazyModelCreationTest extends WicketTestCase tester.executeUrl(page.mainCallbackBehavior.statefullUrl); tester.assertLabel("label", LABEL_VALUE); - assertTrue("mainCallbackBehavior was called", page.mainCallbackBehavior.requested); + assertTrue(page.mainCallbackBehavior.requested, "mainCallbackBehavior was called"); } /** @@ -62,7 +65,7 @@ public class ComponentWithLazyModelCreationTest extends WicketTestCase * URL invoking the wrong component behavior */ @Test - public void urlDontCallOtherBehavior() + void urlDontCallOtherBehavior() { TestPage page = new TestPage(new CompoundPropertyModel<ComponentWithLazyModelCreationTest>( this)); @@ -71,8 +74,8 @@ public class ComponentWithLazyModelCreationTest extends WicketTestCase tester.executeUrl(page.brotherCallbackBehavior.statefullUrl); tester.assertLabel("label", LABEL_VALUE); - assertTrue("brotherCallbackBehavior was requested", page.brotherCallbackBehavior.requested); - assertFalse("mainCallbackBehavior was not requested", page.mainCallbackBehavior.requested); + assertTrue(page.brotherCallbackBehavior.requested, "brotherCallbackBehavior was requested"); + assertFalse(page.mainCallbackBehavior.requested, "mainCallbackBehavior was not requested"); } /** @@ -88,7 +91,7 @@ public class ComponentWithLazyModelCreationTest extends WicketTestCase * * @param model */ - public TestPage(IModel<ComponentWithLazyModelCreationTest> model) + TestPage(IModel<ComponentWithLazyModelCreationTest> model) { super(model); mainCallbackBehavior = new TestCallbackBehavior(); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ConverterLocatorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ConverterLocatorTest.java b/wicket-core/src/test/java/org/apache/wicket/ConverterLocatorTest.java index 45527ec..58ed191 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ConverterLocatorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ConverterLocatorTest.java @@ -16,18 +16,20 @@ */ package org.apache.wicket; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import java.io.Serializable; import java.util.Locale; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for converter locators. * * @author Eelco Hillenius */ -public final class ConverterLocatorTest extends Assert +final class ConverterLocatorTest { private final ConverterLocator locator = new ConverterLocator(); @@ -35,7 +37,7 @@ public final class ConverterLocatorTest extends Assert * Test generalized conversion */ @Test - public void test() + void test() { assertNotNull(locator.getConverter(Integer.class)); assertNotNull(locator.getConverter(Double.class)); @@ -48,7 +50,7 @@ public final class ConverterLocatorTest extends Assert * WICKET-4755 */ @Test - public void isInstance() + void isInstance() { assertEquals("test", locator.getConverter(Serializable.class).convertToObject("test", Locale.US)); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperResourceBlockedDevModeTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperResourceBlockedDevModeTest.java b/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperResourceBlockedDevModeTest.java index a5bd77f..95cf54f 100644 --- a/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperResourceBlockedDevModeTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperResourceBlockedDevModeTest.java @@ -16,8 +16,8 @@ */ package org.apache.wicket; -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.CoreMatchers.is; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; import javax.servlet.http.HttpServletResponse; @@ -28,12 +28,12 @@ import org.apache.wicket.request.http.handler.ErrorCodeRequestHandler; import org.apache.wicket.request.resource.PackageResource; import org.apache.wicket.settings.ExceptionSettings; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link org.apache.wicket.DefaultExceptionMapper} */ -public class DefaultExceptionMapperResourceBlockedDevModeTest extends WicketTestCase +class DefaultExceptionMapperResourceBlockedDevModeTest extends WicketTestCase { @Override protected WebApplication newApplication() @@ -61,14 +61,14 @@ public class DefaultExceptionMapperResourceBlockedDevModeTest extends WicketTest * on the screen) */ @Test - public void packageResourceBlockedExceptionDevMode() + void packageResourceBlockedExceptionDevMode() { DefaultExceptionMapper mapper = new DefaultExceptionMapper(); PackageResource.PackageResourceBlockedException x = new PackageResource.PackageResourceBlockedException("test"); IRequestHandler handler = mapper.map(x); - assertThat(handler, instanceOf(ErrorCodeRequestHandler.class)); + assertThat(handler).isInstanceOf(ErrorCodeRequestHandler.class); ErrorCodeRequestHandler errorCodeRequestHandler = (ErrorCodeRequestHandler) handler; - assertThat(errorCodeRequestHandler.getErrorCode(), is(HttpServletResponse.SC_INTERNAL_SERVER_ERROR)); + assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, errorCodeRequestHandler.getErrorCode()); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperResourceBlockedProdModeTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperResourceBlockedProdModeTest.java b/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperResourceBlockedProdModeTest.java index dc6b277..297f044 100644 --- a/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperResourceBlockedProdModeTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperResourceBlockedProdModeTest.java @@ -16,8 +16,8 @@ */ package org.apache.wicket; -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.CoreMatchers.is; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; import javax.servlet.http.HttpServletResponse; @@ -28,12 +28,12 @@ import org.apache.wicket.request.http.handler.ErrorCodeRequestHandler; import org.apache.wicket.request.resource.PackageResource; import org.apache.wicket.settings.ExceptionSettings; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link DefaultExceptionMapper} */ -public class DefaultExceptionMapperResourceBlockedProdModeTest extends WicketTestCase +class DefaultExceptionMapperResourceBlockedProdModeTest extends WicketTestCase { @Override protected WebApplication newApplication() @@ -59,14 +59,14 @@ public class DefaultExceptionMapperResourceBlockedProdModeTest extends WicketTes * In production mode return http status 404 when a resource is blocked */ @Test - public void packageResourceBlockedException() + void packageResourceBlockedException() { DefaultExceptionMapper mapper = new DefaultExceptionMapper(); PackageResource.PackageResourceBlockedException x = new PackageResource.PackageResourceBlockedException("test"); IRequestHandler handler = mapper.map(x); - assertThat(handler, instanceOf(ErrorCodeRequestHandler.class)); + assertThat(handler).isInstanceOf(ErrorCodeRequestHandler.class); ErrorCodeRequestHandler errorCodeRequestHandler = (ErrorCodeRequestHandler) handler; - assertThat(errorCodeRequestHandler.getErrorCode(), is(HttpServletResponse.SC_NOT_FOUND)); + assertEquals(HttpServletResponse.SC_NOT_FOUND, errorCodeRequestHandler.getErrorCode()); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperTest.java index af105fc..e3cbf0e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/DefaultExceptionMapperTest.java @@ -16,6 +16,7 @@ */ package org.apache.wicket; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -32,13 +33,12 @@ import org.apache.wicket.settings.ExceptionSettings; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link DefaultExceptionMapper} */ -public class DefaultExceptionMapperTest extends WicketTestCase +class DefaultExceptionMapperTest extends WicketTestCase { @Override protected WebApplication newApplication() @@ -58,7 +58,7 @@ public class DefaultExceptionMapperTest extends WicketTestCase * <a href="https://issues.apache.org/jira/browse/WICKET-4659";>WICKET-4659</a> */ @Test - public void shouldDisableCaching() + void shouldDisableCaching() { WebResponse response = mock(WebResponse.class); tester.getRequestCycle().setResponse(response); @@ -71,7 +71,7 @@ public class DefaultExceptionMapperTest extends WicketTestCase * <a href="https://issues.apache.org/jira/browse/WICKET-3520";>WICKET-3520</a> */ @Test - public void showNoExceptionPage() + void showNoExceptionPage() { tester.setExposeExceptions(false); @@ -80,7 +80,7 @@ public class DefaultExceptionMapperTest extends WicketTestCase tester.submitForm("form"); - Assert.assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, tester.getLastResponse() + assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, tester.getLastResponse() .getStatus()); tester.destroy(); @@ -100,7 +100,7 @@ public class DefaultExceptionMapperTest extends WicketTestCase * * @param parameters */ - public ShowNoExceptionPage(final PageParameters parameters) + ShowNoExceptionPage(final PageParameters parameters) { super(parameters); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/DisabledComponentTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/DisabledComponentTest.java b/wicket-core/src/test/java/org/apache/wicket/DisabledComponentTest.java index 0d57faf..bc1e5bb 100644 --- a/wicket-core/src/test/java/org/apache/wicket/DisabledComponentTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/DisabledComponentTest.java @@ -16,21 +16,23 @@ */ package org.apache.wicket; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import org.apache.wicket.core.request.handler.ListenerInvocationNotAllowedException; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.util.tester.WicketTestCase; -import org.apache.wicket.core.request.handler.ListenerInvocationNotAllowedException; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author jcompagner */ -public class DisabledComponentTest extends WicketTestCase +class DisabledComponentTest extends WicketTestCase { /** * @throws Exception */ @Test - public void enabled() throws Exception + void enabled() throws Exception { executeTest(DisabledComponentPage1.class, "DisabledComponentPage1a_result.html"); Link<?> link = ((DisabledComponentPage1)tester.getLastRenderedPage()).link; @@ -40,14 +42,15 @@ public class DisabledComponentTest extends WicketTestCase /** * @throws Exception */ - @Test(expected = ListenerInvocationNotAllowedException.class) - public void disabled() throws Exception + @Test + void disabled() throws Exception { executeTest(DisabledComponentPage1.class, "DisabledComponentPage1a_result.html"); Link<?> link = ((DisabledComponentPage1)tester.getLastRenderedPage()).link; link.setEnabled(false); - executeListener(link, "DisabledComponentPage1b_result.html"); - fail("Executing the listener on disabled component is not allowed."); + assertThrows(ListenerInvocationNotAllowedException.class, () -> { + executeListener(link, "DisabledComponentPage1b_result.html"); + }); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/EventDispatcherTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/EventDispatcherTest.java b/wicket-core/src/test/java/org/apache/wicket/EventDispatcherTest.java index b9ab1fe..552cbc8 100644 --- a/wicket-core/src/test/java/org/apache/wicket/EventDispatcherTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/EventDispatcherTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -27,12 +30,12 @@ import org.apache.wicket.event.Broadcast; import org.apache.wicket.event.IEvent; import org.apache.wicket.markup.html.WebComponent; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Pedro Santos */ -public class EventDispatcherTest extends WicketTestCase +class EventDispatcherTest extends WicketTestCase { /** @@ -40,7 +43,7 @@ public class EventDispatcherTest extends WicketTestCase * invoke the methods annotated with @EvenCallback * */ @Test - public void dispatchToAnnotatedMethod() + void dispatchToAnnotatedMethod() { tester.getApplication().getFrameworkSettings().add(new DispatchToAnnotatedMethod()); MockPageWithOneComponent page = new MockPageWithOneComponent(); @@ -53,12 +56,12 @@ public class EventDispatcherTest extends WicketTestCase @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) - @interface EventCallback { + private @interface EventCallback { } /** */ - public static class DispatchToAnnotatedMethod implements IEventDispatcher + static class DispatchToAnnotatedMethod implements IEventDispatcher { @Override public void dispatchEvent(Object sink, IEvent<?> event, Component component) @@ -90,7 +93,7 @@ public class EventDispatcherTest extends WicketTestCase /** * @param id */ - public TestComponent(String id) + TestComponent(String id) { super(id); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ExceptionMapperTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ExceptionMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/ExceptionMapperTest.java index c17d2b3..2f43333 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ExceptionMapperTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ExceptionMapperTest.java @@ -29,12 +29,11 @@ import org.apache.wicket.util.lang.Exceptions; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Ignore; /** + * // TODO can be removed? */ -@Ignore -public class ExceptionMapperTest extends WicketTestCase +abstract class ExceptionMapperTest extends WicketTestCase { /** * Testing an custom exception mapper provider that return an wrapped exception mapper in order @@ -57,7 +56,7 @@ public class ExceptionMapperTest extends WicketTestCase /** */ - public static class WrapperProvider implements Supplier<IExceptionMapper> + static class WrapperProvider implements Supplier<IExceptionMapper> { private Supplier<IExceptionMapper> wrapped; WrapperExceptionMapper wrapperExceptionMapper; @@ -66,7 +65,7 @@ public class ExceptionMapperTest extends WicketTestCase * @param wrapped * exception mapper provider */ - public WrapperProvider(Supplier<IExceptionMapper> wrapped) + WrapperProvider(Supplier<IExceptionMapper> wrapped) { this.wrapped = wrapped; } @@ -80,7 +79,7 @@ public class ExceptionMapperTest extends WicketTestCase /** */ - public static class WrapperExceptionMapper implements IExceptionMapper + static class WrapperExceptionMapper implements IExceptionMapper { private IExceptionMapper wrapped; @@ -88,7 +87,7 @@ public class ExceptionMapperTest extends WicketTestCase * @param wrapped * IExceptionMapper */ - public WrapperExceptionMapper(IExceptionMapper wrapped) + WrapperExceptionMapper(IExceptionMapper wrapped) { this.wrapped = wrapped; } @@ -135,7 +134,7 @@ public class ExceptionMapperTest extends WicketTestCase /** */ - public TestPage() + TestPage() { add(new Link<Void>(LINK_ID) { http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/FeedbackMessagesTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/FeedbackMessagesTest.java b/wicket-core/src/test/java/org/apache/wicket/FeedbackMessagesTest.java index 2894592..ccb4a1b 100644 --- a/wicket-core/src/test/java/org/apache/wicket/FeedbackMessagesTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/FeedbackMessagesTest.java @@ -16,14 +16,15 @@ */ package org.apache.wicket; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author oli */ -public class FeedbackMessagesTest extends WicketTestCase +class FeedbackMessagesTest extends WicketTestCase { /** @@ -32,13 +33,13 @@ public class FeedbackMessagesTest extends WicketTestCase * . */ @Test - public void hasMessageForComponentInt() + void hasMessageForComponentInt() { final Page page = new TestPage_1(); tester.startPage(page); page.debug("debug message"); page.info("info message"); page.error("error message"); - Assert.assertTrue(tester.getLastRenderedPage().hasErrorMessage()); + assertTrue(tester.getLastRenderedPage().hasErrorMessage()); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/FormDispatchEventTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/FormDispatchEventTest.java b/wicket-core/src/test/java/org/apache/wicket/FormDispatchEventTest.java index 9fde63a..d400d2f 100644 --- a/wicket-core/src/test/java/org/apache/wicket/FormDispatchEventTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/FormDispatchEventTest.java @@ -16,21 +16,23 @@ */ package org.apache.wicket; +import static org.junit.jupiter.api.Assertions.assertTrue; + 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 jcompagner */ -public class FormDispatchEventTest extends WicketTestCase +class FormDispatchEventTest extends WicketTestCase { /** * @throws Exception */ @Test - public void dropDownEvent() throws Exception + void dropDownEvent() throws Exception { tester.startPage(MockPageWithForm.class); @@ -41,7 +43,7 @@ public class FormDispatchEventTest extends WicketTestCase MockPageWithForm page = (MockPageWithForm)tester.getLastRenderedPage(); - assertTrue("Form.onSubmit() should have been called", page.isSubmitted()); - assertTrue("DropDownChoice.onSelectionChanged() should have been called", page.isSelected()); + assertTrue(page.isSubmitted(), "Form.onSubmit() should have been called"); + assertTrue(page.isSelected(), "DropDownChoice.onSelectionChanged() should have been called"); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/LocalizerTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/LocalizerTest.java b/wicket-core/src/test/java/org/apache/wicket/LocalizerTest.java index d98bc64..9f922e5 100644 --- a/wicket-core/src/test/java/org/apache/wicket/LocalizerTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/LocalizerTest.java @@ -16,6 +16,11 @@ */ package org.apache.wicket; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + import java.util.Arrays; import java.util.HashMap; import java.util.Locale; @@ -34,126 +39,100 @@ import org.apache.wicket.settings.ResourceSettings; import org.apache.wicket.util.string.Strings; import org.apache.wicket.util.tester.WicketTester; import org.apache.wicket.util.value.ValueMap; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Test cases for the <code>Localizer</code> class. * * @author Chris Turner */ -public class LocalizerTest extends Assert +class LocalizerTest { - private static class MyMockPage extends WebPage - { - private static final long serialVersionUID = 1L; - - DropDownChoice<String> drop1; - DropDownChoice<String> drop2; - - /** - * Construct. - */ - public MyMockPage() - { - final Form<Void> form = new Form<Void>("form"); - add(form); - - String[] choices = { "choice1", "choice2" }; - drop1 = new DropDownChoice<String>("drop1", Arrays.asList(choices)); - drop2 = new DropDownChoice<String>("drop2", Arrays.asList(choices)); - - form.add(drop1); - form.add(drop2); - } - } - + Localizer localizer; private WicketTester tester; private ResourceSettings settings; - protected Localizer localizer; - /** - * + * * @throws Exception */ - @Before - public void setUp() throws Exception + @BeforeEach + void setUp() throws Exception { tester = new WicketTester(new DummyApplication()); settings = tester.getApplication().getResourceSettings(); localizer = tester.getApplication().getResourceSettings().getLocalizer(); } - @After - public void tearDown() throws Exception + @AfterEach + void tearDown() throws Exception { tester.destroy(); } /** - * + * */ @Test - public void testGetStringValidString() + void testGetStringValidString() { - Assert.assertEquals("Expected string should be returned", "This is a test", - localizer.getString("test.string", null, null, "DEFAULT")); + assertEquals("This is a test", localizer.getString("test.string", null, null, "DEFAULT"), + "Expected string should be returned"); } /** - * + * */ @Test - public void testGetStringMissingStringReturnDefault() + void testGetStringMissingStringReturnDefault() { settings.setUseDefaultOnMissingResource(true); - Assert.assertEquals("Default string should be returned", "DEFAULT", - localizer.getString("unknown.string", null, null, "DEFAULT")); + assertEquals("DEFAULT", localizer.getString("unknown.string", null, null, "DEFAULT"), + "Default string should be returned"); } /** - * + * */ @Test - public void testGetStringMissingStringNoDefault() + void testGetStringMissingStringNoDefault() { settings.setUseDefaultOnMissingResource(true); settings.setThrowExceptionOnMissingResource(false); - Assert.assertEquals("Wrapped key should be returned on no default", - "[Warning: Property for 'unknown.string' not found]", - localizer.getString("unknown.string", null, null, null)); + assertEquals("[Warning: Property for 'unknown.string' not found]", + localizer.getString("unknown.string", null, null, null), + "Wrapped key should be returned on no default"); } /** - * + * */ @Test - public void testGetStringMissingStringDoNotUseDefault() + void testGetStringMissingStringDoNotUseDefault() { settings.setUseDefaultOnMissingResource(false); settings.setThrowExceptionOnMissingResource(false); - Assert.assertEquals("Wrapped key should be returned on not using default and no exception", - "[Warning: Property for 'unknown.string' not found]", - localizer.getString("unknown.string", null, null, "DEFAULT")); + assertEquals("[Warning: Property for 'unknown.string' not found]", + localizer.getString("unknown.string", null, null, "DEFAULT"), + "Wrapped key should be returned on not using default and no exception"); } /** - * + * */ @Test - public void testGetStringMissingStringExceptionThrown() + void testGetStringMissingStringExceptionThrown() { settings.setUseDefaultOnMissingResource(false); settings.setThrowExceptionOnMissingResource(true); try { localizer.getString("unknown.string", null, null, "DEFAULT"); - Assert.fail("MissingResourceException expected"); + fail("MissingResourceException expected"); } catch (MissingResourceException e) { @@ -162,10 +141,10 @@ public class LocalizerTest extends Assert } /** - * + * */ @Test - public void testGetStringPropertySubstitution() + void testGetStringPropertySubstitution() { Session.get().setLocale(Locale.GERMAN); @@ -173,15 +152,16 @@ public class LocalizerTest extends Assert vm.put("user", "John Doe"); vm.put("rating", 4.5); IModel<ValueMap> model = new Model<ValueMap>(vm); - Assert.assertEquals("Property substitution should occur", "John Doe gives 4,5 stars", - localizer.getString("test.substitute", null, model, null)); + assertEquals("John Doe gives 4,5 stars", + localizer.getString("test.substitute", null, model, null), + "Property substitution should occur"); } /** - * + * */ @Test - public void testInComponentConstructor() + void testInComponentConstructor() { new MyLabel("myLabel"); } @@ -190,14 +170,12 @@ public class LocalizerTest extends Assert * Unit test for bug number [1416582] Resource loading caches wrong. */ @Test - public void testTwoComponents() + void testTwoComponents() { Session.get().setLocale(Locale.ENGLISH); MyMockPage page = new MyMockPage(); - Application.get() - .getResourceSettings() - .getStringResourceLoaders() - .add(new ComponentStringResourceLoader()); + Application.get().getResourceSettings().getStringResourceLoaders().add( + new ComponentStringResourceLoader()); Localizer localizer = Application.get().getResourceSettings().getLocalizer(); assertEquals("value 1", localizer.getString("null", page.drop1)); @@ -206,14 +184,13 @@ public class LocalizerTest extends Assert Session.get().setLocale(new Locale("nl")); assertEquals("waarde 1", localizer.getString("null", page.drop1)); assertEquals("waarde 2", localizer.getString("null", page.drop2)); - } /** - * + * */ @Test - public void testGetStringUseModel() + void testGetStringUseModel() { Session.get().setLocale(Locale.GERMAN); @@ -221,27 +198,30 @@ public class LocalizerTest extends Assert model.put("user", "juergen"); model.put("rating", 4.5); - Assert.assertEquals("Expected string should be returned", "juergen gives 4,5 stars", - localizer.getString("test.substitute", null, new PropertyModel<String>(model, null), - "DEFAULT {user}")); + assertEquals( + "juergen gives 4,5 stars", localizer.getString("test.substitute", null, + new PropertyModel<String>(model, null), "DEFAULT {user}"), + "Expected string should be returned"); - Assert.assertEquals("Expected string should be returned", "DEFAULT juergen", + assertEquals("DEFAULT juergen", localizer.getString("test.substituteDoesNotExist", null, - new PropertyModel<HashMap<String, Object>>(model, null), "DEFAULT ${user}")); + new PropertyModel<HashMap<String, Object>>(model, null), "DEFAULT ${user}"), + "Expected string should be returned"); } /** * See https://issues.apache.org/jira/browse/WICKET-1851 */ @Test - public void test_1851_1() + void test_1851_1() { MyMockPage page = new MyMockPage(); tester.getApplication().getResourceSettings().setThrowExceptionOnMissingResource(false); tester.getApplication().getResourceSettings().setUseDefaultOnMissingResource(false); - String option = localizer.getStringIgnoreSettings("dummy.null", page.drop1, null, "default"); + String option = localizer.getStringIgnoreSettings("dummy.null", page.drop1, null, + "default"); assertEquals("default", option); option = localizer.getStringIgnoreSettings("dummy.null", page.drop1, null, null); @@ -267,7 +247,7 @@ public class LocalizerTest extends Assert try { localizer.getString("dummy.null", page.drop1, null, null); - assertTrue("Expected an exception to happen", false); + assertTrue(false, "Expected an exception to happen"); } catch (MissingResourceException ex) { @@ -277,6 +257,30 @@ public class LocalizerTest extends Assert } } + public static class MyMockPage extends WebPage + { + private static final long serialVersionUID = 1L; + + DropDownChoice<String> drop1; + DropDownChoice<String> drop2; + + /** + * Construct. + */ + MyMockPage() + { + final Form<Void> form = new Form<Void>("form"); + add(form); + + String[] choices = { "choice1", "choice2" }; + drop1 = new DropDownChoice<String>("drop1", Arrays.asList(choices)); + drop2 = new DropDownChoice<String>("drop2", Arrays.asList(choices)); + + form.add(drop1); + form.add(drop2); + } + } + /** * Test label. */ @@ -289,7 +293,7 @@ public class LocalizerTest extends Assert * * @param id */ - public MyLabel(final String id) + MyLabel(final String id) { super(id); @@ -297,8 +301,8 @@ public class LocalizerTest extends Assert // should work properly in a component constructor (without parent) // as well - Assert.assertEquals("Expected string should be returned", "This is a test", - localizer.getString("test.string", this, "DEFAULT")); + assertEquals("This is a test", + localizer.getString("test.string", this, "DEFAULT"), "Expected string should be returned"); } }
