Repository: wicket Updated Branches: refs/heads/master de2aedd27 -> 4be82eb0c
wicket-auth-roles: Migrate to Junit 5 wicket-request: Migrate to Junit 5 wicket-util: fix Assertion order Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/28dd4830 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/28dd4830 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/28dd4830 Branch: refs/heads/master Commit: 28dd48300fab7cc91c0b1652288e82330b10b0a6 Parents: dcd29c0 Author: renoth <[email protected]> Authored: Thu Aug 30 22:59:22 2018 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Sep 26 15:36:17 2018 +0300 ---------------------------------------------------------------------- .../AuthenticatedWebSessionTest.java | 16 +- ...nnotationsRoleAuthorizationStrategyTest.java | 155 ++++++-------- .../role/annotations/AnnotationsRoleTest.java | 44 ++-- .../role/metadata/ActionPermissionsTest.java | 33 +-- .../metadata/InstantiationPermissionsTest.java | 36 ++-- .../request/HttpHeaderCollectionTest.java | 17 +- .../java/org/apache/wicket/request/UrlTest.java | 212 ++++++++++--------- .../org/apache/wicket/request/UrlUtilsTest.java | 14 +- .../handler/RedirectRequestHandlerTest.java | 12 +- .../mapper/CompoundRequestMapperTest.java | 12 +- .../parameter/PageParametersEncoderTest.java | 17 +- .../mapper/parameter/PageParametersTest.java | 177 +++++++--------- .../UrlPathPageParametersEncoderTest.java | 42 ++-- .../CombinedRequestParametersAdapterTest.java | 7 +- .../license/ApacheLicenseHeaderTestCase.java | 31 ++- .../wicket/util/collections/IntHashMapTest.java | 18 +- 16 files changed, 403 insertions(+), 440 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/28dd4830/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authentication/AuthenticatedWebSessionTest.java ---------------------------------------------------------------------- diff --git a/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authentication/AuthenticatedWebSessionTest.java b/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authentication/AuthenticatedWebSessionTest.java index d91dd9d..0078aa5 100644 --- a/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authentication/AuthenticatedWebSessionTest.java +++ b/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authentication/AuthenticatedWebSessionTest.java @@ -33,20 +33,20 @@ import org.apache.wicket.request.Request; import org.apache.wicket.request.Response; import org.apache.wicket.session.ISessionStore; 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; /** * @author Pedro Santos */ -public class AuthenticatedWebSessionTest extends WicketTestCase { +class AuthenticatedWebSessionTest extends WicketTestCase { private Request request; private Response response; private ISessionStore sessionStore; private AuthenticatedWebSession session; - @Before - public void initialize() { + @BeforeEach + void initialize() { request = mock(Request.class); response = mock(Response.class); sessionStore = mock(ISessionStore.class); @@ -55,7 +55,7 @@ public class AuthenticatedWebSessionTest extends WicketTestCase { } @Test - public void shouldLookupForSessionOnce() throws InterruptedException { + void shouldLookupForSessionOnce() throws InterruptedException { ExecutorService executorService = Executors.newFixedThreadPool(10); for (int i = 0; i < 10; i++) executorService.submit(new SiginTask(tester.getApplication())); @@ -69,7 +69,7 @@ public class AuthenticatedWebSessionTest extends WicketTestCase { class SiginTask implements Runnable { Application application; - public SiginTask(Application application) { + SiginTask(Application application) { this.application = application; } @@ -84,7 +84,7 @@ public class AuthenticatedWebSessionTest extends WicketTestCase { class TestAuthenticatedWebSession extends AuthenticatedWebSession { private static final long serialVersionUID = 1L; - public TestAuthenticatedWebSession(Request request) { + TestAuthenticatedWebSession(Request request) { super(request); } http://git-wip-us.apache.org/repos/asf/wicket/blob/28dd4830/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategyTest.java ---------------------------------------------------------------------- diff --git a/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategyTest.java b/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategyTest.java index 9ef17ce..31c1b43 100644 --- a/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategyTest.java +++ b/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategyTest.java @@ -16,174 +16,172 @@ */ package org.apache.wicket.authroles.authorization.strategies.role.annotations; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.Component; import org.apache.wicket.authroles.authorization.strategies.role.IRoleCheckingStrategy; import org.apache.wicket.authroles.authorization.strategies.role.Roles; import org.apache.wicket.markup.html.WebComponent; import org.apache.wicket.request.resource.IResource; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - /** * Tests for {@link AnnotationsRoleAuthorizationStrategy} */ -public class AnnotationsRoleAuthorizationStrategyTest +class AnnotationsRoleAuthorizationStrategyTest { /** * https://issues.apache.org/jira/browse/WICKET-3974 */ @Test - public void allowsRenderWithRequiredRoleAndNoDeniedRole() + void allowsRenderWithRequiredRoleAndNoDeniedRole() { AnnotationsRoleAuthorizationStrategy strategy = new AnnotationsRoleAuthorizationStrategy( - roles("role1")); + roles("role1")); // use mock to not need Application in the thread - TestComponent_Render component = Mockito - .mock(TestComponent_Render.class); + TestComponent_Render component = Mockito.mock(TestComponent_Render.class); assertTrue(strategy.isActionAuthorized(component, Component.RENDER)); } @Test - public void deniesRenderWithoutRequiredRole() + void deniesRenderWithoutRequiredRole() { AnnotationsRoleAuthorizationStrategy strategy = new AnnotationsRoleAuthorizationStrategy( - roles("role2")); - TestComponent_Render component = Mockito - .mock(TestComponent_Render.class); + roles("role2")); + TestComponent_Render component = Mockito.mock(TestComponent_Render.class); assertFalse(strategy.isActionAuthorized(component, Component.RENDER)); } @Test - public void deniesRenderWithRequiredRoleAndDeniedRole() + void deniesRenderWithRequiredRoleAndDeniedRole() { AnnotationsRoleAuthorizationStrategy strategy = new AnnotationsRoleAuthorizationStrategy( - roles("role1", "role3")); - TestComponent_Render component = Mockito - .mock(TestComponent_Render.class); + roles("role1", "role3")); + TestComponent_Render component = Mockito.mock(TestComponent_Render.class); assertFalse(strategy.isActionAuthorized(component, Component.RENDER)); } @Test - public void deniesRenderWithDeniedRole() + void deniesRenderWithDeniedRole() { AnnotationsRoleAuthorizationStrategy strategy = new AnnotationsRoleAuthorizationStrategy( - roles("role3")); - TestComponent_Render component = Mockito - .mock(TestComponent_Render.class); + roles("role3")); + TestComponent_Render component = Mockito.mock(TestComponent_Render.class); assertFalse(strategy.isActionAuthorized(component, Component.RENDER)); } @Test - public void allowsEnableWithRequiredRole() + void allowsEnableWithRequiredRole() { AnnotationsRoleAuthorizationStrategy strategy = new AnnotationsRoleAuthorizationStrategy( - roles("role1")); - TestComponent_Enable component = Mockito - .mock(TestComponent_Enable.class); + roles("role1")); + TestComponent_Enable component = Mockito.mock(TestComponent_Enable.class); assertTrue(strategy.isActionAuthorized(component, Component.ENABLE)); } @Test - public void deniesEnableWithoutRequiredRoleAndNoDeniedRole() + void deniesEnableWithoutRequiredRoleAndNoDeniedRole() { AnnotationsRoleAuthorizationStrategy strategy = new AnnotationsRoleAuthorizationStrategy( - roles("role2")); - TestComponent_Enable component = Mockito - .mock(TestComponent_Enable.class); + roles("role2")); + TestComponent_Enable component = Mockito.mock(TestComponent_Enable.class); assertFalse(strategy.isActionAuthorized(component, Component.ENABLE)); } @Test - public void deniesEnableWithDeniedRole() + void deniesEnableWithDeniedRole() { AnnotationsRoleAuthorizationStrategy strategy = new AnnotationsRoleAuthorizationStrategy( - roles("role3")); - TestComponent_Enable component = Mockito - .mock(TestComponent_Enable.class); + roles("role3")); + TestComponent_Enable component = Mockito.mock(TestComponent_Enable.class); assertFalse(strategy.isActionAuthorized(component, Component.ENABLE)); } @Test - public void deniesEnableWithRequiredRoleAndDeniedRole() + void deniesEnableWithRequiredRoleAndDeniedRole() { AnnotationsRoleAuthorizationStrategy strategy = new AnnotationsRoleAuthorizationStrategy( - roles("role1", "role3")); - TestComponent_Enable component = Mockito - .mock(TestComponent_Enable.class); + roles("role1", "role3")); + TestComponent_Enable component = Mockito.mock(TestComponent_Enable.class); assertFalse(strategy.isActionAuthorized(component, Component.ENABLE)); } @Test - public void allowsInstantiationWithRequiredRole() throws Exception - { + void allowsInstantiationWithRequiredRole() { AnnotationsRoleAuthorizationStrategy strategy = new AnnotationsRoleAuthorizationStrategy( - roles("role1")); - assertTrue(strategy - .isInstantiationAuthorized(TestComponent_Instantiate.class)); + roles("role1")); + assertTrue(strategy.isInstantiationAuthorized(TestComponent_Instantiate.class)); } @Test - public void deniesInstantiationWithoutRequiredRole() throws Exception - { + void deniesInstantiationWithoutRequiredRole() { AnnotationsRoleAuthorizationStrategy strategy = new AnnotationsRoleAuthorizationStrategy( - roles("role2")); - assertFalse(strategy - .isInstantiationAuthorized(TestComponent_Instantiate.class)); + roles("role2")); + assertFalse(strategy.isInstantiationAuthorized(TestComponent_Instantiate.class)); } @Test - public void allowsInstantiationWithAllRequiredRoles() throws Exception - { + void allowsInstantiationWithAllRequiredRoles() { AnnotationsRoleAuthorizationStrategy strategy = new AnnotationsRoleAuthorizationStrategy( roles("role1", "role2")); assertTrue(strategy.isInstantiationAuthorized(TestComponent_Roleset_Instantiate.class)); } @Test - public void deniesInstantiationWithoutAllRequiredRoles() throws Exception - { + void deniesInstantiationWithoutAllRequiredRoles() { AnnotationsRoleAuthorizationStrategy strategy = new AnnotationsRoleAuthorizationStrategy( roles("role2")); assertFalse(strategy.isInstantiationAuthorized(TestComponent_Roleset_Instantiate.class)); } @Test - public void allowsResourceWithRequiredRole() throws Exception - { + void allowsResourceWithRequiredRole() { AnnotationsRoleAuthorizationStrategy strategy = new AnnotationsRoleAuthorizationStrategy( - roles("role1")); + roles("role1")); IResource resource = Mockito.mock(RestrictedResource.class); assertTrue(strategy.isResourceAuthorized(resource, null)); } @Test - public void deniesResourceWithoutRequiredRole() throws Exception - { + void deniesResourceWithoutRequiredRole() { AnnotationsRoleAuthorizationStrategy strategy = new AnnotationsRoleAuthorizationStrategy( - roles("role2")); + roles("role2")); IResource resource = Mockito.mock(RestrictedResource.class); assertFalse(strategy.isResourceAuthorized(resource, null)); } @Test - public void allowsUnprotectedResourceWithRole() throws Exception { + void allowsUnprotectedResourceWithRole() { AnnotationsRoleAuthorizationStrategy strategy = new AnnotationsRoleAuthorizationStrategy( - roles("role2")); + roles("role2")); IResource resource = Mockito.mock(UnrestrictedResource.class); assertTrue(strategy.isResourceAuthorized(resource, null)); } - + @Test - public void allowsUnprotectedResourceWithoutRole() throws Exception { - AnnotationsRoleAuthorizationStrategy strategy = new AnnotationsRoleAuthorizationStrategy(roles()); + void allowsUnprotectedResourceWithoutRole() { + AnnotationsRoleAuthorizationStrategy strategy = new AnnotationsRoleAuthorizationStrategy( + roles()); IResource resource = Mockito.mock(UnrestrictedResource.class); assertTrue(strategy.isResourceAuthorized(resource, null)); } - @AuthorizeInstantiation({"role1"}) + /** + * Create a test role checking strategy that is simply given a list of roles and returns true if + * that list contains any of the asked-for roles. + * + * @param availableRoles + * rules that this role checker should have + * @return test role checking strategy + */ + private IRoleCheckingStrategy roles(final String... availableRoles) + { + return requiredRoles -> requiredRoles.hasAnyRole(new Roles(availableRoles)); + } + + @AuthorizeInstantiation({ "role1" }) private static class TestComponent_Instantiate extends WebComponent { @@ -195,7 +193,7 @@ public class AnnotationsRoleAuthorizationStrategyTest } } - + @AuthorizeInstantiations(ruleset = { @AuthorizeInstantiation({ "role1" }), @AuthorizeInstantiation({ "role2" }) }) private static class TestComponent_Roleset_Instantiate extends WebComponent @@ -210,7 +208,7 @@ public class AnnotationsRoleAuthorizationStrategyTest } - @AuthorizeAction(action = "RENDER", roles = {"role1"}, deny = {"role3"}) + @AuthorizeAction(action = "RENDER", roles = { "role1" }, deny = { "role3" }) private static class TestComponent_Render extends WebComponent { @@ -223,7 +221,7 @@ public class AnnotationsRoleAuthorizationStrategyTest } - @AuthorizeAction(action = "ENABLE", roles = {"role1"}, deny = {"role3"}) + @AuthorizeAction(action = "ENABLE", roles = { "role1" }, deny = { "role3" }) private static class TestComponent_Enable extends WebComponent { private static final long serialVersionUID = 1L; @@ -250,29 +248,12 @@ public class AnnotationsRoleAuthorizationStrategyTest } } - private static class UnrestrictedResource implements IResource { + private static class UnrestrictedResource implements IResource + { @Override - public void respond(Attributes attributes) { + public void respond(Attributes attributes) + { ; // NOOP } } - - /** - * Create a test role checking strategy that is simply given a list of roles - * and returns true if that list contains any of the asked-for roles. - * - * @param availableRoles rules that this role checker should have - * @return test role checking strategy - */ - private IRoleCheckingStrategy roles(final String... availableRoles) - { - return new IRoleCheckingStrategy() - { - @Override - public boolean hasAnyRole(Roles requiredRoles) - { - return requiredRoles.hasAnyRole(new Roles(availableRoles)); - } - }; - } } http://git-wip-us.apache.org/repos/asf/wicket/blob/28dd4830/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AnnotationsRoleTest.java ---------------------------------------------------------------------- diff --git a/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AnnotationsRoleTest.java b/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AnnotationsRoleTest.java index 1363b4a..056666b 100644 --- a/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AnnotationsRoleTest.java +++ b/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AnnotationsRoleTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.authroles.authorization.strategies.role.annotations; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.Serializable; import java.lang.reflect.InvocationTargetException; @@ -26,38 +28,33 @@ import org.apache.wicket.authroles.authorization.strategies.role.IRoleCheckingSt import org.apache.wicket.authroles.authorization.strategies.role.RoleAuthorizationStrategy; import org.apache.wicket.authroles.authorization.strategies.role.Roles; 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; /** * Test the annotations package of the auth-roles project. * * @author Eelco Hillenius */ -public class AnnotationsRoleTest extends Assert +class AnnotationsRoleTest { WicketTester tester; - @Before - public void setUp() throws Exception - { + @BeforeEach + void setUp() { tester = new WicketTester(); } - @After - public void tearDown() throws Exception - { + @AfterEach + void tearDown() { tester.destroy(); } /** - * @throws Exception - */ + */ @Test - public void testClear() throws Exception - { + void testClear() { tester.getApplication() .getSecuritySettings() .setAuthorizationStrategy(new RoleAuthorizationStrategy(new UserRolesAuthorizer("FOO"))); @@ -66,11 +63,9 @@ public class AnnotationsRoleTest extends Assert } /** - * @throws Exception - */ + */ @Test - public void testAuthorized() throws Exception - { + void testAuthorized() { WicketTester tester = new WicketTester(); tester.getApplication() .getSecuritySettings() @@ -81,11 +76,9 @@ public class AnnotationsRoleTest extends Assert } /** - * @throws Exception - */ + */ @Test - public void testNotAuthorized() throws Exception - { + void testNotAuthorized() { WicketTester tester = new WicketTester(); tester.getApplication() .getSecuritySettings() @@ -109,8 +102,7 @@ public class AnnotationsRoleTest extends Assert try { tester.startPage(AdminPage.class); - assertTrue("an authorization exception event should have been received", - listener.eventReceived); + assertTrue(listener.eventReceived, "an authorization exception event should have been received"); } catch (Exception e) { @@ -133,7 +125,7 @@ public class AnnotationsRoleTest extends Assert /** * Construct. */ - public UserRolesAuthorizer(String roles) + UserRolesAuthorizer(String roles) { this.roles = new Roles(roles); } http://git-wip-us.apache.org/repos/asf/wicket/blob/28dd4830/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/ActionPermissionsTest.java ---------------------------------------------------------------------- diff --git a/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/ActionPermissionsTest.java b/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/ActionPermissionsTest.java index a2b24bc..d07d8c9 100644 --- a/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/ActionPermissionsTest.java +++ b/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/ActionPermissionsTest.java @@ -16,33 +16,36 @@ */ package org.apache.wicket.authroles.authorization.strategies.role.metadata; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; + import org.apache.wicket.authorization.Action; import org.apache.wicket.authroles.authorization.strategies.role.IRoleCheckingStrategy; import org.apache.wicket.authroles.authorization.strategies.role.Roles; import org.apache.wicket.markup.html.basic.Label; 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; /** * Test case for {@link ActionPermissions}. * * @author Eelco Hillenius */ -public class ActionPermissionsTest extends Assert +class ActionPermissionsTest { private WicketTester tester; - @Before - public void setUp() throws Exception + @BeforeEach + void setUp() throws Exception { tester = new WicketTester(); } - @After - public void tearDown() throws Exception + @AfterEach + void tearDown() throws Exception { tester.destroy(); } @@ -53,7 +56,7 @@ public class ActionPermissionsTest extends Assert * @throws Exception */ @Test - public void testAdd1() throws Exception + void testAdd1() throws Exception { ActionPermissions permissions = new ActionPermissions(); Action mambo = new Action("mambo"); @@ -65,7 +68,7 @@ public class ActionPermissionsTest extends Assert permissions.unauthorize(mambo, new Roles("maurice")); assertEquals(3, permissions.rolesFor(mambo).size()); permissions.authorizeAll(mambo); - assertEquals(null, permissions.rolesFor(mambo)); + assertNull(permissions.rolesFor(mambo)); } /** @@ -74,11 +77,11 @@ public class ActionPermissionsTest extends Assert * @throws Exception */ @Test - public void testRemove1() throws Exception + void testRemove1() throws Exception { ActionPermissions permissions = new ActionPermissions(); Action mambo = new Action("mambo"); - assertEquals(null, permissions.rolesFor(mambo)); + assertNull(permissions.rolesFor(mambo)); permissions.unauthorize(mambo, new Roles("maurice")); assertEquals(new Roles(MetaDataRoleAuthorizationStrategy.NO_ROLE), permissions.rolesFor(mambo)); @@ -88,7 +91,7 @@ public class ActionPermissionsTest extends Assert * Test for issue <a href="http://issues.apache.org/jira/browse/WICKET-1152";>WICKET-1152</a>. */ @Test - public void testRemove2() + void testRemove2() { Label label = new Label("label", "text"); Action mambo = new Action("mambo"); @@ -112,7 +115,7 @@ public class ActionPermissionsTest extends Assert * it with {@link #testRemove2()}. */ @Test - public void testRemove3() + void testRemove3() { Label label = new Label("label", "text"); Action mambo = new Action("mambo"); http://git-wip-us.apache.org/repos/asf/wicket/blob/28dd4830/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/InstantiationPermissionsTest.java ---------------------------------------------------------------------- diff --git a/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/InstantiationPermissionsTest.java b/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/InstantiationPermissionsTest.java index 19b7bdb..1835703 100644 --- a/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/InstantiationPermissionsTest.java +++ b/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/InstantiationPermissionsTest.java @@ -16,33 +16,35 @@ */ package org.apache.wicket.authroles.authorization.strategies.role.metadata; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; + import org.apache.wicket.Page; import org.apache.wicket.authroles.authorization.strategies.role.IRoleCheckingStrategy; import org.apache.wicket.authroles.authorization.strategies.role.Roles; 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; /** - * Test case for - * {@link InstantiationPermissions}. + * Test case for {@link InstantiationPermissions}. * * @author Eelco Hillenius */ -public class InstantiationPermissionsTest extends Assert +class InstantiationPermissionsTest { private WicketTester tester; - @Before - public void setUp() throws Exception + @BeforeEach + void setUp() throws Exception { tester = new WicketTester(); } - @After - public void tearDown() throws Exception + @AfterEach + void tearDown() throws Exception { tester.destroy(); } @@ -53,7 +55,7 @@ public class InstantiationPermissionsTest extends Assert * @throws Exception */ @Test - public void testAdd1() throws Exception + void testAdd1() throws Exception { InstantiationPermissions permissions = new InstantiationPermissions(); permissions.authorize(Page.class, new Roles("jonathan")); @@ -64,7 +66,7 @@ public class InstantiationPermissionsTest extends Assert permissions.unauthorize(Page.class, new Roles("maurice")); assertEquals(3, permissions.getRolesForComponentClass().get(Page.class).size()); permissions.authorizeAll(Page.class); - assertEquals(null, permissions.getRolesForComponentClass().get(Page.class)); + assertNull(permissions.getRolesForComponentClass().get(Page.class)); } /** @@ -73,10 +75,10 @@ public class InstantiationPermissionsTest extends Assert * @throws Exception */ @Test - public void testRemove1() throws Exception + void testRemove1() throws Exception { InstantiationPermissions permissions = new InstantiationPermissions(); - assertEquals(null, permissions.getRolesForComponentClass().get(Page.class)); + assertNull(permissions.getRolesForComponentClass().get(Page.class)); permissions.unauthorize(Page.class, new Roles("eelco")); assertEquals(new Roles(MetaDataRoleAuthorizationStrategy.NO_ROLE), permissions.getRolesForComponentClass().get(Page.class)); @@ -87,7 +89,7 @@ public class InstantiationPermissionsTest extends Assert * */ @Test - public void testRemove2() + void testRemove2() { MetaDataRoleAuthorizationStrategy strategy = new MetaDataRoleAuthorizationStrategy( new IRoleCheckingStrategy() @@ -110,7 +112,7 @@ public class InstantiationPermissionsTest extends Assert * with {@link #testRemove2()}. */ @Test - public void testRemove3() + void testRemove3() { MetaDataRoleAuthorizationStrategy strategy = new MetaDataRoleAuthorizationStrategy( new IRoleCheckingStrategy() http://git-wip-us.apache.org/repos/asf/wicket/blob/28dd4830/wicket-request/src/test/java/org/apache/wicket/request/HttpHeaderCollectionTest.java ---------------------------------------------------------------------- diff --git a/wicket-request/src/test/java/org/apache/wicket/request/HttpHeaderCollectionTest.java b/wicket-request/src/test/java/org/apache/wicket/request/HttpHeaderCollectionTest.java index 4b85c35..faabc4b 100644 --- a/wicket-request/src/test/java/org/apache/wicket/request/HttpHeaderCollectionTest.java +++ b/wicket-request/src/test/java/org/apache/wicket/request/HttpHeaderCollectionTest.java @@ -16,19 +16,19 @@ */ package org.apache.wicket.request; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +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 static org.junit.jupiter.api.Assertions.fail; import java.util.Locale; import java.util.Set; import java.util.TimeZone; import org.apache.wicket.util.time.Time; -import org.junit.Test; +import org.junit.jupiter.api.Test; @SuppressWarnings("javadoc") public class HttpHeaderCollectionTest @@ -122,7 +122,8 @@ public class HttpHeaderCollectionTest } assertArrayEquals(new String[] { "Thu, 01 Jan 1970 00:16:40 GMT", - "Thu, 01 Jan 1970 00:33:20 GMT", "not-a-date" }, headers.getHeaderValues("date")); + "Thu, 01 Jan 1970 00:33:20 GMT", "not-a-date" }, + headers.getHeaderValues("date")); headers.setHeader("date", "foobar"); try http://git-wip-us.apache.org/repos/asf/wicket/blob/28dd4830/wicket-request/src/test/java/org/apache/wicket/request/UrlTest.java ---------------------------------------------------------------------- diff --git a/wicket-request/src/test/java/org/apache/wicket/request/UrlTest.java b/wicket-request/src/test/java/org/apache/wicket/request/UrlTest.java index f5ab12c..4e12824 100644 --- a/wicket-request/src/test/java/org/apache/wicket/request/UrlTest.java +++ b/wicket-request/src/test/java/org/apache/wicket/request/UrlTest.java @@ -16,9 +16,12 @@ */ package org.apache.wicket.request; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.junit.Assert.*; +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.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -32,10 +35,10 @@ import java.util.List; import org.apache.wicket.request.Url.QueryParameter; import org.apache.wicket.request.Url.StringMode; -import org.junit.Test; +import org.junit.jupiter.api.Test; @SuppressWarnings("javadoc") -public class UrlTest +class UrlTest { private void checkSegments(Url url, String... segments) { @@ -55,7 +58,7 @@ public class UrlTest } @Test - public void parse1() + void parse1() { String s = "foo/bar/baz?a=4&b=5#foo2"; Url url = Url.parse(s); @@ -65,7 +68,7 @@ public class UrlTest } @Test - public void parse2() + void parse2() { String s = "foo/bar//baz?=4&6"; Url url = Url.parse(s); @@ -74,7 +77,7 @@ public class UrlTest } @Test - public void parse3() + void parse3() { String s = "//foo/bar/"; Url url = Url.parse(s); @@ -86,7 +89,7 @@ public class UrlTest } @Test - public void parse4() + void parse4() { String s = "/foo/bar//"; Url url = Url.parse(s); @@ -96,7 +99,7 @@ public class UrlTest } @Test - public void parse5() + void parse5() { String s = "foo/b%3Dr/b%26z/x%3F?a=b&x%3F%264=y%3Dz"; Url url = Url.parse(s); @@ -105,11 +108,10 @@ public class UrlTest } /** - * Same as #parse5() but with full url and not encoded '=' char in the query string - * WICKET-5157 + * Same as #parse5() but with full url and not encoded '=' char in the query string WICKET-5157 */ @Test - public void parse5_1() + void parse5_1() { String s = "http://host:12345/foo/b%3Dr/b%26z/x%3F?a=b&x%3F%264=y=z";; Url url = Url.parse(s); @@ -118,7 +120,7 @@ public class UrlTest } @Test - public void parse6() + void parse6() { String s = ""; Url url = Url.parse(s); @@ -127,7 +129,7 @@ public class UrlTest } @Test - public void parse7() + void parse7() { String s = "?a=b"; Url url = Url.parse(s); @@ -136,7 +138,7 @@ public class UrlTest } @Test - public void parse8() + void parse8() { String s = "/"; Url url = Url.parse(s); @@ -146,7 +148,7 @@ public class UrlTest } @Test - public void parse9() + void parse9() { String s = "/?a=b"; Url url = Url.parse(s); @@ -156,7 +158,7 @@ public class UrlTest } @Test - public void parse10() + void parse10() { String s = "/?a"; Url url = Url.parse(s); @@ -166,7 +168,7 @@ public class UrlTest } @Test - public void parse11() + void parse11() { String s = "/?a="; Url url = Url.parse(s); @@ -176,7 +178,7 @@ public class UrlTest } @Test - public void parse12() + void parse12() { String s = "/?=b"; Url url = Url.parse(s); @@ -189,7 +191,7 @@ public class UrlTest * https://issues.apache.org/jira/browse/WICKET-4398 */ @Test - public void parse13() + void parse13() { String s = "/?a=b&"; Url url = Url.parse(s); @@ -202,7 +204,7 @@ public class UrlTest * https://issues.apache.org/jira/browse/WICKET-4398 */ @Test - public void parse14() + void parse14() { String s = "/?a=b&+"; Url url = Url.parse(s); @@ -215,7 +217,7 @@ public class UrlTest * https://issues.apache.org/jira/browse/WICKET-4877 */ @Test - public void testParse15() + void testParse15() { String s = "http://localhost:56704;jsessionid=8kxeo3reannw1qjtxgkju8yiu";; Url url = Url.parse(s); @@ -228,7 +230,7 @@ public class UrlTest * https://issues.apache.org/jira/browse/WICKET-5065 */ @Test - public void parse16() + void parse16() { String s = "//localhost:56704;jsessionid=8kxeo3reannw1qjtxgkju8yiu"; Url url = Url.parse(s); @@ -242,7 +244,7 @@ public class UrlTest * WICKET-5259 */ @Test - public void parse17() + void parse17() { String s = "http://me:secret@localhost";; Url url = Url.parse(s); @@ -254,7 +256,7 @@ public class UrlTest * WICKET-5259 */ @Test - public void parse18() + void parse18() { String s = "http://me:secret@localhost:8080";; Url url = Url.parse(s); @@ -267,7 +269,7 @@ public class UrlTest * https://issues.apache.org/jira/browse/WICKET-5717 */ @Test - public void parse19() + void parse19() { String s = "http://me:secret@localhost:8080/segment/#fragment";; Url url = Url.parse(s); @@ -278,26 +280,26 @@ public class UrlTest * https://issues.apache.org/jira/browse/WICKET-5717 */ @Test - public void parse20() + void parse20() { String s = "http://me:secret@localhost:8080/segment/#";; Url url = Url.parse(s); - assertThat(url.getFragment(), is(nullValue())); + assertNull(url.getFragment()); } /** * https://issues.apache.org/jira/browse/WICKET-5717 */ @Test - public void parse21() + void parse21() { String s = "http://me:secret@localhost:8080/segment#";; Url url = Url.parse(s); - assertThat(url.getFragment(), is(nullValue())); + assertNull(url.getFragment()); } @Test - public void render1() + void render1() { Url url = new Url(); url.getSegments().add("foo"); @@ -311,7 +313,7 @@ public class UrlTest } @Test - public void render2() + void render2() { String s = "/absolute/url"; Url url = Url.parse(s); @@ -319,7 +321,7 @@ public class UrlTest } @Test - public void render3() + void render3() { String s = "//absolute/url"; Url url = Url.parse(s); @@ -327,7 +329,7 @@ public class UrlTest } @Test - public void render4() + void render4() { String s = "/"; Url url = Url.parse(s); @@ -335,7 +337,7 @@ public class UrlTest } @Test - public void render5() + void render5() { Url url = Url.parse("https://www.domain.com/foo/bar?baz=ban";); @@ -350,7 +352,7 @@ public class UrlTest } @Test - public void render6() + void render6() { Url url = Url.parse("https://www.domain.com/foo/bar?baz=ban#bat";); @@ -362,7 +364,7 @@ public class UrlTest } @Test - public void absolute1() + void absolute1() { Url url = Url.parse("abc/efg"); assertFalse(url.isFull()); @@ -370,7 +372,7 @@ public class UrlTest } @Test - public void absolute2() + void absolute2() { Url url = Url.parse(""); assertFalse(url.isFull()); @@ -378,7 +380,7 @@ public class UrlTest } @Test - public void absolute3() + void absolute3() { Url url = Url.parse("/"); assertFalse(url.isFull()); @@ -386,7 +388,7 @@ public class UrlTest } @Test - public void absolute4() + void absolute4() { Url url = Url.parse("/abc/efg"); assertFalse(url.isFull()); @@ -394,7 +396,7 @@ public class UrlTest } @Test - public void absolute5() + void absolute5() { Url url = Url.parse("http://www.domain.com";); assertTrue(url.isFull()); @@ -403,7 +405,7 @@ public class UrlTest @Test - public void concat1() + void concat1() { Url url = Url.parse("abc/efg"); url.concatSegments(Arrays.asList("xx", "yy")); @@ -411,7 +413,7 @@ public class UrlTest } @Test - public void concat2() + void concat2() { Url url = Url.parse("abc/efg"); url.concatSegments(Arrays.asList(".", "..", "xx", "yy")); @@ -419,7 +421,7 @@ public class UrlTest } @Test - public void concat3() + void concat3() { Url url = Url.parse("abc/efg"); url.concatSegments(Arrays.asList("..", "..", "xx", "yy")); @@ -427,7 +429,7 @@ public class UrlTest } @Test - public void concat4() + void concat4() { Url url = Url.parse("abc/efg"); url.concatSegments(Arrays.asList("..", "..", "..", "xx", "yy")); @@ -435,7 +437,7 @@ public class UrlTest } @Test - public void concat5() + void concat5() { Url url = Url.parse("abc/efg/"); url.concatSegments(Arrays.asList("xx", "yy")); @@ -443,7 +445,7 @@ public class UrlTest } @Test - public void concat6() + void concat6() { Url url = Url.parse("abc/efg/"); url.concatSegments(Arrays.asList("..")); @@ -451,7 +453,7 @@ public class UrlTest } @Test - public void concat7() + void concat7() { Url url = Url.parse("abc/efg/"); url.concatSegments(Arrays.asList("..", "..")); @@ -459,7 +461,7 @@ public class UrlTest } @Test - public void concat8() + void concat8() { Url url = Url.parse("fff/abc/efg/xxx"); url.concatSegments(Arrays.asList("..")); @@ -467,7 +469,7 @@ public class UrlTest } @Test - public void concat9() + void concat9() { Url url = Url.parse("fff/abc/efg/xxx"); url.concatSegments(Arrays.asList("..", "..")); @@ -478,7 +480,7 @@ public class UrlTest * @see <a href="https://issues.apache.org/jira/browse/WICKET-3363";>WICKET-3363</a> */ @Test - public void resolveRelative1() + void resolveRelative1() { Url relative = Url.parse("./a/b?p1=v1"); Url baseUrl = Url.parse("c/d?p2=v2"); @@ -491,7 +493,7 @@ public class UrlTest * @see <a href="https://issues.apache.org/jira/browse/WICKET-3363";>WICKET-3363</a> */ @Test - public void resolveRelative2() + void resolveRelative2() { Url relative = Url.parse("a/b?p1=v1"); Url baseUrl = Url.parse("c/d?p2=v2"); @@ -504,7 +506,7 @@ public class UrlTest * @see <a href="https://issues.apache.org/jira/browse/WICKET-3363";>WICKET-3363</a> */ @Test - public void resolveRelative3() + void resolveRelative3() { Url relative = Url.parse("../a/b?p1=v1"); Url baseUrl = Url.parse("c/d"); @@ -517,7 +519,7 @@ public class UrlTest * @see <a href="https://issues.apache.org/jira/browse/WICKET-4518";>WICKET-4518</a> */ @Test - public void resolveRelative4() + void resolveRelative4() { Url relative = Url.parse("../?p1=v1"); Url baseUrl = Url.parse("c/d"); @@ -530,7 +532,7 @@ public class UrlTest * @see <a href="https://issues.apache.org/jira/browse/WICKET-4789";>WICKET-4789</a> */ @Test - public void resolveRelative_EmptyTrailingSegmentInBase() + void resolveRelative_EmptyTrailingSegmentInBase() { Url relative = Url.parse("./?0-1.ILinkListener-link"); Url baseUrl = Url.parse("Home/"); @@ -543,7 +545,7 @@ public class UrlTest * @see <a href="https://issues.apache.org/jira/browse/WICKET-4789";>WICKET-4789</a> */ @Test - public void resolveRelative_EmptyTrailingSegmentInBase2() + void resolveRelative_EmptyTrailingSegmentInBase2() { Url relative = Url.parse("./foo/?0-1.ILinkListener-link"); Url baseUrl = Url.parse("Home/"); @@ -556,7 +558,7 @@ public class UrlTest * Tries to resolve a relative url against a base that has no segments */ @Test - public void resolveRelative_NoSegmentsInBase() + void resolveRelative_NoSegmentsInBase() { Url relative = Url.parse("?a=b"); Url baseUrl = Url.parse("?foo=bar"); @@ -569,7 +571,7 @@ public class UrlTest * Tries to resolve a relative url against a base that has no segments */ @Test - public void resolveRelative_NoSegmentsInBase2() + void resolveRelative_NoSegmentsInBase2() { Url relative = Url.parse("bar/baz?a=b"); Url baseUrl = Url.parse("?foo=bar"); @@ -584,14 +586,14 @@ public class UrlTest * @see <a href="https://issues.apache.org/jira/browse/WICKET-4518";>WICKET-4518</a> */ @Test - public void resolveRelative_DotFollowedByEmptySegment1() + void resolveRelative_DotFollowedByEmptySegment1() { Url relative = Url.parse("./?a=b"); Url baseUrl = Url.parse("bar"); baseUrl.resolveRelative(relative); assertEquals("?a=b", baseUrl.toString()); - assertEquals("no empty segment", 0, baseUrl.getSegments().size()); + assertEquals(0, baseUrl.getSegments().size(), "no empty segment"); } /** @@ -600,7 +602,7 @@ public class UrlTest * @see <a href="https://issues.apache.org/jira/browse/WICKET-4518";>WICKET-4518</a> */ @Test - public void resolveRelative_DotFollowedByEmptySegment2() + void resolveRelative_DotFollowedByEmptySegment2() { Url relative = Url.parse("./?a=b"); Url baseUrl = Url.parse("bar/baz"); @@ -613,7 +615,7 @@ public class UrlTest * Tests that the default charset is UTF-8 */ @Test - public void charset1() + void charset1() { Url url = new Url(); assertEquals(Charset.forName("UTF-8"), url.getCharset()); @@ -623,7 +625,7 @@ public class UrlTest * Tests setting the charset explicitly in the constructor */ @Test - public void charset2() + void charset2() { Charset expected = Charset.forName("ISO-8859-2"); Url url = new Url(expected); @@ -636,7 +638,7 @@ public class UrlTest * @throws Exception */ @Test - public void charset3() throws Exception + void charset3() throws Exception { Charset expected = Charset.forName("ISO-8859-1"); Url url = new Url(expected); @@ -654,7 +656,7 @@ public class UrlTest } @Test - public void parseRelativeUrl() + void parseRelativeUrl() { Url url = Url.parse("foo"); checkUrl(url, null, null, null, "foo"); @@ -680,7 +682,7 @@ public class UrlTest } @Test - public void parseAbsoluteUrl() + void parseAbsoluteUrl() { Url url = Url.parse("ftp://myhost:8081";); checkUrl(url, "ftp", "myhost", 8081, "", ""); @@ -753,7 +755,7 @@ public class UrlTest } @Test - public void compact() + void compact() { assertEquals("", Url.parse("").canonical().getPath()); assertEquals("/", Url.parse("/").canonical().getPath()); @@ -773,7 +775,7 @@ public class UrlTest } @Test - public void copyConstructor() + void copyConstructor() { String protocol = "myProtocol"; String host = "www.example.com"; @@ -802,7 +804,7 @@ public class UrlTest * it as absolute only if there are no slashes earlier in the string. */ @Test - public void parseHttpSlashSlashColon() + void parseHttpSlashSlashColon() { // relative String uri = "/abc/http://host:9090/";; @@ -823,7 +825,7 @@ public class UrlTest } @Test - public void prependLeadingSegments1() + void prependLeadingSegments1() { Url url = Url.parse("a"); @@ -833,7 +835,7 @@ public class UrlTest } @Test - public void prependLeadingSegments2() + void prependLeadingSegments2() { Url url = Url.parse("a"); @@ -843,7 +845,7 @@ public class UrlTest } @Test - public void prependLeadingSegments3() + void prependLeadingSegments3() { Url url = Url.parse("a"); @@ -853,7 +855,7 @@ public class UrlTest } @Test - public void prependLeadingSegments4() + void prependLeadingSegments4() { Url url = new Url(); @@ -863,7 +865,7 @@ public class UrlTest } @Test - public void removeLeadingSegments1() + void removeLeadingSegments1() { Url url = Url.parse("a/b"); @@ -872,7 +874,7 @@ public class UrlTest } @Test - public void removeLeadingSegments2() + void removeLeadingSegments2() { Url url = Url.parse("a/b"); @@ -880,50 +882,54 @@ public class UrlTest assertEquals("", url.toString()); } - @Test(expected = IllegalArgumentException.class) - public void removeLeadingSegments3() + @Test + void removeLeadingSegments3() { - Url url = Url.parse("a/b"); + assertThrows(IllegalArgumentException.class, () -> { + Url url = Url.parse("a/b"); - url.removeLeadingSegments(3); + url.removeLeadingSegments(3); + }); } @Test - public void wicket_5114_allowtoStringFullWhenContainingTwoDots() + void wicket_5114_allowtoStringFullWhenContainingTwoDots() { Url url = Url.parse("/mountPoint/whatever.../"); url.setHost("wicketHost"); assertEquals("//wicketHost/mountPoint/whatever.../", url.toString(StringMode.FULL)); } - @Test(expected = IllegalStateException.class) - public void wicket_5114_throwExceptionWhenToStringFullContainsRelativePathSegment() + @Test + void wicket_5114_throwExceptionWhenToStringFullContainsRelativePathSegment() { - Url url = Url.parse("/mountPoint/../whatever/"); - url.setHost("wicketHost"); - url.toString(StringMode.FULL); + assertThrows(IllegalStateException.class, () -> { + Url url = Url.parse("/mountPoint/../whatever/"); + url.setHost("wicketHost"); + url.toString(StringMode.FULL); + }); } @Test - public void contextRelativeIsntReadAsContextAbsolute() throws Exception + void contextRelativeIsntReadAsContextAbsolute() throws Exception { Url url = Url.parse("/segment"); url.setContextRelative(true); - assertThat(url.isContextRelative(), is(true)); - assertThat(url.isContextAbsolute(), is(false)); + assertTrue(url.isContextRelative()); + assertFalse(url.isContextAbsolute()); } @Test - public void contextRelativeIsntReadAsFull() throws Exception + void contextRelativeIsntReadAsFull() throws Exception { Url url = Url.parse("http://www.example.com/segment";); url.setContextRelative(true); - assertThat(url.isContextRelative(), is(true)); - assertThat(url.isFull(), is(false)); + assertTrue(url.isContextRelative()); + assertFalse(url.isFull()); } @Test - public void isContextAbsolute() + void isContextAbsolute() { Url url = Url.parse(""); assertFalse(url.isContextAbsolute()); @@ -942,7 +948,7 @@ public class UrlTest } @Test - public void isFull() + void isFull() { Url url = Url.parse(""); assertFalse(url.isFull()); @@ -965,7 +971,7 @@ public class UrlTest * https://issues.apache.org/jira/browse/WICKET-5157 */ @Test - public void parseQueryStringWithEqualsSignInParameterValue() + void parseQueryStringWithEqualsSignInParameterValue() { String s = "/?a=b=c&d=e=f"; Url url = Url.parse(s); @@ -973,28 +979,28 @@ public class UrlTest checkSegments(url, "", ""); checkQueryParams(url, "a", "b=c", "d", "e=f"); } - + /** * Parse IP6 addresses (https://www.ietf.org/rfc/rfc2732.txt) * * https://issues.apache.org/jira/browse/WICKET-5809 */ @Test - public void parseIp6Address() + void parseIp6Address() { String s = "https://[::1]/myapp";; Url url = Url.parse(s); - + assertTrue(url.isFull()); checkUrl(url, "https", "[::1]", 443, "", "myapp"); - - //now with port in URL + + // now with port in URL s = "http://[::1]:1234/myapp";; - + url = Url.parse(s); - + assertTrue(url.isFull()); checkUrl(url, "http", "[::1]", 1234, "", "myapp"); - + } } http://git-wip-us.apache.org/repos/asf/wicket/blob/28dd4830/wicket-request/src/test/java/org/apache/wicket/request/UrlUtilsTest.java ---------------------------------------------------------------------- diff --git a/wicket-request/src/test/java/org/apache/wicket/request/UrlUtilsTest.java b/wicket-request/src/test/java/org/apache/wicket/request/UrlUtilsTest.java index fc13753..23eab12 100644 --- a/wicket-request/src/test/java/org/apache/wicket/request/UrlUtilsTest.java +++ b/wicket-request/src/test/java/org/apache/wicket/request/UrlUtilsTest.java @@ -16,21 +16,21 @@ */ package org.apache.wicket.request; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +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.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link UrlUtils} */ -public class UrlUtilsTest +class UrlUtilsTest { /** */ @Test - public void isRelative() + void isRelative() { assertTrue(UrlUtils.isRelative("./mypage?return=http://example.com";)); assertTrue(UrlUtils.isRelative("./path/path2?param1=value1")); @@ -41,7 +41,7 @@ public class UrlUtilsTest /** */ @Test - public void normalizePath() + void normalizePath() { // test basic normalization assertEquals("/foo/bar", UrlUtils.normalizePath("foo/bar")); http://git-wip-us.apache.org/repos/asf/wicket/blob/28dd4830/wicket-request/src/test/java/org/apache/wicket/request/http/handler/RedirectRequestHandlerTest.java ---------------------------------------------------------------------- diff --git a/wicket-request/src/test/java/org/apache/wicket/request/http/handler/RedirectRequestHandlerTest.java b/wicket-request/src/test/java/org/apache/wicket/request/http/handler/RedirectRequestHandlerTest.java index d6239dc..ef917d3 100644 --- a/wicket-request/src/test/java/org/apache/wicket/request/http/handler/RedirectRequestHandlerTest.java +++ b/wicket-request/src/test/java/org/apache/wicket/request/http/handler/RedirectRequestHandlerTest.java @@ -20,13 +20,13 @@ import javax.servlet.http.HttpServletResponse; import org.apache.wicket.request.IRequestCycle; import org.apache.wicket.request.http.WebResponse; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; /** * RedirectRequestHandlerTest */ -public class RedirectRequestHandlerTest +class RedirectRequestHandlerTest { private static final String REDIRECT_URL = "redirectUrl"; @@ -35,7 +35,7 @@ public class RedirectRequestHandlerTest * permenanentlyMovedShouldSetLocationHeader() */ @Test - public void permenanentlyMovedShouldSetLocationHeader() + void permenanentlyMovedShouldSetLocationHeader() { RedirectRequestHandler handler = new RedirectRequestHandler(REDIRECT_URL, HttpServletResponse.SC_MOVED_PERMANENTLY); @@ -55,7 +55,7 @@ public class RedirectRequestHandlerTest * tempMovedShouldRedirect() */ @Test - public void tempMovedShouldRedirect() + void tempMovedShouldRedirect() { RedirectRequestHandler handler = new RedirectRequestHandler(REDIRECT_URL, HttpServletResponse.SC_MOVED_TEMPORARILY); @@ -74,10 +74,10 @@ public class RedirectRequestHandlerTest * https://issues.apache.org/jira/browse/WICKET-5131 */ @Test - public void seeOtherShouldSetLocationHeader() + void seeOtherShouldSetLocationHeader() { RedirectRequestHandler handler = new RedirectRequestHandler(REDIRECT_URL, - HttpServletResponse.SC_SEE_OTHER); + HttpServletResponse.SC_SEE_OTHER); IRequestCycle requestCycle = Mockito.mock(IRequestCycle.class); WebResponse webResponse = Mockito.mock(WebResponse.class); http://git-wip-us.apache.org/repos/asf/wicket/blob/28dd4830/wicket-request/src/test/java/org/apache/wicket/request/mapper/CompoundRequestMapperTest.java ---------------------------------------------------------------------- diff --git a/wicket-request/src/test/java/org/apache/wicket/request/mapper/CompoundRequestMapperTest.java b/wicket-request/src/test/java/org/apache/wicket/request/mapper/CompoundRequestMapperTest.java index 977edf7..943df12 100644 --- a/wicket-request/src/test/java/org/apache/wicket/request/mapper/CompoundRequestMapperTest.java +++ b/wicket-request/src/test/java/org/apache/wicket/request/mapper/CompoundRequestMapperTest.java @@ -16,22 +16,24 @@ */ package org.apache.wicket.request.mapper; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.request.mapper.CompoundRequestMapper.MapperWithScore; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link CompoundRequestMapper} */ -public class CompoundRequestMapperTest extends Assert +class CompoundRequestMapperTest { /** * Test {@link MapperWithScore#compareTo(MapperWithScore)}. */ @Test - public void score() + void score() { - assertTrue(score(0).compareTo(score(0)) == 0); + assertEquals(0, score(0).compareTo(score(0))); assertTrue(score(0).compareTo(score(10)) > 0); assertTrue(score(10).compareTo(score(0)) < 0); assertTrue(score(0).compareTo(score(10)) > 0); http://git-wip-us.apache.org/repos/asf/wicket/blob/28dd4830/wicket-request/src/test/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoderTest.java ---------------------------------------------------------------------- diff --git a/wicket-request/src/test/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoderTest.java b/wicket-request/src/test/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoderTest.java index e58a920..27fde72 100644 --- a/wicket-request/src/test/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoderTest.java +++ b/wicket-request/src/test/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoderTest.java @@ -16,32 +16,29 @@ */ package org.apache.wicket.request.mapper.parameter; -import static org.hamcrest.CoreMatchers.is; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.wicket.request.Url; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for PageParametersEncoder */ -public class PageParametersEncoderTest extends Assert +class PageParametersEncoderTest { /** * Tests that PageParametersEncoder decodes parameters - * - * @throws Exception + * */ @Test - public void decodeParameters() throws Exception - { + void decodeParameters() { PageParametersEncoder encoder = new PageParametersEncoder(); Url url = Url.parse("idx1/idx2?named1=value1&=&named2=value2"); PageParameters pageParameters = encoder.decodePageParameters(url); - assertThat(pageParameters.getIndexedCount(), is(2)); - assertThat(pageParameters.getNamedKeys().size(), is(2)); + assertEquals(2, pageParameters.getIndexedCount()); + assertEquals(2, pageParameters.getNamedKeys().size()); assertEquals("idx1", pageParameters.get(0).toOptionalString()); assertEquals("idx2", pageParameters.get(1).toOptionalString()); assertEquals("value1", pageParameters.get("named1").toOptionalString()); http://git-wip-us.apache.org/repos/asf/wicket/blob/28dd4830/wicket-request/src/test/java/org/apache/wicket/request/mapper/parameter/PageParametersTest.java ---------------------------------------------------------------------- diff --git a/wicket-request/src/test/java/org/apache/wicket/request/mapper/parameter/PageParametersTest.java b/wicket-request/src/test/java/org/apache/wicket/request/mapper/parameter/PageParametersTest.java index d390eee..513e9ff 100644 --- a/wicket-request/src/test/java/org/apache/wicket/request/mapper/parameter/PageParametersTest.java +++ b/wicket-request/src/test/java/org/apache/wicket/request/mapper/parameter/PageParametersTest.java @@ -16,20 +16,19 @@ */ package org.apache.wicket.request.mapper.parameter; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.Matchers.not; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; import org.apache.wicket.util.string.StringValue; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link PageParameters} */ -public class PageParametersTest extends Assert +class PageParametersTest { /** @@ -37,7 +36,7 @@ public class PageParametersTest extends Assert * StringValue's for that key */ @Test - public void addStringArrayValue() + void addStringArrayValue() { PageParameters parameters = new PageParameters(); @@ -70,36 +69,34 @@ public class PageParametersTest extends Assert * https://issues.apache.org/jira/browse/WICKET-3906 */ @Test - public void getPosition() + void getPosition() { PageParameters parameters = new PageParameters(); parameters.set("named1", "value1", 3, INamedParameters.Type.MANUAL); - assertEquals( - "Adding a parameter at position out of the size of the list will just append it", 0, - parameters.getPosition("named1")); + assertEquals(0, parameters.getPosition("named1"), + "Adding a parameter at position out of the size of the list will just append it"); parameters.set("named2", "value2", 0, INamedParameters.Type.MANUAL); assertEquals(0, parameters.getPosition("named2")); - assertEquals("'named1' should be moved back", 1, parameters.getPosition("named1")); + assertEquals(1, parameters.getPosition("named1"), "'named1' should be moved back"); parameters.set("named3", "value3", -100, INamedParameters.Type.MANUAL); assertEquals(0, parameters.getPosition("named2")); assertEquals(1, parameters.getPosition("named1")); - assertEquals("Adding a parameter with negative position will just append it.", 2, - parameters.getPosition("named3")); + assertEquals(2, parameters.getPosition("named3"), + "Adding a parameter with negative position will just append it."); } /** * Tests that overwriting (via #set()) a named parameter will preserve its position */ @Test - public void set() + void set() { PageParameters parameters = new PageParameters(); - parameters - .add("named1", "value1", INamedParameters.Type.MANUAL) - .add("named2", "value2", INamedParameters.Type.MANUAL); + parameters.add("named1", "value1", INamedParameters.Type.MANUAL).add("named2", "value2", + INamedParameters.Type.MANUAL); assertEquals(0, parameters.getPosition("named1")); assertEquals(1, parameters.getPosition("named2")); @@ -119,11 +116,11 @@ public class PageParametersTest extends Assert * Remove the parameter by its name */ @Test - public void removeParameters() + void removeParameters() { PageParameters parameters = new PageParameters() - .add("named1", "value1", INamedParameters.Type.MANUAL) - .add("named2", "value2", INamedParameters.Type.MANUAL); + .add("named1", "value1", INamedParameters.Type.MANUAL) + .add("named2", "value2", INamedParameters.Type.MANUAL); assertEquals("value1", parameters.get("named1").toString()); assertEquals("value2", parameters.get("named2").toString()); @@ -139,11 +136,11 @@ public class PageParametersTest extends Assert * Remove the parameter by its name only if its value is equal to the criteria */ @Test - public void removeParametersByValue() + void removeParametersByValue() { PageParameters parameters = new PageParameters() - .add("named1", "value1", INamedParameters.Type.MANUAL) - .add("named1", "value2", INamedParameters.Type.MANUAL); + .add("named1", "value1", INamedParameters.Type.MANUAL) + .add("named1", "value2", INamedParameters.Type.MANUAL); assertEquals(2, parameters.getAllNamed().size()); @@ -157,10 +154,9 @@ public class PageParametersTest extends Assert * Merge PageParameters, also when other has multiple values for the same name */ @Test - public void mergeParameters() + void mergeParameters() { - PageParameters left = new PageParameters() - .add("left", "left", INamedParameters.Type.MANUAL) + PageParameters left = new PageParameters().add("left", "left", INamedParameters.Type.MANUAL) .add("both", "both1", INamedParameters.Type.MANUAL) .add("both", "both2", INamedParameters.Type.MANUAL) .set(0, "val0") @@ -187,59 +183,59 @@ public class PageParametersTest extends Assert * https://issues.apache.org/jira/browse/WICKET-5669 */ @Test - public void parameterTypes() + void parameterTypes() { PageParameters p = new PageParameters() - .add("pathName1", "pathValue1", INamedParameters.Type.PATH) - .add("pathName1", "pathValue1.1", INamedParameters.Type.PATH) - .add("pathName2", "pathValue2", INamedParameters.Type.PATH) - .add("queryName1", "queryValue1", INamedParameters.Type.QUERY_STRING) - .add("queryName1", "queryValue1.1", INamedParameters.Type.QUERY_STRING) - .add("queryName2", "queryValue2", INamedParameters.Type.QUERY_STRING) - .add("manualName1", "manualValue1", INamedParameters.Type.MANUAL) - .add("manualName1", "manualValue1.1", INamedParameters.Type.MANUAL) - .add("manualName2", "manualValue2", INamedParameters.Type.MANUAL); + .add("pathName1", "pathValue1", INamedParameters.Type.PATH) + .add("pathName1", "pathValue1.1", INamedParameters.Type.PATH) + .add("pathName2", "pathValue2", INamedParameters.Type.PATH) + .add("queryName1", "queryValue1", INamedParameters.Type.QUERY_STRING) + .add("queryName1", "queryValue1.1", INamedParameters.Type.QUERY_STRING) + .add("queryName2", "queryValue2", INamedParameters.Type.QUERY_STRING) + .add("manualName1", "manualValue1", INamedParameters.Type.MANUAL) + .add("manualName1", "manualValue1.1", INamedParameters.Type.MANUAL) + .add("manualName2", "manualValue2", INamedParameters.Type.MANUAL); { // PATH - assertThat(p.getAllNamedByType(INamedParameters.Type.PATH).size(), is(3)); + assertEquals(3, p.getAllNamedByType(INamedParameters.Type.PATH).size()); List<StringValue> pathName1Values = p.getValues("pathName1"); - assertThat(pathName1Values.size(), is(2)); - assertThat(pathName1Values.get(0).toString(), is("pathValue1")); - assertThat(pathName1Values.get(1).toString(), is("pathValue1.1")); + assertEquals(2, pathName1Values.size()); + assertEquals("pathValue1", pathName1Values.get(0).toString()); + assertEquals("pathValue1.1", pathName1Values.get(1).toString()); List<StringValue> pathName2Values = p.getValues("pathName2"); - assertThat(pathName2Values.size(), is(1)); - assertThat(pathName2Values.get(0).toString(), is("pathValue2")); + assertEquals(1, pathName2Values.size()); + assertEquals("pathValue2", pathName2Values.get(0).toString()); } { // QUERY STRING - assertThat(p.getAllNamedByType(INamedParameters.Type.QUERY_STRING).size(), is(3)); + assertEquals(3, p.getAllNamedByType(INamedParameters.Type.QUERY_STRING).size()); List<StringValue> queryName1Values = p.getValues("queryName1"); - assertThat(queryName1Values.size(), is(2)); - assertThat(queryName1Values.get(0).toString(), is("queryValue1")); - assertThat(queryName1Values.get(1).toString(), is("queryValue1.1")); + assertEquals(2, queryName1Values.size()); + assertEquals("queryValue1", queryName1Values.get(0).toString()); + assertEquals("queryValue1.1", queryName1Values.get(1).toString()); List<StringValue> queryName2Values = p.getValues("queryName2"); - assertThat(queryName2Values.size(), is(1)); - assertThat(queryName2Values.get(0).toString(), is("queryValue2")); + assertEquals(1, queryName2Values.size()); + assertEquals("queryValue2", queryName2Values.get(0).toString()); } { // MANUAL - assertThat(p.getAllNamedByType(INamedParameters.Type.MANUAL).size(), is(3)); + assertEquals(3, p.getAllNamedByType(INamedParameters.Type.MANUAL).size()); List<StringValue> manualName1Values = p.getValues("manualName1"); - assertThat(manualName1Values.size(), is(2)); - assertThat(manualName1Values.get(0).toString(), is("manualValue1")); - assertThat(manualName1Values.get(1).toString(), is("manualValue1.1")); + assertEquals(2, manualName1Values.size()); + assertEquals("manualValue1", manualName1Values.get(0).toString()); + assertEquals("manualValue1.1", manualName1Values.get(1).toString()); List<StringValue> manualName2Values = p.getValues("manualName2"); - assertThat(manualName2Values.size(), is(1)); - assertThat(manualName2Values.get(0).toString(), is("manualValue2")); + assertEquals(1, manualName2Values.size()); + assertEquals("manualValue2", manualName2Values.get(0).toString()); } } @@ -247,33 +243,33 @@ public class PageParametersTest extends Assert * https://issues.apache.org/jira/browse/WICKET-5669 */ @Test - public void addWithoutTypeIsManual() + void addWithoutTypeIsManual() { PageParameters p = new PageParameters(); p.add("name", "value"); - assertThat(p.getAllNamed().get(0).getType(), is(INamedParameters.Type.MANUAL)); + assertEquals(INamedParameters.Type.MANUAL, p.getAllNamed().get(0).getType()); } /** * https://issues.apache.org/jira/browse/WICKET-5669 */ @Test - public void setWithoutTypeIsManual() + void setWithoutTypeIsManual() { PageParameters p = new PageParameters(); p.set("name", "value"); - assertThat(p.getAllNamed().get(0).getType(), is(INamedParameters.Type.MANUAL)); + assertEquals(INamedParameters.Type.MANUAL, p.getAllNamed().get(0).getType()); } /** * https://issues.apache.org/jira/browse/WICKET-5669 */ @Test - public void setWithIndexWithoutTypeIsManual() + void setWithIndexWithoutTypeIsManual() { PageParameters p = new PageParameters(); p.set("name", "value", 3); - assertThat(p.getAllNamed().get(0).getType(), is(INamedParameters.Type.MANUAL)); + assertEquals(INamedParameters.Type.MANUAL, p.getAllNamed().get(0).getType()); } /** @@ -282,17 +278,15 @@ public class PageParametersTest extends Assert * https://issues.apache.org/jira/browse/WICKET-5669 */ @Test - public void equality() + void equality() { - PageParameters p1 = new PageParameters() - .add("a", "b", INamedParameters.Type.MANUAL) - .set("c", "d", INamedParameters.Type.MANUAL); + PageParameters p1 = new PageParameters().add("a", "b", INamedParameters.Type.MANUAL) + .set("c", "d", INamedParameters.Type.MANUAL); - PageParameters p2 = new PageParameters() - .set("a", "b", INamedParameters.Type.QUERY_STRING) - .add("c", "d", INamedParameters.Type.PATH); + PageParameters p2 = new PageParameters().set("a", "b", INamedParameters.Type.QUERY_STRING) + .add("c", "d", INamedParameters.Type.PATH); - assertThat(p1, is(equalTo(p2))); + assertEquals(p2, p1); } /** @@ -301,17 +295,12 @@ public class PageParametersTest extends Assert * https://issues.apache.org/jira/browse/WICKET-6283 */ @Test - public void equalityOfDifferentNamedParametersOrder() + void equalityOfDifferentNamedParametersOrder() { - PageParameters p1 = new PageParameters() - .add("a", "b") - .add("c", "d"); + PageParameters p1 = new PageParameters().add("a", "b").add("c", "d"); + PageParameters p2 = new PageParameters().add("c", "d").add("a", "b"); - PageParameters p2 = new PageParameters() - .add("c", "d") - .add("a", "b"); - - assertThat(p1, is(equalTo(p2))); + assertEquals(p2, p1); } /** @@ -320,14 +309,11 @@ public class PageParametersTest extends Assert * https://issues.apache.org/jira/browse/WICKET-6332 */ @Test - public void equalityWithEmptyNamedParameters() + void equalityWithEmptyNamedParameters() { - PageParameters p1 = new PageParameters() - .add("a", "b"); - - PageParameters p2 = new PageParameters(); + PageParameters p1 = new PageParameters().add("a", "b"); - assertThat(p1, is(not(equalTo(p2)))); + assertNotEquals(new PageParameters(), p1); } /** @@ -336,14 +322,11 @@ public class PageParametersTest extends Assert * https://issues.apache.org/jira/browse/WICKET-6332 */ @Test - public void equalityWithEmptyIndexedParameters() + void equalityWithEmptyIndexedParameters() { - PageParameters p1 = new PageParameters() - .set(0, "b"); - - PageParameters p2 = new PageParameters(); + PageParameters p1 = new PageParameters().set(0, "b"); - assertThat(p1, is(not(equalTo(p2)))); + assertNotEquals(new PageParameters(), p1); } /** @@ -352,16 +335,14 @@ public class PageParametersTest extends Assert * https://issues.apache.org/jira/browse/WICKET-5669 */ @Test - public void hashcode() + void hashcode() { - PageParameters p1 = new PageParameters() - .add("a", "b", INamedParameters.Type.MANUAL) - .set("c", "d", INamedParameters.Type.MANUAL); + PageParameters p1 = new PageParameters().add("a", "b", INamedParameters.Type.MANUAL) + .set("c", "d", INamedParameters.Type.MANUAL); - PageParameters p2 = new PageParameters() - .set("a", "b", INamedParameters.Type.QUERY_STRING) - .add("c", "d", INamedParameters.Type.PATH); + PageParameters p2 = new PageParameters().set("a", "b", INamedParameters.Type.QUERY_STRING) + .add("c", "d", INamedParameters.Type.PATH); - assertThat(p1.hashCode(), is(equalTo(p2.hashCode()))); + assertEquals(p2.hashCode(), p1.hashCode()); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/28dd4830/wicket-request/src/test/java/org/apache/wicket/request/mapper/parameter/UrlPathPageParametersEncoderTest.java ---------------------------------------------------------------------- diff --git a/wicket-request/src/test/java/org/apache/wicket/request/mapper/parameter/UrlPathPageParametersEncoderTest.java b/wicket-request/src/test/java/org/apache/wicket/request/mapper/parameter/UrlPathPageParametersEncoderTest.java index 4217c19..a331cc4 100644 --- a/wicket-request/src/test/java/org/apache/wicket/request/mapper/parameter/UrlPathPageParametersEncoderTest.java +++ b/wicket-request/src/test/java/org/apache/wicket/request/mapper/parameter/UrlPathPageParametersEncoderTest.java @@ -16,21 +16,23 @@ */ package org.apache.wicket.request.mapper.parameter; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.apache.wicket.request.Url; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link UrlPathPageParametersEncoder} */ -public class UrlPathPageParametersEncoderTest extends Assert +class UrlPathPageParametersEncoderTest { /** * Encode named parameters in the segments (so they look like indexed parameters) */ @Test - public void encodeNamedParameters() + void encodeNamedParameters() { PageParameters params = new PageParameters(); params.add("name1", "value1", INamedParameters.Type.MANUAL); @@ -47,7 +49,7 @@ public class UrlPathPageParametersEncoderTest extends Assert * and/or value have non-ASCII characters */ @Test - public void encodeNamedParametersWithSpecialChars() + void encodeNamedParametersWithSpecialChars() { // the non-ASCII characters are randomly chosen PageParameters params = new PageParameters(); @@ -63,22 +65,24 @@ public class UrlPathPageParametersEncoderTest extends Assert /** * This encoder doesn't support indexed parameters */ - @Test(expected = IllegalArgumentException.class) - public void encodeIndexedParameters() + @Test + void encodeIndexedParameters() { - PageParameters params = new PageParameters(); - params.set(0, "value1"); - params.set(1, "value2"); - - UrlPathPageParametersEncoder encoder = new UrlPathPageParametersEncoder(); - encoder.encodePageParameters(params); + assertThrows(IllegalArgumentException.class, () -> { + PageParameters params = new PageParameters(); + params.set(0, "value1"); + params.set(1, "value2"); + + UrlPathPageParametersEncoder encoder = new UrlPathPageParametersEncoder(); + encoder.encodePageParameters(params); + }); } /** * Decode properly encoded parameters */ @Test - public void decodeUrl() + void decodeUrl() { Url url = Url.parse("name1/value1/name2/value2"); @@ -95,7 +99,7 @@ public class UrlPathPageParametersEncoderTest extends Assert * ignored */ @Test - public void decodeUrlWithTrailingSlash() + void decodeUrlWithTrailingSlash() { Url url = Url.parse("name1/value1/name2/value2/"); @@ -112,7 +116,7 @@ public class UrlPathPageParametersEncoderTest extends Assert * ignored */ @Test - public void decodeUrlWithTrailingSlashAfterName() + void decodeUrlWithTrailingSlashAfterName() { Url url = Url.parse("name1/value1/name2/value2/name3"); @@ -128,7 +132,7 @@ public class UrlPathPageParametersEncoderTest extends Assert * Decode encoded parameters with a leading slash. The empty name segment should be ignored. */ @Test - public void decodeUrlWithLeadingSlash() + void decodeUrlWithLeadingSlash() { Url url = Url.parse("/name1/value1/name2/value2"); @@ -145,7 +149,7 @@ public class UrlPathPageParametersEncoderTest extends Assert * ignored. */ @Test - public void decodeUrlWithSlashesInTheMiddle() + void decodeUrlWithSlashesInTheMiddle() { Url url = Url.parse("name1/value1////name2/value2"); @@ -162,7 +166,7 @@ public class UrlPathPageParametersEncoderTest extends Assert * ignored. */ @Test - public void decodeUrlWithSlashesInTheMiddleAndEmptyValue() + void decodeUrlWithSlashesInTheMiddleAndEmptyValue() { Url url = Url.parse("name1/value1////name2//"); http://git-wip-us.apache.org/repos/asf/wicket/blob/28dd4830/wicket-request/src/test/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapterTest.java ---------------------------------------------------------------------- diff --git a/wicket-request/src/test/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapterTest.java b/wicket-request/src/test/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapterTest.java index 77f441f..248ec3f 100644 --- a/wicket-request/src/test/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapterTest.java +++ b/wicket-request/src/test/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapterTest.java @@ -16,17 +16,18 @@ */ package org.apache.wicket.request.parameter; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.List; import org.apache.wicket.request.Url; import org.apache.wicket.util.string.StringValue; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @since 1.5.5 */ -public class CombinedRequestParametersAdapterTest extends Assert +public class CombinedRequestParametersAdapterTest { /** * Tests that org.apache.wicket.request.parameter.CombinedRequestParametersAdapter#getParameterValues(java.lang.String) http://git-wip-us.apache.org/repos/asf/wicket/blob/28dd4830/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java b/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java index 8485723..596b2ed 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java @@ -16,14 +16,6 @@ */ package org.apache.wicket.util.license; -import org.apache.wicket.util.lang.Generics; -import org.apache.wicket.util.string.Strings; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.opentest4j.AssertionFailedError; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.File; import java.io.FileFilter; import java.util.ArrayList; @@ -31,6 +23,15 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Objects; + +import org.apache.wicket.util.lang.Generics; +import org.apache.wicket.util.string.Strings; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.opentest4j.AssertionFailedError; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Testcase used in the different wicket projects for testing for the correct ASL license headers. @@ -96,7 +97,7 @@ public abstract class ApacheLicenseHeaderTestCase * */ @BeforeEach - public final void before() + final void before() { // setup the base directory for when running inside maven (building a release // comes to mind). @@ -111,7 +112,7 @@ public abstract class ApacheLicenseHeaderTestCase * Test all the files in the project which has an associated {@link ILicenseHeaderHandler}. */ @Test - public void licenseHeaders() + void licenseHeaders() { licenseHeaderHandlers = new ILicenseHeaderHandler[] { new JavaLicenseHeaderHandler(javaIgnore), @@ -180,15 +181,7 @@ public abstract class ApacheLicenseHeaderTestCase // Find the license type String licenseType = licenseHeaderHandler.getLicenseType(file); - if (licenseType == null) - { - failString.append("NONE"); - } - else - { - failString.append(licenseType); - } - + failString.append(Objects.requireNonNullElse(licenseType, "NONE")); failString.append(' ').append(filename).append(LINE_ENDING); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/28dd4830/wicket-util/src/test/java/org/apache/wicket/util/collections/IntHashMapTest.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/test/java/org/apache/wicket/util/collections/IntHashMapTest.java b/wicket-util/src/test/java/org/apache/wicket/util/collections/IntHashMapTest.java index 4f8fdca..f3e9587 100644 --- a/wicket-util/src/test/java/org/apache/wicket/util/collections/IntHashMapTest.java +++ b/wicket-util/src/test/java/org/apache/wicket/util/collections/IntHashMapTest.java @@ -16,23 +16,23 @@ */ package org.apache.wicket.util.collections; -import org.apache.wicket.util.io.ByteArrayOutputStream; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.apache.wicket.util.io.ByteArrayOutputStream; +import org.junit.jupiter.api.Test; @SuppressWarnings("javadoc") -public class IntHashMapTest +class IntHashMapTest { @SuppressWarnings({ "resource", "unchecked" }) @Test - public void serialize() throws IOException, ClassNotFoundException + void serialize() throws IOException, ClassNotFoundException { IntHashMap<String> map = new IntHashMap<>(); map.put(1, "one"); @@ -45,10 +45,10 @@ public class IntHashMapTest byte[] serialized = baos.toByteArray(); ByteArrayInputStream bais = new ByteArrayInputStream(serialized); ObjectInputStream ois = new ObjectInputStream(bais); - IntHashMap<String> deserialized = (IntHashMap<String>) ois.readObject(); + IntHashMap<String> deserialized = (IntHashMap<String>)ois.readObject(); assertNotNull(deserialized); - assertEquals(deserialized.get(1), "one"); - assertEquals(deserialized.get(2), "two"); + assertEquals("one", deserialized.get(1)); + assertEquals("two", deserialized.get(2)); // WICKET-5584 deserialized.put(3, "three");
