You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2018/09/26 13:39:31 UTC
[01/45] wicket git commit: wicket-auth-roles: Migrate to Junit 5
wicket-request: Migrate to Junit 5 wicket-util: fix Assertion order
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 <jo...@gmx.de>
Authored: Thu Aug 30 22:59:22 2018 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
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");
[38/45] wicket git commit: wicket-auth-roles: Migrate to Junit 5
wicket-request: Migrate to Junit 5 wicket-util: fix Assertion order
Posted by mg...@apache.org.
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/cba693fb
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/cba693fb
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/cba693fb
Branch: refs/heads/master
Commit: cba693fbd8bd1f0cd7c0be8bc6a6aba73a8e5dae
Parents: c30e329
Author: renoth <jo...@gmx.de>
Authored: Thu Aug 30 22:59:22 2018 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 26 16:10:50 2018 +0300
----------------------------------------------------------------------
.../wicket/util/license/ApacheLicenseHeaderTestCase.java | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/cba693fb/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 4c88b1b..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;
@@ -37,6 +29,7 @@ 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;
@@ -104,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).
[07/45] wicket git commit: wicket-bean-validation / wicket-ioc /
wicket-spring / wicket-velocity : Migrate to Junit5 WicketTestTag.java : Add
proerty to distinguish slow tests
Posted by mg...@apache.org.
wicket-bean-validation / wicket-ioc / wicket-spring / wicket-velocity : Migrate to Junit5
WicketTestTag.java : Add proerty to distinguish slow tests
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7d07e19d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7d07e19d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7d07e19d
Branch: refs/heads/master
Commit: 7d07e19d3c3844320fc3de1f70f67a21ff4fbae6
Parents: 645f239
Author: renoth <jo...@gmx.de>
Authored: Fri Aug 31 23:55:25 2018 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 26 15:37:45 2018 +0300
----------------------------------------------------------------------
.../validation/DefaultPropertyResolverTest.java | 177 ++++++++++---------
.../PropertyValidatorRequiredTest.java | 27 ++-
.../validation/ValidationModelResolverTest.java | 23 +--
.../CompoundFieldValueFactoryTest.java | 20 +--
.../apache/wicket/injection/InjectorTest.java | 19 +-
.../injection/NoopFieldValueFactoryTest.java | 11 +-
.../wicket/proxy/LazyInitProxyFactoryTest.java | 27 +--
.../util/tester/SendPayloadWithContextTest.java | 29 ++-
.../ws/util/tester/TestWebSocketResource.java | 17 +-
.../util/tester/WebSocketBehaviorTestPage.java | 24 +--
.../tester/WebSocketTesterBehaviorTest.java | 23 +--
.../tester/WebSocketTesterProcessorTest.java | 25 +--
...WebSocketTesterRequestCycleListenerTest.java | 34 ++--
.../tester/WebSocketTesterResourceTest.java | 28 +--
.../wicket/spring/FieldBeansCollectorTest.java | 8 +-
.../wicket/spring/SpringBeanLocatorTest.java | 31 ++--
.../spring/SpringWebApplicationFactoryTest.java | 20 ++-
.../annot/AnnotProxyFieldValueFactoryTest.java | 35 ++--
...axInjectAnnotProxyFieldValueFactoryTest.java | 8 +-
.../spring/injection/annot/SpringBeanTest.java | 14 +-
.../annot/SpringBeanWithGenericsTest.java | 66 ++++---
.../java/org/apache/wicket/util/SlowTests.java | 25 ---
.../org/apache/wicket/util/WicketTestTag.java | 25 +++
.../markup/html/velocity/VelocityPanelTest.java | 13 +-
.../VelocityJavaScriptContributorTest.java | 5 +-
25 files changed, 381 insertions(+), 353 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/DefaultPropertyResolverTest.java
----------------------------------------------------------------------
diff --git a/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/DefaultPropertyResolverTest.java b/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/DefaultPropertyResolverTest.java
index 1dc6802..932c1d9 100644
--- a/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/DefaultPropertyResolverTest.java
+++ b/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/DefaultPropertyResolverTest.java
@@ -16,127 +16,112 @@
*/
package org.apache.wicket.bean.validation;
-import static org.apache.wicket.bean.validation.customconstraint.PasswordConstraintAnnotation.CUSTOM_BUNDLE_KEY;
-import static org.apache.wicket.bean.validation.customconstraint.PasswordConstraintAnnotation.DEFAULT_BUNDLE_KEY;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
-import java.util.List;
-import java.util.Set;
+import org.apache.wicket.bean.validation.customconstraint.PasswordConstraintAnnotation;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.util.tester.WicketTesterExtension;
+import org.apache.wicket.validation.ValidationError;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import javax.validation.ConstraintViolation;
import javax.validation.Validation;
import javax.validation.Validator;
import javax.validation.ValidatorFactory;
+import java.util.List;
+import java.util.Set;
-import org.apache.wicket.bean.validation.customconstraint.PasswordConstraintAnnotation;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.util.tester.WicketTesterScope;
-import org.apache.wicket.validation.ValidationError;
-import org.junit.Rule;
-import org.junit.Test;
+import static org.apache.wicket.bean.validation.customconstraint.PasswordConstraintAnnotation.CUSTOM_BUNDLE_KEY;
+import static org.apache.wicket.bean.validation.customconstraint.PasswordConstraintAnnotation.DEFAULT_BUNDLE_KEY;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class DefaultPropertyResolverTest
{
- @Rule
- public WicketTesterScope scope = new WicketTesterScope();
-
- public static class Bean1
- {
- private String foo;
-
- public String getFoo()
- {
- return foo;
- }
- }
+ @RegisterExtension
+ public WicketTesterExtension scope = new WicketTesterExtension();
@Test
- public void hasFieldAndGetter()
+ void hasFieldAndGetter()
{
DefaultPropertyResolver resolver = new DefaultPropertyResolver();
- TextField<?> component = new TextField<>("id", new PropertyModel<Bean1>(new Bean1(), "foo"));
+ TextField<?> component = new TextField<>("id",
+ new PropertyModel<Bean1>(new Bean1(), "foo"));
Property property = resolver.resolveProperty(component);
- assertThat(property, not(nullValue()));
- assertThat(property.getName(), is("foo"));
- assertThat(property.getOwner().getName(), is(Bean1.class.getName()));
+ assertNotNull(property);
+ assertEquals("foo", property.getName());
+ assertEquals(Bean1.class.getName(), property.getOwner().getName());
}
/**
* https://issues.apache.org/jira/browse/WICKET-5505
*/
@Test
- public void booleanHasFieldAndGetter()
+ void booleanHasFieldAndGetter()
{
DefaultPropertyResolver resolver = new DefaultPropertyResolver();
- TextField<?> component = new TextField<>("id", new PropertyModel<BooleanBean>(
- new BooleanBean(), "foo"));
+ TextField<?> component = new TextField<>("id",
+ new PropertyModel<BooleanBean>(new BooleanBean(), "foo"));
Property property = resolver.resolveProperty(component);
- assertThat(property, not(nullValue()));
- assertThat(property.getName(), is("foo"));
- assertThat(property.getOwner().getName(), is(BooleanBean.class.getName()));
+ assertNotNull(property);
+ assertEquals("foo", property.getName());
+ assertEquals(BooleanBean.class.getName(), property.getOwner().getName());
}
@Test
- public void hasOnlyField()
+ void hasOnlyField()
{
DefaultPropertyResolver resolver = new DefaultPropertyResolver();
- TextField<?> component = new TextField<>("id", new PropertyModel<Bean2>(new Bean2(), "foo"));
+ TextField<?> component = new TextField<>("id",
+ new PropertyModel<Bean2>(new Bean2(), "foo"));
Property property = resolver.resolveProperty(component);
- assertThat(property, not(nullValue()));
- assertThat(property.getName(), is("foo"));
- assertThat(property.getOwner().getName(), is(Bean2.class.getName()));
- }
-
- public static class Bean2
- {
- private String foo;
+ assertNotNull(property);
+ assertEquals("foo", property.getName());
+ assertEquals(Bean2.class.getName(), property.getOwner().getName());
}
@Test
- public void hasOnlyGetter()
+ void hasOnlyGetter()
{
DefaultPropertyResolver resolver = new DefaultPropertyResolver();
- TextField<?> component = new TextField<>("id", new PropertyModel<Bean3>(new Bean3(), "foo"));
+ TextField<?> component = new TextField<>("id",
+ new PropertyModel<Bean3>(new Bean3(), "foo"));
Property property = resolver.resolveProperty(component);
- assertThat(property, not(nullValue()));
- assertThat(property.getName(), is("foo"));
- assertThat(property.getOwner().getName(), is(Bean3.class.getName()));
+ assertNotNull(property);
+ assertEquals("foo", property.getName());
+ assertEquals(Bean3.class.getName(), property.getOwner().getName());
}
/**
* https://issues.apache.org/jira/browse/WICKET-5506
*/
@Test
- public void getterHasPriorityOverField()
+ void getterHasPriorityOverField()
{
DefaultPropertyResolver resolver = new DefaultPropertyResolver();
- TextField<?> component = new TextField<>("id", new PropertyModel<Bean4>(new Bean4(), "foo"));
+ TextField<?> component = new TextField<>("id",
+ new PropertyModel<Bean4>(new Bean4(), "foo"));
Property property = resolver.resolveProperty(component);
- assertThat(property, not(nullValue()));
- assertThat(property.getName(), is("foo"));
- assertThat(property.getOwner().getName(), is(Bean4.class.getName()));
+ assertNotNull(property);
+ assertEquals("foo", property.getName());
+ assertEquals(Bean4.class.getName(), property.getOwner().getName());
}
/**
* Test custom bundle mechanism of jsr 303
- *
+ *
* https://issues.apache.org/jira/browse/WICKET-5654
- *
+ *
* @throws Exception
*/
@Test
- public void testBundleKeysResolution() throws Exception
+ void testBundleKeysResolution() throws Exception
{
ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
Validator validator = factory.getValidator();
@@ -163,7 +148,8 @@ public class DefaultPropertyResolverTest
assertEquals(1, constraintViolations.size());
@SuppressWarnings("unchecked")
- ConstraintViolation<BeanWithPassword> nonWordviolation = (ConstraintViolation<BeanWithPassword>)constraintViolations.toArray()[0];
+ ConstraintViolation<BeanWithPassword> nonWordviolation = (ConstraintViolation<BeanWithPassword>)constraintViolations
+ .toArray()[0];
error = translator.convert(nonWordviolation);
@@ -180,7 +166,7 @@ public class DefaultPropertyResolverTest
/**
* Checks that validation error has the expected keys as bundle keys, in the order they are
* specified in {@code expectedKeys}.
- *
+ *
* @param error
* @param expectedKeys
*/
@@ -188,8 +174,8 @@ public class DefaultPropertyResolverTest
{
List<String> keys = error.getKeys();
- assertEquals("The expected number for bundle keys is '" + expectedKeys.length
- + "' but we have '" + keys.size() + "'", expectedKeys.length, keys.size());
+ assertEquals(expectedKeys.length, keys.size(), "The expected number for bundle keys is '" +
+ expectedKeys.length + "' but we have '" + keys.size() + "'");
for (int i = 0; i < expectedKeys.length; i++)
{
@@ -199,6 +185,21 @@ public class DefaultPropertyResolverTest
}
}
+ public static class Bean1
+ {
+ private String foo;
+
+ public String getFoo()
+ {
+ return foo;
+ }
+ }
+
+ public static class Bean2
+ {
+ private String foo;
+ }
+
public static class Bean3
{
public String getFoo()
@@ -225,25 +226,25 @@ public class DefaultPropertyResolverTest
return "foo4";
}
}
-
+
public static class BeanWithPassword
- {
- @PasswordConstraintAnnotation
- private String password;
-
- public BeanWithPassword(String password)
- {
- this.password = password;
- }
-
- public String getPassword()
- {
- return password;
- }
-
- public void setPassword(String password)
- {
- this.password = password;
- }
- }
+ {
+ @PasswordConstraintAnnotation
+ private String password;
+
+ public BeanWithPassword(String password)
+ {
+ this.password = password;
+ }
+
+ public String getPassword()
+ {
+ return password;
+ }
+
+ public void setPassword(String password)
+ {
+ this.password = password;
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/PropertyValidatorRequiredTest.java
----------------------------------------------------------------------
diff --git a/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/PropertyValidatorRequiredTest.java b/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/PropertyValidatorRequiredTest.java
index 118b3fa..4e56c9b 100644
--- a/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/PropertyValidatorRequiredTest.java
+++ b/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/PropertyValidatorRequiredTest.java
@@ -1,14 +1,5 @@
package org.apache.wicket.bean.validation;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Arrays;
-import java.util.List;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.html.WebPage;
@@ -20,14 +11,22 @@ import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTester;
-import org.apache.wicket.util.tester.WicketTesterScope;
-import org.junit.Rule;
-import org.junit.Test;
+import org.apache.wicket.util.tester.WicketTesterExtension;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class PropertyValidatorRequiredTest
{
- @Rule
- public WicketTesterScope scope = new WicketTesterScope()
+ @RegisterExtension
+ public WicketTesterExtension scope = new WicketTesterExtension()
{
protected WicketTester create()
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/ValidationModelResolverTest.java
----------------------------------------------------------------------
diff --git a/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/ValidationModelResolverTest.java b/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/ValidationModelResolverTest.java
index cefb2e9..a174ed4 100644
--- a/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/ValidationModelResolverTest.java
+++ b/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/ValidationModelResolverTest.java
@@ -4,10 +4,13 @@ import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.IPropertyReflectionAwareModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.util.tester.WicketTesterScope;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.apache.wicket.util.tester.WicketTesterExtension;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
/**
* @author alexander.v.morozov
@@ -15,21 +18,21 @@ import org.junit.Test;
public class ValidationModelResolverTest
{
- @Rule
- public WicketTesterScope scope = new WicketTesterScope();
+ @RegisterExtension
+ public WicketTesterExtension scope = new WicketTesterExtension();
@Test
public void noModelBoundToComponent()
{
TextField<String> textField = new TextField<String>("field");
- Assert.assertNull(ValidationModelResolver.resolvePropertyModelFrom(textField));
+ assertNull(ValidationModelResolver.resolvePropertyModelFrom(textField));
}
@Test
public void simpleModelBoundToComponent()
{
TextField<String> textField = new TextField<String>("text", new Model<String>());
- Assert.assertNull(ValidationModelResolver.resolvePropertyModelFrom(textField));
+ assertNull(ValidationModelResolver.resolvePropertyModelFrom(textField));
}
@Test
@@ -37,8 +40,8 @@ public class ValidationModelResolverTest
{
TextField<String> textField = new TextField<String>("text", new PropertyModel<String>(new TestValidatableBean(), "text"));
IPropertyReflectionAwareModel<?> model = ValidationModelResolver.resolvePropertyModelFrom(textField);
- Assert.assertNotNull(model);
- Assert.assertEquals("text", model.getPropertyField().getName());
+ assertNotNull(model);
+ assertEquals("text", model.getPropertyField().getName());
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java
----------------------------------------------------------------------
diff --git a/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java b/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java
index f4eadbf..d8b5bcb 100644
--- a/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java
+++ b/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java
@@ -16,19 +16,19 @@
*/
package org.apache.wicket.injection;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.lang.reflect.Field;
import java.util.Arrays;
import java.util.List;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
/**
* Test {@link CompoundFieldValueFactory}
@@ -36,7 +36,7 @@ import org.junit.Test;
* @author Igor Vaynberg (ivaynberg)
*
*/
-public class CompoundFieldValueFactoryTest extends Assert
+public class CompoundFieldValueFactoryTest
{
private Integer testField;
@@ -48,7 +48,7 @@ public class CompoundFieldValueFactoryTest extends Assert
*
* @throws Exception
*/
- @Before
+ @BeforeEach
public void before() throws Exception
{
CompoundFieldValueFactoryTest.class.getDeclaredField("testField");
http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-ioc/src/test/java/org/apache/wicket/injection/InjectorTest.java
----------------------------------------------------------------------
diff --git a/wicket-ioc/src/test/java/org/apache/wicket/injection/InjectorTest.java b/wicket-ioc/src/test/java/org/apache/wicket/injection/InjectorTest.java
index 63dd10d..9089371 100644
--- a/wicket-ioc/src/test/java/org/apache/wicket/injection/InjectorTest.java
+++ b/wicket-ioc/src/test/java/org/apache/wicket/injection/InjectorTest.java
@@ -16,12 +16,13 @@
*/
package org.apache.wicket.injection;
-import java.lang.reflect.Field;
-
import org.apache.wicket.injection.util.MockDependency;
import org.apache.wicket.injection.util.TestObject;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Field;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Tests {@link Injector}
@@ -29,7 +30,7 @@ import org.junit.Test;
* @author Igor Vaynberg (ivaynberg)
*
*/
-public class InjectorTest extends Assert
+public class InjectorTest
{
private static MockDependency dependency = new MockDependency("inject");
@@ -70,10 +71,10 @@ public class InjectorTest extends Assert
new TestInjector().inject(testObject, factory);
- assertEquals(testObject.getDependency1().getMessage(), "inject");
- assertEquals(testObject.getDependency2().getMessage(), "dont-inject");
- assertEquals(testObject.getDependency3().getMessage(), "dont-inject");
- assertEquals(testObject.getDependency4().getMessage(), "inject");
+ assertEquals("inject", testObject.getDependency1().getMessage());
+ assertEquals("dont-inject", testObject.getDependency2().getMessage());
+ assertEquals("dont-inject", testObject.getDependency3().getMessage());
+ assertEquals("inject", testObject.getDependency4().getMessage());
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-ioc/src/test/java/org/apache/wicket/injection/NoopFieldValueFactoryTest.java
----------------------------------------------------------------------
diff --git a/wicket-ioc/src/test/java/org/apache/wicket/injection/NoopFieldValueFactoryTest.java b/wicket-ioc/src/test/java/org/apache/wicket/injection/NoopFieldValueFactoryTest.java
index 06ec9d6..fa95618 100644
--- a/wicket-ioc/src/test/java/org/apache/wicket/injection/NoopFieldValueFactoryTest.java
+++ b/wicket-ioc/src/test/java/org/apache/wicket/injection/NoopFieldValueFactoryTest.java
@@ -16,11 +16,12 @@
*/
package org.apache.wicket.injection;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
import java.lang.reflect.Field;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertNull;
/**
* Test {@link NoopFieldValueFactory}
@@ -28,7 +29,7 @@ import org.junit.Test;
* @author Igor Vaynberg (ivaynberg)
*
*/
-public class NoopFieldValueFactoryTest extends Assert
+public class NoopFieldValueFactoryTest
{
private Field field;
@@ -38,7 +39,7 @@ public class NoopFieldValueFactoryTest extends Assert
/**
* @throws Exception
*/
- @Before
+ @BeforeEach
public void before() throws Exception
{
NoopFieldValueFactoryTest.class.getDeclaredField("testField");
http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java
----------------------------------------------------------------------
diff --git a/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java b/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java
index 60bab12..5483ce4 100644
--- a/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java
+++ b/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java
@@ -16,10 +16,6 @@
*/
package org.apache.wicket.proxy;
-import static org.hamcrest.CoreMatchers.instanceOf;
-
-import java.lang.reflect.Proxy;
-
import org.apache.wicket.core.util.lang.WicketObjects;
import org.apache.wicket.proxy.LazyInitProxyFactory.ProxyReplacement;
import org.apache.wicket.proxy.util.ConcreteObject;
@@ -27,8 +23,15 @@ import org.apache.wicket.proxy.util.IInterface;
import org.apache.wicket.proxy.util.IObjectMethodTester;
import org.apache.wicket.proxy.util.InterfaceObject;
import org.apache.wicket.proxy.util.ObjectMethodTester;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Proxy;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests lazy init proxy factory
@@ -36,7 +39,7 @@ import org.junit.Test;
* @author Igor Vaynberg (ivaynberg)
*
*/
-public class LazyInitProxyFactoryTest extends Assert
+public class LazyInitProxyFactoryTest
{
private static InterfaceObject interfaceObject = new InterfaceObject("interface");
@@ -102,7 +105,7 @@ public class LazyInitProxyFactoryTest extends Assert
assertTrue(Proxy.isProxyClass(proxy.getClass()));
// test proxy implements ILazyInitProxy
- assertThat(proxy, instanceOf(ILazyInitProxy.class));
+ assertTrue(proxy instanceof ILazyInitProxy);
assertTrue(((ILazyInitProxy)proxy).getObjectLocator() == interfaceObjectLocator);
// test method invocation
@@ -146,8 +149,8 @@ public class LazyInitProxyFactoryTest extends Assert
ConcreteObject.class, concreteObjectLocator);
// test proxy implements ILazyInitProxy
- assertThat(proxy, instanceOf(ILazyInitProxy.class));
- assertTrue(((ILazyInitProxy)proxy).getObjectLocator() == concreteObjectLocator);
+ assertTrue(proxy instanceof ILazyInitProxy);
+ assertSame(((ILazyInitProxy) proxy).getObjectLocator(), concreteObjectLocator);
// test we do not have a jdk dynamic proxy
assertFalse(Proxy.isProxyClass(proxy.getClass()));
@@ -157,7 +160,7 @@ public class LazyInitProxyFactoryTest extends Assert
// test serialization
ConcreteObject proxy2 = WicketObjects.cloneObject(proxy);
- assertTrue(proxy != proxy2);
+ assertNotSame(proxy, proxy2);
assertEquals(proxy2.getMessage(), "concrete");
// test equals/hashcode method interception
@@ -200,7 +203,7 @@ public class LazyInitProxyFactoryTest extends Assert
PackagePrivateConcreteObject.class, PACKAGE_PRIVATE_CONCRETE_OBJECT_LOCATOR);
// test proxy implements ILazyInitProxy
- assertThat(proxy, instanceOf(ILazyInitProxy.class));
+ assertTrue(proxy instanceof ILazyInitProxy);
assertTrue(((ILazyInitProxy)proxy).getObjectLocator() == PACKAGE_PRIVATE_CONCRETE_OBJECT_LOCATOR);
// test we do not have a jdk dynamic proxy
http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/SendPayloadWithContextTest.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/SendPayloadWithContextTest.java b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/SendPayloadWithContextTest.java
index db4f6c3..53429d8 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/SendPayloadWithContextTest.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/SendPayloadWithContextTest.java
@@ -16,11 +16,6 @@
*/
package org.apache.wicket.protocol.ws.util.tester;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.html.WebPage;
@@ -31,10 +26,14 @@ import org.apache.wicket.protocol.ws.api.message.TextMessage;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
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;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test for https://issues.apache.org/jira/browse/WICKET-5627.
@@ -42,13 +41,13 @@ import org.junit.Test;
*
* @since 6.17.0
*/
-public class SendPayloadWithContextTest extends Assert
+public class SendPayloadWithContextTest
{
final AtomicBoolean context = new AtomicBoolean(false);
WicketTester tester;
- @Before
+ @BeforeEach
public void before()
{
tester = new WicketTester();
@@ -64,7 +63,7 @@ public class SendPayloadWithContextTest extends Assert
});
}
- @After
+ @AfterEach
public void after()
{
tester.destroy();
@@ -80,12 +79,12 @@ public class SendPayloadWithContextTest extends Assert
@Override
protected void onOutMessage(String message)
{
- assertThat(Boolean.parseBoolean(message), is(equalTo(Boolean.TRUE)));
+ assertTrue(Boolean.parseBoolean(message));
}
};
- assertThat(context.get(), is(false));
+ assertFalse(context.get());
webSocketTester.sendMessage("trigger web socket communication");
- assertThat(context.get(), is(false));
+ assertFalse(context.get());
webSocketTester.destroy();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/TestWebSocketResource.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/TestWebSocketResource.java b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/TestWebSocketResource.java
index 276c566..e6145cf 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/TestWebSocketResource.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/TestWebSocketResource.java
@@ -16,10 +16,6 @@
*/
package org.apache.wicket.protocol.ws.util.tester;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.apache.wicket.util.string.Strings;
-import org.junit.Assert;
import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler;
import org.apache.wicket.protocol.ws.api.WebSocketResource;
import org.apache.wicket.protocol.ws.api.message.AbortedMessage;
@@ -27,6 +23,11 @@ import org.apache.wicket.protocol.ws.api.message.BinaryMessage;
import org.apache.wicket.protocol.ws.api.message.ClosedMessage;
import org.apache.wicket.protocol.ws.api.message.ConnectedMessage;
import org.apache.wicket.protocol.ws.api.message.TextMessage;
+import org.apache.wicket.util.string.Strings;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
*
@@ -90,7 +91,7 @@ public class TestWebSocketResource extends WebSocketResource
super.onMessage(handler, message);
String text = message.getText();
- Assert.assertEquals(expectedMessage, text);
+ assertEquals(expectedMessage, text);
handler.push(Strings.capitalize(text));
}
@@ -103,9 +104,9 @@ public class TestWebSocketResource extends WebSocketResource
int offset = binaryMessage.getOffset();
int length = binaryMessage.getLength();
- Assert.assertEquals(expectedBinaryMessage, data);
- Assert.assertEquals(expectedOffset, offset);
- Assert.assertEquals(expectedLength, length);
+ assertEquals(expectedBinaryMessage, data);
+ assertEquals(expectedOffset, offset);
+ assertEquals(expectedLength, length);
handler.push(data, offset, length);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketBehaviorTestPage.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketBehaviorTestPage.java b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketBehaviorTestPage.java
index b00ed25..a6a03bd 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketBehaviorTestPage.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketBehaviorTestPage.java
@@ -16,22 +16,22 @@
*/
package org.apache.wicket.protocol.ws.util.tester;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-
import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.protocol.ws.api.WebSocketBehavior;
+import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler;
import org.apache.wicket.protocol.ws.api.message.BinaryMessage;
import org.apache.wicket.protocol.ws.api.message.IWebSocketPushMessage;
import org.apache.wicket.protocol.ws.api.message.TextMessage;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.string.Strings;
-import org.hamcrest.CoreMatchers;
-import org.junit.Assert;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* A page used for {@link WebSocketTesterBehaviorTest}
@@ -53,7 +53,7 @@ class WebSocketBehaviorTestPage extends WebPage implements IMarkupResourceStream
protected void onMessage(WebSocketRequestHandler handler, TextMessage message)
{
// assert the inbould message
- Assert.assertThat(message.getText(), is(equalTo(expectedMessage)));
+ assertEquals(expectedMessage, message.getText());
// now send an outbound message
handler.push(Strings.capitalize(expectedMessage));
@@ -68,9 +68,9 @@ class WebSocketBehaviorTestPage extends WebPage implements IMarkupResourceStream
@Override
protected void onMessage(WebSocketRequestHandler handler, BinaryMessage binaryMessage)
{
- Assert.assertArrayEquals(message, binaryMessage.getData());
- Assert.assertEquals(offset, binaryMessage.getOffset());
- Assert.assertEquals(length, binaryMessage.getLength());
+ assertArrayEquals(binaryMessage.getData(), message);
+ assertEquals(offset, binaryMessage.getOffset());
+ assertEquals(length, binaryMessage.getLength());
String msg = new String(message);
byte[] pushedMessage = Strings.capitalize(msg).getBytes();
@@ -87,9 +87,9 @@ class WebSocketBehaviorTestPage extends WebPage implements IMarkupResourceStream
@Override
protected void onPush(WebSocketRequestHandler handler, IWebSocketPushMessage message)
{
- Assert.assertThat(message, CoreMatchers.instanceOf(WebSocketTesterBehaviorTest.BroadcastMessage.class));
+ assertTrue(message instanceof WebSocketTesterBehaviorTest.BroadcastMessage);
WebSocketTesterBehaviorTest.BroadcastMessage broadcastMessage = (WebSocketTesterBehaviorTest.BroadcastMessage) message;
- Assert.assertSame(expectedMessage, broadcastMessage);
+ assertSame(expectedMessage, broadcastMessage);
String pushedMessage = broadcastMessage.getText().toUpperCase();
http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterBehaviorTest.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterBehaviorTest.java b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterBehaviorTest.java
index 241047e..10a82df 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterBehaviorTest.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterBehaviorTest.java
@@ -16,17 +16,20 @@
*/
package org.apache.wicket.protocol.ws.util.tester;
-import java.io.UnsupportedEncodingException;
-import java.util.concurrent.atomic.AtomicBoolean;
-
import org.apache.wicket.protocol.ws.api.message.IWebSocketPushMessage;
import org.apache.wicket.protocol.ws.api.registry.PageIdKey;
import org.apache.wicket.util.string.Strings;
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;
+
+import java.io.UnsupportedEncodingException;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests for WebSocketTester.
@@ -34,17 +37,17 @@ import org.junit.Test;
*
* @since 6.0
*/
-public class WebSocketTesterBehaviorTest extends Assert
+public class WebSocketTesterBehaviorTest
{
WicketTester tester;
- @Before
+ @BeforeEach
public void before()
{
tester = new WicketTester();
}
- @After
+ @AfterEach
public void after()
{
tester.destroy();
http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterProcessorTest.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterProcessorTest.java b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterProcessorTest.java
index 0a7dd10..0b807fb 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterProcessorTest.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterProcessorTest.java
@@ -16,11 +16,6 @@
*/
package org.apache.wicket.protocol.ws.util.tester;
-import java.util.Arrays;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.protocol.http.mock.MockHttpServletRequest;
@@ -28,15 +23,21 @@ import org.apache.wicket.protocol.ws.WebSocketSettings;
import org.apache.wicket.protocol.ws.api.WebSocketConnectionOriginFilter;
import org.apache.wicket.request.http.WebRequest;
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;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests for https://issues.apache.org/jira/browse/WICKET-5860
*/
-public class WebSocketTesterProcessorTest extends Assert
+public class WebSocketTesterProcessorTest
{
final static AtomicBoolean messageReceived = new AtomicBoolean(false);
@@ -72,14 +73,14 @@ public class WebSocketTesterProcessorTest extends Assert
}
};
- @Before
+ @BeforeEach
public void before()
{
tester = new WicketTester(application);
application.getWicketFilter().setFilterPath("");
}
- @After
+ @AfterEach
public void after()
{
tester.destroy();
http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterRequestCycleListenerTest.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterRequestCycleListenerTest.java b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterRequestCycleListenerTest.java
index d6701e7..562da94 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterRequestCycleListenerTest.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterRequestCycleListenerTest.java
@@ -16,18 +16,18 @@
*/
package org.apache.wicket.protocol.ws.util.tester;
-import static org.hamcrest.CoreMatchers.is;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-
import org.apache.wicket.request.cycle.IRequestCycleListener;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.string.Strings;
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;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests for WebSocketTester.
@@ -35,7 +35,7 @@ import org.junit.Test;
*
* @since 6.18.0
*/
-public class WebSocketTesterRequestCycleListenerTest extends Assert
+public class WebSocketTesterRequestCycleListenerTest
{
private final AtomicBoolean beginRequestCalled = new AtomicBoolean(false);
private final AtomicBoolean endRequestCalled = new AtomicBoolean(false);
@@ -43,7 +43,7 @@ public class WebSocketTesterRequestCycleListenerTest extends Assert
private WicketTester tester;
- @Before
+ @BeforeEach
public void before()
{
tester = new WicketTester();
@@ -69,7 +69,7 @@ public class WebSocketTesterRequestCycleListenerTest extends Assert
});
}
- @After
+ @AfterEach
public void after()
{
tester.destroy();
@@ -103,16 +103,16 @@ public class WebSocketTesterRequestCycleListenerTest extends Assert
};
// assert and reset
- assertThat(beginRequestCalled.compareAndSet(true, false), is(true));
- assertThat(endRequestCalled.compareAndSet(true, false), is(true));
- assertThat(detachCalled.compareAndSet(true, false), is(true));
+ assertTrue(beginRequestCalled.compareAndSet(true, false));
+ assertTrue(endRequestCalled.compareAndSet(true, false));
+ assertTrue(detachCalled.compareAndSet(true, false));
// broadcasts WebSocket.TextMessage and notifies the listeners
webSocketTester.sendMessage(expectedMessage);
- assertThat(beginRequestCalled.get(), is(true));
- assertThat(endRequestCalled.get(), is(true));
- assertThat(detachCalled.get(), is(true));
+ assertTrue(beginRequestCalled.get());
+ assertTrue(endRequestCalled.get());
+ assertTrue(detachCalled.get());
webSocketTester.destroy();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterResourceTest.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterResourceTest.java b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterResourceTest.java
index d64c35d..e39bedc 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterResourceTest.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterResourceTest.java
@@ -16,16 +16,20 @@
*/
package org.apache.wicket.protocol.ws.util.tester;
-import java.util.concurrent.atomic.AtomicBoolean;
-
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.string.Strings;
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;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+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.assertTrue;
/**
* Tests for WebSocketTester.
@@ -33,7 +37,7 @@ import org.junit.Test;
*
* @since 6.0
*/
-public class WebSocketTesterResourceTest extends Assert
+public class WebSocketTesterResourceTest
{
private static final String EXPECTED_TEXT = "expected text";
private static final byte[] EXPECTED_BINARY = new byte[] {1, 2, 3};
@@ -45,7 +49,7 @@ public class WebSocketTesterResourceTest extends Assert
WicketTester tester;
- @Before
+ @BeforeEach
public void before()
{
TestWebSocketResource.ON_CONNECT_CALLED.set(false);
@@ -70,7 +74,7 @@ public class WebSocketTesterResourceTest extends Assert
tester = new WicketTester(application);
}
- @After
+ @AfterEach
public void after()
{
tester.destroy();
@@ -123,9 +127,9 @@ public class WebSocketTesterResourceTest extends Assert
protected void onOutMessage(byte[] message, int offset, int length)
{
ON_OUT_BINARY_CALLED.set(true);
- Assert.assertArrayEquals(EXPECTED_BINARY, message);
- Assert.assertEquals(offset, offset);
- Assert.assertEquals(length, length);
+ assertArrayEquals(EXPECTED_BINARY, message);
+ assertEquals(offset, offset);
+ assertEquals(length, length);
}
};
http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-spring/src/test/java/org/apache/wicket/spring/FieldBeansCollectorTest.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/FieldBeansCollectorTest.java b/wicket-spring/src/test/java/org/apache/wicket/spring/FieldBeansCollectorTest.java
index 62597f4..9d098e4 100644
--- a/wicket-spring/src/test/java/org/apache/wicket/spring/FieldBeansCollectorTest.java
+++ b/wicket-spring/src/test/java/org/apache/wicket/spring/FieldBeansCollectorTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.wicket.spring;
-import static org.junit.Assert.assertTrue;
+import org.apache.wicket.spring.FieldBeansCollector.FieldType;
+import org.junit.jupiter.api.Test;
+import org.springframework.core.ResolvableType;
import java.lang.reflect.Field;
import java.util.List;
-import org.apache.wicket.spring.FieldBeansCollector.FieldType;
-import org.junit.Test;
-import org.springframework.core.ResolvableType;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FieldBeansCollectorTest
http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-spring/src/test/java/org/apache/wicket/spring/SpringBeanLocatorTest.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/SpringBeanLocatorTest.java b/wicket-spring/src/test/java/org/apache/wicket/spring/SpringBeanLocatorTest.java
index 0e09953..20800a3 100644
--- a/wicket-spring/src/test/java/org/apache/wicket/spring/SpringBeanLocatorTest.java
+++ b/wicket-spring/src/test/java/org/apache/wicket/spring/SpringBeanLocatorTest.java
@@ -19,9 +19,14 @@ package org.apache.wicket.spring;
import org.apache.wicket.core.util.lang.WicketObjects;
import org.apache.wicket.spring.test.ApplicationContextMock;
import org.apache.wicket.spring.test.SpringContextLocatorMock;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Tests {@link SpringBeanLocator}
@@ -29,7 +34,7 @@ import org.junit.Test;
* @author ivaynberg
*
*/
-public class SpringBeanLocatorTest extends Assert
+public class SpringBeanLocatorTest
{
private ApplicationContextMock ctx;
@@ -38,7 +43,7 @@ public class SpringBeanLocatorTest extends Assert
/**
*
*/
- @Before
+ @BeforeEach
public void before()
{
ctx = new ApplicationContextMock();
@@ -56,7 +61,7 @@ public class SpringBeanLocatorTest extends Assert
ctx.putBean("bean", bean);
SpringBeanLocator locator = new SpringBeanLocator(Bean.class, ctxLocator);
- assertTrue(locator.locateProxyTarget() == bean);
+ assertSame(locator.locateProxyTarget(), bean);
}
/**
@@ -126,7 +131,7 @@ public class SpringBeanLocatorTest extends Assert
ctx.putBean("bean", bean);
SpringBeanLocator locator = new SpringBeanLocator("bean", Bean.class, ctxLocator);
- assertTrue(locator.locateProxyTarget() == bean);
+ assertSame(locator.locateProxyTarget(), bean);
}
@@ -230,19 +235,19 @@ public class SpringBeanLocatorTest extends Assert
assertEquals(aprime, a);
assertEquals(a.hashCode(), aprime.hashCode());
- assertFalse(a.equals(b));
- assertFalse(a.equals(c));
- assertFalse(b.equals(c));
+ assertNotEquals(a, b);
+ assertNotEquals(a, c);
+ assertNotEquals(b, c);
assertEquals(d, dprime);
assertEquals(dprime, d);
ctx.putBean("locator", a); // we need to register a Bean of type d.getClass()
assertEquals(d.hashCode(), dprime.hashCode());
- assertFalse(a.equals(d));
- assertFalse(d.equals(e));
+ assertNotEquals(a, d);
+ assertNotEquals(d, e);
- assertFalse(a.equals(ctxLocator));
+ assertNotEquals(a, ctxLocator);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-spring/src/test/java/org/apache/wicket/spring/SpringWebApplicationFactoryTest.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/SpringWebApplicationFactoryTest.java b/wicket-spring/src/test/java/org/apache/wicket/spring/SpringWebApplicationFactoryTest.java
index 89bf3e4..ca3dd81 100644
--- a/wicket-spring/src/test/java/org/apache/wicket/spring/SpringWebApplicationFactoryTest.java
+++ b/wicket-spring/src/test/java/org/apache/wicket/spring/SpringWebApplicationFactoryTest.java
@@ -16,26 +16,28 @@
*/
package org.apache.wicket.spring;
-import java.util.Enumeration;
-
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
-
import org.apache.wicket.Page;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.protocol.http.WicketFilter;
import org.apache.wicket.protocol.http.mock.MockServletContext;
import org.apache.wicket.spring.injection.annot.SpringComponentInjector;
import org.apache.wicket.util.lang.Packages;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
+import java.util.Enumeration;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Test for {@link SpringWebApplicationFactory}.
*
* @author svenmeier
*/
-public class SpringWebApplicationFactoryTest extends Assert
+public class SpringWebApplicationFactoryTest
{
/**
@@ -52,7 +54,7 @@ public class SpringWebApplicationFactoryTest extends Assert
filter.destroy();
- assertTrue("is not destroyed", Destroyable.instance.destroyed);
+ assertTrue(Destroyable.instance.destroyed, "is not destroyed");
}
private class FilterConfigImpl implements FilterConfig
http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java
index f8b7a81..f913655 100644
--- a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java
+++ b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java
@@ -16,10 +16,6 @@
*/
package org.apache.wicket.spring.injection.annot;
-import static org.hamcrest.CoreMatchers.instanceOf;
-
-import java.lang.reflect.Field;
-
import org.apache.wicket.proxy.ILazyInitProxy;
import org.apache.wicket.spring.ISpringContextLocator;
import org.apache.wicket.spring.SpringBeanLocator;
@@ -27,16 +23,23 @@ import org.apache.wicket.spring.injection.util.Bean;
import org.apache.wicket.spring.injection.util.Bean2;
import org.apache.wicket.spring.injection.util.InjectableInterface;
import org.apache.wicket.spring.test.ApplicationContextMock;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.context.ApplicationContext;
+import java.lang.reflect.Field;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
/**
* Tests for BeanAnnotLocatorFactory
*
* @author igor
*/
-public abstract class AnnotProxyFieldValueFactoryTest extends Assert
+public abstract class AnnotProxyFieldValueFactoryTest
{
ISpringContextLocator mockCtxLocator = new ISpringContextLocator()
{
@@ -79,17 +82,17 @@ public abstract class AnnotProxyFieldValueFactoryTest extends Assert
field = obj.getClass().getDeclaredField("beanByClass");
proxy = factory.getFieldValue(field, obj);
locator = (SpringBeanLocator)((ILazyInitProxy)proxy).getObjectLocator();
- assertTrue(locator.getBeanType().equals(Bean.class));
- assertTrue(locator.getSpringContextLocator() == mockCtxLocator);
- assertThat(factory.getFieldValue(field, obj), instanceOf(ILazyInitProxy.class));
+ assertEquals(locator.getBeanType(), Bean.class);
+ assertSame(locator.getSpringContextLocator(), mockCtxLocator);
+ assertTrue(factory.getFieldValue(field, obj) instanceof ILazyInitProxy);
field = obj.getClass().getDeclaredField("beanByName");
proxy = factory.getFieldValue(field, obj);
locator = (SpringBeanLocator)((ILazyInitProxy)proxy).getObjectLocator();
- assertTrue(locator.getBeanName().equals("somebean"));
- assertTrue(locator.getBeanType().equals(Bean2.class));
- assertTrue(locator.getSpringContextLocator() == mockCtxLocator);
- assertThat(factory.getFieldValue(field, obj), instanceOf(ILazyInitProxy.class));
+ assertEquals("somebean", locator.getBeanName());
+ assertEquals(locator.getBeanType(), Bean2.class);
+ assertSame(locator.getSpringContextLocator(), mockCtxLocator);
+ assertTrue(factory.getFieldValue(field, obj) instanceof ILazyInitProxy);
}
/**
@@ -103,12 +106,12 @@ public abstract class AnnotProxyFieldValueFactoryTest extends Assert
Field field = obj.getClass().getDeclaredField("beanByClass");
Object proxy1 = factory.getFieldValue(field, obj);
Object proxy2 = factory.getFieldValue(field, obj);
- assertTrue(proxy1 == proxy2);
+ assertSame(proxy1, proxy2);
field = obj.getClass().getDeclaredField("beanByName");
proxy1 = factory.getFieldValue(field, obj);
proxy2 = factory.getFieldValue(field, obj);
- assertTrue(proxy1 == proxy2);
+ assertSame(proxy1, proxy2);
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/JavaxInjectAnnotProxyFieldValueFactoryTest.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/JavaxInjectAnnotProxyFieldValueFactoryTest.java b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/JavaxInjectAnnotProxyFieldValueFactoryTest.java
index 6d3d9cc..f128366 100644
--- a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/JavaxInjectAnnotProxyFieldValueFactoryTest.java
+++ b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/JavaxInjectAnnotProxyFieldValueFactoryTest.java
@@ -16,11 +16,13 @@
*/
package org.apache.wicket.spring.injection.annot;
-import java.lang.reflect.Field;
-
import org.apache.wicket.spring.injection.util.JavaxInjectInjectable;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Field;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Tests for Spring injection with {@literal @javax.inject.Inject} annotation
http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanTest.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanTest.java b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanTest.java
index cc55ea2..4bdea91 100644
--- a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanTest.java
+++ b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanTest.java
@@ -24,16 +24,20 @@ import org.apache.wicket.spring.SpringBeanLocator;
import org.apache.wicket.spring.test.ApplicationContextMock;
import org.apache.wicket.util.tester.DummyHomePage;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Test for SpringBean.
*
* @author Andrea Del Bene
*/
-public class SpringBeanTest extends Assert
+public class SpringBeanTest
{
private WicketTester tester;
private ApplicationContextMock ctx;
@@ -41,7 +45,7 @@ public class SpringBeanTest extends Assert
/**
* @throws Exception
*/
- @Before
+ @BeforeEach
public void before() throws Exception
{
tester = new WicketTester();
http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanWithGenericsTest.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanWithGenericsTest.java b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanWithGenericsTest.java
index 74dca27..3eea80b 100644
--- a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanWithGenericsTest.java
+++ b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanWithGenericsTest.java
@@ -16,10 +16,14 @@
*/
package org.apache.wicket.spring.injection.annot;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.hasItem;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
+import org.apache.wicket.spring.BeanWithGeneric;
+import org.apache.wicket.util.tester.DummyHomePage;
+import org.apache.wicket.util.tester.WicketTester;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
import java.util.ArrayList;
import java.util.Arrays;
@@ -27,21 +31,15 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.wicket.spring.BeanWithGeneric;
-import org.apache.wicket.util.tester.DummyHomePage;
-import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* @author Andrea Del Bene
*
*/
-public class SpringBeanWithGenericsTest extends Assert
+public class SpringBeanWithGenericsTest
{
private WicketTester tester;
private AnnotationConfigApplicationContext ctx;
@@ -49,7 +47,7 @@ public class SpringBeanWithGenericsTest extends Assert
/**
* @throws Exception
*/
- @Before
+ @BeforeEach
public void before() throws Exception
{
tester = new WicketTester();
@@ -96,11 +94,11 @@ public class SpringBeanWithGenericsTest extends Assert
List<BeanWithGeneric<String>> beans = page.getBeans();
- assertThat(beans, is(notNullValue()));
- assertThat(beans.size(), is(1));
+ assertNotNull(beans);
+ assertEquals(1, beans.size());
BeanWithGeneric<String> stringBean = (BeanWithGeneric<String>) ctx.getBean("stringBean");
- assertThat(beans, hasItem(stringBean));
+ assertTrue(beans.contains(stringBean));
}
@Test
@@ -142,28 +140,28 @@ public class SpringBeanWithGenericsTest extends Assert
List<String> stringsList = page.getStringsList();
assertNotNull(stringsList);
assertEquals(3, stringsList.size());
- assertThat(stringsList.get(0), is(equalTo("foo")));
- assertThat(stringsList.get(1), is(equalTo("bar")));
- assertThat(stringsList.get(2), is(equalTo("baz")));
+ assertEquals("foo", stringsList.get(0));
+ assertEquals("bar", stringsList.get(1));
+ assertEquals("baz", stringsList.get(2));
ArrayList<String> arrayListStrings = page.getArrayListStrings();
- assertThat(arrayListStrings, is(notNullValue()));
- assertThat(arrayListStrings.size(), is(3));
- assertThat(arrayListStrings.get(0), is(equalTo("one")));
- assertThat(arrayListStrings.get(1), is(equalTo("two")));
- assertThat(arrayListStrings.get(2), is(equalTo("three")));
+ assertNotNull(arrayListStrings);
+ assertEquals(3, arrayListStrings.size());
+ assertEquals("one", arrayListStrings.get(0));
+ assertEquals("two", arrayListStrings.get(1));
+ assertEquals("three", arrayListStrings.get(2));
ArrayList<Integer> arrayListIntegers = page.getArrayListIntegers();
- assertThat(arrayListIntegers, is(notNullValue()));
- assertThat(arrayListIntegers.size(), is(3));
- assertThat(arrayListIntegers.get(0), is(1));
- assertThat(arrayListIntegers.get(1), is(2));
- assertThat(arrayListIntegers.get(2), is(3));
+ assertNotNull(arrayListIntegers);
+ assertEquals(3, arrayListIntegers.size());
+ assertEquals(Integer.valueOf(1), arrayListIntegers.get(0));
+ assertEquals(Integer.valueOf(2), arrayListIntegers.get(1));
+ assertEquals(Integer.valueOf(3), arrayListIntegers.get(2));
MyList<String> myList = page.getMyList();
- assertThat(myList, is(notNullValue()));
- assertThat(myList.size(), is(1));
- assertThat(myList.get(0), is("one"));
+ assertNotNull(myList);
+ assertEquals(1, myList.size());
+ assertEquals("one", myList.get(0));
}
@Test
http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-util/src/main/java/org/apache/wicket/util/SlowTests.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/SlowTests.java b/wicket-util/src/main/java/org/apache/wicket/util/SlowTests.java
deleted file mode 100644
index b67013c..0000000
--- a/wicket-util/src/main/java/org/apache/wicket/util/SlowTests.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.util;
-
-/**
- * JUnit Category marker.
- * Used to mark slow running tests which are not executed with Maven profile 'fast'
- */
-public interface SlowTests {
-
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-util/src/main/java/org/apache/wicket/util/WicketTestTag.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/WicketTestTag.java b/wicket-util/src/main/java/org/apache/wicket/util/WicketTestTag.java
new file mode 100644
index 0000000..cf92bca
--- /dev/null
+++ b/wicket-util/src/main/java/org/apache/wicket/util/WicketTestTag.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.util;
+
+/**
+ * JUnit Category marker.
+ * Used to mark slow running tests which are not executed with Maven profile 'fast'
+ */
+public interface WicketTestTag {
+ public static final String SLOW = "SLOW";
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPanelTest.java
----------------------------------------------------------------------
diff --git a/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPanelTest.java b/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPanelTest.java
index 5dc102b..9ead683 100644
--- a/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPanelTest.java
+++ b/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPanelTest.java
@@ -17,24 +17,23 @@
package org.apache.wicket.contrib.markup.html.velocity;
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;
/**
* Tests for <code>VelocityPanel</code>
*
* @see org.apache.wicket.velocity.markup.html.VelocityPanel
*/
-public class VelocityPanelTest extends Assert
+public class VelocityPanelTest
{
WicketTester tester;
/**
*
*/
- @Before
+ @BeforeEach
public void before()
{
tester = new WicketTester();
@@ -43,7 +42,7 @@ public class VelocityPanelTest extends Assert
/**
*
*/
- @After
+ @AfterEach
public void after()
{
tester.destroy();
http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptContributorTest.java
----------------------------------------------------------------------
diff --git a/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptContributorTest.java b/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptContributorTest.java
index 13a3282..0ae70a0 100644
--- a/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptContributorTest.java
+++ b/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptContributorTest.java
@@ -17,13 +17,12 @@
package org.apache.wicket.contrib.velocity;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test header contributions.
*/
-public class VelocityJavaScriptContributorTest extends Assert
+public class VelocityJavaScriptContributorTest
{
/**
* Test that the header contribution is added correctly.
[22/45] wicket git commit: wicket-core: Migrate to Junit 5
Posted by mg...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/ComponentMarkupIdTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/ComponentMarkupIdTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/ComponentMarkupIdTest.java
index cb16c69..d39f2cf 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/ComponentMarkupIdTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/ComponentMarkupIdTest.java
@@ -16,23 +16,24 @@
*/
package org.apache.wicket.markup.html;
-import org.junit.Assert;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.EmptyPanel;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Unit test to ensure that calling {@link Component#getMarkupId()} still works as advertised in
* Wicket 1.4.
*/
-public class ComponentMarkupIdTest extends WicketTestCase
+class ComponentMarkupIdTest extends WicketTestCase
{
/** */
@Test
- public void idGeneratedWhenComponentNotAddedToPage()
+ void idGeneratedWhenComponentNotAddedToPage()
{
// In wicket 1.4 the following sequence would not cause an exception
Label label = new Label("bla", "Hello, World!");
@@ -41,12 +42,12 @@ public class ComponentMarkupIdTest extends WicketTestCase
String markupId = label.getMarkupId();
// instead 1.4 would just generate the missing markup identifier
- Assert.assertEquals("bla1", markupId);
+ assertEquals("bla1", markupId);
}
/** */
@Test
- public void idGeneratedWhenPanelNotAddedToPage()
+ void idGeneratedWhenPanelNotAddedToPage()
{
// In wicket 1.4 the following sequence would not cause an exception
Panel panel = new EmptyPanel("bla");
@@ -56,7 +57,7 @@ public class ComponentMarkupIdTest extends WicketTestCase
String markupId = panel.getMarkupId();
// instead 1.4 would just generate the missing markup identifier
- Assert.assertEquals("bla1", markupId);
+ assertEquals("bla1", markupId);
}
/**
@@ -64,13 +65,13 @@ public class ComponentMarkupIdTest extends WicketTestCase
* markup file, when the component has been added to the page.
*/
@Test
- public void idFromMarkupRetrievedWhenPanelAddedToPage()
+ void idFromMarkupRetrievedWhenPanelAddedToPage()
{
ComponentMarkupIdTestPage page = new ComponentMarkupIdTestPage();
tester.startPage(page);
tester.assertRenderedPage(ComponentMarkupIdTestPage.class);
- Assert.assertEquals("markupPanel", page.markupPanel.getMarkupId());
+ assertEquals("markupPanel", page.markupPanel.getMarkupId());
}
/**
@@ -78,41 +79,41 @@ public class ComponentMarkupIdTest extends WicketTestCase
* markup file, when the component has been added to the page.
*/
@Test
- public void idFromMarkupRetrievedWhenLabelAddedToPage()
+ void idFromMarkupRetrievedWhenLabelAddedToPage()
{
ComponentMarkupIdTestPage page = new ComponentMarkupIdTestPage();
tester.startPage(page);
tester.assertRenderedPage(ComponentMarkupIdTestPage.class);
- Assert.assertEquals("markupLabel", page.markupLabel.getMarkupId());
+ assertEquals("markupLabel", page.markupLabel.getMarkupId());
}
/**
* Tests that a generated ID is kept, even if an identifier in the markup was set.
*/
@Test
- public void generatedIdOverridesIdFromMarkupWhenLabelAddedToPage()
+ void generatedIdOverridesIdFromMarkupWhenLabelAddedToPage()
{
ComponentMarkupIdTestPage page = new ComponentMarkupIdTestPage();
tester.startPage(page);
tester.assertRenderedPage(ComponentMarkupIdTestPage.class);
- Assert.assertEquals("generatedLabel1", page.generatedLabelMarkupId);
- Assert.assertEquals("generatedLabel1", page.generatedLabel.getMarkupId());
+ assertEquals("generatedLabel1", page.generatedLabelMarkupId);
+ assertEquals("generatedLabel1", page.generatedLabel.getMarkupId());
}
/**
* Tests that a generated ID is kept, even if an identifier in the markup was set.
*/
@Test
- public void generatedIdOverridesIdFromMarkup()
+ void generatedIdOverridesIdFromMarkup()
{
ComponentMarkupIdTestPage page = new ComponentMarkupIdTestPage();
tester.startPage(page);
tester.assertRenderedPage(ComponentMarkupIdTestPage.class);
- Assert.assertEquals("generatedPanel2", page.generatedPanelMarkupId);
- Assert.assertEquals("generatedPanel2", page.generatedPanel.getMarkupId());
+ assertEquals("generatedPanel2", page.generatedPanelMarkupId);
+ assertEquals("generatedPanel2", page.generatedPanel.getMarkupId());
}
/**
@@ -120,13 +121,13 @@ public class ComponentMarkupIdTest extends WicketTestCase
* kept, even if an identifier in the markup was set.
*/
@Test
- public void fixedIdFromJavaForLabelOverridesIdFromMarkup()
+ void fixedIdFromJavaForLabelOverridesIdFromMarkup()
{
ComponentMarkupIdTestPage page = new ComponentMarkupIdTestPage();
tester.startPage(page);
tester.assertRenderedPage(ComponentMarkupIdTestPage.class);
- Assert.assertEquals("javaLabel", page.fixedLabel.getMarkupId());
+ assertEquals("javaLabel", page.fixedLabel.getMarkupId());
}
/**
@@ -134,12 +135,12 @@ public class ComponentMarkupIdTest extends WicketTestCase
* kept, even if an identifier in the markup was set.
*/
@Test
- public void fixedIdFromJavaForPanelOverridesIdFromMarkup()
+ void fixedIdFromJavaForPanelOverridesIdFromMarkup()
{
ComponentMarkupIdTestPage page = new ComponentMarkupIdTestPage();
tester.startPage(page);
tester.assertRenderedPage(ComponentMarkupIdTestPage.class);
- Assert.assertEquals("javaPanel", page.fixedPanel.getMarkupId());
+ assertEquals("javaPanel", page.fixedPanel.getMarkupId());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/DecoratingHeaderResponseTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/DecoratingHeaderResponseTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/DecoratingHeaderResponseTest.java
index 30f8d5b..65eb1ca 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/DecoratingHeaderResponseTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/DecoratingHeaderResponseTest.java
@@ -16,11 +16,15 @@
*/
package org.apache.wicket.markup.html;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.io.IOException;
import java.text.ParseException;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
+import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;
@@ -28,17 +32,16 @@ import org.apache.wicket.markup.head.ResourceAggregator;
import org.apache.wicket.markup.parser.XmlPullParser;
import org.apache.wicket.markup.parser.XmlTag;
import org.apache.wicket.request.resource.PackageResourceReference;
-import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Pedro Santos
*/
-public class DecoratingHeaderResponseTest extends WicketTestCase
+class DecoratingHeaderResponseTest extends WicketTestCase
{
/**
@@ -49,7 +52,7 @@ public class DecoratingHeaderResponseTest extends WicketTestCase
* @throws ParseException
*/
@Test
- public void decoratedStringPrepend() throws IOException, ResourceStreamNotFoundException,
+ void decoratedStringPrepend() throws IOException, ResourceStreamNotFoundException,
ParseException
{
tester.getApplication().setHeaderResponseDecorator(new IHeaderResponseDecorator()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/HeaderContributorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/HeaderContributorTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/HeaderContributorTest.java
index 867dc07..f6d8d54 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/HeaderContributorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/HeaderContributorTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup.html;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.wicket.Component;
@@ -30,28 +32,27 @@ import org.apache.wicket.markup.head.IHeaderResponse;
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 that {@link Component}, {@link Behavior} and {@link org.apache.wicket.ajax.attributes.IAjaxCallListener} that implements
* {@link IHeaderContributor} actually contributes to the header
*/
-public class HeaderContributorTest extends WicketTestCase
+class HeaderContributorTest extends WicketTestCase
{
/**
* @see <a href="https://issues.apache.org/jira/browse/WICKET-3059">WICKET-3059</a>
*/
@Test
- public void testHeaderContribution()
+ void testHeaderContribution()
{
HeaderContributorTestPage page = new HeaderContributorTestPage();
tester.startPage(page);
- Assert.assertTrue("component", page.component.get());
- Assert.assertTrue("behavior", page.behavior.get());
- Assert.assertTrue("callDecorator", page.callDecorator.get());
+ assertTrue(page.component.get(), "component");
+ assertTrue(page.behavior.get(), "behavior");
+ assertTrue(page.callDecorator.get(), "callDecorator");
}
/**
@@ -70,7 +71,7 @@ public class HeaderContributorTest extends WicketTestCase
/**
* Construct.
*/
- public HeaderContributorTestPage()
+ HeaderContributorTestPage()
{
add(new AjaxEventBehavior("dummy")
{
@@ -130,7 +131,7 @@ public class HeaderContributorTest extends WicketTestCase
*
* @param callDecorator
*/
- public HeaderContributingCallDecorator(AtomicBoolean callDecorator)
+ HeaderContributingCallDecorator(AtomicBoolean callDecorator)
{
this.callDecorator = callDecorator;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupHeadFirstTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupHeadFirstTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupHeadFirstTest.java
index 7d54d4a..3abf5f8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupHeadFirstTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupHeadFirstTest.java
@@ -25,12 +25,12 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* <a href="https://issues.apache.org/jira/browse/WICKET-3761">WICKET-3761</a>
*/
-public class MarkupHeadFirstTest extends WicketTestCase
+class MarkupHeadFirstTest extends WicketTestCase
{
/**
@@ -44,7 +44,7 @@ public class MarkupHeadFirstTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderMyPage() throws Exception
+ void renderMyPage() throws Exception
{
executeTest(MarkupHeadFirstPage.class, "MarkupHeadFirstPage.html");
}
@@ -82,7 +82,7 @@ public class MarkupHeadFirstTest extends WicketTestCase
private static final long serialVersionUID = 1L;
- public MarkupHeadFirstPanel(String id)
+ MarkupHeadFirstPanel(String id)
{
super(id);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupInheritanceResolverTestPage1.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupInheritanceResolverTestPage1.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupInheritanceResolverTestPage1.java
index fc15a00..fc98744 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupInheritanceResolverTestPage1.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupInheritanceResolverTestPage1.java
@@ -24,7 +24,7 @@ public class MarkupInheritanceResolverTestPage1 extends WebPage
private static final long serialVersionUID = 1L;
/** */
- public MarkupInheritanceResolverTestPage1()
+ MarkupInheritanceResolverTestPage1()
{
add(new Label("test1", "test1"));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupInheritanceResolverTestPage2.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupInheritanceResolverTestPage2.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupInheritanceResolverTestPage2.java
index 636a14a..a44ace2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupInheritanceResolverTestPage2.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupInheritanceResolverTestPage2.java
@@ -24,7 +24,7 @@ public class MarkupInheritanceResolverTestPage2 extends MarkupInheritanceResolve
private static final long serialVersionUID = 1L;
/** */
- public MarkupInheritanceResolverTestPage2()
+ MarkupInheritanceResolverTestPage2()
{
add(new Label("test2", "test2"));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceGuardTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceGuardTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceGuardTest.java
index 42669a7..e146e03 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceGuardTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceGuardTest.java
@@ -16,21 +16,25 @@
*/
package org.apache.wicket.markup.html;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.File;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Juergen Donnerstag
*/
-public class PackageResourceGuardTest extends WicketTestCase
+class PackageResourceGuardTest extends WicketTestCase
{
/**
* Test acceptance of root folder.
*/
@Test
- public void accept()
+ void accept()
{
PackageResourceGuard guard = new PackageResourceGuard();
@@ -48,7 +52,7 @@ public class PackageResourceGuardTest extends WicketTestCase
* works on Windows and properly blocks on any other OS).
*/
@Test
- public void acceptAbsolutePath()
+ void acceptAbsolutePath()
{
PackageResourceGuard guard = new PackageResourceGuard();
guard.setAllowAccessToRootResources(false);
@@ -82,7 +86,7 @@ public class PackageResourceGuardTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void markup() throws Exception
+ void markup() throws Exception
{
PackageResourceGuard guard = new PackageResourceGuard();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java
index 63d6b6a..11bd855 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java
@@ -16,6 +16,11 @@
*/
package org.apache.wicket.markup.html;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.Locale;
import org.apache.wicket.Application;
@@ -27,8 +32,8 @@ import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.lang.Packages;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests for package resources.
@@ -38,13 +43,13 @@ import org.junit.Test;
public class PackageResourceTest extends WicketTestCase
{
/** mock application object */
- public WebApplication application;
+ private WebApplication application;
/**
*
*/
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
application = tester.getApplication();
}
@@ -55,11 +60,12 @@ public class PackageResourceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void bindAbsolutePackageResource() throws Exception
+ void bindAbsolutePackageResource() throws Exception
{
final SharedResources sharedResources = Application.get().getSharedResources();
- assertNotNull("resource packaged1.txt should be available as a packaged resource",
- sharedResources.get(PackageResourceTest.class, "packaged1.txt", null, null, null, true));
+ assertNotNull(
+ sharedResources.get(PackageResourceTest.class, "packaged1.txt", null, null, null, true),
+ "resource packaged1.txt should be available as a packaged resource");
}
/**
@@ -68,7 +74,7 @@ public class PackageResourceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void packageResourceGuard() throws Exception
+ void packageResourceGuard() throws Exception
{
PackageResourceGuard guard = new PackageResourceGuard();
assertTrue(guard.acceptExtension("txt"));
@@ -91,24 +97,22 @@ public class PackageResourceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void lenientPackageResourceMatching() throws Exception
+ void lenientPackageResourceMatching() throws Exception
{
ResourceReference invalidResource = new PackageResourceReference(PackageResourceTest.class,
"i_do_not_exist.txt", Locale.ENGLISH, null, null);
- assertNotNull(
- "resource i_do_not_exist.txt SHOULD be available as a packaged resource even if it doesn't exist",
- invalidResource.getResource());
+ assertNotNull(invalidResource.getResource(), "resource i_do_not_exist.txt SHOULD be available as a packaged resource even if it doesn't exist");
- assertTrue(PackageResource.exists(PackageResourceTest.class, "packaged1.txt", null, null,
- null));
+ assertTrue(
+ PackageResource.exists(PackageResourceTest.class, "packaged1.txt", null, null, null));
assertTrue(PackageResource.exists(PackageResourceTest.class, "packaged1.txt", Locale.CHINA,
null, null));
assertTrue(PackageResource.exists(PackageResourceTest.class, "packaged1.txt", Locale.CHINA,
"foo", null));
- assertTrue(PackageResource.exists(PackageResourceTest.class, "packaged1.txt", null, "foo",
+ assertTrue(
+ PackageResource.exists(PackageResourceTest.class, "packaged1.txt", null, "foo", null));
+ assertTrue(PackageResource.exists(PackageResourceTest.class, "packaged1_en.txt", null, null,
null));
- assertTrue(PackageResource.exists(PackageResourceTest.class, "packaged1_en.txt", null,
- null, null));
assertTrue(PackageResource.exists(PackageResourceTest.class, "packaged1_en_US.txt", null,
null, null));
assertTrue(PackageResource.exists(PackageResourceTest.class, "packaged1_en_US.txt", null,
@@ -139,7 +143,7 @@ public class PackageResourceTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-4119
*/
@Test
- public void contentType()
+ void contentType()
{
PackageResource textResource = new PackageResource(PackageResourceTest.class,
"packaged1.txt", null, null, null)
@@ -161,7 +165,7 @@ public class PackageResourceTest extends WicketTestCase
}
@Test
- public void textFileWithEncoding()
+ void textFileWithEncoding()
{
final String encoding = "Klingon-8859-42";
final PackageResource resource = new PackageResource(PackageResourceTest.class,
@@ -176,7 +180,7 @@ public class PackageResourceTest extends WicketTestCase
}
@Test
- public void javascriptFileWithEncoding()
+ void javascriptFileWithEncoding()
{
final String encoding = "Klingon-8859-42";
final JavaScriptPackageResource resource = new JavaScriptPackageResource(
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/SecurePackageResourceGuardTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/SecurePackageResourceGuardTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/SecurePackageResourceGuardTest.java
index 9507d0a..0df9800 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/SecurePackageResourceGuardTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/SecurePackageResourceGuardTest.java
@@ -16,21 +16,24 @@
*/
package org.apache.wicket.markup.html;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.Application;
import org.apache.wicket.util.lang.Packages;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Juergen Donnerstag
*/
-public class SecurePackageResourceGuardTest extends WicketTestCase
+class SecurePackageResourceGuardTest extends WicketTestCase
{
/**
*
*/
@Test
- public void accept()
+ void accept()
{
SecurePackageResourceGuard guard = new SecurePackageResourceGuard();
guard.setAllowAccessToRootResources(false);
@@ -63,14 +66,14 @@ public class SecurePackageResourceGuardTest extends WicketTestCase
{
hit = true;
}
- assertTrue("Expected an IllegalArgumentException", hit);
+ assertTrue(hit, "Expected an IllegalArgumentException");
}
/**
*
*/
@Test
- public void acceptAbsolutePath()
+ void acceptAbsolutePath()
{
SecurePackageResourceGuard guard = new SecurePackageResourceGuard();
guard.addPattern("+*.gif");
@@ -84,7 +87,7 @@ public class SecurePackageResourceGuardTest extends WicketTestCase
*
*/
@Test
- public void fileOnly()
+ void fileOnly()
{
SecurePackageResourceGuard guard = new SecurePackageResourceGuard();
guard.setAllowAccessToRootResources(true);
@@ -106,7 +109,7 @@ public class SecurePackageResourceGuardTest extends WicketTestCase
}
@Test
- public void fileOnly_relative_allowed()
+ void fileOnly_relative_allowed()
{
// ".." is allowed as long as we have parent folder placeholder set in resource settings
tester.getApplication().getResourceSettings().setParentFolderPlaceholder("::");
@@ -116,7 +119,7 @@ public class SecurePackageResourceGuardTest extends WicketTestCase
}
@Test
- public void fileOnly_relative_not_allowed()
+ void fileOnly_relative_not_allowed()
{
// ".." is allowed as long as we have parent folder placeholder set in resource settings
tester.getApplication().getResourceSettings().setParentFolderPlaceholder(null);
@@ -129,7 +132,7 @@ public class SecurePackageResourceGuardTest extends WicketTestCase
*
*/
@Test
- public void withDirectory()
+ void withDirectory()
{
SecurePackageResourceGuard guard = new SecurePackageResourceGuard();
guard.getPattern().clear();
@@ -146,7 +149,7 @@ public class SecurePackageResourceGuardTest extends WicketTestCase
*
*/
@Test
- public void one()
+ void one()
{
SecurePackageResourceGuard guard = new SecurePackageResourceGuard();
guard.getPattern().clear();
@@ -163,7 +166,7 @@ public class SecurePackageResourceGuardTest extends WicketTestCase
*
*/
@Test
- public void two()
+ void two()
{
SecurePackageResourceGuard guard = new SecurePackageResourceGuard();
guard.getPattern().clear();
@@ -183,7 +186,7 @@ public class SecurePackageResourceGuardTest extends WicketTestCase
*
*/
@Test
- public void three()
+ void three()
{
SecurePackageResourceGuard guard = new SecurePackageResourceGuard();
guard.getPattern().clear();
@@ -203,7 +206,7 @@ public class SecurePackageResourceGuardTest extends WicketTestCase
*
*/
@Test
- public void four()
+ void four()
{
SecurePackageResourceGuard guard = new SecurePackageResourceGuard();
guard.getPattern().clear();
@@ -231,7 +234,7 @@ public class SecurePackageResourceGuardTest extends WicketTestCase
*
*/
@Test
- public void five()
+ void five()
{
SecurePackageResourceGuard guard = new SecurePackageResourceGuard();
guard.getPattern().clear();
@@ -249,7 +252,7 @@ public class SecurePackageResourceGuardTest extends WicketTestCase
*
*/
@Test
- public void six()
+ void six()
{
SecurePackageResourceGuard guard = new SecurePackageResourceGuard();
guard.setAllowAccessToRootResources(true);
@@ -267,7 +270,7 @@ public class SecurePackageResourceGuardTest extends WicketTestCase
*
*/
@Test
- public void seven()
+ void seven()
{
SecurePackageResourceGuard guard = new SecurePackageResourceGuard();
guard.getPattern().clear();
@@ -284,7 +287,7 @@ public class SecurePackageResourceGuardTest extends WicketTestCase
*
*/
@Test
- public void eight()
+ void eight()
{
SecurePackageResourceGuard guard = new SecurePackageResourceGuard();
guard.getPattern().clear();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/TransparentWebMarkupContainerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/TransparentWebMarkupContainerTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/TransparentWebMarkupContainerTest.java
index 39586e0..da853e4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/TransparentWebMarkupContainerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/TransparentWebMarkupContainerTest.java
@@ -16,7 +16,11 @@
*/
package org.apache.wicket.markup.html;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.wicket.Component;
import org.apache.wicket.IPageManagerProvider;
@@ -40,7 +44,7 @@ import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Pedro Santos
@@ -53,7 +57,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void markupInheritanceResolver() throws Exception
+ void markupInheritanceResolver() throws Exception
{
executeTest(MarkupInheritanceResolverTestPage3.class,
"MarkupInheritanceResolverTestPage_expected.html");
@@ -63,7 +67,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase
*
*/
@Test
- public void unableToFindComponents()
+ void unableToFindComponents()
{
try
{
@@ -72,8 +76,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase
}
catch (MarkupException e)
{
- assertTrue(e.getMessage(),
- e.getMessage().contains("Unable to find component with id 'c1'"));
+ assertTrue(e.getMessage().contains("Unable to find component with id 'c1'"), e.getMessage());
}
}
@@ -82,7 +85,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase
* WicketTagIdentifier is generation for internal components.
*/
@Test
- public void usingGeneratedWicketIdAreSafe1()
+ void usingGeneratedWicketIdAreSafe1()
{
tester.startPage(TestPage2.class);
assertTrue(tester.getLastResponseAsString().contains("test_message"));
@@ -93,7 +96,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase
* Same test in different scenario
*/
@Test
- public void usingGeneratedWicketIdAreSafe2()
+ void usingGeneratedWicketIdAreSafe2()
{
tester.startPage(TestPage3.class);
String expected = tester.getApplication()
@@ -107,7 +110,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase
* Test case for <a href="https://issues.apache.org/jira/browse/WICKET-3719">WICKET-3719</a>
*/
@Test
- public void ajaxUpdate()
+ void ajaxUpdate()
{
WicketTester wicketTester = new WicketTester()
{
@@ -147,7 +150,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase
* that might need rewriting.
*/
@Test
- public void ajaxRequestForComponentInTransparentWebMarkupContainerShouldntCauseStackOverflow()
+ void ajaxRequestForComponentInTransparentWebMarkupContainerShouldntCauseStackOverflow()
{
tester.startPage(SingleNestedTransparentContainerPage.class);
@@ -166,7 +169,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase
* outer TWMC.
*/
@Test
- public void ajaxRequestForComponentInTransparentWebMarkupContainerShouldntCauseStackOverflow2()
+ void ajaxRequestForComponentInTransparentWebMarkupContainerShouldntCauseStackOverflow2()
{
tester.startPage(DoubleNestedTransparentContainerPage.class);
@@ -185,7 +188,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase
* container and trying to update a label that was added to the outer TWMC.
*/
@Test
- public void ajaxRequestForComponentInTransparentWebMarkupContainerShouldntCauseStackOverflow3()
+ void ajaxRequestForComponentInTransparentWebMarkupContainerShouldntCauseStackOverflow3()
{
tester.startPage(DoubleNestedTransparentContainerWithSiblingTransparentContainerPage.class);
@@ -205,7 +208,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase
* the outer TWMC.
*/
@Test
- public void ajaxRequestForComponentInTransparentWebMarkupContainerShouldntCauseStackOverflow4()
+ void ajaxRequestForComponentInTransparentWebMarkupContainerShouldntCauseStackOverflow4()
{
tester.startPage(TransparentContainerWithAutoTransparentContainerPage.class);
@@ -224,7 +227,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase
* label that was added to the outer TWMC.
*/
@Test
- public void ajaxRequestForComponentInTransparentWebMarkupContainerShouldntCauseStackOverflow5()
+ void ajaxRequestForComponentInTransparentWebMarkupContainerShouldntCauseStackOverflow5()
{
tester.startPage(TransparentContainerWithManualTransparentContainerPage.class);
@@ -242,7 +245,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase
* Headers not rendered for components inside TransparentWebMarkupContainer on ajax update
*/
@Test
- public void updateAjaxUpdateOfTransparentContainer() throws Exception
+ void updateAjaxUpdateOfTransparentContainer() throws Exception
{
TestEmbeddedAjaxComponet page = new TestEmbeddedAjaxComponet();
tester.startPage(page);
@@ -253,7 +256,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase
}
@Test
- public void updateAjaxUpdateOfContainerWithTransparentContainer() throws Exception
+ void updateAjaxUpdateOfContainerWithTransparentContainer() throws Exception
{
TestEmbeddedAjaxComponet page = new TestEmbeddedAjaxComponet();
tester.startPage(page);
@@ -264,7 +267,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase
}
@Test
- public void nestedTransparentContainer() throws Exception
+ void nestedTransparentContainer() throws Exception
{
tester.startPage(TestEmbeddedTransparentMarkupContainer.class);
tester.assertRenderedPage(TestEmbeddedTransparentMarkupContainer.class);
@@ -280,7 +283,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-6219
*/
@Test
- public void shouldAllowAFragmentIdConflictingToASibilingTagWicketId() throws Exception
+ void shouldAllowAFragmentIdConflictingToASibilingTagWicketId() throws Exception
{
tester.startPage(SubPageWithAFragment.class);
assertThat(tester.getLastResponseAsString(), containsString("content"));
@@ -387,10 +390,10 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase
{
private static final long serialVersionUID = 1L;
- public int renderHeadCount = 0;
+ int renderHeadCount = 0;
/** */
- public TestEmbeddedAjaxComponet()
+ TestEmbeddedAjaxComponet()
{
final WebMarkupContainer container = new WebMarkupContainer("container");
container.setOutputMarkupId(true);
@@ -456,10 +459,10 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase
{
private static final long serialVersionUID = 1L;
- public static final String LABEL_MARKUP = "<span wicket:id=\"label\"></span>";
+ static final String LABEL_MARKUP = "<span wicket:id=\"label\"></span>";
/** */
- public TestEmbeddedTransparentMarkupContainer()
+ public TestEmbeddedTransparentMarkupContainer()
{
add(new TransparentWebMarkupContainer("outer"));
add(new TransparentWebMarkupContainer("inner"));
@@ -486,7 +489,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase
{
private static final long serialVersionUID = 1L;
- public PageWithAChildInsideATransparentContainer(PageParameters parameters)
+ public PageWithAChildInsideATransparentContainer(PageParameters parameters)
{
super(parameters);
add(new TransparentWebMarkupContainer("wrapper"));
@@ -508,7 +511,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase
{
private static final long serialVersionUID = 1L;
- public SubPageWithAFragment(PageParameters parameters)
+ public SubPageWithAFragment(PageParameters parameters)
{
super(parameters);
Fragment fragment = new Fragment("header", "header", this);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/WebPageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/WebPageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/WebPageTest.java
index 1d4e256..4f280f6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/WebPageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/WebPageTest.java
@@ -16,7 +16,8 @@
*/
package org.apache.wicket.markup.html;
-import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -26,12 +27,12 @@ import org.apache.wicket.page.IManageablePage;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Pedro Santos
*/
-public class WebPageTest extends WicketTestCase
+class WebPageTest extends WicketTestCase
{
/**
@@ -40,7 +41,7 @@ public class WebPageTest extends WicketTestCase
* @see <a href="https://issues.apache.org/jira/browse/WICKET-3892">WICKET-3892</a>
*/
@Test
- public void increaseNewlyCreatedPageId()
+ void increaseNewlyCreatedPageId()
{
tester.startPage(MainPage.class);
int mainPageId = tester.getLastRenderedPage().getPageId();
@@ -54,8 +55,8 @@ public class WebPageTest extends WicketTestCase
IManageablePage mainPage = tester.getSession().getPageManager().getPage(mainPageId);
IManageablePage targetPage = tester.getSession().getPageManager().getPage(targetPageId);
- assertThat(mainPage, instanceOf(MainPage.class));
- assertThat(targetPage, instanceOf(TargetPage.class));
+ assertThat(mainPage).isInstanceOf(MainPage.class);
+ assertThat(targetPage).isInstanceOf(TargetPage.class);
}
/** */
@@ -86,7 +87,7 @@ public class WebPageTest extends WicketTestCase
}
/** */
- public static class TargetPage extends WebPage implements IMarkupResourceStreamProvider
+ static class TargetPage extends WebPage implements IMarkupResourceStreamProvider
{
@Override
public IResourceStream getMarkupResourceStream(MarkupContainer container,
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/XmlDeclResponseTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/XmlDeclResponseTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/XmlDeclResponseTest.java
index dba8b4b..95442fe 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/XmlDeclResponseTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/XmlDeclResponseTest.java
@@ -16,24 +16,26 @@
*/
package org.apache.wicket.markup.html;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.Page;
import org.apache.wicket.markup.IMarkupFragment;
import org.apache.wicket.markup.Markup;
import org.apache.wicket.markup.MarkupType;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test xml decl in WebResponse
*/
-public class XmlDeclResponseTest extends WicketTestCase
+class XmlDeclResponseTest extends WicketTestCase
{
private static final String markupWith = "<?xml version='1.0' encoding='UTF-8' ?><html><body></body></html>";
private static final String markupWithout = "<html><body></body></html>";
private static final String acceptString = "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5";
- public static final String ACCEPT = "Accept";
+ private static final String ACCEPT = "Accept";
private int insertXmlDecl = 0;
@@ -64,7 +66,7 @@ public class XmlDeclResponseTest extends WicketTestCase
/** */
@Test
- public void insertAlways()
+ void insertAlways()
{
insertXmlDecl = 1;
@@ -99,7 +101,7 @@ public class XmlDeclResponseTest extends WicketTestCase
/** */
@Test
- public void insertNever()
+ void insertNever()
{
insertXmlDecl = -1;
@@ -134,7 +136,7 @@ public class XmlDeclResponseTest extends WicketTestCase
/** */
@Test
- public void insertWithRules()
+ void insertWithRules()
{
insertXmlDecl = 0;
@@ -179,7 +181,7 @@ public class XmlDeclResponseTest extends WicketTestCase
/**
* @param mime
*/
- public SimplePage(String mime)
+ SimplePage(String mime)
{
this.mime = mime;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/AutocomponetsGenerationTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/AutocomponetsGenerationTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/AutocomponetsGenerationTest.java
index d5dbff6..b26c414 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/AutocomponetsGenerationTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/AutocomponetsGenerationTest.java
@@ -16,13 +16,15 @@
*/
package org.apache.wicket.markup.html.autocomponent;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.Page;
import org.apache.wicket.core.util.string.ComponentRenderer;
import org.apache.wicket.markup.IMarkupCache;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class AutocomponetsGenerationTest extends WicketTestCase
+class AutocomponetsGenerationTest extends WicketTestCase
{
/*
@@ -30,7 +32,7 @@ public class AutocomponetsGenerationTest extends WicketTestCase
* and for https://issues.apache.org/jira/browse/WICKET-5908
*/
@Test
- public void autocomponetsNumberDoesntChange()
+ void autocomponetsNumberDoesntChange()
{
AutoComponentsPage autoComponentsPage = new AutoComponentsPage();
tester.startPage(autoComponentsPage);
@@ -51,7 +53,7 @@ public class AutocomponetsGenerationTest extends WicketTestCase
* Test for https://issues.apache.org/jira/browse/WICKET-6116
*/
@Test
- public void borderResolvesAutocomponents() throws Exception
+ void borderResolvesAutocomponents() throws Exception
{
AutoComponentsBorder border = new AutoComponentsBorder("id");
@@ -71,7 +73,7 @@ public class AutocomponetsGenerationTest extends WicketTestCase
* Test for https://issues.apache.org/jira/browse/WICKET-6256
*/
@Test
- public void autoComponentsIdsGeneration() throws Exception
+ void autoComponentsIdsGeneration() throws Exception
{
Page page = new UniqueIdTest();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/UniqueIdTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/UniqueIdTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/UniqueIdTest.java
index 43782e9..d30d2d5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/UniqueIdTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/UniqueIdTest.java
@@ -24,7 +24,7 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
-public class UniqueIdTest extends WebPage {
+class UniqueIdTest extends WebPage {
@Override
protected void onInitialize() {
@@ -44,7 +44,7 @@ public class UniqueIdTest extends WebPage {
*/
private static final long serialVersionUID = -437057755276096255L;
- public CacheKeyNullPanel(String id) {
+ CacheKeyNullPanel(String id) {
super(id);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutoLinkInPanelsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutoLinkInPanelsTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutoLinkInPanelsTest.java
index 23865c8..0291b43 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutoLinkInPanelsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutoLinkInPanelsTest.java
@@ -22,15 +22,15 @@ import org.apache.wicket.markup.html.autolink.sub.LogoPanel;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test for WICKET-4681
*
* @author Carl-Eric Menzel
*/
-public class AutoLinkInPanelsTest extends WicketTestCase
+class AutoLinkInPanelsTest extends WicketTestCase
{
public static class TestPage extends WebPage
{
@@ -40,8 +40,8 @@ public class AutoLinkInPanelsTest extends WicketTestCase
}
}
- @Before
- public void setUp()
+ @BeforeEach
+ void setUp()
{
tester = new WicketTester(new WebApplication()
{
@@ -62,7 +62,7 @@ public class AutoLinkInPanelsTest extends WicketTestCase
}
@Test
- public void imgTagWorksInPanelWithExtraContainer() throws Exception
+ void imgTagWorksInPanelWithExtraContainer() throws Exception
{
tester.startPage(TestPage.class);
// tester.dumpPage();
@@ -70,7 +70,7 @@ public class AutoLinkInPanelsTest extends WicketTestCase
}
@Test
- public void imgTagWorksInPanelWithoutExtraContainer() throws Exception
+ void imgTagWorksInPanelWithoutExtraContainer() throws Exception
{
tester.startPage(TestPage.class);
tester.assertContains("<img src=\"\\./wicket/resource/org.apache.wicket.markup.html.autolink.sub.LogoPanel/logo2-ver-\\d+.png\"/>");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutolinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutolinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutolinkTest.java
index 1aa6139..567e4c2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutolinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutolinkTest.java
@@ -18,20 +18,20 @@ package org.apache.wicket.markup.html.autolink;
import org.apache.wicket.markup.html.autolink.sub.PageB;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class AutolinkTest extends WicketTestCase
+class AutolinkTest extends WicketTestCase
{
/**
*
* @throws Exception
*/
@Test
- public void test_1() throws Exception
+ void test_1() throws Exception
{
executeTest(MyPage.class, "MyPageExpectedResult.html");
}
@@ -41,7 +41,7 @@ public class AutolinkTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void test_2() throws Exception
+ void test_2() throws Exception
{
executeTest(PageA.class, "PageAExpectedResult.html");
}
@@ -51,7 +51,7 @@ public class AutolinkTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void test_3() throws Exception
+ void test_3() throws Exception
{
executeTest(PageB.class, "PageBExpectedResult.html");
}
@@ -61,7 +61,7 @@ public class AutolinkTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void test_4() throws Exception
+ void test_4() throws Exception
{
executeTest(Index.class, "Index_ExpectedResult.html");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/BasePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/BasePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/BasePage.java
index ad2b7ee..405bb89 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/BasePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/BasePage.java
@@ -29,7 +29,7 @@ public class BasePage extends WebPage
* Creates a new instance of BasePanel
*
*/
- public BasePage()
+ BasePage()
{
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/QuickStartPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/QuickStartPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/QuickStartPage.java
index af20c04..09ac525 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/QuickStartPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/QuickStartPage.java
@@ -32,7 +32,7 @@ public abstract class QuickStartPage extends WebPage
/**
* Construct.
*/
- public QuickStartPage()
+ QuickStartPage()
{
add(new LinkPanel("linkPanel"));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/sub/BasePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/sub/BasePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/sub/BasePage.java
index 0ff5403..4a8ec3e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/sub/BasePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/sub/BasePage.java
@@ -29,7 +29,7 @@ public class BasePage extends WebPage
* Creates a new instance of BasePanel
*
*/
- public BasePage()
+ BasePage()
{
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/EnclosureContainerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/EnclosureContainerTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/EnclosureContainerTest.java
index c27121d..19b00fd 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/EnclosureContainerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/EnclosureContainerTest.java
@@ -16,19 +16,21 @@
*/
package org.apache.wicket.markup.html.basic;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link EnclosureContainer}.
*
* @author svenmeier
*/
-public class EnclosureContainerTest extends WicketTestCase
+class EnclosureContainerTest extends WicketTestCase
{
@Test
- public void test() {
+ void test() {
EnclosureContainerPage page = new EnclosureContainerPage();
tester.startPage(page);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java
index 6c1c550..b5328dc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java
@@ -16,20 +16,22 @@
*/
package org.apache.wicket.markup.html.basic;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.util.tester.DiffUtil;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author jcompagner
*/
-public class HomePageRedirectTest extends WicketTestCase
+class HomePageRedirectTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void testRenderHomePagePageRedirect() throws Exception
+ void testRenderHomePagePageRedirect() throws Exception
{
tester.startPage(HomePagePageRedirect.class);
@@ -44,7 +46,7 @@ public class HomePageRedirectTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void testRenderHomePageClassRedirect() throws Exception
+ void testRenderHomePageClassRedirect() throws Exception
{
tester.startPage(HomePageClassRedirect.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/LabelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/LabelTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/LabelTest.java
index 000136b..831ce64 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/LabelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/LabelTest.java
@@ -17,14 +17,14 @@
package org.apache.wicket.markup.html.basic;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for Label components
*
* @author Eelco Hillenius
*/
-public class LabelTest extends WicketTestCase
+class LabelTest extends WicketTestCase
{
/**
* Test escaping markup.
@@ -32,7 +32,7 @@ public class LabelTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void labelWithEscapeMarkup() throws Exception
+ void labelWithEscapeMarkup() throws Exception
{
executeTest(LabelWithEscapeMarkupPage.class, "LabelWithEscapeMarkupPageExpectedResult.html");
}
@@ -43,7 +43,7 @@ public class LabelTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void labelWithoutEscapeMarkup() throws Exception
+ void labelWithoutEscapeMarkup() throws Exception
{
executeTest(LabelWithoutEscapeMarkupPage.class,
"LabelWithoutEscapeMarkupPageExpectedResult.html");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java
index 8e8de92..bb591da 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java
@@ -16,6 +16,11 @@
*/
package org.apache.wicket.markup.html.basic;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.markup.MarkupException;
import org.apache.wicket.markup.MarkupNotFoundException;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -23,8 +28,7 @@ import org.apache.wicket.markup.html.border.Border;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.value.ValueMap;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Simple application that demonstrates the mock http application code (and checks that it is
@@ -32,13 +36,13 @@ import org.junit.Test;
*
* @author Chris Turner
*/
-public class SimplePageTest extends WicketTestCase
+class SimplePageTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void renderHomePage() throws Exception
+ void renderHomePage() throws Exception
{
executeTest(SimplePage.class, "SimplePageExpectedResult.html");
}
@@ -47,7 +51,7 @@ public class SimplePageTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_2() throws Exception
+ void renderHomePage_2() throws Exception
{
executeTest(SimplePage.class, "SimplePageExpectedResult.html");
String document = tester.getLastResponseAsString();
@@ -58,7 +62,8 @@ public class SimplePageTest extends WicketTestCase
Panel panel = (Panel)tester.getLastRenderedPage().get("myPanel");
assertNotNull(panel);
- assertTrue(document.contains("<wicket:panel>Inside the panel<span wicket:id=\"label\">mein Label</span></wicket:panel>"));
+ assertTrue(document.contains(
+ "<wicket:panel>Inside the panel<span wicket:id=\"label\">mein Label</span></wicket:panel>"));
label = (Label)tester.getLastRenderedPage().get("myPanel:label");
assertNotNull(label);
@@ -68,18 +73,21 @@ public class SimplePageTest extends WicketTestCase
Border border = (Border)tester.getLastRenderedPage().get("myBorder");
assertNotNull(border);
assertFalse("".equals(document));
- assertTrue(document.contains("<wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border>"));
+ assertTrue(document.contains(
+ "<wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border>"));
border = (Border)tester.getLastRenderedPage().get("myBorder2");
assertNotNull(border);
assertFalse("".equals(document));
- assertTrue(document.contains("<span wicket:id=\"myBorder2\" testAttr=\"myValue\"><wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border></span>"));
+ assertTrue(document.contains(
+ "<span wicket:id=\"myBorder2\" testAttr=\"myValue\"><wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border></span>"));
// do the same test twice. Igor reported a problem with that, so we have to test it.
border = (Border)tester.getLastRenderedPage().get("myBorder2");
assertNotNull(border);
assertFalse("".equals(document));
- assertTrue(document.contains("<span wicket:id=\"myBorder2\" testAttr=\"myValue\"><wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border></span>"));
+ assertTrue(document.contains(
+ "<span wicket:id=\"myBorder2\" testAttr=\"myValue\"><wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border></span>"));
WebMarkupContainer container = (WebMarkupContainer)tester.getLastRenderedPage().get("test");
assertNotNull(container);
@@ -96,7 +104,7 @@ public class SimplePageTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_2a() throws Exception
+ void renderHomePage_2a() throws Exception
{
// Render the component without having rendered the page previously
SimplePage page = new SimplePage();
@@ -108,7 +116,8 @@ public class SimplePageTest extends WicketTestCase
Panel panel = (Panel)page.get("myPanel");
assertNotNull(panel);
- assertTrue(document.contains("<wicket:panel>Inside the panel<span wicket:id=\"label\">mein Label</span></wicket:panel>"));
+ assertTrue(document.contains(
+ "<wicket:panel>Inside the panel<span wicket:id=\"label\">mein Label</span></wicket:panel>"));
label = (Label)page.get("myPanel:label");
assertNotNull(label);
@@ -116,16 +125,19 @@ public class SimplePageTest extends WicketTestCase
Border border = (Border)page.get("myBorder");
assertNotNull(border);
- assertTrue(document.contains("<wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border>"));
+ assertTrue(document.contains(
+ "<wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border>"));
border = (Border)page.get("myBorder2");
assertNotNull(border);
- assertTrue(document.contains("<span wicket:id=\"myBorder2\" testAttr=\"myValue\"><wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border></span>"));
+ assertTrue(document.contains(
+ "<span wicket:id=\"myBorder2\" testAttr=\"myValue\"><wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border></span>"));
// do the same test twice. Igor reported a problem with that, so we have to test it.
border = (Border)page.get("myBorder2");
assertNotNull(border);
- assertTrue(document.contains("<span wicket:id=\"myBorder2\" testAttr=\"myValue\"><wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border></span>"));
+ assertTrue(document.contains(
+ "<span wicket:id=\"myBorder2\" testAttr=\"myValue\"><wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border></span>"));
WebMarkupContainer container = (WebMarkupContainer)page.get("test");
assertNotNull(container);
@@ -140,7 +152,7 @@ public class SimplePageTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_2b() throws Exception
+ void renderHomePage_2b() throws Exception
{
// Render the component without having rendered the page previously
SimplePage page = new SimplePage();
@@ -199,7 +211,7 @@ public class SimplePageTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_3() throws Exception
+ void renderHomePage_3() throws Exception
{
executeTest(SimplePage_3.class, "SimplePageExpectedResult_3.html");
}
@@ -208,7 +220,7 @@ public class SimplePageTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_4() throws Exception
+ void renderHomePage_4() throws Exception
{
boolean hit = false;
try
@@ -223,14 +235,14 @@ public class SimplePageTest extends WicketTestCase
assertTrue(mex.getMessage().contains("<span>"));
assertTrue(mex.toString().contains("SimplePage_4.html"));
}
- assertTrue("Did expect a MarkupException", hit);
+ assertTrue(hit, "Did expect a MarkupException");
}
/**
* @throws Exception
*/
@Test
- public void renderHomePage_5() throws Exception
+ void renderHomePage_5() throws Exception
{
boolean hit = false;
try
@@ -241,14 +253,14 @@ public class SimplePageTest extends WicketTestCase
{
hit = true;
}
- assertTrue("Did expect a MarkupNotFoundException", hit);
+ assertTrue(hit, "Did expect a MarkupNotFoundException");
}
/**
* @throws Exception
*/
@Test
- public void renderHomePage_6() throws Exception
+ void renderHomePage_6() throws Exception
{
boolean hit = false;
try
@@ -259,14 +271,14 @@ public class SimplePageTest extends WicketTestCase
{
hit = true;
}
- assertTrue("Did expect a MarkupException", hit);
+ assertTrue(hit, "Did expect a MarkupException");
}
/**
* @throws Exception
*/
@Test
- public void renderHomePage_7() throws Exception
+ void renderHomePage_7() throws Exception
{
tester.getApplication().getResourceSettings().setThrowExceptionOnMissingResource(false);
// This is for issue https://issues.apache.org/jira/browse/WICKET-590
@@ -277,7 +289,7 @@ public class SimplePageTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_8() throws Exception
+ void renderHomePage_8() throws Exception
{
boolean hit = false;
try
@@ -288,14 +300,14 @@ public class SimplePageTest extends WicketTestCase
{
hit = true;
}
- assertTrue("Did expect a MarkupException", hit);
+ assertTrue(hit, "Did expect a MarkupException");
}
/**
* @throws Exception
*/
@Test
- public void renderHomePage_9() throws Exception
+ void renderHomePage_9() throws Exception
{
executeTest(SimplePage_9.class, "SimplePageExpectedResult_9.html");
}
@@ -304,19 +316,20 @@ public class SimplePageTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_10() throws Exception
+ void renderHomePage_10() throws Exception
{
executeTest(new SimplePage_10(false), "SimplePageExpectedResult_10.html");
tester.startPage(new SimplePage_10(true));
String document = tester.getLastResponseAsString();
- assertTrue(document.contains("<wicket:panel>Inside the panel<span wicket:id=\"label\">mein Label</span></wicket:panel>"));
+ assertTrue(document.contains(
+ "<wicket:panel>Inside the panel<span wicket:id=\"label\">mein Label</span></wicket:panel>"));
}
/**
* @throws Exception
*/
@Test
- public void renderHomePage_11() throws Exception
+ void renderHomePage_11() throws Exception
{
executeTest(SimplePage_11.class, "SimplePageExpectedResult_11.html");
}
@@ -325,7 +338,7 @@ public class SimplePageTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_12() throws Exception
+ void renderHomePage_12() throws Exception
{
executeTest(SimplePage_12.class, "SimplePageExpectedResult_12.html");
}
@@ -334,7 +347,7 @@ public class SimplePageTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_13() throws Exception
+ void renderHomePage_13() throws Exception
{
executeTest(SimplePage_13.class, "SimplePageExpectedResult_13.html");
}
@@ -343,7 +356,7 @@ public class SimplePageTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_14() throws Exception
+ void renderHomePage_14() throws Exception
{
executeTest(SimplePage_14.class, "SimplePageExpectedResult_14.html");
}
@@ -352,7 +365,7 @@ public class SimplePageTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_15() throws Exception
+ void renderHomePage_15() throws Exception
{
executeTest(SimplePage_15.class, "SimplePageExpectedResult_15.html");
}
@@ -361,7 +374,7 @@ public class SimplePageTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_16() throws Exception
+ void renderHomePage_16() throws Exception
{
executeTest(SimplePage_16.class, "SimplePageExpectedResult_16.html");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_9.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_9.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_9.java
index c8eb668..23df29e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_9.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_9.java
@@ -49,7 +49,7 @@ public class SimplePage_9 extends WebPage
*
* @param id
*/
- public TestContainer(String id)
+ TestContainer(String id)
{
super(id);
add(new Label("test", "myTest"));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClassTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClassTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClassTest.java
index 54fa671..6f73267 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClassTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClassTest.java
@@ -16,23 +16,23 @@
*/
package org.apache.wicket.markup.html.basic;
-import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.assertj.core.api.Assertions.assertThat;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author jcompagner
*
*/
-public class SimpleResponsePageClassTest extends WicketTestCase
+class SimpleResponsePageClassTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void responsePageClass() throws Exception
+ void responsePageClass() throws Exception
{
tester.startPage(SimpleResponsePageClass.class);
SimpleResponsePageClass manageBook = (SimpleResponsePageClass)tester.getLastRenderedPage();
@@ -42,6 +42,6 @@ public class SimpleResponsePageClassTest extends WicketTestCase
tester.submitForm(form);
// assertion failed, getLastRenderedPage() return null.
- assertThat(tester.getLastRenderedPage(), instanceOf(SimplePage.class));
+ assertThat(tester.getLastRenderedPage()).isInstanceOf(SimplePage.class);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/XmlBasePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/XmlBasePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/XmlBasePage.java
index 3934366..7fef7c2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/XmlBasePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/XmlBasePage.java
@@ -32,7 +32,7 @@ public class XmlBasePage extends WebPage
/**
* Construct.
*/
- public XmlBasePage()
+ XmlBasePage()
{
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/XmlPageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/XmlPageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/XmlPageTest.java
index dbfd25f..352f1cc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/XmlPageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/XmlPageTest.java
@@ -22,7 +22,7 @@ import org.apache.wicket.resource.IsoPropertiesFilePropertiesLoader;
import org.apache.wicket.resource.PropertiesFactory;
import org.apache.wicket.resource.XmlFilePropertiesLoader;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
*
* @author Juergen Donnerstag
*/
-public class XmlPageTest extends WicketTestCase
+class XmlPageTest extends WicketTestCase
{
private static final Logger log = LoggerFactory.getLogger(XmlPageTest.class);
@@ -39,7 +39,7 @@ public class XmlPageTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_1() throws Exception
+ void renderHomePage_1() throws Exception
{
executeTest(XmlPage_1.class, "XmlPageExpectedResult_1.xml");
}
@@ -48,7 +48,7 @@ public class XmlPageTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_2() throws Exception
+ void renderHomePage_2() throws Exception
{
IPropertiesFactory myFac = new MyPropertiesFactory(tester.getApplication());
tester.getApplication().getResourceSettings().setPropertiesFactory(myFac);
@@ -60,7 +60,7 @@ public class XmlPageTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_3() throws Exception
+ void renderHomePage_3() throws Exception
{
IPropertiesFactory myFac = new MyPropertiesFactory(tester.getApplication());
tester.getApplication().getResourceSettings().setPropertiesFactory(myFac);
@@ -75,7 +75,7 @@ public class XmlPageTest extends WicketTestCase
*
* @param application
*/
- public MyPropertiesFactory(Application application)
+ MyPropertiesFactory(Application application)
{
super(application.getResourceSettings());
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BorderWithForm.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BorderWithForm.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BorderWithForm.java
index 9bf4762..13d2011 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BorderWithForm.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BorderWithForm.java
@@ -19,7 +19,7 @@ package org.apache.wicket.markup.html.border;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
-public class BorderWithForm extends Border
+class BorderWithForm extends Border
{
public BorderWithForm(String id)
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java
index bc2f2fd..51c1f63 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java
@@ -16,18 +16,22 @@
*/
package org.apache.wicket.markup.html.border;
+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 org.apache.wicket.Page;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.model.Model;
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 ComponentBorderTest extends WicketTestCase
+class ComponentBorderTest extends WicketTestCase
{
private static final String TEST_TEXT = "Meaning of life? 42!";
@@ -37,7 +41,7 @@ public class ComponentBorderTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void componentUseCheck() throws Exception
+ void componentUseCheck() throws Exception
{
/*
* Suppose:
@@ -65,7 +69,7 @@ public class ComponentBorderTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void hideableBorder() throws Exception
+ void hideableBorder() throws Exception
{
executeTest(HideableBorderPage.class, "HideableBorderPage_ExpectedResult.html");
@@ -83,72 +87,68 @@ public class ComponentBorderTest extends WicketTestCase
ajaxResponse = tester.getLastResponseAsString();
tester.assertComponentOnAjaxResponse(wrapper);
}
-
+
@Test
- public void borderWithForm() throws Exception
+ void borderWithForm() throws Exception
{
/*
* Suppose we have a border like this:
*
- * <div wicket:id="border">
- * <form>
- * <body/>
- * </form>
- * </div>
+ * <div wicket:id="border"> <form> <body/> </form> </div>
*
- * Any form components inside its body must be correctly
- * submitted with the outer form.
+ * Any form components inside its body must be correctly submitted with the outer form.
*/
Model<String> model = Model.of("");
BorderWithFormPage page = new BorderWithFormPage(model);
-
+
tester.startPage(page);
-
- FormTester formTester = tester.
- newFormTester("borderContainer:formBorder:borderContainer:form");
-
+
+ FormTester formTester = tester
+ .newFormTester("borderContainer:formBorder:borderContainer:form");
+
formTester.setValue("formBorder_body:text", TEST_TEXT);
formTester.submit();
-
+
assertEquals(TEST_TEXT, model.getObject());
}
-
+
@Test
- public void borderWithEnclosurePage() throws Exception
+ void borderWithEnclosurePage() throws Exception
{
tester.startPage(BorderWithEnclosurePage.class);
tester.assertRenderedPage(BorderWithEnclosurePage.class);
}
-
+
@Test
- public void borderWithAutoLabel() throws Exception
+ void borderWithAutoLabel() throws Exception
{
tester.startPage(BorderWithAutoLabelPage.class);
tester.assertRenderedPage(BorderWithAutoLabelPage.class);
}
-
+
@Test
- public void borderWithBodyInsideAnotherBody() throws Exception
+ void borderWithBodyInsideAnotherBody() throws Exception
{
BorderWithNestedBodyPage page = tester.startPage(BorderWithNestedBodyPage.class);
-
- Border borderTest = (Border) page.get("outerBorder");
+
+ Border borderTest = (Border)page.get("outerBorder");
Border nestedBorder = (Border)borderTest.get("nestedBorder");
-
+
assertNotNull(borderTest.getBodyContainer().getParent());
assertNotNull(nestedBorder.getBodyContainer().getParent());
-
- //https://issues.apache.org/jira/browse/WICKET-6303
+
+ // https://issues.apache.org/jira/browse/WICKET-6303
assertTrue(page.isBehaviorRendered());
}
-
+
/**
* https://issues.apache.org/jira/browse/WICKET-6374
+ *
* @throws Exception
*/
@Test
- public void borderExtendingMarkup() throws Exception
- {
- tester.startComponentInPage(ExtendedBorder.class);
- }
+ void borderExtendingMarkup() throws Exception
+ {
+ tester.startComponentInPage(ExtendedBorder.class);
+ }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ExtedableBorder.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ExtedableBorder.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ExtedableBorder.java
index cdd4a81..bcfe041 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ExtedableBorder.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ExtedableBorder.java
@@ -23,7 +23,7 @@ public class ExtedableBorder extends Border
*/
private static final long serialVersionUID = 1431333408002477444L;
- public ExtedableBorder(final String id)
+ ExtedableBorder(final String id)
{
super(id);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/debug/WicketComponentTreeTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/debug/WicketComponentTreeTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/debug/WicketComponentTreeTest.java
index 5d33954..2a9613e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/debug/WicketComponentTreeTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/debug/WicketComponentTreeTest.java
@@ -17,14 +17,14 @@
package org.apache.wicket.markup.html.debug;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test the component: PageView
*
* @author Juergen Donnerstag
*/
-public class WicketComponentTreeTest extends WicketTestCase
+class WicketComponentTreeTest extends WicketTestCase
{
/**
@@ -33,7 +33,7 @@ public class WicketComponentTreeTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void test1() throws Exception
+ void test1() throws Exception
{
// disable the component use check, as this consumes extra
// memory (label size doubles to 1.1K)
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java
index fbb8567..f875ab1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java
@@ -49,7 +49,7 @@ public abstract class AbstractCheckGroupTestPage extends WebPage
*
* @param list
*/
- public AbstractCheckGroupTestPage(List<String> list)
+ AbstractCheckGroupTestPage(List<String> list)
{
form = new Form<Void>("form");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AbstractTextComponentConvertEmptyStringsToNullTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AbstractTextComponentConvertEmptyStringsToNullTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AbstractTextComponentConvertEmptyStringsToNullTest.java
index 6e688d9..2d51d77 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AbstractTextComponentConvertEmptyStringsToNullTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AbstractTextComponentConvertEmptyStringsToNullTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import java.util.Locale;
import org.apache.wicket.MarkupContainer;
@@ -27,18 +30,18 @@ import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*/
-public class AbstractTextComponentConvertEmptyStringsToNullTest extends WicketTestCase
+class AbstractTextComponentConvertEmptyStringsToNullTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void convertEmptyStringsToNull() throws Exception
+ void convertEmptyStringsToNull() throws Exception
{
StringArrayPage page = tester.startPage(StringArrayPage.class);
@@ -55,10 +58,10 @@ public class AbstractTextComponentConvertEmptyStringsToNullTest extends WicketTe
private static final long serialVersionUID = 1L;
/** */
- public String[] array = new String[0];
+ String[] array = new String[0];
/** */
- public Form<Void> form;
+ Form<Void> form;
/**
* Construct.
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoFormLabelPickupTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoFormLabelPickupTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoFormLabelPickupTest.java
index 204f949..e3d3908 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoFormLabelPickupTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoFormLabelPickupTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.Locale;
import org.apache.wicket.Page;
@@ -24,24 +26,24 @@ import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
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;
@SuppressWarnings({ "rawtypes", "serial", "unchecked" })
-public class AutoFormLabelPickupTest extends WicketTestCase
+class AutoFormLabelPickupTest extends WicketTestCase
{
- public static class PrintLabelPage extends WebPage
+ static class PrintLabelPage extends WebPage
{
- public PrintLabelPage(IModel labelModel)
+ PrintLabelPage(IModel labelModel)
{
Form form = new Form("form");
add(form);
form.add(new TextField("input", Model.of("")).setLabel(labelModel));
}
}
- public static class PickUpLabelPage extends WebPage
+ static class PickUpLabelPage extends WebPage
{
- public PickUpLabelPage(IModel labelModel)
+ PickUpLabelPage(IModel labelModel)
{
Form form = new Form("form");
add(form);
@@ -55,28 +57,28 @@ public class AutoFormLabelPickupTest extends WicketTestCase
/**
*
*/
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
Session.get().setLocale(Locale.US);
}
@Test
- public void labelIsPrintedFromModel() throws Exception
+ void labelIsPrintedFromModel() throws Exception
{
tester.startPage(new PrintLabelPage(Model.of("label from model")));
tester.assertContains("<label wicket:for=\"input\" id=\"input2-w-lbl\" for=\"input2\">\\|label from model\\|</label>");
}
@Test
- public void labelIsPrintedFromProperties() throws Exception
+ void labelIsPrintedFromProperties() throws Exception
{
tester.startPage(new PrintLabelPage(Model.of((String)null)));
tester.assertContains("<label wicket:for=\"input\" id=\"input2-w-lbl\" for=\"input2\">\\|label from properties\\|</label>");
}
@Test
- public void labelIsPickedUpFromMarkup() throws Exception
+ void labelIsPickedUpFromMarkup() throws Exception
{
tester.startPage(new PickUpLabelPage(null));
assertEquals(
@@ -86,7 +88,7 @@ public class AutoFormLabelPickupTest extends WicketTestCase
}
@Test
- public void labelIsPickedUpFromProperties() throws Exception
+ void labelIsPickedUpFromProperties() throws Exception
{
tester.startPage(new PickUpLabelPage(null));
assertEquals(
@@ -96,7 +98,7 @@ public class AutoFormLabelPickupTest extends WicketTestCase
}
@Test
- public void withoutAutolabel() throws Exception
+ void withoutAutolabel() throws Exception
{
tester.startPage(new PickUpLabelPage(null));
tester.assertContains("<label>label from markup without autolabel</label>");
@@ -107,7 +109,7 @@ public class AutoFormLabelPickupTest extends WicketTestCase
}
@Test
- public void localeChangesAreDetectedWithExplicitMessageKeys() throws Exception
+ void localeChangesAreDetectedWithExplicitMessageKeys() throws Exception
{
Session.get().setLocale(Locale.GERMAN);
tester.startPage(new PickUpLabelPage(null));
@@ -129,7 +131,7 @@ public class AutoFormLabelPickupTest extends WicketTestCase
}
@Test
- public void localeChangesAreDetectedWithDefaultLabels() throws Exception
+ void localeChangesAreDetectedWithDefaultLabels() throws Exception
{
Session.get().setLocale(Locale.GERMAN);
tester.startPage(new PickUpLabelPage(null));
@@ -151,7 +153,7 @@ public class AutoFormLabelPickupTest extends WicketTestCase
}
@Test
- public void defaultLabelIsPickedUpFromProperties() throws Exception
+ void defaultLabelIsPickedUpFromProperties() throws Exception
{
tester.startPage(new PickUpLabelPage(null));
assertEquals(
[43/45] wicket git commit: - merge with master - codereview issues
fixed
Posted by mg...@apache.org.
- merge with master
- codereview issues fixed
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/512c4216
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/512c4216
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/512c4216
Branch: refs/heads/master
Commit: 512c4216689a72931f101f7e59b81ab1ccc37b11
Parents: ce3c7c7
Author: renoth <jo...@gmx.de>
Authored: Fri Sep 7 07:55:44 2018 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 26 16:18:00 2018 +0300
----------------------------------------------------------------------
pom.xml | 36 ++++++++++----------
testing/wicket-common-tests/pom.xml | 10 +++---
wicket-bean-validation/pom.xml | 9 +++--
wicket-core/pom.xml | 19 +++++++----
.../apache/wicket/util/tester/WicketTester.java | 5 +--
.../wicket-native-websocket-core/pom.xml | 1 -
wicket-util/pom.xml | 10 +++---
.../markup/xhtml/WellFormedXmlTestCase.java | 20 ++++++-----
8 files changed, 60 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/512c4216/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7e74e89..c3275ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -495,30 +495,12 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.11.0</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
- <version>2.0.0.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jmx</artifactId>
<version>${jetty.version}</version>
@@ -573,6 +555,24 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
http://git-wip-us.apache.org/repos/asf/wicket/blob/512c4216/testing/wicket-common-tests/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-common-tests/pom.xml b/testing/wicket-common-tests/pom.xml
index ecb8402..adbfd7e 100644
--- a/testing/wicket-common-tests/pom.xml
+++ b/testing/wicket-common-tests/pom.xml
@@ -34,11 +34,6 @@
<dependencies>
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-auth-roles</artifactId>
<scope>test</scope>
@@ -109,6 +104,11 @@
<artifactId>wicket-velocity</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/wicket/blob/512c4216/wicket-bean-validation/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-bean-validation/pom.xml b/wicket-bean-validation/pom.xml
index f1240cd..99e6376 100644
--- a/wicket-bean-validation/pom.xml
+++ b/wicket-bean-validation/pom.xml
@@ -25,11 +25,6 @@
<artifactId>wicket-core</artifactId>
</dependency>
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>el-impl</artifactId>
</dependency>
@@ -37,5 +32,9 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/wicket/blob/512c4216/wicket-core/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml
index 7963d34..faac57b 100644
--- a/wicket-core/pom.xml
+++ b/wicket-core/pom.xml
@@ -27,7 +27,7 @@
<packaging>bundle</packaging>
<name>Wicket Core</name>
<description>
- Wicket is a Java web application framework that takes simplicity,
+ Wicket is a Java web application framework that takes simplicity,
separation of concerns and ease of development to a whole new level.
Wicket pages can be mocked up, previewed and later revised using
standard WYSIWYG HTML design tools. Dynamic content processing and
@@ -37,17 +37,16 @@
</description>
<dependencies>
<dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-junit</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <!-- provided because of WicketTester -->
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-junit</artifactId>
- </dependency>
- <dependency>
<groupId>com.github.openjson</groupId>
<artifactId>openjson</artifactId>
</dependency>
@@ -97,6 +96,14 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/wicket/blob/512c4216/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
index 651c0ef..74bab6c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
@@ -18,6 +18,7 @@ package org.apache.wicket.util.tester;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
@@ -960,7 +961,7 @@ public class WicketTester extends BaseWicketTester
public void executeListener(final Class<?> testClass, final Component component,
final String filename) throws Exception
{
- assert(component != null);
+ assertNotNull(component);
log.info("=== " + testClass.getName() + " : " + component.getPageRelativePath() + " ===");
@@ -978,7 +979,7 @@ public class WicketTester extends BaseWicketTester
public void executeBehavior(final Class<?> testClass, final AbstractAjaxBehavior behavior,
final String filename) throws Exception
{
- assert(behavior != null);
+ assertNotNull(behavior);
log.info("=== " + testClass.getName() + " : " + behavior.toString() + " ===");
http://git-wip-us.apache.org/repos/asf/wicket/blob/512c4216/wicket-native-websocket/wicket-native-websocket-core/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-core/pom.xml b/wicket-native-websocket/wicket-native-websocket-core/pom.xml
index 090faf1..53eaa11 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-core/pom.xml
@@ -39,7 +39,6 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/512c4216/wicket-util/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-util/pom.xml b/wicket-util/pom.xml
index d5777f8..f7ad0b1 100755
--- a/wicket-util/pom.xml
+++ b/wicket-util/pom.xml
@@ -28,11 +28,6 @@
<name>Wicket Util</name>
<dependencies>
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
</dependency>
@@ -44,5 +39,10 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/wicket/blob/512c4216/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java b/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
index 71f8357..9af193a 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
@@ -16,18 +16,23 @@
*/
package org.apache.wicket.util.markup.xhtml;
-import org.junit.jupiter.api.Test;
-import org.xml.sax.*;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.junit.jupiter.api.Test;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
/**
* Usable by tests to check that the html markup files are well formed.
*
@@ -148,8 +153,7 @@ public class WellFormedXmlTestCase
}
@Override
- public InputSource resolveEntity(String publicId, String systemId)
- {
+ public InputSource resolveEntity(String publicId, String systemId) {
String uri = systemIdToUri.get(systemId);
if (uri != null)
{
[11/45] wicket git commit: wicket-core: Migrate to Junit 5
Posted by mg...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest.java
index f702a20..5bddd9c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest.java
@@ -17,6 +17,8 @@
package org.apache.wicket.resource.aggregator;
import static org.apache.wicket.markup.head.JavaScriptHeaderItem.forReference;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.util.ArrayList;
import java.util.Arrays;
@@ -29,15 +31,15 @@ import org.apache.wicket.markup.head.ResourceAggregator;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.resource.CircularDependencyException;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests for the {@link org.apache.wicket.markup.head.ResourceAggregator} class.
*
* @author Hielke Hoeve
*/
-public class ResourceAggregatorTest extends WicketTestCase
+class ResourceAggregatorTest extends WicketTestCase
{
private void assertItems(ResourceReference... references)
{
@@ -65,8 +67,8 @@ public class ResourceAggregatorTest extends WicketTestCase
* Setup the testcase, creating a new header response stub and wrapping it in a resource
* aggregator
*/
- @Before
- public void setup()
+ @BeforeEach
+ void setup()
{
responseStub = new TestHeaderResponse();
aggregator = new ResourceAggregator(responseStub);
@@ -76,7 +78,7 @@ public class ResourceAggregatorTest extends WicketTestCase
* render [b->a], should render [a,b]
*/
@Test
- public void testDependency()
+ void testDependency()
{
aggregator.render(forReference(new ResourceReferenceB()));
assertItems(new ResourceReferenceA(), new ResourceReferenceB());
@@ -86,7 +88,7 @@ public class ResourceAggregatorTest extends WicketTestCase
* render [b->a, c->a], should render [a,b,c]
*/
@Test
- public void test2RefsWithDependency()
+ void test2RefsWithDependency()
{
aggregator.render(forReference(new ResourceReferenceB()));
aggregator.render(forReference(new ResourceReferenceC()));
@@ -97,7 +99,7 @@ public class ResourceAggregatorTest extends WicketTestCase
* render [d->c->a], should render [a, c, d]
*/
@Test
- public void testTransitiveDependencies()
+ void testTransitiveDependencies()
{
aggregator.render(forReference(new ResourceReferenceD()));
assertItems(new ResourceReferenceA(), new ResourceReferenceC(), new ResourceReferenceD());
@@ -107,7 +109,7 @@ public class ResourceAggregatorTest extends WicketTestCase
* bundle {a, b->a}, render [a], should render [ab]
*/
@Test
- public void testBundle()
+ void testBundle()
{
HeaderItem bundleAB = Application.get()
.getResourceBundles()
@@ -121,7 +123,7 @@ public class ResourceAggregatorTest extends WicketTestCase
* bundle {a, b->a}, render [b], should render [ab]
*/
@Test
- public void testBundleRenderingOther()
+ void testBundleRenderingOther()
{
HeaderItem bundleAB = Application.get()
.getResourceBundles()
@@ -135,7 +137,7 @@ public class ResourceAggregatorTest extends WicketTestCase
* bundle {a, b->a}, render [a, b], should render [ab]
*/
@Test
- public void testBundleRenderingBoth()
+ void testBundleRenderingBoth()
{
HeaderItem bundleAB = Application.get()
.getResourceBundles()
@@ -150,7 +152,7 @@ public class ResourceAggregatorTest extends WicketTestCase
* bundle {a, b->a}, render [d->c->a], should render [ab, c, d]
*/
@Test
- public void testBundleRenderedAsDependency()
+ void testBundleRenderedAsDependency()
{
HeaderItem bundleAB = Application.get()
.getResourceBundles()
@@ -165,7 +167,7 @@ public class ResourceAggregatorTest extends WicketTestCase
* bundle {c->a, d->c->a}, render [d], should render [a, cd]
*/
@Test
- public void testBundleWithDependencies()
+ void testBundleWithDependencies()
{
HeaderItem bundleCD = Application.get()
.getResourceBundles()
@@ -180,7 +182,7 @@ public class ResourceAggregatorTest extends WicketTestCase
* bundle {a, b->a} and {c->a, d->c->a}, render [d], should render [ab, cd]
*/
@Test
- public void testTwoBundlesWithDependencies()
+ void testTwoBundlesWithDependencies()
{
HeaderItem bundleAB = Application.get()
.getResourceBundles()
@@ -199,7 +201,7 @@ public class ResourceAggregatorTest extends WicketTestCase
* cd]
*/
@Test
- public void testTwoBundlesWithDependenciesAndPriority()
+ void testTwoBundlesWithDependenciesAndPriority()
{
HeaderItem bundleAB = Application.get()
.getResourceBundles()
@@ -217,33 +219,37 @@ public class ResourceAggregatorTest extends WicketTestCase
/**
* bundle {a, b->a} and {a, c->a}, should give exception
*/
- @Test(expected = IllegalArgumentException.class)
- public void testTwoBundlesProvidingSameResource()
+ @Test
+ void testTwoBundlesProvidingSameResource()
{
- Application.get()
- .getResourceBundles()
- .addJavaScriptBundle(Application.class, "ab.js", new ResourceReferenceA(),
- new ResourceReferenceB());
- Application.get()
- .getResourceBundles()
- .addJavaScriptBundle(Application.class, "ac.js", new ResourceReferenceA(),
- new ResourceReferenceC());
+ assertThrows(IllegalArgumentException.class, () -> {
+ Application.get()
+ .getResourceBundles()
+ .addJavaScriptBundle(Application.class, "ab.js", new ResourceReferenceA(),
+ new ResourceReferenceB());
+ Application.get()
+ .getResourceBundles()
+ .addJavaScriptBundle(Application.class, "ac.js", new ResourceReferenceA(),
+ new ResourceReferenceC());
+ });
}
/**
* render [circ1->circ2->circ1->...], should give exception
*/
- @Test(expected = CircularDependencyException.class)
- public void testCircularDependency()
+ @Test
+ void testCircularDependency()
{
- aggregator.render(forReference(new ResourceReferenceCirc1()));
+ assertThrows(CircularDependencyException.class, () -> {
+ aggregator.render(forReference(new ResourceReferenceCirc1()));
+ });
}
/**
* bundle {bun1 -> x, bun2 -> y}, render [bun1], should render [x, y, bun12]
*/
@Test
- public void testTwoResourcesWithBundleAsDependency()
+ void testTwoResourcesWithBundleAsDependency()
{
HeaderItem bundle12 = Application.get()
.getResourceBundles()
@@ -258,7 +264,7 @@ public class ResourceAggregatorTest extends WicketTestCase
* bundle {a, b -> a}, render [x, priority(a)], should render [priority(ab), x]
*/
@Test
- public void testBundleWithPriority()
+ void testBundleWithPriority()
{
HeaderItem bundleAB = Application.get()
.getResourceBundles()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest1Page.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest1Page.java b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest1Page.java
index ae7b249..3e62249 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest1Page.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest1Page.java
@@ -32,7 +32,7 @@ public class ResourceAggregatorTest1Page extends WebPage
/**
*
*/
- public static String javascript = "alert('Hello World!');";
+ private static String javascript = "alert('Hello World!');";
/**
* Construct.
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/TestHeaderResponse.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/TestHeaderResponse.java b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/TestHeaderResponse.java
index 6887be5..94f39e8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/TestHeaderResponse.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/TestHeaderResponse.java
@@ -23,8 +23,8 @@ import java.util.Set;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.request.Response;
import org.apache.wicket.markup.head.NoHeaderItem;
+import org.apache.wicket.request.Response;
import org.apache.wicket.response.StringResponse;
/**
@@ -32,7 +32,7 @@ import org.apache.wicket.response.StringResponse;
*
* @author papegaaij
*/
-public class TestHeaderResponse implements IHeaderResponse
+class TestHeaderResponse implements IHeaderResponse
{
private StringResponse response = new StringResponse();
private Set<Object> rendered = new HashSet<Object>();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/bundles/CompressBundlesTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/bundles/CompressBundlesTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/bundles/CompressBundlesTest.java
index e8c9e7c..99c1ef9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/bundles/CompressBundlesTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/bundles/CompressBundlesTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.resource.bundles;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.javascript.DefaultJavaScriptCompressor;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
@@ -28,18 +30,18 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* A test case for https://issues.apache.org/jira/browse/WICKET-4902
*/
-public class CompressBundlesTest extends WicketTestCase
+class CompressBundlesTest extends WicketTestCase
{
/**
* Asserts that the bundle response is compressed
*/
@Test
- public void compressBundle()
+ void compressBundle()
{
tester.startPage(new CompressBundleTestPage());
tester.assertRenderedPage(CompressBundleTestPage.class);
@@ -75,7 +77,7 @@ public class CompressBundlesTest extends WicketTestCase
{
private static final long serialVersionUID = 1L;
- public CompressBundleTestPage() {}
+ CompressBundleTestPage() {}
@Override
public void renderHead(IHeaderResponse response)
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/loader/ClassStringResourceLoaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/loader/ClassStringResourceLoaderTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/loader/ClassStringResourceLoaderTest.java
index 73b275c..153eb1c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/loader/ClassStringResourceLoaderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/loader/ClassStringResourceLoaderTest.java
@@ -16,23 +16,25 @@
*/
package org.apache.wicket.resource.loader;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.Component;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class ClassStringResourceLoaderTest extends WicketTestCase
+class ClassStringResourceLoaderTest extends WicketTestCase
{
/**
*
*/
@Test
- public void validator1()
+ void validator1()
{
ClassStringResourceLoader loader = new ClassStringResourceLoader(MyValidator.class);
tester.getApplication().getResourceSettings().getStringResourceLoaders().add(loader);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/loader/ComponentStringResourceLoaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/loader/ComponentStringResourceLoaderTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/loader/ComponentStringResourceLoaderTest.java
index b06b045..2e6b596 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/loader/ComponentStringResourceLoaderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/loader/ComponentStringResourceLoaderTest.java
@@ -24,19 +24,19 @@ import org.apache.wicket.resource.IsoPropertiesFilePropertiesLoader;
import org.apache.wicket.resource.Properties;
import org.apache.wicket.resource.PropertiesFactory;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class ComponentStringResourceLoaderTest extends WicketTestCase
+class ComponentStringResourceLoaderTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void renderHomePage_1() throws Exception
+ void renderHomePage_1() throws Exception
{
// The xml markup file and the search for an xml properties
// file get in the way
@@ -47,7 +47,7 @@ public class ComponentStringResourceLoaderTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_2() throws Exception
+ void renderHomePage_2() throws Exception
{
// Avoid the conflict by limiting the search for properties files
// to *.properties
@@ -62,7 +62,7 @@ public class ComponentStringResourceLoaderTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void disabledCache() throws Exception
+ void disabledCache() throws Exception
{
IPropertiesFactory myFac = new DisabledCachePropertiesFactory(tester.getApplication()
.getResourceSettings());
@@ -83,7 +83,7 @@ public class ComponentStringResourceLoaderTest extends WicketTestCase
*
* @param context
*/
- public MyPropertiesFactory(IPropertiesFactoryContext context)
+ MyPropertiesFactory(IPropertiesFactoryContext context)
{
super(context);
@@ -102,7 +102,7 @@ public class ComponentStringResourceLoaderTest extends WicketTestCase
*
* @param context
*/
- public DisabledCachePropertiesFactory(IPropertiesFactoryContext context)
+ DisabledCachePropertiesFactory(IPropertiesFactoryContext context)
{
super(context);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer.java b/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer.java
index 59d363a..3bf6695 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer.java
@@ -22,7 +22,7 @@ import org.apache.wicket.IInitializer;
/**
*
*/
-public class FooInitializer implements IInitializer
+class FooInitializer implements IInitializer
{
@Override
public void init(Application application)
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/loader/InitializerStringResourceLoaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/loader/InitializerStringResourceLoaderTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/loader/InitializerStringResourceLoaderTest.java
index 7a798ab..db07adb 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/loader/InitializerStringResourceLoaderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/loader/InitializerStringResourceLoaderTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.resource.loader;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import java.util.Arrays;
import org.apache.wicket.IInitializer;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/loader/NestedStringResourceLoaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/loader/NestedStringResourceLoaderTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/loader/NestedStringResourceLoaderTest.java
index 19f357e..7360c6f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/loader/NestedStringResourceLoaderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/loader/NestedStringResourceLoaderTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.resource.loader;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.List;
import java.util.regex.Pattern;
@@ -25,19 +27,19 @@ import org.apache.wicket.resource.loader.ClassStringResourceLoaderTest.MyValidat
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the nested string resource loader
*/
-public class NestedStringResourceLoaderTest extends WicketTestCase
+class NestedStringResourceLoaderTest extends WicketTestCase
{
/**
* Tests the nested string resource loader
*/
@Test
- public void testNestedStrings(){
+ void testNestedStrings(){
List<IStringResourceLoader> loaders = tester.getApplication().getResourceSettings().getStringResourceLoaders();
ClassStringResourceLoader classStringResourceLoader = new ClassStringResourceLoader(MyValidator.class);
loaders.add(classStringResourceLoader);
@@ -53,7 +55,7 @@ public class NestedStringResourceLoaderTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-6393
*/
@Test
- public void whenAnyKeyIsMissing_thenUseTheDefaultValue(){
+ void whenAnyKeyIsMissing_thenUseTheDefaultValue(){
List<IStringResourceLoader> loaders = tester.getApplication().getResourceSettings().getStringResourceLoaders();
ClassStringResourceLoader classStringResourceLoader = new ClassStringResourceLoader(NestedWithMissingKeyValidator.class);
loaders.add(classStringResourceLoader);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/loader/PackageStringResourceLoaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/loader/PackageStringResourceLoaderTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/loader/PackageStringResourceLoaderTest.java
index 212498e..a1bdee7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/loader/PackageStringResourceLoaderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/loader/PackageStringResourceLoaderTest.java
@@ -16,21 +16,24 @@
*/
package org.apache.wicket.resource.loader;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import org.apache.wicket.Page;
import org.apache.wicket.resource.loader.pages.Test1;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class PackageStringResourceLoaderTest extends WicketTestCase
+class PackageStringResourceLoaderTest extends WicketTestCase
{
/**
*
*/
@Test
- public void packageFileInComponentPackage()
+ void packageFileInComponentPackage()
{
Page page = new Test1();
PackageStringResourceLoader loader = new PackageStringResourceLoader();
@@ -42,7 +45,7 @@ public class PackageStringResourceLoaderTest extends WicketTestCase
*
*/
@Test
- public void packageFileInParentPackage()
+ void packageFileInParentPackage()
{
Page page = new Test1();
PackageStringResourceLoader loader = new PackageStringResourceLoader();
@@ -54,7 +57,7 @@ public class PackageStringResourceLoaderTest extends WicketTestCase
*
*/
@Test
- public void notFound()
+ void notFound()
{
Page page = new Test1();
PackageStringResourceLoader loader = new PackageStringResourceLoader();
@@ -65,7 +68,7 @@ public class PackageStringResourceLoaderTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void test_1() throws Exception
+ void test_1() throws Exception
{
executeTest(Test1.class, "PackageTestPageExpectedResult_1.html");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/loader/PropertiesResolverTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/loader/PropertiesResolverTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/loader/PropertiesResolverTest.java
index bcd718c..f1d88da 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/loader/PropertiesResolverTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/loader/PropertiesResolverTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.resource.loader;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -25,8 +27,7 @@ import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.StringResourceModel;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* test hierarchic lookup of properties from component property files
@@ -34,13 +35,13 @@ import org.junit.Test;
* @author Peter Ertl
*
*/
-public class PropertiesResolverTest extends Assert
+class PropertiesResolverTest
{
/**
*
*/
@Test
- public void resolveProperties()
+ void resolveProperties()
{
WicketTester tester = new WicketTester(new App());
@@ -51,7 +52,7 @@ public class PropertiesResolverTest extends Assert
/**
*/
- public static class App extends WebApplication
+ static class App extends WebApplication
{
@Override
public Class<? extends Page> getHomePage()
@@ -69,7 +70,7 @@ public class PropertiesResolverTest extends Assert
/**
* Construct.
*/
- public MyPage()
+ public MyPage()
{
MyRepeatingView repeater = new MyRepeatingView("repeater");
add(repeater);
@@ -125,25 +126,25 @@ public class PropertiesResolverTest extends Assert
}
}
- public static class MyRepeatingView extends RepeatingView
+ static class MyRepeatingView extends RepeatingView
{
- public MyRepeatingView(String id)
+ MyRepeatingView(String id)
{
super(id);
}
}
- public static class MyContainer extends WebMarkupContainer
+ static class MyContainer extends WebMarkupContainer
{
- public MyContainer(String id)
+ MyContainer(String id)
{
super(id);
}
}
- public static class MyLabel extends Label
+ static class MyLabel extends Label
{
- public MyLabel(String id)
+ MyLabel(String id)
{
super(id);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/loader/ValidatorStringResourceLoaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/loader/ValidatorStringResourceLoaderTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/loader/ValidatorStringResourceLoaderTest.java
index 0fefa31..8c8ef83 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/loader/ValidatorStringResourceLoaderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/loader/ValidatorStringResourceLoaderTest.java
@@ -34,14 +34,14 @@ import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.ValidationError;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for ValidatorStringResourceLoader
*
* @since 1.5.5
*/
-public class ValidatorStringResourceLoaderTest extends WicketTestCase
+class ValidatorStringResourceLoaderTest extends WicketTestCase
{
/**
* Tests that resource bundle is properly loaded for implementations of
@@ -50,7 +50,7 @@ public class ValidatorStringResourceLoaderTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-4379
*/
@Test
- public void interfaceValidator()
+ void interfaceValidator()
{
tester.startPage(new ValidatorLoaderPage(new InterfaceValidator()));
FormTester formTester = tester.newFormTester("form");
@@ -67,7 +67,7 @@ public class ValidatorStringResourceLoaderTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-4379
*/
@Test
- public void classValidator()
+ void classValidator()
{
tester.startPage(new ValidatorLoaderPage(new ClassValidator()));
FormTester formTester = tester.newFormTester("form");
@@ -78,7 +78,7 @@ public class ValidatorStringResourceLoaderTest extends WicketTestCase
}
@Test
- public void formValidator()
+ void formValidator()
{
tester.startPage(new FormValidatorPage());
FormTester formTester = tester.newFormTester("form");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/loader/XmlPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/loader/XmlPage.java b/wicket-core/src/test/java/org/apache/wicket/resource/loader/XmlPage.java
index 9336eed..a27ca74 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/loader/XmlPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/loader/XmlPage.java
@@ -30,7 +30,7 @@ public class XmlPage extends WebPage
/**
* Construct.
*/
- public XmlPage()
+ XmlPage()
{
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/response/PreserveCookieForTheNextHandlerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/response/PreserveCookieForTheNextHandlerTest.java b/wicket-core/src/test/java/org/apache/wicket/response/PreserveCookieForTheNextHandlerTest.java
index 68c7931..bcd29f1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/response/PreserveCookieForTheNextHandlerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/response/PreserveCookieForTheNextHandlerTest.java
@@ -16,8 +16,9 @@
*/
package org.apache.wicket.response;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.List;
import javax.servlet.http.Cookie;
import org.apache.wicket.MarkupContainer;
@@ -28,12 +29,12 @@ import org.apache.wicket.util.cookies.CookieUtils;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @since 1.5.8
*/
-public class PreserveCookieForTheNextHandlerTest extends WicketTestCase
+class PreserveCookieForTheNextHandlerTest extends WicketTestCase
{
/**
* Verifies that any meta data actions set to a BufferedWebResponse during page rendering
@@ -42,7 +43,7 @@ public class PreserveCookieForTheNextHandlerTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-4358
*/
@Test
- public void preserveCookie()
+ void preserveCookie()
{
tester.startPage(StartPage.class);
tester.assertRenderedPage(StartPage.class);
@@ -55,9 +56,9 @@ public class PreserveCookieForTheNextHandlerTest extends WicketTestCase
assertEquals("value", cookies.get(0).getValue());
}
- public static final class StartPage extends WebPage implements IMarkupResourceStreamProvider
+ public static final class StartPage extends WebPage implements IMarkupResourceStreamProvider
{
- public StartPage()
+ public StartPage()
{
add(new BookmarkablePageLink<Void>("link", SetCookiePage.class));
}
@@ -69,7 +70,7 @@ public class PreserveCookieForTheNextHandlerTest extends WicketTestCase
}
}
- public static final class SetCookiePage extends WebPage implements IMarkupResourceStreamProvider
+ public static final class SetCookiePage extends WebPage implements IMarkupResourceStreamProvider
{
@Override
protected void onBeforeRender()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/response/filter/ResponseFilterTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/response/filter/ResponseFilterTest.java b/wicket-core/src/test/java/org/apache/wicket/response/filter/ResponseFilterTest.java
index 495c1ab..cd61482 100644
--- a/wicket-core/src/test/java/org/apache/wicket/response/filter/ResponseFilterTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/response/filter/ResponseFilterTest.java
@@ -16,9 +16,11 @@
*/
package org.apache.wicket.response.filter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.concurrent.atomic.AtomicInteger;
-import org.junit.Assert;
import org.apache.wicket.MockPageWithLink;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -28,8 +30,8 @@ import org.apache.wicket.resource.DummyApplication;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.tester.DummyHomePage;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
/**
* Test case for <a href="https://issues.apache.org/jira/browse/WICKET-3280">WICKET-3280</a>
@@ -37,7 +39,7 @@ import org.junit.Test;
* {@link IResponseFilter}s must be called for both Ajax and non-Ajax responses
*/
@SuppressWarnings("serial")
-public class ResponseFilterTest extends WicketTestCase
+class ResponseFilterTest extends WicketTestCase
{
private final AtomicInteger counter = new AtomicInteger(0);
@@ -71,8 +73,8 @@ public class ResponseFilterTest extends WicketTestCase
/**
* after()
*/
- @After
- public void after()
+ @AfterEach
+ void after()
{
counter.set(0);
}
@@ -81,17 +83,17 @@ public class ResponseFilterTest extends WicketTestCase
* WICKET-3620
*/
@Test
- public void filterAddCommentFilter()
+ void filterAddCommentFilter()
{
tester.startPage(DummyHomePage.class);
- Assert.assertTrue(tester.getLastResponseAsString().contains(AppendCommentFilter.COMMENT));
+ assertTrue(tester.getLastResponseAsString().contains(AppendCommentFilter.COMMENT));
}
/**
* WICKET-3620
*/
@Test
- public void addCommentFilterInAjaxResponse()
+ void addCommentFilterInAjaxResponse()
{
DummyHomePage testPage = new DummyHomePage();
testPage.getTestPageLink().add(new AjaxEventBehavior("event")
@@ -103,7 +105,7 @@ public class ResponseFilterTest extends WicketTestCase
});
tester.startPage(testPage);
tester.executeAjaxEvent(testPage.getTestPageLink(), "event");
- Assert.assertTrue(tester.getLastResponseAsString().contains(AppendCommentFilter.COMMENT));
+ assertTrue(tester.getLastResponseAsString().contains(AppendCommentFilter.COMMENT));
}
private static class AppendCommentFilter implements IResponseFilter
@@ -122,7 +124,7 @@ public class ResponseFilterTest extends WicketTestCase
* normalRequest()
*/
@Test
- public void normalRequest()
+ void normalRequest()
{
tester.startPage(DummyHomePage.class);
@@ -133,7 +135,7 @@ public class ResponseFilterTest extends WicketTestCase
* ajaxRequest()
*/
@Test
- public void ajaxRequest()
+ void ajaxRequest()
{
AjaxPage page = new AjaxPage(counter);
tester.startPage(page);
@@ -149,7 +151,7 @@ public class ResponseFilterTest extends WicketTestCase
/**
* Test page for ajax request
*/
- public static class AjaxPage extends MockPageWithLink
+ static class AjaxPage extends MockPageWithLink
{
boolean ajaxCalled = false;
@@ -158,7 +160,7 @@ public class ResponseFilterTest extends WicketTestCase
*
* @param counter
*/
- public AjaxPage(final AtomicInteger counter)
+ AjaxPage(final AtomicInteger counter)
{
add(new AjaxLink<Void>(MockPageWithLink.LINK_ID)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/response/filter/XmlCleaningResponseFilterTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/response/filter/XmlCleaningResponseFilterTest.java b/wicket-core/src/test/java/org/apache/wicket/response/filter/XmlCleaningResponseFilterTest.java
index 9bc9e1a..2209b14 100644
--- a/wicket-core/src/test/java/org/apache/wicket/response/filter/XmlCleaningResponseFilterTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/response/filter/XmlCleaningResponseFilterTest.java
@@ -18,24 +18,26 @@ package org.apache.wicket.response.filter;
import static org.apache.wicket.page.XmlPartialPageUpdate.END_ROOT_ELEMENT;
import static org.apache.wicket.page.XmlPartialPageUpdate.START_ROOT_ELEMENT;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.wicket.util.string.AppendingStringBuffer;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for XmlCleaningResponseFilter
*/
-public class XmlCleaningResponseFilterTest extends Assert {
+class XmlCleaningResponseFilterTest {
/**
* Tests that invalid XML characters are removed
* @throws Exception
*/
@Test
- public void filterInvalid() throws Exception
+ void filterInvalid() throws Exception
{
XmlCleaningResponseFilter filter = new XmlCleaningResponseFilter();
int[] invalidChars = new int[] {0x0008, 0x0010, 0xD800, 0xDDDD, 0xFFFE};
@@ -45,8 +47,7 @@ public class XmlCleaningResponseFilterTest extends Assert {
CharSequence text = createText(invalidChar);
AppendingStringBuffer filtered = filter.filter(new AppendingStringBuffer(text));
- assertEquals(String.format("checking Unicode codepoint 0x%X:", invalidChar),
- START_ROOT_ELEMENT+END_ROOT_ELEMENT, filtered.toString());
+ assertEquals(START_ROOT_ELEMENT+END_ROOT_ELEMENT, filtered.toString(), String.format("checking Unicode codepoint 0x%X:", invalidChar));
}
}
@@ -55,7 +56,7 @@ public class XmlCleaningResponseFilterTest extends Assert {
* @throws Exception
*/
@Test
- public void filterMultipleInvalid() throws Exception
+ void filterMultipleInvalid() throws Exception
{
XmlCleaningResponseFilter filter = new XmlCleaningResponseFilter();
CharSequence text = new StringBuilder()
@@ -76,7 +77,7 @@ public class XmlCleaningResponseFilterTest extends Assert {
* @throws Exception
*/
@Test
- public void filterValid() throws Exception
+ void filterValid() throws Exception
{
XmlCleaningResponseFilter filter = new XmlCleaningResponseFilter();
int[] validChars = new int[] {0x9, 0xA, 'a', 0xE000, 0xFFFC, 0x10400};
@@ -86,8 +87,7 @@ public class XmlCleaningResponseFilterTest extends Assert {
CharSequence text = createText(validChar);
AppendingStringBuffer filtered = filter.filter(new AppendingStringBuffer(text));
- assertEquals(String.format("checking Unicode codepoint 0x%X:", validChar),
- text.toString(), filtered.toString());
+ assertEquals(text.toString(), filtered.toString(), String.format("checking Unicode codepoint 0x%X:", validChar));
}
}
@@ -107,7 +107,7 @@ public class XmlCleaningResponseFilterTest extends Assert {
* @throws Exception
*/
@Test
- public void shouldFilter() throws Exception
+ void shouldFilter() throws Exception
{
XmlFilter filter = new XmlFilter();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/serialize/java/JavaSerializerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/serialize/java/JavaSerializerTest.java b/wicket-core/src/test/java/org/apache/wicket/serialize/java/JavaSerializerTest.java
index c90414c..560c495 100644
--- a/wicket-core/src/test/java/org/apache/wicket/serialize/java/JavaSerializerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/serialize/java/JavaSerializerTest.java
@@ -16,9 +16,11 @@
*/
package org.apache.wicket.serialize.java;
-import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -36,12 +38,12 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.util.io.IOUtils;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class JavaSerializerTest extends WicketTestCase
+class JavaSerializerTest extends WicketTestCase
{
/**
* https://issues.apache.org/jira/browse/WICKET-4812
@@ -51,7 +53,7 @@ public class JavaSerializerTest extends WicketTestCase
* in the object tree.
*/
@Test
- public void notDetachedModel()
+ void notDetachedModel()
{
JavaSerializer serializer = new JavaSerializer("JavaSerializerTest")
{
@@ -67,7 +69,7 @@ public class JavaSerializerTest extends WicketTestCase
model.getObject();
WebComponent component = new WebComponent("id", model);
byte[] serialized = serializer.serialize(component);
- assertNull("The produced byte[] must be null if there was an error", serialized);
+ assertNull(serialized, "The produced byte[] must be null if there was an error");
}
/**
@@ -89,19 +91,19 @@ public class JavaSerializerTest extends WicketTestCase
* JavaSerializer and some object in the tree is not Serializable
*/
@Test
- public void notSerializable()
+ void notSerializable()
{
JavaSerializer serializer = new JavaSerializer("JavaSerializerTest");
WebComponent component = new NotSerializableComponent("id");
byte[] serialized = serializer.serialize(component);
- assertNull("The produced byte[] must be null if there was an error", serialized);
+ assertNull(serialized, "The produced byte[] must be null if there was an error");
}
private static class NotSerializableComponent extends WebComponent
{
private final NotSerializableObject member = new NotSerializableObject();
- public NotSerializableComponent(final String id)
+ NotSerializableComponent(final String id)
{
super(id);
}
@@ -110,7 +112,7 @@ public class JavaSerializerTest extends WicketTestCase
private static class NotSerializableObject {}
@Test
- public void normal()
+ void normal()
{
JavaSerializer serializer = new JavaSerializer("JavaSerializerTest-normal") {
@Override
@@ -127,7 +129,7 @@ public class JavaSerializerTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-5667
*/
@Test
- public void preserveTheOriginalException()
+ void preserveTheOriginalException()
{
JavaSerializer serializer = new JavaSerializer("JavaSerializerTest-aa")
{
@@ -173,15 +175,15 @@ public class JavaSerializerTest extends WicketTestCase
catch (Exception x)
{
Throwable cause0 = x.getCause();
- assertThat(cause0, is(instanceOf(WicketRuntimeException.class)));
+ assertThat(cause0, instanceOf(WicketRuntimeException.class));
WicketRuntimeException wrx = (WicketRuntimeException) cause0;
Throwable cause1 = wrx.getCause();
- assertThat(cause1, is(instanceOf(IllegalStateException.class)));
- assertThat(cause1.getMessage(), is(equalTo("Cannot serialize me twice!")));
+ assertThat(cause1, instanceOf(IllegalStateException.class));
+ assertEquals("Cannot serialize me twice!", cause1.getMessage());
Throwable cause2 = cause1.getCause();
- assertThat(cause2, is(instanceOf(NotSerializableException.class)));
+ assertThat(cause2, instanceOf(NotSerializableException.class));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/session/BindSessionOnRedirectTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/session/BindSessionOnRedirectTest.java b/wicket-core/src/test/java/org/apache/wicket/session/BindSessionOnRedirectTest.java
index 74fd33e..feae5aa 100644
--- a/wicket-core/src/test/java/org/apache/wicket/session/BindSessionOnRedirectTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/session/BindSessionOnRedirectTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.session;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.html.WebPage;
@@ -23,18 +26,18 @@ import org.apache.wicket.markup.html.link.StatelessLink;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* https://issues.apache.org/jira/browse/WICKET-5165
*/
-public class BindSessionOnRedirectTest extends WicketTestCase
+class BindSessionOnRedirectTest extends WicketTestCase
{
- public static final String SESSION_FEEDBACK_MESSAGE = "Session message";
+ private static final String SESSION_FEEDBACK_MESSAGE = "Session message";
@Test
- public void bindSessionWhenThereAreFeedbackMessages()
+ void bindSessionWhenThereAreFeedbackMessages()
{
tester.startPage(FirstPage.class);
assertTrue(tester.getSession().isTemporary());
@@ -47,9 +50,9 @@ public class BindSessionOnRedirectTest extends WicketTestCase
tester.assertInfoMessages(SESSION_FEEDBACK_MESSAGE);
}
- public static class FirstPage extends WebPage implements IMarkupResourceStreamProvider
+ static class FirstPage extends WebPage implements IMarkupResourceStreamProvider
{
- public FirstPage()
+ FirstPage()
{
add(new StatelessLink<Void>("link") {
@@ -69,9 +72,9 @@ public class BindSessionOnRedirectTest extends WicketTestCase
}
}
- public static class SecondPage extends WebPage implements IMarkupResourceStreamProvider
+ static class SecondPage extends WebPage implements IMarkupResourceStreamProvider
{
- public SecondPage()
+ SecondPage()
{
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java b/wicket-core/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java
index c7e5055..d481887 100644
--- a/wicket-core/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java
@@ -16,6 +16,11 @@
*/
package org.apache.wicket.session;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.wicket.IPageFactory;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.markup.html.WebPage;
@@ -23,18 +28,143 @@ import org.apache.wicket.request.flow.ResetResponseException;
import org.apache.wicket.request.handler.EmptyRequestHandler;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
+import org.junit.jupiter.api.Test;
/**
* Default page factory tests
*
* @author ivaynberg
*/
-public class DefaultPageFactoryTest extends WicketTestCase
+class DefaultPageFactoryTest extends WicketTestCase
{
+ final private IPageFactory pageFactory = new DefaultPageFactory();
+
+ @Test
+ void throwExceptionInConstructor()
+ {
+ Exception e = assertThrows(WicketRuntimeException.class, () -> {
+ pageFactory.newPage(ThrowExceptionInConstructorPage.class);
+ });
+
+ assertEquals(
+ "Can't instantiate page using constructor 'public org.apache.wicket.session.DefaultPageFactoryTest$ThrowExceptionInConstructorPage()'. An exception has been thrown during construction!",
+ e.getMessage());
+ }
+
+ @Test
+ void privateConstructor()
+ {
+ Exception e = assertThrows(WicketRuntimeException.class, () -> {
+ pageFactory.newPage(PrivateDefaultConstructorPage.class);
+ });
+
+ assertEquals(
+ "Can't instantiate page using constructor 'private org.apache.wicket.session.DefaultPageFactoryTest$PrivateDefaultConstructorPage()'. This constructor is private!",
+ e.getMessage());
+ }
+
+ @Test
+ void privateConstructorWithParameters()
+ {
+
+ PageParameters parameters = new PageParameters();
+ parameters.add("key", "value");
+
+
+ Exception e = assertThrows(WicketRuntimeException.class, () -> {
+ pageFactory.newPage(PrivateConstructorWithParametersPage.class, parameters);
+ });
+
+ assertEquals(
+ "Can't instantiate page using constructor 'private org.apache.wicket.session.DefaultPageFactoryTest$PrivateConstructorWithParametersPage(org.apache.wicket.request.mapper.parameter.PageParameters)' and argument 'key=[value]'. This constructor is private!",
+ e.getMessage());
+ }
+
+ @Test
+ void nonDefaultConstructor()
+ {
+ Exception e = assertThrows(WicketRuntimeException.class, () -> {
+ pageFactory.newPage(NonDefaultConstructorPage.class);
+ });
+
+ assertEquals(
+ "Unable to create page from class org.apache.wicket.session.DefaultPageFactoryTest$NonDefaultConstructorPage. Class does not have a visible default constructor.",
+ e.getMessage());
+ }
+
+ /**
+ * Verifies page factory bubbles ResetResponseException
+ */
+ @Test
+ void abortAndRespondContract()
+ {
+ try
+ {
+ pageFactory.newPage(AbortAndRespondPage1.class);
+ fail();
+ }
+ catch (ResetResponseException e)
+ {
+ // noop
+ }
+
+ try
+ {
+ pageFactory.newPage(AbortAndRespondPage2.class);
+ fail();
+ }
+ catch (ResetResponseException e)
+ {
+ // noop
+ }
+
+ try
+ {
+ pageFactory.newPage(AbortAndRespondPage2.class, new PageParameters());
+ fail();
+ }
+ catch (ResetResponseException e)
+ {
+ // noop
+ }
+
+ try
+ {
+ pageFactory.newPage(AbortAndRespondPage3.class);
+ fail();
+ }
+ catch (ResetResponseException e)
+ {
+ // noop
+ }
+
+ try
+ {
+ pageFactory.newPage(AbortAndRespondPage3.class, new PageParameters());
+ fail();
+ }
+ catch (ResetResponseException e)
+ {
+ // noop
+ }
+
+ try
+ {
+ pageFactory.newPage(PageThrowingCheckedException.class);
+ fail();
+ }
+ catch (WicketRuntimeException e)
+ {
+ assertNotNull(e.getCause());
+ assertNotNull(e.getCause().getCause());
+ assertEquals(PageThrowingCheckedException.EXCEPTION, e.getCause().getCause());
+ }
+ catch (Exception e)
+ {
+ fail();
+ }
+ }
+
/**
* @author ivaynberg
*/
@@ -45,7 +175,7 @@ public class DefaultPageFactoryTest extends WicketTestCase
/**
* Construct.
*/
- public AbortAndRespondPage1()
+ AbortAndRespondPage1()
{
throw new ResetResponseException(new EmptyRequestHandler())
{
@@ -63,10 +193,10 @@ public class DefaultPageFactoryTest extends WicketTestCase
/**
* Construct.
- *
+ *
* @param params
*/
- public AbortAndRespondPage2(PageParameters params)
+ AbortAndRespondPage2(PageParameters params)
{
throw new ResetResponseException(new EmptyRequestHandler())
{
@@ -85,7 +215,7 @@ public class DefaultPageFactoryTest extends WicketTestCase
/**
* Construct.
*/
- public AbortAndRespondPage3()
+ AbortAndRespondPage3()
{
throw new ResetResponseException(new EmptyRequestHandler())
{
@@ -95,10 +225,10 @@ public class DefaultPageFactoryTest extends WicketTestCase
/**
* Construct.
- *
+ *
* @param params
*/
- public AbortAndRespondPage3(PageParameters params)
+ AbortAndRespondPage3(PageParameters params)
{
throw new ResetResponseException(new EmptyRequestHandler())
{
@@ -112,163 +242,50 @@ public class DefaultPageFactoryTest extends WicketTestCase
*/
public static class PageThrowingCheckedException extends WebPage
{
- private static final long serialVersionUID = 1L;
-
/** */
- public static final Exception EXCEPTION = new Exception("a checked exception");
+ static final Exception EXCEPTION = new Exception("a checked exception");
+ private static final long serialVersionUID = 1L;
/**
* Construct.
- *
+ *
* @throws Exception
*/
- public PageThrowingCheckedException() throws Exception
+ PageThrowingCheckedException() throws Exception
{
throw EXCEPTION;
}
}
- public static class PrivateDefaultConstructorPage extends WebPage
+ public static class PrivateDefaultConstructorPage extends WebPage
{
private PrivateDefaultConstructorPage()
- {}
+ {
+ }
}
- public static class PrivateConstructorWithParametersPage extends WebPage
+ public static class PrivateConstructorWithParametersPage extends WebPage
{
- private PrivateConstructorWithParametersPage(PageParameters parameters)
+ private PrivateConstructorWithParametersPage(PageParameters parameters)
{
super(parameters);
}
}
- public static class NonDefaultConstructorPage extends WebPage
+ public static class NonDefaultConstructorPage extends WebPage
{
- public NonDefaultConstructorPage(String aa) {
+ public NonDefaultConstructorPage(String aa)
+ {
super();
}
}
- public static class ThrowExceptionInConstructorPage extends WebPage
+ public static class ThrowExceptionInConstructorPage extends WebPage
{
- public ThrowExceptionInConstructorPage()
+ public ThrowExceptionInConstructorPage()
{
throw new RuntimeException("exception!");
}
}
-
- final private IPageFactory pageFactory = new DefaultPageFactory();
-
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
-
-
- @Test
- public void throwExceptionInConstructor()
- {
- expectedException.expect(WicketRuntimeException.class);
- expectedException.expectMessage("Can't instantiate page using constructor 'public org.apache.wicket.session.DefaultPageFactoryTest$ThrowExceptionInConstructorPage()'. An exception has been thrown during construction!");
-
- pageFactory.newPage(ThrowExceptionInConstructorPage.class);
- }
-
- @Test
- public void privateConstructor() {
- expectedException.expect(WicketRuntimeException.class);
- expectedException.expectMessage("Can't instantiate page using constructor 'private org.apache.wicket.session.DefaultPageFactoryTest$PrivateDefaultConstructorPage()'. This constructor is private!");
-
- pageFactory.newPage(PrivateDefaultConstructorPage.class);
- }
-
- @Test
- public void privateConstructorWithParameters() {
- expectedException.expect(WicketRuntimeException.class);
- expectedException.expectMessage("Can't instantiate page using constructor 'private org.apache.wicket.session.DefaultPageFactoryTest$PrivateConstructorWithParametersPage(org.apache.wicket.request.mapper.parameter.PageParameters)' and argument 'key=[value]'. This constructor is private!");
-
- PageParameters parameters = new PageParameters();
- parameters.add("key", "value");
- pageFactory.newPage(PrivateConstructorWithParametersPage.class, parameters);
- }
-
- @Test
- public void nonDefaultConstructor() {
- expectedException.expect(WicketRuntimeException.class);
- expectedException.expectMessage("Unable to create page from class org.apache.wicket.session.DefaultPageFactoryTest$NonDefaultConstructorPage. Class does not have a visible default constructor.");
-
- pageFactory.newPage(NonDefaultConstructorPage.class);
- }
-
- /**
- * Verifies page factory bubbles ResetResponseException
- */
- @Test
- public void abortAndRespondContract()
- {
- try
- {
- pageFactory.newPage(AbortAndRespondPage1.class);
- fail();
- }
- catch (ResetResponseException e)
- {
- // noop
- }
-
- try
- {
- pageFactory.newPage(AbortAndRespondPage2.class);
- fail();
- }
- catch (ResetResponseException e)
- {
- // noop
- }
-
- try
- {
- pageFactory.newPage(AbortAndRespondPage2.class, new PageParameters());
- fail();
- }
- catch (ResetResponseException e)
- {
- // noop
- }
-
- try
- {
- pageFactory.newPage(AbortAndRespondPage3.class);
- fail();
- }
- catch (ResetResponseException e)
- {
- // noop
- }
-
- try
- {
- pageFactory.newPage(AbortAndRespondPage3.class, new PageParameters());
- fail();
- }
- catch (ResetResponseException e)
- {
- // noop
- }
-
- try
- {
- pageFactory.newPage(PageThrowingCheckedException.class);
- fail();
- }
- catch (WicketRuntimeException e)
- {
- assertNotNull(e.getCause());
- assertNotNull(e.getCause().getCause());
- assertEquals(PageThrowingCheckedException.EXCEPTION, e.getCause().getCause());
- }
- catch (Exception e)
- {
- fail();
- }
- }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/settings/DebugSettingsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/settings/DebugSettingsTest.java b/wicket-core/src/test/java/org/apache/wicket/settings/DebugSettingsTest.java
index c05c042..2b54ba4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/settings/DebugSettingsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/settings/DebugSettingsTest.java
@@ -16,23 +16,25 @@
*/
package org.apache.wicket.settings;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.Component;
import org.apache.wicket.MockPageWithLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.util.tester.TagTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for DebugSettings
*/
-public class DebugSettingsTest extends WicketTestCase
+class DebugSettingsTest extends WicketTestCase
{
/**
* https://issues.apache.org/jira/browse/WICKET-5498
*/
@Test
- public void setComponentPathAttributeName()
+ void setComponentPathAttributeName()
{
String attributeName = "data-wicket-path";
tester.getApplication().getDebugSettings().setComponentPathAttributeName(attributeName);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/settings/ExceptionSettingsNotRenderableErrorStrategyTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/settings/ExceptionSettingsNotRenderableErrorStrategyTest.java b/wicket-core/src/test/java/org/apache/wicket/settings/ExceptionSettingsNotRenderableErrorStrategyTest.java
index 7ab3aed..169b7e3 100644
--- a/wicket-core/src/test/java/org/apache/wicket/settings/ExceptionSettingsNotRenderableErrorStrategyTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/settings/ExceptionSettingsNotRenderableErrorStrategyTest.java
@@ -16,6 +16,11 @@
*/
package org.apache.wicket.settings;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
@@ -24,22 +29,19 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link ExceptionSettings#notRenderableErrorStrategy}
*/
-public class ExceptionSettingsNotRenderableErrorStrategyTest extends WicketTestCase {
+class ExceptionSettingsNotRenderableErrorStrategyTest extends WicketTestCase {
private WicketTagTestPage wicketTagTestPage;
private RenderBodyOnlyTestPage renderBodyOnlyTestPage;
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
ExceptionSettings exceptionSettings = tester.getApplication().getExceptionSettings();
exceptionSettings.setNotRenderableErrorStrategy(ExceptionSettings.NotRenderableErrorStrategy.THROW_EXCEPTION);
@@ -49,7 +51,7 @@ public class ExceptionSettingsNotRenderableErrorStrategyTest extends WicketTestC
}
@Test
- public void notRenderableErrorStrategy_whenWicketTagAndOutputId_throwException() {
+ void notRenderableErrorStrategy_whenWicketTagAndOutputId_throwException() {
try
{
wicketTagTestPage.component.setOutputMarkupId(true);
@@ -61,7 +63,7 @@ public class ExceptionSettingsNotRenderableErrorStrategyTest extends WicketTestC
}
@Test
- public void notRenderableErrorStrategy_whenWicketTagAndOutputPlaceholder_throwException() {
+ void notRenderableErrorStrategy_whenWicketTagAndOutputPlaceholder_throwException() {
try
{
wicketTagTestPage.component.setOutputMarkupPlaceholderTag(true);
@@ -73,7 +75,7 @@ public class ExceptionSettingsNotRenderableErrorStrategyTest extends WicketTestC
}
@Test
- public void notRenderableErrorStrategy_whenRenderBodyOnlyAndOutputId_throwException() {
+ void notRenderableErrorStrategy_whenRenderBodyOnlyAndOutputId_throwException() {
try
{
renderBodyOnlyTestPage.component.setOutputMarkupId(true);
@@ -85,7 +87,7 @@ public class ExceptionSettingsNotRenderableErrorStrategyTest extends WicketTestC
}
@Test
- public void notRenderableErrorStrategy_whenRenderBodyOnlyAndOutputPlaceholder_throwException() {
+ void notRenderableErrorStrategy_whenRenderBodyOnlyAndOutputPlaceholder_throwException() {
try
{
renderBodyOnlyTestPage.component.setOutputMarkupPlaceholderTag(true);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/settings/ISecuritySettingsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/settings/ISecuritySettingsTest.java b/wicket-core/src/test/java/org/apache/wicket/settings/ISecuritySettingsTest.java
index d0b64c2..dfa768c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/settings/ISecuritySettingsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/settings/ISecuritySettingsTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.wicket.settings;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.MockPageWithLink;
import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler;
import org.apache.wicket.core.request.handler.PageProvider;
@@ -30,20 +34,19 @@ import org.apache.wicket.protocol.https.HttpsMapper;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.flow.RedirectToUrlException;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link SecuritySettings}
*/
-public class ISecuritySettingsTest extends WicketTestCase
+class ISecuritySettingsTest extends WicketTestCase
{
/**
* https://issues.apache.org/jira/browse/WICKET-3849
*/
@Test
- public void enforceMounts()
+ void enforceMounts()
{
MockPageWithLink pageWithLink = new MockPageWithLink();
pageWithLink.add(new Link<Void>(MockPageWithLink.LINK_ID)
@@ -53,8 +56,8 @@ public class ISecuritySettingsTest extends WicketTestCase
@Override
public void onClick()
{
- throw new RedirectToUrlException("/wicket/bookmarkable/" +
- UnknownPage.class.getName());
+ throw new RedirectToUrlException(
+ "/wicket/bookmarkable/" + UnknownPage.class.getName());
}
});
@@ -68,32 +71,37 @@ public class ISecuritySettingsTest extends WicketTestCase
tester.startPage(pageWithLink);
tester.assertRenderedPage(MockPageWithLink.class);
tester.clickLink(MockPageWithLink.LINK_ID);
- Assert.assertNull(tester.getLastRenderedPage());
+ assertNull(tester.getLastRenderedPage());
/*
- * Test that mounts are enforced when the root compound mapper does not directly contain the mounted mapper.
+ * Test that mounts are enforced when the root compound mapper does not directly contain the
+ * mounted mapper.
*/
- tester.getApplication().setRootRequestMapper(new HttpsMapper(tester.getApplication().getRootRequestMapper(), new HttpsConfig()));
+ tester.getApplication().setRootRequestMapper(
+ new HttpsMapper(tester.getApplication().getRootRequestMapper(), new HttpsConfig()));
tester.startPage(pageWithLink);
tester.assertRenderedPage(MockPageWithLink.class);
tester.clickLink(MockPageWithLink.LINK_ID);
- Assert.assertNull(tester.getLastRenderedPage());
+ assertNull(tester.getLastRenderedPage());
}
/**
* https://issues.apache.org/jira/browse/WICKET-5560
*/
@Test
- public void enforceMountsWithCryptoMapper()
+ void enforceMountsWithCryptoMapper()
{
WebApplication app = tester.getApplication();
- IRequestHandler handler = new BookmarkablePageRequestHandler(new PageProvider(UnknownPage.class));
+ IRequestHandler handler = new BookmarkablePageRequestHandler(
+ new PageProvider(UnknownPage.class));
String plainTextNonMountedUrl = tester.urlFor(handler).toString();
- assertTrue("Plain text non mounted url should start with wicket/bookmarkable/: " + plainTextNonMountedUrl, plainTextNonMountedUrl.startsWith("wicket/bookmarkable/"));
+ assertTrue(plainTextNonMountedUrl.startsWith("wicket/bookmarkable/"),
+ "Plain text non mounted url should start with wicket/bookmarkable/: " +
+ plainTextNonMountedUrl);
tester.executeUrl(plainTextNonMountedUrl);
tester.assertRenderedPage(UnknownPage.class);
@@ -107,7 +115,8 @@ public class ISecuritySettingsTest extends WicketTestCase
String encryptedNonMountedUrl = tester.urlFor(handler).toString();
- assertFalse("Encrypted URL should not start with wicket/bookmarkable/" + encryptedNonMountedUrl, encryptedNonMountedUrl.startsWith("wicket/bookmarkable/"));
+ assertFalse(encryptedNonMountedUrl.startsWith("wicket/bookmarkable/"),
+ "Encrypted URL should not start with wicket/bookmarkable/" + encryptedNonMountedUrl);
tester.executeUrl(plainTextNonMountedUrl);
assertNull(tester.getLastRenderedPage());
@@ -128,7 +137,7 @@ public class ISecuritySettingsTest extends WicketTestCase
tester.executeUrl(encryptedNonMountedUrl);
assertNull(tester.getLastRenderedPage());
}
-
+
/**
* Dummy page for testing BookmarkableMapper
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/settings/def/SetCustomResourceSettingsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/settings/def/SetCustomResourceSettingsTest.java b/wicket-core/src/test/java/org/apache/wicket/settings/def/SetCustomResourceSettingsTest.java
index 91384c7..3f96e31 100644
--- a/wicket-core/src/test/java/org/apache/wicket/settings/def/SetCustomResourceSettingsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/settings/def/SetCustomResourceSettingsTest.java
@@ -16,8 +16,7 @@
*/
package org.apache.wicket.settings.def;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -25,20 +24,19 @@ import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.settings.ResourceSettings;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.apache.wicket.util.time.Duration;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test for https://issues.apache.org/jira/browse/WICKET-5625
*/
-public class SetCustomResourceSettingsTest extends WicketTestCase
+class SetCustomResourceSettingsTest extends WicketTestCase
{
- final String expected = "~!@";
- ResourceSettings resSettings;
+ private final String expected = "~!@";
+ private ResourceSettings resSettings;
@Override
- @Before
+ @BeforeEach
public void commonBefore() {
resSettings = mock(ResourceSettings.class);
when(resSettings.getParentFolderPlaceholder()).thenReturn(expected);
@@ -47,9 +45,9 @@ public class SetCustomResourceSettingsTest extends WicketTestCase
}
@Test
- public void check() {
+ void check() {
ResourceSettings settings = tester.getApplication().getResourceSettings();
- assertThat(settings.getParentFolderPlaceholder(), is(equalTo(expected)));
+ assertEquals(expected, settings.getParentFolderPlaceholder());
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/stateless/ImageStatelessTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/ImageStatelessTest.java b/wicket-core/src/test/java/org/apache/wicket/stateless/ImageStatelessTest.java
index dbc40c1..05558c3 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/ImageStatelessTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/ImageStatelessTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.stateless;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.html.WebPage;
@@ -25,37 +27,37 @@ import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author jcompagner
*/
-public class ImageStatelessTest extends WicketTestCase
+class ImageStatelessTest extends WicketTestCase
{
/**
*
*/
@Test
- public void resourceReference()
+ void resourceReference()
{
ImageStatelessPage page = new ImageStatelessPage();
final Image i = new Image("test", new PackageResourceReference("test"));
page.add(i);
tester.startPage(page);
- assertTrue("image with resource reference should be stateless", i.isStateless());
+ assertTrue(i.isStateless(), "image with resource reference should be stateless");
}
/**
*
*/
@Test
- public void resource()
+ void resource()
{
ImageStatelessPage page = new ImageStatelessPage();
final Image i = new Image("test", new ByteArrayResource("text/text", new byte[0]));
page.add(i);
tester.startPage(page);
- assertTrue("image with resource should be stateful", !i.isStateless());
+ assertTrue(!i.isStateless(), "image with resource should be stateful");
}
private static class ImageStatelessPage extends WebPage implements IMarkupResourceStreamProvider
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
index 91d95e8..85f5241 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
@@ -16,22 +16,25 @@
*/
package org.apache.wicket.stateless;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.wicket.request.Url;
import org.apache.wicket.request.mapper.parameter.INamedParameters;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author jcompagner
*/
-public class StatelessComponentTest extends WicketTestCase
+class StatelessComponentTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void statelessComponentPage() throws Exception
+ void statelessComponentPage() throws Exception
{
executeTest(StatelessComponentPage.class, "StatelessComponentPage_result.html");
@@ -54,7 +57,7 @@ public class StatelessComponentTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void statelessComponentPageWithMount() throws Exception
+ void statelessComponentPageWithMount() throws Exception
{
tester.getApplication().mountPage("/stateless", StatelessComponentPage.class);
// test is always the home page. it doesn't work then
@@ -77,7 +80,7 @@ public class StatelessComponentTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void statelessComponentPageWithParams() throws Exception
+ void statelessComponentPageWithParams() throws Exception
{
PageParameters params = new PageParameters();
params.set("testParam1", "testValue1", INamedParameters.Type.QUERY_STRING);
@@ -105,7 +108,7 @@ public class StatelessComponentTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void statelessComponentPageWithParamsWithMount() throws Exception
+ void statelessComponentPageWithParamsWithMount() throws Exception
{
PageParameters params = new PageParameters();
params.set("testParam1", "testValue1", INamedParameters.Type.QUERY_STRING);
@@ -132,7 +135,7 @@ public class StatelessComponentTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void statelessComponentPageWithParamsWithIndexMount() throws Exception
+ void statelessComponentPageWithParamsWithIndexMount() throws Exception
{
PageParameters params = new PageParameters();
params.set(0, "testValue1");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java
index f5f5284..7b1549b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java
@@ -16,20 +16,22 @@
*/
package org.apache.wicket.stateless;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.request.Url;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author svenmeier
*/
-public class StatelessDynmicLinksTest extends WicketTestCase
+class StatelessDynmicLinksTest extends WicketTestCase
{
/**
* WICKET-5460
*/
@Test
- public void foo() throws Exception
+ void foo() throws Exception
{
tester.getApplication().mountPage("/stateless", StatelessPageWithDynamicLinks.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java
index 1c0389d..77861a5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.stateless;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.Page;
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
@@ -24,13 +27,13 @@ import org.apache.wicket.stateless.pages.HomePage;
import org.apache.wicket.stateless.pages.LoginPage;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
* @author marrink
*/
-public class StatelessFormTest extends WicketTestCase
+class StatelessFormTest extends WicketTestCase
{
private final Class<? extends Page> HOME = HomePage.class;
private final Class<? extends Page> LOGIN = LoginPage.class;
@@ -52,7 +55,7 @@ public class StatelessFormTest extends WicketTestCase
* Login through the login page.
*/
@Test
- public void login()
+ void login()
{
tester.startPage(LOGIN);
tester.assertRenderedPage(LOGIN);
@@ -67,7 +70,7 @@ public class StatelessFormTest extends WicketTestCase
* test initialization of component on stateless components
*/
@Test
- public void onInitializationForStatelessComponents()
+ void onInitializationForStatelessComponents()
{
LoginPage page = new LoginPage();
assertFalse(page.isPageInitialized());
@@ -96,7 +99,7 @@ public class StatelessFormTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void pageWithParameters() throws Exception
+ void pageWithParameters() throws Exception
{
PageParameters parameters = new PageParameters();
parameters.add("first", "foo");
@@ -109,7 +112,7 @@ public class StatelessFormTest extends WicketTestCase
* stateless form
*/
@Test
- public void submitStatelessFormDoesntBindSession()
+ void submitStatelessFormDoesntBindSession()
{
StatelessPageWithForm.FORM_SUBMITTED.set(false);
try
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessFormUrlTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessFormUrlTest.java b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessFormUrlTest.java
index 17b3f8d..5a6aea9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessFormUrlTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessFormUrlTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.stateless;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
@@ -30,12 +32,12 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Pedro Santos
*/
-public class StatelessFormUrlTest extends WicketTestCase
+class StatelessFormUrlTest extends WicketTestCase
{
@Override
protected WebApplication newApplication()
@@ -53,7 +55,7 @@ public class StatelessFormUrlTest extends WicketTestCase
* Preventing WICKET-3438
*/
@Test
- public void submitLinkInputNameNotEncodedIntoFormAction()
+ void submitLinkInputNameNotEncodedIntoFormAction()
{
tester.executeUrl("?0-1.IFormSubmitListener-form&text=newValue&submitLink=x");
assertFalse(tester.getLastResponseAsString().contains("submitLink=x"));
@@ -63,7 +65,7 @@ public class StatelessFormUrlTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-4365
*/
@Test
- public void formComponentNameNotEncodedIntoFormAction()
+ void formComponentNameNotEncodedIntoFormAction()
{
tester.executeUrl("?0-1.IFormSubmitListener-form&text=newValue");
assertFalse(tester.getLastResponseAsString().contains("text=newValue"));
@@ -78,7 +80,7 @@ public class StatelessFormUrlTest extends WicketTestCase
/**
* @param pageParameters
*/
- public TestPage(PageParameters pageParameters)
+ public TestPage(PageParameters pageParameters)
{
super(pageParameters);
StatelessForm<Void> form = new StatelessForm<>("form");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithFeedbackTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithFeedbackTest.java b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithFeedbackTest.java
index 14bfc88..40f870b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithFeedbackTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithFeedbackTest.java
@@ -16,18 +16,18 @@
*/
package org.apache.wicket.stateless;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.Page;
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Simple test using the WicketTester
*/
-public class StatelessPageWithFeedbackTest extends WicketTestCase
+class StatelessPageWithFeedbackTest extends WicketTestCase
{
@Override
protected WebApplication newApplication()
@@ -46,13 +46,13 @@ public class StatelessPageWithFeedbackTest extends WicketTestCase
* After submit, both feedbackmessages (from onInitialize and onSubmit) must be visible
*/
@Test
- public void wicket6529()
+ void wicket6529()
{
tester.startPage(StatelessPageWithFeedback.class);
tester.assertFeedback("feedback", "error in onInitialize");
tester.clickLink("form:submit");
String response = tester.getLastResponseAsString();
- Assert.assertTrue("onInitialize", response.contains("error in onInitialize"));
- Assert.assertTrue("onSubmit", response.contains("error in onSubmit"));
+ assertTrue(response.contains("error in onInitialize"), "onInitialize");
+ assertTrue(response.contains("error in onSubmit"), "onSubmit");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java b/wicket-core/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java
index f376161..f1614d4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.stateless;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.Page;
import org.apache.wicket.Session;
import org.apache.wicket.mock.MockApplication;
@@ -24,7 +27,7 @@ import org.apache.wicket.stateless.pages.HomePage;
import org.apache.wicket.stateless.pages.LoginPage;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* A test to detect temporary sessions. However since the http stack has been mocked for this test,
@@ -33,7 +36,7 @@ import org.junit.Test;
*
* @author marrink
*/
-public class TemporarySessionTest extends WicketTestCase
+class TemporarySessionTest extends WicketTestCase
{
@Override
protected WebApplication newApplication()
@@ -53,7 +56,7 @@ public class TemporarySessionTest extends WicketTestCase
* Test if we can keep a session temporary.
*/
@Test
- public void sessionIsTemporary()
+ void sessionIsTemporary()
{
tester.startPage(LoginPage.class);
assertTrue(tester.getSession().isTemporary());
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/stateless/pages/RefreshStatelessPageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/pages/RefreshStatelessPageTest.java b/wicket-core/src/test/java/org/apache/wicket/stateless/pages/RefreshStatelessPageTest.java
index 2626370..48fa5e8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/pages/RefreshStatelessPageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/pages/RefreshStatelessPageTest.java
@@ -24,19 +24,19 @@ import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* https://issues.apache.org/jira/browse/WICKET-3965
*/
-public class RefreshStatelessPageTest extends WicketTestCase
+class RefreshStatelessPageTest extends WicketTestCase
{
/**
* https://issues.apache.org/jira/browse/WICKET-3965
*/
@Test
- public void refreshStatelessPage()
+ void refreshStatelessPage()
{
tester.startPage(new StatefulPage());
tester.clickLink("link", false);
@@ -73,7 +73,7 @@ public class RefreshStatelessPageTest extends WicketTestCase
private static class StatelessPage extends WebPage implements IMarkupResourceStreamProvider
{
- public StatelessPage()
+ StatelessPage()
{
setStatelessHint(true);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/stateless/pages/StatelessFormTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/pages/StatelessFormTest.java b/wicket-core/src/test/java/org/apache/wicket/stateless/pages/StatelessFormTest.java
index 0b384da..41ea6d1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/pages/StatelessFormTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/pages/StatelessFormTest.java
@@ -21,13 +21,13 @@ import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.Url;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* User: Anatoly Kupriyanov (kan.izh@gmail.com) Date: 12-Feb-2009 Time: 22:27:08 Bugfix for
* http://issues.apache.org/jira/browse/WICKET-1897
*/
-public class StatelessFormTest extends WicketTestCase
+class StatelessFormTest extends WicketTestCase
{
@Override
protected WebApplication newApplication()
@@ -55,7 +55,7 @@ public class StatelessFormTest extends WicketTestCase
* testBug()
*/
@Test
- public void bug()
+ void bug()
{
{
tester.getRequest().setUrl(Url.parse("page2"));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/stateless/pages/UsernamePasswordSignInPanel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/pages/UsernamePasswordSignInPanel.java b/wicket-core/src/test/java/org/apache/wicket/stateless/pages/UsernamePasswordSignInPanel.java
index 2e73b39..c082e9d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/pages/UsernamePasswordSignInPanel.java
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/pages/UsernamePasswordSignInPanel.java
@@ -60,7 +60,7 @@ public class UsernamePasswordSignInPanel extends Panel
* @param password
* @return whether signin is successful
*/
- public boolean signIn(String username, String password)
+ private boolean signIn(String username, String password)
{
return username.equals(password);
}
@@ -85,7 +85,7 @@ public class UsernamePasswordSignInPanel extends Panel
* id of the form component
* @param panel
*/
- public SignInForm(final String id, UsernamePasswordSignInPanel panel)
+ SignInForm(final String id, UsernamePasswordSignInPanel panel)
{
super(id, new CompoundPropertyModel<IValueMap>(new ValueMap()));
this.panel = panel;
[26/45] wicket git commit: wicket-core: Migrate to Junit 5
Posted by mg...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehaviorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehaviorTest.java
index 539b495..b9f3c5e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehaviorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehaviorTest.java
@@ -16,14 +16,15 @@
*/
package org.apache.wicket.ajax;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.Locale;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.attributes.AjaxAttributeName;
import org.apache.wicket.ajax.attributes.AjaxCallListener;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
/**
@@ -31,13 +32,13 @@ import org.mockito.Mockito;
*
* @since 6.0
*/
-public class AbstractDefaultAjaxBehaviorTest extends Assert
+class AbstractDefaultAjaxBehaviorTest
{
/**
* Checks the generated JSON for Ajax's attributes
*/
@Test
- public void renderAjaxAttributes()
+ void renderAjaxAttributes()
{
AjaxRequestAttributes attributes = new AjaxRequestAttributes();
attributes.getExtraParameters().put("param1", 123);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorAndMetaDataTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorAndMetaDataTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorAndMetaDataTest.java
index e24a115..e48c78a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorAndMetaDataTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorAndMetaDataTest.java
@@ -17,7 +17,7 @@
package org.apache.wicket.ajax;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
@@ -28,11 +28,11 @@ import org.junit.Test;
* @author Rüdiger Schulz <ru...@darkprophet.de>
* @version $Revision$
*/
-public class AjaxBehaviorAndMetaDataTest extends WicketTestCase
+class AjaxBehaviorAndMetaDataTest extends WicketTestCase
{
/** */
@Test
- public void render()
+ void render()
{
tester.startPage(AjaxBehaviorAndMetaDataPage.class);
tester.assertRenderedPage(AjaxBehaviorAndMetaDataPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledPage.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledPage.java
index 50b0650..a12b2bd 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledPage.java
@@ -16,9 +16,11 @@
*/
package org.apache.wicket.ajax;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
-import org.junit.Assert;
/**
* @author marrink
@@ -42,7 +44,7 @@ public class AjaxBehaviorEnabledPage extends WebPage
@Override
protected void onEvent(AjaxRequestTarget target)
{
- Assert.assertNotNull(target);
+ assertNotNull(target);
}
});
add(enabled);
@@ -55,7 +57,7 @@ public class AjaxBehaviorEnabledPage extends WebPage
@Override
protected void onEvent(AjaxRequestTarget target)
{
- Assert.fail("should never get here with disabled ajax");
+ fail("should never get here with disabled ajax");
}
});
add(disabled);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java
index d6f96bd..333084c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java
@@ -26,13 +26,13 @@ import org.apache.wicket.request.Request;
import org.apache.wicket.request.Response;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* @author marrink
*/
-public class AjaxBehaviorEnabledTest extends WicketTestCase
+class AjaxBehaviorEnabledTest extends WicketTestCase
{
/**
* Custom security strategy to disable all components where the id ends with "disable".
@@ -60,8 +60,8 @@ public class AjaxBehaviorEnabledTest extends WicketTestCase
/**
*
*/
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
final IAuthorizationStrategy strategy = new CustomStrategy();
tester = new WicketTester(new MockApplication()
@@ -89,7 +89,7 @@ public class AjaxBehaviorEnabledTest extends WicketTestCase
* @see <a href="https://issues.apache.org/jira/browse/WICKET-1575">1575</a>
*/
@Test
- public void disabledBehavior() throws Exception
+ void disabledBehavior() throws Exception
{
executeTest(AjaxBehaviorEnabledPage.class, "AjaxBehaviorEnabled_expected.html");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java
index 776b484..3fad533 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java
@@ -20,15 +20,16 @@ import static org.apache.wicket.ajax.attributes.CallbackParameter.context;
import static org.apache.wicket.ajax.attributes.CallbackParameter.converted;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
import static org.apache.wicket.ajax.attributes.CallbackParameter.resolved;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class AjaxCallbackFunctionTest extends WicketTestCase
+class AjaxCallbackFunctionTest extends WicketTestCase
{
@Test
- public void testDefaultCallbackFunction()
+ void testDefaultCallbackFunction()
{
AjaxCallbackPage page = tester.startPage(AjaxCallbackPage.class);
assertEquals(//
@@ -52,7 +53,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase
}
@Test
- public void testCallbackFunctionWithContext()
+ void testCallbackFunctionWithContext()
{
AjaxCallbackPage page = tester.startPage(AjaxCallbackPage.class);
assertEquals(//
@@ -76,7 +77,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase
}
@Test
- public void testCallbackFunctionWithExplicit()
+ void testCallbackFunctionWithExplicit()
{
AjaxCallbackPage page = tester.startPage(AjaxCallbackPage.class);
assertEquals(//
@@ -99,7 +100,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase
}
@Test
- public void testCallbackFunctionWithResolved()
+ void testCallbackFunctionWithResolved()
{
AjaxCallbackPage page = tester.startPage(AjaxCallbackPage.class);
assertEquals(//
@@ -127,7 +128,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase
}
@Test
- public void testCallbackFunctionWithConverted()
+ void testCallbackFunctionWithConverted()
{
AjaxCallbackPage page = tester.startPage(AjaxCallbackPage.class);
assertEquals(
@@ -157,7 +158,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase
}
@Test
- public void testCallbackFunctionWithAll()
+ void testCallbackFunctionWithAll()
{
AjaxCallbackPage page = tester.startPage(AjaxCallbackPage.class);
assertEquals(
@@ -195,7 +196,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase
}
@Test
- public void testJQueryUIEvent()
+ void testJQueryUIEvent()
{
AjaxCallbackPage page = tester.startPage(AjaxCallbackPage.class);
assertEquals(
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxChannelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxChannelTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxChannelTest.java
index bab9eba..567fd0f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxChannelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxChannelTest.java
@@ -16,20 +16,22 @@
*/
package org.apache.wicket.ajax;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Martin Dilger
*/
-public class AjaxChannelTest extends WicketTestCase
+class AjaxChannelTest extends WicketTestCase
{
/**
* https://issues.apache.org/jira/browse/WICKET-4024
*/
@Test
- public void getChannelNameRetursCorrectStringForStackableChannels()
+ void getChannelNameRetursCorrectStringForStackableChannels()
{
String channelName = "channelName";
String expectedForStackables = channelName + "|s";
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxComponentVisibilityTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxComponentVisibilityTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxComponentVisibilityTest.java
index 735b7a7..41c9491 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxComponentVisibilityTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxComponentVisibilityTest.java
@@ -16,15 +16,18 @@
*/
package org.apache.wicket.ajax;
+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.util.tester.WicketTestCase;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* @author Gerolf Seitz
*/
-public class AjaxComponentVisibilityTest extends WicketTestCase
+class AjaxComponentVisibilityTest extends WicketTestCase
{
private Component test1;
@@ -34,8 +37,8 @@ public class AjaxComponentVisibilityTest extends WicketTestCase
/**
*
*/
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
tester.startPage(new AjaxHeaderContributionPage());
test1 = tester.getLastRenderedPage().get("test1");
@@ -47,7 +50,7 @@ public class AjaxComponentVisibilityTest extends WicketTestCase
*
*/
@Test
- public void componentsAddedToAjax()
+ void componentsAddedToAjax()
{
test2.setVisible(false);
test3.setVisible(false).setOutputMarkupPlaceholderTag(true);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxEventBehaviorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxEventBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxEventBehaviorTest.java
index fbbccea3..085bdda 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxEventBehaviorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxEventBehaviorTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.ajax;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.wicket.MarkupContainer;
@@ -25,19 +28,19 @@ 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;
/**
* @since 6.0.1
*/
-public class AjaxEventBehaviorTest extends WicketTestCase
+class AjaxEventBehaviorTest extends WicketTestCase
{
/**
* Tests execution of the second configured event
* https://issues.apache.org/jira/browse/WICKET-4748
*/
@Test
- public void executeSecondEvent()
+ void executeSecondEvent()
{
AtomicInteger counter = new AtomicInteger(0);
SecondEventTestPage page = new SecondEventTestPage(counter);
@@ -54,28 +57,37 @@ public class AjaxEventBehaviorTest extends WicketTestCase
assertEquals(2, counter.get());
}
- @Test(expected = IllegalArgumentException.class)
- public void nullName()
+ @Test
+ void nullName()
{
- new EventNamesBehavior(null);
+ assertThrows(IllegalArgumentException.class, () -> {
+ new EventNamesBehavior(null);
+
+ });
}
- @Test(expected = IllegalArgumentException.class)
- public void emptyName()
+ @Test
+ void emptyName()
{
- new EventNamesBehavior("");
+ assertThrows(IllegalArgumentException.class, () -> {
+ new EventNamesBehavior("");
+ });
}
- @Test(expected = IllegalArgumentException.class)
- public void spacesName()
+ @Test
+ void spacesName()
{
- new EventNamesBehavior(" ");
+ assertThrows(IllegalArgumentException.class, () -> {
+ new EventNamesBehavior(" ");
+ });
}
- @Test(expected = IllegalArgumentException.class)
- public void tabName()
+ @Test
+ void tabName()
{
- new EventNamesBehavior("\t");
+ assertThrows(IllegalArgumentException.class, () -> {
+ new EventNamesBehavior("\t");
+ });
}
private static class EventNamesBehavior extends AjaxEventBehavior
@@ -83,9 +95,10 @@ public class AjaxEventBehaviorTest extends WicketTestCase
/**
* Construct.
*
- * @param event the event this behavior will be attached to
+ * @param event
+ * the event this behavior will be attached to
*/
- public EventNamesBehavior(String event)
+ EventNamesBehavior(String event)
{
super(event);
}
@@ -99,7 +112,9 @@ public class AjaxEventBehaviorTest extends WicketTestCase
/**
* Test page for #executeSecondEvent()
*/
- private static class SecondEventTestPage extends WebPage implements IMarkupResourceStreamProvider
+ private static class SecondEventTestPage extends WebPage
+ implements
+ IMarkupResourceStreamProvider
{
private SecondEventTestPage(final AtomicInteger counter)
{
@@ -118,9 +133,11 @@ public class AjaxEventBehaviorTest extends WicketTestCase
}
@Override
- public IResourceStream getMarkupResourceStream(MarkupContainer container, Class<?> containerClass)
+ public IResourceStream getMarkupResourceStream(MarkupContainer container,
+ Class<?> containerClass)
{
- return new StringResourceStream("<html><body><span wicket:id='comp'></span></body></html>");
+ return new StringResourceStream(
+ "<html><body><span wicket:id='comp'></span></body></html>");
}
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionTest.java
index 9c0eb8e..3182176 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionTest.java
@@ -17,18 +17,18 @@
package org.apache.wicket.ajax;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author jcompagner
*/
-public class AjaxHeaderContributionTest extends WicketTestCase
+class AjaxHeaderContributionTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void ajaxHeaderContribution() throws Exception
+ void ajaxHeaderContribution() throws Exception
{
tester.startPage(AjaxHeaderContributionPage.class);
tester.assertResultPage(AjaxHeaderContributionPage.class,
@@ -44,7 +44,7 @@ public class AjaxHeaderContributionTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void doubleAjaxHeaderContribution() throws Exception
+ void doubleAjaxHeaderContribution() throws Exception
{
tester.startPage(AjaxHeaderContributionPage2.class);
tester.assertResultPage(AjaxHeaderContributionPage2.class,
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxRequestHandlerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxRequestHandlerTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxRequestHandlerTest.java
index 8c90304..3e9738d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxRequestHandlerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxRequestHandlerTest.java
@@ -16,6 +16,11 @@
*/
package org.apache.wicket.ajax;
+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.io.IOException;
import java.lang.reflect.Constructor;
import java.nio.charset.Charset;
@@ -37,7 +42,7 @@ import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.DiffUtil;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.time.Time;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,7 +51,7 @@ import org.slf4j.LoggerFactory;
*
* @author Frank Bille
*/
-public class AjaxRequestHandlerTest extends WicketTestCase
+class AjaxRequestHandlerTest extends WicketTestCase
{
private static final Logger log = LoggerFactory.getLogger(AjaxRequestHandlerTest.class);
@@ -56,7 +61,7 @@ public class AjaxRequestHandlerTest extends WicketTestCase
* @throws IOException
*/
@Test
- public void headerContribution1() throws IOException
+ void headerContribution1() throws IOException
{
executeHeaderTest(MockComponent1.class, "MockComponent1-expected.html");
}
@@ -68,7 +73,7 @@ public class AjaxRequestHandlerTest extends WicketTestCase
* @throws IOException
*/
@Test
- public void headerContribution2() throws IOException
+ void headerContribution2() throws IOException
{
executeHeaderTest(MockComponent2.class);
}
@@ -79,7 +84,7 @@ public class AjaxRequestHandlerTest extends WicketTestCase
* @throws IOException
*/
@Test
- public void headerContribution3() throws IOException
+ void headerContribution3() throws IOException
{
executeHeaderTest(MockComponent3.class, "MockComponent3-expected.html");
}
@@ -95,7 +100,8 @@ public class AjaxRequestHandlerTest extends WicketTestCase
{
final MockPageWithLinkAndComponent page = new MockPageWithLinkAndComponent();
- page.add(new WebComponent(MockPageWithLinkAndComponent.COMPONENT_ID).setOutputMarkupId(true));
+ page.add(
+ new WebComponent(MockPageWithLinkAndComponent.COMPONENT_ID).setOutputMarkupId(true));
page.add(new AjaxLink<Void>(MockPageWithLinkAndComponent.LINK_ID)
{
@@ -107,7 +113,8 @@ public class AjaxRequestHandlerTest extends WicketTestCase
// Create an instance of the component
try
{
- Constructor<? extends Component> con = componentClass.getConstructor(new Class[] { String.class });
+ Constructor<? extends Component> con = componentClass
+ .getConstructor(new Class[] { String.class });
Component comp = con.newInstance(MockPageWithLinkAndComponent.COMPONENT_ID);
page.replace(comp);
@@ -145,8 +152,8 @@ public class AjaxRequestHandlerTest extends WicketTestCase
// This means that it doesn't exist at all
if (expectedFile == null)
{
- assertNull("There was a header contribution on the response " +
- "(though we didn't expect one): <" + headerContribution + ">", headerContribution);
+ assertNull(headerContribution, "There was a header contribution on the response " +
+ "(though we didn't expect one): <" + headerContribution + ">");
}
else if (headerContribution == null)
{
@@ -162,7 +169,7 @@ public class AjaxRequestHandlerTest extends WicketTestCase
* WICKET-2328
*/
@Test
- public void renderMyPage()
+ void renderMyPage()
{
// start and render the test page
tester.startPage(HomePage2.class);
@@ -186,16 +193,16 @@ public class AjaxRequestHandlerTest extends WicketTestCase
* WICKET-6568
*/
@Test
- public void lastFocusedEncoding()
+ void lastFocusedEncoding()
{
FocusPage page = new FocusPage();
-
+
tester.startPage(page);
// wicket-ajax-jquery encodes non ASCII id
String encoded = UrlEncoder.QUERY_INSTANCE.encode("€uro", Charset.forName("UTF-8"));
tester.getRequest().setHeader("Wicket-FocusedElementId", encoded);
-
+
tester.executeAjaxEvent("link", "click");
assertEquals("€uro", page.lastFocusedElementId);
@@ -205,14 +212,15 @@ public class AjaxRequestHandlerTest extends WicketTestCase
* WICKET-2543
*/
@Test
- public void varargsAddComponent()
+ void varargsAddComponent()
{
tester.startPage(VarargsAddComponentPage.class);
for (int i = 0; i < VarargsAddComponentPage.NUMBER_OF_LABELS; i++)
{
final String labelMarkupId = "label" + i;
- final String expectedContent = String.format(VarargsAddComponentPage.INITIAL_CONTENT, i);
+ final String expectedContent = String.format(VarargsAddComponentPage.INITIAL_CONTENT,
+ i);
tester.assertLabel(labelMarkupId, expectedContent);
}
@@ -221,8 +229,8 @@ public class AjaxRequestHandlerTest extends WicketTestCase
for (int i = 0; i < VarargsAddComponentPage.NUMBER_OF_LABELS; i++)
{
final String labelMarkupId = "label" + i;
- final String expectedContent = String.format(VarargsAddComponentPage.INITIAL_CONTENT, i) +
- VarargsAddComponentPage.AJAX_APPENDED_SUFFIX;
+ final String expectedContent = String.format(VarargsAddComponentPage.INITIAL_CONTENT,
+ i) + VarargsAddComponentPage.AJAX_APPENDED_SUFFIX;
tester.assertLabel(labelMarkupId, expectedContent);
}
}
@@ -231,7 +239,7 @@ public class AjaxRequestHandlerTest extends WicketTestCase
* Testing the default event raised whenever Wicket begins to create an AJAX response
*/
@Test
- public void defaultEventRaisedOnAjaxResponse()
+ void defaultEventRaisedOnAjaxResponse()
{
tester.startPage(TestEventPage.class);
tester.clickLink(MockPageWithLinkAndComponent.LINK_ID, true);
@@ -243,7 +251,7 @@ public class AjaxRequestHandlerTest extends WicketTestCase
* @see <a href="https://issues.apache.org/jira/browse/WICKET-3263">WICKET-3263</a>
*/
@Test
- public void globalAjaxRequestTargetListeners()
+ void globalAjaxRequestTargetListeners()
{
final ValidatingAjaxRequestTargetListener listener = new ValidatingAjaxRequestTargetListener();
@@ -260,20 +268,20 @@ public class AjaxRequestHandlerTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-3921
*/
@Test
- public void ajaxRedirectSetsNoCachingHeaders()
+ void ajaxRedirectSetsNoCachingHeaders()
{
tester.startPage(new Wicket3921());
tester.clickLink("updatePage");
- assertEquals(Time.START_OF_UNIX_TIME.toRfc1123TimestampString(), tester.getLastResponse()
- .getHeader("Expires"));
+ assertEquals(Time.START_OF_UNIX_TIME.toRfc1123TimestampString(),
+ tester.getLastResponse().getHeader("Expires"));
assertEquals("no-cache", tester.getLastResponse().getHeader("Pragma"));
assertEquals("no-cache, no-store", tester.getLastResponse().getHeader("Cache-Control"));
tester.clickLink("updateComponent");
- assertEquals(Time.START_OF_UNIX_TIME.toRfc1123TimestampString(), tester.getLastResponse()
- .getHeader("Expires"));
+ assertEquals(Time.START_OF_UNIX_TIME.toRfc1123TimestampString(),
+ tester.getLastResponse().getHeader("Expires"));
assertEquals("no-cache", tester.getLastResponse().getHeader("Pragma"));
assertEquals("no-cache, no-store", tester.getLastResponse().getHeader("Cache-Control"));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java
index d8c2392..db459b6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.ajax;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.Component;
import org.apache.wicket.MockPageWithLinkAndComponent;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -26,18 +28,17 @@ import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.time.Duration;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
* Tests that an AbstractAjaxTimerBehavior injects itself into the markup once and only once. Also
* tests the callback URL to make sure the timer reinjects itself
*
* @author Jim McLaughlin
*/
-public class AjaxTimerBehaviorTest extends WicketTestCase
+class AjaxTimerBehaviorTest extends WicketTestCase
{
private static final Logger log = LoggerFactory.getLogger(AjaxTimerBehaviorTest.class);
@@ -45,7 +46,7 @@ public class AjaxTimerBehaviorTest extends WicketTestCase
* Tests timer behavior in a component added to an AjaxRequestTarget
*/
@Test
- public void addedInAjaxSetsTimout()
+ void addedInAjaxSetsTimout()
{
Duration dur = Duration.seconds(20);
final AjaxSelfUpdatingTimerBehavior timer = new AjaxSelfUpdatingTimerBehavior(dur);
@@ -87,7 +88,7 @@ public class AjaxTimerBehaviorTest extends WicketTestCase
* tests timer behavior in a WebPage.
*/
@Test
- public void pageRenderSetsTimeout()
+ void pageRenderSetsTimeout()
{
Duration dur = Duration.seconds(20);
final AjaxSelfUpdatingTimerBehavior timer = new AjaxSelfUpdatingTimerBehavior(dur);
@@ -124,7 +125,7 @@ public class AjaxTimerBehaviorTest extends WicketTestCase
* tests timer behavior in a WebPage.
*/
@Test
- public void ajaxUpdateDoesNotSetTimeout()
+ void ajaxUpdateDoesNotSetTimeout()
{
Duration dur = Duration.seconds(20);
final AjaxSelfUpdatingTimerBehavior timer = new AjaxSelfUpdatingTimerBehavior(dur);
@@ -161,7 +162,7 @@ public class AjaxTimerBehaviorTest extends WicketTestCase
/**
*/
@Test
- public void setVisibleSetsTimeout()
+ void setVisibleSetsTimeout()
{
Duration dur = Duration.seconds(20);
final AjaxSelfUpdatingTimerBehavior timer = new AjaxSelfUpdatingTimerBehavior(dur);
@@ -200,7 +201,7 @@ public class AjaxTimerBehaviorTest extends WicketTestCase
/**
*/
@Test
- public void setDisabledClearsTimeout()
+ void setDisabledClearsTimeout()
{
final AbstractAjaxTimerBehavior timer = new AbstractAjaxTimerBehavior(Duration.seconds(20))
{
@@ -250,7 +251,7 @@ public class AjaxTimerBehaviorTest extends WicketTestCase
* WICKET-1525, WICKET-2152
*/
@Test
- public void restartResultsInAddTimeout()
+ void restartResultsInAddTimeout()
{
final Integer labelInitialValue = Integer.valueOf(0);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage.java b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage.java
index 27a6447..19b0387 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage.java
@@ -47,7 +47,7 @@ public class DomReadyOrderPage extends WebPage
*
* @param id
*/
- public Link(String id)
+ Link(String id)
{
super(id);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderTest.java
index 9f09c10..ea1e3b4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderTest.java
@@ -17,14 +17,14 @@
package org.apache.wicket.ajax;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author jcompagner
*/
-public class DomReadyOrderTest extends WicketTestCase
+class DomReadyOrderTest extends WicketTestCase
{
/** log. */
private static final Logger log = LoggerFactory.getLogger(DomReadyOrderTest.class);
@@ -33,7 +33,7 @@ public class DomReadyOrderTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void domReadyOrder() throws Exception
+ void domReadyOrder() throws Exception
{
tester.startPage(DomReadyOrderPage.class);
tester.assertResultPage(DomReadyOrderPage.class, "DomReadyOrderPage_expected.html");
@@ -46,7 +46,7 @@ public class DomReadyOrderTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void domReadyOrder2() throws Exception
+ void domReadyOrder2() throws Exception
{
tester.startPage(DomReadyOrderPage.class);
tester.assertResultPage(DomReadyOrderPage.class, "DomReadyOrderPage_expected.html");
@@ -59,7 +59,7 @@ public class DomReadyOrderTest extends WicketTestCase
*
*/
@Test
- public void ajaxSubmitWhileAnotherButtonIsNotVisible()
+ void ajaxSubmitWhileAnotherButtonIsNotVisible()
{
// start and render the test page
tester.startPage(HomePage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/GlobalUpdateAjaxAttributesTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/GlobalUpdateAjaxAttributesTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/GlobalUpdateAjaxAttributesTest.java
index d427172..265ae0a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/GlobalUpdateAjaxAttributesTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/GlobalUpdateAjaxAttributesTest.java
@@ -25,12 +25,12 @@ import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class GlobalUpdateAjaxAttributesTest extends WicketTestCase
+class GlobalUpdateAjaxAttributesTest extends WicketTestCase
{
@Override
protected WebApplication newApplication()
@@ -53,7 +53,7 @@ public class GlobalUpdateAjaxAttributesTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-4958
*/
@Test
- public void globalUpdateAjaxAttributes()
+ void globalUpdateAjaxAttributes()
{
tester.startPage(new GlobalUpdateAjaxAttributesPage());
// System.err.println(tester.getLastResponseAsString());
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/HomePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/HomePage.java b/wicket-core/src/test/java/org/apache/wicket/ajax/HomePage.java
index bc0b5cb..ece6ccc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/HomePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/HomePage.java
@@ -39,7 +39,7 @@ public class HomePage extends WebPage
{
private static final long serialVersionUID = 1L;
- int rows = 1;
+ private int rows = 1;
/**
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/InternalErrorCallsAjaxOnFailureTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/InternalErrorCallsAjaxOnFailureTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/InternalErrorCallsAjaxOnFailureTest.java
index d6f089a..7e5f34f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/InternalErrorCallsAjaxOnFailureTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/InternalErrorCallsAjaxOnFailureTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.ajax;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.markup.html.pages.ExceptionErrorPage;
import org.apache.wicket.markup.html.pages.InternalErrorPage;
import org.apache.wicket.protocol.http.mock.MockHttpServletResponse;
@@ -24,7 +27,7 @@ import org.apache.wicket.settings.ExceptionSettings;
import org.apache.wicket.util.tester.BaseWicketTester;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests that for internal errors in Ajax requests Wicket will send the error response immediately
@@ -35,7 +38,7 @@ import org.junit.Test;
* See WICKET-3143 No Exception page are rendered when using ajax
*
*/
-public class InternalErrorCallsAjaxOnFailureTest extends WicketTestCase
+class InternalErrorCallsAjaxOnFailureTest extends WicketTestCase
{
/**
@@ -43,7 +46,7 @@ public class InternalErrorCallsAjaxOnFailureTest extends WicketTestCase
* {@link org.apache.wicket.settings.ExceptionSettings.AjaxErrorStrategy#REDIRECT_TO_ERROR_PAGE}
*/
@Test
- public void showsInternalErrorPage()
+ void showsInternalErrorPage()
{
tester.setExposeExceptions(false);
@@ -68,7 +71,7 @@ public class InternalErrorCallsAjaxOnFailureTest extends WicketTestCase
* but will preserve the current page and send http status 500 to wicket-ajax.js
*/
@Test
- public void callsOnFailure()
+ void callsOnFailure()
{
WicketTester tester = new WicketTester(new DummyApplication()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/StatelessPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/StatelessPage.java b/wicket-core/src/test/java/org/apache/wicket/ajax/StatelessPage.java
index e4bc3a8..58a6c92 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/StatelessPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/StatelessPage.java
@@ -47,11 +47,11 @@ public class StatelessPage extends WebPage
public static final String FORM_SUBMIT = "form submit";
- static int itemCount = 0;
+ private static int itemCount = 0;
private static final long serialVersionUID = 1L;
- static List<String> getList()
+ private static List<String> getList()
{
final ArrayList<String> list = new ArrayList<String>(itemCount);
final int count = ++itemCount;
@@ -100,10 +100,10 @@ public class StatelessPage extends WebPage
System.out.println(_data);
listView.setModelObject(_data);
-
+
target.ifPresent(ajaxTarget -> ajaxTarget.add(list, "new"));
}
-
+
@Override
protected boolean getStatelessHint()
{
@@ -124,7 +124,7 @@ public class StatelessPage extends WebPage
Form<String> form = new StatelessForm<String>("inputForm")
{
/**
- *
+ *
*/
private static final long serialVersionUID = -6554405700693024016L;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/attributes/AjaxAttributeNameTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/attributes/AjaxAttributeNameTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/attributes/AjaxAttributeNameTest.java
index 4b2d173..15161ff 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/attributes/AjaxAttributeNameTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/attributes/AjaxAttributeNameTest.java
@@ -16,29 +16,31 @@
*/
package org.apache.wicket.ajax.attributes;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.HashSet;
import java.util.Set;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* provide some refactoring safety
*
* @author mosmann
*/
-public class AjaxAttributeNameTest extends Assert
+class AjaxAttributeNameTest
{
/**
* do not let json parameter names collide
*/
@Test
- public void jsonNamesDoNotCollide()
+ void jsonNamesDoNotCollide()
{
Set<String> jsonNames = new HashSet<>();
for (AjaxAttributeName name : AjaxAttributeName.values())
{
- assertTrue("Attribute: " + name, jsonNames.add(name.jsonName()));
+ assertTrue(jsonNames.add(name.jsonName()), "Attribute: " + name);
}
}
@@ -47,7 +49,7 @@ public class AjaxAttributeNameTest extends Assert
* names
*/
@Test
- public void nobodyDidChangeAnyAjaxAttributeName()
+ void nobodyDidChangeAnyAjaxAttributeName()
{
StringBuilder sb = new StringBuilder();
for (AjaxAttributeName name : AjaxAttributeName.values())
@@ -56,8 +58,8 @@ public class AjaxAttributeNameTest extends Assert
sb.append('|');
}
- assertEquals("all known json parameter names",
+ assertEquals(
"tr|p|d|id|dt|wr|rt|pd|sp|ch|e|async|dep|ep|pre|coh|fh|sh|ah|bsh|bh|ih|dh|i|sc|mp|f|c|m|u|sel|sr|",
- sb.toString());
+ sb.toString(), "all known json parameter names");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehaviorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehaviorTest.java
index 1e8e1ab..86d1f1d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehaviorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehaviorTest.java
@@ -16,17 +16,21 @@
*/
package org.apache.wicket.ajax.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class AjaxFormChoiceComponentUpdatingBehaviorTest extends WicketTestCase
+class AjaxFormChoiceComponentUpdatingBehaviorTest extends WicketTestCase
{
/**
* WICKET-5230 nested FormComponent with error message makes group invalid
*/
@Test
- public void nestedInvalidFormComponent()
+ void nestedInvalidFormComponent()
{
ChoiceComponentPage page = tester.startPage(ChoiceComponentPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java
index a0cab5d..0628908 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java
@@ -16,16 +16,17 @@
*/
package org.apache.wicket.ajax.form;
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.NestedFormPage;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class AjaxFormSubmitBehaviorTest extends WicketTestCase
+class AjaxFormSubmitBehaviorTest extends WicketTestCase
{
/**
* Test case for WICKET-1743
@@ -33,7 +34,7 @@ public class AjaxFormSubmitBehaviorTest extends WicketTestCase
* @see <a href="https://issues.apache.org/jira/browse/WICKET-1743">WICKET-1743</a>
*/
@Test
- public void ajaxFormSubmitBehavior()
+ void ajaxFormSubmitBehavior()
{
// start and render the test page
tester.startPage(AjaxFormSubmitBehaviorTestPage.class);
@@ -50,7 +51,7 @@ public class AjaxFormSubmitBehaviorTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-6455
*/
@Test
- public void innerFormSubmit()
+ void innerFormSubmit()
{
tester.startPage(NestedFormTestPage.class);
@@ -69,7 +70,7 @@ public class AjaxFormSubmitBehaviorTest extends WicketTestCase
* onSubmit must be called once.
*/
@Test
- public void formReplacement()
+ void formReplacement()
{
PanelEdit panelEdit = tester.startComponentInPage(PanelEdit.class);
FormTester formTester = tester.newFormTester(panelEdit.getId() + ":form");
@@ -86,14 +87,14 @@ public class AjaxFormSubmitBehaviorTest extends WicketTestCase
private static final long serialVersionUID = -515262294201762225L;
- public NestedFormTestPage()
+ public NestedFormTestPage()
{
- Form<?> inner = new Form("inner") {
+ Form<Void> inner = new Form<>("inner") {
@Override
protected boolean wantSubmitOnParentFormSubmit() {
return false;
}
-
+
@Override
protected void onSubmit() {
super.onSubmit();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java
index da7c2e0..58b8d22 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java
@@ -16,17 +16,21 @@
*/
package org.apache.wicket.ajax.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author marrink
*/
-public class AjaxFormSubmitTest extends WicketTestCase
+class AjaxFormSubmitTest extends WicketTestCase
{
@Test
- public void submit()
+ void submit()
{
AjaxFormSubmitTestPage page = new AjaxFormSubmitTestPage(true);
@@ -56,7 +60,7 @@ public class AjaxFormSubmitTest extends WicketTestCase
* @see <a href="https://issues.apache.org/jira/browse/WICKET-1291">WICKET-1291</a>
*/
@Test
- public void submitNoDefProcessing()
+ void submitNoDefProcessing()
{
AjaxFormSubmitTestPage page = new AjaxFormSubmitTestPage(false);
@@ -83,7 +87,7 @@ public class AjaxFormSubmitTest extends WicketTestCase
* @see <a href="https://issues.apache.org/jira/browse/WICKET-6324">WICKET-6324</a>
*/
@Test
- public void submitFallbackErrors()
+ void submitFallbackErrors()
{
AjaxFormSubmitTestPage page = new AjaxFormSubmitTestPage(true);
@@ -110,7 +114,7 @@ public class AjaxFormSubmitTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void eventJavaScriptEscaped() throws Exception
+ void eventJavaScriptEscaped() throws Exception
{
tester.startPage(new AjaxFormSubmitTestPage(false));
tester.assertResultPage(AjaxFormSubmitTestPage.class,
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage.java b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage.java
index a13a653..f258b28 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.ajax.form;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.Optional;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehaviorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehaviorTest.java
index 1e8b515..a5259e2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehaviorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehaviorTest.java
@@ -17,19 +17,19 @@
package org.apache.wicket.ajax.form;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author shuraa
*/
-public class AjaxFormValidatingBehaviorTest extends WicketTestCase
+class AjaxFormValidatingBehaviorTest extends WicketTestCase
{
/**
* https://issues.apache.org/jira/browse/WICKET-5999
*/
@Test
- public void ajaxUpdateOrdinaryFeedbackComponents() throws Exception
+ void ajaxUpdateOrdinaryFeedbackComponents() throws Exception
{
tester.startPage(AjaxFormValidatingBehaviorTestPage.class);
tester.assertRenderedPage(AjaxFormValidatingBehaviorTestPage.class);
@@ -42,7 +42,7 @@ public class AjaxFormValidatingBehaviorTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-5999
*/
@Test
- public void ajaxUpdateInitiallyInvisibleFeedbackComponents() throws Exception
+ void ajaxUpdateInitiallyInvisibleFeedbackComponents() throws Exception
{
tester.startPage(AjaxFormValidatingBehaviorTestPage.class);
tester.assertRenderedPage(AjaxFormValidatingBehaviorTestPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehaviorTestPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehaviorTestPage.java b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehaviorTestPage.java
index 4960445..0bd06a0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehaviorTestPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehaviorTestPage.java
@@ -79,7 +79,7 @@ public class AjaxFormValidatingBehaviorTestPage extends WebPage
* @param id
* @param markupContainer
*/
- public HiddenFeedbackPanel(String id, MarkupContainer markupContainer)
+ HiddenFeedbackPanel(String id, MarkupContainer markupContainer)
{
super(id, new ContainerFeedbackMessageFilter(markupContainer));
setOutputMarkupPlaceholderTag(true);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/form/ChoiceComponentPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/ChoiceComponentPage.java b/wicket-core/src/test/java/org/apache/wicket/ajax/form/ChoiceComponentPage.java
index c1dd6c6..30a6462 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/ChoiceComponentPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/ChoiceComponentPage.java
@@ -37,7 +37,7 @@ public class ChoiceComponentPage extends WebPage
public final RadioGroup<Boolean> group;
- public final Radio<Boolean> radioTrue;
+ private final Radio<Boolean> radioTrue;
public final Radio<Boolean> radioFalse;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTest.java
index 60036e8..61ac5cb 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTest.java
@@ -19,18 +19,18 @@ package org.apache.wicket.ajax.form;
import java.util.Locale;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Janne Hietamäki (janne)
*/
-public class OnChangeAjaxBehaviorTest extends WicketTestCase
+class OnChangeAjaxBehaviorTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void rendering() throws Exception
+ void rendering() throws Exception
{
tester.getSession().setLocale(Locale.ENGLISH);
@@ -44,7 +44,7 @@ public class OnChangeAjaxBehaviorTest extends WicketTestCase
*
*/
@Test
- public void ajaxSubmitWhileAnotherButtonIsNotVisible()
+ void ajaxSubmitWhileAnotherButtonIsNotVisible()
{
// start and render the test page
tester.startPage(HomePage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/json/JsonUtilsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/json/JsonUtilsTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/json/JsonUtilsTest.java
index b78003b..b4bfb48 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/json/JsonUtilsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/json/JsonUtilsTest.java
@@ -16,22 +16,23 @@
*/
package org.apache.wicket.ajax.json;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @since 6.0.0
*/
-public class JsonUtilsTest extends Assert
+class JsonUtilsTest
{
@Test
- public void asArray() throws Exception
+ void asArray() throws Exception
{
Map<String, Object> map = new HashMap<String, Object>();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLinkTest.java
index 0441436..e320773 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLinkTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.ajax.markup.html;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import java.util.Optional;
import org.apache.wicket.MarkupContainer;
@@ -26,29 +28,35 @@ 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;
/**
* @since 6.0.0
*/
-public class AjaxFallbackLinkTest extends WicketTestCase
+class AjaxFallbackLinkTest extends WicketTestCase
{
/**
* https://issues.apache.org/jira/browse/WICKET-4641
*
* AjaxFallbackLink can be used only with <a>, <area> or <link> markup elements
*/
- @Test(expected = MarkupException.class)
- public void onlyAnchorAreaAndLink()
+ @Test
+ void onlyAnchorAreaAndLink()
{
- tester.startPage(new OnlyAnchorAreaAndLinkPage());
+ assertThrows(MarkupException.class, () -> {
+ tester.startPage(new OnlyAnchorAreaAndLinkPage());
+
+ });
}
- private static class OnlyAnchorAreaAndLinkPage extends WebPage implements IMarkupResourceStreamProvider
+ private static class OnlyAnchorAreaAndLinkPage extends WebPage
+ implements
+ IMarkupResourceStreamProvider
{
private OnlyAnchorAreaAndLinkPage()
{
- add(new AjaxFallbackLink<Void>("l") {
+ add(new AjaxFallbackLink<Void>("l")
+ {
@Override
public void onClick(Optional<AjaxRequestTarget> optional)
@@ -58,9 +66,11 @@ public class AjaxFallbackLinkTest extends WicketTestCase
}
@Override
- public IResourceStream getMarkupResourceStream(MarkupContainer container, Class<?> containerClass)
+ public IResourceStream getMarkupResourceStream(MarkupContainer container,
+ Class<?> containerClass)
{
- return new StringResourceStream("<html><body><bla wicket:id='l'>Ajax fallback link</bla></body></html>");
+ return new StringResourceStream(
+ "<html><body><bla wicket:id='l'>Ajax fallback link</bla></body></html>");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ComponentNotOnPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ComponentNotOnPage.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ComponentNotOnPage.java
index 5d06ea3..9c40cdc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ComponentNotOnPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ComponentNotOnPage.java
@@ -69,7 +69,7 @@ public class ComponentNotOnPage extends WebPage
{
private static final long serialVersionUID = 1L;
- public LastSelectedPanel(String id, WebMarkupContainer refresher)
+ LastSelectedPanel(String id, WebMarkupContainer refresher)
{
super(id);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ComponentNotOnPageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ComponentNotOnPageTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ComponentNotOnPageTest.java
index 14e8255..4b6739f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ComponentNotOnPageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ComponentNotOnPageTest.java
@@ -16,18 +16,20 @@
*/
package org.apache.wicket.ajax.markup.html;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.wicket.RuntimeConfigurationType;
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for checking whether or not a component is attached to the component hierarchy when
* updating through AJAX.
*/
-public class ComponentNotOnPageTest extends WicketTestCase
+class ComponentNotOnPageTest extends WicketTestCase
{
private RuntimeConfigurationType configuration = RuntimeConfigurationType.DEVELOPMENT;
@@ -52,25 +54,16 @@ public class ComponentNotOnPageTest extends WicketTestCase
* the developers part that a component that is not part of the page is being refreshed in the
* AJAX response, resulting in a no-op (which is not the intended result).
*/
- @Test(expected = IllegalArgumentException.class)
- public void responseTargetInDevelopmentModeShouldFail()
+ @Test
+ void responseTargetInDevelopmentModeShouldFail()
{
configuration = RuntimeConfigurationType.DEVELOPMENT;
- try
- {
- // this should not fail
- ComponentNotOnPage page = tester.startPage(ComponentNotOnPage.class);
- tester.clickLink("listview:0:link", true);
- tester.startPage(page);
- }
- catch (Exception e)
- {
- Assert.fail("Unexpected exception: " + e);
- }
+ clickLinkFailOnError();
- // this should fail
- tester.clickLink("refresher:refresh", true);
+ assertThrows(IllegalArgumentException.class, () -> {
+ tester.clickLink("refresher:refresh", true);
+ });
}
/**
@@ -81,10 +74,17 @@ public class ComponentNotOnPageTest extends WicketTestCase
* (which happened in Wicket 7).
*/
@Test
- public void responseTargetInDeploymentModeShouldNotFail()
+ void responseTargetInDeploymentModeShouldNotFail()
{
configuration = RuntimeConfigurationType.DEPLOYMENT;
+ clickLinkFailOnError();
+
+ // this shouldn't fail as well
+ tester.clickLink("refresher:refresh", true);
+ }
+
+ private void clickLinkFailOnError() {
try
{
// this should not fail
@@ -94,10 +94,7 @@ public class ComponentNotOnPageTest extends WicketTestCase
}
catch (Exception e)
{
- Assert.fail("Unexpected exception: " + e);
+ fail("Unexpected exception: " + e);
}
-
- // this shouldn't fail as well
- tester.clickLink("refresher:refresh", true);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkDoNotRecreatePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkDoNotRecreatePage.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkDoNotRecreatePage.java
index 8f8a26f..5092933 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkDoNotRecreatePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkDoNotRecreatePage.java
@@ -83,7 +83,7 @@ public class StatelessAjaxFallbackLinkDoNotRecreatePage extends WebPage
return value.toString();
}
- protected final void updateParams(final PageParameters pageParameters, final int counter)
+ private void updateParams(final PageParameters pageParameters, final int counter)
{
pageParameters.set(COUNTER_PARAM, Integer.toString(counter + 1));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkDoNotRecreateTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkDoNotRecreateTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkDoNotRecreateTest.java
index bc087fc..e5e2377 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkDoNotRecreateTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkDoNotRecreateTest.java
@@ -16,16 +16,18 @@
*/
package org.apache.wicket.ajax.markup.html;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.Page;
import org.apache.wicket.Session;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
-public class StatelessAjaxFallbackLinkDoNotRecreateTest extends WicketTestCase
+class StatelessAjaxFallbackLinkDoNotRecreateTest extends WicketTestCase
{
- @After
- public void after()
+ @AfterEach
+ void after()
{
// things must stay stateless
assertTrue(Session.get().isTemporary());
@@ -35,7 +37,7 @@ public class StatelessAjaxFallbackLinkDoNotRecreateTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-6349
*/
@Test
- public void statelessPagesAreAlwaysRecreated()
+ void statelessPagesAreAlwaysRecreated()
{
tester.getApplication().getPageSettings().setRecreateBookmarkablePagesAfterExpiry(false);
tester.startPage(StatelessAjaxFallbackLinkDoNotRecreatePage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkTest.java
index 5cf7ff2..763d0e2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.ajax.markup.html;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.List;
@@ -26,22 +26,22 @@ import org.apache.wicket.ajax.StatelessPage;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.After;
-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;
-public class StatelessAjaxFallbackLinkTest
+class StatelessAjaxFallbackLinkTest
{
- protected WicketTester tester;
+ private WicketTester tester;
- @Before
- public void setUp()
+ @BeforeEach
+ void setUp()
{
tester = new WicketTester(new MockApplication());
}
- @After
- public void teardown()
+ @AfterEach
+ void teardown()
{
// things must stay stateless
assertTrue(Session.get().isTemporary());
@@ -49,7 +49,7 @@ public class StatelessAjaxFallbackLinkTest
@Test
@SuppressWarnings("unchecked")
- public void testGetStatelessHint()
+ void testGetStatelessHint()
{
tester.startPage(StatelessPage.class);
@@ -64,7 +64,7 @@ public class StatelessAjaxFallbackLinkTest
final AjaxEventBehavior behavior = (AjaxEventBehavior)behaviors.get(0);
behavior.onRequest();
-
+
assertTrue(link.isStateless());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkTest.java
index e18fa29..8802913 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkTest.java
@@ -16,25 +16,26 @@
*/
package org.apache.wicket.ajax.markup.html.ajaxLink;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.behavior.AbstractAjaxBehavior;
import org.apache.wicket.util.tester.TagTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class AjaxLinkTest extends WicketTestCase
+class AjaxLinkTest extends WicketTestCase
{
/**
* If the AjaxLink is attached to an "a" tag the href value should be replaced with "#" because
* we use the onclick to execute the javascript.
*/
@Test
- public void anchorGetsHrefReplaced()
+ void anchorGetsHrefReplaced()
{
tester.startPage(AjaxLinkPage.class);
@@ -48,7 +49,7 @@ public class AjaxLinkTest extends WicketTestCase
* Tests setting the request target to a normal page request from an ajax request.
*/
@Test
- public void fromAjaxRequestToNormalPage()
+ void fromAjaxRequestToNormalPage()
{
tester.startPage(AjaxLinkPageToNormalPage.class);
tester.assertRenderedPage(AjaxLinkPageToNormalPage.class);
@@ -64,7 +65,7 @@ public class AjaxLinkTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void page_2() throws Exception
+ void page_2() throws Exception
{
executeTest(AjaxPage2.class, "AjaxPage2_ExpectedResult.html");
@@ -80,7 +81,7 @@ public class AjaxLinkTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_1() throws Exception
+ void renderHomePage_1() throws Exception
{
executeTest(AjaxLinkPage.class, "AjaxLinkPageExpectedResult.html");
}
@@ -90,7 +91,7 @@ public class AjaxLinkTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_2() throws Exception
+ void renderHomePage_2() throws Exception
{
executeTest(AjaxLinkWithBorderPage.class, "AjaxLinkWithBorderPageExpectedResult.html");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelBase.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelBase.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelBase.java
index e855996..71e4b70 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelBase.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelBase.java
@@ -26,14 +26,14 @@ public class SimpleTestPanelBase extends Panel
{
private static final long serialVersionUID = 1L;
- protected WebMarkupContainer baseSpan;
+ WebMarkupContainer baseSpan;
/**
* Construct.
*
* @param name
*/
- public SimpleTestPanelBase(String name)
+ SimpleTestPanelBase(String name)
{
super(name);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelTest.java
index e3bf94c..f1dc955 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelTest.java
@@ -19,7 +19,7 @@ package org.apache.wicket.ajax.markup.html.componentMap;
import org.apache.wicket.Page;
import org.apache.wicket.util.tester.DiffUtil;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
@@ -27,13 +27,13 @@ import org.junit.Test;
*
* @author Juergen Donnerstag
*/
-public class SimpleTestPanelTest extends WicketTestCase
+class SimpleTestPanelTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void renderHomePage_2() throws Exception
+ void renderHomePage_2() throws Exception
{
executeTest(SimpleTestPage.class, "SimpleTestPageExpectedResult.html");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/AjaxButtonTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/AjaxButtonTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/AjaxButtonTest.java
index c699262..2b34f65 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/AjaxButtonTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/AjaxButtonTest.java
@@ -16,19 +16,21 @@
*/
package org.apache.wicket.ajax.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Simple test using the WicketTester
*/
-public class AjaxButtonTest extends WicketTestCase
+class AjaxButtonTest extends WicketTestCase
{
/**
*
*/
@Test
- public void ajaxButtonWhenCancelButtonHasAModelValue()
+ void ajaxButtonWhenCancelButtonHasAModelValue()
{
// start and render the test page
tester.startPage(HomePage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/StatelessAjaxSubmitLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/StatelessAjaxSubmitLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/StatelessAjaxSubmitLinkTest.java
index 51f7840..33b1d9c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/StatelessAjaxSubmitLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/StatelessAjaxSubmitLinkTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.ajax.markup.html.form;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.wicket.Session;
import org.apache.wicket.ajax.StatelessPage;
@@ -24,48 +24,48 @@ import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.page.XmlPartialPageUpdate;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.After;
-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;
-public class StatelessAjaxSubmitLinkTest
+class StatelessAjaxSubmitLinkTest
{
- protected WicketTester tester;
+ private WicketTester tester;
- @Before
- public void setUp()
+ @BeforeEach
+ void setUp()
{
tester = new WicketTester(new MockApplication());
}
- @After
- public void teardown()
+ @AfterEach
+ void teardown()
{
// things must stay stateless
assertTrue(Session.get().isTemporary());
}
-
+
@Test
- public void testSubmitForm() throws Exception
+ void testSubmitForm() throws Exception
{
- tester.startPage(StatelessPage.class);
-
- FormTester formTester = tester.newFormTester("inputForm");
- formTester.setValue("name", "myname");
- formTester.setValue("surname", "mysurname");
-
- tester.executeAjaxEvent("inputForm:submit", "click");
-
- String response = tester.getLastResponseAsString();
-
- boolean isAjaxResponse = response.contains(XmlPartialPageUpdate.START_ROOT_ELEMENT)
- && response.contains(XmlPartialPageUpdate.END_ROOT_ELEMENT);
-
- assertTrue(isAjaxResponse);
-
- boolean formAjaxSubmit = response.contains(StatelessPage.FORM_SUBMIT) &&
- response.contains(StatelessPage.AJAX_SUBMIT);
-
- assertTrue(formAjaxSubmit);
+ tester.startPage(StatelessPage.class);
+
+ FormTester formTester = tester.newFormTester("inputForm");
+ formTester.setValue("name", "myname");
+ formTester.setValue("surname", "mysurname");
+
+ tester.executeAjaxEvent("inputForm:submit", "click");
+
+ String response = tester.getLastResponseAsString();
+
+ boolean isAjaxResponse = response.contains(XmlPartialPageUpdate.START_ROOT_ELEMENT) &&
+ response.contains(XmlPartialPageUpdate.END_ROOT_ELEMENT);
+
+ assertTrue(isAjaxResponse);
+
+ boolean formAjaxSubmit = response.contains(StatelessPage.FORM_SUBMIT) &&
+ response.contains(StatelessPage.AJAX_SUBMIT);
+
+ assertTrue(formAjaxSubmit);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/authorization/ComponentIsRenderedAllowedTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/authorization/ComponentIsRenderedAllowedTest.java b/wicket-core/src/test/java/org/apache/wicket/authorization/ComponentIsRenderedAllowedTest.java
index e6ac55c..f0eadb9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/authorization/ComponentIsRenderedAllowedTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/authorization/ComponentIsRenderedAllowedTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.authorization;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
@@ -26,14 +28,14 @@ import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Checks whether or not authorization strategy blocks rendering of components
*
* @author igor
*/
-public class ComponentIsRenderedAllowedTest extends WicketTestCase
+class ComponentIsRenderedAllowedTest extends WicketTestCase
{
@Override
protected WebApplication newApplication()
@@ -43,7 +45,7 @@ public class ComponentIsRenderedAllowedTest extends WicketTestCase
/** */
@Test
- public void onBeforeRenderNotCalledOnVetoedComponents()
+ void onBeforeRenderNotCalledOnVetoedComponents()
{
TestPage page = new TestPage();
tester.startPage(page);
@@ -52,7 +54,7 @@ public class ComponentIsRenderedAllowedTest extends WicketTestCase
/** */
@Test
- public void vetoedComponentNotRendered()
+ void vetoedComponentNotRendered()
{
TestPage page = new TestPage();
tester.startPage(page);
@@ -60,12 +62,12 @@ public class ComponentIsRenderedAllowedTest extends WicketTestCase
}
/** */
- public class TestPage extends WebPage implements IMarkupResourceStreamProvider
+ class TestPage extends WebPage implements IMarkupResourceStreamProvider
{
private final NormalContainer normal;
/** */
- public TestPage()
+ TestPage()
{
ForbiddenContainer forbidden = new ForbiddenContainer("forbidden");
normal = new NormalContainer("normal");
@@ -89,7 +91,7 @@ public class ComponentIsRenderedAllowedTest extends WicketTestCase
private boolean onBeforeRenderCalled = false;
private boolean onAfterRenderCalled = false;
- public NormalContainer(String id)
+ NormalContainer(String id)
{
super(id);
}
@@ -112,7 +114,7 @@ public class ComponentIsRenderedAllowedTest extends WicketTestCase
private static class ForbiddenContainer extends WebMarkupContainer implements Forbidden
{
- public ForbiddenContainer(String id)
+ ForbiddenContainer(String id)
{
super(id);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/behavior/AjaxCallbackUrlTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/behavior/AjaxCallbackUrlTest.java b/wicket-core/src/test/java/org/apache/wicket/behavior/AjaxCallbackUrlTest.java
index 57d4eb1..33d9433 100644
--- a/wicket-core/src/test/java/org/apache/wicket/behavior/AjaxCallbackUrlTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/behavior/AjaxCallbackUrlTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.behavior;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -26,26 +28,23 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
+import org.junit.jupiter.api.Test;
/**
* Test for https://issues.apache.org/jira/browse/WICKET-6192
*/
-public class AjaxCallbackUrlTest extends WicketTestCase {
+class AjaxCallbackUrlTest extends WicketTestCase {
@Test
- public void withoutPathParameters() {
+ void withoutPathParameters() {
String callbackUrl = getCallbackUrl("/a/b/c");
- assertThat(callbackUrl, is(equalTo("./a/b/c?0-1.0-link")));
+ assertEquals("./a/b/c?0-1.0-link", callbackUrl);
}
@Test
- public void withPathParameters() {
+ void withPathParameters() {
String callbackUrl = getCallbackUrl("/a/${b}/${c}");
- assertThat(callbackUrl, is(equalTo("./a/BBB/CCC?0-1.0-link")));
+ assertEquals("./a/BBB/CCC?0-1.0-link", callbackUrl);
}
private String getCallbackUrl(final String pageMountPath) {
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/behavior/BehaviorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/behavior/BehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/behavior/BehaviorTest.java
index ed4f473..29f69d4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/behavior/BehaviorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/behavior/BehaviorTest.java
@@ -16,24 +16,24 @@
*/
package org.apache.wicket.behavior;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.wicket.MockPageWithOneComponent;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.util.tester.TagTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link Behavior}
*/
-public class BehaviorTest extends WicketTestCase
+class BehaviorTest extends WicketTestCase
{
@Test
- public void onTagTest()
+ void onTagTest()
{
- WebMarkupContainer component = new WebMarkupContainer(MockPageWithOneComponent.COMPONENT_ID);
+ WebMarkupContainer component = new WebMarkupContainer(
+ MockPageWithOneComponent.COMPONENT_ID);
MockPageWithOneComponent page = new MockPageWithOneComponent();
page.add(component);
String value = "value";
@@ -44,14 +44,15 @@ public class BehaviorTest extends WicketTestCase
tester.startPage(page);
TagTester tagTester = tester.getTagByWicketId(MockPageWithOneComponent.COMPONENT_ID);
- assertThat(tagTester.getAttribute(key), is(equalTo(value)));
- assertThat(tagTester.getAttribute("class"), is(equalTo("zzz")));
+ assertEquals(value, tagTester.getAttribute(key));
+ assertEquals("zzz", tagTester.getAttribute("class"));
}
-
+
@Test
- public void onAttributeTest()
+ void onAttributeTest()
{
- WebMarkupContainer component = new WebMarkupContainer(MockPageWithOneComponent.COMPONENT_ID);
+ WebMarkupContainer component = new WebMarkupContainer(
+ MockPageWithOneComponent.COMPONENT_ID);
MockPageWithOneComponent page = new MockPageWithOneComponent();
page.add(component);
String value = "value";
@@ -61,6 +62,6 @@ public class BehaviorTest extends WicketTestCase
tester.startPage(page);
TagTester tagTester = tester.getTagByWicketId(MockPageWithOneComponent.COMPONENT_ID);
- assertThat(tagTester.getAttribute(key), is(equalTo(value)));
+ assertEquals(value, tagTester.getAttribute(key));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java b/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java
index b622e7c..7c22e4c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.behavior;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.List;
import org.apache.wicket.AttributeModifier;
@@ -30,14 +33,14 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/** IBehavior array management tests */
-public class ImmutableBehaviorIdsTest extends WicketTestCase
+class ImmutableBehaviorIdsTest extends WicketTestCase
{
/** Tests simple behavior */
@Test
- public void simple()
+ void simple()
{
MyPage page = new MyPage();
page.getContainer().add(new AttributeModifier("class", "border"));
@@ -50,7 +53,7 @@ public class ImmutableBehaviorIdsTest extends WicketTestCase
* Tests the fact that url-behavior indexes do not change even if behaviors are removed/added
*/
@Test
- public void urlIndexRendering()
+ void urlIndexRendering()
{
Behavior border = new AttributeModifier("class", "border");
Behavior border2 = new AttributeModifier("class2", "border");
@@ -96,7 +99,7 @@ public class ImmutableBehaviorIdsTest extends WicketTestCase
* Tests that removal of behaviors properly cleans up the data array
*/
@Test
- public void behaviorDataArrayCleanup()
+ void behaviorDataArrayCleanup()
{
Behavior border = new AttributeModifier("class", "border");
Behavior border2 = new AttributeModifier("class2", "border");
@@ -157,7 +160,7 @@ public class ImmutableBehaviorIdsTest extends WicketTestCase
private final String attr;
- public LinkBehavior(String attr)
+ LinkBehavior(String attr)
{
this.attr = attr;
}
@@ -180,7 +183,7 @@ public class ImmutableBehaviorIdsTest extends WicketTestCase
private static final long serialVersionUID = 1L;
private final WebMarkupContainer container;
- public MyPage()
+ MyPage()
{
container = new WebMarkupContainer("container");
add(container);
@@ -194,7 +197,7 @@ public class ImmutableBehaviorIdsTest extends WicketTestCase
"<html><body><a wicket:id='container'></a></body></html>");
}
- public WebMarkupContainer getContainer()
+ WebMarkupContainer getContainer()
{
return container;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/behavior/SharedBehaviorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/behavior/SharedBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/behavior/SharedBehaviorTest.java
index 6b94bb0..3d23abb 100644
--- a/wicket-core/src/test/java/org/apache/wicket/behavior/SharedBehaviorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/behavior/SharedBehaviorTest.java
@@ -26,12 +26,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;
/**
* @since 1.5.8
*/
-public class SharedBehaviorTest extends WicketTestCase
+class SharedBehaviorTest extends WicketTestCase
{
/**
* https://issues.apache.org/jira/browse/WICKET-4570
@@ -45,7 +45,7 @@ public class SharedBehaviorTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void sharedBehaviorRenderHead() throws Exception
+ void sharedBehaviorRenderHead() throws Exception
{
TestPage page = new TestPage();
executeTest(page, "SharedBehaviorTest_renderHead_expected.html");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/component/replacewith/BaseReplaceWithPanel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/component/replacewith/BaseReplaceWithPanel.java b/wicket-core/src/test/java/org/apache/wicket/component/replacewith/BaseReplaceWithPanel.java
index 52b3c27..a808c52 100644
--- a/wicket-core/src/test/java/org/apache/wicket/component/replacewith/BaseReplaceWithPanel.java
+++ b/wicket-core/src/test/java/org/apache/wicket/component/replacewith/BaseReplaceWithPanel.java
@@ -25,9 +25,9 @@ import org.apache.wicket.util.resource.StringResourceStream;
/**
* A base panel for all replaceWith panels
*/
-public class BaseReplaceWithPanel extends Panel implements IMarkupResourceStreamProvider
+class BaseReplaceWithPanel extends Panel implements IMarkupResourceStreamProvider
{
- public BaseReplaceWithPanel(String id)
+ BaseReplaceWithPanel(String id)
{
super(id);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/component/replacewith/PanelB.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/component/replacewith/PanelB.java b/wicket-core/src/test/java/org/apache/wicket/component/replacewith/PanelB.java
index f38889b..f17e7e8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/component/replacewith/PanelB.java
+++ b/wicket-core/src/test/java/org/apache/wicket/component/replacewith/PanelB.java
@@ -18,7 +18,7 @@ package org.apache.wicket.component.replacewith;
import org.apache.wicket.markup.html.panel.Panel;
-public class PanelB extends Panel
+class PanelB extends Panel
{
public PanelB(String id)
{
[29/45] wicket git commit: wicket-core: Migrate to Junit 5
Posted by mg...@apache.org.
wicket-core: Migrate to Junit 5
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/645f239c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/645f239c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/645f239c
Branch: refs/heads/master
Commit: 645f239cda3a9c94c5ab65a5a0b78fb24fd99b0c
Parents: 28dd483
Author: renoth <jo...@gmx.de>
Authored: Fri Aug 31 23:25:41 2018 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 26 15:37:45 2018 +0300
----------------------------------------------------------------------
pom.xml | 19 +-
wicket-core/pom.xml | 15 +
.../wicket/util/tester/BaseWicketTester.java | 15 +-
.../org/apache/wicket/util/tester/DiffUtil.java | 5 +-
.../apache/wicket/util/tester/FormTester.java | 8 +-
.../wicket/util/tester/WicketTestCase.java | 21 +-
.../apache/wicket/util/tester/WicketTester.java | 183 +++---
.../util/tester/WicketTesterExtension.java | 71 ++
.../wicket/util/tester/WicketTesterHelper.java | 15 +-
.../wicket/util/tester/WicketTesterScope.java | 73 ---
.../AddChildToParentInOnInitializeTest.java | 18 +-
.../apache/wicket/ApplicationSettingsTest.java | 86 +--
.../apache/wicket/AttributeModifierTest.java | 60 +-
.../org/apache/wicket/AuthorizationTest.java | 28 +-
.../org/apache/wicket/BehaviorRequestTest.java | 27 +-
.../java/org/apache/wicket/BehaviorUrlTest.java | 24 +-
.../wicket/CachingDisabledLocalizerTest.java | 6 +-
.../wicket/ClassAttributeModifierTest.java | 14 +-
...entBehaviorOverComponentTagBehaviorTest.java | 6 +-
.../wicket/ComponentConfigurationTest.java | 19 +-
.../org/apache/wicket/ComponentEventsTest.java | 130 ++--
.../ComponentInitializationIntegrationTest.java | 14 +-
.../wicket/ComponentInitializationTest.java | 27 +-
.../apache/wicket/ComponentOnConfigureTest.java | 30 +-
.../java/org/apache/wicket/ComponentTest.java | 22 +-
.../ComponentWithLazyModelCreationTest.java | 19 +-
.../org/apache/wicket/ConverterLocatorTest.java | 12 +-
...ceptionMapperResourceBlockedDevModeTest.java | 14 +-
...eptionMapperResourceBlockedProdModeTest.java | 14 +-
.../wicket/DefaultExceptionMapperTest.java | 14 +-
.../apache/wicket/DisabledComponentTest.java | 19 +-
.../org/apache/wicket/EventDispatcherTest.java | 15 +-
.../org/apache/wicket/ExceptionMapperTest.java | 15 +-
.../org/apache/wicket/FeedbackMessagesTest.java | 11 +-
.../apache/wicket/FormDispatchEventTest.java | 12 +-
.../java/org/apache/wicket/LocalizerTest.java | 168 ++---
.../org/apache/wicket/MarkupContainerTest.java | 653 ++++++++++---------
.../apache/wicket/MarkupIdGeneratorTest.java | 10 +-
.../java/org/apache/wicket/MetaDataTest.java | 11 +-
.../java/org/apache/wicket/MockComponent.java | 8 +-
.../apache/wicket/MockPageParametersAware.java | 2 +-
.../java/org/apache/wicket/OnReAddTest.java | 42 +-
.../java/org/apache/wicket/PageFactoryTest.java | 34 +-
.../apache/wicket/PageMarkupLoadingTest.java | 16 +-
.../wicket/ParentResourceEscapePathTest.java | 16 +-
.../org/apache/wicket/PlaceholderTagIdTest.java | 8 +-
.../org/apache/wicket/RedirectApplication.java | 2 +-
.../test/java/org/apache/wicket/RemoveTest.java | 34 +-
.../java/org/apache/wicket/RemoveTestPage.java | 4 +-
.../org/apache/wicket/RequestEncodingTest.java | 25 +-
.../java/org/apache/wicket/ResourceTest.java | 11 +-
...ponseAtInterceptPageExceptionInAjaxTest.java | 10 +-
...artResponseAtInterceptPageExceptionTest.java | 6 +-
.../wicket/RestartResponseExceptionTest.java | 6 +-
.../wicket/RestartWithMountedPageTest.java | 6 +-
.../org/apache/wicket/SetResponsePageTest.java | 10 +-
.../apache/wicket/SharedResourceUrlTest.java | 10 +-
.../wicket/StyleAttributeModifierTest.java | 14 +-
.../test/java/org/apache/wicket/TesterTest.java | 11 +-
.../java/org/apache/wicket/VisitorTest.java | 39 +-
.../ajax/AbstractDefaultAjaxBehaviorTest.java | 9 +-
.../ajax/AjaxBehaviorAndMetaDataTest.java | 6 +-
.../wicket/ajax/AjaxBehaviorEnabledPage.java | 8 +-
.../wicket/ajax/AjaxBehaviorEnabledTest.java | 12 +-
.../wicket/ajax/AjaxCallbackFunctionTest.java | 19 +-
.../org/apache/wicket/ajax/AjaxChannelTest.java | 8 +-
.../ajax/AjaxComponentVisibilityTest.java | 15 +-
.../wicket/ajax/AjaxEventBehaviorTest.java | 57 +-
.../wicket/ajax/AjaxHeaderContributionTest.java | 8 +-
.../wicket/ajax/AjaxRequestHandlerTest.java | 56 +-
.../wicket/ajax/AjaxTimerBehaviorTest.java | 19 +-
.../apache/wicket/ajax/DomReadyOrderPage.java | 2 +-
.../apache/wicket/ajax/DomReadyOrderTest.java | 10 +-
.../ajax/GlobalUpdateAjaxAttributesTest.java | 6 +-
.../java/org/apache/wicket/ajax/HomePage.java | 2 +-
.../InternalErrorCallsAjaxOnFailureTest.java | 11 +-
.../org/apache/wicket/ajax/StatelessPage.java | 10 +-
.../ajax/attributes/AjaxAttributeNameTest.java | 18 +-
...FormChoiceComponentUpdatingBehaviorTest.java | 10 +-
.../ajax/form/AjaxFormSubmitBehaviorTest.java | 21 +-
.../wicket/ajax/form/AjaxFormSubmitTest.java | 16 +-
.../ajax/form/AjaxFormSubmitTestPage.java | 2 +-
.../form/AjaxFormValidatingBehaviorTest.java | 8 +-
.../AjaxFormValidatingBehaviorTestPage.java | 2 +-
.../wicket/ajax/form/ChoiceComponentPage.java | 2 +-
.../ajax/form/OnChangeAjaxBehaviorTest.java | 8 +-
.../apache/wicket/ajax/json/JsonUtilsTest.java | 9 +-
.../ajax/markup/html/AjaxFallbackLinkTest.java | 28 +-
.../ajax/markup/html/ComponentNotOnPage.java | 2 +-
.../markup/html/ComponentNotOnPageTest.java | 43 +-
...telessAjaxFallbackLinkDoNotRecreatePage.java | 2 +-
...telessAjaxFallbackLinkDoNotRecreateTest.java | 14 +-
.../html/StatelessAjaxFallbackLinkTest.java | 24 +-
.../ajax/markup/html/ajaxLink/AjaxLinkTest.java | 17 +-
.../html/componentMap/SimpleTestPanelBase.java | 4 +-
.../html/componentMap/SimpleTestPanelTest.java | 6 +-
.../ajax/markup/html/form/AjaxButtonTest.java | 8 +-
.../html/form/StatelessAjaxSubmitLinkTest.java | 62 +-
.../ComponentIsRenderedAllowedTest.java | 18 +-
.../wicket/behavior/AjaxCallbackUrlTest.java | 17 +-
.../apache/wicket/behavior/BehaviorTest.java | 25 +-
.../behavior/ImmutableBehaviorIdsTest.java | 19 +-
.../wicket/behavior/SharedBehaviorTest.java | 6 +-
.../replacewith/BaseReplaceWithPanel.java | 4 +-
.../wicket/component/replacewith/PanelB.java | 2 +-
.../replacewith/ReplaceInConstructorPanel.java | 2 +-
.../ReplaceInOnBeforeRenderPanel.java | 2 +-
.../replacewith/ReplaceInOnConfigurePanel.java | 2 +-
.../replacewith/ReplaceInOnInitializePanel.java | 2 +-
.../component/replacewith/ReplaceWithTest.java | 29 +-
.../handler/ListenerRequestHandlerTest.java | 105 ++-
.../mapper/AbstractBookmarkableMapperTest.java | 36 +-
.../core/request/mapper/AbstractMapperTest.java | 13 +-
.../AbstractResourceReferenceMapperOwnTest.java | 11 +-
.../AbstractResourceReferenceMapperTest.java | 38 +-
.../BasicResourceReferenceMapperTest.java | 134 ++--
.../request/mapper/BookmarkableMapperTest.java | 114 ++--
.../core/request/mapper/CryptoMapperTest.java | 272 ++++----
.../mapper/LocaleAwarePageParametersTest.java | 36 +-
.../MoreSpecificResourceMountPathTest.java | 153 +++--
.../core/request/mapper/MountedMapperTest.java | 301 +++++----
.../core/request/mapper/PackageMapperTest.java | 226 ++++---
.../request/mapper/PageInstanceMapperTest.java | 52 +-
.../core/request/mapper/ResourceMapperTest.java | 32 +-
...esourceMapperWithDecoratedResourcesTest.java | 36 +-
.../core/request/mapper/TestMapperContext.java | 10 +-
.../wicket/core/request/mapper/UrlInfoTest.java | 9 +-
.../util/license/ApacheLicenceHeaderTest.java | 4 +-
.../checker/AbstractObjectCheckerTest.java | 9 +-
.../checker/DifferentPageCheckerTest.java | 12 +-
.../checker/OrphanComponentCheckerTest.java | 8 +-
.../objects/checker/SessionCheckerTest.java | 12 +-
.../resource/ClassPathResourceFinderTest.java | 12 +-
.../wicket/core/util/string/CssUtilsTest.java | 9 +-
.../core/util/string/JavaScriptUtilsTest.java | 15 +-
.../ComponentRendererInstanceTest.java | 20 +-
.../ComponentRendererTest.java | 10 +-
.../wicket/dontstoreunrendered/BasePage.java | 2 +-
...ntStoreNotRenderedPageOnePassRenderTest.java | 2 +-
...toreNotRenderedPageRedirectToBufferTest.java | 2 +-
...toreNotRenderedPageRedirectToRenderTest.java | 2 +-
.../DontStoreNotRenderedPageTestCase.java | 19 +-
.../wicket/feedback/FeedbackRenderTest.java | 10 +-
.../InterceptDataCleanedAfterReadTest.java | 6 +-
.../wicket/intercept/Wicket4066Application.java | 2 +-
.../ComponentTagAttributeEscapingTest.java | 44 +-
.../DefaultMarkupCacheKeyProviderTest.java | 8 +-
.../wicket/markup/HtmlProblemFinderTest.java | 16 +-
.../apache/wicket/markup/MarkupCacheTest.java | 20 +-
.../wicket/markup/MarkupFragmentTest.java | 23 +-
.../markup/MarkupInheritanceBaseBase_11.java | 2 +-
.../markup/MarkupInheritanceBaseBase_13.java | 2 +-
.../markup/MarkupInheritanceBaseBase_3.java | 2 +-
.../markup/MarkupInheritanceBasePanel_6.java | 2 +-
.../markup/MarkupInheritanceBasePanel_9.java | 2 +-
.../wicket/markup/MarkupInheritanceBase_1.java | 2 +-
.../wicket/markup/MarkupInheritanceBase_10.java | 2 +-
.../wicket/markup/MarkupInheritanceBase_11.java | 2 +-
.../wicket/markup/MarkupInheritanceBase_12.java | 2 +-
.../wicket/markup/MarkupInheritanceBase_13.java | 2 +-
.../wicket/markup/MarkupInheritanceBase_2.java | 2 +-
.../wicket/markup/MarkupInheritanceBase_3.java | 2 +-
.../wicket/markup/MarkupInheritanceBase_4.java | 2 +-
.../wicket/markup/MarkupInheritanceBase_5.java | 2 +-
.../wicket/markup/MarkupInheritanceBase_7.java | 2 +-
.../wicket/markup/MarkupInheritanceBase_8.java | 2 +-
.../wicket/markup/MarkupInheritanceTest.java | 35 +-
.../apache/wicket/markup/MarkupParserTest.java | 119 ++--
.../org/apache/wicket/markup/MarkupTest.java | 11 +-
.../apache/wicket/markup/MarkupTest_Find_1.java | 2 +-
.../apache/wicket/markup/MarkupTest_Find_2.java | 2 +-
.../apache/wicket/markup/MarkupTest_Find_3.java | 2 +-
.../wicket/markup/MarkupVariationTest.java | 10 +-
.../markup/RefreshingViewOnRemoveTest.java | 22 +-
.../wicket/markup/WicketNamespaceTest.java | 24 +-
.../wicket/markup/head/HeaderResponseTest.java | 8 +-
.../markup/head/HtmlImportHeaderItemTest.java | 37 +-
.../markup/head/MetaDataHeaderItemTest.java | 12 +-
.../filter/FilteringHeaderResponseTest.java | 37 +-
.../markup/html/ComponentMarkupIdTest.java | 43 +-
.../html/DecoratingHeaderResponseTest.java | 11 +-
.../markup/html/HeaderContributorTest.java | 19 +-
.../wicket/markup/html/MarkupHeadFirstTest.java | 8 +-
.../MarkupInheritanceResolverTestPage1.java | 2 +-
.../MarkupInheritanceResolverTestPage2.java | 2 +-
.../markup/html/PackageResourceGuardTest.java | 14 +-
.../wicket/markup/html/PackageResourceTest.java | 46 +-
.../html/SecurePackageResourceGuardTest.java | 37 +-
.../html/TransparentWebMarkupContainerTest.java | 49 +-
.../apache/wicket/markup/html/WebPageTest.java | 15 +-
.../wicket/markup/html/XmlDeclResponseTest.java | 16 +-
.../AutocomponetsGenerationTest.java | 12 +-
.../markup/html/autocomponent/UniqueIdTest.java | 4 +-
.../html/autolink/AutoLinkInPanelsTest.java | 14 +-
.../markup/html/autolink/AutolinkTest.java | 12 +-
.../wicket/markup/html/autolink/BasePage.java | 2 +-
.../markup/html/autolink/QuickStartPage.java | 2 +-
.../markup/html/autolink/sub/BasePage.java | 2 +-
.../html/basic/EnclosureContainerTest.java | 8 +-
.../markup/html/basic/HomePageRedirectTest.java | 10 +-
.../wicket/markup/html/basic/LabelTest.java | 8 +-
.../markup/html/basic/SimplePageTest.java | 81 ++-
.../wicket/markup/html/basic/SimplePage_9.java | 2 +-
.../html/basic/SimpleResponsePageClassTest.java | 10 +-
.../wicket/markup/html/basic/XmlBasePage.java | 2 +-
.../wicket/markup/html/basic/XmlPageTest.java | 12 +-
.../markup/html/border/BorderWithForm.java | 2 +-
.../markup/html/border/ComponentBorderTest.java | 70 +-
.../markup/html/border/ExtedableBorder.java | 2 +-
.../html/debug/WicketComponentTreeTest.java | 6 +-
.../html/form/AbstractCheckGroupTestPage.java | 2 +-
...tComponentConvertEmptyStringsToNullTest.java | 13 +-
.../html/form/AutoFormLabelPickupTest.java | 36 +-
.../wicket/markup/html/form/AutoLabelTest.java | 40 +-
.../html/form/AutoLabelWithContentTest.java | 8 +-
.../html/form/AutoLabelWithinEnclosureTest.java | 12 +-
.../wicket/markup/html/form/ButtonTest.java | 39 +-
.../html/form/CheckBoxMultipleChoiceTest.java | 31 +-
.../wicket/markup/html/form/CheckGroupTest.java | 58 +-
.../html/form/CollectionFormComponentTest.java | 49 +-
.../form/DisabledItemRetainingCheckBoxTest.java | 18 +-
.../markup/html/form/DropDownChoiceTest.java | 18 +-
.../html/form/EnumChoiceRendererTest.java | 8 +-
.../form/EscapeAttributesInChoicesTest.java | 13 +-
.../form/FormComponentPanelProcessingTest.java | 17 +-
.../markup/html/form/FormComponentTest.java | 32 +-
.../markup/html/form/FormHasErrorPage.java | 6 +-
.../html/form/FormMethodMismatchTest.java | 46 +-
.../markup/html/form/FormMultiPartTest.java | 30 +-
.../form/FormParentDisabledRawInputTest.java | 23 +-
.../markup/html/form/FormSubmitOrderTest.java | 14 +-
.../wicket/markup/html/form/FormSubmitTest.java | 41 +-
.../wicket/markup/html/form/FormTest.java | 29 +-
...FormValidationDisabledFormComponentTest.java | 21 +-
.../markup/html/form/FormValidationTest.java | 27 +-
.../html/form/FormWithMultipleButtonsTest.java | 16 +-
.../html/form/ListMultipleChoiceTest.java | 23 +-
.../html/form/LocalizedErrorMessageTest.java | 10 +-
.../markup/html/form/LocalizedMessagePage.java | 2 +-
.../markup/html/form/MultiPartFormPage.java | 4 +-
.../markup/html/form/NestedFormSubmitTest.java | 50 +-
.../markup/html/form/NestedFormsPage.java | 6 +-
.../markup/html/form/NestedFormsTest.java | 10 +-
.../markup/html/form/NumberTextFieldTest.java | 19 +-
.../html/form/OnValidateModelObjectsTest.java | 12 +-
.../markup/html/form/PasswordTextFieldTest.java | 18 +-
.../html/form/PrimitiveTypeRequiredTest.java | 10 +-
.../markup/html/form/RadioChoiceTest.java | 12 +-
.../wicket/markup/html/form/RadioGroupTest.java | 26 +-
.../markup/html/form/TestFormHasError.java | 10 +-
.../wicket/markup/html/form/TextAreaTest.java | 10 +-
.../wicket/markup/html/form/TextFieldTest.java | 17 +-
.../html/form/ValidatorPropertiesTest.java | 16 +-
.../markup/html/form/border/TestHomePage.java | 14 +-
.../html/form/border/TestHomePage_2134.java | 12 +-
.../markup/html/form/encryption/CryptTest.java | 12 +-
.../html/form/feedback/FormFeedbackTest.java | 8 +-
.../form/formComponentPanel/SimplePageTest.java | 12 +-
.../html/form/imagebutton/ImageButtonTest.java | 6 +-
.../imagebutton/InvalidImageButtonTest.java | 6 +-
.../html/form/imagebutton/PubApplication.java | 2 +-
.../markup/html/form/login/InterceptTest.java | 21 +-
.../markup/html/form/login/MockLoginPage.java | 2 +-
.../OnFormValidateModelObjectsPage.java | 4 +-
.../html/form/panelBorder/TestHomePage.java | 8 +-
.../form/panelBorder/TestHomePage_2134.java | 12 +-
.../markup/html/form/submitlink/HomePage.java | 16 +-
.../html/form/submitlink/TestHomePage.java | 40 +-
.../html/form/upload/FileUploadErrorTest.java | 32 +-
.../html/form/upload/FileUploadFieldTest.java | 19 +-
.../form/upload/FileUploadServletPartTest.java | 29 +-
.../markup/html/form/upload/FileUploadTest.java | 13 +-
.../upload/MockPageWithFormAndUploadField.java | 4 +-
.../form/upload/MultiFileUploadFieldTest.java | 19 +-
.../validation/FormValidatorBehaviorTest.java | 21 +-
.../markup/html/form/validation/HomePage.java | 2 +-
.../html/form/validation/HomePageTest.java | 34 +-
.../markup/html/form/validation/MyBorder.java | 2 +-
.../form/validation/innerfeedback/BasePage.java | 2 +-
.../innerfeedback/InnerFeedbackTest.java | 6 +-
.../wicket/markup/html/header/BasePanel.java | 2 +-
.../markup/html/header/HeaderScopingTest.java | 8 +-
.../header/inheritance/InheritanceHeadTest.java | 8 +-
.../html/header/response/PanelWithHeader.java | 2 +-
.../markup/html/header/testing/HeaderTest.java | 6 +-
.../html/header/testing/TestBasePanel.java | 2 +-
.../markup/html/header/testing2/HeaderTest.java | 8 +-
.../html/header/testing2/TestBasePage.java | 2 +-
.../markup/html/header/testing3/HeaderTest.java | 6 +-
.../markup/html/header/testing3/TestPage.java | 2 +-
.../header/threelayers/AbstractBasePage.java | 2 +-
.../header/threelayers/AbstractMeldingPage.java | 2 +-
.../header/threelayers/AbstractSecurePage.java | 2 +-
.../header/threelayers/InheritanceHeadTest.java | 6 +-
.../header/threelayers2/AbstractBasePage.java | 2 +-
.../threelayers2/AbstractMeldingPage.java | 2 +-
.../header/threelayers2/AbstractSecurePage.java | 2 +-
.../threelayers2/InheritanceHeadTest.java | 6 +-
.../markup/html/image/AjaxUpdatedImageTest.java | 19 +-
.../markup/html/image/ExternalImageTest.java | 30 +-
.../html/image/ExternalImageTestPage.java | 2 +-
.../wicket/markup/html/image/ImageTest.java | 6 +-
.../markup/html/image/InlineImageTest.java | 15 +-
.../markup/html/image/InvalidImageTest.java | 6 +-
.../markup/html/image/NonCachingImageTest.java | 8 +-
.../markup/html/image/PubApplication.java | 2 +-
.../markup/html/image/ResponsiveImageTest.java | 41 +-
.../markup/html/internal/AjaxEnclosureTest.java | 29 +-
.../wicket/markup/html/internal/BasePage.java | 2 +-
.../markup/html/internal/EnclosurePage_9.java | 2 +-
.../markup/html/internal/EnclosureTest.java | 57 +-
.../html/internal/HeaderResponseTest.java | 58 +-
.../html/internal/HtmlHeaderContainerTest.java | 10 +-
.../html/internal/InlineEnclosureTest.java | 21 +-
.../InlineEnclosureWithWicketMessagePage.java | 2 +-
.../html/internal/ListViewInContainerPage.java | 4 +-
.../markup/html/internal/TogglePageTest.java | 26 +-
.../internal/TraditionalEnclosureAjaxPage.java | 14 +-
.../html/internal/headeritems/BasePage.java | 2 +-
.../headeritems/BasePageWithHeaderItems.java | 2 +-
.../HtmlHeaderItemsContainerTest.java | 158 +++--
.../PageExtendingBasePageWithHeaderItems.java | 2 +-
.../html/internal/headeritems/PanelA.java | 2 +-
.../markup/html/link/AbstractLinkTest.java | 17 +-
.../wicket/markup/html/link/AutolinkTest.java | 16 +-
.../link/BookmarkableHomePageLinksTest.java | 6 +-
.../html/link/BookmarkablePageLinkTest.java | 17 +-
.../html/link/ClientSideImageMapTest.java | 6 +-
.../markup/html/link/DownloadLinkTest.java | 19 +-
.../markup/html/link/ExternalLinkTest.java | 8 +-
.../wicket/markup/html/link/HrefTest.java | 12 +-
.../markup/html/link/MountedPageLinkTest.java | 96 +--
.../wicket/markup/html/link/PageWithLink.java | 5 +-
.../html/link/submitLink/FormPage2Test.java | 38 +-
.../html/link/submitLink/FormPageTest.java | 38 +-
.../list/IncrementalTableNavigationTest.java | 6 +-
.../wicket/markup/html/list/ListViewTest.java | 14 +-
.../html/list/PagedTableNavigatorTest.java | 10 +-
...agedTableNavigatorWithLabelProviderTest.java | 10 +-
.../list/PagedTableNavigatorWithMarginTest.java | 10 +-
.../markup/html/list/SimpleTableTest.java | 12 +-
.../wicket/markup/html/list/TableTest.java | 11 +-
.../markup/html/markupId/TestHomePage.java | 6 +-
.../markup/html/markupId/WicketApplication.java | 2 +-
.../html/media/MediaComponentsApplication.java | 2 +-
.../wicket/markup/html/media/MediaTagsTest.java | 25 +-
.../paging/AbstractPagingNavigationTest.java | 13 +-
.../PagingNavigationIncrementLinkTest.java | 21 +-
.../paging/PagingNavigationLinkTest.java | 65 +-
.../wicket/markup/html/page/TestHomePage.java | 6 +-
.../markup/html/panel/FeedbackPanelTest.java | 10 +-
.../html/panel/FencedFeedbackPanelTest.java | 27 +-
.../wicket/markup/html/panel/FragmentTest.java | 9 +-
.../markup/html/panel/FragmentTestPanel.java | 2 +-
.../markup/html/panel/FragmentTestPanel_2.java | 2 +-
.../markup/html/panel/InlinePanelPage_5.java | 2 +-
.../markup/html/panel/InlinePanelPage_8.java | 4 +-
.../wicket/markup/html/panel/PanelTest.java | 40 +-
.../markup/html/tags/InputTagNotClosedTest.java | 8 +-
.../OutputTransformerContainerTest.java | 10 +-
.../wicket/markup/parser/MergedMarkupTest.java | 10 +-
.../parser/RelativePathPrefixHandlerTest.java | 10 +-
.../wicket/markup/parser/TestHomePage.java | 6 +-
.../wicket/markup/parser/XmlPullParserTest.java | 35 +-
.../parser/filter/AbstractTest14WebPage.java | 2 +-
.../markup/parser/filter/CustomMarkupLabel.java | 4 +-
.../parser/filter/DoubleHeaderPartPageTest.java | 6 +-
.../parser/filter/HeaderSectionBasePage_12.java | 2 +-
.../parser/filter/HeaderSectionPage_20.java | 4 +-
.../markup/parser/filter/HeaderSectionTest.java | 57 +-
.../markup/parser/filter/HtmlHandlerTest.java | 6 +-
.../filter/HtmlHeaderSectionHandlerTest.java | 17 +-
.../parser/filter/OpenCloseTagExpanderTest.java | 23 +-
.../filter/StyleAndScriptIdentifierTest.java | 13 +-
.../ChildFirstHeaderRenderStrategyTest.java | 26 +-
.../markup/resolver/AutoLinkResolverTest.java | 9 +-
.../markup/resolver/SimpleBasePage_6.java | 2 +-
.../wicket/markup/resolver/TestHomePage.java | 8 +-
.../resolver/WicketContainerResolverTest.java | 6 +-
.../resolver/WicketMessageResolverTest.java | 25 +-
.../wicket/markup/resolver/border/BasePage.java | 4 +-
.../border/WicketMessageResolverTest.java | 6 +-
.../AutoLinkResolveInParentsMarkupTest.java | 6 +-
.../markup/resolver/issue3559/BasePage.java | 2 +-
.../markup/resolver/issue3559/MyTest.java | 8 +-
.../resolver/issue3559/WicketApplication.java | 2 +-
.../resolver/issue3989/Issue3989Test.java | 6 +-
.../markup/resolver/issue5569/HomePage.java | 2 +-
.../resolver/issue5569/Issue5569Test.java | 6 +-
.../AbstractTransformerBehaviorTest.java | 10 +-
.../markupFragments/MarkupFragmentTest.java | 22 +-
.../AbstractPropertyModelObjectClassTest.java | 17 +-
.../apache/wicket/model/ChainingModelTest.java | 27 +-
.../wicket/model/CompoundPropertyModelTest.java | 6 +-
.../CompoundPropertyModelTwoLevelsDeepPage.java | 6 +-
.../org/apache/wicket/model/DetachableTest.java | 9 +-
.../java/org/apache/wicket/model/HomePage.java | 2 +-
.../org/apache/wicket/model/IModelTest.java | 129 ++--
.../apache/wicket/model/InheritedModelTest.java | 14 +-
.../apache/wicket/model/LambdaModelTest.java | 39 +-
.../model/LoadableDetachableModelTest.java | 44 +-
.../apache/wicket/model/ModelDetachTest.java | 41 +-
.../apache/wicket/model/ModelToStringTest.java | 18 +-
.../apache/wicket/model/PropertyModelTest.java | 38 +-
.../wicket/model/PropertyModelWithListTest.java | 21 +-
.../apache/wicket/model/ResourceModelTest.java | 12 +-
.../wicket/model/StringResourceModelTest.java | 156 +++--
.../org/apache/wicket/model/TestHomePage.java | 6 +-
.../wicket/noheadnobody/NoHeadNoBodyTest.java | 13 +-
.../wicket/page/PageAccessSynchronizerTest.java | 46 +-
.../wicket/page/PersistentPageManagerTest.java | 28 +-
.../wicket/page/XmlPartialPageUpdateTest.java | 15 +-
.../PageExpirationRecoveryTest.java | 75 ++-
.../persistent/disk/PageWindowManagerTest.java | 26 +-
.../wicket/pageStore/AbstractPageStoreTest.java | 46 +-
.../pageStore/AsynchronousDataStoreTest.java | 8 +-
.../pageStore/AsynchronousPageStoreTest.java | 26 +-
.../wicket/pageStore/DiskDataStoreTest.java | 31 +-
.../apache/wicket/pageStore/NoopDataStore.java | 2 +-
.../pageStore/PerSessionPageStoreTest.java | 8 +-
.../memory/DummyPageManagerContext.java | 4 +-
.../memory/HttpSessionDataStoreTest.java | 34 +-
.../memory/MemorySizeEvictionStrategyTest.java | 23 +-
.../memory/PageNumberEvictionStrategyTest.java | 25 +-
.../wicket/pageStore/memory/PageTableTest.java | 12 +-
.../wicket/properties/MyTesterApplication.java | 2 +-
.../wicket/properties/PropertiesTest.java | 10 +-
.../org/apache/wicket/properties/TestPage.java | 2 +-
.../http/AbstractRequestLoggerTest.java | 8 +-
.../protocol/http/BufferedWebResponseTest.java | 7 +-
.../protocol/http/ClientPropertiesTest.java | 25 +-
.../CsrfPreventionRequestCycleListenerTest.java | 66 +-
.../http/HeaderBufferingWebResponseTest.java | 14 +-
.../protocol/http/ModifyCookiePageTest.java | 10 +-
.../http/RequestLoggerLiveSessionsTest.java | 17 +-
.../wicket/protocol/http/RequestUtilsTest.java | 35 +-
.../protocol/http/ResponseIOExceptionTest.java | 32 +-
.../protocol/http/SessionDestroyTest.java | 16 +-
.../protocol/http/StoredResponsesMapTest.java | 38 +-
.../protocol/http/WebApplicationTest.java | 191 +++---
.../protocol/http/WebExternalResourceTest.java | 25 +-
.../http/WebResponseExceptionsTest.java | 16 +-
.../wicket/protocol/http/WebSessionTest.java | 9 +-
.../wicket/protocol/http/WicketFilterTest.java | 77 +--
.../wicket/protocol/http/WicketURLTest.java | 15 +-
.../wicket/protocol/http/mock/CookiesTest.java | 10 +-
.../http/mock/MockHttpServletRequestTest.java | 44 +-
.../http/mock/MockHttpServletResponseTest.java | 25 +-
.../CryptedUrlWebRequestCodingStrategyTest.java | 12 +-
.../http/request/WebClientInfoTest.java | 43 +-
...dRemoteAddressRequestWrapperFactoryTest.java | 9 +-
.../http/servlet/ServletWebRequestTest.java | 27 +-
.../http/servlet/ServletWebResponseTest.java | 19 +-
.../http/servlet/WicketSessionFilterTest.java | 23 +-
.../servlet/XForwardedRequestWrapperTest.java | 31 +-
.../protocol/https/HttpsMapperApplication.java | 2 +-
.../https/HttpsMapperApplicationTest.java | 22 +-
.../wicket/protocol/https/HttpsMapperTest.java | 66 +-
.../ComponentQueueingPerformanceTest.java | 40 +-
.../wicket/queueing/ComponentQueueingTest.java | 153 ++---
.../java/org/apache/wicket/queueing/Path.java | 6 +-
.../wicket/queueing/bodyisachild/FormGroup.java | 22 +-
.../queueing/bodyisachild/LoginPanel.java | 6 +-
.../queueing/transparentresolvers/BasePage.java | 2 +-
...eueingTransparentWebMarkupContainerTest.java | 10 +-
.../queueing/transparentresolvers/HtmlTag.java | 2 +-
.../redirect/RestartWithMountedPageTest.java | 6 +-
.../redirect/abort/AbortExceptionTest.java | 20 +-
.../redirect/intercept/InterceptTest.java | 8 +-
...equestCycleListenerCallOrderApplication.java | 2 +-
.../MultiRequestCycleListenerCallOrderTest.java | 19 +-
.../cycle/PageRequestHandlerTrackerTest.java | 23 +-
.../RequestCycleListenerDetachOrderTest.java | 10 +-
.../request/cycle/RequestCycleListenerTest.java | 30 +-
.../request/cycle/RequestCycleUrlForTest.java | 26 +-
.../cycle/RequestHandlerExecutorTest.java | 6 +-
.../wicket/request/cycle/RerenderPageTest.java | 9 +-
.../wicket/request/cycle/UrlRendererTest.java | 105 +--
.../request/handler/PageIdPoliticTest.java | 28 +-
.../request/handler/PageProviderTest.java | 31 +-
.../handler/render/AbstractVariations.java | 4 +-
.../render/ShouldRedirectToTargetUrl.java | 16 +-
...uldRenderPageAndWriteResponseVariations.java | 18 +-
.../SkipRenderWithSetResponsePageTest.java | 12 +-
...elessPageManipulatingPageParametersTest.java | 14 +-
.../request/handler/render/TestVariations.java | 37 +-
.../handler/render/VariationIterator.java | 4 +-
.../handler/render/WebPageRendererTest.java | 129 ++--
.../resource/ResourceAuthorizationTest.java | 33 +-
.../request/mapper/CustomHomePageTest.java | 8 +-
.../request/mapper/info/ComponentInfoTest.java | 30 +-
.../mapper/info/PageComponentInfoTest.java | 17 +-
.../request/resource/ByteArrayResourceTest.java | 17 +-
.../resource/CharSequenceResourceTest.java | 19 +-
.../ContextRelativeResourceReferenceTest.java | 30 +-
.../resource/CssPackageResourceTest.java | 12 +-
.../resource/DynamicImageResourceTest.java | 14 +-
.../resource/JavaScriptPackageResourceTest.java | 14 +-
.../resource/LessResourceReferenceTest.java | 15 +-
.../MetaInfStaticResourceReferenceTest.java | 34 +-
.../MinifiedAwareResourceReferenceTest.java | 22 +-
.../resource/PackageResourceReferenceTest.java | 71 +-
.../request/resource/ResouceBundleTest.java | 18 +-
.../resource/ResourceReferenceLambdaTest.java | 8 +-
.../resource/ResourceReferenceLocatingTest.java | 192 +++---
.../resource/ResourceReferenceRegistryTest.java | 23 +-
.../resource/UrlResourceReferenceTest.java | 27 +-
.../request/resource/WriteCallbackTest.java | 12 +-
.../ContextRelativeResourceCachingTest.java | 14 +-
...eWithVersionResourceCachingStrategyTest.java | 17 +-
...gWithVersionResourceCachingStrategyTest.java | 18 +-
.../ApplicationStringResourceLoaderTest.java | 8 +-
.../BundleStringResourceLoaderTest.java | 20 +-
.../ComponentStringResourceLoaderTest.java | 48 +-
.../wicket/resource/CssUrlReplacerTest.java | 36 +-
.../FileSystemResourceReferenceTest.java | 35 +-
.../wicket/resource/PageWithUTF8Properties.java | 2 +-
.../wicket/resource/PageWithXmlProperties.java | 2 +-
.../wicket/resource/ResourceUtilTest.java | 17 +-
.../resource/StringResourceLoaderTestBase.java | 53 +-
.../TextTemplateResourceReferenceTest.java | 9 +-
.../UtfPropertiesFilePropertiesLoaderTest.java | 6 +-
.../resource/XmlFilePropertiesLoaderTest.java | 7 +-
.../ResourceAggregatorRenderTest.java | 8 +-
.../aggregator/ResourceAggregatorTest.java | 66 +-
.../aggregator/ResourceAggregatorTest1Page.java | 2 +-
.../resource/aggregator/TestHeaderResponse.java | 4 +-
.../resource/bundles/CompressBundlesTest.java | 10 +-
.../loader/ClassStringResourceLoaderTest.java | 8 +-
.../ComponentStringResourceLoaderTest.java | 14 +-
.../wicket/resource/loader/FooInitializer.java | 2 +-
.../InitializerStringResourceLoaderTest.java | 2 +
.../loader/NestedStringResourceLoaderTest.java | 10 +-
.../loader/PackageStringResourceLoaderTest.java | 15 +-
.../resource/loader/PropertiesResolverTest.java | 25 +-
.../ValidatorStringResourceLoaderTest.java | 10 +-
.../apache/wicket/resource/loader/XmlPage.java | 2 +-
.../PreserveCookieForTheNextHandlerTest.java | 15 +-
.../response/filter/ResponseFilterTest.java | 30 +-
.../filter/XmlCleaningResponseFilterTest.java | 22 +-
.../serialize/java/JavaSerializerTest.java | 32 +-
.../session/BindSessionOnRedirectTest.java | 19 +-
.../wicket/session/DefaultPageFactoryTest.java | 293 +++++----
.../wicket/settings/DebugSettingsTest.java | 8 +-
...nSettingsNotRenderableErrorStrategyTest.java | 26 +-
.../wicket/settings/ISecuritySettingsTest.java | 39 +-
.../def/SetCustomResourceSettingsTest.java | 20 +-
.../wicket/stateless/ImageStatelessTest.java | 14 +-
.../stateless/StatelessComponentTest.java | 17 +-
.../stateless/StatelessDynmicLinksTest.java | 8 +-
.../wicket/stateless/StatelessFormTest.java | 15 +-
.../wicket/stateless/StatelessFormUrlTest.java | 12 +-
.../StatelessPageWithFeedbackTest.java | 14 +-
.../wicket/stateless/TemporarySessionTest.java | 9 +-
.../pages/RefreshStatelessPageTest.java | 8 +-
.../stateless/pages/StatelessFormTest.java | 6 +-
.../pages/UsernamePasswordSignInPanel.java | 4 +-
.../apache/wicket/util/ExceptionTestBase.java | 41 +-
.../apache/wicket/util/Log4jEventHistory.java | 2 +-
.../wicket/util/cookies/CookieUtilsTest.java | 25 +-
.../cookies/CookieValuePersisterTestPage.java | 2 +-
...PreserveRequestCookieAfterLinkClickTest.java | 14 +-
.../SetCookieAndRedirectStatefullTestPage.java | 2 +-
.../SetCookieAndRedirectStatelessTestPage.java | 2 +-
.../util/cookies/SetCookieAndRedirectTest.java | 11 +-
.../util/file/WebApplicationPathTest.java | 12 +-
.../wicket/util/io/SerializableCheckerTest.java | 70 +-
.../org/apache/wicket/util/lang/Country2.java | 2 +-
.../org/apache/wicket/util/lang/Document.java | 2 +-
.../wicket/util/lang/PropertyResolverTest.java | 108 +--
.../wicket/util/lang/WicketObjectsTest.java | 27 +-
.../util/markup/xhtml/WellFormedXmlTest.java | 4 +-
.../apache/wicket/util/resource/PathTest.java | 68 +-
.../resource/ResourceStreamLocatorTest.java | 20 +-
.../util/resource/UrlResourceStreamTest.java | 15 +-
.../CachingResourceStreamLocatorTest.java | 39 +-
.../locator/ResourceNameIteratorTest.java | 19 +-
.../util/string/JavaScriptStripperTest.java | 37 +-
.../PropertyVariableInterpolatorTest.java | 15 +-
.../wicket/util/template/CssTemplateTest.java | 6 +-
.../apache/wicket/util/tester/CookiePage.java | 5 +-
.../util/tester/FormTesterSubmitLinkTest.java | 15 +-
.../wicket/util/tester/FormTesterTest.java | 85 +--
.../wicket/util/tester/MockFormSubmitsPage.java | 4 +-
...ckPageWithFormAndAjaxFormSubmitBehavior.java | 2 +-
.../tester/MockPageWithLabelInEnclosure.java | 3 +-
.../util/tester/MockResourceLinkPage.java | 2 +-
...tartComponentInPageRedirectToRenderTest.java | 6 +-
.../wicket/util/tester/TagTesterTest.java | 79 +--
.../WicketTesterClickExternalLinkTest.java | 6 +-
.../util/tester/WicketTesterCookieTest.java | 324 +++++----
.../WicketTesterLazyIsPageStatelessBase.java | 8 +-
...ketTesterLazyIsPageStatelessOnePassTest.java | 2 +-
...LazyIsPageStatelessRedirectToBufferTest.java | 6 +-
...LazyIsPageStatelessRedirectToRenderTest.java | 2 +-
.../tester/WicketTesterSessionCreationTest.java | 10 +-
.../WicketTesterSessionInvalidateTest.java | 11 +-
.../wicket/util/tester/WicketTesterTest.java | 238 ++++---
.../wicket/util/tester/apps_1/CreateBook.java | 2 +-
.../apache/wicket/util/tester/apps_2/Test.java | 11 +-
.../util/tester/apps_3/FormTesterTest.java | 30 +-
.../util/tester/apps_4/FormTesterTest.java | 11 +-
.../util/tester/apps_5/AjaxLinkClickTest.java | 21 +-
.../tester/apps_5/AjaxSubmitLinkClickTest.java | 19 +-
.../wicket/util/tester/apps_7/TestHomePage.java | 6 +-
.../util/tester/apps_7/WicketApplication.java | 2 +-
.../apps_8/TestResourceProvidingLabel.java | 2 +-
.../validation/CompoundValidatorTest.java | 6 +-
.../wicket/validation/ValidationErrorTest.java | 15 +-
.../validation/ValidatorBehaviorTest.java | 16 +-
.../validator/CreditCardValidatorTest.java | 15 +-
.../validator/EmailValidatorTest.java | 16 +-
.../validator/RangeValidatorTest.java | 18 +-
.../validation/validator/UrlValidatorTest.java | 58 +-
.../wicket/versioning/PageVersioningTest.java | 24 +-
615 files changed, 7717 insertions(+), 6806 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8edc8af..df3df06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -500,6 +500,23 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>3.11.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>java-hamcrest</artifactId>
+ <version>2.0.0.0</version>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jmx</artifactId>
<version>${jetty.version}</version>
@@ -1190,7 +1207,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <excludedGroups>org.apache.wicket.util.SlowTests</excludedGroups>
+ <excludedGroups>org.apache.wicket.util.WicketTestTag</excludedGroups>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml
index e19d904..7963d34 100644
--- a/wicket-core/pom.xml
+++ b/wicket-core/pom.xml
@@ -52,6 +52,21 @@
<artifactId>openjson</artifactId>
</dependency>
<dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>java-hamcrest</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-request</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
index a835c6c..532cd10 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.util.tester;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.io.IOException;
import java.io.Serializable;
import java.lang.reflect.Constructor;
@@ -31,7 +34,6 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.regex.Pattern;
-
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
import javax.servlet.http.Cookie;
@@ -132,11 +134,10 @@ import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.time.Duration;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
+import org.opentest4j.AssertionFailedError;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import junit.framework.AssertionFailedError;
-
/**
* A helper class to ease unit testing of Wicket applications without the need for a servlet
* container. See javadoc of <code>WicketTester</code> for example usage. This class can be used as
@@ -724,7 +725,7 @@ public class BaseWicketTester
{
if (redirectCount++ >= 100)
{
- fail("Possible infinite redirect detected. Bailing out.");
+ throw new AssertionFailedError("Possible infinite redirect detected. Bailing out.");
}
Url newUrl = Url.parse(lastResponse.getRedirectLocation(),
@@ -1085,7 +1086,6 @@ public class BaseWicketTester
* (with an optional redirect - depending on {@link RenderStrategy}).
*
* @param component
- * @param listener
*/
public void executeListener(final Component component)
{
@@ -1122,7 +1122,6 @@ public class BaseWicketTester
* (with an optional redirect - depending on {@link RenderStrategy}).
*
* @param component
- * @param listener
*/
public void invokeListener(final Component component)
{
@@ -1144,7 +1143,7 @@ public class BaseWicketTester
* (with an optional redirect - depending on {@link RenderStrategy}).
*
* @param component
- * @param listener
+ * @param behavior
*/
public void invokeListener(Component component, final Behavior behavior)
{
@@ -2510,7 +2509,7 @@ public class BaseWicketTester
{
// The form that needs to be "submitted".
Form<?> form = behavior.getForm();
- assertNotNull("No form attached to the submitlink.", form);
+ assertNotNull(form, "No form attached to the submitlink.");
checkUsability(form, true);
serializeFormToRequest(form);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/main/java/org/apache/wicket/util/tester/DiffUtil.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/DiffUtil.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/DiffUtil.java
index 1d8aa02..309653e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/DiffUtil.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/DiffUtil.java
@@ -16,13 +16,14 @@
*/
package org.apache.wicket.util.tester;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
import java.net.URL;
-import org.junit.Assert;
import org.apache.wicket.markup.MarkupParser;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.util.diff.Diff;
@@ -157,7 +158,7 @@ public final class DiffUtil
if (failWithAssert)
{
- Assert.assertEquals(filename, reference, document);
+ assertEquals(reference, document, filename);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java
index d1780ea..e5d71a6 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.util.tester;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -33,12 +34,12 @@ import org.apache.wicket.markup.html.form.Check;
import org.apache.wicket.markup.html.form.CheckGroup;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.FormComponent;
+import org.apache.wicket.markup.html.form.FormComponentUpdatingBehavior;
import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.markup.html.form.IFormSubmittingComponent;
import org.apache.wicket.markup.html.form.ListMultipleChoice;
import org.apache.wicket.markup.html.form.Radio;
import org.apache.wicket.markup.html.form.RadioGroup;
-import org.apache.wicket.markup.html.form.FormComponentUpdatingBehavior;
import org.apache.wicket.markup.html.form.upload.FileUploadField;
import org.apache.wicket.markup.html.form.upload.MultiFileUploadField;
import org.apache.wicket.protocol.http.mock.MockHttpServletRequest;
@@ -49,8 +50,6 @@ import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
/**
* A helper class for testing validation and submission of <code>FormComponent</code>s.
*
@@ -581,8 +580,7 @@ public class FormTester
public FormTester setValue(final String formComponentId, final String value)
{
Component component = workingForm.get(formComponentId);
- assertNotNull("Unable to set value. Couldn't find component with name: " +
- formComponentId, component);
+ assertNotNull(component, "Unable to set value. Couldn't find component with name: " + formComponentId);
return setValue(component, value);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTestCase.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTestCase.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTestCase.java
index 43169e1..294b111 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTestCase.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTestCase.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.util.tester;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.io.IOException;
import java.util.Locale;
@@ -27,9 +29,8 @@ import org.apache.wicket.markup.IMarkupFragment;
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
/**
* Base class for tests which require comparing wicket response with a file.
@@ -37,15 +38,14 @@ import org.junit.Before;
* To create/replace the expected result file with the new content, define the system property like
* -Dwicket.replace.expected.results=true
*/
-public abstract class WicketTestCase extends Assert
+public abstract class WicketTestCase
{
/** */
public WicketTester tester;
/**
- * @see junit.framework.TestCase#setUp()
*/
- @Before
+ @BeforeEach
public void commonBefore()
{
// make sure no leaked threadlocals are present
@@ -83,7 +83,7 @@ public abstract class WicketTestCase extends Assert
/**
*
*/
- @After
+ @AfterEach
public void commonAfter()
{
tester.destroy();
@@ -178,7 +178,7 @@ public abstract class WicketTestCase extends Assert
* @param scopeClass
* @throws IOException
*/
- public final void compareMarkupWithFile(IMarkupFragment markup, String filename, Class<?> scopeClass)
+ protected final void compareMarkupWithFile(IMarkupFragment markup, String filename, Class<?> scopeClass)
throws IOException
{
String doc = markup.toString(true);
@@ -190,11 +190,8 @@ public abstract class WicketTestCase extends Assert
*
* @param markup
* @param testMarkup
- * @throws IOException
*/
- public final void compareMarkupWithString(IMarkupFragment markup, String testMarkup)
- throws IOException
- {
+ protected final void compareMarkupWithString(IMarkupFragment markup, String testMarkup) {
testMarkup = testMarkup.replaceAll("\r", "");
testMarkup = testMarkup.replaceAll("\n", "");
testMarkup = testMarkup.replaceAll("\t", "");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
index f94304f..7420526 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
@@ -16,6 +16,18 @@
*/
package org.apache.wicket.util.tester;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import javax.servlet.ServletContext;
+
import org.apache.commons.collections4.CollectionUtils;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
@@ -42,18 +54,6 @@ import org.opentest4j.AssertionFailedError;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.ServletContext;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
/**
* A helper class to ease unit testing of Wicket applications without the need for a servlet
* container. To start a test, either use <code>startPage</code> or <code>startPanel</code>:
@@ -147,16 +147,14 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
*
* Cookie handling:
*
- * There are some expectations about wicket tester cookie handling which should match as best as
- * it can be with a real client server request response cycle:
- * - all valid cookies set before a request is made (tester.getRequest().addCookie()) should
- * appear in the page request
- * - all cookies set in the response should appear in the last response (tester.getLastResponse())
- * after the request is made (expired cookies and others)
- * - all cookies set in the response should appear even after a redirect response is made
- * until the final response (tester.getLastResponse()) is written to the client (wicket tester)
- * - all valid cookies (maxAge!=0) from the last response should be added to
- * the next request cookies (tester.getRequest().getCookies())
+ * There are some expectations about wicket tester cookie handling which should match as best as it
+ * can be with a real client server request response cycle: - all valid cookies set before a request
+ * is made (tester.getRequest().addCookie()) should appear in the page request - all cookies set in
+ * the response should appear in the last response (tester.getLastResponse()) after the request is
+ * made (expired cookies and others) - all cookies set in the response should appear even after a
+ * redirect response is made until the final response (tester.getLastResponse()) is written to the
+ * client (wicket tester) - all valid cookies (maxAge!=0) from the last response should be added to
+ * the next request cookies (tester.getRequest().getCookies())
*
*
* TODO General: Example usage of FormTester
@@ -259,19 +257,41 @@ public class WicketTester extends BaseWicketTester
}
/**
+ * Returns the current Maven build directory taken from the <tt>basedir</tt> system property, or
+ * null if not set
+ *
+ * @return path with a trailing slash
+ */
+ public static String getBasedir()
+ {
+ String basedir = System.getProperty("basedir");
+ if (basedir != null)
+ {
+ basedir = basedir + "/";
+ }
+ else
+ {
+ basedir = "";
+ }
+ return basedir;
+ }
+
+ /**
* Asserts that the Ajax location header is present.
*/
public void assertAjaxLocation()
{
if (null != getLastResponse().getHeader("Location"))
{
- throw new AssertionFailedError("Location header should *not* be present when using Ajax");
+ throw new AssertionFailedError(
+ "Location header should *not* be present when using Ajax");
}
String ajaxLocation = getLastResponse().getHeader("Ajax-Location");
if (null == ajaxLocation)
{
- throw new AssertionFailedError("Ajax-Location header should be present when using Ajax");
+ throw new AssertionFailedError(
+ "Ajax-Location header should be present when using Ajax");
}
int statusCode = getLastResponse().getStatus();
@@ -295,8 +315,7 @@ public class WicketTester extends BaseWicketTester
}
/**
- * Asserts that the <code>Component</code> a the given path has a behavior
- * of the given type.
+ * Asserts that the <code>Component</code> a the given path has a behavior of the given type.
*
* @param path
* path to <code>Component</code>
@@ -310,14 +329,14 @@ public class WicketTester extends BaseWicketTester
Component component = assertExists(path);
List<? extends Behavior> behaviors = component.getBehaviors(expectedBehaviorClass);
final String message = String.format("Component '%s' has no behaviors of type '%s'",
- component.getPageRelativePath(), expectedBehaviorClass);
+ component.getPageRelativePath(), expectedBehaviorClass);
assertResult(new Result(CollectionUtils.isEmpty(behaviors), message));
}
/**
* Tests that a <code>Component</code> has been added to a <code>AjaxRequestTarget</code>, using
- * {@link org.apache.wicket.ajax.AjaxRequestTarget#add(Component...)}. This method actually tests that a
- * <code>Component</code> is on the Ajax response sent back to the client.
+ * {@link org.apache.wicket.ajax.AjaxRequestTarget#add(Component...)}. This method actually
+ * tests that a <code>Component</code> is on the Ajax response sent back to the client.
* <p>
* PLEASE NOTE! This method doesn't actually insert the <code>Component</code> in the client DOM
* tree, using JavaScript. But it shouldn't be needed because you just have to trust that Wicket
@@ -334,8 +353,8 @@ public class WicketTester extends BaseWicketTester
/**
* Tests that a <code>Component</code> has been added to a <code>AjaxRequestTarget</code>, using
- * {@link org.apache.wicket.ajax.AjaxRequestTarget#add(Component...)}. This method actually tests that a
- * <code>Component</code> is on the Ajax response sent back to the client.
+ * {@link org.apache.wicket.ajax.AjaxRequestTarget#add(Component...)}. This method actually
+ * tests that a <code>Component</code> is on the Ajax response sent back to the client.
* <p>
* PLEASE NOTE! This method doesn't actually insert the <code>Component</code> in the client DOM
* tree, using JavaScript. But it shouldn't be needed because you just have to trust that Wicket
@@ -376,9 +395,9 @@ public class WicketTester extends BaseWicketTester
* Asserts that a component's markup has loaded with the given variation
*
* @param component
- * The component which markup to check
+ * The component which markup to check
* @param expectedVariation
- * The expected variation of the component's markup
+ * The expected variation of the component's markup
*/
public void assertMarkupVariation(Component component, String expectedVariation)
{
@@ -388,7 +407,8 @@ public class WicketTester extends BaseWicketTester
String actualVariation = markup.getMarkupResourceStream().getVariation();
if (Objects.equal(expectedVariation, actualVariation) == false)
{
- result = Result.fail(String.format("Wrong variation for component '%s'. Actual: '%s', expected: '%s'",
+ result = Result.fail(
+ String.format("Wrong variation for component '%s'. Actual: '%s', expected: '%s'",
component.getPageRelativePath(), actualVariation, expectedVariation));
}
@@ -399,10 +419,10 @@ public class WicketTester extends BaseWicketTester
* Asserts that a component's markup has loaded with the given style.
*
* @param component
- * The component which markup to check
+ * The component which markup to check
* @param expectedStyle
- * The expected style of the component's markup.
- * For example: <em>green</em> in <code>MyPanel_green.html</code>
+ * The expected style of the component's markup. For example: <em>green</em> in
+ * <code>MyPanel_green.html</code>
*/
public void assertMarkupStyle(Component component, String expectedStyle)
{
@@ -412,7 +432,8 @@ public class WicketTester extends BaseWicketTester
String actualStyle = markup.getMarkupResourceStream().getStyle();
if (Objects.equal(expectedStyle, actualStyle) == false)
{
- result = Result.fail(String.format("Wrong style for component '%s'. Actual: '%s', expected: '%s'",
+ result = Result
+ .fail(String.format("Wrong style for component '%s'. Actual: '%s', expected: '%s'",
component.getPageRelativePath(), actualStyle, expectedStyle));
}
@@ -423,9 +444,9 @@ public class WicketTester extends BaseWicketTester
* Asserts that a component's markup has loaded with the given locale
*
* @param component
- * The component which markup to check
+ * The component which markup to check
* @param expectedLocale
- * The expected locale of the component's markup
+ * The expected locale of the component's markup
*/
public void assertMarkupLocale(Component component, Locale expectedLocale)
{
@@ -435,7 +456,8 @@ public class WicketTester extends BaseWicketTester
Locale actualLocale = markup.getMarkupResourceStream().getLocale();
if (Objects.equal(expectedLocale, actualLocale) == false)
{
- result = Result.fail(String.format("Wrong locale for component '%s'. Actual: '%s', expected: '%s'",
+ result = Result
+ .fail(String.format("Wrong locale for component '%s'. Actual: '%s', expected: '%s'",
component.getPageRelativePath(), actualLocale, expectedLocale));
}
@@ -447,7 +469,7 @@ public class WicketTester extends BaseWicketTester
IMarkupFragment markup = null;
if (component instanceof MarkupContainer)
{
- markup = ((MarkupContainer) component).getAssociatedMarkup();
+ markup = ((MarkupContainer)component).getAssociatedMarkup();
}
if (markup == null)
@@ -457,7 +479,8 @@ public class WicketTester extends BaseWicketTester
if (markup == null)
{
- throw new AssertionFailedError(String.format("Cannot find the markup of component: %s", component.getPageRelativePath()));
+ throw new AssertionFailedError(String.format("Cannot find the markup of component: %s",
+ component.getPageRelativePath()));
}
return markup;
@@ -471,7 +494,8 @@ public class WicketTester extends BaseWicketTester
*/
public void assertErrorMessages(Serializable... expectedErrorMessages)
{
- assertFeedbackMessages(new ExactLevelFeedbackMessageFilter(FeedbackMessage.ERROR), expectedErrorMessages);
+ assertFeedbackMessages(new ExactLevelFeedbackMessageFilter(FeedbackMessage.ERROR),
+ expectedErrorMessages);
}
/**
@@ -482,7 +506,8 @@ public class WicketTester extends BaseWicketTester
*/
public void assertInfoMessages(Serializable... expectedInfoMessages)
{
- assertFeedbackMessages(new ExactLevelFeedbackMessageFilter(FeedbackMessage.INFO), expectedInfoMessages);
+ assertFeedbackMessages(new ExactLevelFeedbackMessageFilter(FeedbackMessage.INFO),
+ expectedInfoMessages);
}
/**
@@ -493,7 +518,8 @@ public class WicketTester extends BaseWicketTester
* @param expectedMessages
* expected feedback messages
*/
- public void assertFeedbackMessages(IFeedbackMessageFilter filter, Serializable... expectedMessages)
+ public void assertFeedbackMessages(IFeedbackMessageFilter filter,
+ Serializable... expectedMessages)
{
List<FeedbackMessage> feedbackMessages = getFeedbackMessages(filter);
List<Serializable> actualMessages = getActualFeedbackMessages(feedbackMessages);
@@ -504,31 +530,33 @@ public class WicketTester extends BaseWicketTester
* Asserts that there is a feedback message provided by a given component
*
* @param component
- * the component that provided the expected feedback message. Optional.
+ * the component that provided the expected feedback message. Optional.
* @param key
- * the resource key for the feedback message. Mandatory.
+ * the resource key for the feedback message. Mandatory.
* @param model
- * the model used for interpolating the feedback message. Optional.
+ * the model used for interpolating the feedback message. Optional.
* @param filter
- * the filter that decides in which messages to look in. E.g. with a specific
- * level, rendered or not, etc.
+ * the filter that decides in which messages to look in. E.g. with a specific level,
+ * rendered or not, etc.
*/
- public void assertComponentFeedbackMessage(Component component, String key, IModel<?> model, IFeedbackMessageFilter filter)
+ public void assertComponentFeedbackMessage(Component component, String key, IModel<?> model,
+ IFeedbackMessageFilter filter)
{
Args.notNull(key, "key");
- String expectedMessage = getApplication().getResourceSettings().getLocalizer().getString(key, component, model);
+ String expectedMessage = getApplication().getResourceSettings().getLocalizer().getString(
+ key, component, model);
List<FeedbackMessage> feedbackMessages = getFeedbackMessages(filter);
List<Serializable> actualMessages = getActualFeedbackMessages(feedbackMessages);
- assertTrue(actualMessages.contains(expectedMessage),
- String.format("Feedback message with key '%s' cannot be found in %s", key, actualMessages));
+ assertTrue(actualMessages.contains(expectedMessage), String
+ .format("Feedback message with key '%s' cannot be found in %s", key, actualMessages));
}
/**
- * Extracts the actual messages from the passed feedback messages.
- * Specially handles ValidationErrorFeedback messages by extracting their String message
+ * Extracts the actual messages from the passed feedback messages. Specially handles
+ * ValidationErrorFeedback messages by extracting their String message
*
* @param feedbackMessages
* the feedback messages
@@ -571,12 +599,14 @@ public class WicketTester extends BaseWicketTester
final List<FeedbackMessage> renderedMessages = model.getObject();
if (renderedMessages == null)
{
- throw new AssertionFailedError(String.format("feedback panel at path [%s] returned null messages", path));
+ throw new AssertionFailedError(
+ String.format("feedback panel at path [%s] returned null messages", path));
}
if (messages.length != renderedMessages.size())
{
- throw new AssertionFailedError(String.format("you expected '%d' messages for the feedback panel [%s], but there were actually '%d'",
- messages.length, path, renderedMessages.size()));
+ throw new AssertionFailedError(String.format(
+ "you expected '%d' messages for the feedback panel [%s], but there were actually '%d'",
+ messages.length, path, renderedMessages.size()));
}
for (int i = 0; i < messages.length && i < renderedMessages.size(); i++)
{
@@ -832,15 +862,16 @@ public class WicketTester extends BaseWicketTester
}
catch (ClassCastException e)
{
- throw new IllegalArgumentException("Component with id:" + id +
- " is not a BookmarkablePageLink");
+ throw new IllegalArgumentException(
+ "Component with id:" + id + " is not a BookmarkablePageLink");
}
- assertEquals(pageClass,
- pageLink.getPageClass(), "BookmarkablePageLink: " + id + " is pointing to the wrong page");
+ assertEquals(pageClass, pageLink.getPageClass(),
+ "BookmarkablePageLink: " + id + " is pointing to the wrong page");
- assertEquals(parameters, pageLink.getPageParameters(), "One or more of the parameters associated with the BookmarkablePageLink: " +
- id + " do not match");
+ assertEquals(parameters, pageLink.getPageParameters(),
+ "One or more of the parameters associated with the BookmarkablePageLink: " + id +
+ " do not match");
}
/**
@@ -968,24 +999,4 @@ public class WicketTester extends BaseWicketTester
String actualRedirectUrl = getLastResponse().getRedirectLocation();
assertEquals(expectedRedirectUrl, actualRedirectUrl);
}
-
- /**
- * Returns the current Maven build directory taken from the <tt>basedir</tt> system property, or
- * null if not set
- *
- * @return path with a trailing slash
- */
- public static String getBasedir()
- {
- String basedir = System.getProperty("basedir");
- if (basedir != null)
- {
- basedir = basedir + "/";
- }
- else
- {
- basedir = "";
- }
- return basedir;
- }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterExtension.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterExtension.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterExtension.java
new file mode 100644
index 0000000..ed7b240
--- /dev/null
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterExtension.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.util.tester;
+
+import org.junit.jupiter.api.extension.AfterTestExecutionCallback;
+import org.junit.jupiter.api.extension.BeforeTestExecutionCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.TestExecutionExceptionHandler;
+
+/**
+ * Manages {@link WicketTester} instance
+ *
+ * @author igor
+ */
+public class WicketTesterExtension implements BeforeTestExecutionCallback, AfterTestExecutionCallback, TestExecutionExceptionHandler
+{
+ private WicketTester tester;
+
+ /**
+ * Allows setup of the tester instance
+ *
+ * @return tester
+ */
+ protected WicketTester create()
+ {
+ return new WicketTester();
+ }
+
+ /**
+ * Gets the tester instance.
+ *
+ * @return tester instance or {@code null} if called outside the rule's scope
+ */
+ public WicketTester getTester()
+ {
+ return tester;
+ }
+
+ @Override
+ public void beforeTestExecution(ExtensionContext context) {
+ tester = create();
+ }
+
+ @Override
+ public void afterTestExecution(ExtensionContext context) {
+ tester.destroy();
+ tester = null;
+ }
+
+ @Override
+ public void handleTestExecutionException(ExtensionContext context, Throwable throwable) throws Throwable {
+ tester.destroy();
+ tester = null;
+
+ throw throwable;
+ }
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterHelper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterHelper.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterHelper.java
index 1905cb8..2bd94e4 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterHelper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterHelper.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.util.tester;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -30,7 +32,6 @@ import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
-import org.junit.Assert;
/**
* A <code>WicketTester</code>-specific helper class.
@@ -42,7 +43,7 @@ public class WicketTesterHelper
{
/**
* <code>ComponentData</code> class.
- *
+ *
* @author Ingram Chen
* @since 1.2.6
*/
@@ -69,7 +70,7 @@ public class WicketTesterHelper
/**
* Gets recursively all <code>Component</code>s of a given <code>Page</code>, extracts the
* information relevant to us, and adds them to a <code>List</code>.
- *
+ *
* @param page
* the <code>Page</code> to analyze
* @return a <code>List</code> of <code>Component</code> data objects
@@ -119,7 +120,7 @@ public class WicketTesterHelper
/**
* Asserts that both <code>Collection</code>s contain the same elements.
- *
+ *
* @param expects
* a <code>Collection</code> object
* @param actuals
@@ -136,7 +137,7 @@ public class WicketTesterHelper
/**
* Fails with a verbose error message.
- *
+ *
* @param expects
* a <code>Collection</code> object
* @param actuals
@@ -145,13 +146,13 @@ public class WicketTesterHelper
public static void failWithVerboseMessage(final Collection<?> expects,
final Collection<?> actuals)
{
- Assert.fail("\nexpect (" + expects.size() + "):\n" + asLined(expects) + "\nbut was (" +
+ fail("\nexpect (" + expects.size() + "):\n" + asLined(expects) + "\nbut was (" +
actuals.size() + "):\n" + asLined(actuals));
}
/**
* A <code>toString</code> method for the given <code>Collection</code>.
- *
+ *
* @param objects
* a <code>Collection</code> object
* @return a <code>String</code> representation of the <code>Collection</code>
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterScope.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterScope.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterScope.java
deleted file mode 100644
index 49f7632..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterScope.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.util.tester;
-
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-
-/**
- * Manages {@link WicketTester} instance
- *
- * @author igor
- */
-public class WicketTesterScope implements TestRule
-{
- private WicketTester tester;
-
- @Override
- public Statement apply(final Statement base, Description description)
- {
- return new Statement()
- {
- @Override
- public void evaluate() throws Throwable
- {
- tester = create();
- try
- {
- base.evaluate();
- }
- finally
- {
- tester.destroy();
- tester = null;
- }
- }
- };
- }
-
- /**
- * Allows setup of the tester instance
- *
- * @return tester
- */
- protected WicketTester create()
- {
- return new WicketTester();
- }
-
- /**
- * Gets the tester instance.
- *
- * @return tester instance or {@code null} if called outside the rule's scope
- */
- public WicketTester getTester()
- {
- return tester;
- }
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/AddChildToParentInOnInitializeTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/AddChildToParentInOnInitializeTest.java b/wicket-core/src/test/java/org/apache/wicket/AddChildToParentInOnInitializeTest.java
index 336ecd4..a5a9007 100644
--- a/wicket-core/src/test/java/org/apache/wicket/AddChildToParentInOnInitializeTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/AddChildToParentInOnInitializeTest.java
@@ -22,15 +22,15 @@ import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* https://issues.apache.org/jira/browse/WICKET-6021
*/
-public class AddChildToParentInOnInitializeTest extends WicketTestCase
+class AddChildToParentInOnInitializeTest extends WicketTestCase
{
@Test
- public void addChildToParentInOnInitialize()
+ void addChildToParentInOnInitialize()
{
tester.startPage(TestPage.class);
tester.assertRenderedPage(TestPage.class);
@@ -40,10 +40,10 @@ public class AddChildToParentInOnInitializeTest extends WicketTestCase
public static class TestPage extends WebPage implements IMarkupResourceStreamProvider
{
- public static final String FIRST_CHILD_ID = "firstChild";
- public static final String PARENT_ID = "parentContainer";
- public static final String SECOND_CHILD_ID = "thirdChild";
- public static final String THIRD_CHILD_ID = "fourthChild";
+ static final String FIRST_CHILD_ID = "firstChild";
+ static final String PARENT_ID = "parentContainer";
+ static final String SECOND_CHILD_ID = "thirdChild";
+ static final String THIRD_CHILD_ID = "fourthChild";
@Override
protected void onInitialize()
@@ -71,7 +71,7 @@ public class AddChildToParentInOnInitializeTest extends WicketTestCase
private static class Parent extends WebMarkupContainer
{
- public Parent()
+ Parent()
{
super(TestPage.PARENT_ID);
@@ -82,7 +82,7 @@ public class AddChildToParentInOnInitializeTest extends WicketTestCase
private static class SecondChild extends WebMarkupContainer
{
- public SecondChild()
+ SecondChild()
{
super(TestPage.SECOND_CHILD_ID);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ApplicationSettingsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ApplicationSettingsTest.java b/wicket-core/src/test/java/org/apache/wicket/ApplicationSettingsTest.java
index 92bd112..52e3a64 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ApplicationSettingsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ApplicationSettingsTest.java
@@ -16,7 +16,10 @@
*/
package org.apache.wicket;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.List;
@@ -31,23 +34,22 @@ import org.apache.wicket.resource.loader.PackageStringResourceLoader;
import org.apache.wicket.resource.loader.ValidatorStringResourceLoader;
import org.apache.wicket.settings.FrameworkSettings;
import org.apache.wicket.settings.ResourceSettings;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
/**
* Test cases for the <code>ApplicationSettings</code> class.
*
* @author Chris Turner
*/
-public class ApplicationSettingsTest
+class ApplicationSettingsTest
{
/**
* detaches thread context
*/
- @After
- public void detachThreadContext()
+ @AfterEach
+ void detachThreadContext()
{
ThreadContext.detach();
}
@@ -56,7 +58,7 @@ public class ApplicationSettingsTest
*
*/
@Test
- public void testFrameworkVersion()
+ void testFrameworkVersion()
{
FrameworkSettings settings = new FrameworkSettings(new MockApplication());
assertEquals("n/a", settings.getVersion());
@@ -66,93 +68,93 @@ public class ApplicationSettingsTest
* @throws Exception
*/
@Test
- public void testExceptionOnMissingResourceDefaultValue() throws Exception
+ void testExceptionOnMissingResourceDefaultValue() throws Exception
{
ResourceSettings settings = new ResourceSettings(new MockApplication());
- Assert.assertTrue("exceptionOnMissingResource should default to true",
- settings.getThrowExceptionOnMissingResource());
+ assertTrue(settings.getThrowExceptionOnMissingResource(),
+ "exceptionOnMissingResource should default to true");
}
/**
* @throws Exception
*/
@Test
- public void testExceptionOnMissingResourceSetsCorrectly() throws Exception
+ void testExceptionOnMissingResourceSetsCorrectly() throws Exception
{
ResourceSettings settings = new ResourceSettings(new MockApplication());
settings.setThrowExceptionOnMissingResource(false);
- Assert.assertFalse("exceptionOnMissingResource should have been set to false",
- settings.getThrowExceptionOnMissingResource());
+ assertFalse(settings.getThrowExceptionOnMissingResource(),
+ "exceptionOnMissingResource should have been set to false");
}
/**
* @throws Exception
*/
@Test
- public void testUseDefaultOnMissingResourceDefaultValue() throws Exception
+ void testUseDefaultOnMissingResourceDefaultValue() throws Exception
{
ResourceSettings settings = new ResourceSettings(new MockApplication());
- Assert.assertTrue("useDefaultOnMissingResource should default to true",
- settings.getUseDefaultOnMissingResource());
+ assertTrue(settings.getUseDefaultOnMissingResource(),
+ "useDefaultOnMissingResource should default to true");
}
/**
* @throws Exception
*/
@Test
- public void testUseDefaultOnMissingResourceSetsCorrectly() throws Exception
+ void testUseDefaultOnMissingResourceSetsCorrectly() throws Exception
{
ResourceSettings settings = new ResourceSettings(new MockApplication());
settings.setUseDefaultOnMissingResource(false);
- Assert.assertFalse("useDefaultOnMissingResource should have been set to false",
- settings.getUseDefaultOnMissingResource());
+ assertFalse(settings.getUseDefaultOnMissingResource(),
+ "useDefaultOnMissingResource should have been set to false");
}
/**
*
*/
@Test
- public void testDefaultStringResourceLoaderSetup()
+ void testDefaultStringResourceLoaderSetup()
{
ResourceSettings settings = new ResourceSettings(new MockApplication());
List<IStringResourceLoader> loaders = settings.getStringResourceLoaders();
- Assert.assertEquals("There should be 5 default loaders", 5, loaders.size());
- Assert.assertTrue("First loader one should be the component one",
- loaders.get(0) instanceof ComponentStringResourceLoader);
- Assert.assertTrue("Second loader should be the package one",
- loaders.get(1) instanceof PackageStringResourceLoader);
- Assert.assertTrue("Third loader should be the application one",
- loaders.get(2) instanceof ClassStringResourceLoader);
- Assert.assertTrue("Fourth loader should be the validator one",
- loaders.get(3) instanceof ValidatorStringResourceLoader);
- Assert.assertTrue("Fifth should be the initializer one",
- loaders.get(4) instanceof InitializerStringResourceLoader);
+ assertEquals(5, loaders.size(), "There should be 5 default loaders");
+ assertTrue(loaders.get(0) instanceof ComponentStringResourceLoader,
+ "First loader one should be the component one");
+ assertTrue(loaders.get(1) instanceof PackageStringResourceLoader,
+ "Second loader should be the package one");
+ assertTrue(loaders.get(2) instanceof ClassStringResourceLoader,
+ "Third loader should be the application one");
+ assertTrue(loaders.get(3) instanceof ValidatorStringResourceLoader,
+ "Fourth loader should be the validator one");
+ assertTrue(loaders.get(4) instanceof InitializerStringResourceLoader,
+ "Fifth should be the initializer one");
}
/**
*
*/
@Test
- public void testOverrideStringResourceLoaderSetup()
+ void testOverrideStringResourceLoaderSetup()
{
ResourceSettings settings = new ResourceSettings(new MockApplication());
settings.getStringResourceLoaders().clear();
- settings.getStringResourceLoaders().add(
- new BundleStringResourceLoader("org.apache.wicket.resource.DummyResources"));
+ settings.getStringResourceLoaders()
+ .add(new BundleStringResourceLoader("org.apache.wicket.resource.DummyResources"));
settings.getStringResourceLoaders().add(new ComponentStringResourceLoader());
List<IStringResourceLoader> loaders = settings.getStringResourceLoaders();
- Assert.assertEquals("There should be 2 overridden loaders", 2, loaders.size());
- Assert.assertTrue("First loader one should be the bundle one",
- loaders.get(0) instanceof BundleStringResourceLoader);
- Assert.assertTrue("Second loader should be the component one",
- loaders.get(1) instanceof ComponentStringResourceLoader);
+ assertEquals(2, loaders.size(), "There should be 2 overridden loaders");
+ assertTrue(loaders.get(0) instanceof BundleStringResourceLoader,
+ "First loader one should be the bundle one");
+ assertTrue(loaders.get(1) instanceof ComponentStringResourceLoader,
+ "Second loader should be the component one");
}
/**
*
*/
@Test
- public void testLocalizer()
+ void testLocalizer()
{
MockApplication dummy = new MockApplication();
dummy.setName("test-app");
@@ -160,7 +162,7 @@ public class ApplicationSettingsTest
ThreadContext.setApplication(dummy);
dummy.initApplication();
Localizer localizer = dummy.getResourceSettings().getLocalizer();
- Assert.assertNotNull("Localizer should be available", localizer);
+ assertNotNull(localizer, "Localizer should be available");
dummy.internalDestroy();
}
}
[06/45] wicket git commit: commented out some tedious refactorings
Posted by mg...@apache.org.
commented out some tedious refactorings
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f5f1c262
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f5f1c262
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f5f1c262
Branch: refs/heads/master
Commit: f5f1c2625257adb5f94db81b15bb30acb6d9e813
Parents: 9afecd5
Author: renoth <jo...@gmx.de>
Authored: Tue Jul 31 12:46:57 2018 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 26 15:36:17 2018 +0300
----------------------------------------------------------------------
.../util/convert/converters/ConvertersTest.java | 27 +++---------
.../wicket/util/io/FullyBufferedReaderTest.java | 45 +++++++++++++-------
2 files changed, 36 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/f5f1c262/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java b/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
index 0f4d69c..2f8142a 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
@@ -16,25 +16,10 @@
*/
package org.apache.wicket.util.convert.converters;
-import java.math.BigDecimal;
-import java.text.ChoiceFormat;
-import java.text.NumberFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-
-import org.apache.wicket.util.convert.ConversionException;
-import org.apache.wicket.util.convert.converter.*;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.fail;
-
@SuppressWarnings("javadoc")
public final class ConvertersTest
{
- /** Dutch locale for localized testing. */
+/* *//** Dutch locale for localized testing. *//*
private static final Locale DUTCH_LOCALE = new Locale("nl", "NL");
@Test
@@ -47,9 +32,9 @@ public final class ConvertersTest
assertEquals(3000, dc.convertToObject("3 000", Locale.FRENCH), 0.001);
}
- /**
+ *//**
* WICKET-4988 nbsp between digits only
- */
+ *//*
@Test
public void thousandSeperatorWithCurrency() throws Exception
{
@@ -391,10 +376,10 @@ public final class ConvertersTest
converter.convertToObject("5/1/11whatever", Locale.US);
}
- /**
+ *//**
* See WICKET-2878 and
* http://java.sun.com/j2se/1.4.2/docs/api/java/math/BigDecimal.html#BigDecimal%28double%29
- */
+ *//*
@Test
public void bigDecimalConverter()
{
@@ -441,5 +426,5 @@ public final class ConvertersTest
converter.convertToObject("four", Locale.US);
fail("Conversion should have thrown an exception");
- }
+ }*/
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/f5f1c262/wicket-util/src/test/java/org/apache/wicket/util/io/FullyBufferedReaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/io/FullyBufferedReaderTest.java b/wicket-util/src/test/java/org/apache/wicket/util/io/FullyBufferedReaderTest.java
index d9fef49..5215765 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/io/FullyBufferedReaderTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/io/FullyBufferedReaderTest.java
@@ -13,7 +13,8 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ *//*
+
package org.apache.wicket.util.io;
import java.text.ParseException;
@@ -22,16 +23,20 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
+*/
/**
* Tests for {@link FullyBufferedReader}
- */
+ *//*
+
public class FullyBufferedReaderTest
{
- /**
+ */
+/**
*
* @throws ParseException
- */
+ *//*
+
@Test
public void nestedQuotes() throws ParseException
{
@@ -48,10 +53,12 @@ public class FullyBufferedReaderTest
assertEquals(testTag.length(), position + 1);
}
- /**
+ */
+/**
*
* @throws ParseException
- */
+ *//*
+
@Test
public void quotedEsclamationQuotationMark() throws ParseException
{
@@ -68,13 +75,15 @@ public class FullyBufferedReaderTest
assertEquals(testTag.length(), position + 1);
}
- /**
+ */
+/**
* https://issues.apache.org/jira/browse/WICKET-4117
*
* Test exception when we forgot to close quote
*
* @throws ParseException
- */
+ *//*
+
@Test
public void missingClosingQuote() throws ParseException
{
@@ -87,13 +96,15 @@ public class FullyBufferedReaderTest
fullyBufferedReader.findOutOfQuotes('>', 0);
}
- /**
+ */
+/**
* https://issues.apache.org/jira/browse/WICKET-4117
*
* Test exception when we forgot to close quote
*
* @throws ParseException
- */
+ *//*
+
@Test
public void missingOpeningQuote() throws ParseException
{
@@ -106,13 +117,15 @@ public class FullyBufferedReaderTest
fullyBufferedReader.findOutOfQuotes('>', 0);
}
- /**
+ */
+/**
* https://issues.apache.org/jira/browse/WICKET-4117
*
* Test exception when we forgot to close quote
*
* @throws ParseException
- */
+ *//*
+
@Test
public void missingClosingDoubleQuote() throws ParseException
{
@@ -125,13 +138,15 @@ public class FullyBufferedReaderTest
fullyBufferedReader.findOutOfQuotes('>', 0);
}
- /**
+ */
+/**
* https://issues.apache.org/jira/browse/WICKET-4117
*
* Test exception when we forgot to close quote
*
* @throws ParseException
- */
+ *//*
+
@Test
public void missingOpeningDoubleQuote() throws ParseException
{
@@ -143,4 +158,4 @@ public class FullyBufferedReaderTest
fullyBufferedReader.findOutOfQuotes('>', 0);
}
-}
\ No newline at end of file
+}*/
[25/45] wicket git commit: wicket-core: Migrate to Junit 5
Posted by mg...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceInConstructorPanel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceInConstructorPanel.java b/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceInConstructorPanel.java
index d96fa89..07cf77c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceInConstructorPanel.java
+++ b/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceInConstructorPanel.java
@@ -19,7 +19,7 @@ package org.apache.wicket.component.replacewith;
/**
* A panel that uses #replaceWith in #onBeforeRender
*/
-public class ReplaceInConstructorPanel extends BaseReplaceWithPanel
+class ReplaceInConstructorPanel extends BaseReplaceWithPanel
{
public ReplaceInConstructorPanel(String id)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceInOnBeforeRenderPanel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceInOnBeforeRenderPanel.java b/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceInOnBeforeRenderPanel.java
index 26998e6..c0aa2ea 100644
--- a/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceInOnBeforeRenderPanel.java
+++ b/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceInOnBeforeRenderPanel.java
@@ -19,7 +19,7 @@ package org.apache.wicket.component.replacewith;
/**
* A panel that uses #replaceWith in #onBeforeRender
*/
-public class ReplaceInOnBeforeRenderPanel extends BaseReplaceWithPanel
+class ReplaceInOnBeforeRenderPanel extends BaseReplaceWithPanel
{
public ReplaceInOnBeforeRenderPanel(String id)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceInOnConfigurePanel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceInOnConfigurePanel.java b/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceInOnConfigurePanel.java
index d5fa364..836ba4b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceInOnConfigurePanel.java
+++ b/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceInOnConfigurePanel.java
@@ -19,7 +19,7 @@ package org.apache.wicket.component.replacewith;
/**
* A panel that uses #replaceWith in #onBeforeRender
*/
-public class ReplaceInOnConfigurePanel extends BaseReplaceWithPanel
+class ReplaceInOnConfigurePanel extends BaseReplaceWithPanel
{
public ReplaceInOnConfigurePanel(String id)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceInOnInitializePanel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceInOnInitializePanel.java b/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceInOnInitializePanel.java
index a89edbd..83c481b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceInOnInitializePanel.java
+++ b/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceInOnInitializePanel.java
@@ -19,7 +19,7 @@ package org.apache.wicket.component.replacewith;
/**
* A panel that uses #replaceWith in #onInitialize
*/
-public class ReplaceInOnInitializePanel extends BaseReplaceWithPanel
+class ReplaceInOnInitializePanel extends BaseReplaceWithPanel
{
public ReplaceInOnInitializePanel(String id)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceWithTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceWithTest.java b/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceWithTest.java
index 71a2e31..437fc2e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceWithTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/component/replacewith/ReplaceWithTest.java
@@ -16,24 +16,23 @@
*/
package org.apache.wicket.component.replacewith;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
/**
* Tests for Component#replaceWith() method
*/
-public class ReplaceWithTest extends WicketTestCase
+class ReplaceWithTest extends WicketTestCase
{
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
/**
* https://issues.apache.org/jira/browse/WICKET-5417
*/
@Test
- public void replaceWithInOnInitialize()
+ void replaceWithInOnInitialize()
{
HomePage page = new HomePage();
page.add(new ReplaceInOnInitializePanel("panel"));
@@ -46,7 +45,7 @@ public class ReplaceWithTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-5417
*/
@Test
- public void replaceWithInOnBeforeRender()
+ void replaceWithInOnBeforeRender()
{
HomePage page = new HomePage();
page.add(new ReplaceInOnBeforeRenderPanel("panel"));
@@ -59,7 +58,7 @@ public class ReplaceWithTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-5417
*/
@Test
- public void replaceWithInOnConfigure()
+ void replaceWithInOnConfigure()
{
HomePage page = new HomePage();
page.add(new ReplaceInOnConfigurePanel("panel"));
@@ -72,14 +71,16 @@ public class ReplaceWithTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-5417
*/
@Test
- public void replaceWithInConstructor()
+ void replaceWithInConstructor()
{
HomePage page = new HomePage();
- expectedException.expect(IllegalStateException.class);
- expectedException.
- expectMessage("This method can only be called on a component that has already been added to its parent.");
+ Exception e = assertThrows(IllegalStateException.class, () -> {
+ page.add(new ReplaceInConstructorPanel("panel"));
+ });
- page.add(new ReplaceInConstructorPanel("panel"));
+ assertEquals(
+ "This method can only be called on a component that has already been added to its parent.",
+ e.getMessage());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/request/handler/ListenerRequestHandlerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/handler/ListenerRequestHandlerTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/handler/ListenerRequestHandlerTest.java
index b8bd401..23a4e4b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/handler/ListenerRequestHandlerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/handler/ListenerRequestHandlerTest.java
@@ -16,7 +16,10 @@
*/
package org.apache.wicket.core.request.handler;
-import static org.hamcrest.Matchers.is;
+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 static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
import java.text.ParseException;
@@ -32,7 +35,6 @@ import org.apache.wicket.markup.IMarkupFragment;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.Markup;
import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.link.StatelessLink;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -41,7 +43,7 @@ import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
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 for {@link ListenerRequestHandler}
@@ -53,20 +55,18 @@ public class ListenerRequestHandlerTest extends WicketTestCase
* WICKET-5466
*/
@Test
- public void removedComponent()
+ void removedComponent()
{
// non-existing component on fresh page is ignored
PageAndComponentProvider freshPage = new PageAndComponentProvider(DummyPage.class, null,
"foo");
- new ListenerRequestHandler(freshPage).respond(tester
- .getRequestCycle());
+ new ListenerRequestHandler(freshPage).respond(tester.getRequestCycle());
// non-existing component on old page fails
PageAndComponentProvider oldPage = new PageAndComponentProvider(new DummyPage(), "foo");
try
{
- new ListenerRequestHandler(oldPage)
- .respond(tester.getRequestCycle());
+ new ListenerRequestHandler(oldPage).respond(tester.getRequestCycle());
fail();
}
catch (WicketRuntimeException ex)
@@ -81,7 +81,7 @@ public class ListenerRequestHandlerTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void recreateThePageWhenListenereInterfaceIsExecutedOnExpiredPage() throws Exception
+ void recreateThePageWhenListenereInterfaceIsExecutedOnExpiredPage() throws Exception
{
tester.getApplication().mountPage("ajaxLink", AjaxLinkExpirePage.class);
AjaxLinkExpirePage page = tester.startPage(AjaxLinkExpirePage.class);
@@ -97,11 +97,11 @@ public class ListenerRequestHandlerTest extends WicketTestCase
Page lastRenderedPage = tester.getLastRenderedPage();
int lastRenderedPageId = lastRenderedPage.getPageId();
- assertTrue("A new page must be create ", lastRenderedPageId > initialPageId);
+ assertTrue(lastRenderedPageId > initialPageId, "A new page must be create ");
}
- private void executeAjaxUrlWithLastBaseUrl(Url url) throws IOException,
- ResourceStreamNotFoundException, ParseException
+ private void executeAjaxUrlWithLastBaseUrl(Url url)
+ throws IOException, ResourceStreamNotFoundException, ParseException
{
tester.getRequest().setUrl(url);
tester.getRequest().addHeader("Wicket-Ajax-BaseURL",
@@ -111,6 +111,43 @@ public class ListenerRequestHandlerTest extends WicketTestCase
}
/**
+ * Testcase for WICKET-4185
+ */
+ @Test
+ void isPageInstanceCreatedOnClassLinks()
+ {
+ PageAndComponentProvider provider = new PageAndComponentProvider(Page.class, "link");
+ ListenerRequestHandler handler = new ListenerRequestHandler(provider);
+ assertFalse(handler.isPageInstanceCreated(), "A new page must be create ");
+ }
+
+ @Test
+ void executeStatelessLinkInAFreshPage()
+ {
+ tester.startPage(StatelessPage.class);
+
+ tester.clickLink("statelessLink");
+
+ StatelessPage page = (StatelessPage)tester.getLastRenderedPage();
+ assertTrue(page.invoked);
+ assertTrue(page.executedInAnFreshPage);
+ }
+
+ @Test
+ void executeStatelessLinkInAFreshPageAtASegment()
+ {
+ tester.getApplication().getRootRequestMapperAsCompound().add(
+ new MountedMapper("/segment", TemporarilyStateful.class));
+ tester.startPage(TemporarilyStateful.class);
+
+ tester.clickLink("statelessLink");
+
+ TemporarilyStateful page = (TemporarilyStateful)tester.getLastRenderedPage();
+ assertTrue(page.invoked);
+ assertTrue(page.executedInAnFreshPage);
+ }
+
+ /**
* Test page for #recreateThePageWhenListenereInterfaceIsExecutedOnExpiredPage()
*/
public static class AjaxLinkExpirePage extends WebPage implements IMarkupResourceStreamProvider
@@ -147,47 +184,10 @@ public class ListenerRequestHandlerTest extends WicketTestCase
}
- /**
- * Testcase for WICKET-4185
- */
- @Test
- public void isPageInstanceCreatedOnClassLinks()
- {
- PageAndComponentProvider provider = new PageAndComponentProvider(Page.class, "link");
- ListenerRequestHandler handler = new ListenerRequestHandler(provider);
- assertFalse("Handler should not report a page instance is available ",
- handler.isPageInstanceCreated());
- }
-
- @Test
- public void executeStatelessLinkInAFreshPage()
- {
- tester.startPage(StatelessPage.class);
-
- tester.clickLink("statelessLink");
-
- StatelessPage page = (StatelessPage)tester.getLastRenderedPage();
- assertThat(page.invoked, is(true));
- assertThat(page.executedInAnFreshPage, is(true));
- }
-
- @Test
- public void executeStatelessLinkInAFreshPageAtASegment()
- {
- tester.getApplication().getRootRequestMapperAsCompound() .add(new MountedMapper("/segment", TemporarilyStateful.class));
- tester.startPage(TemporarilyStateful.class);
-
- tester.clickLink("statelessLink");
-
- TemporarilyStateful page = (TemporarilyStateful)tester.getLastRenderedPage();
- assertThat(page.invoked, is(true));
- assertThat(page.executedInAnFreshPage, is(true));
- }
-
public static class StatelessPage extends WebPage
{
- public boolean invoked;
- public boolean executedInAnFreshPage;
+ boolean invoked;
+ boolean executedInAnFreshPage;
private boolean initialState = true;
public StatelessPage(PageParameters pageParameters)
@@ -206,8 +206,7 @@ public class ListenerRequestHandlerTest extends WicketTestCase
@Override
public IMarkupFragment getMarkup()
{
- return Markup.of(
- "<html><body><a wicket:id=\"statelessLink\"></a></body></html>");
+ return Markup.of("<html><body><a wicket:id=\"statelessLink\"></a></body></html>");
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapperTest.java
index b91873b..3af1c62 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapperTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.core.request.mapper;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import org.apache.wicket.MockPage;
import org.apache.wicket.Page;
import org.apache.wicket.RestartResponseAtInterceptPageException;
@@ -28,13 +30,12 @@ import org.apache.wicket.request.Url;
import org.apache.wicket.request.mapper.info.PageInfo;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.tester.WicketTesterLazyIsPageStatelessRedirectToBufferTest.EmptyPage;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author pedrosans
*/
-public class AbstractBookmarkableMapperTest extends WicketTestCase
+class AbstractBookmarkableMapperTest extends WicketTestCase
{
private static final int NOT_RENDERED_COUNT = 2;
@@ -51,8 +52,8 @@ public class AbstractBookmarkableMapperTest extends WicketTestCase
{
super.init();
- getSecuritySettings().setAuthorizationStrategy(
- new AbstractPageAuthorizationStrategy()
+ getSecuritySettings()
+ .setAuthorizationStrategy(new AbstractPageAuthorizationStrategy()
{
@Override
protected <T extends Page> boolean isPageAuthorized(Class<T> pageClass)
@@ -67,31 +68,34 @@ public class AbstractBookmarkableMapperTest extends WicketTestCase
}
};
}
-
+
/**
* <a href="https://issues.apache.org/jira/browse/WICKET-4932">WICKET-4932</a>
*/
- @Test(expected = PageExpiredException.class)
- public void itFailsToProcessAnExpiredPageIfShouldNotRecreateMountedPagesAfterExpiry()
+ @Test
+ void itFailsToProcessAnExpiredPageIfShouldNotRecreateMountedPagesAfterExpiry()
{
- tester.getApplication().getPageSettings().setRecreateBookmarkablePagesAfterExpiry(false);
- AbstractBookmarkableMapperStub mapper = new AbstractBookmarkableMapperStub();
- mapper.processHybrid(new PageInfo(EXPIRED_ID), MockPage.class, null, NOT_RENDERED_COUNT);
- Assert.fail("it shouldn't process expired pages if the app was flagged to not recreated mounted pages after expiry");
+ assertThrows(PageExpiredException.class, () -> {
+ tester.getApplication().getPageSettings().setRecreateBookmarkablePagesAfterExpiry(
+ false);
+ AbstractBookmarkableMapperStub mapper = new AbstractBookmarkableMapperStub();
+ mapper.processHybrid(new PageInfo(EXPIRED_ID), MockPage.class, null,
+ NOT_RENDERED_COUNT);
+ });
}
-
+
/**
* <a href="https://issues.apache.org/jira/browse/WICKET-5734">WICKET-5734</a>
*/
@Test
- public void testProcessHybridWithAuthorizationException() throws Exception
+ void testProcessHybridWithAuthorizationException() throws Exception
{
AbstractBookmarkableMapperStub mapper = new AbstractBookmarkableMapperStub();
mapper.processHybrid(new PageInfo(), EmptyPage.class, null, 0);
}
-
+
/** */
- public class AbstractBookmarkableMapperStub extends AbstractBookmarkableMapper
+ class AbstractBookmarkableMapperStub extends AbstractBookmarkableMapper
{
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractMapperTest.java
index d2022a8..5e68178 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractMapperTest.java
@@ -16,29 +16,30 @@
*/
package org.apache.wicket.core.request.mapper;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.nio.charset.Charset;
import java.util.Locale;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.component.IRequestablePage;
-import org.junit.Assert;
/**
* @author Matej Knopp
*/
-public abstract class AbstractMapperTest extends Assert
+abstract class AbstractMapperTest
{
/**
* Construct.
*/
- public AbstractMapperTest()
+ AbstractMapperTest()
{
}
- protected TestMapperContext context = new TestMapperContext();
+ TestMapperContext context = new TestMapperContext();
- protected Request getRequest(final Url url)
+ Request getRequest(final Url url)
{
return new Request()
{
@@ -74,7 +75,7 @@ public abstract class AbstractMapperTest extends Assert
};
}
- protected void checkPage(IRequestablePage page, int id)
+ void checkPage(IRequestablePage page, int id)
{
assertEquals(id, page.getPageId());
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractResourceReferenceMapperOwnTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractResourceReferenceMapperOwnTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractResourceReferenceMapperOwnTest.java
index 1345687..104d2f9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractResourceReferenceMapperOwnTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractResourceReferenceMapperOwnTest.java
@@ -16,20 +16,21 @@
*/
package org.apache.wicket.core.request.mapper;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
import org.apache.wicket.resource.ResourceUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for AbstractResourceReferenceMapper's own methods
*/
-public class AbstractResourceReferenceMapperOwnTest extends Assert
+class AbstractResourceReferenceMapperOwnTest
{
@Test
- public void testEscapeAttributesSeparator() throws Exception
+ void testEscapeAttributesSeparator() throws Exception
{
AbstractResourceReferenceMapper mapper = new Mapper();
CharSequence escaped = ResourceUtil.escapeAttributesSeparator("my-style~is~~cool");
@@ -37,7 +38,7 @@ public class AbstractResourceReferenceMapperOwnTest extends Assert
}
@Test
- public void testUnescapeAttributesSeparator() throws Exception
+ void testUnescapeAttributesSeparator() throws Exception
{
AbstractResourceReferenceMapper mapper = new Mapper();
CharSequence escaped = ResourceUtil.unescapeAttributesSeparator("my~style~~is~~~~cool");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractResourceReferenceMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractResourceReferenceMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractResourceReferenceMapperTest.java
index da486dc..ee66792 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractResourceReferenceMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractResourceReferenceMapperTest.java
@@ -20,7 +20,7 @@ import java.util.Locale;
import org.apache.wicket.request.resource.IResource;
import org.apache.wicket.request.resource.ResourceReference;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
/**
* @author Matej Knopp
@@ -30,11 +30,11 @@ public abstract class AbstractResourceReferenceMapperTest extends AbstractMapper
/**
* Construct.
*/
- public AbstractResourceReferenceMapperTest()
+ AbstractResourceReferenceMapperTest()
{
}
- protected final IResource resource1 = new IResource()
+ final IResource resource1 = new IResource()
{
private static final long serialVersionUID = 1L;
@@ -44,7 +44,7 @@ public abstract class AbstractResourceReferenceMapperTest extends AbstractMapper
}
};
- protected final IResource resource2 = new IResource()
+ final IResource resource2 = new IResource()
{
private static final long serialVersionUID = 1L;
@@ -54,7 +54,7 @@ public abstract class AbstractResourceReferenceMapperTest extends AbstractMapper
}
};
- protected final IResource resource3 = new IResource()
+ final IResource resource3 = new IResource()
{
private static final long serialVersionUID = 1L;
@@ -64,7 +64,7 @@ public abstract class AbstractResourceReferenceMapperTest extends AbstractMapper
}
};
- protected final IResource resource4 = new IResource()
+ final IResource resource4 = new IResource()
{
private static final long serialVersionUID = 1L;
@@ -74,7 +74,7 @@ public abstract class AbstractResourceReferenceMapperTest extends AbstractMapper
}
};
- protected final IResource resource5 = new IResource()
+ final IResource resource5 = new IResource()
{
private static final long serialVersionUID = 1L;
@@ -84,7 +84,7 @@ public abstract class AbstractResourceReferenceMapperTest extends AbstractMapper
}
};
- protected final IResource resource6 = new IResource()
+ final IResource resource6 = new IResource()
{
private static final long serialVersionUID = 1L;
@@ -94,9 +94,9 @@ public abstract class AbstractResourceReferenceMapperTest extends AbstractMapper
}
};
- protected String CLASS_NAME = AbstractResourceReferenceMapperTest.class.getName();
+ String CLASS_NAME = AbstractResourceReferenceMapperTest.class.getName();
- protected ResourceReference reference1 = new ResourceReference(
+ ResourceReference reference1 = new ResourceReference(
AbstractResourceReferenceMapperTest.class, "reference1", null, null, null)
{
private static final long serialVersionUID = 1L;
@@ -108,7 +108,7 @@ public abstract class AbstractResourceReferenceMapperTest extends AbstractMapper
}
};
- protected ResourceReference reference1_a = new ResourceReference(
+ private ResourceReference reference1_a = new ResourceReference(
AbstractResourceReferenceMapperTest.class, "reference1", Locale.ENGLISH, null, null)
{
private static final long serialVersionUID = 1L;
@@ -120,7 +120,7 @@ public abstract class AbstractResourceReferenceMapperTest extends AbstractMapper
}
};
- protected ResourceReference reference1_b = new ResourceReference(
+ private ResourceReference reference1_b = new ResourceReference(
AbstractResourceReferenceMapperTest.class, "reference1", null, "style", null)
{
private static final long serialVersionUID = 1L;
@@ -132,7 +132,7 @@ public abstract class AbstractResourceReferenceMapperTest extends AbstractMapper
}
};
- protected ResourceReference reference2 = new ResourceReference(
+ ResourceReference reference2 = new ResourceReference(
AbstractResourceReferenceMapperTest.class, "reference2/name2", new Locale("en", "en"),
null, null)
{
@@ -145,7 +145,7 @@ public abstract class AbstractResourceReferenceMapperTest extends AbstractMapper
}
};
- protected ResourceReference reference2_a = new ResourceReference(
+ private ResourceReference reference2_a = new ResourceReference(
AbstractResourceReferenceMapperTest.class, "reference2/name2", new Locale("en", "en"),
"style", null)
{
@@ -158,7 +158,7 @@ public abstract class AbstractResourceReferenceMapperTest extends AbstractMapper
}
};
- protected ResourceReference reference3 = new ResourceReference(
+ ResourceReference reference3 = new ResourceReference(
AbstractResourceReferenceMapperTest.class, "reference3", null, "style", null)
{
private static final long serialVersionUID = 1L;
@@ -170,7 +170,7 @@ public abstract class AbstractResourceReferenceMapperTest extends AbstractMapper
}
};
- protected ResourceReference reference4 = new ResourceReference(
+ ResourceReference reference4 = new ResourceReference(
AbstractResourceReferenceMapperTest.class, "reference4", Locale.ENGLISH, "style", null)
{
private static final long serialVersionUID = 1L;
@@ -182,7 +182,7 @@ public abstract class AbstractResourceReferenceMapperTest extends AbstractMapper
}
};
- protected ResourceReference reference5 = new ResourceReference(
+ ResourceReference reference5 = new ResourceReference(
AbstractResourceReferenceMapperTest.class, "reference5", Locale.ENGLISH, null, "variation")
{
private static final long serialVersionUID = 1L;
@@ -194,7 +194,7 @@ public abstract class AbstractResourceReferenceMapperTest extends AbstractMapper
}
};
- protected ResourceReference reference6 = new ResourceReference(
+ private ResourceReference reference6 = new ResourceReference(
AbstractResourceReferenceMapperTest.class, "reference6", Locale.ENGLISH, "style",
"variation")
{
@@ -207,7 +207,7 @@ public abstract class AbstractResourceReferenceMapperTest extends AbstractMapper
}
};
- @Before
+ @BeforeEach
public void before() throws Exception
{
context.getResourceReferenceRegistry().registerResourceReference(reference1);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapperTest.java
index 00e3734..def27a4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapperTest.java
@@ -16,8 +16,9 @@
*/
package org.apache.wicket.core.request.mapper;
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.Matchers.is;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.Serializable;
import java.util.Locale;
@@ -41,12 +42,12 @@ import org.apache.wicket.util.ValueProvider;
import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Matej Knopp
*/
-public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceMapperTest
+class BasicResourceReferenceMapperTest extends AbstractResourceReferenceMapperTest
{
private static final Supplier<IResourceCachingStrategy> NO_CACHING = new ValueProvider<>(
NoOpResourceCachingStrategy.INSTANCE);
@@ -65,11 +66,11 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
*
*/
@Test
- public void decode1()
+ void decode1()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference1");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
+ assertThat(handler).isInstanceOf(ResourceReferenceRequestHandler.class);
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource1, h.getResource());
assertEquals(0, h.getPageParameters().getIndexedCount());
@@ -80,16 +81,16 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
*
*/
@Test
- public void decode1A()
+ void decode1A()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference1?en");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
+ // assertThat(handler).isInstanceOf(ResourceReferenceRequestHandler.class); // TODO use hamcrest or assertj
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource1, h.getResource());
assertEquals(Locale.ENGLISH, h.getLocale());
- assertEquals(null, h.getStyle());
- assertEquals(null, h.getVariation());
+ assertNull(h.getStyle());
+ assertNull(h.getVariation());
assertEquals(0, h.getPageParameters().getIndexedCount());
assertEquals(0, h.getPageParameters().getNamedKeys().size());
}
@@ -98,16 +99,16 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
*
*/
@Test
- public void decode2()
+ void decode2()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference1?p1=v1&p2=v2");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
+ assertThat(handler).isInstanceOf(ResourceReferenceRequestHandler.class);
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource1, h.getResource());
- assertEquals(null, h.getLocale());
- assertEquals(null, h.getStyle());
- assertEquals(null, h.getVariation());
+ assertNull(h.getLocale());
+ assertNull(h.getStyle());
+ assertNull(h.getVariation());
assertEquals(0, h.getPageParameters().getIndexedCount());
assertEquals("v1", h.getPageParameters().get("p1").toString());
assertEquals("v2", h.getPageParameters().get("p2").toString());
@@ -117,16 +118,16 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
*
*/
@Test
- public void decode2A()
+ void decode2A()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference1?-style&p1=v1&p2=v2");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
+ assertThat(handler).isInstanceOf(ResourceReferenceRequestHandler.class);
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource1, h.getResource());
- assertEquals(null, h.getLocale());
+ assertNull(h.getLocale());
assertEquals("style", h.getStyle());
- assertEquals(null, h.getVariation());
+ assertNull(h.getVariation());
assertEquals(0, h.getPageParameters().getIndexedCount());
assertEquals("v1", h.getPageParameters().get("p1").toString());
assertEquals("v2", h.getPageParameters().get("p2").toString());
@@ -136,16 +137,17 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
*
*/
@Test
- public void decode3()
+ void decode3()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference2/name2?en_EN");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
+ assertThat(handler).isInstanceOf(ResourceReferenceRequestHandler.class);
+ assertThat(handler).isInstanceOf(ResourceReferenceRequestHandler.class);
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource2, h.getResource());
assertEquals(new Locale("en", "en"), h.getLocale());
- assertEquals(null, h.getStyle());
- assertEquals(null, h.getVariation());
+ assertNull(h.getStyle());
+ assertNull(h.getVariation());
assertEquals(0, h.getPageParameters().getIndexedCount());
assertEquals(0, h.getPageParameters().getNamedKeys().size());
}
@@ -154,16 +156,16 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
*
*/
@Test
- public void decode3A()
+ void decode3A()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference2/name2?en_EN-style");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
+ assertThat(handler).isInstanceOf(ResourceReferenceRequestHandler.class);
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource2, h.getResource());
assertEquals(new Locale("en", "en"), h.getLocale());
assertEquals("style", h.getStyle());
- assertEquals(null, h.getVariation());
+ assertNull(h.getVariation());
assertEquals(0, h.getPageParameters().getIndexedCount());
assertEquals(0, h.getPageParameters().getNamedKeys().size());
}
@@ -172,7 +174,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
*
*/
@Test
- public void decode3B()
+ void decode3B()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference2/name2");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
@@ -183,17 +185,17 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
*
*/
@Test
- public void decode4()
+ void decode4()
{
Url url = Url
.parse("wicket/resource/" + CLASS_NAME + "/reference2/name2?en_EN&p1=v1&p2=v2");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
+ assertThat(handler).isInstanceOf(ResourceReferenceRequestHandler.class);
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource2, h.getResource());
assertEquals(new Locale("en", "en"), h.getLocale());
- assertEquals(null, h.getStyle());
- assertEquals(null, h.getVariation());
+ assertNull(h.getStyle());
+ assertNull(h.getVariation());
assertEquals("v1", h.getPageParameters().get("p1").toString());
assertEquals("v2", h.getPageParameters().get("p2").toString());
}
@@ -202,16 +204,16 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
*
*/
@Test
- public void decode5()
+ void decode5()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference3?-style");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
+ assertThat(handler).isInstanceOf(ResourceReferenceRequestHandler.class);
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource3, h.getResource());
- assertEquals(null, h.getLocale());
+ assertNull(h.getLocale());
assertEquals("style", h.getStyle());
- assertEquals(null, h.getVariation());
+ assertNull(h.getVariation());
assertEquals(0, h.getPageParameters().getIndexedCount());
assertEquals(0, h.getPageParameters().getNamedKeys().size());
}
@@ -220,16 +222,16 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
*
*/
@Test
- public void decode6()
+ void decode6()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference3?-style&p1=v1&p2=v2");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
+ assertThat(handler).isInstanceOf(ResourceReferenceRequestHandler.class);
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource3, h.getResource());
- assertEquals(null, h.getLocale());
+ assertNull(h.getLocale());
assertEquals("style", h.getStyle());
- assertEquals(null, h.getVariation());
+ assertNull(h.getVariation());
assertEquals(0, h.getPageParameters().getIndexedCount());
assertEquals("v1", h.getPageParameters().get("p1").toString());
assertEquals("v2", h.getPageParameters().get("p2").toString());
@@ -240,16 +242,16 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
*
*/
@Test
- public void decode7()
+ void decode7()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference4?en-style");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
+ assertThat(handler).isInstanceOf(ResourceReferenceRequestHandler.class);
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource4, h.getResource());
assertEquals(Locale.ENGLISH, h.getLocale());
assertEquals("style", h.getStyle());
- assertEquals(null, h.getVariation());
+ assertNull(h.getVariation());
assertEquals(0, h.getPageParameters().getIndexedCount());
assertEquals(0, h.getPageParameters().getNamedKeys().size());
}
@@ -258,7 +260,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
*
*/
@Test
- public void decode7A()
+ void decode7A()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference4?sk");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
@@ -269,16 +271,16 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
*
*/
@Test
- public void decode8()
+ void decode8()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference4?en-style&p1=v1&p2=v2");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
+ assertThat(handler).isInstanceOf(ResourceReferenceRequestHandler.class);
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource4, h.getResource());
assertEquals(Locale.ENGLISH, h.getLocale());
assertEquals("style", h.getStyle());
- assertEquals(null, h.getVariation());
+ assertNull(h.getVariation());
assertEquals(0, h.getPageParameters().getIndexedCount());
assertEquals("v1", h.getPageParameters().get("p1").toString());
assertEquals("v2", h.getPageParameters().get("p2").toString());
@@ -288,16 +290,16 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
*
*/
@Test
- public void decode9()
+ void decode9()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME
+ "/reference5?en--variation&p1=v1&p2=v2");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
+ assertThat(handler).isInstanceOf(ResourceReferenceRequestHandler.class);
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource5, h.getResource());
assertEquals(Locale.ENGLISH, h.getLocale());
- assertEquals(null, h.getStyle());
+ assertNull(h.getStyle());
assertEquals("variation", h.getVariation());
assertEquals(0, h.getPageParameters().getIndexedCount());
assertEquals("v1", h.getPageParameters().get("p1").toString());
@@ -308,12 +310,12 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
*
*/
@Test
- public void decode10()
+ void decode10()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME
+ "/reference6?en-style-variation&p1=v1&p2=v2");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
+ assertThat(handler).isInstanceOf(ResourceReferenceRequestHandler.class);
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource6, h.getResource());
assertEquals(Locale.ENGLISH, h.getLocale());
@@ -328,18 +330,18 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
* https://issues.apache.org/jira/browse/WICKET-5673
*/
@Test
- public void decode11()
+ void decode11()
{
Url url = Url.parse("wicket/resource/com.example.Scope/");
int score = encoder.getCompatibilityScore(getRequest(url));
- assertThat(score, is(-1));
+ assertEquals(-1, score);
}
/**
*
*/
@Test
- public void encode1()
+ void encode1()
{
ResourceReferenceRequestHandler handler = new ResourceReferenceRequestHandler(reference1,
null);
@@ -351,7 +353,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
*
*/
@Test
- public void encode2()
+ void encode2()
{
PageParameters parameters = new PageParameters();
parameters.set(0, "X");
@@ -368,7 +370,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
*
*/
@Test
- public void encode3()
+ void encode3()
{
ResourceReferenceRequestHandler handler = new ResourceReferenceRequestHandler(reference2,
null);
@@ -380,7 +382,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
*
*/
@Test
- public void encode4()
+ void encode4()
{
PageParameters parameters = new PageParameters();
parameters.set(0, "X");
@@ -398,7 +400,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
*
*/
@Test
- public void encode5()
+ void encode5()
{
ResourceReferenceRequestHandler handler = new ResourceReferenceRequestHandler(reference3,
null);
@@ -410,7 +412,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
*
*/
@Test
- public void encode6()
+ void encode6()
{
PageParameters parameters = new PageParameters();
parameters.set(0, "X");
@@ -428,7 +430,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
*
*/
@Test
- public void encode7()
+ void encode7()
{
ResourceReferenceRequestHandler handler = new ResourceReferenceRequestHandler(reference4,
null);
@@ -440,7 +442,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
*
*/
@Test
- public void encode8()
+ void encode8()
{
PageParameters parameters = new PageParameters();
parameters.set(0, "X");
@@ -458,7 +460,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
* Tests request to url encoding when style is null but variation is not
*/
@Test
- public void encode9()
+ void encode9()
{
ResourceReferenceRequestHandler handler = new ResourceReferenceRequestHandler(reference5,
null);
@@ -471,7 +473,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
*
*/
@Test
- public void versionStringInResourceFilename()
+ void versionStringInResourceFilename()
{
final IStaticCacheableResource resource = new IStaticCacheableResource()
{
@@ -565,7 +567,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
* @param version
* static version string to deliver for all queries resources
*/
- public AlphaDigitResourceVersion(String version)
+ AlphaDigitResourceVersion(String version)
{
this.version = Args.notNull(version, "version");
}
@@ -587,7 +589,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
*
*/
@Test
- public void requestWithEmptyFilename()
+ void requestWithEmptyFilename()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
@@ -598,7 +600,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
* Tests <a href="https://issues.apache.org/jira/browse/WICKET-3918">WICKET-3918</a>.
*/
@Test
- public void wicket3918()
+ void wicket3918()
{
Url url = Url
.parse("wicket/resource/org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow/res/");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
index b08ca4c..0482352 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
@@ -16,9 +16,12 @@
*/
package org.apache.wicket.core.request.mapper;
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.Matchers.is;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+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.nio.charset.Charset;
import java.util.Locale;
@@ -39,12 +42,12 @@ import org.apache.wicket.request.component.IRequestableComponent;
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.mapper.parameter.INamedParameters;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Matej Knopp
*/
-public class BookmarkableMapperTest extends AbstractMapperTest
+class BookmarkableMapperTest extends AbstractMapperTest
{
private final BookmarkableMapper encoder = new BookmarkableMapper()
@@ -68,12 +71,12 @@ public class BookmarkableMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode1()
+ void decode1()
{
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME);
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(PAGE_CLASS_NAME, page.getClass().getName());
assertEquals(0, page.getPageParameters().getIndexedCount());
@@ -84,7 +87,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
* https://issues.apache.org/jira/browse/WICKET-5500
*/
@Test
- public void decodePageClassWithPathParameters()
+ void decodePageClassWithPathParameters()
{
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + ";something=else");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
@@ -100,12 +103,11 @@ public class BookmarkableMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode2()
+ void decode2()
{
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "/indexed1?a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
-
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(PAGE_CLASS_NAME, page.getClass().getName());
@@ -126,12 +128,12 @@ public class BookmarkableMapperTest extends AbstractMapperTest
* nor in the query string) so the resolved page is assumed to be valid.
*/
@Test
- public void decode3()
+ void decode3()
{
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "?15");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
}
@@ -151,12 +153,12 @@ public class BookmarkableMapperTest extends AbstractMapperTest
* then Wicket will create a new page that will show product=24
*/
@Test
- public void decode4()
+ void decode4()
{
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "/i1/i2?15&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
RenderPageRequestHandler h = (RenderPageRequestHandler) handler;
((PageProvider) h.getPageProvider()).setPageSource(context);
IRequestablePage page = h.getPage();
@@ -172,12 +174,12 @@ public class BookmarkableMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode5()
+ void decode5()
{
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "?15--foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
@@ -192,13 +194,13 @@ public class BookmarkableMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode6()
+ void decode6()
{
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME
+ "/i1/i2?15--foo-bar&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
IRequestablePage page = h.getPage();
@@ -216,13 +218,13 @@ public class BookmarkableMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode7()
+ void decode7()
{
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME
+ "?15-ILinkListener.4-foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
@@ -237,7 +239,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode8()
+ void decode8()
{
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME
+ "/i1/i2?15-5.ILinkListener-foo-bar&a=b&b=c");
@@ -246,7 +248,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
IRequestablePage page = h.getPage();
@@ -256,29 +258,30 @@ public class BookmarkableMapperTest extends AbstractMapperTest
/**
*
*/
- @Test(expected = StalePageException.class)
- public void decode9()
+ @Test
+ void decode9()
{
- Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME
- + "/i1/i2?15-5.ILinkListener-foo-bar&a=b&b=c");
-
- context.setNextPageRenderCount(6);
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
-
- ((IPageRequestHandler)handler).getPage();
+ assertThrows(StalePageException.class, () -> {
+ Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME
+ + "/i1/i2?15-5.ILinkListener-foo-bar&a=b&b=c");
+
+ context.setNextPageRenderCount(6);
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ ((IPageRequestHandler)handler).getPage();
+ });
}
/**
* WICKET-2993
*/
@Test
- public void decode10()
+ void decode10()
{
// use String.class but any other non-Page will do the job as well
Url url = Url.parse("wicket/bookmarkable/" + String.class.getName());
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertNull("A non-page class should not create a request handler!", handler);
+ assertNull(handler, "A non-page class should not create a request handler!");
}
/**
@@ -291,7 +294,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
* {@link org.apache.wicket.core.request.mapper.IMapperContext#getBookmarkableIdentifier()}
*/
@Test
- public void decode11()
+ void decode11()
{
final Url url = Url.parse(context.getBookmarkableIdentifier() + "/" + PAGE_CLASS_NAME);
@@ -333,8 +336,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
};
IRequestHandler handler = encoder.mapRequest(request);
- assertNotNull("A handler should be resolved for relative url to a bookmarkable page!",
- handler);
+ assertNotNull(handler, "A handler should be resolved for relative url to a bookmarkable page!");
IRequestablePage page = ((IPageRequestHandler)handler).getPage();
assertEquals(page.getClass().getName(), PAGE_CLASS_NAME);
@@ -350,7 +352,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
* {@link org.apache.wicket.core.request.mapper.IMapperContext#getPageIdentifier()}
*/
@Test
- public void decode12()
+ void decode12()
{
final Url url = Url.parse(context.getBookmarkableIdentifier() + "/" + PAGE_CLASS_NAME);
@@ -391,8 +393,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
};
IRequestHandler handler = encoder.mapRequest(request);
- assertNotNull("A handler should be resolved for relative url to a page instance url!",
- handler);
+ assertNotNull(handler, "A handler should be resolved for relative url to a page instance url!");
IRequestablePage page = ((IPageRequestHandler)handler).getPage();
assertEquals(page.getClass().getName(), PAGE_CLASS_NAME);
@@ -408,7 +409,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
* {@link org.apache.wicket.core.request.mapper.IMapperContext#getPageIdentifier()}
*/
@Test
- public void decode13()
+ void decode13()
{
final Url url = Url.parse(context.getBookmarkableIdentifier() + "/" + PAGE_CLASS_NAME);
@@ -448,8 +449,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
};
IRequestHandler handler = encoder.mapRequest(request);
- assertNotNull("A handler should be resolved for relative url to a bookmarkable page url!",
- handler);
+ assertNotNull(handler, "A handler should be resolved for relative url to a bookmarkable page url!");
IRequestablePage page = ((IPageRequestHandler)handler).getPage();
assertEquals(page.getClass().getName(), PAGE_CLASS_NAME);
@@ -459,43 +459,43 @@ public class BookmarkableMapperTest extends AbstractMapperTest
* https://issues.apache.org/jira/browse/WICKET-5673
*/
@Test
- public void decode14()
+ void decode14()
{
Url url = Url.parse("wicket/bookmarkable/");
int score = encoder.getCompatibilityScore(getRequest(url));
- assertThat(score, is(0));
+ assertEquals(0, score);
}
/**
* https://issues.apache.org/jira/browse/WICKET-5996
*/
@Test
- public void decode15()
+ void decode15()
{
Url url = Url.parse("wicket/bookmarkable");
final AbstractBookmarkableMapper.UrlInfo urlInfo = encoder.parseRequest(getRequest(url));
- assertThat(urlInfo, is(nullValue()));
+ assertNull(urlInfo);
}
/**
* https://issues.apache.org/jira/browse/WICKET-5996
*/
@Test
- public void decode16()
+ void decode16()
{
Url url = Url.parse("wicket/bookmarkable/");
final AbstractBookmarkableMapper.UrlInfo urlInfo = encoder.parseRequest(getRequest(url));
- assertThat(urlInfo, is(nullValue()));
+ assertNull(urlInfo);
}
/**
*
*/
@Test
- public void encode1()
+ void encode1()
{
PageProvider provider = new PageProvider(MockPage.class, new PageParameters());
provider.setPageSource(context);
@@ -508,7 +508,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode2()
+ void encode2()
{
PageParameters parameters = new PageParameters();
parameters.set(0, "i1");
@@ -526,7 +526,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode3()
+ void encode3()
{
PageParameters parameters = new PageParameters();
parameters.set(0, "i1");
@@ -546,7 +546,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode4()
+ void encode4()
{
MockPage page = new MockPage(15);
page.getPageParameters().set(0, "i1");
@@ -566,7 +566,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode5()
+ void encode5()
{
MockPage page = new MockPage(15);
page.getPageParameters().set(0, "i1");
@@ -591,7 +591,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode6()
+ void encode6()
{
MockPage page = new MockPage(15);
page.getPageParameters().set(0, "i1");
@@ -618,7 +618,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode7()
+ void encode7()
{
MockPage page = new MockPage(15);
page.getPageParameters().set(0, "i1");
@@ -645,7 +645,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode8()
+ void encode8()
{
MockPage page = new MockPage(15);
page.setBookmarkable(true);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java
index 58e5a6d..17d2273 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java
@@ -16,7 +16,13 @@
*/
package org.apache.wicket.core.request.mapper;
-import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.function.Supplier;
@@ -51,16 +57,17 @@ import org.apache.wicket.util.crypt.ICryptFactory;
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.After;
-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;
/**
* Tests for {@link CryptoMapper}
*/
-public class CryptoMapperTest extends AbstractMapperTest
+class CryptoMapperTest extends AbstractMapperTest
{
- private static final String PLAIN_BOOKMARKABLE_URL = "wicket/bookmarkable/" + Page2.class.getName();
+ private static final String PLAIN_BOOKMARKABLE_URL = "wicket/bookmarkable/" +
+ Page2.class.getName();
private static final String ENCRYPTED_BOOKMARKABLE_URL = "L7ExSNbPC4sb6TPJDblCAopL53TWmZP5y7BQEaJSJAC05HXod5M5U7gT2yNT0lK5L6L09ZAOoZkGyUhseyPrC4S5tqUUrV6zipc4_Ni877EmwR8AyCyA-A/L7E59/5y7f2";
private static final String PLAIN_PAGE_INSTANCE_URL = "wicket/page?5";
private static final String ENCRYPTED_PAGE_INSTANCE_URL = "fyBfZ9p6trOhokHCzsQS6Q/fyBce";
@@ -70,13 +77,23 @@ public class CryptoMapperTest extends AbstractMapperTest
private WicketTester tester;
+ private static IRequestHandler unwrapRequestHandlerDelegate(IRequestHandler handler)
+ {
+ while (handler instanceof IRequestHandlerDelegate)
+ {
+ handler = ((IRequestHandlerDelegate)handler).getDelegateHandler();
+ }
+
+ return handler;
+ }
+
/**
* Creates the {@link CryptoMapper}
*
* @throws Exception
*/
- @Before
- public void before() throws Exception
+ @BeforeEach
+ void before() throws Exception
{
tester = new WicketTester(HomePage.class);
@@ -105,8 +122,8 @@ public class CryptoMapperTest extends AbstractMapperTest
/**
* @throws Exception
*/
- @After
- public void after() throws Exception
+ @AfterEach
+ void after() throws Exception
{
tester.destroy();
}
@@ -115,13 +132,13 @@ public class CryptoMapperTest extends AbstractMapperTest
* Tests that the home page is requestable.
*/
@Test
- public void homePage()
+ void homePage()
{
IRequestHandler requestHandler = mapper.mapRequest(getRequest(Url.parse("")));
- assertNotNull("Unable to map request for home page", requestHandler);
+ assertNotNull(requestHandler, "Unable to map request for home page");
requestHandler = unwrapRequestHandlerDelegate(requestHandler);
- assertThat(requestHandler, instanceOf(RenderPageRequestHandler.class));
- RenderPageRequestHandler handler = (RenderPageRequestHandler) requestHandler;
+ assertThat(requestHandler).isInstanceOf(RenderPageRequestHandler.class);
+ RenderPageRequestHandler handler = (RenderPageRequestHandler)requestHandler;
assertSame(tester.getApplication().getHomePage(), handler.getPageClass());
}
@@ -129,10 +146,11 @@ public class CryptoMapperTest extends AbstractMapperTest
* Verifies that the home page can be reached with non-encrypted query parameters.
* https://issues.apache.org/jira/browse/WICKET-4345
*
- * Also, test that the URL for the home page with non-encrypted parameters is not encrypted, to avoid unnecessary redirects.
+ * Also, test that the URL for the home page with non-encrypted parameters is not encrypted, to
+ * avoid unnecessary redirects.
*/
@Test
- public void homePageWithNonEncryptedQueryParameters()
+ void homePageWithNonEncryptedQueryParameters()
{
String expectedEncrypted = "?namedKey1=namedValue1";
PageParameters expectedParameters = new PageParameters();
@@ -149,23 +167,26 @@ public class CryptoMapperTest extends AbstractMapperTest
assertNotNull(requestHandler);
requestHandler = unwrapRequestHandlerDelegate(requestHandler);
- assertThat(requestHandler, instanceOf(RenderPageRequestHandler.class));
- RenderPageRequestHandler handler = (RenderPageRequestHandler) requestHandler;
+ assertThat(requestHandler).isInstanceOf(RenderPageRequestHandler.class);
+ RenderPageRequestHandler handler = (RenderPageRequestHandler)requestHandler;
assertEquals(tester.getApplication().getHomePage(), handler.getPageClass());
StringValue queryParam = handler.getPageParameters().get("namedKey1");
assertEquals("namedValue1", queryParam.toOptionalString());
}
/**
- * Tests that we do not allow unencrypted URLs to IRequestListeners on the home page, like: ?0-0.ILinkListener-link
+ * Tests that we do not allow unencrypted URLs to IRequestListeners on the home page, like:
+ * ?0-0.ILinkListener-link
*/
@Test
- public void homePageForceEncryptionOfRequestListener()
+ void homePageForceEncryptionOfRequestListener()
{
- PageAndComponentProvider provider = new PageAndComponentProvider(tester.getApplication().getHomePage(), "link");
+ PageAndComponentProvider provider = new PageAndComponentProvider(
+ tester.getApplication().getHomePage(), "link");
IRequestHandler requestHandler = new BookmarkableListenerRequestHandler(provider);
Url plainUrl = mapper.getDelegateMapper().mapHandler(requestHandler);
- assertTrue("Plain URL for home page has segments: " + plainUrl.toString(), plainUrl.getSegments().isEmpty());
+ assertTrue(plainUrl.getSegments().isEmpty(),
+ "Plain URL for home page has segments: " + plainUrl.toString());
assertNull(mapper.mapRequest(getRequest(plainUrl)));
}
@@ -173,10 +194,10 @@ public class CryptoMapperTest extends AbstractMapperTest
* Tests that URLs for bookmarkable pages are encrypted.
*/
@Test
- public void bookmarkablePageEncrypt()
+ void bookmarkablePageEncrypt()
{
- IRequestHandler renderPage2BookmarkableHandler = new RenderPageRequestHandler(new PageProvider(
- Page2.class, new PageParameters()));
+ IRequestHandler renderPage2BookmarkableHandler = new RenderPageRequestHandler(
+ new PageProvider(Page2.class, new PageParameters()));
Url plainTextUrl = mapper.getDelegateMapper().mapHandler(renderPage2BookmarkableHandler);
@@ -187,10 +208,11 @@ public class CryptoMapperTest extends AbstractMapperTest
}
/**
- * Tests that encrypted URLs for bookmarkable pages are decrypted and passed to the wrapped mapper.
+ * Tests that encrypted URLs for bookmarkable pages are decrypted and passed to the wrapped
+ * mapper.
*/
@Test
- public void bookmarkablePageDecrypt()
+ void bookmarkablePageDecrypt()
{
Request request = getRequest(Url.parse(ENCRYPTED_BOOKMARKABLE_URL));
IRequestHandler requestHandler = mapper.mapRequest(request);
@@ -198,23 +220,24 @@ public class CryptoMapperTest extends AbstractMapperTest
assertNotNull(requestHandler);
requestHandler = unwrapRequestHandlerDelegate(requestHandler);
- assertThat(requestHandler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(requestHandler).isInstanceOf(RenderPageRequestHandler.class);
- RenderPageRequestHandler handler = (RenderPageRequestHandler) requestHandler;
+ RenderPageRequestHandler handler = (RenderPageRequestHandler)requestHandler;
assertEquals(Page2.class, handler.getPageClass());
}
/**
* https://issues.apache.org/jira/browse/WICKET-6131
*
- * Tests that encrypted URLs for bookmarkable pages are decrypted and passed to the wrapped mapper.
- * Extra segments should be ignored.
+ * Tests that encrypted URLs for bookmarkable pages are decrypted and passed to the wrapped
+ * mapper. Extra segments should be ignored.
*/
@Test
- public void bookmarkablePageDecrypt2()
+ void bookmarkablePageDecrypt2()
{
String encryptedExtraSegments = "/i87b7/i87b7";
- Request request = getRequest(Url.parse(ENCRYPTED_BOOKMARKABLE_URL + encryptedExtraSegments));
+ Request request = getRequest(
+ Url.parse(ENCRYPTED_BOOKMARKABLE_URL + encryptedExtraSegments));
IRequestHandler requestHandler = mapper.mapRequest(request);
assertNotNull(requestHandler);
@@ -222,16 +245,16 @@ public class CryptoMapperTest extends AbstractMapperTest
assertTrue(requestHandler instanceof RenderPageRequestHandler);
- RenderPageRequestHandler handler = (RenderPageRequestHandler) requestHandler;
+ RenderPageRequestHandler handler = (RenderPageRequestHandler)requestHandler;
assertEquals(Page2.class, handler.getPageClass());
}
/**
- * Tests that encrypted URLs for bookmarkable pages are decrypted and passed to the wrapped mapper when there is more than
- * one cryptomapper installed.
+ * Tests that encrypted URLs for bookmarkable pages are decrypted and passed to the wrapped
+ * mapper when there is more than one cryptomapper installed.
*/
@Test
- public void bookmarkablePageDecryptMultipleCryptoMapper()
+ void bookmarkablePageDecryptMultipleCryptoMapper()
{
Request request = getRequest(Url.parse(ENCRYPTED_BOOKMARKABLE_URL));
@@ -241,9 +264,9 @@ public class CryptoMapperTest extends AbstractMapperTest
assertNotNull(requestHandler);
requestHandler = unwrapRequestHandlerDelegate(requestHandler);
- assertThat(requestHandler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(requestHandler).isInstanceOf(RenderPageRequestHandler.class);
- RenderPageRequestHandler handler = (RenderPageRequestHandler) requestHandler;
+ RenderPageRequestHandler handler = (RenderPageRequestHandler)requestHandler;
assertEquals(Page2.class, handler.getPageClass());
}
@@ -251,9 +274,10 @@ public class CryptoMapperTest extends AbstractMapperTest
* Tests that plain text URLs to bookmarkable pages are not mapped.
*/
@Test
- public void bookmarkablePageForceEncryption()
+ void bookmarkablePageForceEncryption()
{
- IRequestHandler requestHandler = mapper.mapRequest(getRequest(Url.parse(PLAIN_BOOKMARKABLE_URL)));
+ IRequestHandler requestHandler = mapper
+ .mapRequest(getRequest(Url.parse(PLAIN_BOOKMARKABLE_URL)));
assertNull(requestHandler);
}
@@ -262,14 +286,14 @@ public class CryptoMapperTest extends AbstractMapperTest
* wicket/bookmarkable/my.package.page?0-0.ILinkListener-link
*/
@Test
- public void bookmarkablePageForceEncryptionOfRequestListener()
+ void bookmarkablePageForceEncryptionOfRequestListener()
{
PageAndComponentProvider provider = new PageAndComponentProvider(Page2.class, "link");
IRequestHandler requestHandler = new BookmarkableListenerRequestHandler(provider);
Url plainUrl = mapper.getDelegateMapper().mapHandler(requestHandler);
- assertTrue("Plain text request listener URL for bookmarkable page does not start with: "
- + PLAIN_BOOKMARKABLE_URL + ": " + plainUrl.toString(),
- plainUrl.toString().startsWith(PLAIN_BOOKMARKABLE_URL));
+ assertTrue(plainUrl.toString().startsWith(PLAIN_BOOKMARKABLE_URL),
+ "Plain text request listener URL for bookmarkable page does not start with: " +
+ PLAIN_BOOKMARKABLE_URL + ": " + plainUrl.toString());
assertNull(mapper.mapRequest(getRequest(plainUrl)));
}
@@ -277,12 +301,13 @@ public class CryptoMapperTest extends AbstractMapperTest
* Tests that URLs for page instances are encrypted (/wicket/page?5)
*/
@Test
- public void pageInstanceEncrypt()
+ void pageInstanceEncrypt()
{
MockPage page = new MockPage(5);
IRequestHandler requestHandler = new RenderPageRequestHandler(new PageProvider(page));
- assertEquals(PLAIN_PAGE_INSTANCE_URL, mapper.getDelegateMapper().mapHandler(requestHandler).toString());
+ assertEquals(PLAIN_PAGE_INSTANCE_URL,
+ mapper.getDelegateMapper().mapHandler(requestHandler).toString());
assertEquals(ENCRYPTED_PAGE_INSTANCE_URL, mapper.mapHandler(requestHandler).toString());
}
@@ -290,15 +315,16 @@ public class CryptoMapperTest extends AbstractMapperTest
* Make sure that encrypted page instance URLs are decrypted and the correct handler resolved.
*/
@Test
- public void pageInstanceDecrypt()
+ void pageInstanceDecrypt()
{
- IRequestHandler requestHandler = mapper.mapRequest(getRequest(Url.parse(ENCRYPTED_PAGE_INSTANCE_URL)));
+ IRequestHandler requestHandler = mapper
+ .mapRequest(getRequest(Url.parse(ENCRYPTED_PAGE_INSTANCE_URL)));
assertNotNull(requestHandler);
requestHandler = unwrapRequestHandlerDelegate(requestHandler);
- assertThat(requestHandler, instanceOf(RenderPageRequestHandler.class));
- RenderPageRequestHandler handler = (RenderPageRequestHandler) requestHandler;
+ assertThat(requestHandler).isInstanceOf(RenderPageRequestHandler.class);
+ RenderPageRequestHandler handler = (RenderPageRequestHandler)requestHandler;
assertEquals(5, handler.getPageId().intValue());
}
@@ -306,7 +332,7 @@ public class CryptoMapperTest extends AbstractMapperTest
* Make sure that encrypted page instance URLs are decrypted and the correct handler resolved.
*/
@Test
- public void pageInstanceDecryptMultipleCryptoMapper()
+ void pageInstanceDecryptMultipleCryptoMapper()
{
IRequestHandler requestHandler = new CryptoMapper(mapper, tester.getApplication())
.mapRequest(getRequest(Url.parse(ENCRYPTED_PAGE_INSTANCE_URL)));
@@ -314,8 +340,8 @@ public class CryptoMapperTest extends AbstractMapperTest
assertNotNull(requestHandler);
requestHandler = unwrapRequestHandlerDelegate(requestHandler);
- assertThat(requestHandler, instanceOf(RenderPageRequestHandler.class));
- RenderPageRequestHandler handler = (RenderPageRequestHandler) requestHandler;
+ assertThat(requestHandler).isInstanceOf(RenderPageRequestHandler.class);
+ RenderPageRequestHandler handler = (RenderPageRequestHandler)requestHandler;
assertEquals(5, handler.getPageId().intValue());
}
@@ -323,7 +349,7 @@ public class CryptoMapperTest extends AbstractMapperTest
* Tests that plain text requests to a page instance URL are not mapped.
*/
@Test
- public void pageInstanceForceEncryption()
+ void pageInstanceForceEncryption()
{
assertNull(mapper.mapRequest(getRequest(Url.parse(PLAIN_PAGE_INSTANCE_URL))));
}
@@ -332,9 +358,10 @@ public class CryptoMapperTest extends AbstractMapperTest
* Tests that mounted pages are still accessible through their mounted URL.
*/
@Test
- public void mountedPage()
+ void mountedPage()
{
- IRequestHandler requestHandler = new RenderPageRequestHandler(new PageProvider(Page1.class));
+ IRequestHandler requestHandler = new RenderPageRequestHandler(
+ new PageProvider(Page1.class));
assertEquals(MOUNTED_URL, mapper.mapHandler(requestHandler).toString());
@@ -344,20 +371,21 @@ public class CryptoMapperTest extends AbstractMapperTest
requestHandler = unwrapRequestHandlerDelegate(requestHandler);
- assertThat(requestHandler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(requestHandler).isInstanceOf(RenderPageRequestHandler.class);
- assertEquals(Page1.class, ((RenderPageRequestHandler) requestHandler).getPageClass());
+ assertEquals(Page1.class, ((RenderPageRequestHandler)requestHandler).getPageClass());
}
/**
* Tests that PageComponentInfo parameters are encrypted on Mounted pages
*/
@Test
- public void mountedPageRequestListenerParameter()
+ void mountedPageRequestListenerParameter()
{
final String componentPath = "link";
- PageAndComponentProvider provider = new PageAndComponentProvider(Page1.class, componentPath);
+ PageAndComponentProvider provider = new PageAndComponentProvider(Page1.class,
+ componentPath);
IRequestHandler requestHandler = new ListenerRequestHandler(provider);
Url plainUrl = mapper.getDelegateMapper().mapHandler(requestHandler);
@@ -381,7 +409,7 @@ public class CryptoMapperTest extends AbstractMapperTest
if (Strings.isEmpty(qp.getValue()))
{
PageComponentInfo pci = PageComponentInfo.parse(qp.getName());
- assertNull("PageComponentInfo query parameter not encrypted", pci);
+ assertNull(pci, "PageComponentInfo query parameter not encrypted");
}
}
@@ -391,14 +419,15 @@ public class CryptoMapperTest extends AbstractMapperTest
requestHandler = unwrapRequestHandlerDelegate(requestHandler);
- assertThat(requestHandler, instanceOf(ListenerRequestHandler.class));
+ assertThat(requestHandler).isInstanceOf(ListenerRequestHandler.class);
- ListenerRequestHandler handler = (ListenerRequestHandler) requestHandler;
+ ListenerRequestHandler handler = (ListenerRequestHandler)requestHandler;
assertEquals(componentPath, handler.getComponentPath());
assertEquals(Page1.class, handler.getPageClass());
/*
- * We anticipate that sometimes multiple cryptomappers will be used. It should still work in these situations.
+ * We anticipate that sometimes multiple cryptomappers will be used. It should still work in
+ * these situations.
*/
requestHandler = new CryptoMapper(mapper, tester.getApplication())
.mapRequest(getRequest(encryptedUrl));
@@ -407,9 +436,9 @@ public class CryptoMapperTest extends AbstractMapperTest
requestHandler = unwrapRequestHandlerDelegate(requestHandler);
- assertThat(requestHandler, instanceOf(ListenerRequestHandler.class));
+ assertThat(requestHandler).isInstanceOf(ListenerRequestHandler.class);
- handler = (ListenerRequestHandler) requestHandler;
+ handler = (ListenerRequestHandler)requestHandler;
assertEquals(componentPath, handler.getComponentPath());
assertEquals(Page1.class, handler.getPageClass());
}
@@ -418,24 +447,23 @@ public class CryptoMapperTest extends AbstractMapperTest
* Tests that the compatability score is correctly calculated from wrapped mapper.
*/
@Test
- public void compatabilityScore()
+ void compatabilityScore()
{
- int delegateHomePageScore = mapper.getDelegateMapper().getCompatibilityScore(
- getRequest(Url.parse("")));
- int cryptoHomePageScore = mapper.getCompatibilityScore(
- getRequest(Url.parse("")));
+ int delegateHomePageScore = mapper.getDelegateMapper()
+ .getCompatibilityScore(getRequest(Url.parse("")));
+ int cryptoHomePageScore = mapper.getCompatibilityScore(getRequest(Url.parse("")));
assertEquals(delegateHomePageScore, cryptoHomePageScore);
- int delegateBookmarkableScore = mapper.getDelegateMapper().getCompatibilityScore(
- getRequest(Url.parse(PLAIN_BOOKMARKABLE_URL)));
- int cryptoBookmarkableScore = mapper.getCompatibilityScore(
- getRequest(Url.parse(ENCRYPTED_BOOKMARKABLE_URL)));
+ int delegateBookmarkableScore = mapper.getDelegateMapper()
+ .getCompatibilityScore(getRequest(Url.parse(PLAIN_BOOKMARKABLE_URL)));
+ int cryptoBookmarkableScore = mapper
+ .getCompatibilityScore(getRequest(Url.parse(ENCRYPTED_BOOKMARKABLE_URL)));
assertEquals(delegateBookmarkableScore, cryptoBookmarkableScore);
- int delegatePageInstanceScore = mapper.getDelegateMapper().getCompatibilityScore(
- getRequest(Url.parse(PLAIN_PAGE_INSTANCE_URL)));
- int cryptoPageInstanceScore = mapper.getCompatibilityScore(
- getRequest(Url.parse(ENCRYPTED_PAGE_INSTANCE_URL)));
+ int delegatePageInstanceScore = mapper.getDelegateMapper()
+ .getCompatibilityScore(getRequest(Url.parse(PLAIN_PAGE_INSTANCE_URL)));
+ int cryptoPageInstanceScore = mapper
+ .getCompatibilityScore(getRequest(Url.parse(ENCRYPTED_PAGE_INSTANCE_URL)));
assertEquals(delegatePageInstanceScore, cryptoPageInstanceScore);
}
@@ -443,7 +471,7 @@ public class CryptoMapperTest extends AbstractMapperTest
* Test a failed decrypt, WICKET-4139
*/
@Test
- public void decryptFailed()
+ void decryptFailed()
{
String encrypted = "style.css";
@@ -456,7 +484,7 @@ public class CryptoMapperTest extends AbstractMapperTest
* Tests that named and indexed parameters are properly (en|de)crypted
*/
@Test
- public void pageParameters()
+ void pageParameters()
{
String expectedEncrypted = "L7ExSNbPC4sb6TPJDblCAopL53TWmZP5y7BQEaJSJAC05HXod5M5U7gT2yNT0lK5L6L09ZAOoZkGyUhseyPrC4S5tqUUrV6zipc4_Ni877FDOOoE5C_Cd7YCyK1xSScpVhno6LeBz2wiu5oWyf7hB1RKcv6zkhEBmbx8vU7K7-e4xe1_LO8Y3fhEjMSQyU9BVh7Uz4HKzkR2OxFo5LaDzQ/L7E59/yPr6a/5L6ae/OxF2c";
@@ -474,9 +502,9 @@ public class CryptoMapperTest extends AbstractMapperTest
IRequestHandler requestHandler = mapper.mapRequest(request);
assertNotNull(requestHandler);
requestHandler = unwrapRequestHandlerDelegate(requestHandler);
- assertThat(requestHandler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(requestHandler).isInstanceOf(RenderPageRequestHandler.class);
- RenderPageRequestHandler handler = (RenderPageRequestHandler) requestHandler;
+ RenderPageRequestHandler handler = (RenderPageRequestHandler)requestHandler;
assertEquals(Page2.class, handler.getPageClass());
PageParameters actualParameters = handler.getPageParameters();
assertEquals(expectedParameters, actualParameters);
@@ -486,7 +514,7 @@ public class CryptoMapperTest extends AbstractMapperTest
* UrlResourceReferences, WICKET-5319
*/
@Test
- public void urlResourceReference()
+ void urlResourceReference()
{
UrlResourceReference resource = new UrlResourceReference(
Url.parse("http://wicket.apache.org/"));
@@ -499,7 +527,7 @@ public class CryptoMapperTest extends AbstractMapperTest
* Relative ResourceReferences, WICKET-3514
*/
@Test
- public void resourceReference()
+ void resourceReference()
{
PackageResourceReference resource = new PackageResourceReference(getClass(),
"crypt/crypt.txt");
@@ -511,8 +539,8 @@ public class CryptoMapperTest extends AbstractMapperTest
assertNotNull(requestHandler);
requestHandler = unwrapRequestHandlerDelegate(requestHandler);
- assertThat(requestHandler, instanceOf(ResourceReferenceRequestHandler.class));
- ResourceReferenceRequestHandler handler = (ResourceReferenceRequestHandler) requestHandler;
+ assertThat(requestHandler).isInstanceOf(ResourceReferenceRequestHandler.class);
+ ResourceReferenceRequestHandler handler = (ResourceReferenceRequestHandler)requestHandler;
assertEquals(getClass(), handler.getResourceReference().getScope());
assertEquals("crypt/crypt.txt", handler.getResourceReference().getName());
@@ -522,7 +550,7 @@ public class CryptoMapperTest extends AbstractMapperTest
* Relative ResourceReferences, WICKET-3514
*/
@Test
- public void resourceReferenceWithModifiedSegments()
+ void resourceReferenceWithModifiedSegments()
{
PackageResourceReference resource = new PackageResourceReference(getClass(),
"crypt/crypt.txt");
@@ -536,8 +564,8 @@ public class CryptoMapperTest extends AbstractMapperTest
assertNotNull(requestHandler);
requestHandler = unwrapRequestHandlerDelegate(requestHandler);
- assertThat(requestHandler, instanceOf(ResourceReferenceRequestHandler.class));
- ResourceReferenceRequestHandler handler = (ResourceReferenceRequestHandler) requestHandler;
+ assertThat(requestHandler).isInstanceOf(ResourceReferenceRequestHandler.class);
+ ResourceReferenceRequestHandler handler = (ResourceReferenceRequestHandler)requestHandler;
assertEquals(getClass(), handler.getResourceReference().getScope());
assertEquals("crypt/modified-crypt.txt", handler.getResourceReference().getName());
@@ -547,7 +575,7 @@ public class CryptoMapperTest extends AbstractMapperTest
* Relative ResourceReferences, WICKET-3514
*/
@Test
- public void resourceReferenceWithMoreSegments()
+ void resourceReferenceWithMoreSegments()
{
PackageResourceReference resource = new PackageResourceReference(getClass(),
"crypt/crypt.txt");
@@ -562,7 +590,7 @@ public class CryptoMapperTest extends AbstractMapperTest
assertNotNull(requestHandler);
requestHandler = unwrapRequestHandlerDelegate(requestHandler);
- ResourceReferenceRequestHandler handler = (ResourceReferenceRequestHandler) requestHandler;
+ ResourceReferenceRequestHandler handler = (ResourceReferenceRequestHandler)requestHandler;
assertEquals(getClass(), handler.getResourceReference().getScope());
assertEquals("crypt/more/more-crypt.txt", handler.getResourceReference().getName());
@@ -572,7 +600,7 @@ public class CryptoMapperTest extends AbstractMapperTest
* Relative ResourceReferences, WICKET-3514
*/
@Test
- public void resourceReferenceWithLessSegments()
+ void resourceReferenceWithLessSegments()
{
PackageResourceReference resource = new PackageResourceReference(getClass(),
"crypt/crypt.txt");
@@ -587,8 +615,8 @@ public class CryptoMapperTest extends AbstractMapperTest
assertNotNull(requestHandler);
requestHandler = unwrapRequestHandlerDelegate(requestHandler);
- assertThat(requestHandler, instanceOf(ResourceReferenceRequestHandler.class));
- ResourceReferenceRequestHandler handler = (ResourceReferenceRequestHandler) requestHandler;
+ assertThat(requestHandler).isInstanceOf(ResourceReferenceRequestHandler.class);
+ ResourceReferenceRequestHandler handler = (ResourceReferenceRequestHandler)requestHandler;
assertEquals(getClass(), handler.getResourceReference().getScope());
assertEquals("less-crypt.txt", handler.getResourceReference().getName());
@@ -598,7 +626,7 @@ public class CryptoMapperTest extends AbstractMapperTest
* Additional parameters, WICKET-4923
*/
@Test
- public void additionalParameters()
+ void additionalParameters()
{
MockPage page = new MockPage();
IRequestableComponent c = page.get("foo:bar");
@@ -612,16 +640,17 @@ public class CryptoMapperTest extends AbstractMapperTest
IRequestHandler requestHandler = mapper.mapRequest(request);
- assertThat(requestHandler, instanceOf(RequestSettingRequestHandler.class));
+ assertThat(requestHandler).isInstanceOf(RequestSettingRequestHandler.class);
- assertEquals("foo", ((RequestSettingRequestHandler) requestHandler).getRequest()
- .getUrl()
- .getQueryParameterValue("q")
- .toString());
+ assertEquals("foo",
+ ((RequestSettingRequestHandler)requestHandler).getRequest()
+ .getUrl()
+ .getQueryParameterValue("q")
+ .toString());
}
@Test
- public void markedEncryptedUrlDecrypt()
+ void markedEncryptedUrlDecrypt()
{
mapper.setMarkEncryptedUrls(true);
Request request = getRequest(Url.parse("crypt." + ENCRYPTED_BOOKMARKABLE_URL));
@@ -632,29 +661,23 @@ public class CryptoMapperTest extends AbstractMapperTest
assertTrue(requestHandler instanceof RenderPageRequestHandler);
- RenderPageRequestHandler handler = (RenderPageRequestHandler) requestHandler;
+ RenderPageRequestHandler handler = (RenderPageRequestHandler)requestHandler;
assertEquals(Page2.class, handler.getPageClass());
}
- @Test(expected = PageExpiredException.class)
- public void expiredMarkedEncryptedUrlThrowsPageExpiredException()
+ @Test
+ void expiredMarkedEncryptedUrlThrowsPageExpiredException()
{
mapper.setMarkEncryptedUrls(true);
- Url encryptedUrl = mapper.mapHandler(new RenderPageRequestHandler(new PageProvider(Page2.class)));
+ Url encryptedUrl = mapper
+ .mapHandler(new RenderPageRequestHandler(new PageProvider(Page2.class)));
assertTrue(encryptedUrl.getSegments().get(0).startsWith("crypt."));
encryptedUrl.getSegments().remove(0);
encryptedUrl.getSegments().add(0, "crypt.no decryptable");
- mapper.mapRequest(getRequest(encryptedUrl));
- }
- private static IRequestHandler unwrapRequestHandlerDelegate(IRequestHandler handler)
- {
- while (handler instanceof IRequestHandlerDelegate)
- {
- handler = ((IRequestHandlerDelegate) handler).getDelegateHandler();
- }
-
- return handler;
+ assertThrows(PageExpiredException.class, () -> {
+ mapper.mapRequest(getRequest(encryptedUrl));
+ });
}
/**
@@ -664,14 +687,15 @@ public class CryptoMapperTest extends AbstractMapperTest
{
public HomePage()
{
- add(new Link<Void>("link") {
+ add(new Link<Void>("link")
+ {
@Override
public void onClick()
{
}
});
}
-
+
@Override
public IMarkupFragment getMarkup()
{
@@ -686,14 +710,15 @@ public class CryptoMapperTest extends AbstractMapperTest
{
public Page1()
{
- add(new Link<Void>("link") {
+ add(new Link<Void>("link")
+ {
@Override
public void onClick()
{
}
});
}
-
+
@Override
public IMarkupFragment getMarkup()
{
@@ -708,14 +733,15 @@ public class CryptoMapperTest extends AbstractMapperTest
{
public Page2()
{
- add(new Link<Void>("link") {
+ add(new Link<Void>("link")
+ {
@Override
public void onClick()
{
}
});
}
-
+
@Override
public IMarkupFragment getMarkup()
{
[04/45] wicket git commit: - upgrade junit4 with junit5 in
wicket-util - replace Junit4 Methods in WicketTester.java - remove junit 4
dependencies in pom.xml
Posted by mg...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlEncoderTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlEncoderTest.java b/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlEncoderTest.java
index 1f86c05..965256e 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlEncoderTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlEncoderTest.java
@@ -17,12 +17,13 @@
package org.apache.wicket.util.encoding;
import org.apache.wicket.util.crypt.CharEncoding;
-import org.apache.wicket.util.encoding.UrlEncoder;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
@SuppressWarnings("javadoc")
-public class UrlEncoderTest extends Assert
+public class UrlEncoderTest
{
// starts with ä
@@ -40,7 +41,7 @@ public class UrlEncoderTest extends Assert
}
}
}
-
+
@Test
public void queryStringUnencoded() {
String unencoded = "azAZ09.-_~!$*,:@/";
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/file/FilesTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/file/FilesTest.java b/wicket-util/src/test/java/org/apache/wicket/util/file/FilesTest.java
index 75fdab8..2b9986b 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/file/FilesTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/file/FilesTest.java
@@ -16,22 +16,21 @@
*/
package org.apache.wicket.util.file;
-import static java.lang.System.currentTimeMillis;
-import static org.hamcrest.Matchers.lessThan;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.net.URL;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static java.lang.System.currentTimeMillis;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
/**
* Tests for {@link Files}
*/
-public class FilesTest extends Assert
+public class FilesTest
{
/**
* Tests for {@link Files#remove(java.io.File)}
@@ -41,59 +40,82 @@ public class FilesTest extends Assert
@Test
public void remove() throws IOException
{
- assertFalse("'null' files are not deleted.", Files.remove(null));
+ assertFalse(Files.remove(null), "'null' files are not deleted.");
- assertFalse("Non existing files are not deleted.", Files.remove(new File(
- "/somethingThatDoesntExistsOnMostMachines-111111111111111111111111111111")));
+ assertFalse(
+ Files.remove(new File(
+ "/somethingThatDoesntExistsOnMostMachines-111111111111111111111111111111")),
+ "Non existing files are not deleted.");
java.io.File file = getFile();
file.createNewFile();
- assertTrue("The just created file should exist!", file.isFile());
+ assertTrue(file.isFile(), "The just created file should exist!");
boolean removed = Files.remove(file);
- assertFalse("The just removed file should not exist!", file.exists());
- assertTrue("Files.remove(file) should remove the file", removed);
+ assertFalse(file.exists(), "The just removed file should not exist!");
+ assertTrue(removed, "Files.remove(file) should remove the file");
// try to remove non-existing file
removed = Files.remove(file);
- assertFalse("The just removed file should not exist!", file.exists());
- assertFalse("Files.remove(file) should not remove the file", removed);
+ assertFalse(file.exists(), "The just removed file should not exist!");
+ assertFalse(removed, "Files.remove(file) should not remove the file");
// try to remove a folder
java.io.File folder = getFolder();
Files.mkdirs(folder);
assertTrue(folder.isDirectory());
- assertFalse("Should not be able to delete a folder, even empty one.", Files.remove(folder));
- assertTrue("Should not be able to delete a folder.", Files.removeFolder(folder));
+ assertFalse(Files.remove(folder), "Should not be able to delete a folder, even empty one.");
+ assertTrue(Files.removeFolder(folder), "Should not be able to delete a folder.");
+ }
+
+ /**
+ * @return a reference to a file, without creating it !
+ * @throws IOException
+ */
+ private java.io.File getFile() throws IOException
+ {
+ return new java.io.File(System.getProperty("java.io.tmpdir"), "wicket-7.x-test-file");
+ }
+
+ /**
+ * @return a reference to a folder, without creating it !
+ */
+ private java.io.File getFolder()
+ {
+ File folder = new File(System.getProperty("java.io.tmpdir"), "wicket-7.x-test-folder");
+ return folder;
}
/**
- * WICKET-6236 - honoring the javadoc by putting a wait only after the 10th failed attempt to delete a file
+ * WICKET-6236 - honoring the javadoc by putting a wait only after the 10th failed attempt to
+ * delete a file
*/
@Test
- public void dontWaitTooMuchIfCantDelete(){
+ public void dontWaitTooMuchIfCantDelete()
+ {
java.io.File f = mock(java.io.File.class);
when(f.isFile()).thenReturn(true);
when(f.delete()).thenReturn(false);
long start = currentTimeMillis();
Files.remove(f);
long end = currentTimeMillis();
- assertThat(end - start, lessThan(5000l));
+ assertTrue((end - start) < 5000l);
}
-
/**
* Tests for {@link Files#removeFolder(java.io.File)}
- *
+ *
* @throws Exception
*/
@Test
public void removeFolder() throws Exception
{
- assertFalse("'null' folders are not deleted.", Files.removeFolder(null));
+ assertFalse(Files.removeFolder(null), "'null' folders are not deleted.");
- assertFalse("Non existing folders are not deleted.", Files.removeFolder(new File(
- "/somethingThatDoesntExistsOnMostMachines-111111111111111111111111111111")));
+ assertFalse(
+ Files.removeFolder(new File(
+ "/somethingThatDoesntExistsOnMostMachines-111111111111111111111111111111")),
+ "Non existing folders are not deleted.");
java.io.File folder = new File(System.getProperty("java.io.tmpdir"), "wicket-test-folder");
Files.mkdirs(folder);
@@ -102,35 +124,35 @@ public class FilesTest extends Assert
file.createNewFile();
assertTrue(file.exists());
- assertTrue("Should be able to delete a folder.", Files.removeFolder(folder));
+ assertTrue(Files.removeFolder(folder), "Should be able to delete a folder.");
}
/**
* Tests for {@link Files#removeAsync(java.io.File, IFileCleaner)}
- *
+ *
* @throws Exception
*/
@Test
- @Ignore // the test is unreliable on the CI server
+ @Disabled // the test is unreliable on the CI server
public void removeAsync() throws Exception
{
IFileCleaner fileCleaner = new FileCleaner();
- assertFalse("'null' files are not deleted.", Files.removeAsync(null, fileCleaner));
+ assertFalse(Files.removeAsync(null, fileCleaner), "'null' files are not deleted.");
File nonExistingFile = new File(
"/somethingThatDoesntExistsOnMostMachines-111111111111111111111111111111");
- assertTrue("Even non existing file are scheduled for deletion.",
- Files.removeFolderAsync(nonExistingFile, fileCleaner));
+ assertTrue(Files.removeFolderAsync(nonExistingFile, fileCleaner),
+ "Even non existing file are scheduled for deletion.");
assertFalse(nonExistingFile.exists());
java.io.File file = getFile();
file.createNewFile();
- assertTrue("The just created file should exist!", file.exists());
+ assertTrue(file.exists(), "The just created file should exist!");
assertTrue(file.isFile());
- assertTrue("The file is scheduled for deletion.", Files.removeAsync(file, fileCleaner));
+ assertTrue(Files.removeAsync(file, fileCleaner), "The file is scheduled for deletion.");
// remove the reference to the file to be deleted
// this way the FileCleaningTracker's ReferenceQueue will mark it as eligible for GC
@@ -149,26 +171,26 @@ public class FilesTest extends Assert
break;
}
}
- assertFalse("The file no longer exists", exists);
+ assertFalse(exists, "The file no longer exists");
}
/**
* Tests for {@link Files#removeFolderAsync(java.io.File, IFileCleaner)}
- *
+ *
* @throws Exception
*/
@Test
- @Ignore // the test is unreliable on the CI server
+ @Disabled // the test is unreliable on the CI server
public void removeFolderAsync() throws Exception
{
- assertFalse("'null' folders are not deleted.", Files.removeFolderAsync(null, null));
+ assertFalse(Files.removeFolderAsync(null, null), "'null' folders are not deleted.");
IFileCleaner fileCleaner = new FileCleaner();
File nonExistingFolder = new File(
"/somethingThatDoesntExistsOnMostMachines-111111111111111111111111111111");
- assertTrue("Even non existing folders are scheduled for deletion.",
- Files.removeFolderAsync(nonExistingFolder, fileCleaner));
+ assertTrue(Files.removeFolderAsync(nonExistingFolder, fileCleaner),
+ "Even non existing folders are scheduled for deletion.");
assertFalse(nonExistingFolder.exists());
java.io.File folder = getFolder();
@@ -178,8 +200,8 @@ public class FilesTest extends Assert
file.createNewFile();
assertTrue(file.exists());
- assertTrue("The folder is scheduled for deletion.",
- Files.removeFolderAsync(folder, fileCleaner));
+ assertTrue(Files.removeFolderAsync(folder, fileCleaner),
+ "The folder is scheduled for deletion.");
// remove the reference to the folder to be deleted
// this way the FileCleaningTracker's ReferenceQueue will mark it as eligible for GC
@@ -189,12 +211,12 @@ public class FilesTest extends Assert
System.gc();
Thread.sleep(5);
java.io.File newFolderReference = getFolder();
- assertFalse("The folder still exists", newFolderReference.exists());
+ assertFalse(newFolderReference.exists(), "The folder still exists");
}
/**
* WICKET-4509
- *
+ *
* @throws Exception
*/
@Test
@@ -202,25 +224,8 @@ public class FilesTest extends Assert
{
URL url = new URL("file:/file%20with%20whitespace");
- assertEquals( java.io.File.separator + "file with whitespace", Files.getLocalFileFromUrl(url).getPath());
- }
-
- /**
- * @return a reference to a folder, without creating it !
- */
- private java.io.File getFolder()
- {
- File folder = new File(System.getProperty("java.io.tmpdir"), "wicket-7.x-test-folder");
- return folder;
- }
-
- /**
- * @return a reference to a file, without creating it !
- * @throws IOException
- */
- private java.io.File getFile() throws IOException
- {
- return new java.io.File(System.getProperty("java.io.tmpdir"), "wicket-7.x-test-file");
+ assertEquals(java.io.File.separator + "file with whitespace",
+ Files.getLocalFileFromUrl(url).getPath());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/file/WebXmlFileTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/file/WebXmlFileTest.java b/wicket-util/src/test/java/org/apache/wicket/util/file/WebXmlFileTest.java
index 4f76c6c..9e16f1a 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/file/WebXmlFileTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/file/WebXmlFileTest.java
@@ -16,20 +16,20 @@
*/
package org.apache.wicket.util.file;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
+import org.junit.jupiter.api.Test;
+import org.xml.sax.SAXException;
import javax.xml.parsers.ParserConfigurationException;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.xml.sax.SAXException;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
/**
*
*/
-public class WebXmlFileTest extends Assert
+public class WebXmlFileTest
{
/**
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/io/ConnectionsTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/io/ConnectionsTest.java b/wicket-util/src/test/java/org/apache/wicket/util/io/ConnectionsTest.java
index ef95539..8608ad4 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/io/ConnectionsTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/io/ConnectionsTest.java
@@ -16,21 +16,16 @@
*/
package org.apache.wicket.util.io;
-import static org.junit.Assert.*;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.notNullValue;
+import org.apache.wicket.util.time.Time;
+import org.junit.jupiter.api.Test;
import java.net.URL;
-import org.apache.wicket.util.SlowTests;
-import org.apache.wicket.util.time.Time;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
@SuppressWarnings("javadoc")
-@Category(SlowTests.class)
-public class ConnectionsTest
+public class ConnectionsTest
{
/**
* https://issues.apache.org/jira/browse/WICKET-5838
@@ -40,7 +35,7 @@ public class ConnectionsTest
{
URL url = new URL("http://wicket.apache.org/learn/books/wia.png");
Time lastModified = Connections.getLastModified(url);
- assertThat(lastModified, is(notNullValue()));
- assertThat(lastModified.getMilliseconds(), is(not(0L)));
+ assertNotNull(lastModified);
+ assertNotEquals(lastModified.getMilliseconds(), 0L);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/io/LastModifiedTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/io/LastModifiedTest.java b/wicket-util/src/test/java/org/apache/wicket/util/io/LastModifiedTest.java
index 866be29..481ef87 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/io/LastModifiedTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/io/LastModifiedTest.java
@@ -16,19 +16,20 @@
*/
package org.apache.wicket.util.io;
+import org.apache.wicket.util.file.Files;
+import org.apache.wicket.util.time.Time;
+import org.junit.jupiter.api.Test;
+
import java.io.File;
import java.io.IOException;
import java.net.URL;
-import org.apache.wicket.util.file.Files;
-import org.apache.wicket.util.time.Time;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
/**
* @author pertl
*/
-public class LastModifiedTest extends Assert
+public class LastModifiedTest
{
private static final String FILE = "/some/folder/file.jar";
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/io/XmlReaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/io/XmlReaderTest.java b/wicket-util/src/test/java/org/apache/wicket/util/io/XmlReaderTest.java
index 1cbb1d6..e3965c1 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/io/XmlReaderTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/io/XmlReaderTest.java
@@ -16,13 +16,15 @@
*/
package org.apache.wicket.util.io;
+import org.junit.jupiter.api.Test;
+
import java.io.BufferedReader;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
@SuppressWarnings("javadoc")
-public class XmlReaderTest extends Assert
+public class XmlReaderTest
{
@Test
public void readHtmlFileWithoutAnyTags() throws Exception
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/lang/ArgsTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/lang/ArgsTest.java b/wicket-util/src/test/java/org/apache/wicket/util/lang/ArgsTest.java
index 7f0a3a8..c70bc88 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/lang/ArgsTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/lang/ArgsTest.java
@@ -16,23 +16,19 @@
*/
package org.apache.wicket.util.lang;
+import org.junit.jupiter.api.Test;
+
import java.util.Collection;
import java.util.Collections;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Tests for {@link Args}
*/
public class ArgsTest
{
- /**
- * A rule for expecting exceptions
- */
- @Rule
- public ExpectedException thrown = ExpectedException.none();
+
/**
* Test for {@link Args#notEmpty(java.util.Collection, String, Object...)}
@@ -40,10 +36,10 @@ public class ArgsTest
@Test
public void notNullCollection()
{
- thrown.expect(IllegalArgumentException.class);
- thrown.expectMessage("Collection 'col' may not be null or empty");
+ assertThrows(IllegalArgumentException.class, () -> {
+ Args.notEmpty((Collection<?>)null, "col");
+ });
- Args.notEmpty((Collection<?>)null, "col");
}
/**
@@ -52,10 +48,9 @@ public class ArgsTest
@Test
public void notEmptyCollection()
{
- thrown.expect(IllegalArgumentException.class);
- thrown.expectMessage("Collection 'col' may not be null or empty");
-
- Args.notEmpty(Collections.emptySet(), "col");
+ assertThrows(IllegalArgumentException.class, () -> {
+ Args.notEmpty(Collections.emptySet(), "col");
+ });
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/lang/BytesTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/lang/BytesTest.java b/wicket-util/src/test/java/org/apache/wicket/util/lang/BytesTest.java
index bfa6b93..13d010b 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/lang/BytesTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/lang/BytesTest.java
@@ -16,18 +16,19 @@
*/
package org.apache.wicket.util.lang;
+import org.apache.wicket.util.string.StringValueConversionException;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
import java.util.Locale;
-import org.apache.wicket.util.string.StringValueConversionException;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
/**
* Tests the <code>Bytes</code> class.
*/
-public class BytesTest extends Assert
+public class BytesTest
{
/**
* Backup of the default locale.
@@ -38,13 +39,14 @@ public class BytesTest extends Assert
/**
* Save the default locale.
*/
- @Before
+ @BeforeEach
public void before()
{
originalFormatLocale = Locale.getDefault(Locale.Category.FORMAT);
originalDefaultLocale = Locale.getDefault();
- // these tests run in US locale for formatting and German default locale - they should still work with split
+ // these tests run in US locale for formatting and German default locale - they should still
+ // work with split
// locale.
Locale.setDefault(Locale.GERMANY);
Locale.setDefault(Locale.Category.FORMAT, Locale.US);
@@ -53,7 +55,7 @@ public class BytesTest extends Assert
/**
* Restore the default locale.
*/
- @After
+ @AfterEach
public void after()
{
Locale.setDefault(originalDefaultLocale);
@@ -76,21 +78,21 @@ public class BytesTest extends Assert
assertEquals(1024L * 1024 * 1024, Bytes.gigabytes(1).bytes());
assertEquals(1024L * 1024 * 1024 * 1024, Bytes.terabytes(1).bytes());
- assertEquals(1.5, Bytes.bytes(1536).kilobytes(), 0);
- assertEquals(1.0, Bytes.kilobytes(1).kilobytes(), 0);
- assertEquals(0.5, Bytes.bytes(512).kilobytes(), 0);
+ assertEquals(1.5, Bytes.bytes(1536).kilobytes());
+ assertEquals(1.0, Bytes.kilobytes(1).kilobytes());
+ assertEquals(0.5, Bytes.bytes(512).kilobytes());
- assertEquals(1.5, Bytes.kilobytes(1536).megabytes(), 0);
- assertEquals(1.0, Bytes.megabytes(1).megabytes(), 0);
- assertEquals(0.5, Bytes.kilobytes(512).megabytes(), 0);
+ assertEquals(1.5, Bytes.kilobytes(1536).megabytes());
+ assertEquals(1.0, Bytes.megabytes(1).megabytes());
+ assertEquals(0.5, Bytes.kilobytes(512).megabytes());
- assertEquals(1.5, Bytes.megabytes(1536).gigabytes(), 0);
- assertEquals(1.0, Bytes.gigabytes(1).gigabytes(), 0);
- assertEquals(0.5, Bytes.megabytes(512).gigabytes(), 0);
+ assertEquals(1.5, Bytes.megabytes(1536).gigabytes());
+ assertEquals(1.0, Bytes.gigabytes(1).gigabytes());
+ assertEquals(0.5, Bytes.megabytes(512).gigabytes());
- assertEquals(1.5, Bytes.gigabytes(1536).terabytes(), 0);
- assertEquals(1.0, Bytes.terabytes(1).terabytes(), 0);
- assertEquals(0.5, Bytes.gigabytes(512).terabytes(), 0);
+ assertEquals(1.5, Bytes.gigabytes(1536).terabytes());
+ assertEquals(1.0, Bytes.terabytes(1).terabytes());
+ assertEquals(0.5, Bytes.gigabytes(512).terabytes());
}
/**
@@ -160,10 +162,13 @@ public class BytesTest extends Assert
/**
* Negative values are not supported
*/
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void negative()
{
- Bytes.bytes(-1);
- fail("Bytes should not support negative values!");
+ assertThrows(IllegalArgumentException.class, () -> {
+ Bytes.bytes(-1);
+ fail("Bytes should not support negative values!");
+ });
+
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/lang/ClassesTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/lang/ClassesTest.java b/wicket-util/src/test/java/org/apache/wicket/util/lang/ClassesTest.java
index 80e7d7f..763f785 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/lang/ClassesTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/lang/ClassesTest.java
@@ -16,16 +16,17 @@
*/
package org.apache.wicket.util.lang;
+import org.junit.jupiter.api.Test;
+
import java.text.SimpleDateFormat;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @since 1.5.8
*/
@SuppressWarnings({"javadoc", "serial"})
-public class ClassesTest extends Assert
+public class ClassesTest
{
@Test
public void simpleName() throws Exception
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/lang/NumbersTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/lang/NumbersTest.java b/wicket-util/src/test/java/org/apache/wicket/util/lang/NumbersTest.java
index 9b08c3a..ba15a76 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/lang/NumbersTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/lang/NumbersTest.java
@@ -16,17 +16,18 @@
*/
package org.apache.wicket.util.lang;
+import org.junit.jupiter.api.Test;
+
import java.math.BigDecimal;
import java.math.BigInteger;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @since 1.5.8
*/
@SuppressWarnings("javadoc")
-public class NumbersTest extends Assert
+public class NumbersTest
{
/**
* See WICKET-4696 for Float and Double minimum value
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/lang/ObjectsTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/lang/ObjectsTest.java b/wicket-util/src/test/java/org/apache/wicket/util/lang/ObjectsTest.java
index dc158e8..32fe8f1 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/lang/ObjectsTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/lang/ObjectsTest.java
@@ -16,16 +16,17 @@
*/
package org.apache.wicket.util.lang;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests the Objects class.
*
* @author Martijn Dashorst
*/
-public class ObjectsTest extends Assert
+public class ObjectsTest
{
/**
* Test method for 'org.apache.wicket.util.lang.Objects.equal(Object, Object)'
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/lang/PackagesTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/lang/PackagesTest.java b/wicket-util/src/test/java/org/apache/wicket/util/lang/PackagesTest.java
index 7b9be38..35447b3 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/lang/PackagesTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/lang/PackagesTest.java
@@ -16,14 +16,15 @@
*/
package org.apache.wicket.util.lang;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @since 1.5.5
*/
@SuppressWarnings("javadoc")
-public class PackagesTest extends Assert
+public class PackagesTest
{
@Test
public void absolutePath0() throws Exception
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/lang/PrimitivesTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/lang/PrimitivesTest.java b/wicket-util/src/test/java/org/apache/wicket/util/lang/PrimitivesTest.java
index 9f79952..7c7ca47 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/lang/PrimitivesTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/lang/PrimitivesTest.java
@@ -16,9 +16,11 @@
*/
package org.apache.wicket.util.lang;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests the <code>Primitives</code> class. The code for testing the hashcode is taken from the
@@ -28,7 +30,7 @@ import org.junit.Test;
* @author Martijn Dashorst
* @author <a href="mailto:pholser@yahoo.com">Paul Holser</a>
*/
-public class PrimitivesTest extends Assert
+public class PrimitivesTest
{
/**
* Test stub for testing the hashcode function.
@@ -66,7 +68,7 @@ public class PrimitivesTest extends Assert
/**
* Creates the objects for the tests.
*/
- @Before
+ @BeforeEach
public void before()
{
eq1 = new HashCodeObject(26);
@@ -83,10 +85,10 @@ public class PrimitivesTest extends Assert
@Test
public final void hashCodeContract()
{
- assertEquals("1st vs. 2nd", eq1.hashCode(), eq2.hashCode());
- assertEquals("1st vs. 3rd", eq1.hashCode(), eq3.hashCode());
- assertEquals("2nd vs. 3rd", eq2.hashCode(), eq3.hashCode());
- assertTrue("1st vs. neq", eq1.hashCode() != neq.hashCode());
+ assertEquals(eq1.hashCode(), eq2.hashCode(), "1st vs. 2nd");
+ assertEquals(eq1.hashCode(), eq3.hashCode(), "1st vs. 3rd");
+ assertEquals(eq2.hashCode(), eq3.hashCode(), "2nd vs. 3rd");
+ assertTrue(eq1.hashCode() != neq.hashCode(), "1st vs. neq");
}
/**
@@ -104,10 +106,10 @@ public class PrimitivesTest extends Assert
for (int i = 0; i < 2; ++i)
{
- assertEquals("1st equal instance", eq1Hash, eq1.hashCode());
- assertEquals("2nd equal instance", eq2Hash, eq2.hashCode());
- assertEquals("3rd equal instance", eq3Hash, eq3.hashCode());
- assertEquals("not-equal instance", neqHash, neq.hashCode());
+ assertEquals(eq1Hash, eq1.hashCode(), "1st equal instance");
+ assertEquals(eq2Hash, eq2.hashCode(), "2nd equal instance");
+ assertEquals(eq3Hash, eq3.hashCode(), "3rd equal instance");
+ assertEquals(neqHash, neq.hashCode(), "not-equal instance");
}
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/parse/metapattern/MetaPatternTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/parse/metapattern/MetaPatternTest.java b/wicket-util/src/test/java/org/apache/wicket/util/parse/metapattern/MetaPatternTest.java
index 04ff836..6a4187c 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/parse/metapattern/MetaPatternTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/parse/metapattern/MetaPatternTest.java
@@ -16,22 +16,22 @@
*/
package org.apache.wicket.util.parse.metapattern;
-
-import java.util.regex.Matcher;
-
import org.apache.wicket.util.parse.metapattern.parsers.CommaSeparatedVariableParser;
import org.apache.wicket.util.parse.metapattern.parsers.IntegerVariableAssignmentParser;
import org.apache.wicket.util.parse.metapattern.parsers.TagNameParser;
import org.apache.wicket.util.parse.metapattern.parsers.VariableAssignmentParser;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import java.util.regex.Matcher;
+
+import static org.junit.jupiter.api.Assertions.*;
/**
* Test cases for this object
*
* @author Jonathan Locke
*/
-public final class MetaPatternTest extends Assert
+public final class MetaPatternTest
{
/**
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/VariableAssignmentParserTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/VariableAssignmentParserTest.java b/wicket-util/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/VariableAssignmentParserTest.java
index 9ff73b9..8622360 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/VariableAssignmentParserTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/VariableAssignmentParserTest.java
@@ -16,13 +16,14 @@
*/
package org.apache.wicket.util.parse.metapattern.parsers;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @since 1.5.8
*/
-public class VariableAssignmentParserTest extends Assert
+public class VariableAssignmentParserTest
{
/**
* Tests parsing of attribute names with and without namespaces
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/resource/ResourceUtilsTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/resource/ResourceUtilsTest.java b/wicket-util/src/test/java/org/apache/wicket/util/resource/ResourceUtilsTest.java
index 4174444..89e935d 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/resource/ResourceUtilsTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/resource/ResourceUtilsTest.java
@@ -16,17 +16,15 @@
*/
package org.apache.wicket.util.resource;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
+import org.junit.jupiter.api.Test;
import java.util.Locale;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
/** */
-public class ResourceUtilsTest extends Assert
+public class ResourceUtilsTest
{
/**
* https://issues.apache.org/jira/browse/WICKET-5706
@@ -37,27 +35,27 @@ public class ResourceUtilsTest extends Assert
ResourceUtils.PathLocale pathLocale;
pathLocale = ResourceUtils.getLocaleFromFilename("some.ext");
- assertThat(pathLocale.path, is(equalTo("some.ext")));
- assertThat(pathLocale.locale, is(nullValue()));
+ assertEquals(pathLocale.path, "some.ext");
+ assertNull(pathLocale.locale);
pathLocale = ResourceUtils.getLocaleFromFilename("some.min.ext");
- assertThat(pathLocale.path, is(equalTo("some.min.ext")));
- assertThat(pathLocale.locale, is(nullValue()));
+ assertEquals(pathLocale.path, "some.min.ext");
+ assertNull(pathLocale.locale);
pathLocale = ResourceUtils.getLocaleFromFilename("some.min_en.ext");
- assertThat(pathLocale.path, is(equalTo("some.min.ext")));
- assertThat(pathLocale.locale, is(Locale.ENGLISH));
+ assertEquals(pathLocale.path, "some.min.ext");
+ assertEquals(pathLocale.locale, Locale.ENGLISH);
pathLocale = ResourceUtils.getLocaleFromFilename("some_fr_CA.min.ext");
- assertThat(pathLocale.path, is(equalTo("some.min.ext")));
- assertThat(pathLocale.locale, is(Locale.CANADA_FRENCH));
+ assertEquals(pathLocale.path, "some.min.ext");
+ assertEquals(pathLocale.locale, Locale.CANADA_FRENCH);
String localeVariant = "blah";
pathLocale = ResourceUtils
.getLocaleFromFilename("some_fr_CA_" + localeVariant + ".min.ext");
- assertThat(pathLocale.path, is(equalTo("some.min.ext")));
- assertThat(pathLocale.locale.getLanguage(), is("fr"));
- assertThat(pathLocale.locale.getCountry(), is("CA"));
- assertThat(pathLocale.locale.getVariant(), is(localeVariant));
+ assertEquals(pathLocale.path, "some.min.ext");
+ assertEquals(pathLocale.locale.getLanguage(), "fr");
+ assertEquals(pathLocale.locale.getCountry(), "CA");
+ assertEquals(pathLocale.locale.getVariant(), localeVariant);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/size/BytesTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/size/BytesTest.java b/wicket-util/src/test/java/org/apache/wicket/util/size/BytesTest.java
index 3f74671..cd9b4bd 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/size/BytesTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/size/BytesTest.java
@@ -16,22 +16,23 @@
*/
package org.apache.wicket.util.size;
+import org.apache.wicket.util.lang.Bytes;
+import org.apache.wicket.util.string.StringValueConversionException;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.util.Locale;
-import org.apache.wicket.util.lang.Bytes;
-import org.apache.wicket.util.string.StringValueConversionException;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test cases for this object
*
* @author Jonathan Locke
*/
-public final class BytesTest extends Assert
+public final class BytesTest
{
/**
* Backup of the default locale.
@@ -41,7 +42,7 @@ public final class BytesTest extends Assert
/**
* Save the default locale.
*/
- @Before
+ @BeforeEach
public void before()
{
defaultLocale = Locale.getDefault(Locale.Category.FORMAT);
@@ -50,7 +51,7 @@ public final class BytesTest extends Assert
/**
* Restore the default locale.
*/
- @After
+ @AfterEach
public void after()
{
Locale.setDefault(Locale.Category.FORMAT, defaultLocale);
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/string/AppendingStringBufferTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/string/AppendingStringBufferTest.java b/wicket-util/src/test/java/org/apache/wicket/util/string/AppendingStringBufferTest.java
index a7d8bc7..aca03fe 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/string/AppendingStringBufferTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/string/AppendingStringBufferTest.java
@@ -16,11 +16,14 @@
*/
package org.apache.wicket.util.string;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
@SuppressWarnings("javadoc")
-public class AppendingStringBufferTest extends Assert
+public class AppendingStringBufferTest
{
@Test
public void append()
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/string/PrependingStringBufferTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/string/PrependingStringBufferTest.java b/wicket-util/src/test/java/org/apache/wicket/util/string/PrependingStringBufferTest.java
index 191291c..4363ed2 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/string/PrependingStringBufferTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/string/PrependingStringBufferTest.java
@@ -16,13 +16,15 @@
*/
package org.apache.wicket.util.string;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* @author jcompagner
*/
-public class PrependingStringBufferTest extends Assert
+public class PrependingStringBufferTest
{
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/string/StringListTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/string/StringListTest.java b/wicket-util/src/test/java/org/apache/wicket/util/string/StringListTest.java
index dfe46ab..8299d35 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/string/StringListTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/string/StringListTest.java
@@ -16,17 +16,18 @@
*/
package org.apache.wicket.util.string;
+import org.junit.jupiter.api.Test;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
/**
* Tests the <code>StringList</code> class.
*/
-public class StringListTest extends Assert
+public class StringListTest
{
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/string/StringValueTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/string/StringValueTest.java b/wicket-util/src/test/java/org/apache/wicket/util/string/StringValueTest.java
index 81c002f..527b3ad 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/string/StringValueTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/string/StringValueTest.java
@@ -16,15 +16,16 @@
*/
package org.apache.wicket.util.string;
-import java.util.Locale;
-
import org.apache.wicket.util.time.Duration;
import org.apache.wicket.util.time.Time;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import java.util.Locale;
+
+import static org.junit.jupiter.api.Assertions.*;
@SuppressWarnings("javadoc")
-public class StringValueTest extends Assert
+public class StringValueTest
{
/**
* WICKET-5359 equals
@@ -32,12 +33,12 @@ public class StringValueTest extends Assert
@Test
public void equals()
{
- assertFalse(StringValue.valueOf("bla", Locale.FRANCE).equals(
- StringValue.valueOf("bla", Locale.CANADA)));
- assertTrue(StringValue.valueOf("bla", Locale.FRANCE).equals(
- StringValue.valueOf("bla", Locale.FRANCE)));
- assertFalse(StringValue.valueOf("bla", Locale.FRANCE).equals(
- StringValue.valueOf("blo", Locale.FRANCE)));
+ assertFalse(StringValue.valueOf("bla", Locale.FRANCE)
+ .equals(StringValue.valueOf("bla", Locale.CANADA)));
+ assertTrue(StringValue.valueOf("bla", Locale.FRANCE)
+ .equals(StringValue.valueOf("bla", Locale.FRANCE)));
+ assertFalse(StringValue.valueOf("bla", Locale.FRANCE)
+ .equals(StringValue.valueOf("blo", Locale.FRANCE)));
}
/**
@@ -125,12 +126,8 @@ public class StringValueTest extends Assert
assertNull(sv.toOptional(String[].class));
}
- static enum TestEnum {
- FOO, BAR, BAZ
- }
-
@Test
- public void enums()
+ public void enums()
{
assertEquals(TestEnum.FOO, new StringValue("FOO").toEnum(TestEnum.class));
assertEquals(TestEnum.FOO, new StringValue("FOO").toEnum(TestEnum.BAR));
@@ -143,15 +140,26 @@ public class StringValueTest extends Assert
assertNull(new StringValue(null).toOptionalEnum(TestEnum.class));
}
- @Test(expected = StringValueConversionException.class)
+ @Test
public void failingEnum() throws Exception
{
- new StringValue("camelot").toEnum(TestEnum.class);
+
+ assertThrows(StringValueConversionException.class, () -> {
+ new StringValue("camelot").toEnum(TestEnum.class);
+ });
+
}
- @Test(expected = StringValueConversionException.class)
+ @Test
public void failingEnum2() throws Exception
{
- new StringValue("camelot").toOptionalEnum(TestEnum.class);
+ assertThrows(StringValueConversionException.class, () -> {
+ new StringValue("camelot").toOptionalEnum(TestEnum.class);
+ });
+
+ }
+
+ static enum TestEnum {
+ FOO, BAR, BAZ
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java b/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java
index dc5fb8e..bb0fa39 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java
@@ -16,13 +16,13 @@
*/
package org.apache.wicket.util.string;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
import java.io.UnsupportedEncodingException;
import java.util.Arrays;
import java.util.List;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
@SuppressWarnings("javadoc")
public class StringsTest
@@ -187,8 +187,10 @@ public class StringsTest
// The escaped unicode is ����������"
assertEquals("Çüéâäàåçêë",
- Strings.escapeMarkup("\u00c7\u00fc\u00e9\u00e2\u00e4\u00e0\u00e5\u00e7\u00ea\u00eb",
- false, true).toString());
+ Strings
+ .escapeMarkup("\u00c7\u00fc\u00e9\u00e2\u00e4\u00e0\u00e5\u00e7\u00ea\u00eb", false,
+ true)
+ .toString());
}
@@ -256,10 +258,13 @@ public class StringsTest
assertTrue(Strings.isTrue("1"));
}
- @Test(expected = StringValueConversionException.class)
+ @Test
public void invalidIsTrue()
{
- Strings.isTrue("foo");
+ assertThrows(StringValueConversionException.class, () -> {
+ Strings.isTrue("foo");
+ });
+
}
@Test
@@ -338,10 +343,12 @@ public class StringsTest
assertEquals(Boolean.TRUE, Strings.toBoolean("1"));
}
- @Test(expected = StringValueConversionException.class)
+ @Test
public void invalidToBoolean()
{
- Strings.toBoolean("waar");
+ assertThrows(StringValueConversionException.class, () -> {
+ Strings.toBoolean("waar");
+ });
}
@Test
@@ -351,22 +358,30 @@ public class StringsTest
assertEquals('a', Strings.toChar("a"));
}
- @Test(expected = StringValueConversionException.class)
+ @Test
public void invalidToChar1()
{
- Strings.toChar("");
+ assertThrows(StringValueConversionException.class, () -> {
+ Strings.toChar("");
+ });
+
}
- @Test(expected = StringValueConversionException.class)
+ @Test
public void invalidToChar2()
{
- Strings.toChar(null);
+
+ assertThrows(StringValueConversionException.class, () -> {
+ Strings.toChar(null);
+ });
}
- @Test(expected = StringValueConversionException.class)
+ @Test
public void invalidToChar3()
{
- Strings.toChar("aa");
+ assertThrows(StringValueConversionException.class, () -> {
+ Strings.toChar("aa");
+ });
}
@Test
@@ -386,9 +401,8 @@ public class StringsTest
// WICKET-4837
assertEquals(
"<p><a href=\"mailto:john@doe.com\">john@doe.com</a><br/><a href=\"http://apache.wicket.org\">http://apache.wicket.org</a></p>",
- Strings
- .toMultilineMarkup(
- "<a href=\"mailto:john@doe.com\">john@doe.com</a>\n<a href=\"http://apache.wicket.org\">http://apache.wicket.org</a>")
+ Strings.toMultilineMarkup(
+ "<a href=\"mailto:john@doe.com\">john@doe.com</a>\n<a href=\"http://apache.wicket.org\">http://apache.wicket.org</a>")
.toString());
assertEquals("<p>abc</p><p>def</p><p>ghi</p>",
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/string/interpolator/VariableInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/string/interpolator/VariableInterpolatorTest.java b/wicket-util/src/test/java/org/apache/wicket/util/string/interpolator/VariableInterpolatorTest.java
index 67e4cf8..8ee5523 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/string/interpolator/VariableInterpolatorTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/string/interpolator/VariableInterpolatorTest.java
@@ -16,18 +16,20 @@
*/
package org.apache.wicket.util.string.interpolator;
+import org.junit.jupiter.api.Test;
+
import java.util.HashMap;
import java.util.Map;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Tests {@link MapVariableInterpolator}
*
* @author <a href="mailto:jbq@apache.org">Jean-Baptiste Quenot</a>
*/
-public class VariableInterpolatorTest extends Assert
+public class VariableInterpolatorTest
{
/**
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/time/DurationTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/time/DurationTest.java b/wicket-util/src/test/java/org/apache/wicket/util/time/DurationTest.java
index 47f3c4a..1ff1460 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/time/DurationTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/time/DurationTest.java
@@ -16,16 +16,15 @@
*/
package org.apache.wicket.util.time;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import org.apache.wicket.util.string.StringValueConversionException;
+import org.junit.jupiter.api.Test;
import java.text.NumberFormat;
import java.util.Locale;
import java.util.Locale.Category;
-import org.apache.wicket.util.string.StringValueConversionException;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test cases for this object
@@ -84,8 +83,8 @@ public final class DurationTest
{
Locale.setDefault(Locale.US);
Locale.setDefault(Category.FORMAT, Locale.GERMANY);
- assertEquals("should take formatting locale into account", "1,5 minutes", Duration.seconds(90)
- .toString());
+ assertEquals("1,5 minutes", Duration.seconds(90)
+ .toString(), "should take formatting locale into account");
} finally
{
Locale.setDefault(oldDefaultLocale);
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/time/TimeFrameTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/time/TimeFrameTest.java b/wicket-util/src/test/java/org/apache/wicket/util/time/TimeFrameTest.java
index a2fe4ef..9b23927 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/time/TimeFrameTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/time/TimeFrameTest.java
@@ -16,13 +16,14 @@
*/
package org.apache.wicket.util.time;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
/**
* @author v857829
*/
-public class TimeFrameTest extends Assert
+public class TimeFrameTest
{
private final TimeOfDay three = TimeOfDay.time(3, 0, TimeOfDay.PM);
@@ -38,7 +39,7 @@ public class TimeFrameTest extends Assert
public void eachDay()
{
ITimeFrameSource test = TimeFrame.eachDay(three, five);
- Assert.assertTrue(test.getTimeFrame().contains(Time.valueOf(four)));
+ assertTrue(test.getTimeFrame().contains(Time.valueOf(four)));
}
/**
@@ -50,8 +51,8 @@ public class TimeFrameTest extends Assert
public void valueOfTimeDuration()
{
TimeFrame test = TimeFrame.valueOf(Time.valueOf(three), Duration.minutes(60));
- Assert.assertEquals(test.getStart(), Time.valueOf(three));
- Assert.assertEquals(test.getEnd(), Time.valueOf(four));
+ assertEquals(test.getStart(), Time.valueOf(three));
+ assertEquals(test.getEnd(), Time.valueOf(four));
}
/**
@@ -62,7 +63,7 @@ public class TimeFrameTest extends Assert
public void contains()
{
TimeFrame test = TimeFrame.valueOf(Time.valueOf(three), Duration.minutes(70));
- Assert.assertTrue(test.contains(Time.valueOf(four)));
+ assertTrue(test.contains(Time.valueOf(four)));
}
/**
@@ -77,10 +78,10 @@ public class TimeFrameTest extends Assert
TimeFrame test2 = TimeFrame.valueOf(Time.valueOf(four), Duration.minutes(50));
TimeFrame test3 = TimeFrame.valueOf(Time.valueOf(four), Time.valueOf(five));
TimeFrame test4 = TimeFrame.valueOf(Time.valueOf(three), Duration.minutes(20));
- Assert.assertTrue(test.overlaps(test2));
- Assert.assertTrue(test3.overlaps(test2));
- Assert.assertTrue(test.overlaps(test3));
- Assert.assertFalse(test4.overlaps(test3));
+ assertTrue(test.overlaps(test2));
+ assertTrue(test3.overlaps(test2));
+ assertTrue(test.overlaps(test3));
+ assertFalse(test4.overlaps(test3));
}
/**
@@ -92,8 +93,8 @@ public class TimeFrameTest extends Assert
TimeFrame test = TimeFrame.valueOf(Time.valueOf(three), Duration.minutes(60));
TimeFrame test2 = TimeFrame.valueOf(Time.valueOf(three), Time.valueOf(four));
TimeFrame test3 = TimeFrame.valueOf(Time.valueOf(three), Duration.minutes(59));
- Assert.assertEquals(test, test2);
- Assert.assertNotSame(test2, test3);
+ assertEquals(test, test2);
+ assertNotSame(test2, test3);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/time/TimeMapTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/time/TimeMapTest.java b/wicket-util/src/test/java/org/apache/wicket/util/time/TimeMapTest.java
index 17e503a..508f2ff 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/time/TimeMapTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/time/TimeMapTest.java
@@ -16,20 +16,21 @@
*/
package org.apache.wicket.util.time;
+import org.junit.jupiter.api.Test;
import java.text.ParseException;
import java.util.GregorianCalendar;
import java.util.Locale;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
/**
* Test cases for this object
*
* @author Jonathan Locke
*/
-public final class TimeMapTest extends Assert
+public final class TimeMapTest
{
/**
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/time/TimeOfDayTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/time/TimeOfDayTest.java b/wicket-util/src/test/java/org/apache/wicket/util/time/TimeOfDayTest.java
index b4e3a17..e7cea80 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/time/TimeOfDayTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/time/TimeOfDayTest.java
@@ -16,15 +16,17 @@
*/
package org.apache.wicket.util.time;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test cases for {@link TimeOfDay}.
*
* @author Jonathan Locke
*/
-public final class TimeOfDayTest extends Assert
+public final class TimeOfDayTest
{
/**
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/time/TimeTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/time/TimeTest.java b/wicket-util/src/test/java/org/apache/wicket/util/time/TimeTest.java
index b13b745..5593ed0 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/time/TimeTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/time/TimeTest.java
@@ -16,15 +16,15 @@
*/
package org.apache.wicket.util.time;
+import org.junit.jupiter.api.Test;
import java.text.ParseException;
import java.util.Calendar;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
@SuppressWarnings("javadoc")
-public final class TimeTest extends Assert
+public final class TimeTest
{
@Test
public void test() throws ParseException
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/value/LongValueTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/value/LongValueTest.java b/wicket-util/src/test/java/org/apache/wicket/util/value/LongValueTest.java
index fa5158f..b5c8e5b 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/value/LongValueTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/value/LongValueTest.java
@@ -16,11 +16,9 @@
*/
package org.apache.wicket.util.value;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
+import org.junit.jupiter.api.Test;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
/**
* {@link LongValue} tests
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/value/ValueMapTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/value/ValueMapTest.java b/wicket-util/src/test/java/org/apache/wicket/util/value/ValueMapTest.java
index 2251fad..2b5671b 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/value/ValueMapTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/value/ValueMapTest.java
@@ -18,14 +18,17 @@ package org.apache.wicket.util.value;
import org.apache.wicket.util.time.Duration;
import org.apache.wicket.util.time.Time;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* @author jcompagner
* @author Doug Donohoe
*/
-public class ValueMapTest extends Assert
+public class ValueMapTest
{
/**
* @throws Exception
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/visit/AllVisitFilterTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/visit/AllVisitFilterTest.java b/wicket-util/src/test/java/org/apache/wicket/util/visit/AllVisitFilterTest.java
index fbcf96d..f286d46 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/visit/AllVisitFilterTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/visit/AllVisitFilterTest.java
@@ -16,15 +16,16 @@
*/
package org.apache.wicket.util.visit;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test for {@link IVisitFilter#ANY}.
*
* @since 1.5.7
*/
-public class AllVisitFilterTest extends Assert
+public class AllVisitFilterTest
{
/**
* @throws Exception
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/visit/ClassVisitFilterTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/visit/ClassVisitFilterTest.java b/wicket-util/src/test/java/org/apache/wicket/util/visit/ClassVisitFilterTest.java
index 01894c4..e683622 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/visit/ClassVisitFilterTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/visit/ClassVisitFilterTest.java
@@ -16,15 +16,17 @@
*/
package org.apache.wicket.util.visit;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test for {@link ClassVisitFilter}.
*
* @since 1.5.7
*/
-public class ClassVisitFilterTest extends Assert
+public class ClassVisitFilterTest
{
/**
* @throws Exception
[40/45] wicket git commit: updated pom.xml with new junit dependency
Posted by mg...@apache.org.
updated pom.xml with new junit dependency
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0465d2c0
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0465d2c0
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0465d2c0
Branch: refs/heads/master
Commit: 0465d2c01df6f3b20069b77d863d27e43f9d2911
Parents: 694ee32
Author: renoth <jo...@gmx.de>
Authored: Sat Sep 1 07:52:38 2018 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 26 16:14:30 2018 +0300
----------------------------------------------------------------------
testing/wicket-arquillian/pom.xml | 8 +-
.../deployment/AbstractDeploymentTest.java | 5 +-
wicket-cdi-1.1/pom.xml | 98 ++++++++++++++++++++
3 files changed, 104 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/0465d2c0/testing/wicket-arquillian/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-arquillian/pom.xml b/testing/wicket-arquillian/pom.xml
index 13023a6..2190f5c 100644
--- a/testing/wicket-arquillian/pom.xml
+++ b/testing/wicket-arquillian/pom.xml
@@ -164,10 +164,10 @@
<groupId>org.wildfly</groupId>
<artifactId>wildfly-weld</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ </dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/0465d2c0/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
----------------------------------------------------------------------
diff --git a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
index 52b9014..d5ad762 100644
--- a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
+++ b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
@@ -58,9 +58,8 @@ import org.slf4j.LoggerFactory;
*
*/
@Tag(WicketTestTag.SLOW)
-public abstract class AbstractDeploymentTest
-{
-
+public abstract class AbstractDeploymentTest {
+
private static final Logger log = LoggerFactory.getLogger(AbstractDeploymentTest.class);
private static final String WEBAPP_SRC = "src/main/webapp";
http://git-wip-us.apache.org/repos/asf/wicket/blob/0465d2c0/wicket-cdi-1.1/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-cdi-1.1/pom.xml b/wicket-cdi-1.1/pom.xml
new file mode 100644
index 0000000..6860248
--- /dev/null
+++ b/wicket-cdi-1.1/pom.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-parent</artifactId>
+ <version>9.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>wicket-cdi-1.1</artifactId>
+ <packaging>bundle</packaging>
+ <name>Wicket CDI 1.1</name>
+ <description>
+ Provides integration between Wicket and CDI containers. Enables injection of
+ components and behaviors, as well as other non-contextual object instances.
+ Also enables propagation of conversations between wicket artifacts such as pages
+ and resources.
+ </description>
+ <dependencyManagement>
+ <dependencies>
+ <!-- local management because we can only define one GAV in the parent -->
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <version>1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld.module</groupId>
+ <artifactId>weld-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld.se</groupId>
+ <artifactId>weld-se</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jglue.cdi-unit</groupId>
+ <artifactId>cdi-unit</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
[42/45] wicket git commit: - wicket-arquilian / wicket-cdi-1.1 :
Enable Junit Vintage Engine to run old Testrunners - BaseWicketTester.java:
remove dependency on AssertionFailedException - global: use AssertionError
instead of AssertionFailedError - upda
Posted by mg...@apache.org.
- wicket-arquilian / wicket-cdi-1.1 : Enable Junit Vintage Engine to run old Testrunners
- BaseWicketTester.java: remove dependency on AssertionFailedException
- global: use AssertionError instead of AssertionFailedError
- updated Templates to use Junit 5 imports and classes
- remove opentest4j as a dependency of wicket-util again
- update cdi-unit to version 4.1.0 from 4.0.2
- Excluded Tests tagged with SLOW from surefire plugin
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4c6cb67e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4c6cb67e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4c6cb67e
Branch: refs/heads/master
Commit: 4c6cb67e5d625b58c6a1e16911103a8c11e45c87
Parents: 0465d2c
Author: renoth <jo...@gmx.de>
Authored: Sat Sep 1 12:15:17 2018 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 26 16:17:37 2018 +0300
----------------------------------------------------------------------
testing/wicket-arquillian/pom.xml | 6 ++++++
.../deployment/AbstractDeploymentTest.java | 5 +++--
wicket-cdi-1.1/pom.xml | 19 +++++++++++++++----
.../wicket/util/tester/BaseWicketTester.java | 4 ++--
.../apache/wicket/util/tester/WicketTester.java | 15 ++++++---------
wicket-util/pom.xml | 6 ------
.../license/AbstractLicenseHeaderHandler.java | 17 +++++++++++------
.../license/ApacheLicenseHeaderTestCase.java | 3 +--
.../util/license/CssLicenseHeaderHandler.java | 4 ++--
.../util/license/JavaLicenseHeaderHandler.java | 5 ++---
.../license/PropertiesLicenseHeaderHandler.java | 9 ++++-----
.../license/VelocityLicenseHeaderHandler.java | 9 ++++-----
.../util/license/XmlLicenseHeaderHandler.java | 12 ++++++------
.../util/license/XmlPrologHeaderHandler.java | 4 +---
14 files changed, 63 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/testing/wicket-arquillian/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-arquillian/pom.xml b/testing/wicket-arquillian/pom.xml
index 2190f5c..d093dff 100644
--- a/testing/wicket-arquillian/pom.xml
+++ b/testing/wicket-arquillian/pom.xml
@@ -144,6 +144,12 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- Wicket CDI integration. -->
<dependency>
<groupId>org.apache.wicket</groupId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
----------------------------------------------------------------------
diff --git a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
index d5ad762..52b9014 100644
--- a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
+++ b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
@@ -58,8 +58,9 @@ import org.slf4j.LoggerFactory;
*
*/
@Tag(WicketTestTag.SLOW)
-public abstract class AbstractDeploymentTest {
-
+public abstract class AbstractDeploymentTest
+{
+
private static final Logger log = LoggerFactory.getLogger(AbstractDeploymentTest.class);
private static final String WEBAPP_SRC = "src/main/webapp";
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/wicket-cdi-1.1/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-cdi-1.1/pom.xml b/wicket-cdi-1.1/pom.xml
index 6860248..ead682d 100644
--- a/wicket-cdi-1.1/pom.xml
+++ b/wicket-cdi-1.1/pom.xml
@@ -66,12 +66,23 @@
<artifactId>weld-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.weld.module</groupId>
- <artifactId>weld-web</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld.module</groupId>
+ <artifactId>weld-web</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.weld.se</groupId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
index 92686b5..313cb2d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
@@ -34,6 +34,7 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.regex.Pattern;
+
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
import javax.servlet.http.Cookie;
@@ -133,7 +134,6 @@ import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.time.Duration;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
-import org.opentest4j.AssertionFailedError;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -723,7 +723,7 @@ public class BaseWicketTester
{
if (redirectCount++ >= 100)
{
- throw new AssertionFailedError("Possible infinite redirect detected. Bailing out.");
+ throw new AssertionError("Possible infinite redirect detected. Bailing out.");
}
Url newUrl = Url.parse(lastResponse.getRedirectLocation(),
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
index 1b469a8..651c0ef 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
@@ -51,7 +51,6 @@ import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Objects;
-import org.opentest4j.AssertionFailedError;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -284,15 +283,13 @@ public class WicketTester extends BaseWicketTester
{
if (null != getLastResponse().getHeader("Location"))
{
- throw new AssertionFailedError(
- "Location header should *not* be present when using Ajax");
+ fail("Location header should *not* be present when using Ajax");
}
String ajaxLocation = getLastResponse().getHeader("Ajax-Location");
if (null == ajaxLocation)
{
- throw new AssertionFailedError(
- "Ajax-Location header should be present when using Ajax");
+ fail("Ajax-Location header should be present when using Ajax");
}
int statusCode = getLastResponse().getStatus();
@@ -480,7 +477,7 @@ public class WicketTester extends BaseWicketTester
if (markup == null)
{
- throw new AssertionFailedError(String.format("Cannot find the markup of component: %s",
+ fail(String.format("Cannot find the markup of component: %s",
component.getPageRelativePath()));
}
@@ -600,13 +597,13 @@ public class WicketTester extends BaseWicketTester
final List<FeedbackMessage> renderedMessages = model.getObject();
if (renderedMessages == null)
{
- throw new AssertionFailedError(
+ fail(
String.format("feedback panel at path [%s] returned null messages", path));
}
if (messages.length != renderedMessages.size())
{
- throw new AssertionFailedError(String.format(
+ fail(String.format(
"you expected '%d' messages for the feedback panel [%s], but there were actually '%d'",
messages.length, path, renderedMessages.size()));
}
@@ -822,7 +819,7 @@ public class WicketTester extends BaseWicketTester
{
if (result.wasFailed())
{
- throw new AssertionFailedError(result.getMessage());
+ fail(result.getMessage());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/wicket-util/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-util/pom.xml b/wicket-util/pom.xml
index 6f71806..d5777f8 100755
--- a/wicket-util/pom.xml
+++ b/wicket-util/pom.xml
@@ -44,11 +44,5 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
- <dependency>
- <groupId>org.opentest4j</groupId>
- <artifactId>opentest4j</artifactId>
- <version>RELEASE</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
index cbbc934..c6e5685 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
@@ -16,12 +16,17 @@
*/
package org.apache.wicket.util.license;
-import java.io.*;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
import java.util.List;
import org.apache.wicket.util.io.IOUtils;
import org.apache.wicket.util.string.Strings;
-import org.opentest4j.AssertionFailedError;
+
abstract class AbstractLicenseHeaderHandler implements ILicenseHeaderHandler
{
@@ -76,7 +81,7 @@ abstract class AbstractLicenseHeaderHandler implements ILicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
finally
{
@@ -86,7 +91,7 @@ abstract class AbstractLicenseHeaderHandler implements ILicenseHeaderHandler
}
catch (IOException e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
}
@@ -110,7 +115,7 @@ abstract class AbstractLicenseHeaderHandler implements ILicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
}
@@ -142,7 +147,7 @@ abstract class AbstractLicenseHeaderHandler implements ILicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
finally
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/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 596b2ed..d03f8ad 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
@@ -29,7 +29,6 @@ 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;
@@ -187,7 +186,7 @@ public abstract class ApacheLicenseHeaderTestCase
}
System.out.println(failString);
- throw new AssertionFailedError(failString.toString());
+ throw new AssertionError(failString.toString());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
index 7652e10..694239b 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.wicket.util.diff.Diff;
import org.apache.wicket.util.diff.Revision;
-import org.opentest4j.AssertionFailedError;
+
class CssLicenseHeaderHandler extends AbstractLicenseHeaderHandler
@@ -56,7 +56,7 @@ class CssLicenseHeaderHandler extends AbstractLicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
return revision.size() == 0;
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
index d38c008..3165ebc 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
@@ -23,7 +23,6 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.wicket.util.string.Strings;
-import org.opentest4j.AssertionFailedError;
class JavaLicenseHeaderHandler extends AbstractLicenseHeaderHandler
{
@@ -64,13 +63,13 @@ class JavaLicenseHeaderHandler extends AbstractLicenseHeaderHandler
}
else
{
- throw new AssertionFailedError();
+ throw new AssertionError();
}
}
catch (Exception e)
{
e.printStackTrace();
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
return added;
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
index 4a0447d..3da2788 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
@@ -16,14 +16,13 @@
*/
package org.apache.wicket.util.license;
-import org.apache.wicket.util.diff.Diff;
-import org.apache.wicket.util.diff.Revision;
-import org.opentest4j.AssertionFailedError;
-
import java.io.File;
import java.util.Arrays;
import java.util.List;
+import org.apache.wicket.util.diff.Diff;
+import org.apache.wicket.util.diff.Revision;
+
class PropertiesLicenseHeaderHandler extends AbstractLicenseHeaderHandler
{
/**
@@ -55,7 +54,7 @@ class PropertiesLicenseHeaderHandler extends AbstractLicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
return revision.size() == 0;
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
index 2d1286b..54fd6a6 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
@@ -16,14 +16,13 @@
*/
package org.apache.wicket.util.license;
-import org.apache.wicket.util.diff.Diff;
-import org.apache.wicket.util.diff.Revision;
-import org.opentest4j.AssertionFailedError;
-
import java.io.File;
import java.util.Arrays;
import java.util.List;
+import org.apache.wicket.util.diff.Diff;
+import org.apache.wicket.util.diff.Revision;
+
class VelocityLicenseHeaderHandler extends AbstractLicenseHeaderHandler
{
/**
@@ -55,7 +54,7 @@ class VelocityLicenseHeaderHandler extends AbstractLicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
return revision.size() == 0;
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
index e8b1ad2..10e4988 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
@@ -16,17 +16,17 @@
*/
package org.apache.wicket.util.license;
-import org.apache.wicket.util.diff.Diff;
-import org.apache.wicket.util.diff.Revision;
-import org.apache.wicket.util.string.Strings;
-import org.opentest4j.AssertionFailedError;
-
import java.io.File;
import java.util.Arrays;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.wicket.util.diff.Diff;
+import org.apache.wicket.util.diff.Revision;
+import org.apache.wicket.util.string.Strings;
+import org.opentest4j.AssertionFailedError;
+
class XmlLicenseHeaderHandler extends AbstractLicenseHeaderHandler
{
private final Pattern xmlHeader = Pattern.compile(
@@ -125,7 +125,7 @@ class XmlLicenseHeaderHandler extends AbstractLicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
return added;
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
index ab5a73e..73597d8 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.util.license;
-import org.opentest4j.AssertionFailedError;
-
import java.io.File;
import java.util.Arrays;
import java.util.List;
@@ -47,7 +45,7 @@ class XmlPrologHeaderHandler extends XmlLicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
}
[05/45] wicket git commit: - upgrade junit4 with junit5 in
wicket-util - replace Junit4 Methods in WicketTester.java - remove junit 4
dependencies in pom.xml
Posted by mg...@apache.org.
- upgrade junit4 with junit5 in wicket-util
- replace Junit4 Methods in WicketTester.java
- remove junit 4 dependencies in pom.xml
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/978ea5cb
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/978ea5cb
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/978ea5cb
Branch: refs/heads/master
Commit: 978ea5cb9a01dcb9ad192a9413d9a18db35b8ca5
Parents: de2aedd
Author: renoth <jo...@gmx.de>
Authored: Tue Jul 31 12:32:49 2018 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 26 15:36:17 2018 +0300
----------------------------------------------------------------------
pom.xml | 18 +-
wicket-core/pom.xml | 12 +-
.../apache/wicket/util/tester/WicketTester.java | 488 ++++++++++---------
wicket-util/pom.xml | 13 +-
.../license/AbstractLicenseHeaderHandler.java | 103 ++--
.../license/ApacheLicenseHeaderTestCase.java | 307 ++++++------
.../util/license/CssLicenseHeaderHandler.java | 4 +-
.../util/license/JavaLicenseHeaderHandler.java | 10 +-
.../license/PropertiesLicenseHeaderHandler.java | 10 +-
.../license/VelocityLicenseHeaderHandler.java | 10 +-
.../util/license/XmlLicenseHeaderHandler.java | 19 +-
.../util/license/XmlPrologHeaderHandler.java | 19 +-
.../markup/xhtml/WellFormedXmlTestCase.java | 18 +-
.../org/apache/wicket/util/LongEncoderTest.java | 10 +-
.../wicket/util/collections/IntHashMapTest.java | 16 +-
.../wicket/util/collections/MicroMapTest.java | 13 +-
.../wicket/util/collections/MiniMapTest.java | 13 +-
.../collections/MostRecentlyUsedMapTest.java | 6 +-
.../collections/ReverseListIteratorTest.java | 7 +-
.../converter/BigIntegerConverterTest.java | 19 +-
.../converter/LocalDateConverterTest.java | 14 +-
.../converter/LocalDateTimeConverterTest.java | 14 +-
.../converter/LocalTimeConverterTest.java | 14 +-
.../converter/ZonedDateTimeConverterTest.java | 14 +-
.../apache/wicket/util/crypt/Base64Test.java | 7 +-
.../wicket/util/crypt/SunJceCryptTest.java | 19 +-
...UnlimitedStrengthJurisdictionPolicyTest.java | 23 +-
.../wicket/util/encoding/UrlDecoderTest.java | 4 +-
.../wicket/util/encoding/UrlEncoderTest.java | 11 +-
.../org/apache/wicket/util/file/FilesTest.java | 131 ++---
.../apache/wicket/util/file/WebXmlFileTest.java | 14 +-
.../apache/wicket/util/io/ConnectionsTest.java | 19 +-
.../apache/wicket/util/io/LastModifiedTest.java | 11 +-
.../apache/wicket/util/io/XmlReaderTest.java | 8 +-
.../org/apache/wicket/util/lang/ArgsTest.java | 25 +-
.../org/apache/wicket/util/lang/BytesTest.java | 53 +-
.../apache/wicket/util/lang/ClassesTest.java | 7 +-
.../apache/wicket/util/lang/NumbersTest.java | 7 +-
.../apache/wicket/util/lang/ObjectsTest.java | 7 +-
.../apache/wicket/util/lang/PackagesTest.java | 7 +-
.../apache/wicket/util/lang/PrimitivesTest.java | 28 +-
.../util/parse/metapattern/MetaPatternTest.java | 12 +-
.../parsers/VariableAssignmentParserTest.java | 7 +-
.../wicket/util/resource/ResourceUtilsTest.java | 34 +-
.../org/apache/wicket/util/size/BytesTest.java | 19 +-
.../util/string/AppendingStringBufferTest.java | 9 +-
.../util/string/PrependingStringBufferTest.java | 8 +-
.../wicket/util/string/StringListTest.java | 7 +-
.../wicket/util/string/StringValueTest.java | 48 +-
.../apache/wicket/util/string/StringsTest.java | 48 +-
.../interpolator/VariableInterpolatorTest.java | 8 +-
.../apache/wicket/util/time/DurationTest.java | 13 +-
.../apache/wicket/util/time/TimeFrameTest.java | 27 +-
.../apache/wicket/util/time/TimeMapTest.java | 7 +-
.../apache/wicket/util/time/TimeOfDayTest.java | 8 +-
.../org/apache/wicket/util/time/TimeTest.java | 6 +-
.../apache/wicket/util/value/LongValueTest.java | 6 +-
.../apache/wicket/util/value/ValueMapTest.java | 9 +-
.../wicket/util/visit/AllVisitFilterTest.java | 7 +-
.../wicket/util/visit/ClassVisitFilterTest.java | 8 +-
60 files changed, 937 insertions(+), 906 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0e8297d..8edc8af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
<cglib.version>3.2.8</cglib.version>
<jacoco.version>0.8.2</jacoco.version>
<jetty.version>9.4.12.v20180830</jetty.version>
- <junit.version>4.12</junit.version>
+ <junit.version>5.2.0</junit.version>
<spring.version>5.1.0.RELEASE</spring.version>
<servlet-api.version>3.1.0</servlet-api.version>
<maven.javadoc.version>3.0.1</maven.javadoc.version>
@@ -494,16 +494,10 @@
</exclusions>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -587,10 +581,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
@@ -1295,7 +1285,7 @@
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.9</version>
+ <version>3.0.0</version>
<reportSets>
<reportSet>
<reports>
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-core/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml
index d9d8342..e19d904 100644
--- a/wicket-core/pom.xml
+++ b/wicket-core/pom.xml
@@ -37,8 +37,8 @@
</description>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
<!-- provided because of WicketTester -->
<scope>provided</scope>
<optional>true</optional>
@@ -64,6 +64,14 @@
<artifactId>jdk-serializable-functional</artifactId>
</dependency>
<dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.github.openjson</groupId>
+ <artifactId>openjson</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
index 613bb02..a35aa0d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
@@ -16,22 +16,6 @@
*/
package org.apache.wicket.util.tester;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-
-import javax.servlet.ServletContext;
-
-import junit.framework.AssertionFailedError;
-
import org.apache.commons.collections4.CollectionUtils;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
@@ -54,14 +38,24 @@ import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Objects;
+import org.opentest4j.AssertionFailedError;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.servlet.ServletContext;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+
+import static org.junit.jupiter.api.Assertions.*;
+
/**
* A helper class to ease unit testing of Wicket applications without the need for a servlet
* container. To start a test, either use <code>startPage</code> or <code>startPanel</code>:
- *
+ *
* <pre>
* // production page
* public class MyPage extends WebPage
@@ -79,16 +73,16 @@ import org.slf4j.LoggerFactory;
* }
* }
* </pre>
- *
+ *
* <pre>
* // test code
* private WicketTester tester;
- *
+ *
* public void setUp()
* {
* tester = new WicketTester();
* }
- *
+ *
* public void testRenderMyPage()
* {
* // start and render the test page
@@ -99,10 +93,10 @@ import org.slf4j.LoggerFactory;
* tester.assertLabel("myMessage", "Hello!");
* }
* </pre>
- *
+ *
* The above example is straight forward: start <code>MyPage.class</code> and assert
* <code>Label</code> it rendered. Next, we try to navigate through a <code>Link</code>:
- *
+ *
* <pre>
* // production page
* public class YourPage extends WebPage
@@ -113,7 +107,7 @@ import org.slf4j.LoggerFactory;
* info("Wicket Rocks ;-)");
* }
* }
- *
+ *
* // test code
* public void testLinkToYourPage()
* {
@@ -124,11 +118,11 @@ import org.slf4j.LoggerFactory;
* tester.assertLabel("yourMessage", "Hi!");
* }
* </pre>
- *
+ *
* <code>tester.clickLink(path);</code> will simulate user click on the component (in this case,
* it's a <code>Link</code>) and render the response page <code>YourPage</code>. Ok, unit test of
* <code>MyPage</code> is completed. Now we test <code>YourPage</code> standalone:
- *
+ *
* <pre>
* // test code
* public void testRenderYourPage()
@@ -141,30 +135,28 @@ import org.slf4j.LoggerFactory;
* tester.assertInfoMessages(new String[] { "Wicket Rocks ;-)" });
* }
* </pre>
- *
+ *
* Many methods require a 'path' parameter. E.g. the page relative path can be obtained via
* {@link Component#getPageRelativePath()}. Since each Component has an ID/name, any Component can
* also be referenced by its ID {@link MarkupContainer#get(String)}. And since MarkupContainer's and
* its subclasses are containers which allow to add Components (in sync with the markup hierarchy),
* you may not only access direct childs but also subchilds like get("myPanel:myForm:myNameField")
* separating each ID with a ':'.
- *
+ *
* Cookie handling:
- *
- * There are some expectations about wicket tester cookie handling which should match as best as
- * it can be with a real client server request response cycle:
- * - all valid cookies set before a request is made (tester.getRequest().addCookie()) should
- * appear in the page request
- * - all cookies set in the response should appear in the last response (tester.getLastResponse())
- * after the request is made (expired cookies and others)
- * - all cookies set in the response should appear even after a redirect response is made
- * until the final response (tester.getLastResponse()) is written to the client (wicket tester)
- * - all valid cookies (maxAge!=0) from the last response should be added to
- * the next request cookies (tester.getRequest().getCookies())
- *
- *
+ *
+ * There are some expectations about wicket tester cookie handling which should match as best as it
+ * can be with a real client server request response cycle: - all valid cookies set before a request
+ * is made (tester.getRequest().addCookie()) should appear in the page request - all cookies set in
+ * the response should appear in the last response (tester.getLastResponse()) after the request is
+ * made (expired cookies and others) - all cookies set in the response should appear even after a
+ * redirect response is made until the final response (tester.getLastResponse()) is written to the
+ * client (wicket tester) - all valid cookies (maxAge!=0) from the last response should be added to
+ * the next request cookies (tester.getRequest().getCookies())
+ *
+ *
* TODO General: Example usage of FormTester
- *
+ *
* @author Ingram Chen
* @author Juergen Donnerstag
* @author Frank Bille
@@ -185,7 +177,7 @@ public class WicketTester extends BaseWicketTester
/**
* Creates a <code>WicketTester</code> and automatically creates a <code>WebApplication</code>.
- *
+ *
* @param homePage
* a home page <code>Class</code>
*/
@@ -196,7 +188,7 @@ public class WicketTester extends BaseWicketTester
/**
* Creates a <code>WicketTester</code>.
- *
+ *
* @param application
* a <code>WicketTester</code> <code>WebApplication</code> object
*/
@@ -207,13 +199,13 @@ public class WicketTester extends BaseWicketTester
/**
* Creates a <code>WicketTester</code> to help unit testing.
- *
+ *
* @param application
* a <code>WicketTester</code> <code>WebApplication</code> object
* @param path
* the absolute path on disk to the web application's contents (e.g. war root) - may
* be <code>null</code>
- *
+ *
* @see org.apache.wicket.mock.MockApplication#MockApplication()
*/
public WicketTester(final WebApplication application, final String path)
@@ -223,7 +215,7 @@ public class WicketTester extends BaseWicketTester
/**
* Creates a <code>WicketTester</code> to help unit testing.
- *
+ *
* @param application
* a <code>WicketTester</code> <code>WebApplication</code> object
* @param servletCtx
@@ -233,10 +225,10 @@ public class WicketTester extends BaseWicketTester
{
super(application, servletCtx);
}
-
+
/**
* Creates a <code>WicketTester</code> to help unit testing.
- *
+ *
* @param application
* a <code>WicketTester</code> <code>WebApplication</code> object
* @param init
@@ -246,10 +238,10 @@ public class WicketTester extends BaseWicketTester
{
super(application, init);
}
-
+
/**
* Creates a <code>WicketTester</code> to help unit testing.
- *
+ *
* @param application
* a <code>WicketTester</code> <code>WebApplication</code> object
* @param servletCtx
@@ -263,19 +255,41 @@ public class WicketTester extends BaseWicketTester
}
/**
+ * Returns the current Maven build directory taken from the <tt>basedir</tt> system property, or
+ * null if not set
+ *
+ * @return path with a trailing slash
+ */
+ public static String getBasedir()
+ {
+ String basedir = System.getProperty("basedir");
+ if (basedir != null)
+ {
+ basedir = basedir + "/";
+ }
+ else
+ {
+ basedir = "";
+ }
+ return basedir;
+ }
+
+ /**
* Asserts that the Ajax location header is present.
*/
public void assertAjaxLocation()
{
if (null != getLastResponse().getHeader("Location"))
{
- fail("Location header should *not* be present when using Ajax");
+ throw new AssertionFailedError(
+ "Location header should *not* be present when using Ajax");
}
String ajaxLocation = getLastResponse().getHeader("Ajax-Location");
if (null == ajaxLocation)
{
- throw new AssertionFailedError("Ajax-Location header should be present when using Ajax");
+ throw new AssertionFailedError(
+ "Ajax-Location header should be present when using Ajax");
}
int statusCode = getLastResponse().getStatus();
@@ -287,7 +301,7 @@ public class WicketTester extends BaseWicketTester
/**
* Asserts a <code>Component</code> class.
- *
+ *
* @param path
* path to <code>Component</code>
* @param expectedComponentClass
@@ -299,8 +313,19 @@ public class WicketTester extends BaseWicketTester
}
/**
- * Asserts that the <code>Component</code> a the given path has a behavior
- * of the given type.
+ *
+ * @param result
+ */
+ private void assertResult(Result result)
+ {
+ if (result.wasFailed())
+ {
+ throw new AssertionFailedError(result.getMessage());
+ }
+ }
+
+ /**
+ * Asserts that the <code>Component</code> a the given path has a behavior of the given type.
*
* @param path
* path to <code>Component</code>
@@ -314,49 +339,49 @@ public class WicketTester extends BaseWicketTester
Component component = assertExists(path);
List<? extends Behavior> behaviors = component.getBehaviors(expectedBehaviorClass);
final String message = String.format("Component '%s' has no behaviors of type '%s'",
- component.getPageRelativePath(), expectedBehaviorClass);
+ component.getPageRelativePath(), expectedBehaviorClass);
assertResult(new Result(CollectionUtils.isEmpty(behaviors), message));
}
/**
* Tests that a <code>Component</code> has been added to a <code>AjaxRequestTarget</code>, using
- * {@link org.apache.wicket.ajax.AjaxRequestTarget#add(Component...)}. This method actually tests that a
- * <code>Component</code> is on the Ajax response sent back to the client.
+ * {@link org.apache.wicket.ajax.AjaxRequestTarget#add(Component...)}. This method actually
+ * tests that a <code>Component</code> is on the Ajax response sent back to the client.
* <p>
* PLEASE NOTE! This method doesn't actually insert the <code>Component</code> in the client DOM
* tree, using JavaScript. But it shouldn't be needed because you just have to trust that Wicket
* Ajax JavaScript works.
- *
- * @param component
- * a <code>Component</code> to be tested
+ *
+ * @param componentPath
+ * a <code>Component</code> path to test
*/
- public void assertComponentOnAjaxResponse(Component component)
+ public void assertComponentOnAjaxResponse(String componentPath)
{
- Result result = isComponentOnAjaxResponse(component);
- assertResult(result);
+ Component component = getComponentFromLastRenderedPage(componentPath, false);
+ assertComponentOnAjaxResponse(component);
}
/**
* Tests that a <code>Component</code> has been added to a <code>AjaxRequestTarget</code>, using
- * {@link org.apache.wicket.ajax.AjaxRequestTarget#add(Component...)}. This method actually tests that a
- * <code>Component</code> is on the Ajax response sent back to the client.
+ * {@link org.apache.wicket.ajax.AjaxRequestTarget#add(Component...)}. This method actually
+ * tests that a <code>Component</code> is on the Ajax response sent back to the client.
* <p>
* PLEASE NOTE! This method doesn't actually insert the <code>Component</code> in the client DOM
* tree, using JavaScript. But it shouldn't be needed because you just have to trust that Wicket
* Ajax JavaScript works.
- *
- * @param componentPath
- * a <code>Component</code> path to test
+ *
+ * @param component
+ * a <code>Component</code> to be tested
*/
- public void assertComponentOnAjaxResponse(String componentPath)
+ public void assertComponentOnAjaxResponse(Component component)
{
- Component component = getComponentFromLastRenderedPage(componentPath, false);
- assertComponentOnAjaxResponse(component);
+ Result result = isComponentOnAjaxResponse(component);
+ assertResult(result);
}
/**
* Asserts the content of last rendered page contains (matches) a given regex pattern.
- *
+ *
* @param pattern
* a regex pattern to match
*/
@@ -367,7 +392,7 @@ public class WicketTester extends BaseWicketTester
/**
* The opposite of {@link #assertContains(String)}.
- *
+ *
* @param pattern
* pattern
*/
@@ -380,9 +405,9 @@ public class WicketTester extends BaseWicketTester
* Asserts that a component's markup has loaded with the given variation
*
* @param component
- * The component which markup to check
+ * The component which markup to check
* @param expectedVariation
- * The expected variation of the component's markup
+ * The expected variation of the component's markup
*/
public void assertMarkupVariation(Component component, String expectedVariation)
{
@@ -392,21 +417,44 @@ public class WicketTester extends BaseWicketTester
String actualVariation = markup.getMarkupResourceStream().getVariation();
if (Objects.equal(expectedVariation, actualVariation) == false)
{
- result = Result.fail(String.format("Wrong variation for component '%s'. Actual: '%s', expected: '%s'",
+ result = Result.fail(
+ String.format("Wrong variation for component '%s'. Actual: '%s', expected: '%s'",
component.getPageRelativePath(), actualVariation, expectedVariation));
}
assertResult(result);
}
+ private IMarkupFragment getMarkupFragment(Component component)
+ {
+ IMarkupFragment markup = null;
+ if (component instanceof MarkupContainer)
+ {
+ markup = ((MarkupContainer)component).getAssociatedMarkup();
+ }
+
+ if (markup == null)
+ {
+ markup = component.getMarkup();
+ }
+
+ if (markup == null)
+ {
+ throw new AssertionFailedError(String.format("Cannot find the markup of component: %s",
+ component.getPageRelativePath()));
+ }
+
+ return markup;
+ }
+
/**
* Asserts that a component's markup has loaded with the given style.
*
* @param component
- * The component which markup to check
+ * The component which markup to check
* @param expectedStyle
- * The expected style of the component's markup.
- * For example: <em>green</em> in <code>MyPanel_green.html</code>
+ * The expected style of the component's markup. For example: <em>green</em> in
+ * <code>MyPanel_green.html</code>
*/
public void assertMarkupStyle(Component component, String expectedStyle)
{
@@ -416,7 +464,8 @@ public class WicketTester extends BaseWicketTester
String actualStyle = markup.getMarkupResourceStream().getStyle();
if (Objects.equal(expectedStyle, actualStyle) == false)
{
- result = Result.fail(String.format("Wrong style for component '%s'. Actual: '%s', expected: '%s'",
+ result = Result
+ .fail(String.format("Wrong style for component '%s'. Actual: '%s', expected: '%s'",
component.getPageRelativePath(), actualStyle, expectedStyle));
}
@@ -427,9 +476,9 @@ public class WicketTester extends BaseWicketTester
* Asserts that a component's markup has loaded with the given locale
*
* @param component
- * The component which markup to check
+ * The component which markup to check
* @param expectedLocale
- * The expected locale of the component's markup
+ * The expected locale of the component's markup
*/
public void assertMarkupLocale(Component component, Locale expectedLocale)
{
@@ -439,54 +488,24 @@ public class WicketTester extends BaseWicketTester
Locale actualLocale = markup.getMarkupResourceStream().getLocale();
if (Objects.equal(expectedLocale, actualLocale) == false)
{
- result = Result.fail(String.format("Wrong locale for component '%s'. Actual: '%s', expected: '%s'",
+ result = Result
+ .fail(String.format("Wrong locale for component '%s'. Actual: '%s', expected: '%s'",
component.getPageRelativePath(), actualLocale, expectedLocale));
}
assertResult(result);
}
- private IMarkupFragment getMarkupFragment(Component component)
- {
- IMarkupFragment markup = null;
- if (component instanceof MarkupContainer)
- {
- markup = ((MarkupContainer) component).getAssociatedMarkup();
- }
-
- if (markup == null)
- {
- markup = component.getMarkup();
- }
-
- if (markup == null)
- {
- throw new AssertionFailedError(String.format("Cannot find the markup of component: %s", component.getPageRelativePath()));
- }
-
- return markup;
- }
-
/**
* Asserts error-level feedback messages.
- *
+ *
* @param expectedErrorMessages
* expected error messages
*/
public void assertErrorMessages(Serializable... expectedErrorMessages)
{
- assertFeedbackMessages(new ExactLevelFeedbackMessageFilter(FeedbackMessage.ERROR), expectedErrorMessages);
- }
-
- /**
- * Assert info-level feedback messages.
- *
- * @param expectedInfoMessages
- * expected info messages
- */
- public void assertInfoMessages(Serializable... expectedInfoMessages)
- {
- assertFeedbackMessages(new ExactLevelFeedbackMessageFilter(FeedbackMessage.INFO), expectedInfoMessages);
+ assertFeedbackMessages(new ExactLevelFeedbackMessageFilter(FeedbackMessage.ERROR),
+ expectedErrorMessages);
}
/**
@@ -497,7 +516,8 @@ public class WicketTester extends BaseWicketTester
* @param expectedMessages
* expected feedback messages
*/
- public void assertFeedbackMessages(IFeedbackMessageFilter filter, Serializable... expectedMessages)
+ public void assertFeedbackMessages(IFeedbackMessageFilter filter,
+ Serializable... expectedMessages)
{
List<FeedbackMessage> feedbackMessages = getFeedbackMessages(filter);
List<Serializable> actualMessages = getActualFeedbackMessages(feedbackMessages);
@@ -505,34 +525,8 @@ public class WicketTester extends BaseWicketTester
}
/**
- * Asserts that there is a feedback message provided by a given component
- *
- * @param component
- * the component that provided the expected feedback message. Optional.
- * @param key
- * the resource key for the feedback message. Mandatory.
- * @param model
- * the model used for interpolating the feedback message. Optional.
- * @param filter
- * the filter that decides in which messages to look in. E.g. with a specific
- * level, rendered or not, etc.
- */
- public void assertComponentFeedbackMessage(Component component, String key, IModel<?> model, IFeedbackMessageFilter filter)
- {
- Args.notNull(key, "key");
-
- String expectedMessage = getApplication().getResourceSettings().getLocalizer().getString(key, component, model);
-
- List<FeedbackMessage> feedbackMessages = getFeedbackMessages(filter);
- List<Serializable> actualMessages = getActualFeedbackMessages(feedbackMessages);
-
- assertTrue(String.format("Feedback message with key '%s' cannot be found in %s", key, actualMessages),
- actualMessages.contains(expectedMessage));
- }
-
- /**
- * Extracts the actual messages from the passed feedback messages.
- * Specially handles ValidationErrorFeedback messages by extracting their String message
+ * Extracts the actual messages from the passed feedback messages. Specially handles
+ * ValidationErrorFeedback messages by extracting their String message
*
* @param feedbackMessages
* the feedback messages
@@ -557,12 +551,52 @@ public class WicketTester extends BaseWicketTester
}
/**
+ * Assert info-level feedback messages.
+ *
+ * @param expectedInfoMessages
+ * expected info messages
+ */
+ public void assertInfoMessages(Serializable... expectedInfoMessages)
+ {
+ assertFeedbackMessages(new ExactLevelFeedbackMessageFilter(FeedbackMessage.INFO),
+ expectedInfoMessages);
+ }
+
+ /**
+ * Asserts that there is a feedback message provided by a given component
+ *
+ * @param component
+ * the component that provided the expected feedback message. Optional.
+ * @param key
+ * the resource key for the feedback message. Mandatory.
+ * @param model
+ * the model used for interpolating the feedback message. Optional.
+ * @param filter
+ * the filter that decides in which messages to look in. E.g. with a specific level,
+ * rendered or not, etc.
+ */
+ public void assertComponentFeedbackMessage(Component component, String key, IModel<?> model,
+ IFeedbackMessageFilter filter)
+ {
+ Args.notNull(key, "key");
+
+ String expectedMessage = getApplication().getResourceSettings().getLocalizer().getString(
+ key, component, model);
+
+ List<FeedbackMessage> feedbackMessages = getFeedbackMessages(filter);
+ List<Serializable> actualMessages = getActualFeedbackMessages(feedbackMessages);
+
+ assertTrue(actualMessages.contains(expectedMessage), String
+ .format("Feedback message with key '%s' cannot be found in %s", key, actualMessages));
+ }
+
+ /**
* Assert that a particular feedback panel is rendering certain messages.
- *
+ *
* NOTE: this casts the component at the specified path to a {@link FeedbackPanel}, so it will
* not work with custom {@link IFeedback} implementations unless you are subclassing
* {@link FeedbackPanel}
- *
+ *
* @param path
* path to the feedback panel
* @param messages
@@ -579,8 +613,9 @@ public class WicketTester extends BaseWicketTester
}
if (messages.length != renderedMessages.size())
{
- fail(String.format("you expected '%d' messages for the feedback panel [%s], but there were actually '%d'",
- messages.length, path, renderedMessages.size()));
+ fail(String.format(
+ "you expected '%d' messages for the feedback panel [%s], but there were actually '%d'",
+ messages.length, path, renderedMessages.size()));
}
for (int i = 0; i < messages.length && i < renderedMessages.size(); i++)
{
@@ -603,7 +638,7 @@ public class WicketTester extends BaseWicketTester
/**
* Asserts that a <code>Component</code> is invisible.
- *
+ *
* @param path
* path to <code>Component</code>
*/
@@ -614,7 +649,7 @@ public class WicketTester extends BaseWicketTester
/**
* Asserts the text of a <code>Label</code> <code>Component</code>.
- *
+ *
* @param path
* path to <code>Label</code> <code>Component</code>
* @param expectedLabelText
@@ -628,7 +663,7 @@ public class WicketTester extends BaseWicketTester
/**
* Asserts the model value of a component.
- *
+ *
* @param path
* path to the component on the page
* @param expectedValue
@@ -642,7 +677,7 @@ public class WicketTester extends BaseWicketTester
/**
* Asserts the model of a {@link ListView}.
- *
+ *
* @param path
* path to a {@link ListView} <code>Component</code>
* @param expectedList
@@ -659,67 +694,56 @@ public class WicketTester extends BaseWicketTester
}
/**
- * Asserts no error-level feedback messages.
+ * Asserts last-rendered <code>Page</code> against an expected HTML document.
+ * <p>
+ * Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected
+ * output file.
+ *
+ * @param clazz
+ * <code>Class</code> used to load the file (relative to <code>clazz</code> package)
+ * @param filename
+ * expected output filename <code>String</code>
+ * @throws Exception
*/
- public void assertNoErrorMessage()
+ @Override
+ public void assertResultPage(final Class<?> clazz, final String filename) throws Exception
{
- assertNoFeedbackMessage(FeedbackMessage.ERROR);
+ String document = getLastResponseAsString();
+ DiffUtil.validatePage(document, clazz, filename, true);
}
/**
- * Asserts no info-level feedback messages.
+ * Asserts no error-level feedback messages.
*/
- public void assertNoInfoMessage()
+ public void assertNoErrorMessage()
{
- assertNoFeedbackMessage(FeedbackMessage.INFO);
+ assertNoFeedbackMessage(FeedbackMessage.ERROR);
}
/**
* Asserts there are no feedback messages with a certain level.
- *
+ *
* @param level
* the level to check for
*/
public void assertNoFeedbackMessage(int level)
{
Result result = hasNoFeedbackMessage(level);
- assertFalse(result.getMessage(), result.wasFailed());
- }
-
- /**
- * Asserts a last-rendered <code>Page</code> class.
- *
- * @param expectedRenderedPageClass
- * expected class of last rendered <code>Page</code>
- */
- public void assertRenderedPage(Class<? extends Page> expectedRenderedPageClass)
- {
- assertResult(isRenderedPage(expectedRenderedPageClass));
+ assertFalse(result.wasFailed(), result.getMessage());
}
/**
- * Asserts last-rendered <code>Page</code> against an expected HTML document.
- * <p>
- * Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected
- * output file.
- *
- * @param clazz
- * <code>Class</code> used to load the file (relative to <code>clazz</code> package)
- * @param filename
- * expected output filename <code>String</code>
- * @throws Exception
+ * Asserts no info-level feedback messages.
*/
- @Override
- public void assertResultPage(final Class<?> clazz, final String filename) throws Exception
+ public void assertNoInfoMessage()
{
- String document = getLastResponseAsString();
- DiffUtil.validatePage(document, clazz, filename, true);
+ assertNoFeedbackMessage(FeedbackMessage.INFO);
}
/**
* Asserts last-rendered <code>Page</code> against an expected HTML document as a
* <code>String</code>
- *
+ *
* @param expectedDocument
* expected output <code>String</code>
* @throws Exception
@@ -733,7 +757,7 @@ public class WicketTester extends BaseWicketTester
/**
* Asserts that a <code>Component</code> is visible.
- *
+ *
* @param path
* path to a <code>Component</code>
*/
@@ -744,10 +768,10 @@ public class WicketTester extends BaseWicketTester
/**
* assert component is enabled.
- *
+ *
* @param path
* path to component
- *
+ *
*/
public void assertEnabled(String path)
{
@@ -756,7 +780,7 @@ public class WicketTester extends BaseWicketTester
/**
* assert component is enabled.
- *
+ *
* @param path
* path to component
*/
@@ -767,7 +791,7 @@ public class WicketTester extends BaseWicketTester
/**
* assert form component is required.
- *
+ *
* @param path
* path to form component
*/
@@ -788,20 +812,8 @@ public class WicketTester extends BaseWicketTester
}
/**
- *
- * @param result
- */
- private void assertResult(Result result)
- {
- if (result.wasFailed())
- {
- throw new AssertionFailedError(result.getMessage());
- }
- }
-
- /**
* Checks whether a component is visible and/or enabled before usage
- *
+ *
* @param component
*/
public void assertUsability(final Component component)
@@ -810,7 +822,7 @@ public class WicketTester extends BaseWicketTester
}
/**
- *
+ *
* @param link
*/
public void clickLink(Component link)
@@ -821,7 +833,7 @@ public class WicketTester extends BaseWicketTester
/**
* Asserts that that the BookmarkablePageLink<?> identified by "id" points to the page as
* expected - including parameters.
- *
+ *
* @param id
* @param pageClass
* @param parameters
@@ -836,21 +848,22 @@ public class WicketTester extends BaseWicketTester
}
catch (ClassCastException e)
{
- throw new IllegalArgumentException("Component with id:" + id +
- " is not a BookmarkablePageLink");
+ throw new IllegalArgumentException(
+ "Component with id:" + id + " is not a BookmarkablePageLink");
}
- assertEquals("BookmarkablePageLink: " + id + " is pointing to the wrong page", pageClass,
- pageLink.getPageClass());
+ assertEquals(pageClass, pageLink.getPageClass(),
+ "BookmarkablePageLink: " + id + " is pointing to the wrong page");
- assertEquals("One or more of the parameters associated with the BookmarkablePageLink: " +
- id + " do not match", parameters, pageLink.getPageParameters());
+ assertEquals(parameters, pageLink.getPageParameters(),
+ "One or more of the parameters associated with the BookmarkablePageLink: " + id +
+ " do not match");
}
/**
* Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected
* output file.
- *
+ *
* @param <T>
* @param testClass
* @param pageClass
@@ -868,9 +881,20 @@ public class WicketTester extends BaseWicketTester
}
/**
+ * Asserts a last-rendered <code>Page</code> class.
+ *
+ * @param expectedRenderedPageClass
+ * expected class of last rendered <code>Page</code>
+ */
+ public void assertRenderedPage(Class<? extends Page> expectedRenderedPageClass)
+ {
+ assertResult(isRenderedPage(expectedRenderedPageClass));
+ }
+
+ /**
* Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected
* output file.
- *
+ *
* @param testClass
* @param page
* @param filename
@@ -889,7 +913,7 @@ public class WicketTester extends BaseWicketTester
/**
* Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected
* output file.
- *
+ *
* @param testClass
* @param component
* @param filename
@@ -907,7 +931,7 @@ public class WicketTester extends BaseWicketTester
/**
* Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected
* output file.
- *
+ *
* @param <T>
* @param testClass
* @param pageClass
@@ -926,7 +950,7 @@ public class WicketTester extends BaseWicketTester
}
/**
- *
+ *
* @param testClass
* @param component
* @param filename
@@ -944,7 +968,7 @@ public class WicketTester extends BaseWicketTester
}
/**
- *
+ *
* @param testClass
* @param behavior
* @param filename
@@ -963,7 +987,7 @@ public class WicketTester extends BaseWicketTester
/**
* Assert that the last request redirected to the given Url.
- *
+ *
* @param expectedRedirectUrl
* expected
*/
@@ -972,24 +996,4 @@ public class WicketTester extends BaseWicketTester
String actualRedirectUrl = getLastResponse().getRedirectLocation();
assertEquals(expectedRedirectUrl, actualRedirectUrl);
}
-
- /**
- * Returns the current Maven build directory taken from the <tt>basedir</tt> system property, or
- * null if not set
- *
- * @return path with a trailing slash
- */
- public static String getBasedir()
- {
- String basedir = System.getProperty("basedir");
- if (basedir != null)
- {
- basedir = basedir + "/";
- }
- else
- {
- basedir = "";
- }
- return basedir;
- }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-util/pom.xml b/wicket-util/pom.xml
index a0ac143..6f71806 100755
--- a/wicket-util/pom.xml
+++ b/wicket-util/pom.xml
@@ -28,10 +28,9 @@
<name>Wicket Util</name>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
@@ -45,5 +44,11 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.opentest4j</groupId>
+ <artifactId>opentest4j</artifactId>
+ <version>RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
index 74583c2..cbbc934 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
@@ -16,24 +16,18 @@
*/
package org.apache.wicket.util.license;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.LineNumberReader;
+import java.io.*;
import java.util.List;
-import org.junit.Assert;
import org.apache.wicket.util.io.IOUtils;
import org.apache.wicket.util.string.Strings;
-
+import org.opentest4j.AssertionFailedError;
abstract class AbstractLicenseHeaderHandler implements ILicenseHeaderHandler
{
protected static final String LINE_ENDING = System.getProperty("line.separator");
- private String licenseHeader;
private final List<String> ignoreFiles;
+ private String licenseHeader;
/**
* Construct.
@@ -64,48 +58,6 @@ abstract class AbstractLicenseHeaderHandler implements ILicenseHeaderHandler
return null;
}
- protected abstract String getLicenseHeaderFilename();
-
- protected String getLicenseHeader()
- {
- if (Strings.isEmpty(licenseHeader))
- {
- LineNumberReader lineNumberReader = null;
- InputStream inputStream = null;
- InputStreamReader inputStreamReader = null;
-
- try
- {
- inputStream = ApacheLicenseHeaderTestCase.class.getResourceAsStream(getLicenseHeaderFilename());
- inputStreamReader = new InputStreamReader(inputStream);
- lineNumberReader = new LineNumberReader(inputStreamReader);
-
- StringBuilder header = new StringBuilder();
- String line = lineNumberReader.readLine();
- while (line != null)
- {
- header.append(line);
- header.append(LINE_ENDING);
- line = lineNumberReader.readLine();
- }
-
- licenseHeader = header.toString().trim();
- }
- catch (Exception e)
- {
- Assert.fail(e.getMessage());
- }
- finally
- {
- IOUtils.closeQuietly(lineNumberReader);
- IOUtils.closeQuietly(inputStream);
- IOUtils.closeQuietly(inputStreamReader);
- }
- }
-
- return licenseHeader;
- }
-
protected String extractLicenseHeader(final File file, final int start, final int length)
{
StringBuilder header = new StringBuilder();
@@ -124,7 +76,7 @@ abstract class AbstractLicenseHeaderHandler implements ILicenseHeaderHandler
}
catch (Exception e)
{
- Assert.fail(e.getMessage());
+ throw new AssertionFailedError(e.getMessage());
}
finally
{
@@ -134,7 +86,7 @@ abstract class AbstractLicenseHeaderHandler implements ILicenseHeaderHandler
}
catch (IOException e)
{
- Assert.fail(e.getMessage());
+ throw new AssertionFailedError(e.getMessage());
}
}
@@ -158,7 +110,50 @@ abstract class AbstractLicenseHeaderHandler implements ILicenseHeaderHandler
}
catch (Exception e)
{
- Assert.fail(e.getMessage());
+ throw new AssertionFailedError(e.getMessage());
}
}
+
+ protected String getLicenseHeader()
+ {
+ if (Strings.isEmpty(licenseHeader))
+ {
+ LineNumberReader lineNumberReader = null;
+ InputStream inputStream = null;
+ InputStreamReader inputStreamReader = null;
+
+ try
+ {
+ inputStream = ApacheLicenseHeaderTestCase.class
+ .getResourceAsStream(getLicenseHeaderFilename());
+ inputStreamReader = new InputStreamReader(inputStream);
+ lineNumberReader = new LineNumberReader(inputStreamReader);
+
+ StringBuilder header = new StringBuilder();
+ String line = lineNumberReader.readLine();
+ while (line != null)
+ {
+ header.append(line);
+ header.append(LINE_ENDING);
+ line = lineNumberReader.readLine();
+ }
+
+ licenseHeader = header.toString().trim();
+ }
+ catch (Exception e)
+ {
+ throw new AssertionFailedError(e.getMessage());
+ }
+ finally
+ {
+ IOUtils.closeQuietly(lineNumberReader);
+ IOUtils.closeQuietly(inputStream);
+ IOUtils.closeQuietly(inputStreamReader);
+ }
+ }
+
+ return licenseHeader;
+ }
+
+ protected abstract String getLicenseHeaderFilename();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/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 b39e7c3..8485723 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,6 +16,14 @@
*/
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;
@@ -24,167 +32,18 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.wicket.util.lang.Generics;
-import org.apache.wicket.util.string.Strings;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* Testcase used in the different wicket projects for testing for the correct ASL license headers.
* Doesn't really make sense outside org.apache.wicket.
*
* @author Frank Bille Jensen (frankbille)
*/
-public abstract class ApacheLicenseHeaderTestCase extends Assert
+public abstract class ApacheLicenseHeaderTestCase
{
/** Log. */
private static final Logger log = LoggerFactory.getLogger(ApacheLicenseHeaderTestCase.class);
private static final String LINE_ENDING = System.getProperty("line.separator");
-
- interface FileVisitor
- {
- /**
- * @param file
- */
- void visitFile(File file);
- }
-
- private class SuffixAndIgnoreFileFilter implements FileFilter
- {
- private final List<String> suffixes;
- private final List<String> ignoreFiles;
-
- private SuffixAndIgnoreFileFilter(final List<String> suffixes,
- final List<String> ignoreFiles)
- {
- this.suffixes = suffixes;
- this.ignoreFiles = ignoreFiles;
- }
-
- @Override
- public boolean accept(final File pathname)
- {
- boolean accept = false;
-
- if (pathname.isFile())
- {
- if (ignoreFile(pathname) == false)
- {
- for (String suffix : suffixes)
- {
- if (pathname.getName().endsWith("." + suffix))
- {
- accept = true;
- break;
- }
- else
- {
- log.debug("File ignored: '{}'", pathname);
- }
- }
- }
- else
- {
- log.debug("File ignored: '{}'", pathname);
- }
- }
-
- return accept;
- }
-
- private boolean ignoreFile(final File pathname)
- {
- boolean ignore = false;
-
- if (ignoreFiles != null)
- {
- String relativePathname = pathname.getAbsolutePath();
- relativePathname = Strings.replaceAll(relativePathname,
- baseDirectory.getAbsolutePath() + System.getProperty("file.separator"), "")
- .toString();
-
- for (String ignorePath : ignoreFiles)
- {
- // Will convert '/'s to '\\'s on Windows
- ignorePath = Strings.replaceAll(ignorePath, "/",
- System.getProperty("file.separator")).toString();
- File ignoreFile = new File(baseDirectory, ignorePath);
-
- // Directory ignore
- if (ignoreFile.isDirectory())
- {
- if (pathname.getAbsolutePath().startsWith(ignoreFile.getAbsolutePath()))
- {
- ignore = true;
- break;
- }
- }
- // Absolute file
- else if (ignoreFile.isFile())
- {
- if (relativePathname.equals(ignorePath))
- {
- ignore = true;
- break;
- }
- }
- else if (pathname.getName().equals(ignorePath))
- {
- ignore = true;
- break;
- }
- }
- }
-
- return ignore;
- }
- }
-
- private class DirectoryFileFilter implements FileFilter
- {
- private final String[] ignoreDirectory = new String[] { ".git" };
-
- @Override
- public boolean accept(final File pathname)
- {
- boolean accept = false;
-
- if (pathname.isDirectory())
- {
- String relativePathname = pathname.getAbsolutePath();
- relativePathname = Strings.replaceAll(relativePathname,
- baseDirectory.getAbsolutePath() + System.getProperty("file.separator"), "")
- .toString();
- if ("target".equals(relativePathname) == false)
- {
- boolean found = false;
- for (String ignore : ignoreDirectory)
- {
- if (pathname.getName().equals(ignore))
- {
- found = true;
- break;
- }
- }
- if (found == false)
- {
- accept = true;
- }
- }
- }
-
- return accept;
- }
- }
-
- private ILicenseHeaderHandler[] licenseHeaderHandlers;
-
- private File baseDirectory = new File("").getAbsoluteFile();
-
protected List<String> javaIgnore = Generics.newArrayList();
protected List<String> htmlIgnore = Generics.newArrayList();
protected List<String> xmlPrologIgnore = Generics.newArrayList();
@@ -194,7 +53,8 @@ public abstract class ApacheLicenseHeaderTestCase extends Assert
protected List<String> velocityIgnore = Generics.newArrayList();
protected List<String> javaScriptIgnore = Generics.newArrayList();
protected boolean addHeaders = false;
-
+ private ILicenseHeaderHandler[] licenseHeaderHandlers;
+ private File baseDirectory = new File("").getAbsoluteFile();
/**
* Construct.
*/
@@ -233,9 +93,9 @@ public abstract class ApacheLicenseHeaderTestCase extends Assert
}
/**
- *
+ *
*/
- @Before
+ @BeforeEach
public final void before()
{
// setup the base directory for when running inside maven (building a release
@@ -334,7 +194,7 @@ public abstract class ApacheLicenseHeaderTestCase extends Assert
}
System.out.println(failString);
- fail(failString.toString());
+ throw new AssertionFailedError(failString.toString());
}
}
@@ -368,4 +228,143 @@ public abstract class ApacheLicenseHeaderTestCase extends Assert
}
}
}
+
+ interface FileVisitor
+ {
+ /**
+ * @param file
+ */
+ void visitFile(File file);
+ }
+
+ private class SuffixAndIgnoreFileFilter implements FileFilter
+ {
+ private final List<String> suffixes;
+ private final List<String> ignoreFiles;
+
+ private SuffixAndIgnoreFileFilter(final List<String> suffixes,
+ final List<String> ignoreFiles)
+ {
+ this.suffixes = suffixes;
+ this.ignoreFiles = ignoreFiles;
+ }
+
+ @Override
+ public boolean accept(final File pathname)
+ {
+ boolean accept = false;
+
+ if (pathname.isFile())
+ {
+ if (ignoreFile(pathname) == false)
+ {
+ for (String suffix : suffixes)
+ {
+ if (pathname.getName().endsWith("." + suffix))
+ {
+ accept = true;
+ break;
+ }
+ else
+ {
+ log.debug("File ignored: '{}'", pathname);
+ }
+ }
+ }
+ else
+ {
+ log.debug("File ignored: '{}'", pathname);
+ }
+ }
+
+ return accept;
+ }
+
+ private boolean ignoreFile(final File pathname)
+ {
+ boolean ignore = false;
+
+ if (ignoreFiles != null)
+ {
+ String relativePathname = pathname.getAbsolutePath();
+ relativePathname = Strings
+ .replaceAll(relativePathname,
+ baseDirectory.getAbsolutePath() + System.getProperty("file.separator"), "")
+ .toString();
+
+ for (String ignorePath : ignoreFiles)
+ {
+ // Will convert '/'s to '\\'s on Windows
+ ignorePath = Strings
+ .replaceAll(ignorePath, "/", System.getProperty("file.separator"))
+ .toString();
+ File ignoreFile = new File(baseDirectory, ignorePath);
+
+ // Directory ignore
+ if (ignoreFile.isDirectory())
+ {
+ if (pathname.getAbsolutePath().startsWith(ignoreFile.getAbsolutePath()))
+ {
+ ignore = true;
+ break;
+ }
+ }
+ // Absolute file
+ else if (ignoreFile.isFile())
+ {
+ if (relativePathname.equals(ignorePath))
+ {
+ ignore = true;
+ break;
+ }
+ }
+ else if (pathname.getName().equals(ignorePath))
+ {
+ ignore = true;
+ break;
+ }
+ }
+ }
+
+ return ignore;
+ }
+ }
+
+ private class DirectoryFileFilter implements FileFilter
+ {
+ private final String[] ignoreDirectory = new String[] { ".git" };
+
+ @Override
+ public boolean accept(final File pathname)
+ {
+ boolean accept = false;
+
+ if (pathname.isDirectory())
+ {
+ String relativePathname = pathname.getAbsolutePath();
+ relativePathname = Strings
+ .replaceAll(relativePathname,
+ baseDirectory.getAbsolutePath() + System.getProperty("file.separator"), "")
+ .toString();
+ if ("target".equals(relativePathname) == false)
+ {
+ boolean found = false;
+ for (String ignore : ignoreDirectory)
+ {
+ if (pathname.getName().equals(ignore))
+ {
+ found = true;
+ break;
+ }
+ }
+ if (found == false)
+ {
+ accept = true;
+ }
+ }
+ }
+
+ return accept;
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
index 7be607c..eddaaa7 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
@@ -20,9 +20,9 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.junit.Assert;
import org.apache.wicket.util.diff.Diff;
import org.apache.wicket.util.diff.Revision;
+import org.opentest4j.AssertionFailedError;
class CssLicenseHeaderHandler extends AbstractLicenseHeaderHandler
{
@@ -55,7 +55,7 @@ class CssLicenseHeaderHandler extends AbstractLicenseHeaderHandler
}
catch (Exception e)
{
- Assert.fail(e.getMessage());
+ throw new AssertionFailedError(e.getMessage());
}
return revision.size() == 0;
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
index bbc0eac..e88a043 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
@@ -16,15 +16,15 @@
*/
package org.apache.wicket.util.license;
+import org.apache.wicket.util.string.Strings;
+import org.opentest4j.AssertionFailedError;
+
import java.io.File;
import java.util.Arrays;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.junit.Assert;
-import org.apache.wicket.util.string.Strings;
-
class JavaLicenseHeaderHandler extends AbstractLicenseHeaderHandler
{
private final Pattern javaHeaderPattern = Pattern.compile("^(.*?)package.*$",
@@ -64,13 +64,13 @@ class JavaLicenseHeaderHandler extends AbstractLicenseHeaderHandler
}
else
{
- Assert.fail();
+ throw new AssertionFailedError();
}
}
catch (Exception e)
{
e.printStackTrace();
- Assert.fail(e.getMessage());
+ throw new AssertionFailedError(e.getMessage());
}
return added;
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
index 98cbbe3..4a0447d 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
@@ -16,14 +16,14 @@
*/
package org.apache.wicket.util.license;
+import org.apache.wicket.util.diff.Diff;
+import org.apache.wicket.util.diff.Revision;
+import org.opentest4j.AssertionFailedError;
+
import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.junit.Assert;
-import org.apache.wicket.util.diff.Diff;
-import org.apache.wicket.util.diff.Revision;
-
class PropertiesLicenseHeaderHandler extends AbstractLicenseHeaderHandler
{
/**
@@ -55,7 +55,7 @@ class PropertiesLicenseHeaderHandler extends AbstractLicenseHeaderHandler
}
catch (Exception e)
{
- Assert.fail(e.getMessage());
+ throw new AssertionFailedError(e.getMessage());
}
return revision.size() == 0;
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
index 6e923b9..2d1286b 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
@@ -16,14 +16,14 @@
*/
package org.apache.wicket.util.license;
+import org.apache.wicket.util.diff.Diff;
+import org.apache.wicket.util.diff.Revision;
+import org.opentest4j.AssertionFailedError;
+
import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.junit.Assert;
-import org.apache.wicket.util.diff.Diff;
-import org.apache.wicket.util.diff.Revision;
-
class VelocityLicenseHeaderHandler extends AbstractLicenseHeaderHandler
{
/**
@@ -55,7 +55,7 @@ class VelocityLicenseHeaderHandler extends AbstractLicenseHeaderHandler
}
catch (Exception e)
{
- Assert.fail(e.getMessage());
+ throw new AssertionFailedError(e.getMessage());
}
return revision.size() == 0;
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
index 98f1f45..8287622 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
@@ -16,21 +16,22 @@
*/
package org.apache.wicket.util.license;
+import org.apache.wicket.util.diff.Diff;
+import org.apache.wicket.util.diff.Revision;
+import org.apache.wicket.util.string.Strings;
+import org.opentest4j.AssertionFailedError;
+
import java.io.File;
import java.util.Arrays;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.junit.Assert;
-import org.apache.wicket.util.diff.Diff;
-import org.apache.wicket.util.diff.Revision;
-import org.apache.wicket.util.string.Strings;
-
class XmlLicenseHeaderHandler extends AbstractLicenseHeaderHandler
{
- private final Pattern xmlHeader = Pattern.compile("^(\\<\\?xml[^" + LINE_ENDING + "]+?)" +
- LINE_ENDING + "(.*)$", Pattern.DOTALL | Pattern.MULTILINE);
+ private final Pattern xmlHeader = Pattern.compile(
+ "^(\\<\\?xml[^" + LINE_ENDING + "]+?)" + LINE_ENDING + "(.*)$",
+ Pattern.DOTALL | Pattern.MULTILINE);
/**
* Construct.
@@ -82,7 +83,7 @@ class XmlLicenseHeaderHandler extends AbstractLicenseHeaderHandler
catch (Exception e)
{
e.printStackTrace();
- Assert.fail(e.getMessage());
+ throw new AssertionFailedError(e.getMessage());
}
return revision.size() == 0;
@@ -125,7 +126,7 @@ class XmlLicenseHeaderHandler extends AbstractLicenseHeaderHandler
}
catch (Exception e)
{
- Assert.fail(e.getMessage());
+ throw new AssertionFailedError(e.getMessage());
}
return added;
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
index 083117b..3d652df 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
@@ -16,12 +16,12 @@
*/
package org.apache.wicket.util.license;
+import org.opentest4j.AssertionFailedError;
+
import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.junit.Assert;
-
class XmlPrologHeaderHandler extends XmlLicenseHeaderHandler
{
/**
@@ -34,12 +34,6 @@ class XmlPrologHeaderHandler extends XmlLicenseHeaderHandler
super(ignoreFiles);
}
- @Override
- public List<String> getSuffixes()
- {
- return Arrays.asList("html");
- }
-
/**
* @see org.apache.wicket.util.license.XmlLicenseHeaderHandler#checkLicenseHeader(java.io.File)
*/
@@ -53,8 +47,13 @@ class XmlPrologHeaderHandler extends XmlLicenseHeaderHandler
}
catch (Exception e)
{
- Assert.fail(e.getMessage());
+ throw new AssertionFailedError(e.getMessage());
}
- return true;
+ }
+
+ @Override
+ public List<String> getSuffixes()
+ {
+ return Arrays.asList("html");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java b/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
index ecdc856..bf330de 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
@@ -16,23 +16,19 @@
*/
package org.apache.wicket.util.markup.xhtml;
+import org.junit.jupiter.api.Test;
+import org.testng.annotations.Test;
+import org.xml.sax.*;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.junit.Test;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
/**
* Usable by tests to check that the html markup files are well formed.
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/LongEncoderTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/LongEncoderTest.java b/wicket-util/src/test/java/org/apache/wicket/util/LongEncoderTest.java
index c3731bb..4d5444b 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/LongEncoderTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/LongEncoderTest.java
@@ -16,11 +16,13 @@
*/
package org.apache.wicket.util;
+import org.junit.jupiter.api.Test;
+
import java.util.HashSet;
import java.util.Set;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
/**
* Tests {@link LongEncoder}
@@ -39,9 +41,9 @@ public class LongEncoderTest
for (int i = -10000; i < 10000; i++)
{
String enc = LongEncoder.encode(i);
- Assert.assertFalse("uniqueness: " + i, encoded.contains(enc));
+ assertFalse(encoded.contains(enc), "uniqueness: " + i);
encoded.add(enc);
- Assert.assertEquals("decoding: " + i, i, LongEncoder.decode(enc));
+ assertEquals(i, LongEncoder.decode(enc), "decoding: " + i);
}
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/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 b5c7da1..4f8fdca 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,18 +16,16 @@
*/
package org.apache.wicket.util.collections;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.*;
+import org.apache.wicket.util.io.ByteArrayOutputStream;
+import org.junit.jupiter.api.Test;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import org.apache.wicket.util.io.ByteArrayOutputStream;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
@SuppressWarnings("javadoc")
public class IntHashMapTest
@@ -48,9 +46,9 @@ public class IntHashMapTest
ByteArrayInputStream bais = new ByteArrayInputStream(serialized);
ObjectInputStream ois = new ObjectInputStream(bais);
IntHashMap<String> deserialized = (IntHashMap<String>) ois.readObject();
- assertThat(deserialized, is(notNullValue()));
- assertThat(deserialized.get(1), is(equalTo("one")));
- assertThat(deserialized.get(2), is(equalTo("two")));
+ assertNotNull(deserialized);
+ assertEquals(deserialized.get(1), "one");
+ assertEquals(deserialized.get(2), "two");
// WICKET-5584
deserialized.put(3, "three");
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/collections/MicroMapTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/collections/MicroMapTest.java b/wicket-util/src/test/java/org/apache/wicket/util/collections/MicroMapTest.java
index a26919b..ba7234a 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/collections/MicroMapTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/collections/MicroMapTest.java
@@ -16,20 +16,17 @@
*/
package org.apache.wicket.util.collections;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
+import org.junit.jupiter.api.Test;
+
+import java.util.*;
import java.util.Map.Entry;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
/**
* @author almaw
*/
-public class MicroMapTest extends Assert
+public class MicroMapTest
{
private static final Object FOO = new Object();
private static final Object BAR = new Object();
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/collections/MiniMapTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/collections/MiniMapTest.java b/wicket-util/src/test/java/org/apache/wicket/util/collections/MiniMapTest.java
index ab0896d..a64c987 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/collections/MiniMapTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/collections/MiniMapTest.java
@@ -16,20 +16,17 @@
*/
package org.apache.wicket.util.collections;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
+import org.junit.jupiter.api.Test;
+
+import java.util.*;
import java.util.Map.Entry;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
/**
* @author almaw
*/
-public class MiniMapTest extends Assert
+public class MiniMapTest
{
private static final Object FOO = new Object();
private static final Object BAR = new Object();
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/collections/MostRecentlyUsedMapTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/collections/MostRecentlyUsedMapTest.java b/wicket-util/src/test/java/org/apache/wicket/util/collections/MostRecentlyUsedMapTest.java
index 8a95d73..717fd4f 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/collections/MostRecentlyUsedMapTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/collections/MostRecentlyUsedMapTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.wicket.util.collections;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.Test;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/collections/ReverseListIteratorTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/collections/ReverseListIteratorTest.java b/wicket-util/src/test/java/org/apache/wicket/util/collections/ReverseListIteratorTest.java
index 4fa5695..e4916db 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/collections/ReverseListIteratorTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/collections/ReverseListIteratorTest.java
@@ -16,16 +16,17 @@
*/
package org.apache.wicket.util.collections;
+import org.junit.jupiter.api.Test;
+
import java.util.ArrayList;
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Tests for {@link ReverseListIterator}
*/
-public class ReverseListIteratorTest extends Assert
+public class ReverseListIteratorTest
{
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/BigIntegerConverterTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/BigIntegerConverterTest.java b/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/BigIntegerConverterTest.java
index 479be0e..a62f597 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/BigIntegerConverterTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/BigIntegerConverterTest.java
@@ -16,15 +16,17 @@
*/
package org.apache.wicket.util.convert.converter;
+import org.apache.wicket.util.convert.ConversionException;
+import org.junit.jupiter.api.Test;
+
import java.math.BigInteger;
import java.util.Locale;
-import org.apache.wicket.util.convert.ConversionException;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
@SuppressWarnings("javadoc")
-public class BigIntegerConverterTest extends Assert
+public class BigIntegerConverterTest
{
@Test
public void positiveInteger()
@@ -76,10 +78,13 @@ public class BigIntegerConverterTest extends Assert
assertEquals("-1234567890987654321234567890987654321234567890987654321", bigInteger.toString());
}
- @Test(expected = ConversionException.class)
+ @Test
public void nan()
{
- BigIntegerConverter converter = new BigIntegerConverter();
- converter.convertToObject("a12345a", Locale.GERMAN);
+ assertThrows(ConversionException.class, () -> {
+ BigIntegerConverter converter = new BigIntegerConverter();
+ converter.convertToObject("a12345a", Locale.GERMAN);
+ });
+
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalDateConverterTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalDateConverterTest.java b/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalDateConverterTest.java
index 4058e32..f3fc687 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalDateConverterTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalDateConverterTest.java
@@ -16,33 +16,31 @@
*/
package org.apache.wicket.util.convert.converter;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
+import org.apache.wicket.util.convert.ConversionException;
+import org.junit.jupiter.api.Test;
import java.time.LocalDate;
import java.util.Locale;
-import org.apache.wicket.util.convert.ConversionException;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Tests for {@link LocalDateConverter}
*/
-public class LocalDateConverterTest extends Assert
+public class LocalDateConverterTest
{
@Test
public void convertToString() {
LocalDateConverter converter = new LocalDateConverter();
String date = converter.convertToString(LocalDate.of(2016, 7, 11), Locale.ENGLISH);
- assertThat(date, is(equalTo("7/11/16")));
+ assertEquals(date, "7/11/16");
}
@Test
public void convertToObject() {
LocalDateConverter converter = new LocalDateConverter();
LocalDate date = converter.convertToObject("7/11/16", Locale.ENGLISH);
- assertThat(date, is(equalTo(LocalDate.of(2016, 7, 11))));
+ assertEquals(date, LocalDate.of(2016, 7, 11));
}
@Test
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalDateTimeConverterTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalDateTimeConverterTest.java b/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalDateTimeConverterTest.java
index 5ca8182..821d469 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalDateTimeConverterTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalDateTimeConverterTest.java
@@ -16,33 +16,31 @@
*/
package org.apache.wicket.util.convert.converter;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
+import org.apache.wicket.util.convert.ConversionException;
+import org.junit.jupiter.api.Test;
import java.time.LocalDateTime;
import java.util.Locale;
-import org.apache.wicket.util.convert.ConversionException;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Tests for {@link LocalDateTimeConverter}
*/
-public class LocalDateTimeConverterTest extends Assert
+public class LocalDateTimeConverterTest
{
@Test
public void convertToString() {
LocalDateTimeConverter converter = new LocalDateTimeConverter();
String date = converter.convertToString(LocalDateTime.of(2016, 7, 11, 1, 2, 3), Locale.ENGLISH);
- assertThat(date, is(equalTo("Jul 11, 2016, 1:02:03 AM")));
+ assertEquals(date, "Jul 11, 2016, 1:02:03 AM");
}
@Test
public void convertToObject() {
LocalDateTimeConverter converter = new LocalDateTimeConverter();
LocalDateTime date = converter.convertToObject("Jul 11, 2016, 1:02:03 AM", Locale.ENGLISH);
- assertThat(date, is(equalTo(LocalDateTime.of(2016, 7, 11, 1, 2, 3))));
+ assertEquals(date, LocalDateTime.of(2016, 7, 11, 1, 2, 3));
}
@Test
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalTimeConverterTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalTimeConverterTest.java b/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalTimeConverterTest.java
index 7c36b20..3234e4d 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalTimeConverterTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalTimeConverterTest.java
@@ -16,33 +16,31 @@
*/
package org.apache.wicket.util.convert.converter;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
+import org.apache.wicket.util.convert.ConversionException;
+import org.junit.jupiter.api.Test;
import java.time.LocalTime;
import java.util.Locale;
-import org.apache.wicket.util.convert.ConversionException;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Tests for {@link LocalTimeConverter}
*/
-public class LocalTimeConverterTest extends Assert
+public class LocalTimeConverterTest
{
@Test
public void convertToString() {
LocalTimeConverter converter = new LocalTimeConverter();
String time = converter.convertToString(LocalTime.of(1, 2, 3), Locale.ENGLISH);
- assertThat(time, is(equalTo("01:02:03")));
+ assertEquals(time, "01:02:03");
}
@Test
public void convertToObject() {
LocalTimeConverter converter = new LocalTimeConverter();
LocalTime time = converter.convertToObject("01:02:03", Locale.ENGLISH);
- assertThat(time, is(equalTo(LocalTime.of(1, 2, 3))));
+ assertEquals(time, LocalTime.of(1, 2, 3));
}
@Test
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/ZonedDateTimeConverterTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/ZonedDateTimeConverterTest.java b/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/ZonedDateTimeConverterTest.java
index d40a640..0761b85 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/ZonedDateTimeConverterTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/ZonedDateTimeConverterTest.java
@@ -16,21 +16,19 @@
*/
package org.apache.wicket.util.convert.converter;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
+import org.apache.wicket.util.convert.ConversionException;
+import org.junit.jupiter.api.Test;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.Locale;
-import org.apache.wicket.util.convert.ConversionException;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Tests for {@link ZonedDateTimeConverter}
*/
-public class ZonedDateTimeConverterTest extends Assert
+public class ZonedDateTimeConverterTest
{
private ZoneId zone = ZoneId.of("Etc/UCT");
@@ -38,14 +36,14 @@ public class ZonedDateTimeConverterTest extends Assert
public void convertToString() {
ZonedDateTimeConverter converter = new ZonedDateTimeConverter();
String date = converter.convertToString(ZonedDateTime.of(2016, 7, 11, 1, 2, 3, 0, zone), Locale.ENGLISH);
- assertThat(date, is(equalTo("Jul 11, 2016, 1:02:03 AM Coordinated Universal Time")));
+ assertEquals(date, "Jul 11, 2016, 1:02:03 AM Coordinated Universal Time");
}
@Test
public void convertToObject() {
ZonedDateTimeConverter converter = new ZonedDateTimeConverter();
ZonedDateTime date = converter.convertToObject("Jul 11, 2016, 1:02:03 AM Coordinated Universal Time", Locale.ENGLISH);
- assertThat(date, is(equalTo(ZonedDateTime.of(2016, 7, 11, 1, 2, 3, 0, zone))));
+ assertEquals(date, ZonedDateTime.of(2016, 7, 11, 1, 2, 3, 0, zone));
}
@Test
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/crypt/Base64Test.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/crypt/Base64Test.java b/wicket-util/src/test/java/org/apache/wicket/util/crypt/Base64Test.java
index 708ddc4..15c5a04 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/crypt/Base64Test.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/crypt/Base64Test.java
@@ -16,18 +16,19 @@
*/
package org.apache.wicket.util.crypt;
+import org.junit.jupiter.api.Test;
+
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Random;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
*
* @author Juergen Donnerstag
*/
-public class Base64Test extends Assert
+public class Base64Test
{
/**
* @throws IOException
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/crypt/SunJceCryptTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/crypt/SunJceCryptTest.java b/wicket-util/src/test/java/org/apache/wicket/util/crypt/SunJceCryptTest.java
index bd1ffa1..fdd3164 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/crypt/SunJceCryptTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/crypt/SunJceCryptTest.java
@@ -16,20 +16,17 @@
*/
package org.apache.wicket.util.crypt;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Test;
+import javax.crypto.Cipher;
import java.security.GeneralSecurityException;
import java.security.NoSuchAlgorithmException;
-import javax.crypto.Cipher;
-
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
@SuppressWarnings("javadoc")
-public class SunJceCryptTest extends Assert
+public class SunJceCryptTest
{
/**
* Default encryption uses {@value org.apache.wicket.util.crypt.SunJceCrypt#DEFAULT_CRYPT_METHOD}
@@ -42,7 +39,7 @@ public class SunJceCryptTest extends Assert
byte[] encrypted = crypt.crypt(input.getBytes(), Cipher.ENCRYPT_MODE);
byte[] decrypted = crypt.crypt(encrypted, Cipher.DECRYPT_MODE);
- assertThat(new String(decrypted), is(equalTo(input)));
+ assertEquals(new String(decrypted), input);
}
/**
@@ -52,14 +49,14 @@ public class SunJceCryptTest extends Assert
public void customPBEEncryption() throws GeneralSecurityException
{
boolean unlimitedStrengthJurisdictionPolicyInstalled = isUnlimitedStrengthJurisdictionPolicyInstalled();
- Assume.assumeThat(unlimitedStrengthJurisdictionPolicyInstalled, is(true));
+ Assumptions.assumeTrue(unlimitedStrengthJurisdictionPolicyInstalled);
SunJceCrypt crypt = new SunJceCrypt("PBEWithMD5AndTripleDES");
String input = "input";
byte[] encrypted = crypt.crypt(input.getBytes(), Cipher.ENCRYPT_MODE);
byte[] decrypted = crypt.crypt(encrypted, Cipher.DECRYPT_MODE);
- assertThat(new String(decrypted), is(equalTo(input)));
+ assertEquals(new String(decrypted), input);
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/crypt/UnlimitedStrengthJurisdictionPolicyTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/crypt/UnlimitedStrengthJurisdictionPolicyTest.java b/wicket-util/src/test/java/org/apache/wicket/util/crypt/UnlimitedStrengthJurisdictionPolicyTest.java
index 0dfc711..f36e4b8 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/crypt/UnlimitedStrengthJurisdictionPolicyTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/crypt/UnlimitedStrengthJurisdictionPolicyTest.java
@@ -16,12 +16,8 @@
*/
package org.apache.wicket.util.crypt;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-
-import java.security.AlgorithmParameters;
-import java.security.GeneralSecurityException;
-import java.security.spec.KeySpec;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Test;
import javax.crypto.Cipher;
import javax.crypto.SecretKey;
@@ -29,23 +25,24 @@ import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.PBEKeySpec;
import javax.crypto.spec.SecretKeySpec;
+import java.security.AlgorithmParameters;
+import java.security.GeneralSecurityException;
+import java.security.spec.KeySpec;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* A demo how to create {@link org.apache.wicket.util.crypt.ICrypt} implementation that
* uses <em>PBKDF2WithHmacSHA1</em> for encryption
*/
@SuppressWarnings("javadoc")
-public class UnlimitedStrengthJurisdictionPolicyTest extends Assert
+public class UnlimitedStrengthJurisdictionPolicyTest
{
@Test
public void unlimitedStrengthJurisdictionEncryption() throws GeneralSecurityException
{
boolean unlimitedStrengthJurisdictionPolicyInstalled = SunJceCryptTest.isUnlimitedStrengthJurisdictionPolicyInstalled();
- Assume.assumeThat(unlimitedStrengthJurisdictionPolicyInstalled, is(true));
+ Assumptions.assumeTrue(unlimitedStrengthJurisdictionPolicyInstalled);
AbstractCrypt crypt = new UnlimitedStrenghtJurisdictionPolicyCrypt();
@@ -56,10 +53,10 @@ public class UnlimitedStrengthJurisdictionPolicyTest extends Assert
byte[] encrypted2 = crypt.crypt(input2.getBytes(), Cipher.ENCRYPT_MODE);
byte[] decrypted = crypt.crypt(encrypted, Cipher.DECRYPT_MODE);
- assertThat(new String(decrypted), is(equalTo(input1)));
+ assertEquals(new String(decrypted), input1);
byte[] decrypted2 = crypt.crypt(encrypted2, Cipher.DECRYPT_MODE);
- assertThat(new String(decrypted2), is(equalTo(input2)));
+ assertEquals(new String(decrypted2),input2);
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlDecoderTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlDecoderTest.java b/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlDecoderTest.java
index 9b01915..2db3f52 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlDecoderTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlDecoderTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.wicket.util.encoding;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
@SuppressWarnings("javadoc")
public class UrlDecoderTest
[36/45] wicket git commit: removed import, added some imports
Posted by mg...@apache.org.
removed import, added some imports
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b0a96e95
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b0a96e95
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b0a96e95
Branch: refs/heads/master
Commit: b0a96e9514bb8fad94c6a63b7781e643c18a6a17
Parents: 51725af
Author: renoth <jo...@gmx.de>
Authored: Tue Jul 31 12:45:28 2018 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 26 16:03:32 2018 +0300
----------------------------------------------------------------------
.../util/convert/converters/ConvertersTest.java | 205 ++++++++----
.../wicket/util/io/FullyBufferedReaderTest.java | 324 +++++++++----------
2 files changed, 298 insertions(+), 231 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/b0a96e95/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java b/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
index 2f8142a..35be426 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
@@ -14,16 +14,33 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.wicket.util.convert.converters;
+import java.math.BigDecimal;
+import java.text.ChoiceFormat;
+import java.text.NumberFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+
+import org.apache.wicket.util.convert.ConversionException;
+import org.apache.wicket.util.convert.converter.*;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
+
@SuppressWarnings("javadoc")
public final class ConvertersTest
{
-/* *//** Dutch locale for localized testing. *//*
+ /** Dutch locale for localized testing. **/
private static final Locale DUTCH_LOCALE = new Locale("nl", "NL");
@Test
- public void thousandSeperator() throws Exception
+ public void thousandSeperator()
{
BigDecimalConverter bdc = new BigDecimalConverter();
assertEquals(new BigDecimal(3000), bdc.convertToObject("3 000", Locale.FRENCH));
@@ -32,11 +49,11 @@ public final class ConvertersTest
assertEquals(3000, dc.convertToObject("3 000", Locale.FRENCH), 0.001);
}
- *//**
+ /**
* WICKET-4988 nbsp between digits only
- *//*
+ */
@Test
- public void thousandSeperatorWithCurrency() throws Exception
+ public void thousandSeperatorWithCurrency()
{
FloatConverter fc = new FloatConverter()
{
@@ -68,13 +85,14 @@ public final class ConvertersTest
assertEquals(Boolean.FALSE, converter.convertToObject("false", Locale.getDefault(Locale.Category.FORMAT)));
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidBooleanConversion()
{
BooleanConverter converter = new BooleanConverter();
- // should throw an exception
- converter.convertToObject("whatever", Locale.getDefault(Locale.Category.FORMAT));
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("whatever", Locale.getDefault(Locale.Category.FORMAT));
+ });
}
@Test
@@ -86,25 +104,31 @@ public final class ConvertersTest
assertEquals("10", converter.convertToString((byte)10, Locale.US));
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidByteConversion1()
{
ByteConverter converter = new ByteConverter();
- converter.convertToObject("whatever", Locale.US);
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("whatever", Locale.US);
+ });
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidByteConversion2()
{
ByteConverter converter = new ByteConverter();
- converter.convertToObject("10whatever", Locale.US);
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("10whatever", Locale.US);
+ });
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidByteConversion3()
{
ByteConverter converter = new ByteConverter();
- converter.convertToObject("256", Locale.US);
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("256", Locale.US);
+ });
}
@Test
@@ -118,25 +142,31 @@ public final class ConvertersTest
assertEquals("1.1", converter.convertToString(1.1, Locale.US));
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidDoubleConversion1()
{
DoubleConverter converter = new DoubleConverter();
- converter.convertToObject("whatever", Locale.US);
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("whatever", Locale.US);
+ });
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidDoubleConversion2()
{
DoubleConverter converter = new DoubleConverter();
- converter.convertToObject("1.1whatever", Locale.US);
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("1.1whatever", Locale.US);
+ });
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidDoubleConversion3()
{
DoubleConverter converter = new DoubleConverter();
- converter.convertToObject("1" + Double.MAX_VALUE, Locale.US);
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("1" + Double.MAX_VALUE, Locale.US);
+ });
}
@Test
@@ -148,25 +178,31 @@ public final class ConvertersTest
assertEquals("1.1", converter.convertToString(1.1F, Locale.US));
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidFloatConversion1()
{
FloatConverter converter = new FloatConverter();
- converter.convertToObject("whatever", Locale.US);
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("whatever", Locale.US);
+ });
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidFloatConversion2()
{
FloatConverter converter = new FloatConverter();
- converter.convertToObject("1.1whatever", Locale.US);
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("1.1whatever", Locale.US);
+ });
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidFloatConversion3()
{
FloatConverter converter = new FloatConverter();
- converter.convertToObject("1" + Float.MAX_VALUE, Locale.US);
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("1" + Float.MAX_VALUE, Locale.US);
+ });
}
@Test
@@ -179,33 +215,40 @@ public final class ConvertersTest
assertEquals("10", converter.convertToString(10, Locale.US));
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidIntegerConversion1()
{
IntegerConverter converter = new IntegerConverter();
- converter.convertToObject("whatever", Locale.US);
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("whatever", Locale.US);
+ });
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidIntegerConversion2()
{
IntegerConverter converter = new IntegerConverter();
- converter.convertToObject("10whatever", Locale.US);
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("10whatever", Locale.US);
+ });
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidIntegerConversion3()
{
IntegerConverter converter = new IntegerConverter();
- converter.convertToObject("1.0", Locale.US);
- fail("Conversion should have thrown an exception");
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("1.0", Locale.US);
+ });
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidIntegerConversion4()
{
IntegerConverter converter = new IntegerConverter();
- converter.convertToObject("1" + Integer.MAX_VALUE, Locale.US);
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("1" + Integer.MAX_VALUE, Locale.US);
+ });
}
@Test
@@ -217,28 +260,34 @@ public final class ConvertersTest
assertEquals("10", converter.convertToString(10L, Locale.US));
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidLongConversion1()
{
LongConverter converter = new LongConverter();
- converter.convertToObject("whatever", Locale.US);
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("whatever", Locale.US);
+ });
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidLongConversion2()
{
LongConverter converter = new LongConverter();
- converter.convertToObject("10whatever", Locale.US);
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("10whatever", Locale.US);
+ });
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidLongConversion3()
{
LongConverter converter = new LongConverter();
- converter.convertToObject("1" + Long.MAX_VALUE, Locale.US);
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("1" + Long.MAX_VALUE, Locale.US);
+ });
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidLongConversion4()
{
LongConverter converter = new LongConverter();
@@ -247,10 +296,12 @@ public final class ConvertersTest
final String biggerThanLong = "9223372036854776833";
assertEquals(1,
new BigDecimal(biggerThanLong).compareTo(BigDecimal.valueOf(Long.MAX_VALUE)));
- converter.convertToObject(biggerThanLong, Locale.US);
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject(biggerThanLong, Locale.US);
+ });
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidLongConversion5()
{
LongConverter converter = new LongConverter();
@@ -259,7 +310,9 @@ public final class ConvertersTest
final String biggerThanLong = "9223372036854776832";
assertEquals(1,
new BigDecimal(biggerThanLong).compareTo(BigDecimal.valueOf(Long.MAX_VALUE)));
- converter.convertToObject(biggerThanLong, Locale.US);
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject(biggerThanLong, Locale.US);
+ });
}
@Test
@@ -271,25 +324,31 @@ public final class ConvertersTest
assertEquals("10", converter.convertToString((short) 10, Locale.US));
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidShortConversion1()
{
ShortConverter converter = new ShortConverter();
- converter.convertToObject("whatever", Locale.US);
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("whatever", Locale.US);
+ });
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidShortConversion2()
{
ShortConverter converter = new ShortConverter();
- converter.convertToObject("10whatever", Locale.US);
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("10whatever", Locale.US);
+ });
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidShortConversion3()
{
ShortConverter converter = new ShortConverter();
- converter.convertToObject("" + (Short.MAX_VALUE + 1), Locale.US);
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("" + (Short.MAX_VALUE + 1), Locale.US);
+ });
}
@Test
@@ -302,12 +361,13 @@ public final class ConvertersTest
assertEquals((Object)'A', converter.convertToObject("A", DUTCH_LOCALE));
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidCharacterConversion1()
{
CharacterConverter converter = new CharacterConverter();
- converter.convertToObject("AA", Locale.US);
- fail("Conversion should have thrown an exception");
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("AA", Locale.US);
+ });
}
@Test
@@ -329,18 +389,22 @@ public final class ConvertersTest
assertEquals(date, converter.convertToObject("10/24/02", Locale.US));
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidDateConversion1()
{
DateConverter converter = new DateConverter();
- converter.convertToObject("whatever", Locale.US);
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("whatever", Locale.US);
+ });
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidDateConversion2()
{
DateConverter converter = new DateConverter();
- converter.convertToObject("10/24/02whatever", Locale.US);
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("10/24/02whatever", Locale.US);
+ });
}
@Test
@@ -362,24 +426,28 @@ public final class ConvertersTest
assertEquals(cal, converter.convertToObject("5/1/11", Locale.US));
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidCalendarConversion1()
{
CalendarConverter converter = new CalendarConverter();
- converter.convertToObject("whatever", Locale.US);
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("whatever", Locale.US);
+ });
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidCalendarConversion2()
{
CalendarConverter converter = new CalendarConverter();
- converter.convertToObject("5/1/11whatever", Locale.US);
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("5/1/11whatever", Locale.US);
+ });
}
- *//**
+ /**
* See WICKET-2878 and
* http://java.sun.com/j2se/1.4.2/docs/api/java/math/BigDecimal.html#BigDecimal%28double%29
- *//*
+ */
@Test
public void bigDecimalConverter()
{
@@ -411,7 +479,7 @@ public final class ConvertersTest
assertEquals(Integer.valueOf(2), integer);
}
- @Test(expected = ConversionException.class)
+ @Test
public void invalidCustomConversion1()
{
@SuppressWarnings("serial")
@@ -424,7 +492,8 @@ public final class ConvertersTest
}
};
- converter.convertToObject("four", Locale.US);
- fail("Conversion should have thrown an exception");
- }*/
+ assertThrows(ConversionException.class, () -> {
+ converter.convertToObject("four", Locale.US);
+ });
+ }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/b0a96e95/wicket-util/src/test/java/org/apache/wicket/util/io/FullyBufferedReaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/io/FullyBufferedReaderTest.java b/wicket-util/src/test/java/org/apache/wicket/util/io/FullyBufferedReaderTest.java
index 7ae2495..5278fd2 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/io/FullyBufferedReaderTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/io/FullyBufferedReaderTest.java
@@ -1,163 +1,161 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.wicket.util.io;
-
-import org.junit.jupiter.api.Test;
-
-import java.text.ParseException;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-/**
- * Tests for {@link FullyBufferedReader}
- */
-
-public class FullyBufferedReaderTest
-{
-
- /**
- *
- * @throws ParseException
- */
-
- @Test
- public void nestedQuotes() throws ParseException
- {
- // testTag is <a href='b \'" > a' theAtr="at'r'\"r">
- String testTag = "<a href='b \\'\" > a' theAtr=\"at'r'\\\"r\">";
- FullyBufferedReader fullyBufferedReader = new FullyBufferedReader(testTag);
-
- // System.out.println(fullyBufferedReader);
- int position = fullyBufferedReader.findOutOfQuotes('>', 0);
-
- // have you found a close bracket?
- assertEquals('>', testTag.charAt(position));
- // close bracket must be at the end of the string
- assertEquals(testTag.length(), position + 1);
- }
-
-
- /**
- *
- * @throws ParseException
- */
-
- @Test
- public void quotedEsclamationQuotationMark() throws ParseException
- {
- // testTag is <a href='b " >!! a<??!!' theAtr=">">
- String testTag = "<a href='b \" >!! a<??!!' theAtr=\">\">";
- FullyBufferedReader fullyBufferedReader = new FullyBufferedReader(testTag);
-
- // System.out.println(fullyBufferedReader);
- int position = fullyBufferedReader.findOutOfQuotes('>', 0);
-
- // have you found a close bracket?
- assertEquals('>', testTag.charAt(position));
- // close bracket must be at the end of the string
- assertEquals(testTag.length(), position + 1);
- }
-
-
- /**
- * https://issues.apache.org/jira/browse/WICKET-4117
- *
- * Test exception when we forgot to close quote
- *
- * @throws ParseException
- */
-
- @Test
- public void missingClosingQuote() throws ParseException
- {
- String testTag = "<a href='blabla>";
- FullyBufferedReader fullyBufferedReader = new FullyBufferedReader(testTag);
-
- final ParseException e = assertThrows(ParseException.class, () -> {
- fullyBufferedReader.findOutOfQuotes('>', 0);
- });
-
- assertEquals("Opening/closing quote not found for quote at (line 1, column 9)", e.getMessage());
- }
-
-
- /**
- * https://issues.apache.org/jira/browse/WICKET-4117
- *
- * Test exception when we forgot to close quote
- *
- * @throws ParseException
- */
-
- @Test
- public void missingOpeningQuote() throws ParseException
- {
- String testTag = "<a href=blabla'>";
- FullyBufferedReader fullyBufferedReader = new FullyBufferedReader(testTag);
-
- final ParseException e = assertThrows(ParseException.class, () -> {
- fullyBufferedReader.findOutOfQuotes('>', 0);
- });
-
- assertEquals("Opening/closing quote not found for quote at (line 1, column 15)", e.getMessage());
- }
-
- /**
- * https://issues.apache.org/jira/browse/WICKET-4117
- *
- * Test exception when we forgot to close quote
- *
- * @throws ParseException
- */
-
- @Test
- public void missingClosingDoubleQuote() throws ParseException
- {
- String testTag = "<a href=\"blabla>";
- FullyBufferedReader fullyBufferedReader = new FullyBufferedReader(testTag);
-
- final ParseException e = assertThrows(ParseException.class, () -> {
- fullyBufferedReader.findOutOfQuotes('>', 0);
- });
-
- assertEquals("Opening/closing quote not found for quote at (line 1, column 9)", e.getMessage());
- }
-
-
- /**
- * https://issues.apache.org/jira/browse/WICKET-4117
- *
- * Test exception when we forgot to close quote
- *
- * @throws ParseException
- */
-
- @Test
- public void missingOpeningDoubleQuote() throws ParseException
- {
- String testTag = "<a href=blabla\">";
- FullyBufferedReader fullyBufferedReader = new FullyBufferedReader(testTag);
-
- final ParseException e = assertThrows(ParseException.class, () -> {
- fullyBufferedReader.findOutOfQuotes('>', 0);
- });
-
- assertEquals("Opening/closing quote not found for quote at (line 1, column 15)", e.getMessage());
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.wicket.util.io;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.text.ParseException;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * Tests for {@link FullyBufferedReader}
+ */
+public class FullyBufferedReaderTest
+{
+
+ /**
+ *
+ * @throws ParseException
+ */
+
+ @Test
+ public void nestedQuotes() throws ParseException
+ {
+ // testTag is <a href='b \'" > a' theAtr="at'r'\"r">
+ String testTag = "<a href='b \\'\" > a' theAtr=\"at'r'\\\"r\">";
+ FullyBufferedReader fullyBufferedReader = new FullyBufferedReader(testTag);
+
+ // System.out.println(fullyBufferedReader);
+ int position = fullyBufferedReader.findOutOfQuotes('>', 0);
+
+ // have you found a close bracket?
+ assertEquals('>', testTag.charAt(position));
+ // close bracket must be at the end of the string
+ assertEquals(testTag.length(), position + 1);
+ }
+
+
+ /**
+ *
+ * @throws ParseException
+ */
+
+ @Test
+ public void quotedEsclamationQuotationMark() throws ParseException
+ {
+ // testTag is <a href='b " >!! a<??!!' theAtr=">">
+ String testTag = "<a href='b \" >!! a<??!!' theAtr=\">\">";
+ FullyBufferedReader fullyBufferedReader = new FullyBufferedReader(testTag);
+
+ // System.out.println(fullyBufferedReader);
+ int position = fullyBufferedReader.findOutOfQuotes('>', 0);
+
+ // have you found a close bracket?
+ assertEquals('>', testTag.charAt(position));
+ // close bracket must be at the end of the string
+ assertEquals(testTag.length(), position + 1);
+ }
+
+ /**
+ * https://issues.apache.org/jira/browse/WICKET-4117
+ *
+ * Test exception when we forgot to close quote
+ *
+ * @throws ParseException
+ */
+
+ @Test
+ public void missingClosingQuote()
+ {
+ String testTag = "<a href='blabla>";
+ FullyBufferedReader fullyBufferedReader = new FullyBufferedReader(testTag);
+
+ final ParseException e = assertThrows(ParseException.class, () -> {
+ fullyBufferedReader.findOutOfQuotes('>', 0);
+ });
+
+ assertEquals("Opening/closing quote not found for quote at (line 1, column 9)", e.getMessage());
+ }
+
+
+ /**
+ * https://issues.apache.org/jira/browse/WICKET-4117
+ *
+ * Test exception when we forgot to close quote
+ *
+ * @throws ParseException
+ */
+
+ @Test
+ public void missingOpeningQuote()
+ {
+ String testTag = "<a href=blabla'>";
+ FullyBufferedReader fullyBufferedReader = new FullyBufferedReader(testTag);
+
+ final ParseException e = assertThrows(ParseException.class, () -> {
+ fullyBufferedReader.findOutOfQuotes('>', 0);
+ });
+
+ assertEquals("Opening/closing quote not found for quote at (line 1, column 15)", e.getMessage());
+ }
+
+ /**
+ * https://issues.apache.org/jira/browse/WICKET-4117
+ *
+ * Test exception when we forgot to close quote
+ *
+ * @throws ParseException
+ */
+
+ @Test
+ public void missingClosingDoubleQuote()
+ {
+ String testTag = "<a href=\"blabla>";
+ FullyBufferedReader fullyBufferedReader = new FullyBufferedReader(testTag);
+
+ final ParseException e = assertThrows(ParseException.class, () -> {
+ fullyBufferedReader.findOutOfQuotes('>', 0);
+ });
+
+ assertEquals("Opening/closing quote not found for quote at (line 1, column 9)", e.getMessage());
+ }
+
+
+ /**
+ * https://issues.apache.org/jira/browse/WICKET-4117
+ *
+ * Test exception when we forgot to close quote
+ *
+ * @throws ParseException
+ */
+
+ @Test
+ public void missingOpeningDoubleQuote()
+ {
+ String testTag = "<a href=blabla\">";
+ FullyBufferedReader fullyBufferedReader = new FullyBufferedReader(testTag);
+
+ final ParseException e = assertThrows(ParseException.class, () -> {
+ fullyBufferedReader.findOutOfQuotes('>', 0);
+ });
+
+ assertEquals("Opening/closing quote not found for quote at (line 1, column 15)", e.getMessage());
+ }
+}
[18/45] wicket git commit: wicket-core: Migrate to Junit 5
Posted by mg...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java
index d4a598d..c7f05a2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup.html.link;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.wicket.MockPageWithLink;
@@ -23,20 +25,19 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.tester.TagTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link AbstractLink}
*/
-public class AbstractLinkTest extends WicketTestCase
+class AbstractLinkTest extends WicketTestCase
{
/**
*
* @see <a href="https://issues.apache.org/jira/browse/WICKET-3338">WICKET-3338</a>
*/
@Test
- public void testSetBodyModel()
+ void testSetBodyModel()
{
final String linkBody = "Link body";
@@ -51,7 +52,7 @@ public class AbstractLinkTest extends WicketTestCase
tester.startPage(mockPageWithLink);
TagTester tagTester = tester.getTagById("link");
- Assert.assertEquals(linkBody, tagTester.getValue());
+ assertEquals(linkBody, tagTester.getValue());
}
/**
@@ -59,7 +60,7 @@ public class AbstractLinkTest extends WicketTestCase
* method can be overridden to provide a dynamic model.
*/
@Test
- public void testRenderUsingGetBody()
+ void testRenderUsingGetBody()
{
final AtomicInteger counter = new AtomicInteger(0);
@@ -79,10 +80,10 @@ public class AbstractLinkTest extends WicketTestCase
tester.startPage(mockPageWithLink);
TagTester tagTester = tester.getTagById("link");
- Assert.assertEquals("0", tagTester.getValue());
+ assertEquals("0", tagTester.getValue());
tester.startPage(mockPageWithLink);
tagTester = tester.getTagById("link");
- Assert.assertEquals("1", tagTester.getValue());
+ assertEquals("1", tagTester.getValue());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkTest.java
index 14321f9..d7022b4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkTest.java
@@ -17,7 +17,7 @@
package org.apache.wicket.markup.html.link;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
@@ -25,13 +25,13 @@ import org.junit.Test;
*
* @author Juergen Donnerstag
*/
-public class AutolinkTest extends WicketTestCase
+class AutolinkTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void renderHomePage_1() throws Exception
+ void renderHomePage_1() throws Exception
{
tester.getApplication().getMarkupSettings().setAutomaticLinking(true);
tester.getApplication().getResourceSettings().setParentFolderPlaceholder("$up$");
@@ -42,7 +42,7 @@ public class AutolinkTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_2() throws Exception
+ void renderHomePage_2() throws Exception
{
tester.getApplication().getMarkupSettings().setAutomaticLinking(true);
tester.getApplication().getMarkupSettings().setStripWicketTags(true);
@@ -53,7 +53,7 @@ public class AutolinkTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_3() throws Exception
+ void renderHomePage_3() throws Exception
{
tester.getApplication().getMarkupSettings().setAutomaticLinking(true);
executeTest(AutolinkPage_3.class, "AutolinkPageExpectedResult_3.html");
@@ -63,21 +63,21 @@ public class AutolinkTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_4() throws Exception
+ void renderHomePage_4() throws Exception
{
tester.getApplication().getMarkupSettings().setAutomaticLinking(true);
executeTest(AutolinkPage_4.class, "AutolinkPageExpectedResult_4.html");
}
@Test
- public void imgTagsShouldNotGetOnClick() throws Exception
+ void imgTagsShouldNotGetOnClick() throws Exception
{
tester.getApplication().getMarkupSettings().setAutomaticLinking(true);
executeTest(AutolinkPage_5.class, "AutolinkPageExpectedResult_5.html");
}
@Test
- public void componentInsideAutolink() throws Exception
+ void componentInsideAutolink() throws Exception
{
tester.getApplication().getMarkupSettings().setAutomaticLinking(true);
tester.startPage(AutolinkPage_6.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksTest.java
index 2c764b6..46ebae8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksTest.java
@@ -17,18 +17,18 @@
package org.apache.wicket.markup.html.link;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author jcompagner
*/
-public class BookmarkableHomePageLinksTest extends WicketTestCase
+class BookmarkableHomePageLinksTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void testLinks() throws Exception
+ void testLinks() throws Exception
{
executeTest(BookmarkableHomePageLinksPage.class,
"BookmarkableHomePageLinksPage_result.html");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
index c49bf32..4988479 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
@@ -16,22 +16,23 @@
*/
package org.apache.wicket.markup.html.link;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.MockPageWithLink;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author jcompagner
*/
-public class BookmarkablePageLinkTest extends WicketTestCase
+class BookmarkablePageLinkTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void bookmarkableRequest() throws Exception
+ void bookmarkableRequest() throws Exception
{
tester.startPage(BookmarkableHomePageLinksPage.class);
assertEquals(tester.getLastRenderedPage().getClass(), BookmarkableHomePageLinksPage.class);
@@ -41,7 +42,7 @@ public class BookmarkablePageLinkTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void bookmarkableRequestWithIntercept() throws Exception
+ void bookmarkableRequestWithIntercept() throws Exception
{
tester.startPage(BookmarkableThrowsInterceptPage.class);
@@ -55,7 +56,7 @@ public class BookmarkablePageLinkTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void bookmarkableRequestWithInterceptWithParams() throws Exception
+ void bookmarkableRequestWithInterceptWithParams() throws Exception
{
PageParameters pp = new PageParameters();
pp.set("test", "test");
@@ -72,7 +73,7 @@ public class BookmarkablePageLinkTest extends WicketTestCase
* @see <a href="https://issues.apache.org/jira/browse/WICKET-3721">WICKET-3721</a>
*/
@Test
- public void customParametersWithSpecialCharacters()
+ void customParametersWithSpecialCharacters()
{
BookmarkablePageLink<MockPageWithLink> link = new BookmarkablePageLink<MockPageWithLink>(
"link", MockPageWithLink.class);
@@ -80,7 +81,7 @@ public class BookmarkablePageLinkTest extends WicketTestCase
tester.startComponentInPage(link, null);
String response = tester.getLastResponse().getDocument();
- Assert.assertEquals(
+ assertEquals(
"<html><body><span wicket:id=\"link\" onclick=\"var win = this.ownerDocument.defaultView || this.ownerDocument.parentWindow; if (win == window) { window.location.href='./bookmarkable/org.apache.wicket.MockPageWithLink?urlEscapeNeeded=someone%27s+%5Eb%25a%26d+pa%22rameter'; } ;return false\"></span></body></html>",
response);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ClientSideImageMapTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ClientSideImageMapTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ClientSideImageMapTest.java
index 4396371..b69922f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ClientSideImageMapTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ClientSideImageMapTest.java
@@ -19,18 +19,18 @@ package org.apache.wicket.markup.html.link;
import java.util.Locale;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @since 1.5
*/
-public class ClientSideImageMapTest extends WicketTestCase
+class ClientSideImageMapTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void testRenderClientSideImageMapPage_1() throws Exception
+ void testRenderClientSideImageMapPage_1() throws Exception
{
tester.getSession().setLocale(Locale.US);
executeTest(ClientSideImageMapPage_1.class, "ClientSideImageMapPageExpectedResult_1.html");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/link/DownloadLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/DownloadLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/DownloadLinkTest.java
index 4248bb9..5feea33 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/DownloadLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/DownloadLinkTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.wicket.markup.html.link;
+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 java.io.File;
import java.io.IOException;
@@ -25,17 +29,16 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.IWrapModel;
import org.apache.wicket.protocol.http.mock.MockServletContext;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
* Tests DownloadLink
*
* @author <a href="mailto:jbq@apache.org">Jean-Baptiste Quenot</a>
*/
-public class DownloadLinkTest extends WicketTestCase
+class DownloadLinkTest extends WicketTestCase
{
private static final String APPLICATION_X_CUSTOM = "application/x-custom";
private static final Logger log = LoggerFactory.getLogger(DownloadLinkTest.class);
@@ -44,7 +47,7 @@ public class DownloadLinkTest extends WicketTestCase
* Tests custom type download.
*/
@Test
- public void customTypeDownloadLink()
+ void customTypeDownloadLink()
{
tester.startPage(DownloadPage.class);
((MockServletContext)tester.getApplication().getServletContext()).addMimeType("custom",
@@ -58,7 +61,7 @@ public class DownloadLinkTest extends WicketTestCase
* Tests pdf download.
*/
@Test
- public void pdfDownloadLink()
+ void pdfDownloadLink()
{
tester.startPage(DownloadPage.class);
tester.clickLink(DownloadPage.PDF_DOWNLOAD_LINK);
@@ -70,7 +73,7 @@ public class DownloadLinkTest extends WicketTestCase
* Tests text download.
*/
@Test
- public void textDownloadLink()
+ void textDownloadLink()
{
tester.startPage(DownloadPage.class);
tester.clickLink(DownloadPage.TEXT_DOWNLOAD_LINK);
@@ -84,7 +87,7 @@ public class DownloadLinkTest extends WicketTestCase
* Tests file removal after download
*/
@Test
- public void deleteAfterLink()
+ void deleteAfterLink()
{
DownloadPage page;
@@ -107,7 +110,7 @@ public class DownloadLinkTest extends WicketTestCase
* WICKET-4738 wrapOnAssigment and detach on fileName
*/
@Test
- public void fileNameModel()
+ void fileNameModel()
{
FileNameModel fileNameModel = new FileNameModel();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkTest.java
index 2093da6..ffbcd67 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkTest.java
@@ -17,20 +17,20 @@
package org.apache.wicket.markup.html.link;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test ExternalLink (href="...")
*
* <a href="https://issues.apache.org/jira/browse/WICKET-1016"></<a>
*/
-public class ExternalLinkTest extends WicketTestCase
+class ExternalLinkTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void renderExternalLink_1() throws Exception
+ void renderExternalLink_1() throws Exception
{
tester.getApplication().getMarkupSettings().setAutomaticLinking(true);
executeTest(ExternalLinkPage_1.class, "ExternalLinkPageExpectedResult_1.html");
@@ -40,7 +40,7 @@ public class ExternalLinkTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderExternalLink_2() throws Exception
+ void renderExternalLink_2() throws Exception
{
tester.getApplication().getMarkupSettings().setAutomaticLinking(true);
executeTest(ExternalLinkPage_2.class, "ExternalLinkPageExpectedResult_2.html");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefTest.java
index 1be89c7..81c9d72 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefTest.java
@@ -17,14 +17,14 @@
package org.apache.wicket.markup.html.link;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Simple tester that demonstrates the mock http application code (and checks that it is working)
*
* @author Chris Turner
*/
-public class HrefTest extends WicketTestCase
+class HrefTest extends WicketTestCase
{
/**
@@ -33,7 +33,7 @@ public class HrefTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_1() throws Exception
+ void renderHomePage_1() throws Exception
{
tester.getApplication().getMarkupSettings().setStripWicketTags(false);
executeTest(Href_1.class, "HrefExpectedResult_1.html");
@@ -45,7 +45,7 @@ public class HrefTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_2() throws Exception
+ void renderHomePage_2() throws Exception
{
tester.getApplication().getMarkupSettings().setStripWicketTags(true);
executeTest(Href_1.class, "HrefExpectedResult_1-1.html");
@@ -57,7 +57,7 @@ public class HrefTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_2a() throws Exception
+ void renderHomePage_2a() throws Exception
{
tester.getApplication().getMarkupSettings().setStripWicketTags(true);
executeTest(Href_2.class, "HrefExpectedResult_2.html");
@@ -69,7 +69,7 @@ public class HrefTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_3() throws Exception
+ void renderHomePage_3() throws Exception
{
executeTest(Href_3.class, "HrefExpectedResult_3.html");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
index 7188083..84ee062 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
@@ -16,19 +16,17 @@
*/
package org.apache.wicket.markup.html.link;
-import java.util.Arrays;
-import java.util.Collection;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.wicket.core.request.mapper.PageInstanceMapper;
import org.apache.wicket.protocol.http.PageExpiredException;
import org.apache.wicket.request.mapper.parameter.INamedParameters;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
/**
* Testcases for links on mounted pages. These links are special, because they refer the page by id
@@ -37,46 +35,36 @@ import org.junit.runners.Parameterized.Parameters;
*
* @author papegaaij
*/
-@RunWith(Parameterized.class)
-public class MountedPageLinkTest extends WicketTestCase
+class MountedPageLinkTest extends WicketTestCase
{
- @Parameters
- public static Collection<Object[]> data()
- {
- return Arrays.asList(new Object[][] { { true }, { false } });
- }
- private boolean mount;
- public MountedPageLinkTest(boolean mount)
+ private void mountPage(boolean argument)
{
- this.mount = mount;
- }
-
- /**
- * Mount the page
- */
- @Before
- public void mountPage()
- {
- if (mount)
+ if (argument) {
tester.getApplication().mountPage("mount/${param}/part2", PageWithLink.class);
+ }
}
/**
* Tests if the page parameters are part of the url of the link, and if the link actually works.
*/
- @Test
- public void testPageParametersInLink()
+ @ParameterizedTest
+ @ValueSource(strings = { "true", "false" })
+ void testPageParametersInLink(boolean doMount)
{
+ mountPage(doMount);
+
PageWithLink page = tester.startPage(PageWithLink.class,
- new PageParameters().add("param", "value"));
+ new PageParameters().add("param", "value"));
Link<?> link = (Link<?>)page.get("link");
String url = link.getURL().toString();
- if (mount)
- assertTrue("URL for link should contain 'mount/value/part2': " + url, url.contains("mount/value/part2"));
+ if (doMount)
+ assertTrue(url.contains("mount/value/part2"),
+ "URL for link should contain 'mount/value/part2': " + url);
else
- assertTrue("URL for link should contain 'param=value': " + url, url.contains("param=value"));
+ assertTrue(url.contains("param=value"),
+ "URL for link should contain 'param=value': " + url);
tester.executeUrl(url);
}
@@ -84,9 +72,12 @@ public class MountedPageLinkTest extends WicketTestCase
* Tests if it is possible to re-instantiate the page if it is expired. The page should be
* instantiated with the same page parameters. The link will not be clicked however.
*/
- @Test
- public void testLinkOnExpiredPage()
+ @ParameterizedTest
+ @ValueSource(strings = { "true", "false" })
+ void testLinkOnExpiredPage(boolean argument)
{
+ mountPage(argument);
+
PageWithLink page = tester.startPage(PageWithLink.class,
new PageParameters().add("param", "value"));
assertEquals("value", page.getPageParameters().get("param").toString());
@@ -102,35 +93,48 @@ public class MountedPageLinkTest extends WicketTestCase
/**
* Tests if the {@link PageInstanceMapper} is used if
- * {@link org.apache.wicket.settings.PageSettings#getRecreateBookmarkablePagesAfterExpiry()}
- * is disabled
+ * {@link org.apache.wicket.settings.PageSettings#getRecreateBookmarkablePagesAfterExpiry()} is
+ * disabled
*/
- @Test
- public void testLinkOnPageWithRecreationDisabled()
+ @ParameterizedTest
+ @ValueSource(strings = { "true", "false" })
+ void testLinkOnPageWithRecreationDisabled(boolean doMount)
{
+ mountPage(doMount);
+
tester.getApplication().getPageSettings().setRecreateBookmarkablePagesAfterExpiry(false);
PageWithLink page = tester.startPage(PageWithLink.class,
new PageParameters().add("param", "value", INamedParameters.Type.MANUAL));
Link<?> link = (Link<?>)page.get("link");
String url = link.getURL().toString();
- assertEquals("./wicket/bookmarkable/org.apache.wicket.markup.html.link.PageWithLink?0-1.-link", url);
+ assertEquals(
+ "./wicket/bookmarkable/org.apache.wicket.markup.html.link.PageWithLink?0-1.-link", url);
tester.executeUrl(url);
}
/**
* ... and this should throw a {@link PageExpiredException} if the page is expired
*/
- @Test(expected = PageExpiredException.class)
- public void testExpiredPageWithRecreationDisabled()
+ @ParameterizedTest
+ @ValueSource(strings = { "true", "false" })
+ void testExpiredPageWithRecreationDisabled(boolean doMount)
{
+ mountPage(doMount);
+
tester.getApplication().getPageSettings().setRecreateBookmarkablePagesAfterExpiry(false);
PageWithLink page = tester.startPage(PageWithLink.class,
new PageParameters().add("param", "value", INamedParameters.Type.MANUAL));
Link<?> link = (Link<?>)page.get("link");
- String url = link.getURL().toString();
- assertEquals("./wicket/bookmarkable/org.apache.wicket.markup.html.link.PageWithLink?0-1.-link", url);
- // simulate a page expiry
- url = url.replace("PageWithLink?0", "PageWithLink?3");
- tester.executeUrl(url);
+
+ assertThrows(PageExpiredException.class, () -> {
+ String url = link.getURL().toString();
+ assertEquals(
+ "./wicket/bookmarkable/org.apache.wicket.markup.html.link.PageWithLink?0-1.-link",
+ url);
+ // simulate a page expiry
+ url = url.replace("PageWithLink?0", "PageWithLink?3");
+
+ tester.executeUrl(url);
+ });
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/link/PageWithLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/PageWithLink.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/PageWithLink.java
index e6af20c..adabef2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/PageWithLink.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/PageWithLink.java
@@ -16,11 +16,12 @@
*/
package org.apache.wicket.markup.html.link;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.StringHeaderItem;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.junit.Assert;
public class PageWithLink extends WebPage
{
@@ -35,7 +36,7 @@ public class PageWithLink extends WebPage
@Override
public void onClick()
{
- Assert.assertEquals("value", getPageParameters().get("param").toString());
+ assertEquals("value", getPageParameters().get("param").toString());
}
});
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage2Test.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage2Test.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage2Test.java
index cae4cb7..6ea07ed 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage2Test.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage2Test.java
@@ -16,77 +16,79 @@
*/
package org.apache.wicket.markup.html.link.submitLink;
-import org.junit.Assert;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+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;
/**
*
*/
-public class FormPage2Test extends WicketTestCase
+class FormPage2Test extends WicketTestCase
{
/**
*
*/
@Test
- public void submitlinkIsSubmitted()
+ void submitlinkIsSubmitted()
{
tester.startPage(FormPage2.class);
FormPage2 page = (FormPage2)tester.getLastRenderedPage();
- Assert.assertFalse(page.isSubmitLinkSubmitted());
- Assert.assertFalse(page.isFormSubmitted());
+ assertFalse(page.isSubmitLinkSubmitted());
+ assertFalse(page.isFormSubmitted());
tester.clickLink("form:link", false);
page = (FormPage2)tester.getLastRenderedPage();
- Assert.assertTrue(page.isSubmitLinkSubmitted());
- Assert.assertTrue(page.isFormSubmitted());
+ assertTrue(page.isSubmitLinkSubmitted());
+ assertTrue(page.isFormSubmitted());
}
/**
*
*/
@Test
- public void formIsSubmitted()
+ void formIsSubmitted()
{
tester.startPage(FormPage2.class);
FormPage2 page = (FormPage2)tester.getLastRenderedPage();
- Assert.assertFalse(page.isSubmitLinkSubmitted());
- Assert.assertFalse(page.isFormSubmitted());
+ assertFalse(page.isSubmitLinkSubmitted());
+ assertFalse(page.isFormSubmitted());
FormTester formTester = tester.newFormTester("form");
formTester.submit();
page = (FormPage2)tester.getLastRenderedPage();
- Assert.assertTrue(page.isFormSubmitted());
- Assert.assertFalse(page.isSubmitLinkSubmitted());
+ assertTrue(page.isFormSubmitted());
+ assertFalse(page.isSubmitLinkSubmitted());
}
/**
*
*/
@Test
- public void formAndLinkAreSubmitted()
+ void formAndLinkAreSubmitted()
{
tester.startPage(FormPage2.class);
FormPage2 page = (FormPage2)tester.getLastRenderedPage();
- Assert.assertFalse(page.isSubmitLinkSubmitted());
- Assert.assertFalse(page.isFormSubmitted());
+ assertFalse(page.isSubmitLinkSubmitted());
+ assertFalse(page.isFormSubmitted());
FormTester formTester = tester.newFormTester("form");
formTester.submitLink("link", false);
page = (FormPage2)tester.getLastRenderedPage();
- Assert.assertTrue(page.isFormSubmitted());
- Assert.assertTrue(page.isSubmitLinkSubmitted());
+ assertTrue(page.isFormSubmitted());
+ assertTrue(page.isSubmitLinkSubmitted());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPageTest.java
index afcc983..798b834 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPageTest.java
@@ -16,77 +16,79 @@
*/
package org.apache.wicket.markup.html.link.submitLink;
-import org.junit.Assert;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+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;
/**
*
*/
-public class FormPageTest extends WicketTestCase
+class FormPageTest extends WicketTestCase
{
/**
*
*/
@Test
- public void submitlinkIsSubmitted()
+ void submitlinkIsSubmitted()
{
tester.startPage(FormPage.class);
FormPage page = (FormPage)tester.getLastRenderedPage();
- Assert.assertFalse(page.isSubmitLinkSubmitted());
- Assert.assertFalse(page.isFormSubmitted());
+ assertFalse(page.isSubmitLinkSubmitted());
+ assertFalse(page.isFormSubmitted());
tester.clickLink("link", false);
page = (FormPage)tester.getLastRenderedPage();
- Assert.assertTrue(page.isSubmitLinkSubmitted());
- Assert.assertTrue(page.isFormSubmitted());
+ assertTrue(page.isSubmitLinkSubmitted());
+ assertTrue(page.isFormSubmitted());
}
/**
*
*/
@Test
- public void formIsSubmitted()
+ void formIsSubmitted()
{
tester.startPage(FormPage.class);
FormPage page = (FormPage)tester.getLastRenderedPage();
- Assert.assertFalse(page.isSubmitLinkSubmitted());
- Assert.assertFalse(page.isFormSubmitted());
+ assertFalse(page.isSubmitLinkSubmitted());
+ assertFalse(page.isFormSubmitted());
FormTester formTester = tester.newFormTester("form");
formTester.submit();
page = (FormPage)tester.getLastRenderedPage();
- Assert.assertTrue(page.isFormSubmitted());
- Assert.assertFalse(page.isSubmitLinkSubmitted());
+ assertTrue(page.isFormSubmitted());
+ assertFalse(page.isSubmitLinkSubmitted());
}
/**
*
*/
@Test
- public void formAndLinkAreSubmitted()
+ void formAndLinkAreSubmitted()
{
tester.startPage(FormPage.class);
FormPage page = (FormPage)tester.getLastRenderedPage();
- Assert.assertFalse(page.isSubmitLinkSubmitted());
- Assert.assertFalse(page.isFormSubmitted());
+ assertFalse(page.isSubmitLinkSubmitted());
+ assertFalse(page.isFormSubmitted());
FormTester formTester = tester.newFormTester("form");
formTester.submitLink("link", true);
page = (FormPage)tester.getLastRenderedPage();
- Assert.assertTrue(page.isFormSubmitted());
- Assert.assertTrue(page.isSubmitLinkSubmitted());
+ assertTrue(page.isFormSubmitted());
+ assertTrue(page.isSubmitLinkSubmitted());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationTest.java
index b02ead5..a59f8aa 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationTest.java
@@ -19,13 +19,13 @@ package org.apache.wicket.markup.html.list;
import org.apache.wicket.Page;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for simple table behavior.
*/
-public class IncrementalTableNavigationTest extends WicketTestCase
+class IncrementalTableNavigationTest extends WicketTestCase
{
/**
* Test simple table behavior.
@@ -33,7 +33,7 @@ public class IncrementalTableNavigationTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void pagedTable() throws Exception
+ void pagedTable() throws Exception
{
executeTest(IncrementalTableNavigationPage.class,
"IncrementalTableNavigationPage_ExpectedResult_1.html");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java
index 451a5a2..4d14625 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup.html.list;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.ArrayList;
import java.util.List;
@@ -23,14 +25,14 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.util.ListModel;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for ListView
*
* @author Juergen Donnerstag
*/
-public class ListViewTest extends WicketTestCase
+class ListViewTest extends WicketTestCase
{
/**
* Create a predefined ListView
@@ -62,7 +64,7 @@ public class ListViewTest extends WicketTestCase
/**
*/
@Test
- public void generics()
+ void generics()
{
// a listView for numbers
class NumberListView<N extends Number> extends ListView<N>
@@ -72,7 +74,7 @@ public class ListViewTest extends WicketTestCase
// since the given list is not changed actually, we can safely
// accept lists accepting subtypes of numbers only
- public NumberListView(String id, IModel<? extends List<N>> model)
+ NumberListView(String id, IModel<? extends List<N>> model)
{
super(id, model);
}
@@ -96,7 +98,7 @@ public class ListViewTest extends WicketTestCase
*
*/
@Test
- public void listView()
+ void listView()
{
ListView<Integer> lv = createListView(4);
assertEquals(4, lv.getList().size());
@@ -133,7 +135,7 @@ public class ListViewTest extends WicketTestCase
*
*/
@Test
- public void emptyListView()
+ void emptyListView()
{
// Empty tables
ListView<?> lv = createListView(0);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java
index dd2799f..a3951e1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java
@@ -16,19 +16,21 @@
*/
package org.apache.wicket.markup.html.list;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.List;
import java.util.Locale;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.util.tester.DiffUtil;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Test for simple table behavior.
*/
-public class PagedTableNavigatorTest extends WicketTestCase
+class PagedTableNavigatorTest extends WicketTestCase
{
/**
@@ -37,7 +39,7 @@ public class PagedTableNavigatorTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void pagedTable() throws Exception
+ void pagedTable() throws Exception
{
tester.getSession().setLocale(Locale.ENGLISH);
tester.startPage(PagedTableNavigatorPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java
index 7df1da9..2ced96c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java
@@ -16,18 +16,20 @@
*/
package org.apache.wicket.markup.html.list;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.Locale;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.util.tester.DiffUtil;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Test for simple table behavior.
*/
-public class PagedTableNavigatorWithLabelProviderTest extends WicketTestCase
+class PagedTableNavigatorWithLabelProviderTest extends WicketTestCase
{
/**
* Test simple table behavior.
@@ -35,7 +37,7 @@ public class PagedTableNavigatorWithLabelProviderTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void pagedTable() throws Exception
+ void pagedTable() throws Exception
{
tester.getSession().setLocale(Locale.ENGLISH);
tester.startPage(PagedTableNavigatorWithLabelProviderPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java
index b4831a5..930dfc8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java
@@ -16,18 +16,20 @@
*/
package org.apache.wicket.markup.html.list;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.Locale;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.util.tester.DiffUtil;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Test for simple table behavior.
*/
-public class PagedTableNavigatorWithMarginTest extends WicketTestCase
+class PagedTableNavigatorWithMarginTest extends WicketTestCase
{
/**
@@ -36,7 +38,7 @@ public class PagedTableNavigatorWithMarginTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void pagedTable() throws Exception
+ void pagedTable() throws Exception
{
tester.getSession().setLocale(Locale.ENGLISH);
tester.startPage(PagedTableNavigatorWithMarginPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java
index cc01a4a..84d7fdc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java
@@ -16,15 +16,17 @@
*/
package org.apache.wicket.markup.html.list;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Test for simple table behavior.
*/
-public class SimpleTableTest extends WicketTestCase
+class SimpleTableTest extends WicketTestCase
{
/**
* Test simple table behavior.
@@ -32,7 +34,7 @@ public class SimpleTableTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void simpleTable_1() throws Exception
+ void simpleTable_1() throws Exception
{
executeTest(SimpleTablePage_1.class, "SimpleTablePageExpectedResult_1.html");
String document = tester.getLastResponseAsString();
@@ -57,7 +59,7 @@ public class SimpleTableTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void simpleTable_2() throws Exception
+ void simpleTable_2() throws Exception
{
executeTest(SimpleTablePage_2.class, "SimpleTablePageExpectedResult_2.html");
String document = tester.getLastResponseAsString();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/list/TableTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/TableTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/TableTest.java
index 7de4d12..7c1899d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/TableTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/TableTest.java
@@ -16,20 +16,21 @@
*/
package org.apache.wicket.markup.html.list;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.model.util.ListModel;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Test for tables.
*
* @author Juergen Donnerstag
*/
-public class TableTest extends WicketTestCase
+class TableTest extends WicketTestCase
{
/**
@@ -64,7 +65,7 @@ public class TableTest extends WicketTestCase
*
*/
@Test
- public void table()
+ void table()
{
PageableListView<?> table = createTable(20, 4);
assertEquals(4, table.getItemsPerPage());
@@ -97,7 +98,7 @@ public class TableTest extends WicketTestCase
*
*/
@Test
- public void emptyTable()
+ void emptyTable()
{
PageableListView<?> table = createTable(0, 4);
assertEquals(4, table.getItemsPerPage());
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/markupId/TestHomePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/markupId/TestHomePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/markupId/TestHomePage.java
index 0d76351..7d77dd0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/markupId/TestHomePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/markupId/TestHomePage.java
@@ -18,12 +18,12 @@ package org.apache.wicket.markup.html.markupId;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Simple test using the WicketTester
*/
-public class TestHomePage extends WicketTestCase
+class TestHomePage extends WicketTestCase
{
@Override
@@ -36,7 +36,7 @@ public class TestHomePage extends WicketTestCase
* testRenderMyPage()
*/
@Test
- public void testRenderMyPage()
+ void testRenderMyPage()
{
// start and render the test page
tester.startPage(HomePage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/markupId/WicketApplication.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/markupId/WicketApplication.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/markupId/WicketApplication.java
index 5dc983c..e09c13e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/markupId/WicketApplication.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/markupId/WicketApplication.java
@@ -24,7 +24,7 @@ import org.apache.wicket.protocol.http.WebApplication;
*
* @see com.mycompany.Start#main(String[])
*/
-public class WicketApplication extends WebApplication
+class WicketApplication extends WebApplication
{
/**
* Constructor
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/media/MediaComponentsApplication.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/media/MediaComponentsApplication.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/media/MediaComponentsApplication.java
index 899f553..ba09f7c 100755
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/media/MediaComponentsApplication.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/media/MediaComponentsApplication.java
@@ -22,7 +22,7 @@ import org.apache.wicket.markup.html.SecurePackageResourceGuard;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.resource.caching.NoOpResourceCachingStrategy;
-public class MediaComponentsApplication extends WebApplication
+class MediaComponentsApplication extends WebApplication
{
@Override
public Class<? extends Page> getHomePage()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/media/MediaTagsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/media/MediaTagsTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/media/MediaTagsTest.java
index 81b12e5..9e95dc3 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/media/MediaTagsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/media/MediaTagsTest.java
@@ -16,12 +16,15 @@
*/
package org.apache.wicket.markup.html.media;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.TagTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class MediaTagsTest extends WicketTestCase
+class MediaTagsTest extends WicketTestCase
{
@Override
protected WebApplication newApplication()
@@ -30,7 +33,7 @@ public class MediaTagsTest extends WicketTestCase
}
@Test
- public void audioTagIsRenderedRight()
+ void audioTagIsRenderedRight()
{
tester.startPage(MediaTagsTestPage.class);
String lastResponseAsString = tester.getLastResponse().getDocument();
@@ -42,31 +45,27 @@ public class MediaTagsTest extends WicketTestCase
assertTrue(createTagByAttribute.hasAttribute("muted"));
assertEquals("user-credentials", createTagByAttribute.getAttribute("crossorigin"));
String attribute = createTagByAttribute.getAttribute("src");
- assertTrue("The time period is set right in the src attribute",
- attribute.contains("#t=5,10"));
- assertTrue("page parameter is in the url of the src attribute",
- attribute.contains("test=test"));
+ assertTrue(attribute.contains("#t=5,10"), "The time period is set right in the src attribute");
+ assertTrue(attribute.contains("test=test"), "page parameter is in the url of the src attribute");
}
@Test
- public void videoTagIsRenderedRight()
+ void videoTagIsRenderedRight()
{
tester.startPage(MediaTagsTestPage.class);
String lastResponseAsString = tester.getLastResponse().getDocument();
TagTester createTagByAttribute = TagTester.createTagByAttribute(lastResponseAsString,
"video");
String attribute = createTagByAttribute.getAttribute("poster");
- assertTrue("page parameter is in the url of the poster",
- attribute.contains("test2=test2"));
+ assertTrue(attribute.contains("test2=test2"), "page parameter is in the url of the poster");
String attributesrc = createTagByAttribute.getAttribute("src");
- assertTrue("video url is in the src attribute",
- attributesrc.contains("dummyVideo.m4a"));
+ assertTrue(attributesrc.contains("dummyVideo.m4a"), "video url is in the src attribute");
assertEquals("500", createTagByAttribute.getAttribute("width"));
assertEquals("400", createTagByAttribute.getAttribute("height"));
}
@Test
- public void extendedVideoTagIsRenderedRight()
+ void extendedVideoTagIsRenderedRight()
{
tester.startPage(MediaTagsExtendedTestPage.class);
String lastResponseAsString = tester.getLastResponse().getDocument();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/AbstractPagingNavigationTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/AbstractPagingNavigationTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/AbstractPagingNavigationTest.java
index 02966e5..5682e89 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/AbstractPagingNavigationTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/AbstractPagingNavigationTest.java
@@ -16,15 +16,16 @@
*/
package org.apache.wicket.markup.html.navigation.paging;
-import org.apache.wicket.util.tester.WicketTestCase;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.apache.wicket.util.tester.WicketTestCase;
/**
* Base class for testing the navigation links, supplies a mock object for exercizing the links.
*
* @author Martijn Dashorst
*/
-public abstract class AbstractPagingNavigationTest extends WicketTestCase
+abstract class AbstractPagingNavigationTest extends WicketTestCase
{
/**
* Mock object for testing the increment link.
@@ -46,12 +47,12 @@ public abstract class AbstractPagingNavigationTest extends WicketTestCase
}
/**
- * @see IPageable#setCurrentPage(int)
+ * @see IPageable#setCurrentPage(long)
*/
@Override
public void setCurrentPage(long page)
{
- assertEquals("setCurrentPage", expectedPage, page);
+ assertEquals(expectedPage, page, "setCurrentPage");
}
/**
@@ -75,8 +76,8 @@ public abstract class AbstractPagingNavigationTest extends WicketTestCase
}
/** mock page count. */
- protected long pagecount = 0;
+ long pagecount = 0;
/** mock current page. */
- protected long currentpage = 0;
+ long currentpage = 0;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLinkTest.java
index 7d6db88..712c5fa 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLinkTest.java
@@ -16,16 +16,19 @@
*/
package org.apache.wicket.markup.html.navigation.paging;
-import org.junit.Before;
-import org.junit.Test;
+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.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Testcase for the navigation increment link.
*
* @author Martijn Dashorst
*/
-public class PagingNavigationIncrementLinkTest extends AbstractPagingNavigationTest
+class PagingNavigationIncrementLinkTest extends AbstractPagingNavigationTest
{
/** the mock pageable driver. */
@@ -36,8 +39,8 @@ public class PagingNavigationIncrementLinkTest extends AbstractPagingNavigationT
*
* @throws Exception
*/
- @Before
- public void before() throws Exception
+ @BeforeEach
+ void before() throws Exception
{
mock = new MockPageable();
}
@@ -46,7 +49,7 @@ public class PagingNavigationIncrementLinkTest extends AbstractPagingNavigationT
* Performs the forward navigation by incrementing one page.
*/
@Test
- public void getPageNumberPositive()
+ void getPageNumberPositive()
{
PagingNavigationIncrementLink<Void> link = new PagingNavigationIncrementLink<Void>("xx",
mock, 1);
@@ -63,7 +66,7 @@ public class PagingNavigationIncrementLinkTest extends AbstractPagingNavigationT
* Performs the backward navigation by decrementing one page.
*/
@Test
- public void getPageNumberNegative()
+ void getPageNumberNegative()
{
PagingNavigationIncrementLink<Void> link = new PagingNavigationIncrementLink<Void>("xx",
mock, -1);
@@ -83,7 +86,7 @@ public class PagingNavigationIncrementLinkTest extends AbstractPagingNavigationT
* Performs the forward navigation by incrementing two pages.
*/
@Test
- public void getPageNumberTwo()
+ void getPageNumberTwo()
{
PagingNavigationIncrementLink<Void> link = new PagingNavigationIncrementLink<Void>("xx",
mock, 2);
@@ -106,7 +109,7 @@ public class PagingNavigationIncrementLinkTest extends AbstractPagingNavigationT
* Checks the logic behind the isFirst and isLast page methods.
*/
@Test
- public void isFirstLastPage()
+ void isFirstLastPage()
{
PagingNavigationIncrementLink<Void> link = new PagingNavigationIncrementLink<Void>("xx",
mock, 0);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationLinkTest.java
index 1be7f40..c8eafa2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationLinkTest.java
@@ -16,16 +16,19 @@
*/
package org.apache.wicket.markup.html.navigation.paging;
-import org.junit.Before;
-import org.junit.Test;
+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.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests the PagingNavigationLink.
*
* @author Martijn Dashorst
*/
-public class PagingNavigationLinkTest extends AbstractPagingNavigationTest
+class PagingNavigationLinkTest extends AbstractPagingNavigationTest
{
/** the mock pageable driver. */
private MockPageable mock;
@@ -35,8 +38,8 @@ public class PagingNavigationLinkTest extends AbstractPagingNavigationTest
*
* @throws Exception
*/
- @Before
- public void before() throws Exception
+ @BeforeEach
+ void before() throws Exception
{
mock = new MockPageable();
}
@@ -45,25 +48,25 @@ public class PagingNavigationLinkTest extends AbstractPagingNavigationTest
* Tests the get page number and is first and last methods.
*/
@Test
- public void getPageNumber_1()
+ void getPageNumber_1()
{
PagingNavigationLink<Void> link = new PagingNavigationLink<Void>("id", mock, 0);
currentpage = 0;
pagecount = 0;
- assertTrue("is first", link.isFirst());
- assertFalse("is last", link.isLast());
+ assertTrue(link.isFirst(), "is first");
+ assertFalse(link.isLast(), "is last");
assertEquals(0, link.getPageNumber());
pagecount = 1;
- assertTrue("is first", link.isFirst());
- assertTrue("is last", link.isLast());
+ assertTrue(link.isFirst(), "is first");
+ assertTrue(link.isLast(), "is last");
assertEquals(0, link.getPageNumber());
pagecount = 2;
- assertTrue("is first", link.isFirst());
- assertFalse("is last", link.isLast());
+ assertTrue(link.isFirst(), "is first");
+ assertFalse(link.isLast(), "is last");
assertEquals(0, link.getPageNumber());
}
@@ -71,25 +74,25 @@ public class PagingNavigationLinkTest extends AbstractPagingNavigationTest
* Tests the get page number and is first and last methods.
*/
@Test
- public void getPageNumber_2()
+ void getPageNumber_2()
{
PagingNavigationLink<Void> link = new PagingNavigationLink<Void>("id", mock, 2);
currentpage = 0;
pagecount = 0;
- assertTrue("is first", link.isFirst());
- assertFalse("is last", link.isLast());
+ assertTrue(link.isFirst(), "is first");
+ assertFalse(link.isLast(), "is last");
assertEquals(0, link.getPageNumber());
pagecount = 2;
- assertFalse("is first", link.isFirst());
- assertTrue("is last", link.isLast());
+ assertFalse(link.isFirst(), "is first");
+ assertTrue(link.isLast(), "is last");
assertEquals(1, link.getPageNumber());
pagecount = 3;
- assertFalse("is first", link.isFirst());
- assertTrue("is last", link.isLast());
+ assertFalse(link.isFirst(), "is first");
+ assertTrue(link.isLast(), "is last");
assertEquals(2, link.getPageNumber());
}
@@ -97,25 +100,25 @@ public class PagingNavigationLinkTest extends AbstractPagingNavigationTest
* Tests the get page number and is first and last methods.
*/
@Test
- public void getPageNumber_3()
+ void getPageNumber_3()
{
PagingNavigationLink<Void> link = new PagingNavigationLink<Void>("id", mock, -1);
currentpage = 0;
pagecount = 0;
- assertTrue("is first", link.isFirst());
- assertFalse("is last", link.isLast());
+ assertTrue(link.isFirst(), "is first");
+ assertFalse(link.isLast(), "is last");
assertEquals(0, link.getPageNumber());
pagecount = 2;
- assertFalse("is first", link.isFirst());
- assertTrue("is last", link.isLast());
+ assertFalse(link.isFirst(), "is first");
+ assertTrue(link.isLast(), "is last");
assertEquals(1, link.getPageNumber());
pagecount = 3;
- assertFalse("is first", link.isFirst());
- assertTrue("is last", link.isLast());
+ assertFalse(link.isFirst(), "is first");
+ assertTrue(link.isLast(), "is last");
assertEquals(2, link.getPageNumber());
}
@@ -123,28 +126,28 @@ public class PagingNavigationLinkTest extends AbstractPagingNavigationTest
* Tests the linksTo method.
*/
@Test
- public void linksTo()
+ void linksTo()
{
PagingNavigationLink<Void> link = new PagingNavigationLink<Void>("id", mock, -1);
currentpage = 0;
pagecount = 0;
- assertTrue("links to", link.linksTo(null));
+ assertTrue(link.linksTo(null), "links to");
currentpage = 0;
pagecount = 1;
- assertTrue("links to", link.linksTo(null));
+ assertTrue(link.linksTo(null), "links to");
currentpage = 0;
pagecount = 3;
- assertFalse("links to", link.linksTo(null));
+ assertFalse(link.linksTo(null), "links to");
currentpage = 2;
pagecount = 3;
- assertTrue("links to", link.linksTo(null));
+ assertTrue(link.linksTo(null), "links to");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/page/TestHomePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/page/TestHomePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/page/TestHomePage.java
index bb7e947..2b4b1c3 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/page/TestHomePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/page/TestHomePage.java
@@ -17,18 +17,18 @@
package org.apache.wicket.markup.html.page;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Simple test using the WicketTester
*/
-public class TestHomePage extends WicketTestCase
+class TestHomePage extends WicketTestCase
{
/**
*
*/
@Test
- public void testRenderMyPage()
+ void testRenderMyPage()
{
// no exception should occur
tester.startPage(HomePage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FeedbackPanelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FeedbackPanelTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FeedbackPanelTest.java
index e38815d..0e7c99a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FeedbackPanelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FeedbackPanelTest.java
@@ -27,17 +27,17 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link FeedbackPanel}
*
* @author cgatay
*/
-public class FeedbackPanelTest extends WicketTestCase
+class FeedbackPanelTest extends WicketTestCase
{
@Test
- public void testCssClassesOnFeedbackPanel() throws Exception
+ void testCssClassesOnFeedbackPanel() throws Exception
{
TestPage testPage = new TestPage();
testPage.label.error("Error message");
@@ -47,7 +47,7 @@ public class FeedbackPanelTest extends WicketTestCase
}
@Test
- public void collectSessionMessages() throws Exception
+ void collectSessionMessages() throws Exception
{
TestPage testPage = new TestPage();
@@ -66,7 +66,7 @@ public class FeedbackPanelTest extends WicketTestCase
FeedbackPanel feedbackPanel;
Component label;
- public TestPage()
+ TestPage()
{
feedbackPanel = new FeedbackPanel("feedback")
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FencedFeedbackPanelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FencedFeedbackPanelTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FencedFeedbackPanelTest.java
index df351cc..2f09613 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FencedFeedbackPanelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FencedFeedbackPanelTest.java
@@ -16,7 +16,8 @@
*/
package org.apache.wicket.markup.html.panel;
-import static org.junit.Assert.*;
+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.MarkupContainer;
@@ -31,22 +32,22 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
-import org.apache.wicket.util.tester.WicketTesterScope;
-import org.junit.Rule;
-import org.junit.Test;
+import org.apache.wicket.util.tester.WicketTesterExtension;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
/**
* Tests {@link FencedFeedbackPanel}
*
* @author igor
*/
-public class FencedFeedbackPanelTest
+class FencedFeedbackPanelTest
{
- @Rule
- public WicketTesterScope scope = new WicketTesterScope();
+ @RegisterExtension
+ public WicketTesterExtension scope = new WicketTesterExtension();
@Test
- public void fencing()
+ void fencing()
{
TestPage page = scope.getTester().startPage(TestPage.class);
page.containerInput.error("error");
@@ -90,7 +91,7 @@ public class FencedFeedbackPanelTest
}
@Test
- public void filtering()
+ void filtering()
{
TestPage page = scope.getTester().startPage(TestPage.class);
@@ -135,7 +136,7 @@ public class FencedFeedbackPanelTest
}
@Test
- public void moving()
+ void moving()
{
TestPage page = scope.getTester().startPage(TestPage.class);
page.containerInput.error("error");
@@ -172,7 +173,7 @@ public class FencedFeedbackPanelTest
}
@Test
- public void reAdding()
+ void reAdding()
{
TestPage page = scope.getTester().startPage(TestPage.class);
MarkupContainer container = page.containerFeedback.getParent();
@@ -188,12 +189,12 @@ public class FencedFeedbackPanelTest
}
- public static class TestPage extends WebPage implements IMarkupResourceStreamProvider
+ public static class TestPage extends WebPage implements IMarkupResourceStreamProvider
{
FencedFeedbackPanel externalFeedback, formFeedback, containerFeedback, containerFeedback2;
Component externalLabel, formInput, containerInput;
- public TestPage()
+ public TestPage()
{
externalFeedback = new FencedFeedbackPanel("feedback");
externalLabel = new Label("externalLabel");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTest.java
index 6eded9a..8c447ab 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTest.java
@@ -16,18 +16,19 @@
*/
package org.apache.wicket.markup.html.panel;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class FragmentTest extends WicketTestCase
+class FragmentTest extends WicketTestCase
{
@Test
- public void testFragments()
+ void testFragments()
{
tester.startComponentInPage(FragmentTestPanel.class);
}
@@ -36,7 +37,7 @@ public class FragmentTest extends WicketTestCase
* WICKET-5060
*/
@Test
- public void testComponentAndFragmentWithSameId()
+ void testComponentAndFragmentWithSameId()
{
tester.startComponentInPage(FragmentTestPanel_2.class);
assertThat(tester.getLastResponseAsString(), containsString("fragment body"));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestPanel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestPanel.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestPanel.java
index 5319a21..be32f84 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestPanel.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestPanel.java
@@ -48,7 +48,7 @@ public class FragmentTestPanel extends Panel
*
* @param id
*/
- public TestFragment(String id)
+ TestFragment(String id)
{
super(id, "testFrag", FragmentTestPanel.this);
add(new Label("label", "Hello!"));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestPanel_2.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestPanel_2.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestPanel_2.java
index a6348d7..1a9b92c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestPanel_2.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestPanel_2.java
@@ -50,7 +50,7 @@ public class FragmentTestPanel_2 extends Panel
*
* @param id
*/
- public TestFragment(String id)
+ TestFragment(String id)
{
super(id, "testFrag", FragmentTestPanel_2.this);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java
index fec0bcd..cf5e478 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java
@@ -53,7 +53,7 @@ public class InlinePanelPage_5 extends WebPage
* @param id
* @param markupId
*/
- public FragmentWithAssociatedMarkupStream(final String id, final String markupId)
+ FragmentWithAssociatedMarkupStream(final String id, final String markupId)
{
super(id, markupId, null);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_8.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_8.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_8.java
index a8b1f2b..1735e41 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_8.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_8.java
@@ -71,7 +71,7 @@ public class InlinePanelPage_8 extends WebPage
* @param id
* @param number
*/
- public ListNode(String id, int number)
+ ListNode(String id, int number)
{
super(id, "node", InlinePanelPage_8.this);
add(new Label("number", Integer.toString(number)));
@@ -87,7 +87,7 @@ public class InlinePanelPage_8 extends WebPage
* @param number
* @return the added {@link ListNode}
*/
- public ListNode addNext(AjaxRequestTarget target, int number)
+ ListNode addNext(AjaxRequestTarget target, int number)
{
ListNode next = new ListNode("next", number);
nextContainer.add(next);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
index 0ede2a9..b2abc5d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
@@ -16,14 +16,16 @@
*/
package org.apache.wicket.markup.html.panel;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
import org.apache.wicket.markup.MarkupException;
import org.apache.wicket.markup.MarkupNotFoundException;
import org.apache.wicket.markup.html.markupId.MyPanel;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Simple application that demonstrates the mock http application code (and checks that it is
@@ -31,13 +33,13 @@ import org.junit.Test;
*
* @author Chris Turner
*/
-public class PanelTest extends WicketTestCase
+class PanelTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void renderHomePage_1() throws Exception
+ void renderHomePage_1() throws Exception
{
boolean hit = false;
try
@@ -52,14 +54,14 @@ public class PanelTest extends WicketTestCase
assertTrue(mex.getMessage().contains("Tag does not have a close tag"));
assertTrue(mex.toString().contains("SimplePanel_1.html"));
}
- assertTrue("Did expect a MarkupException", hit);
+ assertTrue(hit, "Did expect a MarkupException");
}
/**
* @throws Exception
*/
@Test
- public void renderHomePage_2() throws Exception
+ void renderHomePage_2() throws Exception
{
boolean hit = false;
try
@@ -73,14 +75,14 @@ public class PanelTest extends WicketTestCase
assertTrue(mex.getMessage().contains("Expected to find <wicket:panel>"));
assertTrue(mex.getMessage().contains("SimplePanel_2.html"));
}
- assertTrue("Did expect a MarkupException", hit);
+ assertTrue(hit, "Did expect a MarkupException");
}
/**
* @throws Exception
*/
@Test
- public void panel3() throws Exception
+ void panel3() throws Exception
{
executeTest(PanelPage_3.class, "PanelPageExpectedResult_3.html");
}
@@ -89,7 +91,7 @@ public class PanelTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void panel4() throws Exception
+ void panel4() throws Exception
{
executeTest(PanelPage_4.class, "PanelPageExpectedResult_4.html");
}
@@ -98,7 +100,7 @@ public class PanelTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void inlinePanel() throws Exception
+ void inlinePanel() throws Exception
{
executeTest(InlinePanelPage_1.class, "InlinePanelPageExpectedResult_1.html");
}
@@ -107,7 +109,7 @@ public class PanelTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void inlinePanel_2() throws Exception
+ void inlinePanel_2() throws Exception
{
executeTest(InlinePanelPage_2.class, "InlinePanelPageExpectedResult_2.html");
}
@@ -116,7 +118,7 @@ public class PanelTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void inlinePanel_3() throws Exception
+ void inlinePanel_3() throws Exception
{
executeTest(InlinePanelPage_3.class, "InlinePanelPageExpectedResult_3.html");
}
@@ -125,7 +127,7 @@ public class PanelTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void inlinePanel_4() throws Exception
+ void inlinePanel_4() throws Exception
{
executeTest(InlinePanelPage_4.class, "InlinePanelPageExpectedResult_4.html");
}
@@ -134,7 +136,7 @@ public class PanelTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void inlinePanel_5() throws Exception
+ void inlinePanel_5() throws Exception
{
executeTest(InlinePanelPage_5.class, "InlinePanelPageExpectedResult_5.html");
}
@@ -145,7 +147,7 @@ public class PanelTest extends WicketTestCase
// TODO FIX the implementation. Fragment markup provider can not be a
// sibling of the panel.
@Test
- public void inlinePanel_6() throws Exception
+ void inlinePanel_6() throws Exception
{
executeTest(InlinePanelPage_6.class, "InlinePanelPageExpectedResult_6.html");
}
@@ -154,7 +156,7 @@ public class PanelTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void panelWithAttributeModifier() throws Exception
+ void panelWithAttributeModifier() throws Exception
{
executeTest(PanelWithAttributeModifierPage.class,
"PanelWithAttributeModifierPageExpectedResult_1.html");
@@ -164,7 +166,7 @@ public class PanelTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void inlinePanel_7() throws Exception
+ void inlinePanel_7() throws Exception
{
executeTest(InlinePanelPage_7.class, "InlinePanelPageExpectedResult_7.html");
}
@@ -173,7 +175,7 @@ public class PanelTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void inlinePanel_8() throws Exception
+ void inlinePanel_8() throws Exception
{
executeTest(InlinePanelPage_8.class, "InlinePanelPageExpectedResult_8.html");
Page page = tester.getLastRenderedPage();
@@ -187,7 +189,7 @@ public class PanelTest extends WicketTestCase
*
*/
@Test
- public void startPanel()
+ void startPanel()
{
tester.startComponentInPage(MyPanel.class);
tester.assertLabel("label", "Hello, World!");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotClosedTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotClosedTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotClosedTest.java
index bca3e8e..c32cf68 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotClosedTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotClosedTest.java
@@ -17,18 +17,18 @@
package org.apache.wicket.markup.html.tags;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author jcompagner
*/
-public class InputTagNotClosedTest extends WicketTestCase
+class InputTagNotClosedTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void inputVisible() throws Exception
+ void inputVisible() throws Exception
{
executeTest(InputTagVisibleWebPage.class, "InputTagVisibleWebPageResult.html");
}
@@ -37,7 +37,7 @@ public class InputTagNotClosedTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void inputNotVisible() throws Exception
+ void inputNotVisible() throws Exception
{
executeTest(InputTagNotVisibleWebPage.class, "InputTagNotVisibleWebPageResult.html");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/OutputTransformerContainerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/OutputTransformerContainerTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/OutputTransformerContainerTest.java
index 8c753c2..89fac27 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/OutputTransformerContainerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/OutputTransformerContainerTest.java
@@ -17,19 +17,19 @@
package org.apache.wicket.markup.outputTransformer;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
* @author Juergen Donnerstag
*/
-public class OutputTransformerContainerTest extends WicketTestCase
+class OutputTransformerContainerTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void renderHomePage() throws Exception
+ void renderHomePage() throws Exception
{
executeTest(Page_1.class, "PageExpectedResult_1.html");
}
@@ -38,7 +38,7 @@ public class OutputTransformerContainerTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_2() throws Exception
+ void renderHomePage_2() throws Exception
{
executeTest(Page_2.class, "PageExpectedResult_2.html");
}
@@ -47,7 +47,7 @@ public class OutputTransformerContainerTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_3() throws Exception
+ void renderHomePage_3() throws Exception
{
executeTest(Page_3.class, "PageExpectedResult_3.html");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/MergedMarkupTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/MergedMarkupTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/MergedMarkupTest.java
index 7403c2c..c38b2e7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/MergedMarkupTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/MergedMarkupTest.java
@@ -16,24 +16,26 @@
*/
package org.apache.wicket.markup.parser;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.Page;
import org.apache.wicket.markup.Markup;
import org.apache.wicket.markup.MarkupParser;
import org.apache.wicket.markup.MarkupResourceStream;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class MergedMarkupTest extends WicketTestCase
+class MergedMarkupTest extends WicketTestCase
{
/**
* test1()
*/
@Test
- public void test1()
+ void test1()
{
Page page = new SubPageWithoutMarkup();
Markup markup = page.getAssociatedMarkup();
@@ -46,7 +48,7 @@ public class MergedMarkupTest extends WicketTestCase
* test2()
*/
@Test
- public void test2()
+ void test2()
{
Page page = new SubPageWithMarkup();
MarkupStream markup = page.getAssociatedMarkupStream(true);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/RelativePathPrefixHandlerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/RelativePathPrefixHandlerTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/RelativePathPrefixHandlerTest.java
index db1a21a..40ab93f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/RelativePathPrefixHandlerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/RelativePathPrefixHandlerTest.java
@@ -17,21 +17,21 @@
package org.apache.wicket.markup.parser;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Quite some tests are already with MarkupParser.
*
* @author Juergen Donnerstag
*/
-public class RelativePathPrefixHandlerTest extends WicketTestCase
+class RelativePathPrefixHandlerTest extends WicketTestCase
{
/**
*
* @throws Exception
*/
@Test
- public void basics() throws Exception
+ void basics() throws Exception
{
executeTest(Page_1.class, "PageExpectedResult_1.html");
}
@@ -40,7 +40,7 @@ public class RelativePathPrefixHandlerTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void anchors() throws Exception
+ void anchors() throws Exception
{
executeTest(Page_2.class, "PageExpectedResult_2.html");
}
@@ -49,7 +49,7 @@ public class RelativePathPrefixHandlerTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void transparency() throws Exception
+ void transparency() throws Exception
{
executeTest(Page_3.class, "PageExpectedResult_3.html");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/TestHomePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/TestHomePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/TestHomePage.java
index fc57358..323f0ce 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/TestHomePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/TestHomePage.java
@@ -17,18 +17,18 @@
package org.apache.wicket.markup.parser;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class TestHomePage extends WicketTestCase
+class TestHomePage extends WicketTestCase
{
/**
* Wicket-2105
*/
@Test
- public void testRenderMyPage()
+ void testRenderMyPage()
{
// start and render the test page
tester.startPage(HomePage.class);
[35/45] wicket git commit: - upgrade junit4 with junit5 in
wicket-util - replace Junit4 Methods in WicketTester.java - remove junit 4
dependencies in pom.xml
Posted by mg...@apache.org.
- upgrade junit4 with junit5 in wicket-util
- replace Junit4 Methods in WicketTester.java
- remove junit 4 dependencies in pom.xml
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/51725af8
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/51725af8
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/51725af8
Branch: refs/heads/master
Commit: 51725af8cf2d566e9fe69f76152cfc36ce222c71
Parents: 0b48f27
Author: renoth <jo...@gmx.de>
Authored: Tue Jul 31 12:32:49 2018 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 26 15:51:32 2018 +0300
----------------------------------------------------------------------
.../apache/wicket/util/tester/WicketTester.java | 135 ++++----
wicket-util/pom.xml | 6 +
.../license/AbstractLicenseHeaderHandler.java | 17 +-
.../license/ApacheLicenseHeaderTestCase.java | 12 +-
.../util/license/CssLicenseHeaderHandler.java | 3 +-
.../util/license/JavaLicenseHeaderHandler.java | 5 +-
.../license/PropertiesLicenseHeaderHandler.java | 9 +-
.../license/VelocityLicenseHeaderHandler.java | 9 +-
.../util/license/XmlLicenseHeaderHandler.java | 14 +-
.../util/license/XmlPrologHeaderHandler.java | 118 +++----
.../markup/xhtml/WellFormedXmlTestCase.java | 325 +++++++++----------
.../wicket/util/collections/IntHashMapTest.java | 3 +-
12 files changed, 336 insertions(+), 320 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/51725af8/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
index dc352b6..e4e08df 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
@@ -51,6 +51,7 @@ import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Objects;
+import org.opentest4j.AssertionFailedError;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -283,13 +284,15 @@ public class WicketTester extends BaseWicketTester
{
if (null != getLastResponse().getHeader("Location"))
{
- fail("Location header should *not* be present when using Ajax");
+ throw new AssertionFailedError(
+ "Location header should *not* be present when using Ajax");
}
String ajaxLocation = getLastResponse().getHeader("Ajax-Location");
if (null == ajaxLocation)
{
- fail("Ajax-Location header should be present when using Ajax");
+ throw new AssertionFailedError(
+ "Ajax-Location header should be present when using Ajax");
}
int statusCode = getLastResponse().getStatus();
@@ -313,6 +316,18 @@ public class WicketTester extends BaseWicketTester
}
/**
+ *
+ * @param result
+ */
+ private void assertResult(Result result)
+ {
+ if (result.wasFailed())
+ {
+ throw new AssertionFailedError(result.getMessage());
+ }
+ }
+
+ /**
* Asserts that the <code>Component</code> a the given path has a behavior of the given type.
*
* @param path
@@ -340,13 +355,13 @@ public class WicketTester extends BaseWicketTester
* tree, using JavaScript. But it shouldn't be needed because you just have to trust that Wicket
* Ajax JavaScript works.
*
- * @param component
- * a <code>Component</code> to be tested
+ * @param componentPath
+ * a <code>Component</code> path to test
*/
- public void assertComponentOnAjaxResponse(Component component)
+ public void assertComponentOnAjaxResponse(String componentPath)
{
- Result result = isComponentOnAjaxResponse(component);
- assertResult(result);
+ Component component = getComponentFromLastRenderedPage(componentPath, false);
+ assertComponentOnAjaxResponse(component);
}
/**
@@ -358,13 +373,13 @@ public class WicketTester extends BaseWicketTester
* tree, using JavaScript. But it shouldn't be needed because you just have to trust that Wicket
* Ajax JavaScript works.
*
- * @param componentPath
- * a <code>Component</code> path to test
+ * @param component
+ * a <code>Component</code> to be tested
*/
- public void assertComponentOnAjaxResponse(String componentPath)
+ public void assertComponentOnAjaxResponse(Component component)
{
- Component component = getComponentFromLastRenderedPage(componentPath, false);
- assertComponentOnAjaxResponse(component);
+ Result result = isComponentOnAjaxResponse(component);
+ assertResult(result);
}
/**
@@ -413,6 +428,28 @@ public class WicketTester extends BaseWicketTester
assertResult(result);
}
+ private IMarkupFragment getMarkupFragment(Component component)
+ {
+ IMarkupFragment markup = null;
+ if (component instanceof MarkupContainer)
+ {
+ markup = ((MarkupContainer)component).getAssociatedMarkup();
+ }
+
+ if (markup == null)
+ {
+ markup = component.getMarkup();
+ }
+
+ if (markup == null)
+ {
+ throw new AssertionFailedError(String.format("Cannot find the markup of component: %s",
+ component.getPageRelativePath()));
+ }
+
+ return markup;
+ }
+
/**
* Asserts that a component's markup has loaded with the given style.
*
@@ -462,28 +499,6 @@ public class WicketTester extends BaseWicketTester
assertResult(result);
}
- private IMarkupFragment getMarkupFragment(Component component)
- {
- IMarkupFragment markup = null;
- if (component instanceof MarkupContainer)
- {
- markup = ((MarkupContainer)component).getAssociatedMarkup();
- }
-
- if (markup == null)
- {
- markup = component.getMarkup();
- }
-
- if (markup == null)
- {
- fail(String.format("Cannot find the markup of component: %s",
- component.getPageRelativePath()));
- }
-
- return markup;
- }
-
/**
* Asserts error-level feedback messages.
*
@@ -683,19 +698,30 @@ public class WicketTester extends BaseWicketTester
}
/**
- * Asserts no error-level feedback messages.
+ * Asserts last-rendered <code>Page</code> against an expected HTML document.
+ * <p>
+ * Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected
+ * output file.
+ *
+ * @param clazz
+ * <code>Class</code> used to load the file (relative to <code>clazz</code> package)
+ * @param filename
+ * expected output filename <code>String</code>
+ * @throws Exception
*/
- public void assertNoErrorMessage()
+ @Override
+ public void assertResultPage(final Class<?> clazz, final String filename) throws Exception
{
- assertNoFeedbackMessage(FeedbackMessage.ERROR);
+ String document = getLastResponseAsString();
+ DiffUtil.validatePage(document, clazz, filename, true);
}
/**
- * Asserts no info-level feedback messages.
+ * Asserts no error-level feedback messages.
*/
- public void assertNoInfoMessage()
+ public void assertNoErrorMessage()
{
- assertNoFeedbackMessage(FeedbackMessage.INFO);
+ assertNoFeedbackMessage(FeedbackMessage.ERROR);
}
/**
@@ -722,22 +748,11 @@ public class WicketTester extends BaseWicketTester
}
/**
- * Asserts last-rendered <code>Page</code> against an expected HTML document.
- * <p>
- * Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected
- * output file.
- *
- * @param clazz
- * <code>Class</code> used to load the file (relative to <code>clazz</code> package)
- * @param filename
- * expected output filename <code>String</code>
- * @throws Exception
+ * Asserts no info-level feedback messages.
*/
- @Override
- public void assertResultPage(final Class<?> clazz, final String filename) throws Exception
+ public void assertNoInfoMessage()
{
- String document = getLastResponseAsString();
- DiffUtil.validatePage(document, clazz, filename, true);
+ assertNoFeedbackMessage(FeedbackMessage.INFO);
}
/**
@@ -810,18 +825,6 @@ public class WicketTester extends BaseWicketTester
}
/**
- *
- * @param result
- */
- private void assertResult(Result result)
- {
- if (result.wasFailed())
- {
- fail(result.getMessage());
- }
- }
-
- /**
* Checks whether a component is visible and/or enabled before usage
*
* @param component
http://git-wip-us.apache.org/repos/asf/wicket/blob/51725af8/wicket-util/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-util/pom.xml b/wicket-util/pom.xml
index d5777f8..6f71806 100755
--- a/wicket-util/pom.xml
+++ b/wicket-util/pom.xml
@@ -44,5 +44,11 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.opentest4j</groupId>
+ <artifactId>opentest4j</artifactId>
+ <version>RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/wicket/blob/51725af8/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
index c6e5685..cbbc934 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
@@ -16,17 +16,12 @@
*/
package org.apache.wicket.util.license;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.LineNumberReader;
+import java.io.*;
import java.util.List;
import org.apache.wicket.util.io.IOUtils;
import org.apache.wicket.util.string.Strings;
-
+import org.opentest4j.AssertionFailedError;
abstract class AbstractLicenseHeaderHandler implements ILicenseHeaderHandler
{
@@ -81,7 +76,7 @@ abstract class AbstractLicenseHeaderHandler implements ILicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionError(e.getMessage());
+ throw new AssertionFailedError(e.getMessage());
}
finally
{
@@ -91,7 +86,7 @@ abstract class AbstractLicenseHeaderHandler implements ILicenseHeaderHandler
}
catch (IOException e)
{
- throw new AssertionError(e.getMessage());
+ throw new AssertionFailedError(e.getMessage());
}
}
@@ -115,7 +110,7 @@ abstract class AbstractLicenseHeaderHandler implements ILicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionError(e.getMessage());
+ throw new AssertionFailedError(e.getMessage());
}
}
@@ -147,7 +142,7 @@ abstract class AbstractLicenseHeaderHandler implements ILicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionError(e.getMessage());
+ throw new AssertionFailedError(e.getMessage());
}
finally
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/51725af8/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 d03f8ad..4c88b1b 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,6 +16,14 @@
*/
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;
@@ -96,7 +104,7 @@ public abstract class ApacheLicenseHeaderTestCase
*
*/
@BeforeEach
- final void before()
+ public final void before()
{
// setup the base directory for when running inside maven (building a release
// comes to mind).
@@ -186,7 +194,7 @@ public abstract class ApacheLicenseHeaderTestCase
}
System.out.println(failString);
- throw new AssertionError(failString.toString());
+ throw new AssertionFailedError(failString.toString());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/51725af8/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
index 2797d8a..7652e10 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.wicket.util.diff.Diff;
import org.apache.wicket.util.diff.Revision;
+import org.opentest4j.AssertionFailedError;
class CssLicenseHeaderHandler extends AbstractLicenseHeaderHandler
@@ -55,7 +56,7 @@ class CssLicenseHeaderHandler extends AbstractLicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionError(e.getMessage());
+ throw new AssertionFailedError(e.getMessage());
}
return revision.size() == 0;
http://git-wip-us.apache.org/repos/asf/wicket/blob/51725af8/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
index 3165ebc..d38c008 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
@@ -23,6 +23,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.wicket.util.string.Strings;
+import org.opentest4j.AssertionFailedError;
class JavaLicenseHeaderHandler extends AbstractLicenseHeaderHandler
{
@@ -63,13 +64,13 @@ class JavaLicenseHeaderHandler extends AbstractLicenseHeaderHandler
}
else
{
- throw new AssertionError();
+ throw new AssertionFailedError();
}
}
catch (Exception e)
{
e.printStackTrace();
- throw new AssertionError(e.getMessage());
+ throw new AssertionFailedError(e.getMessage());
}
return added;
http://git-wip-us.apache.org/repos/asf/wicket/blob/51725af8/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
index 3da2788..4a0447d 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
@@ -16,13 +16,14 @@
*/
package org.apache.wicket.util.license;
+import org.apache.wicket.util.diff.Diff;
+import org.apache.wicket.util.diff.Revision;
+import org.opentest4j.AssertionFailedError;
+
import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.wicket.util.diff.Diff;
-import org.apache.wicket.util.diff.Revision;
-
class PropertiesLicenseHeaderHandler extends AbstractLicenseHeaderHandler
{
/**
@@ -54,7 +55,7 @@ class PropertiesLicenseHeaderHandler extends AbstractLicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionError(e.getMessage());
+ throw new AssertionFailedError(e.getMessage());
}
return revision.size() == 0;
http://git-wip-us.apache.org/repos/asf/wicket/blob/51725af8/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
index 54fd6a6..2d1286b 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
@@ -16,13 +16,14 @@
*/
package org.apache.wicket.util.license;
+import org.apache.wicket.util.diff.Diff;
+import org.apache.wicket.util.diff.Revision;
+import org.opentest4j.AssertionFailedError;
+
import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.wicket.util.diff.Diff;
-import org.apache.wicket.util.diff.Revision;
-
class VelocityLicenseHeaderHandler extends AbstractLicenseHeaderHandler
{
/**
@@ -54,7 +55,7 @@ class VelocityLicenseHeaderHandler extends AbstractLicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionError(e.getMessage());
+ throw new AssertionFailedError(e.getMessage());
}
return revision.size() == 0;
http://git-wip-us.apache.org/repos/asf/wicket/blob/51725af8/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
index 822cd65..e8b1ad2 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
@@ -16,16 +16,17 @@
*/
package org.apache.wicket.util.license;
+import org.apache.wicket.util.diff.Diff;
+import org.apache.wicket.util.diff.Revision;
+import org.apache.wicket.util.string.Strings;
+import org.opentest4j.AssertionFailedError;
+
import java.io.File;
import java.util.Arrays;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.wicket.util.diff.Diff;
-import org.apache.wicket.util.diff.Revision;
-import org.apache.wicket.util.string.Strings;
-
class XmlLicenseHeaderHandler extends AbstractLicenseHeaderHandler
{
private final Pattern xmlHeader = Pattern.compile(
@@ -81,8 +82,7 @@ class XmlLicenseHeaderHandler extends AbstractLicenseHeaderHandler
}
catch (Exception e)
{
- e.printStackTrace();
- throw new AssertionError(e.getMessage());
+ throw new AssertionFailedError(e.getMessage());
}
return revision.size() == 0;
@@ -125,7 +125,7 @@ class XmlLicenseHeaderHandler extends AbstractLicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionError(e.getMessage());
+ throw new AssertionFailedError(e.getMessage());
}
return added;
http://git-wip-us.apache.org/repos/asf/wicket/blob/51725af8/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
index 3206165..ab5a73e 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
@@ -1,59 +1,59 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.util.license;
-
-
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.List;
-
-class XmlPrologHeaderHandler extends XmlLicenseHeaderHandler
-{
- /**
- * Construct.
- *
- * @param ignoreFiles
- */
- public XmlPrologHeaderHandler(final List<String> ignoreFiles)
- {
- super(ignoreFiles);
- }
-
- /**
- * @see org.apache.wicket.util.license.XmlLicenseHeaderHandler#checkLicenseHeader(java.io.File)
- */
- @Override
- public boolean checkLicenseHeader(final File file)
- {
- try
- {
- String header = extractLicenseHeader(file, 0, 1);
- return header.startsWith("<?xml");
- }
- catch (Exception e)
- {
- throw new AssertionError(e.getMessage());
- }
- }
-
- @Override
- public List<String> getSuffixes()
- {
- return Arrays.asList("html");
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.util.license;
+
+import org.opentest4j.AssertionFailedError;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
+class XmlPrologHeaderHandler extends XmlLicenseHeaderHandler
+{
+ /**
+ * Construct.
+ *
+ * @param ignoreFiles
+ */
+ public XmlPrologHeaderHandler(final List<String> ignoreFiles)
+ {
+ super(ignoreFiles);
+ }
+
+ /**
+ * @see org.apache.wicket.util.license.XmlLicenseHeaderHandler#checkLicenseHeader(java.io.File)
+ */
+ @Override
+ public boolean checkLicenseHeader(final File file)
+ {
+ try
+ {
+ String header = extractLicenseHeader(file, 0, 1);
+ return header.startsWith("<?xml");
+ }
+ catch (Exception e)
+ {
+ throw new AssertionFailedError(e.getMessage());
+ }
+ }
+
+ @Override
+ public List<String> getSuffixes()
+ {
+ return Arrays.asList("html");
+ }
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/51725af8/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java b/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
index 1ad3a27..71f8357 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
@@ -1,163 +1,162 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.util.markup.xhtml;
-
-import org.junit.jupiter.api.Test;
-import org.xml.sax.*;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Usable by tests to check that the html markup files are well formed.
- *
- * @author akiraly
- */
-public class WellFormedXmlTestCase
-{
- private DocumentBuilderFactory factory;
-
- /**
- * Checks xml well formedness of html markup files under the current working directory.
- */
- @Test
- public void markupFiles()
- {
- factory = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
-
- File root = new File("").getAbsoluteFile();
- processDirectory(root);
- }
-
- private void processDirectory(File dir)
- {
- for (File f : dir.listFiles(fileFilter))
- {
- if (f.isDirectory())
- {
- processDirectory(f);
- }
- else
- {
- processFile(f);
- }
- }
- }
-
- private void processFile(File file)
- {
- DocumentBuilder builder;
-
- try
- {
- builder = factory.newDocumentBuilder();
- }
- catch (ParserConfigurationException e)
- {
- throw new RuntimeException("Configuration exception while parsing xml markup.", e);
- }
-
- builder.setEntityResolver(entityResolver);
- builder.setErrorHandler(errorHandler);
-
- try
- {
- builder.parse(file);
- }
- catch (SAXException e)
- {
- throw new RuntimeException("Parsing xml sax failed, file: " + file, e);
- }
- catch (IOException e)
- {
- throw new RuntimeException("Parsing xml io failed, file: " + file, e);
- }
- }
-
- private static final FileFilter fileFilter = new FileFilter()
- {
- @Override
- public boolean accept(File pathname)
- {
- String path = pathname.getAbsolutePath().replace('\\', '/');
- return !path.contains("/src/test/") && !path.contains("/target/") &&
- !"package.html".equals(pathname.getName()) &&
- (pathname.isDirectory() || pathname.getName().endsWith(".html"));
- }
- };
-
- private static final ErrorHandler errorHandler = new ErrorHandler()
- {
- @Override
- public void warning(SAXParseException exception) throws SAXException
- {
- throw exception;
- }
-
- @Override
- public void error(SAXParseException exception) throws SAXException
- {
- throw exception;
- }
-
- @Override
- public void fatalError(SAXParseException exception) throws SAXException
- {
- throw exception;
- }
-
- };
-
- private static final EntityResolver entityResolver = new EntityResolver()
- {
- private final Map<String, String> systemIdToUri = new HashMap<>();
-
- {
- systemIdToUri.put("http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd",
- "xhtml1-transitional.dtd");
- systemIdToUri.put("http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd",
- "xhtml1-strict.dtd");
-
- /*
- * Cheating: using xhtml dtd-s for html4 files too because the html4 dtd-s are not valid
- * xml dtd-s.
- */
- systemIdToUri.put("http://www.w3.org/TR/html4/loose.dtd", "xhtml1-transitional.dtd");
- systemIdToUri.put("http://www.w3.org/TR/html4/strict.dtd", "xhtml1-strict.dtd");
- }
-
- @Override
- public InputSource resolveEntity(String publicId, String systemId) throws SAXException,
- IOException
- {
- String uri = systemIdToUri.get(systemId);
- if (uri != null)
- {
- return new InputSource(WellFormedXmlTestCase.class.getResource(uri).toString());
- }
-
- return null;
- }
- };
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.util.markup.xhtml;
+
+import org.junit.jupiter.api.Test;
+import org.xml.sax.*;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Usable by tests to check that the html markup files are well formed.
+ *
+ * @author akiraly
+ */
+public class WellFormedXmlTestCase
+{
+ private DocumentBuilderFactory factory;
+
+ /**
+ * Checks xml well formedness of html markup files under the current working directory.
+ */
+ @Test
+ public void markupFiles()
+ {
+ factory = DocumentBuilderFactory.newInstance();
+ factory.setNamespaceAware(true);
+
+ File root = new File("").getAbsoluteFile();
+ processDirectory(root);
+ }
+
+ private void processDirectory(File dir)
+ {
+ for (File f : dir.listFiles(fileFilter))
+ {
+ if (f.isDirectory())
+ {
+ processDirectory(f);
+ }
+ else
+ {
+ processFile(f);
+ }
+ }
+ }
+
+ private void processFile(File file)
+ {
+ DocumentBuilder builder;
+
+ try
+ {
+ builder = factory.newDocumentBuilder();
+ }
+ catch (ParserConfigurationException e)
+ {
+ throw new RuntimeException("Configuration exception while parsing xml markup.", e);
+ }
+
+ builder.setEntityResolver(entityResolver);
+ builder.setErrorHandler(errorHandler);
+
+ try
+ {
+ builder.parse(file);
+ }
+ catch (SAXException e)
+ {
+ throw new RuntimeException("Parsing xml sax failed, file: " + file, e);
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException("Parsing xml io failed, file: " + file, e);
+ }
+ }
+
+ private static final FileFilter fileFilter = new FileFilter()
+ {
+ @Override
+ public boolean accept(File pathname)
+ {
+ String path = pathname.getAbsolutePath().replace('\\', '/');
+ return !path.contains("/src/test/") && !path.contains("/target/") &&
+ !"package.html".equals(pathname.getName()) &&
+ (pathname.isDirectory() || pathname.getName().endsWith(".html"));
+ }
+ };
+
+ private static final ErrorHandler errorHandler = new ErrorHandler()
+ {
+ @Override
+ public void warning(SAXParseException exception) throws SAXException
+ {
+ throw exception;
+ }
+
+ @Override
+ public void error(SAXParseException exception) throws SAXException
+ {
+ throw exception;
+ }
+
+ @Override
+ public void fatalError(SAXParseException exception) throws SAXException
+ {
+ throw exception;
+ }
+
+ };
+
+ private static final EntityResolver entityResolver = new EntityResolver()
+ {
+ private final Map<String, String> systemIdToUri = new HashMap<>();
+
+ {
+ systemIdToUri.put("http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd",
+ "xhtml1-transitional.dtd");
+ systemIdToUri.put("http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd",
+ "xhtml1-strict.dtd");
+
+ /*
+ * Cheating: using xhtml dtd-s for html4 files too because the html4 dtd-s are not valid
+ * xml dtd-s.
+ */
+ systemIdToUri.put("http://www.w3.org/TR/html4/loose.dtd", "xhtml1-transitional.dtd");
+ systemIdToUri.put("http://www.w3.org/TR/html4/strict.dtd", "xhtml1-strict.dtd");
+ }
+
+ @Override
+ public InputSource resolveEntity(String publicId, String systemId)
+ {
+ String uri = systemIdToUri.get(systemId);
+ if (uri != null)
+ {
+ return new InputSource(WellFormedXmlTestCase.class.getResource(uri).toString());
+ }
+
+ return null;
+ }
+ };
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/51725af8/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 f3e9587..295244f 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
@@ -45,7 +45,8 @@ 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("one", deserialized.get(1));
assertEquals("two", deserialized.get(2));
[14/45] wicket git commit: wicket-core: Migrate to Junit 5
Posted by mg...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/XForwardedRequestWrapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/XForwardedRequestWrapperTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/XForwardedRequestWrapperTest.java
index af21bda..e307c10 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/XForwardedRequestWrapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/XForwardedRequestWrapperTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.protocol.http.servlet;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
import javax.servlet.http.HttpServletRequest;
import org.apache.wicket.markup.html.basic.SimplePage;
@@ -24,23 +27,23 @@ import org.apache.wicket.protocol.http.mock.MockHttpServletRequest;
import org.apache.wicket.protocol.http.mock.MockHttpServletResponse;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
*
* @author Juergen Donnerstag
*/
-public class XForwardedRequestWrapperTest extends WicketTestCase
+class XForwardedRequestWrapperTest extends WicketTestCase
{
- MockHttpServletRequest request;
- XForwardedRequestWrapperFactory filter;
+ private MockHttpServletRequest request;
+ private XForwardedRequestWrapperFactory filter;
/**
* @throws Exception
*/
- @Before
- public void before() throws Exception
+ @BeforeEach
+ void before() throws Exception
{
filter = new XForwardedRequestWrapperFactory();
request = tester.getRequest();
@@ -48,7 +51,7 @@ public class XForwardedRequestWrapperTest extends WicketTestCase
/** */
@Test
- public void test1()
+ void test1()
{
HttpServletRequest resp = filter.getWrapper(request);
assertEquals("127.0.0.1", resp.getRemoteAddr());
@@ -62,7 +65,7 @@ public class XForwardedRequestWrapperTest extends WicketTestCase
/** */
@Test
- public void test2()
+ void test2()
{
filter.getConfig().setProtocolHeader("x-forwarded-proto");
@@ -80,7 +83,7 @@ public class XForwardedRequestWrapperTest extends WicketTestCase
* Sample with internal proxies
*/
@Test
- public void test3()
+ void test3()
{
filter.getConfig().setAllowedInternalProxies("192\\.168\\.0\\.10, 192\\.168\\.0\\.11");
filter.getConfig().setRemoteIPHeader("x-forwarded-for");
@@ -109,7 +112,7 @@ public class XForwardedRequestWrapperTest extends WicketTestCase
* Sample with trusted proxies
*/
@Test
- public void test4()
+ void test4()
{
filter.getConfig().setAllowedInternalProxies("192\\.168\\.0\\.10, 192\\.168\\.0\\.11");
filter.getConfig().setRemoteIPHeader("x-forwarded-for");
@@ -129,7 +132,7 @@ public class XForwardedRequestWrapperTest extends WicketTestCase
* Sample with internal and trusted proxies
*/
@Test
- public void test5()
+ void test5()
{
filter.getConfig().setAllowedInternalProxies("192\\.168\\.0\\.10, 192\\.168\\.0\\.11");
filter.getConfig().setRemoteIPHeader("x-forwarded-for");
@@ -149,7 +152,7 @@ public class XForwardedRequestWrapperTest extends WicketTestCase
* Sample with an untrusted proxy
*/
@Test
- public void test6()
+ void test6()
{
filter.getConfig().setAllowedInternalProxies("192\\.168\\.0\\.10, 192\\.168\\.0\\.11");
filter.getConfig().setRemoteIPHeader("x-forwarded-for");
@@ -189,7 +192,7 @@ public class XForwardedRequestWrapperTest extends WicketTestCase
*
*/
@Test
- public void test7() throws Exception
+ void test7() throws Exception
{
MyApplication app = new MyApplication();
tester = new WicketTester(app);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperApplication.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperApplication.java b/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperApplication.java
index e35e839..80ec25a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperApplication.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperApplication.java
@@ -19,7 +19,7 @@ package org.apache.wicket.protocol.https;
import org.apache.wicket.Page;
import org.apache.wicket.protocol.http.WebApplication;
-public class HttpsMapperApplication extends WebApplication
+class HttpsMapperApplication extends WebApplication
{
private HttpsConfig config;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperApplicationTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperApplicationTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperApplicationTest.java
index 47d0177..4faa508 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperApplicationTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperApplicationTest.java
@@ -16,17 +16,17 @@
*/
package org.apache.wicket.protocol.https;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.apache.wicket.Page;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for proper switching of http and https in {@link WicketTester}
*/
-public class HttpsMapperApplicationTest
+class HttpsMapperApplicationTest
{
@SuppressWarnings({ "unchecked" })
private <T extends Page> T requestPage(WicketTester tester, Class<T> pageClass)
@@ -40,7 +40,7 @@ public class HttpsMapperApplicationTest
}
@Test
- public void switchDefaultToHttpsWithDefaultPorts()
+ void switchDefaultToHttpsWithDefaultPorts()
{
WicketTester tester = new WicketTester(new HttpsMapperApplication());
@@ -50,7 +50,7 @@ public class HttpsMapperApplicationTest
}
@Test
- public void switchDefaultToHttpsWithCustomPort()
+ void switchDefaultToHttpsWithCustomPort()
{
WicketTester tester = new WicketTester(new HttpsMapperApplication(123, 456));
@@ -61,7 +61,7 @@ public class HttpsMapperApplicationTest
}
@Test
- public void switchHttpsToHttpWithDefaultPorts()
+ void switchHttpsToHttpWithDefaultPorts()
{
WicketTester tester = new WicketTester(new HttpsMapperApplication());
@@ -74,7 +74,7 @@ public class HttpsMapperApplicationTest
}
@Test
- public void switchHttpsToHttpWithCustomPorts()
+ void switchHttpsToHttpWithCustomPorts()
{
WicketTester tester = new WicketTester(new HttpsMapperApplication(123, 456));
@@ -88,7 +88,7 @@ public class HttpsMapperApplicationTest
}
@Test
- public void switchHttpToHttpsWithDefaultPorts()
+ void switchHttpToHttpsWithDefaultPorts()
{
WicketTester tester = new WicketTester(new HttpsMapperApplication());
@@ -100,7 +100,7 @@ public class HttpsMapperApplicationTest
}
@Test
- public void switchHttpToHttpsWithCustomPorts()
+ void switchHttpToHttpsWithCustomPorts()
{
WicketTester tester = new WicketTester(new HttpsMapperApplication(123, 456));
@@ -114,7 +114,7 @@ public class HttpsMapperApplicationTest
}
@Test
- public void testProtocolSwitchForNextRequest()
+ void testProtocolSwitchForNextRequest()
{
WicketTester tester = new WicketTester(new HttpsMapperApplication());
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperTest.java
index cc55338..fabac6b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperTest.java
@@ -18,9 +18,9 @@ package org.apache.wicket.protocol.https;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.Matchers.sameInstance;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.when;
@@ -35,40 +35,40 @@ import org.apache.wicket.protocol.https.HttpsMapper.RedirectHandler;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.IRequestMapper;
import org.apache.wicket.request.Url;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class HttpsMapperTest
+class HttpsMapperTest
{
@Test
- public void getDesiredSchemeOfPageClass()
+ void getDesiredSchemeOfPageClass()
{
IRequestMapper delegate = mock(IRequestMapper.class);
HttpsMapper mapper = new HttpsMapper(delegate, new HttpsConfig());
- assertThat(mapper.getDesiredSchemeFor(SecurePage.class), is(Scheme.HTTPS));
- assertThat(mapper.getDesiredSchemeFor(SecureDecendantPage.class), is(Scheme.HTTPS));
- assertThat(mapper.getDesiredSchemeFor(SecureMixinPage.class), is(Scheme.HTTPS));
- assertThat(mapper.getDesiredSchemeFor(InsecurePage.class), is(Scheme.HTTP));
+ assertEquals(Scheme.HTTPS, mapper.getDesiredSchemeFor(SecurePage.class));
+ assertEquals(Scheme.HTTPS, mapper.getDesiredSchemeFor(SecureDecendantPage.class));
+ assertEquals(Scheme.HTTPS, mapper.getDesiredSchemeFor(SecureMixinPage.class));
+ assertEquals(Scheme.HTTP, mapper.getDesiredSchemeFor(InsecurePage.class));
}
@Test
- public void getDesiredSchemeOfHandler()
+ void getDesiredSchemeOfHandler()
{
IRequestMapper delegate = mock(IRequestMapper.class);
HttpsMapper mapper = new HttpsMapper(delegate, new HttpsConfig());
IRequestHandler handler = new RenderPageRequestHandler(new PageProvider(SecurePage.class));
- assertThat(mapper.getDesiredSchemeFor(handler), is(Scheme.HTTPS));
+ assertEquals(Scheme.HTTPS, mapper.getDesiredSchemeFor(handler));
handler = new RenderPageRequestHandler(new PageProvider(InsecurePage.class));
- assertThat(mapper.getDesiredSchemeFor(handler), is(Scheme.HTTP));
+ assertEquals(Scheme.HTTP, mapper.getDesiredSchemeFor(handler));
handler = mock(IRequestHandler.class);
- assertThat(mapper.getDesiredSchemeFor(handler), is(Scheme.ANY));
+ assertEquals(Scheme.ANY, mapper.getDesiredSchemeFor(handler));
}
@Test
- public void getSchemeOfRequest()
+ void getSchemeOfRequest()
{
IRequestMapper delegate = mock(IRequestMapper.class);
HttpsMapper mapper = new HttpsMapper(delegate, new HttpsConfig());
@@ -78,15 +78,15 @@ public class HttpsMapperTest
when(request.getContainerRequest()).thenReturn(req);
when(req.getScheme()).thenReturn("https");
- assertThat(mapper.getSchemeOf(request), is(Scheme.HTTPS));
+ assertEquals(Scheme.HTTPS, mapper.getSchemeOf(request));
reset(req);
when(req.getScheme()).thenReturn("hTTps");
- assertThat(mapper.getSchemeOf(request), is(Scheme.HTTPS));
+ assertEquals(Scheme.HTTPS, mapper.getSchemeOf(request));
reset(req);
when(req.getScheme()).thenReturn("http");
- assertThat(mapper.getSchemeOf(request), is(Scheme.HTTP));
+ assertEquals(Scheme.HTTP, mapper.getSchemeOf(request));
try
{
@@ -102,7 +102,7 @@ public class HttpsMapperTest
}
@Test
- public void mapHandler()
+ void mapHandler()
{
IRequestMapper delegate = mock(IRequestMapper.class);
HttpsMapper mapper = new HttpsMapper(delegate, new HttpsConfig());
@@ -117,8 +117,8 @@ public class HttpsMapperTest
when(delegate.mapHandler(handler)).thenReturn(url);
when(req.getScheme()).thenReturn("http");
mapper.mapHandler(handler, request);
- assertThat(url.getProtocol(), is("https"));
- assertThat(url.getPort(), is(443));
+ assertEquals("https", url.getProtocol());
+ assertEquals(Integer.valueOf(443), url.getPort());
// render url to http page on http, ignore protocol
handler = new RenderPageRequestHandler(new PageProvider(InsecurePage.class));
@@ -127,7 +127,7 @@ public class HttpsMapperTest
when(delegate.mapHandler(handler)).thenReturn(url);
when(req.getScheme()).thenReturn("http");
mapper.mapHandler(handler, request);
- assertThat(url.getProtocol(), is(nullValue()));
+ assertNull(url.getProtocol());
// render url to http page on https, set protocol
handler = new RenderPageRequestHandler(new PageProvider(InsecurePage.class));
@@ -136,13 +136,13 @@ public class HttpsMapperTest
when(delegate.mapHandler(handler)).thenReturn(url);
when(req.getScheme()).thenReturn("https");
mapper.mapHandler(handler, request);
- assertThat(url.getProtocol(), is("http"));
- assertThat(url.getPort(), is(80));
+ assertEquals("http", url.getProtocol());
+ assertEquals(Integer.valueOf(80), url.getPort());
}
@Test
- public void mapRequest()
+ void mapRequest()
{
IRequestMapper delegate = mock(IRequestMapper.class);
HttpsMapper mapper = new HttpsMapper(delegate, new HttpsConfig());
@@ -156,8 +156,8 @@ public class HttpsMapperTest
IRequestHandler handler = new RenderPageRequestHandler(new PageProvider(SecurePage.class));
when(delegate.mapRequest(request)).thenReturn(handler);
IRequestHandler resolved = mapper.mapRequest(request);
- assertThat(resolved, is(instanceOf(RedirectHandler.class)));
- assertThat(((RedirectHandler)resolved).getUrl(), is("https://localhost/ctx?foo=bar"));
+ assertThat(resolved, instanceOf(RedirectHandler.class));
+ assertEquals("https://localhost/ctx?foo=bar", ((RedirectHandler)resolved).getUrl());
// http handler on http request, return the original handler
handler = new RenderPageRequestHandler(new PageProvider(InsecurePage.class));
@@ -165,11 +165,11 @@ public class HttpsMapperTest
when(delegate.mapRequest(request)).thenReturn(handler);
setupRequest(req, "http", "localhost", 80, "/ctx", "foo=bar");
resolved = mapper.mapRequest(request);
- assertThat(resolved, is(sameInstance(handler)));
+ assertSame(handler, resolved);
}
@Test
- public void mapRequestWithCustomPorts()
+ void mapRequestWithCustomPorts()
{
IRequestMapper delegate = mock(IRequestMapper.class);
HttpsMapper mapper = new HttpsMapper(delegate, new HttpsConfig(10, 20));
@@ -183,8 +183,8 @@ public class HttpsMapperTest
IRequestHandler handler = new RenderPageRequestHandler(new PageProvider(SecurePage.class));
when(delegate.mapRequest(request)).thenReturn(handler);
IRequestHandler resolved = mapper.mapRequest(request);
- assertThat(resolved, is(instanceOf(RedirectHandler.class)));
- assertThat(((RedirectHandler)resolved).getUrl(), is("https://localhost:20/ctx?foo=bar"));
+ assertThat(resolved, instanceOf(RedirectHandler.class));
+ assertEquals("https://localhost:20/ctx?foo=bar", ((RedirectHandler)resolved).getUrl());
// http handler on http request, return the original handler
handler = new RenderPageRequestHandler(new PageProvider(InsecurePage.class));
@@ -192,8 +192,8 @@ public class HttpsMapperTest
when(delegate.mapRequest(request)).thenReturn(handler);
setupRequest(req, "https", "localhost", 20, "/ctx", "foo=bar");
resolved = mapper.mapRequest(request);
- assertThat(resolved, is(instanceOf(RedirectHandler.class)));
- assertThat(((RedirectHandler)resolved).getUrl(), is("http://localhost:10/ctx?foo=bar"));
+ assertThat(resolved, instanceOf(RedirectHandler.class));
+ assertEquals("http://localhost:10/ctx?foo=bar", ((RedirectHandler)resolved).getUrl());
}
private static void setupRequest(HttpServletRequest mock, String scheme, String host, int port,
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingPerformanceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingPerformanceTest.java b/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingPerformanceTest.java
index ed7d341..722478e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingPerformanceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingPerformanceTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.queueing;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -34,15 +36,15 @@ import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.util.SlowTests;
+import org.apache.wicket.util.WicketTestTag;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
-@Category(SlowTests.class)
+@Tag(WicketTestTag.SLOW)
public class ComponentQueueingPerformanceTest extends WicketTestCase
{
private void run(Class<? extends Page> pageClass)
@@ -59,7 +61,7 @@ public class ComponentQueueingPerformanceTest extends WicketTestCase
}
@Test
- public void performance()
+ void performance()
{
final int warmup = 30;
final int performance = 60;
@@ -97,7 +99,7 @@ public class ComponentQueueingPerformanceTest extends WicketTestCase
@Test
- public void consistency()
+ void consistency()
{
tester.startPage(new QueueContactsPage());
String queue = tester.getLastResponseAsString();
@@ -134,7 +136,7 @@ public class ComponentQueueingPerformanceTest extends WicketTestCase
}
- static Store store = new Store();
+ private static Store store = new Store();
private static class Store
{
@@ -159,7 +161,7 @@ public class ComponentQueueingPerformanceTest extends WicketTestCase
throw new RuntimeException();
}
- public Store()
+ Store()
{
for (int i = 0; i < 250; i++)
{
@@ -174,7 +176,7 @@ public class ComponentQueueingPerformanceTest extends WicketTestCase
{
private String id;
- public ContactModel(Contact contact)
+ ContactModel(Contact contact)
{
super(contact);
this.id = contact.id;
@@ -190,7 +192,7 @@ public class ComponentQueueingPerformanceTest extends WicketTestCase
private static abstract class AbstractPhonePanel extends TestPanel
{
- public AbstractPhonePanel(String id, IModel<PhoneNumber> phone)
+ AbstractPhonePanel(String id, IModel<PhoneNumber> phone)
{
super(id);
setPanelMarkup("<wicket:panel><span wicket:id='areacode'></span> <span wicket:id='prefix'></span>-<span wicket:id='suffix'></span></wicket:panel>");
@@ -199,7 +201,7 @@ public class ComponentQueueingPerformanceTest extends WicketTestCase
private static class AddPhonePanel extends AbstractPhonePanel
{
- public AddPhonePanel(String id, IModel<PhoneNumber> phone)
+ AddPhonePanel(String id, IModel<PhoneNumber> phone)
{
super(id, phone);
add(new Label("areacode", new PropertyModel(phone, "areacode")));
@@ -220,7 +222,7 @@ public class ComponentQueueingPerformanceTest extends WicketTestCase
private static abstract class AbstractAddressPanel extends TestPanel
{
- public AbstractAddressPanel(String id, IModel<Address> addr)
+ AbstractAddressPanel(String id, IModel<Address> addr)
{
super(id);
setPanelMarkup("<wicket:panel><span wicket:id='street'></span><br/><span wicket:id='city'></span>, <span wicket:id='state'></span> <span wicket:id='zipcode'></span></wicket:panel>");
@@ -229,7 +231,7 @@ public class ComponentQueueingPerformanceTest extends WicketTestCase
private static class AddAddressPanel extends AbstractAddressPanel
{
- public AddAddressPanel(String id, IModel<Address> addr)
+ AddAddressPanel(String id, IModel<Address> addr)
{
super(id, addr);
add(new Label("street", new PropertyModel(addr, "street")));
@@ -340,7 +342,7 @@ public class ComponentQueueingPerformanceTest extends WicketTestCase
{
private String markup;
- public TestPage()
+ TestPage()
{
}
@@ -349,12 +351,12 @@ public class ComponentQueueingPerformanceTest extends WicketTestCase
this.markup = markup;
}
- protected String getPageMarkup()
+ String getPageMarkup()
{
return markup;
}
- public void setPageMarkup(String markup)
+ void setPageMarkup(String markup)
{
this.markup = markup;
}
@@ -373,17 +375,17 @@ public class ComponentQueueingPerformanceTest extends WicketTestCase
private String markup;
- public TestPanel(String id)
+ TestPanel(String id)
{
super(id);
}
- protected void setPanelMarkup(String markup)
+ void setPanelMarkup(String markup)
{
this.markup = markup;
}
- protected String getPanelMarkup()
+ String getPanelMarkup()
{
return markup;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java b/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java
index 2b4ea15..8cfefb7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java
@@ -17,8 +17,11 @@
package org.apache.wicket.queueing;
import static org.apache.wicket.queueing.WicketMatchers.hasPath;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+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.ArrayList;
@@ -49,14 +52,13 @@ import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class ComponentQueueingTest extends WicketTestCase
+class ComponentQueueingTest extends WicketTestCase
{
/** {@code [a,b,c] -> [a[b[c]]] } */
@Test
- public void dequeue1()
+ void dequeue1()
{
TestPage p = new TestPage();
p.setPageMarkup("<p wicket:id='a'><p wicket:id='b'><p wicket:id='c'></p></p></p>");
@@ -71,7 +73,7 @@ public class ComponentQueueingTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-6361
*/
@Test
- public void dequeueComponentsOnInitialization()
+ void dequeueComponentsOnInitialization()
{
TestPage p = new TestPage();
p.setPageMarkup("<p wicket:id='a'><p wicket:id='b'><p wicket:id='c'></p></p></p>");
@@ -89,7 +91,7 @@ public class ComponentQueueingTest extends WicketTestCase
/** {@code [a[b,c]] -> [a[b[c]]] } */
@Test
- public void dequeue2()
+ void dequeue2()
{
TestPage p = new TestPage();
p.setPageMarkup("<p wicket:id='a'><p wicket:id='b'><p wicket:id='c'></p></p></p>");
@@ -105,7 +107,7 @@ public class ComponentQueueingTest extends WicketTestCase
/** {@code [a[b[c]] -> [a[b[c]]] } */
@Test
- public void dequeue3()
+ void dequeue3()
{
TestPage p = new TestPage();
p.setPageMarkup("<p wicket:id='a'><p wicket:id='b'><p wicket:id='c'></p></p></p>");
@@ -122,7 +124,7 @@ public class ComponentQueueingTest extends WicketTestCase
/** {@code [a[b],c] -> [a[b[c]]] } */
@Test
- public void dequeue4()
+ void dequeue4()
{
TestPage p = new TestPage();
p.setPageMarkup("<p wicket:id='a'><p wicket:id='b'><p wicket:id='c'></p></p></p>");
@@ -138,7 +140,7 @@ public class ComponentQueueingTest extends WicketTestCase
/** {@code [a(b)],c] -> [a[b[c]]] } */
@Test
- public void dequeue5()
+ void dequeue5()
{
TestPage p = new TestPage();
p.setPageMarkup("<p wicket:id='a'><p wicket:id='b'><p wicket:id='c'></p></p></p>");
@@ -153,7 +155,7 @@ public class ComponentQueueingTest extends WicketTestCase
/** {@code [a,b,c] -> [a[b,c]] } */
@Test
- public void dequeue6()
+ void dequeue6()
{
TestPage p = new TestPage();
p.setPageMarkup("<p wicket:id='a'><p wicket:id='b'></p><p wicket:id='c'></p></p>");
@@ -171,7 +173,7 @@ public class ComponentQueueingTest extends WicketTestCase
* {a[b{e}[d,f{g}]],c} -> [a[b[c,d[e],f[g]]]]
*/
@Test
- public void dequeue7()
+ void dequeue7()
{
TestPage p = new TestPage();
@@ -209,7 +211,7 @@ public class ComponentQueueingTest extends WicketTestCase
/** {@code [a,c[b]] ->| [a[b[c]]] } */
@Test
- public void dequeueError1()
+ void dequeueError1()
{
TestPage p = new TestPage();
p.setPageMarkup("<p wicket:id='a'><p wicket:id='b'><p wicket:id='c'></p></p></p>");
@@ -221,7 +223,7 @@ public class ComponentQueueingTest extends WicketTestCase
try
{
tester.startPage(p);
- Assert.fail();
+ fail();
}
catch (WicketRuntimeException e)
{
@@ -231,7 +233,7 @@ public class ComponentQueueingTest extends WicketTestCase
/** {@code [a,q[r,s]] - > [a[q[r[s]]]] } */
@Test
- public void panel1()
+ void panel1()
{
MarkupContainer a = new A(), r = new R(), s = new S();
@@ -251,7 +253,7 @@ public class ComponentQueueingTest extends WicketTestCase
/** panel has leading markup */
@Test
- public void panel2()
+ void panel2()
{
MarkupContainer r = new R();
@@ -270,7 +272,7 @@ public class ComponentQueueingTest extends WicketTestCase
/** panel with a static header section */
@Test
- public void panel3()
+ void panel3()
{
MarkupContainer r = new R();
@@ -293,7 +295,7 @@ public class ComponentQueueingTest extends WicketTestCase
* test with inner panels
*/
@Test
- public void nestedPanels()
+ void nestedPanels()
{
MarkupContainer r = new R(), s = new S();
@@ -317,7 +319,7 @@ public class ComponentQueueingTest extends WicketTestCase
}
@Test
- public void repeater1()
+ void repeater1()
{
TestPage p = new TestPage();
p.setPageMarkup("<p wicket:id='lv'><p wicket:id='b'><p wicket:id='c'></p></p></p>");
@@ -335,7 +337,7 @@ public class ComponentQueueingTest extends WicketTestCase
tester.startPage(p);
- assertThat(l.size(), is(3));
+ assertEquals(3, l.size());
for (Component item : l)
{
assertThat(p, hasPath(new Path(l, item, new B(), new C())));
@@ -344,7 +346,7 @@ public class ComponentQueueingTest extends WicketTestCase
/** repeater */
@Test
- public void repeater2()
+ void repeater2()
{
TestPage p = new TestPage();
p.setPageMarkup("<p wicket:id='a'><p wicket:id='lv'><p wicket:id='b'><p wicket:id='c'></p></p></p></p>");
@@ -363,7 +365,7 @@ public class ComponentQueueingTest extends WicketTestCase
tester.startPage(p);
- assertThat(l.size(), is(3));
+ assertEquals(3, l.size());
for (Component item : l)
{
assertThat(p, hasPath(new Path(a, l, item, new B(), new C())));
@@ -372,7 +374,7 @@ public class ComponentQueueingTest extends WicketTestCase
/** repeater with a panel inside */
@Test
- public void repeater3()
+ void repeater3()
{
TestPage p = new TestPage();
p.setPageMarkup("<p wicket:id='a'><p wicket:id='lv'><p wicket:id='b'><p wicket:id='q'></p></p></p></p>");
@@ -395,7 +397,7 @@ public class ComponentQueueingTest extends WicketTestCase
tester.startPage(p);
- assertThat(l.size(), is(3));
+ assertEquals(3, l.size());
for (Component item : l)
{
assertThat(p, hasPath(new Path(a, l, item, new B()).add("q").add(new R(), new S())));
@@ -404,7 +406,7 @@ public class ComponentQueueingTest extends WicketTestCase
/** dequeue, then rerender the page instance after a callback is executed */
@Test
- public void callback()
+ void callback()
{
TestPage p = new TestPage();
p.setPageMarkup("<p wicket:id='a'><a wicket:id='l'><p wicket:id='b'></p></a></p>");
@@ -415,23 +417,22 @@ public class ComponentQueueingTest extends WicketTestCase
tester.startPage(p);
assertThat(p, hasPath(new Path(a, l, b)));
- assertThat(l.isClicked(), is(false));
+ assertEquals(false, l.isClicked());
tester.clickLink(l);
- assertThat(l.isClicked(), is(true));
+ assertEquals(true, l.isClicked());
}
/** queuing two components with the same id */
@Test
- public void queueIdCollission()
+ void queueIdCollission()
{
try
{
new A().queue(new B(), new B());
- Assert
- .fail("Should not be able to queue two components with the same id under the same parent");
+ fail("Should not be able to queue two components with the same id under the same parent");
}
catch (WicketRuntimeException e)
{
@@ -441,7 +442,7 @@ public class ComponentQueueingTest extends WicketTestCase
@Test
- public void autos1()
+ void autos1()
{
TestPage p = new TestPage();
p.setPageMarkup("<wicket:enclosure child='a'><div wicket:id='a'></div><div wicket:id='b'></div></wicket:enclosure>");
@@ -467,7 +468,7 @@ public class ComponentQueueingTest extends WicketTestCase
}
@Test
- public void autos2()
+ void autos2()
{
TestPage p = new TestPage();
p.setPageMarkup("<wicket:enclosure child='a'><div wicket:id='a'></div><div wicket:id='b'></div></wicket:enclosure>");
@@ -493,7 +494,7 @@ public class ComponentQueueingTest extends WicketTestCase
}
@Test
- public void autos3()
+ void autos3()
{
TestPage p = new TestPage();
p.setPageMarkup("<wicket:enclosure child='a'><div wicket:id='a'></div><div wicket:id='b'></div></wicket:enclosure>");
@@ -520,7 +521,7 @@ public class ComponentQueueingTest extends WicketTestCase
}
@Test
- public void autos4()
+ void autos4()
{
TestPage p = new TestPage();
p.setPageMarkup("<wicket:enclosure child='a'><div wicket:id='a'></div><div wicket:id='b'></div></wicket:enclosure>");
@@ -547,7 +548,7 @@ public class ComponentQueueingTest extends WicketTestCase
}
@Test
- public void autos5()
+ void autos5()
{
TestPage p = new TestPage();
p.setPageMarkup("<wicket:enclosure child='a'><div wicket:id='a'></div><div wicket:id='b'></div></wicket:enclosure>");
@@ -578,7 +579,7 @@ public class ComponentQueueingTest extends WicketTestCase
* Test InlineEnclosure
*/
@Test
- public void autos6()
+ void autos6()
{
TestPage p = new TestPage();
p.setPageMarkup("<div wicket:enclosure='a'><div wicket:id='a'></div><div wicket:id='b'></div></div>");
@@ -607,7 +608,7 @@ public class ComponentQueueingTest extends WicketTestCase
* Test empty child attribute
*/
@Test
- public void autos7()
+ void autos7()
{
TestPage p = new TestPage();
p.setPageMarkup("<wicket:enclosure child=''><div wicket:id='a'></div></wicket:enclosure>");
@@ -636,7 +637,7 @@ public class ComponentQueueingTest extends WicketTestCase
* Test autocomponent inside not-queue region
*/
@Test
- public void autosInsideNotQueueRegion()
+ void autosInsideNotQueueRegion()
{
TestPage p = new TestPage();
p.setPageMarkup("<div wicket:id='outerContainer'><wicket:enclosure><div wicket:id='a'></div></wicket:enclosure></div>");
@@ -651,7 +652,7 @@ public class ComponentQueueingTest extends WicketTestCase
}
@Test
- public void border1()
+ void border1()
{
MarkupContainer a = new A(), b = new B(), r = new R(), s = new S();
@@ -671,7 +672,7 @@ public class ComponentQueueingTest extends WicketTestCase
}
@Test
- public void queueBorderBody() throws Exception
+ void queueBorderBody() throws Exception
{
TestBorder border = new TestBorder("border");
@@ -687,7 +688,7 @@ public class ComponentQueueingTest extends WicketTestCase
}
@Test
- public void border_nested()
+ void border_nested()
{
MarkupContainer a = new A(), b = new B(), c= new C(), d = new D(), r = new R(), s = new S();
@@ -714,7 +715,7 @@ public class ComponentQueueingTest extends WicketTestCase
}
@Test
- public void fragment1() {
+ void fragment1() {
MarkupContainer a = new A(), b = new B(), r = new R(), s = new S();
TestPage page = new TestPage();
@@ -733,7 +734,7 @@ public class ComponentQueueingTest extends WicketTestCase
}
@Test
- public void fragment_doesNotDequeueAcrossRegion()
+ void fragment_doesNotDequeueAcrossRegion()
{
MarkupContainer a = new A();
@@ -745,12 +746,12 @@ public class ComponentQueueingTest extends WicketTestCase
page.queue(a, fragment);
assertThat(page, hasPath(new Path(fragment)));
- assertThat(a.getParent(), is(nullValue()));
+ assertNull(a.getParent());
}
@Test
- public void containerTag1()
+ void containerTag1()
{
MarkupContainer a = new A(), b = new B();
@@ -763,7 +764,7 @@ public class ComponentQueueingTest extends WicketTestCase
}
@Test
- public void queueInsideHeader()
+ void queueInsideHeader()
{
TestPage page = new TestPage();
page.setPageMarkup("<html>"
@@ -781,7 +782,7 @@ public class ComponentQueueingTest extends WicketTestCase
}
@Test
- public void queueInsideAutoLink()
+ void queueInsideAutoLink()
{
TestPage page = new TestPage();
page.setPageMarkup("<wicket:link>"
@@ -795,7 +796,7 @@ public class ComponentQueueingTest extends WicketTestCase
}
@Test
- public void queueInsideLabelComponent()
+ void queueInsideLabelComponent()
{
TestPage page = new TestPage();
page.setPageMarkup("<label wicket:for='input'>"
@@ -809,7 +810,7 @@ public class ComponentQueueingTest extends WicketTestCase
}
@Test
- public void queueInsideTransparentContainer() throws Exception
+ void queueInsideTransparentContainer() throws Exception
{
TestPage page = new TestPage();
page.setPageMarkup("<div wicket:id='transparentContainer'>"
@@ -827,7 +828,7 @@ public class ComponentQueueingTest extends WicketTestCase
}
@Test
- public void queueNestedEnclosure()
+ void queueNestedEnclosure()
{
TestPage page = new TestPage();
page.setPageMarkup( "<div wicket:enclosure='outer'>" +
@@ -855,7 +856,7 @@ public class ComponentQueueingTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-6088
*/
@Test
- public void queueComponentInsideWcAndEnclosure()
+ void queueComponentInsideWcAndEnclosure()
{
TestPage page = new TestPage();
page.setPageMarkup(" <div wicket:id=\"container\">\n" +
@@ -885,7 +886,7 @@ public class ComponentQueueingTest extends WicketTestCase
tester.startPage(page);
}
@Test
- public void queueComponentInsideBorderAndEnclosure()
+ void queueComponentInsideBorderAndEnclosure()
{
TestPage page = new TestPage();
page.setPageMarkup(" <div wicket:id=\"panel\"></div>");
@@ -913,7 +914,7 @@ public class ComponentQueueingTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-6036
*/
@Test
- public void nestedTags()
+ void nestedTags()
{
IncorrectCloseTagPanel p = new IncorrectCloseTagPanel("test");
tester.startComponentInPage(p);
@@ -923,7 +924,7 @@ public class ComponentQueueingTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-6077
*/
@Test
- public void bodyIsAChild() {
+ void bodyIsAChild() {
tester.startPage(BodyIsAChildPage.class);
tester.assertRenderedPage(BodyIsAChildPage.class);
@@ -943,7 +944,7 @@ public class ComponentQueueingTest extends WicketTestCase
private static class A extends WebMarkupContainer
{
- public A()
+ A()
{
super("a");
}
@@ -951,7 +952,7 @@ public class ComponentQueueingTest extends WicketTestCase
private static class B extends WebMarkupContainer
{
- public B()
+ B()
{
super("b");
}
@@ -959,7 +960,7 @@ public class ComponentQueueingTest extends WicketTestCase
private static class C extends WebMarkupContainer
{
- public C()
+ C()
{
super("c");
}
@@ -967,7 +968,7 @@ public class ComponentQueueingTest extends WicketTestCase
private static class D extends WebMarkupContainer
{
- public D()
+ D()
{
super("d");
}
@@ -975,7 +976,7 @@ public class ComponentQueueingTest extends WicketTestCase
private static class E extends WebMarkupContainer
{
- public E()
+ E()
{
super("e");
}
@@ -983,14 +984,14 @@ public class ComponentQueueingTest extends WicketTestCase
private static class F extends WebMarkupContainer
{
- public F()
+ F()
{
super("f");
}
}
private static class G extends WebMarkupContainer
{
- public G()
+ G()
{
super("g");
}
@@ -998,7 +999,7 @@ public class ComponentQueueingTest extends WicketTestCase
private static class R extends WebMarkupContainer
{
- public R()
+ R()
{
super("r");
}
@@ -1006,7 +1007,7 @@ public class ComponentQueueingTest extends WicketTestCase
private static class S extends WebMarkupContainer
{
- public S()
+ S()
{
super("s");
}
@@ -1014,7 +1015,7 @@ public class ComponentQueueingTest extends WicketTestCase
private static abstract class LV extends ListView<Integer>
{
- public LV(int size)
+ LV(int size)
{
super("lv");
ArrayList<Integer> values = new ArrayList<>();
@@ -1028,7 +1029,7 @@ public class ComponentQueueingTest extends WicketTestCase
{
private boolean clicked = false;
- public L()
+ L()
{
super("l");
}
@@ -1039,7 +1040,7 @@ public class ComponentQueueingTest extends WicketTestCase
clicked = true;
}
- public boolean isClicked()
+ boolean isClicked()
{
return clicked;
}
@@ -1050,7 +1051,7 @@ public class ComponentQueueingTest extends WicketTestCase
{
private String markup;
- public TestPage()
+ TestPage()
{
}
@@ -1059,12 +1060,12 @@ public class ComponentQueueingTest extends WicketTestCase
this.markup = markup;
}
- protected String getPageMarkup()
+ String getPageMarkup()
{
return markup;
}
- public void setPageMarkup(String markup)
+ void setPageMarkup(String markup)
{
this.markup = markup;
}
@@ -1082,17 +1083,17 @@ public class ComponentQueueingTest extends WicketTestCase
{
private String markup;
- public TestPanel(String id)
+ TestPanel(String id)
{
super(id);
}
- protected void setPanelMarkup(String markup)
+ void setPanelMarkup(String markup)
{
this.markup = markup;
}
- protected String getPanelMarkup()
+ String getPanelMarkup()
{
return markup;
}
@@ -1109,17 +1110,17 @@ public class ComponentQueueingTest extends WicketTestCase
{
private String markup;
- public TestBorder(String id)
+ TestBorder(String id)
{
super(id);
}
- protected void setBorderMarkup(String markup)
+ void setBorderMarkup(String markup)
{
this.markup = markup;
}
- protected String getBorderMarkup()
+ String getBorderMarkup()
{
return markup;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/queueing/Path.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/Path.java b/wicket-core/src/test/java/org/apache/wicket/queueing/Path.java
index 7e0aa9a..444c8f4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/queueing/Path.java
+++ b/wicket-core/src/test/java/org/apache/wicket/queueing/Path.java
@@ -27,7 +27,7 @@ class Path implements Iterable<Path.Segment>
private List<Segment> segments;
- public Path()
+ private Path()
{
segments = new ArrayList<>();
}
@@ -38,7 +38,7 @@ class Path implements Iterable<Path.Segment>
add(components);
}
- public Path add(Class<?> type, String id)
+ private Path add(Class<?> type, String id)
{
segments.add(new Segment(type, id));
return this;
@@ -81,7 +81,7 @@ class Path implements Iterable<Path.Segment>
Class<?> type;
String id;
- public Segment(Class<?> type, String id)
+ Segment(Class<?> type, String id)
{
this.type = type;
this.id = id;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/queueing/bodyisachild/FormGroup.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/bodyisachild/FormGroup.java b/wicket-core/src/test/java/org/apache/wicket/queueing/bodyisachild/FormGroup.java
index beaf770..f9cbe60 100644
--- a/wicket-core/src/test/java/org/apache/wicket/queueing/bodyisachild/FormGroup.java
+++ b/wicket-core/src/test/java/org/apache/wicket/queueing/bodyisachild/FormGroup.java
@@ -16,6 +16,10 @@
*/
package org.apache.wicket.queueing.bodyisachild;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.feedback.FeedbackMessage;
@@ -31,14 +35,10 @@ import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
/**
* Simplified copy from Wicket-Bootstrap
*/
-public class FormGroup extends Border
+class FormGroup extends Border
{
private Component label;
private Component help;
@@ -63,7 +63,7 @@ public class FormGroup extends Border
*
* @param id the wicket component id
*/
- public FormGroup(final String id, final IModel<String> label, final IModel<String> help)
+ private FormGroup(final String id, final IModel<String> label, final IModel<String> help)
{
super(id, Model.of(""));
@@ -79,7 +79,7 @@ public class FormGroup extends Border
* @param model the content model for this component
* @return new label
*/
- protected Component newLabel(final String id, final IModel<String> model)
+ private Component newLabel(final String id, final IModel<String> model)
{
return new Label(id, model);
}
@@ -90,7 +90,7 @@ public class FormGroup extends Border
* @param id the component id
* @return new feedback message container
*/
- protected Component newFeedbackMessageContainer(final String id)
+ private Component newFeedbackMessageContainer(final String id)
{
return new Label(id, new Model<String>());
}
@@ -103,7 +103,7 @@ public class FormGroup extends Border
* @param model the content model for this component
* @return new help label
*/
- protected Component newHelpLabel(final String id, final IModel<String> model)
+ private Component newHelpLabel(final String id, final IModel<String> model)
{
return new Label(id, model);
}
@@ -174,7 +174,7 @@ public class FormGroup extends Border
*
* @param formComponents the form components to add the output markup id
*/
- protected void addOutputMarkupId(List<FormComponent<?>> formComponents)
+ private void addOutputMarkupId(List<FormComponent<?>> formComponents)
{
for (final FormComponent<?> fc : formComponents)
{
@@ -216,7 +216,7 @@ public class FormGroup extends Border
/**
* @return all form components that are assigned to this {@link FormGroup}
*/
- List<FormComponent<?>> findFormComponents()
+ private List<FormComponent<?>> findFormComponents()
{
final List<FormComponent<?>> components = new ArrayList<>();
getBodyContainer().visitChildren(FormComponent.class, new IVisitor<FormComponent, Void>()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/queueing/bodyisachild/LoginPanel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/bodyisachild/LoginPanel.java b/wicket-core/src/test/java/org/apache/wicket/queueing/bodyisachild/LoginPanel.java
index a8a3792..336b0ec 100644
--- a/wicket-core/src/test/java/org/apache/wicket/queueing/bodyisachild/LoginPanel.java
+++ b/wicket-core/src/test/java/org/apache/wicket/queueing/bodyisachild/LoginPanel.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.queueing.bodyisachild;
+import java.io.Serializable;
+
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.markup.html.form.StatelessForm;
@@ -24,8 +26,6 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.Model;
-import java.io.Serializable;
-
public class LoginPanel extends Panel
{
public final Pojo pojo = new Pojo();
@@ -44,7 +44,7 @@ public class LoginPanel extends Panel
class LoginForm extends StatelessForm {
- public LoginForm(String id) {
+ LoginForm(String id) {
super(id);
setModel(new CompoundPropertyModel<>(pojo));
add(createValidatingFormField(new TextField("username").setRequired(true), "yourUsernameHeadline"));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/BasePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/BasePage.java b/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/BasePage.java
index cae1951..2fd010b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/BasePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/BasePage.java
@@ -22,7 +22,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
public class BasePage extends WebPage {
private static final long serialVersionUID = 1L;
- public BasePage(final PageParameters parameters) {
+ BasePage(final PageParameters parameters) {
super(parameters);
add(new HtmlTag("html"));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/DequeueingTransparentWebMarkupContainerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/DequeueingTransparentWebMarkupContainerTest.java b/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/DequeueingTransparentWebMarkupContainerTest.java
index 6ac7d4a..16e3a49 100644
--- a/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/DequeueingTransparentWebMarkupContainerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/DequeueingTransparentWebMarkupContainerTest.java
@@ -16,15 +16,17 @@
*/
package org.apache.wicket.queueing.transparentresolvers;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class DequeueingTransparentWebMarkupContainerTest extends WicketTestCase
+class DequeueingTransparentWebMarkupContainerTest extends WicketTestCase
{
/**
* Test case for:
@@ -33,7 +35,7 @@ public class DequeueingTransparentWebMarkupContainerTest extends WicketTestCase
* - https://issues.apache.org/jira/browse/WICKET-5728
*/
@Test
- public void startSubPageWithTWMCinTheParentPage()
+ void startSubPageWithTWMCinTheParentPage()
{
tester.startPage(SubPage.class);
tester.assertRenderedPage(SubPage.class);
@@ -52,7 +54,7 @@ public class DequeueingTransparentWebMarkupContainerTest extends WicketTestCase
* Queuing a component within an enclosure
*/
@Test
- public void queuedComponentsInsideTransparentContainer()
+ void queuedComponentsInsideTransparentContainer()
{
tester.startPage(TransparentContainerQueuePage.class);
tester.assertRenderedPage(TransparentContainerQueuePage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/HtmlTag.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/HtmlTag.java b/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/HtmlTag.java
index 2083604..5bec434 100644
--- a/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/HtmlTag.java
+++ b/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/HtmlTag.java
@@ -21,7 +21,7 @@ import org.apache.wicket.markup.html.TransparentWebMarkupContainer;
/**
*
*/
-public class HtmlTag extends TransparentWebMarkupContainer
+class HtmlTag extends TransparentWebMarkupContainer
{
/**
* Construct.
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/redirect/RestartWithMountedPageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/redirect/RestartWithMountedPageTest.java b/wicket-core/src/test/java/org/apache/wicket/redirect/RestartWithMountedPageTest.java
index ab9570f..7d0b398 100644
--- a/wicket-core/src/test/java/org/apache/wicket/redirect/RestartWithMountedPageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/redirect/RestartWithMountedPageTest.java
@@ -17,18 +17,18 @@
package org.apache.wicket.redirect;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*/
-public class RestartWithMountedPageTest extends WicketTestCase
+class RestartWithMountedPageTest extends WicketTestCase
{
/**
* Tests that a protected page can redirect to a login page from mounted pages.
*/
@Test
- public void testWithMountedLoginPage()
+ void testWithMountedLoginPage()
{
tester.getApplication().mountPage("/login", LoginPage.class);
tester.startPage(ProtectedPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java b/wicket-core/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java
index cf361c2..cb3bb2b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java
@@ -16,11 +16,13 @@
*/
package org.apache.wicket.redirect.abort;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.wicket.request.http.flow.AbortWithHttpErrorCodeException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Testcase for WICKET-1418, throwing an abortexception during rendering.
@@ -30,36 +32,36 @@ import org.junit.Test;
*
* @see <a href="https://issues.apache.org/jira/browse/WICKET-1418">WICKET-1418</a>
*/
-public class AbortExceptionTest extends WicketTestCase
+class AbortExceptionTest extends WicketTestCase
{
/**
* Test page without throwing abort.
*/
@Test
- public void testNoAbort()
+ void testNoAbort()
{
tester.startPage(AbortExceptionPage.class, new PageParameters().set("trigger", false));
- Assert.assertEquals(1234, tester.getLastResponse().getStatus());
+ assertEquals(1234, tester.getLastResponse().getStatus());
}
/**
* Test page with throwing abort.
*/
@Test
- public void testAbort()
+ void testAbort()
{
try
{
tester.startPage(AbortExceptionPage.class, new PageParameters().set("trigger", true));
- Assert.assertEquals(1234, tester.getLastResponse().getStatus()); // this will
+ assertEquals(1234, tester.getLastResponse().getStatus()); // this will
// fail
}
catch (RuntimeException x)
{
final Throwable reason = x.getCause();
- Assert.assertEquals(reason.getClass(), AbortWithHttpErrorCodeException.class);
- Assert.fail("this must not happen (we expect a redirect happen here and handled by wicket request processor)");
+ assertEquals(reason.getClass(), AbortWithHttpErrorCodeException.class);
+ fail("this must not happen (we expect a redirect happen here and handled by wicket request processor)");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java b/wicket-core/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java
index 469fc87..d3e5829 100644
--- a/wicket-core/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java
@@ -23,7 +23,7 @@ import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.component.IRequestableComponent;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Testcase for bug WICKET-1292.
@@ -31,7 +31,7 @@ import org.junit.Test;
* @see <a href="https://issues.apache.org/jira/browse/WICKET-1292">WICKET-1292</a>
* @author marrink
*/
-public class InterceptTest extends WicketTestCase
+class InterceptTest extends WicketTestCase
{
@Override
@@ -76,7 +76,7 @@ public class InterceptTest extends WicketTestCase
* Tests a non homepage class.
*/
@Test
- public void testRestartResponseAtInterceptPageAndContinueTorOriginalDestination()
+ void testRestartResponseAtInterceptPageAndContinueTorOriginalDestination()
{
tester.startPage(TargetPage.class);
tester.assertRenderedPage(InterceptPage.class);
@@ -89,7 +89,7 @@ public class InterceptTest extends WicketTestCase
* Tests homepage class.
*/
@Test
- public void testRestartResponseAtInterceptPageAndContinueTorOriginalDestination2()
+ void testRestartResponseAtInterceptPageAndContinueTorOriginalDestination2()
{
tester.startPage(HomePage.class);
tester.assertRenderedPage(InterceptPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/cycle/MultiRequestCycleListenerCallOrderApplication.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/cycle/MultiRequestCycleListenerCallOrderApplication.java b/wicket-core/src/test/java/org/apache/wicket/request/cycle/MultiRequestCycleListenerCallOrderApplication.java
index e75d140..aa057e7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/cycle/MultiRequestCycleListenerCallOrderApplication.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/cycle/MultiRequestCycleListenerCallOrderApplication.java
@@ -48,7 +48,7 @@ class MultiRequestCycleListenerCallOrderApplication extends WebApplication
{
private String name;
- public CallRecordingListener(String name)
+ CallRecordingListener(String name)
{
this.name = name;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/cycle/MultiRequestCycleListenerCallOrderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/cycle/MultiRequestCycleListenerCallOrderTest.java b/wicket-core/src/test/java/org/apache/wicket/request/cycle/MultiRequestCycleListenerCallOrderTest.java
index ca203df..f0b5723 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/cycle/MultiRequestCycleListenerCallOrderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/cycle/MultiRequestCycleListenerCallOrderTest.java
@@ -17,28 +17,29 @@
package org.apache.wicket.request.cycle;
import static java.util.Arrays.asList;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.protocol.http.WebApplication;
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;
/**
* Checks whether multiple registered requestcycle listeners are called in the right order:
* similarly to servlet filters.
*/
-public class MultiRequestCycleListenerCallOrderTest extends WicketTestCase
+class MultiRequestCycleListenerCallOrderTest extends WicketTestCase
{
private MultiRequestCycleListenerCallOrderApplication application;
/**
*
*/
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
application = (MultiRequestCycleListenerCallOrderApplication)tester.getApplication();
application.callSequence.clear();
@@ -53,7 +54,7 @@ public class MultiRequestCycleListenerCallOrderTest extends WicketTestCase
/**
*/
@Test
- public void bookmarkableCallSequenceIsFirstInLastOut()
+ void bookmarkableCallSequenceIsFirstInLastOut()
{
// start and render the test page
tester.startPage(MultiRequestCycleListenerCallOrderPage.class);
@@ -79,7 +80,7 @@ public class MultiRequestCycleListenerCallOrderTest extends WicketTestCase
/**
*/
@Test
- public void sessionRelativePageRequestCallSequenceIsFirstInLastOut()
+ void sessionRelativePageRequestCallSequenceIsFirstInLastOut()
{
// start and render the test page
tester.startPage(new MultiRequestCycleListenerCallOrderPage());
@@ -104,7 +105,7 @@ public class MultiRequestCycleListenerCallOrderTest extends WicketTestCase
/**
*/
@Test
- public void linkListenerCallSequenceIsFirstInLastOut()
+ void linkListenerCallSequenceIsFirstInLastOut()
{
// start and render the test page
tester.startPage(new MultiRequestCycleListenerCallOrderPage());
@@ -137,7 +138,7 @@ public class MultiRequestCycleListenerCallOrderTest extends WicketTestCase
/**
*/
@Test
- public void ajaxlinkListenerCallSequenceIsFirstInLastOut()
+ void ajaxlinkListenerCallSequenceIsFirstInLastOut()
{
// start and render the test page
tester.startPage(new MultiRequestCycleListenerCallOrderPage());
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/cycle/PageRequestHandlerTrackerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/cycle/PageRequestHandlerTrackerTest.java b/wicket-core/src/test/java/org/apache/wicket/request/cycle/PageRequestHandlerTrackerTest.java
index c0a7d0a..ce684c5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/cycle/PageRequestHandlerTrackerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/cycle/PageRequestHandlerTrackerTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.request.cycle;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.core.request.handler.IPageRequestHandler;
import org.apache.wicket.core.request.handler.RequestSettingRequestHandler;
@@ -30,17 +33,17 @@ import org.apache.wicket.request.mapper.IRequestMapperDelegate;
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;
/**
* @since 1.5.8
*/
-public class PageRequestHandlerTrackerTest extends WicketTestCase
+class PageRequestHandlerTrackerTest extends WicketTestCase
{
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
tester.getApplication().getRequestCycleListeners().add(new PageRequestHandlerTracker());
}
@@ -50,7 +53,7 @@ public class PageRequestHandlerTrackerTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-4624
*/
@Test
- public void trackPages()
+ void trackPages()
{
tester.getApplication().getRequestCycleListeners().add(new IRequestCycleListener()
{
@@ -78,7 +81,7 @@ public class PageRequestHandlerTrackerTest extends WicketTestCase
* Uses PageRequestHandlerTracker to check last IRequestHandler encapsulated in IRequestHandlerDelegate
*/
@Test
- public void trackPagesWithMapperDelegate()
+ void trackPagesWithMapperDelegate()
{
IRequestMapper mapper = tester.getApplication().getRootRequestMapper();
tester.getApplication().setRootRequestMapper(new MapperDelegate(mapper));
@@ -92,7 +95,7 @@ public class PageRequestHandlerTrackerTest extends WicketTestCase
*/
private static class PageA extends WebPage implements IMarkupResourceStreamProvider
{
- public PageA()
+ PageA()
{
// make stateful so it is rendered in first requestCycle (without redirect)
setStatelessHint(false);
@@ -105,7 +108,7 @@ public class PageRequestHandlerTrackerTest extends WicketTestCase
IPageRequestHandler lastHandler = PageRequestHandlerTracker.getLastHandler(getRequestCycle());
- assertNotNull("Last handler is null: probably issue in IRequestHandlerDelegate support", lastHandler);
+ assertNotNull(lastHandler, "Last handler is null: probably issue in IRequestHandlerDelegate support");
setResponsePage(new PageB());
}
@@ -136,7 +139,7 @@ public class PageRequestHandlerTrackerTest extends WicketTestCase
{
IRequestMapper mapper;
- public MapperDelegate(IRequestMapper mapper)
+ MapperDelegate(IRequestMapper mapper)
{
this.mapper = mapper;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerDetachOrderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerDetachOrderTest.java b/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerDetachOrderTest.java
index ae527b4..70e82f7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerDetachOrderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerDetachOrderTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.request.cycle;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.ArrayList;
import java.util.List;
@@ -27,7 +27,7 @@ import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
@@ -41,7 +41,7 @@ import org.junit.Test;
public class RequestCycleListenerDetachOrderTest
{
@Test
- public void pageDetachedBeforeListener()
+ void pageDetachedBeforeListener()
{
List<Event> events = new ArrayList<Event>();
@@ -57,7 +57,7 @@ public class RequestCycleListenerDetachOrderTest
{
private final List<Event> events;
- public TestListener(List<Event> events)
+ TestListener(List<Event> events)
{
this.events = events;
}
@@ -73,7 +73,7 @@ public class RequestCycleListenerDetachOrderTest
{
private final List<Event> events;
- public TestPage(List<Event> events)
+ TestPage(List<Event> events)
{
this.events = events;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerTest.java b/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerTest.java
index 12588a5..f37bbb6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.request.cycle;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.apache.wicket.Application;
import org.apache.wicket.ThreadContext;
@@ -32,14 +32,14 @@ import org.apache.wicket.request.RequestHandlerExecutor.ReplaceHandlerException;
import org.apache.wicket.request.Response;
import org.apache.wicket.request.Url;
import org.apache.wicket.resource.DummyApplication;
-import org.junit.After;
-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;
/**
* @author Jeremy Thomerson
*/
-public class RequestCycleListenerTest extends RequestHandlerExecutorTest
+class RequestCycleListenerTest extends RequestHandlerExecutorTest
{
private IRequestHandler handler;
@@ -52,8 +52,8 @@ public class RequestCycleListenerTest extends RequestHandlerExecutorTest
private int exceptionsMapped;
/** */
- @Before
- public void setUp()
+ @BeforeEach
+ void setUp()
{
DummyApplication application = new DummyApplication();
application.setName("dummyTestApplication");
@@ -64,8 +64,8 @@ public class RequestCycleListenerTest extends RequestHandlerExecutorTest
}
/** */
- @After
- public void tearDown()
+ @AfterEach
+ void tearDown()
{
ThreadContext.getApplication().internalDestroy();
ThreadContext.detach();
@@ -140,7 +140,7 @@ public class RequestCycleListenerTest extends RequestHandlerExecutorTest
* @throws Exception
*/
@Test
- public void basicOperations() throws Exception
+ void basicOperations() throws Exception
{
IncrementingListener incrementingListener = new IncrementingListener();
Application.get().getRequestCycleListeners().add(incrementingListener);
@@ -237,7 +237,7 @@ public class RequestCycleListenerTest extends RequestHandlerExecutorTest
/** */
@Test
- public void exceptionIsHandledByRegisteredHandler()
+ void exceptionIsHandledByRegisteredHandler()
{
IncrementingListener incrementingListener = new IncrementingListener();
Application.get().getRequestCycleListeners().add(incrementingListener);
@@ -255,7 +255,7 @@ public class RequestCycleListenerTest extends RequestHandlerExecutorTest
/** */
@Test
- public void exceptionIsHandledByFirstAvailableHandler()
+ void exceptionIsHandledByFirstAvailableHandler()
{
// when two listeners return a handler
Application.get().getRequestCycleListeners().add(new ErrorCodeListener(401));
@@ -272,7 +272,7 @@ public class RequestCycleListenerTest extends RequestHandlerExecutorTest
* @throws Exception
*/
@Test
- public void exceptionHandlingInOnDetach() throws Exception
+ void exceptionHandlingInOnDetach() throws Exception
{
// this test is a little flaky because it depends on the ordering of listeners which is not
// guaranteed
@@ -310,7 +310,7 @@ public class RequestCycleListenerTest extends RequestHandlerExecutorTest
{
private final int code;
- public ErrorCodeListener(int code)
+ ErrorCodeListener(int code)
{
this.code = code;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleUrlForTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleUrlForTest.java b/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleUrlForTest.java
index 6c99eef..2602643 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleUrlForTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleUrlForTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.request.cycle;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -35,9 +36,8 @@ import org.apache.wicket.request.resource.IResource;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.request.resource.caching.IStaticCacheableResource;
import org.apache.wicket.response.StringResponse;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentMatcher;
/**
@@ -45,17 +45,17 @@ import org.mockito.ArgumentMatcher;
*
* https://issues.apache.org/jira/browse/WICKET-4334
*/
-public class RequestCycleUrlForTest extends Assert
+class RequestCycleUrlForTest
{
private static final String JSESSIONID = ";jsessionid=1234567890";
private static final String BOOKMARKABLE_PAGE_URL = "bookmarkablePage";
private static final String RES_REF_URL = "resRef";
private static final String RESOURCE_URL = "res";
- RequestCycle requestCycle;
+ private RequestCycle requestCycle;
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
Request request = mock(Request.class);
Url baseUrl = Url.parse("");
@@ -92,7 +92,7 @@ public class RequestCycleUrlForTest extends Assert
* @throws Exception
*/
@Test
- public void urlForClass() throws Exception
+ void urlForClass() throws Exception
{
CharSequence url = requestCycle.urlFor(MockHomePage.class, new PageParameters());
assertEquals("./bookmarkablePage"+JSESSIONID, url);
@@ -104,7 +104,7 @@ public class RequestCycleUrlForTest extends Assert
* @throws Exception
*/
@Test
- public void urlForResourceReference() throws Exception
+ void urlForResourceReference() throws Exception
{
final IStaticCacheableResource resource = mock(IStaticCacheableResource.class);
ResourceReference reference = new ResourceReference("dummy")
@@ -126,7 +126,7 @@ public class RequestCycleUrlForTest extends Assert
* @throws Exception
*/
@Test
- public void urlForResourceReferenceWithNonStaticResource() throws Exception
+ void urlForResourceReferenceWithNonStaticResource() throws Exception
{
final IResource resource = mock(IResource.class);
ResourceReference reference = new ResourceReference("dummy")
@@ -148,7 +148,7 @@ public class RequestCycleUrlForTest extends Assert
* @throws Exception
*/
@Test
- public void urlForStaticResource() throws Exception
+ void urlForStaticResource() throws Exception
{
IStaticCacheableResource resource = mock(IStaticCacheableResource.class);
ResourceRequestHandler handler = new ResourceRequestHandler(resource, new PageParameters());
@@ -162,7 +162,7 @@ public class RequestCycleUrlForTest extends Assert
* @throws Exception
*/
@Test
- public void urlForDynamicResource() throws Exception
+ void urlForDynamicResource() throws Exception
{
ByteArrayResource resource = new ByteArrayResource(null, new byte[] {1, 2}, "test.bin");
ResourceRequestHandler handler = new ResourceRequestHandler(resource, new PageParameters());
@@ -180,7 +180,7 @@ public class RequestCycleUrlForTest extends Assert
{
private final Class<T> targetClass;
- public ExactClassMatcher(Class<T> targetClass)
+ ExactClassMatcher(Class<T> targetClass)
{
this.targetClass = targetClass;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestHandlerExecutorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestHandlerExecutorTest.java b/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestHandlerExecutorTest.java
index 5d9bab3..eb42129 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestHandlerExecutorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestHandlerExecutorTest.java
@@ -26,9 +26,9 @@ import org.apache.wicket.request.UrlRenderer;
/**
* @author Jeremy Thomerson
*/
-public abstract class RequestHandlerExecutorTest
+abstract class RequestHandlerExecutorTest
{
- protected Response newResponse()
+ Response newResponse()
{
return new Response()
{
@@ -70,7 +70,7 @@ public abstract class RequestHandlerExecutorTest
{
Response response;
- public MockRequestCycle(Response response)
+ MockRequestCycle(Response response)
{
this.response = response;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/cycle/RerenderPageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/cycle/RerenderPageTest.java b/wicket-core/src/test/java/org/apache/wicket/request/cycle/RerenderPageTest.java
index 21af8c4..98d7a4c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/cycle/RerenderPageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/cycle/RerenderPageTest.java
@@ -17,18 +17,19 @@
package org.apache.wicket.request.cycle;
import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.wicket.core.request.mapper.MountedMapper;
import org.apache.wicket.protocol.http.mock.MockHttpServletResponse;
import org.apache.wicket.request.cycle.RerenderPage.Supplier;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test cases for re-rendering pages.
*/
-public class RerenderPageTest extends WicketTestCase
+class RerenderPageTest extends WicketTestCase
{
/**
* A testcase for WICKET-5960.
@@ -38,7 +39,7 @@ public class RerenderPageTest extends WicketTestCase
* because it was already rendered in the first try.
*/
@Test
- public void wicket5960()
+ void wicket5960()
{
// mount the page so we have URL segments
tester.getApplication().mount(new MountedMapper("/rerender/${value}", RerenderPage.class));
@@ -80,7 +81,7 @@ public class RerenderPageTest extends WicketTestCase
* <head>} section to be rendered. This test case walks Wicket through this scenario.
*/
@Test
- public void nonAjaxRequestAfterAjaxUpdatedComponentShouldHaveHtmlHeadSection()
+ void nonAjaxRequestAfterAjaxUpdatedComponentShouldHaveHtmlHeadSection()
{
// perform a normal render of the page
tester.startPage(RerenderAjaxPage.class);
[13/45] wicket git commit: wicket-core: Migrate to Junit 5
Posted by mg...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java b/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
index a64ae61..d1c6809 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
@@ -17,27 +17,28 @@
package org.apache.wicket.request.cycle;
import static java.util.Arrays.asList;
-import static org.hamcrest.CoreMatchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.Arrays;
import org.apache.wicket.mock.MockWebRequest;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.UrlRenderer;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Matej Knopp
*/
-public class UrlRendererTest extends Assert
+class UrlRendererTest
{
/**
*
*/
@Test
- public void test1()
+ void test1()
{
UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("foo/bar/baz?a=b")));
assertEquals("./xyz?x=y", r1.renderUrl(Url.parse("foo/bar/xyz?x=y")));
@@ -50,7 +51,7 @@ public class UrlRendererTest extends Assert
*
*/
@Test
- public void test2()
+ void test2()
{
UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("foo/bar/baz?a=b")));
assertEquals("../../foo?x=y", r1.renderUrl(Url.parse("foo?x=y")));
@@ -61,7 +62,7 @@ public class UrlRendererTest extends Assert
*
*/
@Test
- public void test3()
+ void test3()
{
UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("?a=b")));
assertEquals("./a/b/c?x=y", r1.renderUrl(Url.parse("a/b/c?x=y")));
@@ -71,7 +72,7 @@ public class UrlRendererTest extends Assert
*
*/
@Test
- public void test5()
+ void test5()
{
UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("url")));
assertEquals("./url?1", r1.renderUrl(Url.parse("url?1")));
@@ -81,7 +82,7 @@ public class UrlRendererTest extends Assert
*
*/
@Test
- public void test6()
+ void test6()
{
UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("url/")));
assertEquals("./x?1", r1.renderUrl(Url.parse("url/x?1")));
@@ -91,7 +92,7 @@ public class UrlRendererTest extends Assert
*
*/
@Test
- public void test7()
+ void test7()
{
UrlRenderer r1 = new UrlRenderer(new MockWebRequest(
Url.parse("MyTestPage/indexed1/indexed2/indexed3?10-27.ILinkListener-l2&p1=v1")));
@@ -102,7 +103,7 @@ public class UrlRendererTest extends Assert
*
*/
@Test
- public void test8()
+ void test8()
{
UrlRenderer r1 = new UrlRenderer(new MockWebRequest(
Url.parse("en/first-test-page?16-1.ILinkListener-l1")));
@@ -114,7 +115,7 @@ public class UrlRendererTest extends Assert
*
*/
@Test
- public void test9()
+ void test9()
{
UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("a/b/q/d/e")));
assertEquals("../../../q/c/d/e", r1.renderUrl(Url.parse("a/q/c/d/e")));
@@ -124,7 +125,7 @@ public class UrlRendererTest extends Assert
*
*/
@Test
- public void test10()
+ void test10()
{
MockWebRequest request = new MockWebRequest(Url.parse("a/b/q/d/e"), "/contextPath",
"/filterPath", "../");
@@ -150,7 +151,7 @@ public class UrlRendererTest extends Assert
* <a href="https://issues.apache.org/jira/browse/WICKET-3337">WICKET-3337</a>
*/
@Test
- public void test11()
+ void test11()
{
UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("a")));
assertEquals(".", r1.renderUrl(Url.parse("")));
@@ -160,7 +161,7 @@ public class UrlRendererTest extends Assert
* <a href="https://issues.apache.org/jira/browse/WICKET-3567">WICKET-3567</a>
*/
@Test
- public void test12()
+ void test12()
{
UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("?0")));
assertEquals("./", r1.renderUrl(Url.parse("")));
@@ -173,7 +174,7 @@ public class UrlRendererTest extends Assert
* '../' works better.
*/
@Test
- public void test13()
+ void test13()
{
UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("foo/bar")));
assertEquals("../", r1.renderUrl(Url.parse("")));
@@ -183,7 +184,7 @@ public class UrlRendererTest extends Assert
* WICKET-4920 prevent double slash
*/
@Test
- public void test14()
+ void test14()
{
UrlRenderer r1 = new UrlRenderer(new MockWebRequest(new Url()));
@@ -193,7 +194,7 @@ public class UrlRendererTest extends Assert
}
@Test
- public void rendersRelativeUrl()
+ void rendersRelativeUrl()
{
Url contextRelativeUrl = new Url();
contextRelativeUrl.setProtocol("http");
@@ -203,14 +204,14 @@ public class UrlRendererTest extends Assert
contextRelativeUrl.getSegments().addAll(asList("", ""));
UrlRenderer r1 = new UrlRenderer(new MockWebRequest(contextRelativeUrl));
- assertThat(r1.renderRelativeUrl(Url.parse("foo")), is("../foo"));
+ assertEquals("../foo", r1.renderRelativeUrl(Url.parse("foo")));
}
/**
* WICKET-4935 prevent another double slash
*/
@Test
- public void test15()
+ void test15()
{
UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("private/AdminPage")));
@@ -222,7 +223,7 @@ public class UrlRendererTest extends Assert
* prevent another double slash when common prefix is present
*/
@Test
- public void test16()
+ void test16()
{
UrlRenderer r1 = new UrlRenderer(
new MockWebRequest(Url.parse("private/AdminPage")).setContextPath("context"));
@@ -235,7 +236,7 @@ public class UrlRendererTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-5468
*/
@Test
- public void renderUrlWithTrailingDotsInQueryString()
+ void renderUrlWithTrailingDotsInQueryString()
{
UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("some/path")));
@@ -249,7 +250,7 @@ public class UrlRendererTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-4466
*/
@Test
- public void renderAbsoluteUrl()
+ void renderAbsoluteUrl()
{
String absoluteUrl = "http://www.example.com/some/path.ext";
Url url = Url.parse(absoluteUrl);
@@ -259,7 +260,7 @@ public class UrlRendererTest extends Assert
}
@Test
- public void renderFullUrlWithRelativeArgument()
+ void renderFullUrlWithRelativeArgument()
{
Url baseUrl = Url.parse("one/two/three");
baseUrl.setProtocol("http");
@@ -275,7 +276,7 @@ public class UrlRendererTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-4514
*/
@Test
- public void renderFullUrlWithAbsoluteArgument()
+ void renderFullUrlWithAbsoluteArgument()
{
Url baseUrl = Url.parse("one/two/three");
baseUrl.setProtocol("http");
@@ -293,7 +294,7 @@ public class UrlRendererTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-4562
*/
@Test
- public void renderUrlWithRelativeArgument()
+ void renderUrlWithRelativeArgument()
{
Url baseUrl = Url.parse("one/two/three");
UrlRenderer renderer = new UrlRenderer(new MockWebRequest(baseUrl));
@@ -334,7 +335,7 @@ public class UrlRendererTest extends Assert
}
@Test
- public void renderFullUrlAsRelativeToAnAbsoluteBaseUrl()
+ void renderFullUrlAsRelativeToAnAbsoluteBaseUrl()
{
Url baseUrl = Url.parse("http://host:8080/contextPath/filterPath/a/b/c/d");
Url encodedFullUrl = Url.parse("http://host:8080/contextPath/filterPath/a/b;jsessionid=123456");
@@ -346,7 +347,7 @@ public class UrlRendererTest extends Assert
}
@Test
- public void renderFullUrlAsRelativeToBaseUrlWithoutSchemeHostnameAndPort()
+ void renderFullUrlAsRelativeToBaseUrlWithoutSchemeHostnameAndPort()
{
Url baseUrl = Url.parse("/contextPath/filterPath/a/b/c/d");
Url encodedFullUrl = Url.parse("http://host:8080/contextPath/filterPath/a/b;jsessionid=123456");
@@ -358,7 +359,7 @@ public class UrlRendererTest extends Assert
}
@Test
- public void renderFullUrlAsRelativeToBaseUrlWithoutContextAndFilterPaths()
+ void renderFullUrlAsRelativeToBaseUrlWithoutContextAndFilterPaths()
{
Url baseUrl = Url.parse("a/b/c/d"); // base url without context path and filter path
Url encodedFullUrl = Url.parse("http://host:8080/contextPath/filterPath/a/b;jsessionid=123456");
@@ -373,7 +374,7 @@ public class UrlRendererTest extends Assert
}
@Test
- public void renderFullUrlAsRelativeToBaseUrlWithoutComposedContextAndFilterPaths()
+ void renderFullUrlAsRelativeToBaseUrlWithoutComposedContextAndFilterPaths()
{
Url baseUrl = Url.parse("a/b/c/d"); // base url without context path and filter path
Url encodedFullUrl = Url.parse("http://host:8080/context/path/filter/path/a/b;jsessionid=123456");
@@ -388,7 +389,7 @@ public class UrlRendererTest extends Assert
}
@Test
- public void renderFullUrlAsRelativeToBaseUrlWithoutContextPath()
+ void renderFullUrlAsRelativeToBaseUrlWithoutContextPath()
{
Url baseUrl = Url.parse("a/b/c/d"); // base url without context path and filter path
Url encodedFullUrl = Url.parse("http://host:8080/filterPath/a/b;jsessionid=123456");
@@ -402,7 +403,7 @@ public class UrlRendererTest extends Assert
}
@Test
- public void renderFullUrlAsRelativeToBaseUrlWithoutComposedContextPath()
+ void renderFullUrlAsRelativeToBaseUrlWithoutComposedContextPath()
{
Url baseUrl = Url.parse("a/b/c/d"); // base url without context path and filter path
Url encodedFullUrl = Url.parse("http://host:8080/filter/path/a/b;jsessionid=123456");
@@ -416,7 +417,7 @@ public class UrlRendererTest extends Assert
}
@Test
- public void renderFullUrlAsRelativeToBaseUrlWithoutFilterPath()
+ void renderFullUrlAsRelativeToBaseUrlWithoutFilterPath()
{
Url baseUrl = Url.parse("a/b/c/d"); // base url without context path and filter path
Url encodedFullUrl = Url.parse("http://host:8080/contextPath/a/b;jsessionid=123456");
@@ -430,7 +431,7 @@ public class UrlRendererTest extends Assert
}
@Test
- public void renderFullUrlAsRelativeToBaseUrlWithoutComposedFilterPath()
+ void renderFullUrlAsRelativeToBaseUrlWithoutComposedFilterPath()
{
Url baseUrl = Url.parse("a/b/c/d"); // base url without context path and filter path
Url encodedFullUrl = Url.parse("http://host:8080/context/path/a/b;jsessionid=123456");
@@ -444,7 +445,7 @@ public class UrlRendererTest extends Assert
}
@Test
- public void renderFullUrlAsRelativeToBaseUrlWithFirstSegmentsEqualToTheContextPath()
+ void renderFullUrlAsRelativeToBaseUrlWithFirstSegmentsEqualToTheContextPath()
{
// base url without context path and filter path
// 'contextPath' here is a normal segment with the same value
@@ -462,7 +463,7 @@ public class UrlRendererTest extends Assert
}
@Test
- public void renderFullUrlAsRelativeToBaseUrlWithFirstSegmentsEqualToTheContextAndFilterPaths()
+ void renderFullUrlAsRelativeToBaseUrlWithFirstSegmentsEqualToTheContextAndFilterPaths()
{
// base url without context path and filter path
// 'filterPath' here is a normal segment with the same value
@@ -481,7 +482,7 @@ public class UrlRendererTest extends Assert
}
@Test
- public void renderFullUrlAsRelativeToBaseUrlWithFirstSegmentsEqualToTheFilterPath()
+ void renderFullUrlAsRelativeToBaseUrlWithFirstSegmentsEqualToTheFilterPath()
{
// base url without context path and filter path
// 'filterPath' here is a normal segment with the same value
@@ -502,7 +503,7 @@ public class UrlRendererTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-5123
*/
@Test
- public void renderHomeUrl()
+ void renderHomeUrl()
{
Url baseUrl = Url.parse("login");
@@ -519,7 +520,7 @@ public class UrlRendererTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-5065
*/
@Test
- public void renderAbsoluteWithoutHost()
+ void renderAbsoluteWithoutHost()
{
Url baseUrl = Url.parse("a/b");
@@ -536,7 +537,7 @@ public class UrlRendererTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-5065
*/
@Test
- public void renderAbsoluteWithoutScheme()
+ void renderAbsoluteWithoutScheme()
{
Url baseUrl = Url.parse("a/b");
@@ -553,7 +554,7 @@ public class UrlRendererTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-5065
*/
@Test
- public void renderAbsoluteWithoutSchemeWithPort()
+ void renderAbsoluteWithoutSchemeWithPort()
{
Url baseUrl = Url.parse("a/b");
@@ -570,7 +571,7 @@ public class UrlRendererTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-5073
*/
@Test
- public void removeCommonPrefixesWicket5073()
+ void removeCommonPrefixesWicket5073()
{
Url baseUrl = new Url(Arrays.asList(""), Arrays.<Url.QueryParameter> asList());
@@ -588,7 +589,7 @@ public class UrlRendererTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-5202
*/
@Test
- public void removeCommonPrefixesWithJSessionId()
+ void removeCommonPrefixesWithJSessionId()
{
Url baseUrl = new Url(Arrays.asList("", "SomePage;jsessionid=1234"),
Arrays.<Url.QueryParameter> asList());
@@ -607,7 +608,7 @@ public class UrlRendererTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-5774
*/
@Test
- public void renderFullUrlWithNoOpLeadingSegments()
+ void renderFullUrlWithNoOpLeadingSegments()
{
UrlRenderer renderer = new UrlRenderer(new MockWebRequest(Url.parse("any/thing")));
@@ -625,7 +626,7 @@ public class UrlRendererTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-5774
*/
@Test
- public void renderContextAbsoluteUrlWithNoOpLeadingSegments()
+ void renderContextAbsoluteUrlWithNoOpLeadingSegments()
{
UrlRenderer renderer = new UrlRenderer(new MockWebRequest(Url.parse("any/thing")));
@@ -643,7 +644,7 @@ public class UrlRendererTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-5970
*/
@Test
- public void renderFullUrlWithFragment()
+ void renderFullUrlWithFragment()
{
UrlRenderer renderer = new UrlRenderer(new MockWebRequest(Url.parse("authorize")));
@@ -658,7 +659,7 @@ public class UrlRendererTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-5970
*/
@Test
- public void renderRelativeUrlWithFragment()
+ void renderRelativeUrlWithFragment()
{
UrlRenderer renderer = new UrlRenderer(new MockWebRequest(Url.parse("authorize")));
@@ -673,7 +674,7 @@ public class UrlRendererTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-5970
*/
@Test
- public void renderUrlWithFragment()
+ void renderUrlWithFragment()
{
UrlRenderer renderer = new UrlRenderer(new MockWebRequest(Url.parse("authorize")));
@@ -688,7 +689,7 @@ public class UrlRendererTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-6230
*/
@Test
- public void renderUrlWithManyDotsAtTheBeginning1()
+ void renderUrlWithManyDotsAtTheBeginning1()
{
UrlRenderer renderer = new UrlRenderer(new MockWebRequest(Url.parse("a")));
@@ -701,7 +702,7 @@ public class UrlRendererTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-6230
*/
@Test
- public void renderUrlWithManyDotsAtTheBeginning2()
+ void renderUrlWithManyDotsAtTheBeginning2()
{
UrlRenderer renderer = new UrlRenderer(new MockWebRequest(Url.parse("a/b")));
@@ -713,7 +714,7 @@ public class UrlRendererTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-6230
*/
@Test
- public void renderUrlWithManyDotsAtTheEnd1()
+ void renderUrlWithManyDotsAtTheEnd1()
{
UrlRenderer renderer = new UrlRenderer(new MockWebRequest(Url.parse("a")));
@@ -725,7 +726,7 @@ public class UrlRendererTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-6230
*/
@Test
- public void renderUrlWithManyDotsAtTheEnd2()
+ void renderUrlWithManyDotsAtTheEnd2()
{
UrlRenderer renderer = new UrlRenderer(new MockWebRequest(Url.parse("a/b")));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/handler/PageIdPoliticTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/PageIdPoliticTest.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/PageIdPoliticTest.java
index 978e87b..71b0dc5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/handler/PageIdPoliticTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/PageIdPoliticTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.request.handler;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.nio.charset.Charset;
import org.apache.wicket.IPageManagerProvider;
@@ -37,15 +40,14 @@ import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTester;
import org.apache.wicket.versioning.InMemoryPageStore;
-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;
/**
* @author Pedro Santos
*/
-public class PageIdPoliticTest extends Assert
+class PageIdPoliticTest
{
private WicketTester tester;
private InMemoryPageStore dataStore;
@@ -59,7 +61,7 @@ public class PageIdPoliticTest extends Assert
* @see <a href="https://issues.apache.org/jira/browse/WICKET-3667">WICKET-3667</a>
*/
@Test
- public void testPageGetsTouchedInAjaxRequest()
+ void testPageGetsTouchedInAjaxRequest()
{
TestPage testPage = new TestPage();
tester.startPage(TestPage.class);
@@ -73,7 +75,7 @@ public class PageIdPoliticTest extends Assert
*
*/
@Test
- public void testPageIdDontGetIncreasedInAjaxRequest()
+ void testPageIdDontGetIncreasedInAjaxRequest()
{
TestPage testPage = new TestPage();
tester.startPage(testPage);
@@ -83,8 +85,8 @@ public class PageIdPoliticTest extends Assert
assertTrue(testPage.ajaxCallbackExecuted);
}
- @Before
- public void setUp() throws Exception
+ @BeforeEach
+ void setUp() throws Exception
{
application = new MockApplication();
dataStore = new InMemoryPageStore()
@@ -116,8 +118,8 @@ public class PageIdPoliticTest extends Assert
};
}
- @After
- public void tearDown() throws Exception
+ @AfterEach
+ void tearDown() throws Exception
{
tester.destroy();
}
@@ -133,7 +135,7 @@ public class PageIdPoliticTest extends Assert
/**
* Construct.
*/
- public TestPage()
+ public TestPage()
{
WebComponent component;
component = new WebComponent("component");
@@ -155,7 +157,7 @@ public class PageIdPoliticTest extends Assert
* @param encoding
* @return ajaxUrl
*/
- public Url getAjaxUrl(String encoding)
+ Url getAjaxUrl(String encoding)
{
return Url.parse(eventBehavior.getCallbackUrl().toString(), Charset.forName(encoding));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/handler/PageProviderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/PageProviderTest.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/PageProviderTest.java
index 3f87b08..b7ad145 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/handler/PageProviderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/PageProviderTest.java
@@ -16,7 +16,10 @@
*/
package org.apache.wicket.request.handler;
-import static org.hamcrest.CoreMatchers.is;
+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 static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
import java.text.ParseException;
@@ -40,19 +43,19 @@ import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author pedro
*/
-public class PageProviderTest extends WicketTestCase
+class PageProviderTest extends WicketTestCase
{
/**
* <a href="https://issues.apache.org/jira/browse/WICKET-4046">WICKET-4046</a>
*/
@Test
- public void pageProviderDontDeserializeOnePageTwice()
+ void pageProviderDontDeserializeOnePageTwice()
{
int oldState = 0;
int newState = 1;
@@ -72,7 +75,7 @@ public class PageProviderTest extends WicketTestCase
// simulation an test call to isNewPageInstance
boolean isNewPageInstance = pageProvider.isNewPageInstance();
- assertFalse("test page is already stored", isNewPageInstance);
+ assertFalse(isNewPageInstance, "test page is already stored");
// changing some sate
StatefullMockPage providedPage = (StatefullMockPage)pageProvider.getPageInstance();
@@ -98,7 +101,7 @@ public class PageProviderTest extends WicketTestCase
* @see <a href="https://issues.apache.org/jira/browse/WICKET-3252">WICKET-3252</a>
* */
@Test
- public void testStalePageException()
+ void testStalePageException()
{
tester.startPage(TestPage.class);
TestPage testPage = (TestPage)tester.getLastRenderedPage();
@@ -133,7 +136,7 @@ public class PageProviderTest extends WicketTestCase
*
*/
@Test
- public void testStalePageExceptionOnAjaxRequest() throws IOException,
+ void testStalePageExceptionOnAjaxRequest() throws IOException,
ResourceStreamNotFoundException, ParseException
{
tester.startPage(TestPage.class);
@@ -178,7 +181,7 @@ public class PageProviderTest extends WicketTestCase
* href="https://issues.apache.org/jira/browse/WICKET-3339">WICKET-3339</a>
*/
@Test
- public void test()
+ void test()
{
tester.setFollowRedirects(false);
tester.startPage(TestPage.class);
@@ -187,7 +190,7 @@ public class PageProviderTest extends WicketTestCase
}
@Test
- public void testPageProperties_provided()
+ void testPageProperties_provided()
{
PageProvider provider = new PageProvider(new StatelessPageTest());
assertTrue(provider.hasPageInstance());
@@ -195,7 +198,7 @@ public class PageProviderTest extends WicketTestCase
}
@Test
- public void testPageProperties_bookmarkable()
+ void testPageProperties_bookmarkable()
{
PageProvider provider = new PageProvider(StatelessPageTest.class);
assertTrue(provider.doesProvideNewPage());
@@ -208,7 +211,7 @@ public class PageProviderTest extends WicketTestCase
}
@Test
- public void testPageProperties_stored()
+ void testPageProperties_stored()
{
TestMapperContext mapperContext = new TestMapperContext();
Page page = new TestPage();
@@ -231,7 +234,7 @@ public class PageProviderTest extends WicketTestCase
* the requested and the found page classes do not match.
*/
@Test
- public void ignorePageFoundByIdIfItsClassDoesntMatch()
+ void ignorePageFoundByIdIfItsClassDoesntMatch()
{
TestMapperContext mapperContext = new TestMapperContext();
Page page = new TestPage();
@@ -248,7 +251,7 @@ public class PageProviderTest extends WicketTestCase
}
@Test
- public void pageProviderIsSerializeble() throws Exception
+ void pageProviderIsSerializeble() throws Exception
{
TestMapperContext mapperContext = new TestMapperContext();
Page page = new TestPage();
@@ -261,7 +264,7 @@ public class PageProviderTest extends WicketTestCase
PageProvider deserialized = (PageProvider)javaSerializer.deserialize(serialized);
deserialized.setPageSource(mapperContext);
- assertThat(deserialized.getPageInstance(), is(page));
+ assertEquals(page, deserialized.getPageInstance());
}
/** */
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/handler/render/AbstractVariations.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/AbstractVariations.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/AbstractVariations.java
index af97e14..af4fe15 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/AbstractVariations.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/AbstractVariations.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.request.handler.render;
-public abstract class AbstractVariations
+abstract class AbstractVariations
{
protected abstract VariationIterator<?> last();
@@ -32,7 +32,7 @@ public abstract class AbstractVariations
last().next();
}
- protected void toString(StringBuilder sb, String label, VariationIterator<?> iterator)
+ void toString(StringBuilder sb, String label, VariationIterator<?> iterator)
{
sb.append(label).append('=').append(iterator.current()).append(',');
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/handler/render/ShouldRedirectToTargetUrl.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/ShouldRedirectToTargetUrl.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/ShouldRedirectToTargetUrl.java
index d8b2daf..55486d6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/ShouldRedirectToTargetUrl.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/ShouldRedirectToTargetUrl.java
@@ -22,15 +22,15 @@ import org.apache.wicket.request.Url;
public class ShouldRedirectToTargetUrl extends AbstractVariations
{
- VariationIterator<Boolean> ajax = VariationIterator.of(Variation.ofBoolean());
- VariationIterator<RenderPageRequestHandler.RedirectPolicy> redirectPolicy = VariationIterator.of(ajax,Variation.of(RenderPageRequestHandler.RedirectPolicy.class));
- VariationIterator<Boolean> redirectToRender = VariationIterator.of(redirectPolicy,Variation.ofBoolean());
- VariationIterator<Boolean> targetEqualsCurrentUrl = VariationIterator.of(redirectToRender,Variation.ofBoolean());
- VariationIterator<Boolean> newPageInstance = VariationIterator.of(targetEqualsCurrentUrl,Variation.ofBoolean());
- VariationIterator<Boolean> pageStateless = VariationIterator.of(newPageInstance,Variation.ofBoolean());
- VariationIterator<Boolean> sessionTemporary = VariationIterator.of(pageStateless,Variation.ofBoolean());
+ private VariationIterator<Boolean> ajax = VariationIterator.of(Variation.ofBoolean());
+ private VariationIterator<RenderPageRequestHandler.RedirectPolicy> redirectPolicy = VariationIterator.of(ajax, Variation.of(RenderPageRequestHandler.RedirectPolicy.class));
+ private VariationIterator<Boolean> redirectToRender = VariationIterator.of(redirectPolicy, Variation.ofBoolean());
+ private VariationIterator<Boolean> targetEqualsCurrentUrl = VariationIterator.of(redirectToRender, Variation.ofBoolean());
+ private VariationIterator<Boolean> newPageInstance = VariationIterator.of(targetEqualsCurrentUrl, Variation.ofBoolean());
+ private VariationIterator<Boolean> pageStateless = VariationIterator.of(newPageInstance, Variation.ofBoolean());
+ private VariationIterator<Boolean> sessionTemporary = VariationIterator.of(pageStateless, Variation.ofBoolean());
- VariationIterator<Boolean> last = sessionTemporary;
+ private VariationIterator<Boolean> last = sessionTemporary;
@Override
public String toString()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/handler/render/ShouldRenderPageAndWriteResponseVariations.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/ShouldRenderPageAndWriteResponseVariations.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/ShouldRenderPageAndWriteResponseVariations.java
index 939ad5a..4a7ed37 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/ShouldRenderPageAndWriteResponseVariations.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/ShouldRenderPageAndWriteResponseVariations.java
@@ -21,16 +21,16 @@ import org.apache.wicket.request.Url;
public class ShouldRenderPageAndWriteResponseVariations extends AbstractVariations
{
- VariationIterator<RenderPageRequestHandler.RedirectPolicy> redirectPolicy = VariationIterator.of(Variation.of(RenderPageRequestHandler.RedirectPolicy.class));
- VariationIterator<Boolean> ajax = VariationIterator.of(redirectPolicy, Variation.ofBoolean());
- VariationIterator<Boolean> onePassRender = VariationIterator.of(ajax,Variation.ofBoolean());
- VariationIterator<Boolean> redirectToRender = VariationIterator.of(onePassRender,Variation.ofBoolean());
- VariationIterator<Boolean> shouldPreserveClientUrl = VariationIterator.of(redirectToRender,Variation.ofBoolean());
- VariationIterator<Boolean> targetEqualsCurrentUrl = VariationIterator.of(shouldPreserveClientUrl,Variation.ofBoolean());
- VariationIterator<Boolean> newPageInstance = VariationIterator.of(targetEqualsCurrentUrl,Variation.ofBoolean());
- VariationIterator<Boolean> pageStateless = VariationIterator.of(newPageInstance,Variation.ofBoolean());
+ private VariationIterator<RenderPageRequestHandler.RedirectPolicy> redirectPolicy = VariationIterator.of(Variation.of(RenderPageRequestHandler.RedirectPolicy.class));
+ private VariationIterator<Boolean> ajax = VariationIterator.of(redirectPolicy, Variation.ofBoolean());
+ private VariationIterator<Boolean> onePassRender = VariationIterator.of(ajax, Variation.ofBoolean());
+ private VariationIterator<Boolean> redirectToRender = VariationIterator.of(onePassRender, Variation.ofBoolean());
+ private VariationIterator<Boolean> shouldPreserveClientUrl = VariationIterator.of(redirectToRender, Variation.ofBoolean());
+ private VariationIterator<Boolean> targetEqualsCurrentUrl = VariationIterator.of(shouldPreserveClientUrl, Variation.ofBoolean());
+ private VariationIterator<Boolean> newPageInstance = VariationIterator.of(targetEqualsCurrentUrl, Variation.ofBoolean());
+ private VariationIterator<Boolean> pageStateless = VariationIterator.of(newPageInstance, Variation.ofBoolean());
- VariationIterator<Boolean> last = pageStateless;
+ private VariationIterator<Boolean> last = pageStateless;
@Override
protected VariationIterator<?> last()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/handler/render/SkipRenderWithSetResponsePageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/SkipRenderWithSetResponsePageTest.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/SkipRenderWithSetResponsePageTest.java
index f20e3a1..885c8ca 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/SkipRenderWithSetResponsePageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/SkipRenderWithSetResponsePageTest.java
@@ -16,28 +16,30 @@
*/
package org.apache.wicket.request.handler.render;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.SimplePage;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test if rendering phase is skipped if we invoke setResponsePage inside page constructor
*
* https://issues.apache.org/jira/browse/WICKET-4636
*/
-public class SkipRenderWithSetResponsePageTest extends WicketTestCase
+class SkipRenderWithSetResponsePageTest extends WicketTestCase
{
@Test
- public void setResponsePageInsideConstructor()
+ void setResponsePageInsideConstructor()
{
tester.startPage(NotToRenderConstructorPage.class);
tester.assertRenderedPage(SimplePage.class);
}
- public static class NotToRenderConstructorPage extends WebPage
+ public static class NotToRenderConstructorPage extends WebPage
{
- public NotToRenderConstructorPage()
+ public NotToRenderConstructorPage()
{
setResponsePage(SimplePage.class);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/handler/render/StatelessPageManipulatingPageParametersTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/StatelessPageManipulatingPageParametersTest.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/StatelessPageManipulatingPageParametersTest.java
index 1665001..efb11f2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/StatelessPageManipulatingPageParametersTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/StatelessPageManipulatingPageParametersTest.java
@@ -26,17 +26,17 @@ import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.FormTester;
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;
/**
* https://issues.apache.org/jira/browse/WICKET-5666
* https://issues.apache.org/jira/browse/WICKET-5643
*/
-public class StatelessPageManipulatingPageParametersTest extends WicketTestCase {
+class StatelessPageManipulatingPageParametersTest extends WicketTestCase {
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
WebApplication application = tester.getApplication();
application.mountPage("first", FirstPage.class);
@@ -44,7 +44,7 @@ public class StatelessPageManipulatingPageParametersTest extends WicketTestCase
}
@Test
- public void submitAndRedirect() {
+ void submitAndRedirect() {
tester.startPage(FirstPage.class);
FormTester failingFormTester = tester.newFormTester("form");
failingFormTester.submit();
@@ -82,7 +82,7 @@ public class StatelessPageManipulatingPageParametersTest extends WicketTestCase
return new StringResourceStream(markup);
}
}
-
+
public static class SecondPage extends WebPage implements IMarkupResourceStreamProvider
{
public SecondPage(PageParameters parameters)
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/handler/render/TestVariations.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/TestVariations.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/TestVariations.java
index 8a47659..4473c73 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/TestVariations.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/TestVariations.java
@@ -16,20 +16,23 @@
*/
package org.apache.wicket.request.handler.render;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-public class TestVariations
+import org.junit.jupiter.api.Test;
+
+class TestVariations
{
@Test
- public void testSingle()
+ void testSingle()
{
VariationIterator<Boolean> single = VariationIterator.of(Variation.ofBoolean());
- Assert.assertTrue(single.hasNext());
+ assertTrue(single.hasNext());
single.next();
- Assert.assertTrue(single.hasNext());
+ assertTrue(single.hasNext());
single.next();
- Assert.assertFalse(single.hasNext());
+ assertFalse(single.hasNext());
Exception ex = null;
try
@@ -40,29 +43,29 @@ public class TestVariations
{
ex = e;
}
- Assert.assertNotNull(ex);
+ assertNotNull(ex);
}
@Test
- public void testDouble()
+ void testDouble()
{
VariationIterator<Integer> numbers = VariationIterator.of(new Variation<>(1,2,3));
VariationIterator<Boolean> flag = VariationIterator.of(numbers,Variation.ofBoolean());
VariationIterator<?> last=flag;
- Assert.assertTrue(last.hasNext());
+ assertTrue(last.hasNext());
last.next();
- Assert.assertTrue(last.hasNext());
+ assertTrue(last.hasNext());
last.next();
- Assert.assertTrue(last.hasNext());
+ assertTrue(last.hasNext());
last.next();
- Assert.assertTrue(last.hasNext());
+ assertTrue(last.hasNext());
last.next();
- Assert.assertTrue(last.hasNext());
+ assertTrue(last.hasNext());
last.next();
- Assert.assertTrue(last.hasNext());
+ assertTrue(last.hasNext());
last.next();
- Assert.assertFalse(last.hasNext());
+ assertFalse(last.hasNext());
Exception ex = null;
try
@@ -73,6 +76,6 @@ public class TestVariations
{
ex = e;
}
- Assert.assertNotNull(ex);
+ assertNotNull(ex);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/handler/render/VariationIterator.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/VariationIterator.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/VariationIterator.java
index 1f34ef8..14480ba 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/VariationIterator.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/VariationIterator.java
@@ -27,11 +27,11 @@ public class VariationIterator<T> implements Iterator<T>
private int idx = -1;
- public VariationIterator(Variation<T> variation) {
+ private VariationIterator(Variation<T> variation) {
this(null, variation);
}
- public VariationIterator(VariationIterator<?> prev, Variation<T> variation) {
+ private VariationIterator(VariationIterator<?> prev, Variation<T> variation) {
this.prev = prev;
this.variation = variation;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java
index c2094fa..882c39d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java
@@ -16,10 +16,13 @@
*/
package org.apache.wicket.request.handler.render;
-import static org.mockito.ArgumentMatchers.isNull;
+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 static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
@@ -27,8 +30,6 @@ import static org.mockito.Mockito.when;
import java.util.concurrent.atomic.AtomicBoolean;
-import junit.framework.AssertionFailedError;
-
import org.apache.wicket.core.request.handler.IPageProvider;
import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
import org.apache.wicket.core.request.handler.RenderPageRequestHandler.RedirectPolicy;
@@ -39,14 +40,14 @@ import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.http.WebResponse;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.opentest4j.AssertionFailedError;
/**
* Tests for the calculation whether or not to redirect or directly render a page
*/
-public class WebPageRendererTest extends Assert
+class WebPageRendererTest
{
private RenderPageRequestHandler handler;
@@ -60,8 +61,8 @@ public class WebPageRendererTest extends Assert
/**
* Common setup
*/
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
provider = mock(IPageProvider.class);
@@ -87,7 +88,7 @@ public class WebPageRendererTest extends Assert
* is configured there wont be a redirect issued
*/
@Test
- public void testOnePassRender()
+ void testOnePassRender()
{
TestPageRenderer renderer = new TestPageRenderer(handler);
@@ -113,7 +114,7 @@ public class WebPageRendererTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-5522
*/
@Test
- public void testOnePassRenderDifferentProtocols()
+ void testOnePassRenderDifferentProtocols()
{
final AtomicBoolean responseBuffered = new AtomicBoolean(false);
@@ -151,7 +152,7 @@ public class WebPageRendererTest extends Assert
* is configured but the {@link RedirectPolicy} says that it needs to redirect it will redirect.
*/
@Test
- public void testOnePassRenderWithAlwaysRedirect()
+ void testOnePassRenderWithAlwaysRedirect()
{
PageRenderer renderer = new TestPageRenderer(handler)
@@ -186,7 +187,7 @@ public class WebPageRendererTest extends Assert
* is configured but the current request is Ajax then a redirect should be issued
*/
@Test
- public void testOnePassRenderAndAjaxRequest()
+ void testOnePassRenderAndAjaxRequest()
{
TestPageRenderer renderer = new TestPageRenderer(handler);
@@ -212,7 +213,7 @@ public class WebPageRendererTest extends Assert
* {@link RedirectPolicy#NEVER_REDIRECT} there wont be a redirect issued
*/
@Test
- public void testRedirectPolicyNever()
+ void testRedirectPolicyNever()
{
PageRenderer renderer = new TestPageRenderer(handler)
@@ -243,7 +244,7 @@ public class WebPageRendererTest extends Assert
* is configured there wont be a redirect issued
*/
@Test
- public void testSameUrlsAndRedirectToRender()
+ void testSameUrlsAndRedirectToRender()
{
PageRenderer renderer = new TestPageRenderer(handler)
@@ -275,7 +276,7 @@ public class WebPageRendererTest extends Assert
* be a redirect issued
*/
@Test
- public void testSameUrlsAndStatefulPage()
+ void testSameUrlsAndStatefulPage()
{
when(provider.isNewPageInstance()).thenReturn(false);
when(page.isPageStateless()).thenReturn(false);
@@ -301,7 +302,7 @@ public class WebPageRendererTest extends Assert
* should occur
*/
@Test
- public void testShouldPreserveClientUrl()
+ void testShouldPreserveClientUrl()
{
TestPageRenderer renderer = new TestPageRenderer(handler);
@@ -325,7 +326,7 @@ public class WebPageRendererTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-5486
*/
@Test
- public void testShouldPreserveClientUrlOverruledByRedirectPolicyAlwaysRedirect()
+ void testShouldPreserveClientUrlOverruledByRedirectPolicyAlwaysRedirect()
{
TestPageRenderer renderer = new TestPageRenderer(handler);
renderer.shouldPreserveClientUrl = true;
@@ -346,7 +347,7 @@ public class WebPageRendererTest extends Assert
* {@link RedirectPolicy#ALWAYS_REDIRECT} there a redirect must be issued
*/
@Test
- public void testRedirectPolicyAlways()
+ void testRedirectPolicyAlways()
{
TestPageRenderer renderer = new TestPageRenderer(handler);
renderer.redirectPolicy = RedirectPolicy.ALWAYS_REDIRECT;
@@ -367,7 +368,7 @@ public class WebPageRendererTest extends Assert
* Tests that when the current request is Ajax then a redirect should happen
*/
@Test
- public void testSameUrlsAndAjaxRequest()
+ void testSameUrlsAndAjaxRequest()
{
TestPageRenderer renderer = new TestPageRenderer(handler);
renderer.ajax = true;
@@ -389,7 +390,7 @@ public class WebPageRendererTest extends Assert
* is configured then no matter what are the fromUrl and toUrl a redirect will happen
*/
@Test
- public void testRedirectToRender()
+ void testRedirectToRender()
{
TestPageRenderer renderer = new TestPageRenderer(handler);
@@ -414,7 +415,7 @@ public class WebPageRendererTest extends Assert
* buffer
*/
@Test
- public void testDifferentUrlsTemporarySessionAndStatelessPage()
+ void testDifferentUrlsTemporarySessionAndStatelessPage()
{
TestPageRenderer renderer = new TestPageRenderer(handler);
renderer.redirectToBuffer = true;
@@ -436,7 +437,7 @@ public class WebPageRendererTest extends Assert
* redirect to the url which will instantiate the instance of us
*/
@Test
- public void testDifferentUrlsAndNewPageInstance()
+ void testDifferentUrlsAndNewPageInstance()
{
TestPageRenderer renderer = new TestPageRenderer(handler);
renderer.redirectToBuffer = true;
@@ -457,7 +458,7 @@ public class WebPageRendererTest extends Assert
* want to overwrite the response, so we need to let it
*/
@Test
- public void testRedirectToBufferNoPageToRender()
+ void testRedirectToBufferNoPageToRender()
{
final AtomicBoolean stored = new AtomicBoolean(false);
@@ -486,7 +487,7 @@ public class WebPageRendererTest extends Assert
verify(response, never()).write(any(byte[].class));
verify(response, never()).write(any(CharSequence.class));
verify(response, never()).sendRedirect(anyString());
- Assert.assertFalse(stored.get());
+ assertFalse(stored.get());
}
/**
@@ -494,7 +495,7 @@ public class WebPageRendererTest extends Assert
* page should be written without redirect
*/
@Test
- public void testRedirectToBufferStatelessPageAndRedirectIsDisabled()
+ void testRedirectToBufferStatelessPageAndRedirectIsDisabled()
{
final AtomicBoolean stored = new AtomicBoolean(false);
@@ -523,7 +524,7 @@ public class WebPageRendererTest extends Assert
verify(response).write(any(byte[].class));
verify(response, never()).sendRedirect(anyString());
- Assert.assertFalse(stored.get());
+ assertFalse(stored.get());
}
/**
@@ -531,7 +532,7 @@ public class WebPageRendererTest extends Assert
* should be a redirect
*/
@Test
- public void testRedirectToBufferStatelessPageAndRedirectIsEsabled()
+ void testRedirectToBufferStatelessPageAndRedirectIsEsabled()
{
final AtomicBoolean stored = new AtomicBoolean(false);
@@ -560,7 +561,7 @@ public class WebPageRendererTest extends Assert
verify(response, never()).write(any(byte[].class));
verify(response).sendRedirect(isNull());
- Assert.assertTrue(stored.get());
+ assertTrue(stored.get());
}
/**
@@ -568,7 +569,7 @@ public class WebPageRendererTest extends Assert
* redirect
*/
@Test
- public void testRedirectToBufferStatefulPage()
+ void testRedirectToBufferStatefulPage()
{
final AtomicBoolean stored = new AtomicBoolean(false);
@@ -595,11 +596,11 @@ public class WebPageRendererTest extends Assert
verify(response, never()).write(any(byte[].class));
verify(response).sendRedirect(isNull());
- Assert.assertTrue(stored.get());
+ assertTrue(stored.get());
}
@Test
- public void testShouldRenderPageAndWriteResponseCondition() {
+ void testShouldRenderPageAndWriteResponseCondition() {
TestPageRenderer renderer = new TestPageRenderer(handler);
// if
@@ -612,7 +613,7 @@ public class WebPageRendererTest extends Assert
renderer.newPageInstance = true;
renderer.pageStateless = true;
- Assert.assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle,
+ assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle,
Url.parse("test"), Url.parse("test")));
renderer.ajax = false;
@@ -622,7 +623,7 @@ public class WebPageRendererTest extends Assert
renderer.newPageInstance = false;
renderer.pageStateless = false;
- Assert.assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle,
+ assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle,
Url.parse("test1"), Url.parse("test2")));
// or
@@ -634,7 +635,7 @@ public class WebPageRendererTest extends Assert
renderer.ajax = false;
renderer.onePassRender = true;
- Assert.assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle,
+ assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle,
Url.parse("test1"), Url.parse("test2")));
renderer.redirectPolicy = RedirectPolicy.ALWAYS_REDIRECT;
@@ -643,21 +644,21 @@ public class WebPageRendererTest extends Assert
renderer.newPageInstance = false;
renderer.pageStateless = false;
- Assert.assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle,
+ assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle,
Url.parse("test"), Url.parse("test")));
// or
// the targetUrl matches current url and it's redirect-to-render
renderer.redirectToRender = true;
- Assert.assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle,
+ assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle,
Url.parse("test"), Url.parse("test")));
renderer.pageStateless = true;
renderer.newPageInstance = true;
renderer.redirectToRender = true;
- Assert.assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle,
+ assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle,
Url.parse("test"), Url.parse("test")));
// or
@@ -672,13 +673,13 @@ public class WebPageRendererTest extends Assert
renderer.newPageInstance = true;
renderer.pageStateless = true;
- Assert.assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle,
+ assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle,
Url.parse("test1"), Url.parse("test2")));
}
@Test
- public void testShouldNOTRenderPageAndWriteResponseCondition() {
+ void testShouldNOTRenderPageAndWriteResponseCondition() {
TestPageRenderer renderer = new TestPageRenderer(handler);
@@ -704,25 +705,25 @@ public class WebPageRendererTest extends Assert
renderer.newPageInstance = true;
renderer.pageStateless = true;
- Assert.assertFalse(renderer.shouldRenderPageAndWriteResponse(requestCycle,
+ assertFalse(renderer.shouldRenderPageAndWriteResponse(requestCycle,
Url.parse("test1"), Url.parse("test2")));
renderer.redirectToRender = false;
renderer.newPageInstance = false;
renderer.pageStateless = false;
- Assert.assertFalse(renderer.shouldRenderPageAndWriteResponse(requestCycle,
+ assertFalse(renderer.shouldRenderPageAndWriteResponse(requestCycle,
Url.parse("test"), Url.parse("test")));
}
@Test
- public void testShouldRenderPageAndWriteResponseVariationIntegrity() {
+ void testShouldRenderPageAndWriteResponseVariationIntegrity() {
int count = countVariations(new ShouldRenderPageAndWriteResponseVariations());
- Assert.assertEquals(2 * 2 * 2 * 2 * 2 * 2 * 2 * 3, count);
+ assertEquals(2 * 2 * 2 * 2 * 2 * 2 * 2 * 3, count);
}
@Test
- public void shouldRenderPageAndWriteResponseVariation() {
+ void shouldRenderPageAndWriteResponseVariation() {
String match =
" X X " +
@@ -754,13 +755,13 @@ public class WebPageRendererTest extends Assert
}
@Test
- public void testShouldRedirectToTargetUrlIntegrity() {
+ void testShouldRedirectToTargetUrlIntegrity() {
int count = countVariations(new ShouldRedirectToTargetUrl());
- Assert.assertEquals(2 * 3 * 2 * 2 * 2 * 2 * 2, count);
+ assertEquals(2 * 3 * 2 * 2 * 2 * 2 * 2, count);
}
@Test
- public void testShouldRedirectToTargetUrl() {
+ void testShouldRedirectToTargetUrl() {
String match =
"XXXXXXXXXXXXXXXX" +
@@ -780,7 +781,7 @@ public class WebPageRendererTest extends Assert
}
@Test
- public void shouldRedirectToTargetUrlCondition() {
+ void shouldRedirectToTargetUrlCondition() {
TestPageRenderer renderer = new TestPageRenderer(handler);
@@ -794,7 +795,7 @@ public class WebPageRendererTest extends Assert
renderer.pageStateless = false;
renderer.sessionTemporary = false;
- Assert.assertTrue(renderer.shouldRedirectToTargetUrl(requestCycle, Url.parse("test1"),
+ assertTrue(renderer.shouldRedirectToTargetUrl(requestCycle, Url.parse("test1"),
Url.parse("test2")));
// or
@@ -802,7 +803,7 @@ public class WebPageRendererTest extends Assert
renderer.redirectPolicy = RedirectPolicy.AUTO_REDIRECT;
renderer.redirectToRender = true;
- Assert.assertTrue(renderer.shouldRedirectToTargetUrl(requestCycle, Url.parse("test1"),
+ assertTrue(renderer.shouldRedirectToTargetUrl(requestCycle, Url.parse("test1"),
Url.parse("test2")));
// or
@@ -810,7 +811,7 @@ public class WebPageRendererTest extends Assert
renderer.redirectToRender = false;
renderer.ajax = true;
- Assert.assertTrue(renderer.shouldRedirectToTargetUrl(requestCycle, Url.parse("test"),
+ assertTrue(renderer.shouldRedirectToTargetUrl(requestCycle, Url.parse("test"),
Url.parse("test")));
// or
@@ -821,20 +822,20 @@ public class WebPageRendererTest extends Assert
renderer.ajax = false;
renderer.newPageInstance = true;
- Assert.assertTrue(renderer.shouldRedirectToTargetUrl(requestCycle, Url.parse("test1"),
+ assertTrue(renderer.shouldRedirectToTargetUrl(requestCycle, Url.parse("test1"),
Url.parse("test2")));
renderer.newPageInstance = false;
renderer.sessionTemporary = true;
renderer.pageStateless = true;
- Assert.assertTrue(renderer.shouldRedirectToTargetUrl(requestCycle, Url.parse("test1"),
+ assertTrue(renderer.shouldRedirectToTargetUrl(requestCycle, Url.parse("test1"),
Url.parse("test2")));
// just redirect
}
@Test
- public void shouldNOTRedirectToTargetUrlCondition() {
+ void shouldNOTRedirectToTargetUrlCondition() {
TestPageRenderer renderer = new TestPageRenderer(handler);
@@ -857,7 +858,7 @@ public class WebPageRendererTest extends Assert
renderer.pageStateless=false;
renderer.sessionTemporary=false;
- Assert.assertFalse(renderer.shouldRedirectToTargetUrl(requestCycle, Url.parse("test1"),
+ assertFalse(renderer.shouldRedirectToTargetUrl(requestCycle, Url.parse("test1"),
Url.parse("test2")));
}
@@ -874,12 +875,12 @@ public class WebPageRendererTest extends Assert
int idx=0;
while (variations.hasNextVariation()) {
variations.nextVariation();
- Assert.assertEquals(variations.toString(), match.charAt(idx) == 'X', variations.getResult());
+ assertEquals(match.charAt(idx) == 'X', variations.getResult(), variations.toString());
idx++;
}
}
- private void printVariations(AbstractVariations variations) {
+ void printVariations(AbstractVariations variations) {
int idx=0;
System.out.print("\"");
while (variations.hasNextVariation()) {
@@ -899,7 +900,7 @@ public class WebPageRendererTest extends Assert
* directly
*/
@Test
- public void testRedirectToBufferStatefulPageAndSameUrls()
+ void testRedirectToBufferStatefulPageAndSameUrls()
{
final AtomicBoolean stored = new AtomicBoolean(false);
@@ -930,14 +931,14 @@ public class WebPageRendererTest extends Assert
verify(response).write(any(byte[].class));
verify(response, never()).sendRedirect(anyString());
- Assert.assertFalse(stored.get());
+ assertFalse(stored.get());
}
/**
* Tests that when all the conditions fail the redirect_to_buffer should be used as a fallback
*/
@Test
- public void testRedirectToBufferIsFallback()
+ void testRedirectToBufferIsFallback()
{
final AtomicBoolean stored = new AtomicBoolean(false);
@@ -985,7 +986,7 @@ public class WebPageRendererTest extends Assert
verify(response, never()).write(any(byte[].class));
verify(response).sendRedirect(isNull());
- Assert.assertTrue(stored.get());
+ assertTrue(stored.get());
}
/**
@@ -993,7 +994,7 @@ public class WebPageRendererTest extends Assert
* current request is Ajax then a redirect should be issued
*/
@Test
- public void testShouldPreserveClientUrlAndAjaxRequest()
+ void testShouldPreserveClientUrlAndAjaxRequest()
{
TestPageRenderer renderer = new TestPageRenderer(handler);
renderer.ajax = true;
@@ -1017,7 +1018,7 @@ public class WebPageRendererTest extends Assert
* is Ajax then a redirect should still be issued
*/
@Test
- public void testNeverRedirectButAjaxRequest()
+ void testNeverRedirectButAjaxRequest()
{
TestPageRenderer renderer = new TestPageRenderer(handler);
renderer.redirectPolicy = RedirectPolicy.NEVER_REDIRECT;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/handler/resource/ResourceAuthorizationTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/resource/ResourceAuthorizationTest.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/resource/ResourceAuthorizationTest.java
index 8edf57b..36db7c5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/handler/resource/ResourceAuthorizationTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/resource/ResourceAuthorizationTest.java
@@ -16,22 +16,22 @@
*/
package org.apache.wicket.request.handler.resource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import javax.servlet.http.HttpServletResponse;
import org.apache.wicket.authorization.IAuthorizationStrategy;
-import org.apache.wicket.authorization.IUnauthorizedResourceRequestListener;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.AbstractResource;
import org.apache.wicket.request.resource.IResource;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
/**
* Tests authorization of IResources
*/
-public class ResourceAuthorizationTest extends WicketTestCase
+class ResourceAuthorizationTest extends WicketTestCase
{
private static class RejectingAuthorizationStrategy extends IAuthorizationStrategy.AllowAllAuthorizationStrategy
{
@@ -61,7 +61,7 @@ public class ResourceAuthorizationTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-5012
*/
@Test
- public void rejectWith403()
+ void rejectWith403()
{
tester.getApplication().getSecuritySettings().setAuthorizationStrategy(new RejectingAuthorizationStrategy());
@@ -72,30 +72,23 @@ public class ResourceAuthorizationTest extends WicketTestCase
tester.getLastResponse().getErrorMessage());
}
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
-
/**
* https://issues.apache.org/jira/browse/WICKET-5012
*/
@Test
- public void rejectWithException()
+ void rejectWithException()
{
tester.getApplication().getSecuritySettings().setAuthorizationStrategy(new RejectingAuthorizationStrategy());
- tester.getApplication().getSecuritySettings().setUnauthorizedResourceRequestListener(new IUnauthorizedResourceRequestListener()
- {
- @Override
- public void onUnauthorizedRequest(IResource resource, PageParameters parameters)
- {
- throw new RuntimeException("Not authorized to request: " + resource);
- }
+ tester.getApplication().getSecuritySettings().setUnauthorizedResourceRequestListener((resource, parameters) -> {
+ throw new RuntimeException("Not authorized to request: " + resource);
});
TestResource resource = new TestResource();
- expectedException.expect(RuntimeException.class);
- expectedException.expectMessage("Not authorized to request: " + resource);
+ Exception e = assertThrows(RuntimeException.class, () -> {
+ tester.startResource(resource);
+ });
- tester.startResource(resource);
+ assertEquals("Not authorized to request: " + resource, e.getMessage());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/mapper/CustomHomePageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/CustomHomePageTest.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/CustomHomePageTest.java
index dd1774a..ecdefe4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/CustomHomePageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/mapper/CustomHomePageTest.java
@@ -22,19 +22,19 @@ import org.apache.wicket.protocol.http.mock.MockHttpServletRequest;
import org.apache.wicket.resource.DummyApplication;
import org.apache.wicket.util.tester.DummyHomePage;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* A test case for <a href="https://issues.apache.org/jira/browse/WICKET-3126">WICKET-3126</a>
*/
-public class CustomHomePageTest
+class CustomHomePageTest
{
/**
* Tests no custom home page. The home page is get from {@link Application#getHomePage()}
*/
@Test
- public void defaultHomePage()
+ void defaultHomePage()
{
final WebApplication dummyApplication = new DummyApplication();
final WicketTester tester = new WicketTester(dummyApplication);
@@ -49,7 +49,7 @@ public class CustomHomePageTest
* Tests mounting of a custom home page via {@link WebApplication#mountPage(String, Class)}
*/
@Test
- public void customHomePage()
+ void customHomePage()
{
final WebApplication dummyApplication = new DummyApplication()
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
index c543f87..21df52e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
@@ -16,20 +16,22 @@
*/
package org.apache.wicket.request.mapper.info;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import org.junit.jupiter.api.Test;
/**
*
* @author Matej Knopp
*/
-public class ComponentInfoTest extends Assert
+class ComponentInfoTest
{
/**
*
*/
@Test
- public void test1()
+ void test1()
{
String s = "-component-path";
ComponentInfo info = ComponentInfo.parse(s);
@@ -43,7 +45,7 @@ public class ComponentInfoTest extends Assert
*
*/
@Test
- public void test2()
+ void test2()
{
String s = "component-path";
ComponentInfo info = ComponentInfo.parse(s);
@@ -54,7 +56,7 @@ public class ComponentInfoTest extends Assert
*
*/
@Test
- public void test3()
+ void test3()
{
String s = ".-";
ComponentInfo info = ComponentInfo.parse(s);
@@ -66,7 +68,7 @@ public class ComponentInfoTest extends Assert
*
*/
@Test
- public void test4()
+ void test4()
{
String s = "-";
ComponentInfo info = ComponentInfo.parse(s);
@@ -77,7 +79,7 @@ public class ComponentInfoTest extends Assert
*
*/
@Test
- public void test5()
+ void test5()
{
String s = "abcd";
assertEquals(null, ComponentInfo.parse(s));
@@ -87,7 +89,7 @@ public class ComponentInfoTest extends Assert
*
*/
@Test
- public void test6()
+ void test6()
{
String s = "-compo~~nent-path";
ComponentInfo info = ComponentInfo.parse(s);
@@ -101,7 +103,7 @@ public class ComponentInfoTest extends Assert
*
*/
@Test
- public void test7()
+ void test7()
{
String s = "-co~mpo~~nent-path";
ComponentInfo info = ComponentInfo.parse(s);
@@ -115,7 +117,7 @@ public class ComponentInfoTest extends Assert
*
*/
@Test
- public void test8()
+ void test8()
{
String s = ".12-component-path";
ComponentInfo info = ComponentInfo.parse(s);
@@ -129,7 +131,7 @@ public class ComponentInfoTest extends Assert
*
*/
@Test
- public void test9()
+ void test9()
{
String s = "4.-a-b";
ComponentInfo info = ComponentInfo.parse(s);
@@ -142,7 +144,7 @@ public class ComponentInfoTest extends Assert
*
*/
@Test
- public void test10()
+ void test10()
{
String s = "4.5-a-b";
ComponentInfo info = ComponentInfo.parse(s);
@@ -156,7 +158,7 @@ public class ComponentInfoTest extends Assert
*
*/
@Test
- public void encodeDecode()
+ void encodeDecode()
{
final Integer renderCount = 1;
final String componentPath = "-nav-container-:-nav:1:link";
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
index 9fe3a4f..a657b88 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
@@ -16,15 +16,17 @@
*/
package org.apache.wicket.request.mapper.info;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
-import junit.framework.TestCase;
+import org.junit.jupiter.api.Test;
/**
*
* @author Matej Knopp
*/
-public class PageComponentInfoTest extends TestCase
+class PageComponentInfoTest
{
private void testPageInfoOnly(PageComponentInfo info, Integer pageId)
@@ -49,7 +51,7 @@ public class PageComponentInfoTest extends TestCase
*
*/
@Test
- public void test1()
+ void test1()
{
String s = "2--foo-bar-baz";
PageComponentInfo info = PageComponentInfo.parse(s);
@@ -61,7 +63,7 @@ public class PageComponentInfoTest extends TestCase
*
*/
@Test
- public void test2()
+ void test2()
{
String s = "2";
PageComponentInfo info = PageComponentInfo.parse(s);
@@ -73,9 +75,10 @@ public class PageComponentInfoTest extends TestCase
* <a href="https://issues.apache.org/jira/browse/WICKET-3490">WICKET-3490</a>
*/
@Test
- public void parsePageInfo()
+ void parsePageInfo()
{
- PageComponentInfo pageComponentInfo = PageComponentInfo.parse("99999999999999999999999999999999999999999999999999999999999999999999999");
+ PageComponentInfo pageComponentInfo = PageComponentInfo
+ .parse("99999999999999999999999999999999999999999999999999999999999999999999999");
assertNull(pageComponentInfo);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/ByteArrayResourceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/ByteArrayResourceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/ByteArrayResourceTest.java
index 73b1295..6c163fe 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/ByteArrayResourceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/ByteArrayResourceTest.java
@@ -16,30 +16,31 @@
*/
package org.apache.wicket.request.resource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.request.resource.IResource.Attributes;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
-import javax.servlet.http.HttpServletResponse;
+import org.junit.jupiter.api.Test;
/**
* Unit tests for {@link ByteArrayResource}
*/
-public class ByteArrayResourceTest extends WicketTestCase
+class ByteArrayResourceTest extends WicketTestCase
{
/**
* Unit test for {@link ByteArrayResource} with static byte array.
*/
@Test
- public void staticResource()
+ void staticResource()
{
String contentType = "application/octet-stream";
byte[] array = new byte[] { 1, 2, 3 };
@@ -69,7 +70,7 @@ public class ByteArrayResourceTest extends WicketTestCase
* Unit test for {@link ByteArrayResource} with dynamically generated byte array.
*/
@Test
- public void dynamicResource()
+ void dynamicResource()
{
String contentType = "application/octet-stream";
final byte[] array = new byte[] { 1, 2, 3 };
@@ -112,7 +113,7 @@ public class ByteArrayResourceTest extends WicketTestCase
* See https://issues.apache.org/jira/browse/WICKET-4119
*/
@Test
- public void contentType()
+ void contentType()
{
String userSpecifiedContentType = "text/custom";
ByteArrayResource userSpecified = new ByteArrayResource(userSpecifiedContentType,
@@ -140,7 +141,7 @@ public class ByteArrayResourceTest extends WicketTestCase
* Verify that HttpServletResponse#SC_NOT_FOUND is returned if there is no data.
*/
@Test
- public void noData() {
+ void noData() {
ByteArrayResource resource = new ByteArrayResource("text/plain");
tester.startResource(resource);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/CharSequenceResourceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/CharSequenceResourceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/CharSequenceResourceTest.java
index 0fdbb00..ef3239a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/CharSequenceResourceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/CharSequenceResourceTest.java
@@ -16,38 +16,37 @@
*/
package org.apache.wicket.request.resource;
-import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.nio.charset.Charset;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link CharSequenceResource}
*/
-public class CharSequenceResourceTest extends Assert
+class CharSequenceResourceTest
{
@Test
- public void getLength_whenNoUnicodeSymbols_thenReturnTheStringLength() throws Exception
+ void getLength_whenNoUnicodeSymbols_thenReturnTheStringLength() throws Exception
{
CharSequenceResource resource = new CharSequenceResource("plain/text");
- assertThat(resource.getLength("abcd"), is(4L));
+ assertEquals(Long.valueOf(4L), resource.getLength("abcd"));
}
@Test
- public void getLength_UTF8_whenUnicodeSymbols_thenReturnTheBytesLength() throws Exception
+ void getLength_UTF8_whenUnicodeSymbols_thenReturnTheBytesLength() throws Exception
{
CharSequenceResource resource = new CharSequenceResource("plain/text");
resource.setCharset(Charset.forName("UTF-8"));
- assertThat(resource.getLength("a\u1234d"), is(5L));
+ assertEquals(Long.valueOf(5L), resource.getLength("a\u1234d"));
}
@Test
- public void getLength_UTF16_whenUnicodeSymbols_thenReturnTheBytesLength() throws Exception
+ void getLength_UTF16_whenUnicodeSymbols_thenReturnTheBytesLength() throws Exception
{
CharSequenceResource resource = new CharSequenceResource("plain/text");
resource.setCharset(Charset.forName("UTF-16"));
- assertThat(resource.getLength("a\u1234d"), is(8L));
+ assertEquals(Long.valueOf(8L), resource.getLength("a\u1234d"));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/ContextRelativeResourceReferenceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/ContextRelativeResourceReferenceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/ContextRelativeResourceReferenceTest.java
index a589357..2153310 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/ContextRelativeResourceReferenceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/ContextRelativeResourceReferenceTest.java
@@ -16,43 +16,43 @@
*/
package org.apache.wicket.request.resource;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Assert;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
-public class ContextRelativeResourceReferenceTest extends WicketTestCase
+class ContextRelativeResourceReferenceTest extends WicketTestCase
{
- static final String RESOURCE_NAME = "/foo/baar/myLibrary";
- static final String ALREADY_MINIFIED = RESOURCE_NAME + ".min.js";
- static final String TO_BE_MINIFIED = RESOURCE_NAME + ".js";
- static final String CUSTOM_SUFFIX = "compress";
+ private static final String RESOURCE_NAME = "/foo/baar/myLibrary";
+ private static final String ALREADY_MINIFIED = RESOURCE_NAME + ".min.js";
+ private static final String TO_BE_MINIFIED = RESOURCE_NAME + ".js";
+ private static final String CUSTOM_SUFFIX = "compress";
@Test
- public void testMinifyResource() throws Exception
+ void testMinifyResource() throws Exception
{
ContextRelativeResourceReference resourceReference = new ContextRelativeResourceReference(TO_BE_MINIFIED);
- Assert.assertTrue(testResourceKey(resourceReference, ALREADY_MINIFIED));
+ assertTrue(testResourceKey(resourceReference, ALREADY_MINIFIED));
}
@Test
- public void testDontMinifyResource() throws Exception
+ void testDontMinifyResource() throws Exception
{
ContextRelativeResourceReference resourceReference = new ContextRelativeResourceReference(ALREADY_MINIFIED, false);
- Assert.assertTrue(testResourceKey(resourceReference, ALREADY_MINIFIED));
+ assertTrue(testResourceKey(resourceReference, ALREADY_MINIFIED));
resourceReference = new ContextRelativeResourceReference(TO_BE_MINIFIED, false);
- Assert.assertTrue(testResourceKey(resourceReference, TO_BE_MINIFIED));
+ assertTrue(testResourceKey(resourceReference, TO_BE_MINIFIED));
}
@Test
- public void testCustomSuffix() throws Exception
+ void testCustomSuffix() throws Exception
{
ContextRelativeResourceReference resourceReference = new ContextRelativeResourceReference(TO_BE_MINIFIED, CUSTOM_SUFFIX);
- Assert.assertTrue(testResourceKey(resourceReference, RESOURCE_NAME + "." + CUSTOM_SUFFIX + ".js"));
+ assertTrue(testResourceKey(resourceReference, RESOURCE_NAME + "." + CUSTOM_SUFFIX + ".js"));
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/CssPackageResourceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/CssPackageResourceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/CssPackageResourceTest.java
index e65aaf3..7820e4c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/CssPackageResourceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/CssPackageResourceTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.request.resource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.Locale;
import org.apache.wicket.css.ICssCompressor;
@@ -23,12 +25,12 @@ import org.apache.wicket.markup.html.PackageResourceTest;
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class CssPackageResourceTest extends WicketTestCase
+class CssPackageResourceTest extends WicketTestCase
{
private static final String APP_COMPRESSED = "APP_COMPRESSED";
@@ -61,7 +63,7 @@ public class CssPackageResourceTest extends WicketTestCase
* Tests that a {@link CssPackageResource} can have its custom {@link ICssCompressor}
*/
@Test
- public void customResourceCompressor()
+ void customResourceCompressor()
{
CssPackageResource resource = new CssPackageResource(PackageResourceTest.class,
"packaged1.txt", null, null, null)
@@ -92,7 +94,7 @@ public class CssPackageResourceTest extends WicketTestCase
* when there is no custom
*/
@Test
- public void appLevelCompressor()
+ void appLevelCompressor()
{
CssPackageResource resource = new CssPackageResource(PackageResourceTest.class,
"packaged1.txt", null, null, null);
@@ -106,7 +108,7 @@ public class CssPackageResourceTest extends WicketTestCase
* {@link ICssCompressor}
*/
@Test
- public void noCompressor()
+ void noCompressor()
{
CssPackageResource resource = new CssPackageResource(PackageResourceTest.class,
"packaged1.txt", null, null, null);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/DynamicImageResourceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/DynamicImageResourceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/DynamicImageResourceTest.java
index 2121714..ccee98f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/DynamicImageResourceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/DynamicImageResourceTest.java
@@ -16,23 +16,25 @@
*/
package org.apache.wicket.request.resource;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import javax.servlet.http.HttpServletResponse;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link DynamicImageResource}
*/
-public class DynamicImageResourceTest extends WicketTestCase
+class DynamicImageResourceTest extends WicketTestCase
{
/**
* https://issues.apache.org/jira/browse/WICKET-3935
*/
@Test
- public void emptyImageDataIs404()
+ void emptyImageDataIs404()
{
DynamicImageResource resource = new DynamicImageResource()
{
@@ -53,7 +55,7 @@ public class DynamicImageResourceTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-3935
*/
@Test
- public void nonEmptyImageDataIs200()
+ void nonEmptyImageDataIs200()
{
final byte[] expected = new byte[] { 1, 2, 3 };
@@ -68,6 +70,6 @@ public class DynamicImageResourceTest extends WicketTestCase
tester.startResource(resource);
assertEquals(HttpServletResponse.SC_OK, tester.getLastResponse().getStatus());
- Assert.assertArrayEquals(expected, tester.getLastResponse().getBinaryContent());
+ assertArrayEquals(expected, tester.getLastResponse().getBinaryContent());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/JavaScriptPackageResourceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/JavaScriptPackageResourceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/JavaScriptPackageResourceTest.java
index 022f9d4..14a63cb 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/JavaScriptPackageResourceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/JavaScriptPackageResourceTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.request.resource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.io.IOException;
import java.util.Locale;
@@ -25,12 +27,12 @@ import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for JavaScriptPackageResource
*/
-public class JavaScriptPackageResourceTest extends WicketTestCase
+class JavaScriptPackageResourceTest extends WicketTestCase
{
private static final String APP_COMPRESSED = "APP_COMPRESSED";
@@ -63,7 +65,7 @@ public class JavaScriptPackageResourceTest extends WicketTestCase
* {@link IJavaScriptCompressor}
*/
@Test
- public void customResourceCompressor()
+ void customResourceCompressor()
{
JavaScriptPackageResource resource = new JavaScriptPackageResource(
PackageResourceTest.class, "packaged1.txt", null, null, null)
@@ -96,7 +98,7 @@ public class JavaScriptPackageResourceTest extends WicketTestCase
* same as the one used for the actual response
*/
@Test
- public void cacheableStreamIsCompressed() throws ResourceStreamNotFoundException, IOException
+ void cacheableStreamIsCompressed() throws ResourceStreamNotFoundException, IOException
{
JavaScriptPackageResource resource = new JavaScriptPackageResource(
PackageResourceTest.class, "packaged1.txt", null, null, null)
@@ -127,7 +129,7 @@ public class JavaScriptPackageResourceTest extends WicketTestCase
* {@link IJavaScriptCompressor} when there is no custom
*/
@Test
- public void appLevelCompressor()
+ void appLevelCompressor()
{
JavaScriptPackageResource resource = new JavaScriptPackageResource(
PackageResourceTest.class, "packaged1.txt", null, null, null);
@@ -141,7 +143,7 @@ public class JavaScriptPackageResourceTest extends WicketTestCase
* {@link IJavaScriptCompressor}
*/
@Test
- public void noCompressor()
+ void noCompressor()
{
JavaScriptPackageResource resource = new JavaScriptPackageResource(
PackageResourceTest.class, "packaged1.txt", null, null, null);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/LessResourceReferenceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/LessResourceReferenceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/LessResourceReferenceTest.java
index 17264f4..7e4b6d5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/LessResourceReferenceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/LessResourceReferenceTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.request.resource;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.wicket.MarkupContainer;
@@ -30,8 +33,8 @@ import org.apache.wicket.util.file.Files;
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;
/**
* <a href"https://issues.apache.org/jira/browse/WICKET-4732">WICKET-4732</a>
@@ -67,8 +70,8 @@ public class LessResourceReferenceTest extends WicketTestCase
}
}
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
PROCESS_RESPONSE_CALLED.set(false);
}
@@ -105,7 +108,7 @@ public class LessResourceReferenceTest extends WicketTestCase
* instead of automatically created PackageResourceReference
*/
@Test
- public void processLessResources()
+ void processLessResources()
{
// load the page to register the resource
LessResourcePage page = new LessResourcePage();
@@ -122,7 +125,7 @@ public class LessResourceReferenceTest extends WicketTestCase
* Tests that a LessResourceReference is request-able without being registered in ResourceReferenceRegistry
*/
@Test
- public void processLessResourcesWithoutStartingAPage()
+ void processLessResourcesWithoutStartingAPage()
{
// make a request to the resource that is not registered in the ResourceReferenceRegistry
CharSequence urlToReference = "./wicket/resource/org.apache.wicket.request.resource.LessResourceReferenceTest/LessResourceReference.less";
[41/45] wicket git commit: - fix test error
Posted by mg...@apache.org.
- fix test error
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ce3c7c75
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ce3c7c75
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ce3c7c75
Branch: refs/heads/master
Commit: ce3c7c7551377365925c5e80bbf47528ced58401
Parents: 4c6cb67
Author: renoth <jo...@gmx.de>
Authored: Sat Sep 1 15:41:18 2018 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 26 16:17:37 2018 +0300
----------------------------------------------------------------------
testing/wicket-arquillian/pom.xml | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ce3c7c75/testing/wicket-arquillian/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-arquillian/pom.xml b/testing/wicket-arquillian/pom.xml
index d093dff..350559d 100644
--- a/testing/wicket-arquillian/pom.xml
+++ b/testing/wicket-arquillian/pom.xml
@@ -163,6 +163,13 @@
</dependency>
<dependency>
+ <groupId>org.opentest4j</groupId>
+ <artifactId>opentest4j</artifactId>
+ <version>1.1.0</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
</dependency>
[08/45] wicket git commit: wicket-core: Migrate to Junit 5
Posted by mg...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/validation/validator/CreditCardValidatorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/validation/validator/CreditCardValidatorTest.java b/wicket-core/src/test/java/org/apache/wicket/validation/validator/CreditCardValidatorTest.java
index 3407e49..9ff7d5d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/validation/validator/CreditCardValidatorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/validation/validator/CreditCardValidatorTest.java
@@ -16,24 +16,25 @@
*/
package org.apache.wicket.validation.validator;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.Validatable;
import org.apache.wicket.validation.validator.CreditCardValidator.CreditCard;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests a few valid and invalid credit card numbers.
*
* @author Joachim F. Rohde
*/
-public class CreditCardValidatorTest extends Assert
+class CreditCardValidatorTest
{
/**
* Tests a couple of credit card numbers that shouldn't be valid.
*/
@Test
- public void invalidCreditCardNumbers()
+ void invalidCreditCardNumbers()
{
// null value
CreditCardValidator test = new CreditCardValidator();
@@ -67,7 +68,7 @@ public class CreditCardValidatorTest extends Assert
* https://www.paypal.com/en_US/vhelp/paypalmanager_help/credit_card_numbers.htm
*/
@Test
- public void validCreditCardNumbers()
+ void validCreditCardNumbers()
{
// American Express
CreditCardValidator test = new CreditCardValidator();
@@ -151,7 +152,7 @@ public class CreditCardValidatorTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-3998
*/
@Test
- public void isVisa()
+ void isVisa()
{
CreditCardValidator validator = new CreditCardValidator();
assertEquals(CreditCard.VISA, validator.determineCardId("4111111111111111"));
@@ -161,7 +162,7 @@ public class CreditCardValidatorTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-5891
*/
@Test
- public void isChinaUnionPay()
+ void isChinaUnionPay()
{
CreditCardValidator validator = new CreditCardValidator();
CreditCard creditCard = validator.determineCardId("6222601010012578692");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/validation/validator/EmailValidatorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/validation/validator/EmailValidatorTest.java b/wicket-core/src/test/java/org/apache/wicket/validation/validator/EmailValidatorTest.java
index 4ce3c5c..55e353a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/validation/validator/EmailValidatorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/validation/validator/EmailValidatorTest.java
@@ -16,28 +16,30 @@
*/
package org.apache.wicket.validation.validator;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
/**
* Tests a couple of valid and invalid email patterns.
*
* @author Maurice Marrink
*/
-public class EmailValidatorTest extends Assert
+class EmailValidatorTest
{
/**
* Tests a couple of emails that should be valid.
*/
@Test
- public void testValidEmails()
+ void testValidEmails()
{
EmailAddressValidator test = new EmailAddressValidator();
String[] emails = new String[] { "b.blaat@topicus.nl", "blaat@hotmail.com",
"1.2.3.4@5.6.7.nl", "m@m.nl", "M@M.NL" };
for (String email : emails)
{
- assertTrue(email + " should be valid", test.getPattern().matcher(email).matches());
+ assertTrue(test.getPattern().matcher(email).matches(), email + " should be valid");
}
}
@@ -45,14 +47,14 @@ public class EmailValidatorTest extends Assert
* Tests a couple of emails that should not be valid.
*/
@Test
- public void testInvalidEmails()
+ void testInvalidEmails()
{
EmailAddressValidator test = new EmailAddressValidator();
String[] emails = new String[] { ".blaat@topicus.nl", "blaat.@hotmail.com", "blaat@nl",
"blaat@.nl" };
for (String email : emails)
{
- assertFalse(email + " should not be valid", test.getPattern().matcher(email).matches());
+ assertFalse(test.getPattern().matcher(email).matches(), email + " should not be valid");
}
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/validation/validator/RangeValidatorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/validation/validator/RangeValidatorTest.java b/wicket-core/src/test/java/org/apache/wicket/validation/validator/RangeValidatorTest.java
index 3a7408f..71b89b2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/validation/validator/RangeValidatorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/validation/validator/RangeValidatorTest.java
@@ -16,26 +16,26 @@
*/
package org.apache.wicket.validation.validator;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.Validatable;
import org.apache.wicket.validation.ValidationError;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests range validator
*
* @author igor.vaynberg
*/
-public class RangeValidatorTest
+class RangeValidatorTest
{
/**
* @throws Exception
*/
@Test
- public void doubleRange() throws Exception
+ void doubleRange() throws Exception
{
IValidator<Double> validator = new RangeValidator<Double>(1.1, 1.8);
@@ -65,7 +65,7 @@ public class RangeValidatorTest
* @throws Exception
*/
@Test
- public void integerRange() throws Exception
+ void integerRange() throws Exception
{
IValidator<Integer> validator = new RangeValidator<Integer>(1, 8);
@@ -92,7 +92,7 @@ public class RangeValidatorTest
}
@Test
- public void resourceKeys()
+ void resourceKeys()
{
Validatable<Integer> validatable = new Validatable<Integer>(10);
@@ -118,7 +118,7 @@ public class RangeValidatorTest
}
@Test
- public void onlyMinValue()
+ void onlyMinValue()
{
IValidator<Integer> validator = new RangeValidator<Integer>(1, null);
@@ -128,7 +128,7 @@ public class RangeValidatorTest
}
@Test
- public void onlyMaxValue()
+ void onlyMaxValue()
{
IValidator<Integer> validator = new RangeValidator<Integer>(null, 1);
@@ -141,7 +141,7 @@ public class RangeValidatorTest
* WICKET-4717
*/
@Test
- public void exact()
+ void exact()
{
IValidator<Integer> validator = new RangeValidator<Integer>(1, 1);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/validation/validator/UrlValidatorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/validation/validator/UrlValidatorTest.java b/wicket-core/src/test/java/org/apache/wicket/validation/validator/UrlValidatorTest.java
index 236720a..07e4788 100644
--- a/wicket-core/src/test/java/org/apache/wicket/validation/validator/UrlValidatorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/validation/validator/UrlValidatorTest.java
@@ -16,16 +16,18 @@
*/
package org.apache.wicket.validation.validator;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* {@link UrlValidator} test
*
* @author igor.vaynberg
*/
-public class UrlValidatorTest extends Assert
+class UrlValidatorTest
{
private final boolean printStatus = false;
@@ -37,8 +39,8 @@ public class UrlValidatorTest extends Assert
/**
*
*/
- @Before
- public void setUp()
+ @BeforeEach
+ void setUp()
{
for (int index = 0; index < testPartsIndex.length - 1; index++)
{
@@ -50,7 +52,7 @@ public class UrlValidatorTest extends Assert
* WICKET-5112
*/
@Test
- public void testParentheses()
+ void testParentheses()
{
String[] schemes = { "http" };
UrlValidator urlValidator = new UrlValidator(schemes);
@@ -61,7 +63,7 @@ public class UrlValidatorTest extends Assert
* test
*/
@Test
- public void testIsValid()
+ void testIsValid()
{
testIsValid(testUrlParts, UrlValidator.ALLOW_ALL_SCHEMES);
setUp();
@@ -75,7 +77,7 @@ public class UrlValidatorTest extends Assert
* test
*/
@Test
- public void testIsValidScheme()
+ void testIsValidScheme()
{
if (printStatus)
{
@@ -87,7 +89,7 @@ public class UrlValidatorTest extends Assert
for (ResultPair testPair : testScheme)
{
boolean result = urlVal.isValidScheme(testPair.item);
- assertEquals(testPair.item, testPair.valid, result);
+ assertEquals(testPair.valid, result, testPair.item);
if (printStatus)
{
if (result == testPair.valid)
@@ -158,7 +160,7 @@ public class UrlValidatorTest extends Assert
{
System.out.println(output + " - " + expected + " - " + url);
}
- assertEquals(url, expected, result);
+ assertEquals(expected, result, url);
if (printStatus)
{
if (printIndex)
@@ -195,7 +197,7 @@ public class UrlValidatorTest extends Assert
* test
*/
@Test
- public void testValidator202()
+ void testValidator202()
{
String[] schemes = { "http", "https" };
UrlValidator urlValidator = new UrlValidator(schemes, UrlValidator.NO_FRAGMENTS);
@@ -206,7 +208,7 @@ public class UrlValidatorTest extends Assert
* test
*/
@Test
- public void testValidator204()
+ void testValidator204()
{
String[] schemes = { "http", "https" };
UrlValidator UrlValidator = new UrlValidator(schemes);
@@ -217,7 +219,7 @@ public class UrlValidatorTest extends Assert
* test
*/
@Test
- public void testValidator206()
+ void testValidator206()
{
UrlValidator urlVal = new UrlValidator(null, UrlValidator.ALLOW_ALL_SCHEMES);
assertTrue(urlVal.isValid("http://user@host:80/path"));
@@ -230,7 +232,7 @@ public class UrlValidatorTest extends Assert
* @param testParts
* @return boolean
*/
- static boolean incrementTestPartsIndex(int[] testPartsIndex, Object[] testParts)
+ private static boolean incrementTestPartsIndex(int[] testPartsIndex, Object[] testParts)
{
boolean carry = true; // add 1 to lowest order part.
boolean maxIndex = true;
@@ -289,12 +291,12 @@ public class UrlValidatorTest extends Assert
* permutations. A complete URL is composed of a scheme+authority+port+path+query, all of which
* must be individually valid for the entire URL to be considered valid.
*/
- ResultPair[] testUrlScheme = { new ResultPair("http://", true), new ResultPair("ftp://", true),
+ private ResultPair[] testUrlScheme = { new ResultPair("http://", true), new ResultPair("ftp://", true),
new ResultPair("h3t://", true), new ResultPair("3ht://", false),
new ResultPair("http:/", false), new ResultPair("http:", false),
new ResultPair("http/", false), new ResultPair("://", false), new ResultPair("", true) };
- ResultPair[] testUrlAuthority = { new ResultPair("www.google.com", true),
+ private ResultPair[] testUrlAuthority = { new ResultPair("www.google.com", true),
new ResultPair("go.com", true), new ResultPair("go.au", true),
new ResultPair("0.0.0.0", true), new ResultPair("255.255.255.255", true),
new ResultPair("256.256.256.256", false), new ResultPair("255.com", true),
@@ -308,17 +310,17 @@ public class UrlValidatorTest extends Assert
* , new ResultPair("", false) In combination with "http:/" + "/test1" the expected result is
* true
*/};
- ResultPair[] testUrlPort = { new ResultPair(":80", true), new ResultPair(":65535", true),
+ private ResultPair[] testUrlPort = { new ResultPair(":80", true), new ResultPair(":65535", true),
new ResultPair(":0", true), new ResultPair("", true), new ResultPair(":-1", false),
new ResultPair(":65636", true), new ResultPair(":65a", false) };
- ResultPair[] testPath = { new ResultPair("/test1", true), new ResultPair("/t123", true),
+ private ResultPair[] testPath = { new ResultPair("/test1", true), new ResultPair("/t123", true),
new ResultPair("/$23", true), new ResultPair("/..", false),
new ResultPair("/../", false), new ResultPair("/test1/", true),
new ResultPair("", true), new ResultPair("/test1/file", true),
new ResultPair("/..//file", false), new ResultPair("/test1//file", false),
new ResultPair("/this_one_is_tricky...but...still.....valid", true) };
// Test allow2slash, noFragment
- ResultPair[] testUrlPathOptions = { new ResultPair("/test1", true),
+ private ResultPair[] testUrlPathOptions = { new ResultPair("/test1", true),
new ResultPair("/t123", true), new ResultPair("/$23", true),
new ResultPair("/..", false), new ResultPair("/../", false),
new ResultPair("/test1/", true), new ResultPair("/#", false), new ResultPair("", true),
@@ -327,25 +329,25 @@ public class UrlValidatorTest extends Assert
new ResultPair("/..//file", false), new ResultPair("/test1//file", true),
new ResultPair("/#/file", false) };
- ResultPair[] testUrlQuery = { new ResultPair("?action=view", true),
+ private ResultPair[] testUrlQuery = { new ResultPair("?action=view", true),
new ResultPair("?action=edit&mode=up", true), new ResultPair("", true) };
- Object[] testUrlParts = { testUrlScheme, testUrlAuthority, testUrlPort, testPath, testUrlQuery };
- Object[] testUrlPartsOptions = { testUrlScheme, testUrlAuthority, testUrlPort,
+ private Object[] testUrlParts = { testUrlScheme, testUrlAuthority, testUrlPort, testPath, testUrlQuery };
+ private Object[] testUrlPartsOptions = { testUrlScheme, testUrlAuthority, testUrlPort,
testUrlPathOptions, testUrlQuery };
- int[] testPartsIndex = { 0, 0, 0, 0, 0 };
+ private int[] testPartsIndex = { 0, 0, 0, 0, 0 };
// ---------------- Test data for individual url parts ----------------
- ResultPair[] testScheme = { new ResultPair("http", true), new ResultPair("ftp", false),
+ private ResultPair[] testScheme = { new ResultPair("http", true), new ResultPair("ftp", false),
new ResultPair("httpd", false), new ResultPair("telnet", false) };
class ResultPair
{
- public String item;
- public boolean valid;
+ String item;
+ boolean valid;
- public ResultPair(String item, boolean valid)
+ ResultPair(String item, boolean valid)
{
this.item = item;
this.valid = valid; // Weather the individual part of url is valid.
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/versioning/PageVersioningTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/versioning/PageVersioningTest.java b/wicket-core/src/test/java/org/apache/wicket/versioning/PageVersioningTest.java
index 9ac60fc..6f10ada 100644
--- a/wicket-core/src/test/java/org/apache/wicket/versioning/PageVersioningTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/versioning/PageVersioningTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.versioning;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.apache.wicket.IPageManagerProvider;
import org.apache.wicket.Page;
@@ -30,22 +30,22 @@ import org.apache.wicket.pageStore.IDataStore;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.serialize.java.JavaSerializer;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.After;
-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;
/**
* A test for page versioning
*/
-public class PageVersioningTest
+class PageVersioningTest
{
- WicketTester wicketTester;
+ private WicketTester wicketTester;
/**
* setup()
*/
- @Before
- public void setup()
+ @BeforeEach
+ void setup()
{
final PageVersioningApplication application = new PageVersioningApplication();
@@ -81,8 +81,8 @@ public class PageVersioningTest
/**
*/
- @After
- public void after()
+ @AfterEach
+ void after()
{
wicketTester.destroy();
}
@@ -91,7 +91,7 @@ public class PageVersioningTest
* versionPage()
*/
@Test
- public void versionPage()
+ void versionPage()
{
Page versioningPage = wicketTester.startPage(VersioningTestPage.class);
[23/45] wicket git commit: wicket-core: Migrate to Junit 5
Posted by mg...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/util/string/JavaScriptUtilsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/util/string/JavaScriptUtilsTest.java b/wicket-core/src/test/java/org/apache/wicket/core/util/string/JavaScriptUtilsTest.java
index 1c7f5c4..d89a036 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/util/string/JavaScriptUtilsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/util/string/JavaScriptUtilsTest.java
@@ -16,14 +16,15 @@
*/
package org.apache.wicket.core.util.string;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.response.StringResponse;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @since 1.5.7
*/
-public class JavaScriptUtilsTest extends Assert
+class JavaScriptUtilsTest
{
/**
* https://issues.apache.org/jira/browse/WICKET-4546
@@ -31,7 +32,7 @@ public class JavaScriptUtilsTest extends Assert
* @throws Exception
*/
@Test
- public void writeJavaScriptUrl() throws Exception
+ void writeJavaScriptUrl() throws Exception
{
StringResponse response = new StringResponse();
String url = "some/url;jsessionid=1234?p1=v1&p2=v2";
@@ -49,7 +50,7 @@ public class JavaScriptUtilsTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-5715
*/
@Test
- public void writeJavaScriptUrlAsync()
+ void writeJavaScriptUrlAsync()
{
StringResponse response = new StringResponse();
String url = "some/url;jsessionid=1234?p1=v1&p2=v2";
@@ -67,7 +68,7 @@ public class JavaScriptUtilsTest extends Assert
/**
*/
@Test
- public void writeJavaScript()
+ void writeJavaScript()
{
StringResponse response = new StringResponse();
JavaScriptUtils.writeJavaScript(response,
@@ -83,7 +84,7 @@ public class JavaScriptUtilsTest extends Assert
/**
*/
@Test
- public void scriptTag()
+ void scriptTag()
{
assertEquals("<script type=\"text/javascript\">\n/*<![CDATA[*/\n",
JavaScriptUtils.SCRIPT_OPEN_TAG);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererInstanceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererInstanceTest.java b/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererInstanceTest.java
index fe5aafb..dcf98bc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererInstanceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererInstanceTest.java
@@ -16,33 +16,33 @@
*/
package org.apache.wicket.core.util.string.componentrenderer;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.wicket.core.util.string.ComponentRenderer;
import org.apache.wicket.markup.html.basic.Label;
-import org.junit.After;
-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;
/**
* Tests for {@link ComponentRenderer}
*/
-public class ComponentRendererInstanceTest
+class ComponentRendererInstanceTest
{
private ComponentRenderer renderer;
- @Before
- public void setup() {
+ @BeforeEach
+ void setup() {
renderer = new ComponentRenderer();
}
- @After
- public void destroy() {
+ @AfterEach
+ void destroy() {
renderer.destroy();
}
@Test
- public void render()
+ void render()
{
CharSequence html = renderer.renderComponent(() -> new Label("id", "Hello renderer"));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererTest.java b/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererTest.java
index 56573b0..515ee34 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererTest.java
@@ -16,14 +16,16 @@
*/
package org.apache.wicket.core.util.string.componentrenderer;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.core.util.string.ComponentRenderer;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for ComponentRenderer
*/
-public class ComponentRendererTest extends WicketTestCase
+class ComponentRendererTest extends WicketTestCase
{
/**
@@ -33,7 +35,7 @@ public class ComponentRendererTest extends WicketTestCase
* Enclosure won't know its child component without being initialized
*/
@Test
- public void componentsAreInitialized()
+ void componentsAreInitialized()
{
ComponentRenderer.renderComponent(new EnclosurePanel("anyId"));
}
@@ -45,7 +47,7 @@ public class ComponentRendererTest extends WicketTestCase
* markup if available
*/
@Test
- public void renderListViewItems()
+ void renderListViewItems()
{
PageWithRepeater page = new PageWithRepeater();
CharSequence listViewOutput = ComponentRenderer.renderComponent(page.get("listView"));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/BasePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/BasePage.java b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/BasePage.java
index 93cde7d..542e642 100644
--- a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/BasePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/BasePage.java
@@ -26,7 +26,7 @@ import org.apache.wicket.model.IModel;
class BasePage extends WebPage {
private static final long serialVersionUID = 1L;
- public BasePage() {
+ BasePage() {
add(new Label("className", new IModel<String>() {
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageOnePassRenderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageOnePassRenderTest.java b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageOnePassRenderTest.java
index 9a0d771..2e77026 100644
--- a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageOnePassRenderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageOnePassRenderTest.java
@@ -23,7 +23,7 @@ import org.apache.wicket.settings.RequestCycleSettings;
/**
* https://issues.apache.org/jira/browse/WICKET-5415
*/
-public class DontStoreNotRenderedPageOnePassRenderTest extends DontStoreNotRenderedPageTestCase
+class DontStoreNotRenderedPageOnePassRenderTest extends DontStoreNotRenderedPageTestCase
{
@Override
protected WebApplication newApplication()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToBufferTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToBufferTest.java b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToBufferTest.java
index 5dfadf9..45fed79 100644
--- a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToBufferTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToBufferTest.java
@@ -23,7 +23,7 @@ import org.apache.wicket.settings.RequestCycleSettings;
/**
* https://issues.apache.org/jira/browse/WICKET-5415
*/
-public class DontStoreNotRenderedPageRedirectToBufferTest extends DontStoreNotRenderedPageTestCase
+class DontStoreNotRenderedPageRedirectToBufferTest extends DontStoreNotRenderedPageTestCase
{
@Override
protected WebApplication newApplication()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToRenderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToRenderTest.java b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToRenderTest.java
index 3c46306..a8bdf8a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToRenderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToRenderTest.java
@@ -23,7 +23,7 @@ import org.apache.wicket.settings.RequestCycleSettings;
/**
* https://issues.apache.org/jira/browse/WICKET-5415
*/
-public class DontStoreNotRenderedPageRedirectToRenderTest extends DontStoreNotRenderedPageTestCase
+class DontStoreNotRenderedPageRedirectToRenderTest extends DontStoreNotRenderedPageTestCase
{
@Override
protected WebApplication newApplication()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageTestCase.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageTestCase.java b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageTestCase.java
index fe1875b..ceac5e3 100644
--- a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageTestCase.java
+++ b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageTestCase.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.dontstoreunrendered;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
import org.apache.wicket.Component;
import org.apache.wicket.IPageManagerProvider;
import org.apache.wicket.application.IComponentInstantiationListener;
@@ -27,13 +29,12 @@ import org.apache.wicket.page.IPageManagerContext;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* https://issues.apache.org/jira/browse/WICKET-5415
*/
-public abstract class DontStoreNotRenderedPageTestCase extends WicketTestCase
+abstract class DontStoreNotRenderedPageTestCase extends WicketTestCase
{
@Override
protected WicketTester newWicketTester(WebApplication app)
@@ -65,7 +66,7 @@ public abstract class DontStoreNotRenderedPageTestCase extends WicketTestCase
@Override
public void touchPage(IManageablePage page)
{
- Assert.assertFalse("PageB should not be touched!", page instanceof PageB);
+ assertFalse(page instanceof PageB, "PageB should not be touched!");
super.touchPage(page);
}
};
@@ -76,16 +77,14 @@ public abstract class DontStoreNotRenderedPageTestCase extends WicketTestCase
}
/**
- * Start with PageA.
- * Then click a link to go to PageB.
- * PageB throws a RestartResponseException(PageC) in its constructor, so
- * it shouldn't be neither initialized nor rendered.
- * PageC is rendered.
+ * Start with PageA. Then click a link to go to PageB. PageB throws a
+ * RestartResponseException(PageC) in its constructor, so it shouldn't be neither initialized
+ * nor rendered. PageC is rendered.
*
* Verifies that PageB is not initialized, rendered and stored by PageManager
*/
@Test
- public void dontStoreNotRenderedPage()
+ void dontStoreNotRenderedPage()
{
tester.startPage(PageA.class);
tester.clickLink("goToB");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/feedback/FeedbackRenderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/feedback/FeedbackRenderTest.java b/wicket-core/src/test/java/org/apache/wicket/feedback/FeedbackRenderTest.java
index c12fb2a..714dfd9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/feedback/FeedbackRenderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/feedback/FeedbackRenderTest.java
@@ -16,21 +16,23 @@
*/
package org.apache.wicket.feedback;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.Component;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test calling of {@link Component#beforeRender()} for {@link IFeedback} components.
*/
-public class FeedbackRenderTest extends WicketTestCase
+class FeedbackRenderTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void test() throws Exception
+ void test() throws Exception
{
final FeedbacksPage page = new FeedbacksPage();
@@ -44,7 +46,7 @@ public class FeedbackRenderTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void testAjax() throws Exception
+ void testAjax() throws Exception
{
final FeedbacksPage page = new FeedbacksPage();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/intercept/InterceptDataCleanedAfterReadTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/intercept/InterceptDataCleanedAfterReadTest.java b/wicket-core/src/test/java/org/apache/wicket/intercept/InterceptDataCleanedAfterReadTest.java
index f6ac2ee..a2354d4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/intercept/InterceptDataCleanedAfterReadTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/intercept/InterceptDataCleanedAfterReadTest.java
@@ -19,12 +19,12 @@ package org.apache.wicket.intercept;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* https://issues.apache.org/jira/browse/WICKET-4066
*/
-public class InterceptDataCleanedAfterReadTest extends WicketTestCase
+class InterceptDataCleanedAfterReadTest extends WicketTestCase
{
@Override
protected WebApplication newApplication()
@@ -38,7 +38,7 @@ public class InterceptDataCleanedAfterReadTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-4066
*/
@Test
- public void wicket4066()
+ void wicket4066()
{
// go to a secured page (a redirect to LoginPage with interception will be done)
tester.startPage(SecurePage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/intercept/Wicket4066Application.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/intercept/Wicket4066Application.java b/wicket-core/src/test/java/org/apache/wicket/intercept/Wicket4066Application.java
index cbee61e..ae134b1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/intercept/Wicket4066Application.java
+++ b/wicket-core/src/test/java/org/apache/wicket/intercept/Wicket4066Application.java
@@ -24,7 +24,7 @@ import org.apache.wicket.request.Response;
* Application object for your web application. If you want to run this application without
* deploying, run the Start class.
*/
-public class Wicket4066Application extends WebApplication
+class Wicket4066Application extends WebApplication
{
@Override
public Class<HomePage> getHomePage()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/ComponentTagAttributeEscapingTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/ComponentTagAttributeEscapingTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/ComponentTagAttributeEscapingTest.java
index 222244e..4509edc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/ComponentTagAttributeEscapingTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/ComponentTagAttributeEscapingTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.form.Button;
@@ -23,35 +25,36 @@ 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;
/**
* @author Pedro Santos
*/
-public class ComponentTagAttributeEscapingTest extends WicketTestCase
+class ComponentTagAttributeEscapingTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void componentAttributesNotDoubleEscaped() throws Exception
+ void componentAttributesNotDoubleEscaped() throws Exception
{
tester.startPage(ButtonValuePage.class);
String response = tester.getLastResponseAsString();
-// System.out.println(response);
- assertTrue("One of the pound entity representations is missing: £ or £",
- response.contains("\u00a3\u00a3"));
- assertTrue("must not be double escaped", response.contains("Watch escaped value: >>"));
- assertTrue("following the last assert logic, this one would true",
- response.contains("alerting: &"));
- assertTrue("escape manually added attributes",
- response.contains("some_attribute=\"a & b\""));
+// System.out.println(response);
+ assertTrue(response.contains("\u00a3\u00a3"),
+ "One of the pound entity representations is missing: £ or £");
+ assertTrue(response.contains("Watch escaped value: >>"),
+ "must not be double escaped");
+ assertTrue(response.contains("alerting: &"),
+ "following the last assert logic, this one would true");
+ assertTrue(response.contains("some_attribute=\"a & b\""),
+ "escape manually added attributes");
}
/**
* Just two distinct components with escaped characters in markup attribute.
- * */
+ */
public static class ButtonValuePage extends WebPage implements IMarkupResourceStreamProvider
{
/** */
@@ -60,7 +63,7 @@ public class ComponentTagAttributeEscapingTest extends WicketTestCase
/**
* Construct.
*/
- public ButtonValuePage()
+ public ButtonValuePage()
{
add(new Button("button"));
add(new Link<Void>("link")
@@ -86,13 +89,14 @@ public class ComponentTagAttributeEscapingTest extends WicketTestCase
public IResourceStream getMarkupResourceStream(MarkupContainer container,
Class<?> containerClass)
{
- return new StringResourceStream(
- "<html>"//
- + "<body>"//
- + "<a wicket:id=\"link\" onclick=\"alert('alerting: & ££ ')\">link</a>"//
- + "<input type=\"submit\" wicket:id=\"button\" value=\"Watch escaped value: >>\"/>"//
- + "</body>" + //
- "</html>");
+ return new StringResourceStream("<html>"//
+ + "<body>"//
+ +
+ "<a wicket:id=\"link\" onclick=\"alert('alerting: & ££ ')\">link</a>"//
+ +
+ "<input type=\"submit\" wicket:id=\"button\" value=\"Watch escaped value: >>\"/>"//
+ + "</body>" + //
+ "</html>");
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProviderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProviderTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProviderTest.java
index 909a2ec..c369d2a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProviderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProviderTest.java
@@ -16,22 +16,24 @@
*/
package org.apache.wicket.markup;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.Locale;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link DefaultMarkupCacheKeyProvider}.
*/
-public class DefaultMarkupCacheKeyProviderTest extends WicketTestCase
+class DefaultMarkupCacheKeyProviderTest extends WicketTestCase
{
/**
*/
@Test
- public void localeLanguageCountryVariant()
+ void localeLanguageCountryVariant()
{
DefaultMarkupCacheKeyProvider provider = new DefaultMarkupCacheKeyProvider();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/HtmlProblemFinderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/HtmlProblemFinderTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/HtmlProblemFinderTest.java
index c9215ea..9a19359 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/HtmlProblemFinderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/HtmlProblemFinderTest.java
@@ -16,31 +16,31 @@
*/
package org.apache.wicket.markup;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.wicket.markup.parser.filter.HtmlProblemFinder;
import org.apache.wicket.markup.parser.filter.RelativePathPrefixHandler;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* @author Juergen Donnerstag
*/
-public class HtmlProblemFinderTest extends WicketTestCase
+class HtmlProblemFinderTest extends WicketTestCase
{
/**
* @throws Exception
*/
- @Test(expected = MarkupException.class)
- public void problemFinder() throws Exception
+ @Test
+ void problemFinder() throws Exception
{
final MarkupParser parser = new MarkupParser("<img src=\"\"/>");
parser.add(new HtmlProblemFinder(HtmlProblemFinder.ERR_THROW_EXCEPTION),
RelativePathPrefixHandler.class);
- parser.parse();
- assertTrue("Should have thrown an exception", false);
-
+ assertThrows(MarkupException.class, () -> {
+ parser.parse();
+ });
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java
index 8a8b9d2..1d84cf6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java
@@ -16,19 +16,23 @@
*/
package org.apache.wicket.markup;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.wicket.Application;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.html.panel.Panel;
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;
/**
* @author Timo Rantalaiho
*/
-public class MarkupCacheTest extends WicketTestCase
+class MarkupCacheTest extends WicketTestCase
{
private MarkupCache cache;
private MarkupCachingAssumingComponent component;
@@ -36,8 +40,8 @@ public class MarkupCacheTest extends WicketTestCase
/**
*
*/
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
cache = new MarkupCache();
@@ -58,7 +62,7 @@ public class MarkupCacheTest extends WicketTestCase
* testMarkupNotFoundInformationIsCachedInDeploymentMode()
*/
@Test
- public void markupNotFoundInformationIsCachedInDeploymentMode()
+ void markupNotFoundInformationIsCachedInDeploymentMode()
{
IMarkupFragment markup = cache.getMarkup(component, null, false);
assertNotNull(markup);
@@ -71,7 +75,7 @@ public class MarkupCacheTest extends WicketTestCase
* testRemoveMarkupWhereBaseMarkupIsNoLongerInTheCache()
*/
@Test
- public void removeMarkupWhereBaseMarkupIsNoLongerInTheCache()
+ void removeMarkupWhereBaseMarkupIsNoLongerInTheCache()
{
tester.startPage(MarkupInheritanceExtension_1.class);
tester.assertRenderedPage(MarkupInheritanceExtension_1.class);
@@ -94,7 +98,7 @@ public class MarkupCacheTest extends WicketTestCase
private static final long serialVersionUID = -6743937191677599322L;
private boolean firstCall = true;
- public MarkupCachingAssumingComponent(final String id)
+ MarkupCachingAssumingComponent(final String id)
{
super(id);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupFragmentTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupFragmentTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupFragmentTest.java
index e65a866..12b767d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupFragmentTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupFragmentTest.java
@@ -16,27 +16,26 @@
*/
package org.apache.wicket.markup;
-import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.ArrayList;
import java.util.List;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
+import org.apache.wicket.util.tester.WicketTestCase;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Tests for {@link MarkupFragment}
*/
-public class MarkupFragmentTest extends WicketTestCase
+class MarkupFragmentTest extends WicketTestCase
{
private static final Logger LOG = LoggerFactory.getLogger(MarkupFragmentTest.class);
/** */
@Test
- public void iteratorSameAsSizeForMarkup()
+ void iteratorSameAsSizeForMarkup()
{
Markup markup = Markup.of("<body wicket:id='body'><div wicket:id='label'> text </div></body>");
@@ -65,7 +64,7 @@ public class MarkupFragmentTest extends WicketTestCase
/** */
@Test
- public void iteratorSameAsSizeForMarkupFragment()
+ void iteratorSameAsSizeForMarkupFragment()
{
Markup markup = Markup.of("<body wicket:id='body'><div wicket:id='label'> text </div></body>");
MarkupFragment fragment = new MarkupFragment(markup, 1);
@@ -97,7 +96,7 @@ public class MarkupFragmentTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-4136
*/
@Test
- public void createMarkupFragmentOnOpenTag()
+ void createMarkupFragmentOnOpenTag()
{
Markup markup = Markup.of("<body><img wicket:id='photo'><span wicket:id='label'/></body>");
MarkupFragment fragment = new MarkupFragment(markup, 1);
@@ -109,7 +108,7 @@ public class MarkupFragmentTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-6339
*/
@Test
- public void iteratorMustBeSameAsGetByIndex() {
+ void iteratorMustBeSameAsGetByIndex() {
// test markup
Markup markup = Markup.of("<html><body><wicket:panel><wicket:container wicket:id='content'><a wicket:id='link' href='https://www.google.de'>Test</a></wicket:container></wicket:panel></body></html>");
@@ -130,6 +129,6 @@ public class MarkupFragmentTest extends WicketTestCase
}
// elements from iterator should match the ones from the get(i) method
- assertThat(getElements, is(equalTo(iteratorElements)));
+ assertEquals(iteratorElements, getElements);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_11.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_11.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_11.java
index 9ef2dd6..8aaf523 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_11.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_11.java
@@ -31,7 +31,7 @@ public class MarkupInheritanceBaseBase_11 extends WebPage
/**
* Construct.
*/
- public MarkupInheritanceBaseBase_11()
+ MarkupInheritanceBaseBase_11()
{
WebMarkupContainer css = new WebMarkupContainer("css");
css.add(AttributeModifier.replace("src", Model.of("myStyle.css")));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_13.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_13.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_13.java
index 3af7927..6a41819 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_13.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_13.java
@@ -29,7 +29,7 @@ public class MarkupInheritanceBaseBase_13 extends WebPage
* Construct.
*
*/
- public MarkupInheritanceBaseBase_13()
+ MarkupInheritanceBaseBase_13()
{
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_3.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_3.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_3.java
index 79149dd..b050ae8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_3.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_3.java
@@ -29,7 +29,7 @@ public class MarkupInheritanceBaseBase_3 extends WebPage
* Construct.
*
*/
- public MarkupInheritanceBaseBase_3()
+ MarkupInheritanceBaseBase_3()
{
// add(new Label("label1", "baseBase label 1"));
// add(new Label("label2", "baseBase label 2"));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBasePanel_6.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBasePanel_6.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBasePanel_6.java
index 344c86f..13fc672 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBasePanel_6.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBasePanel_6.java
@@ -31,7 +31,7 @@ public class MarkupInheritanceBasePanel_6 extends Panel
*
* @param id
*/
- public MarkupInheritanceBasePanel_6(final String id)
+ MarkupInheritanceBasePanel_6(final String id)
{
super(id);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBasePanel_9.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBasePanel_9.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBasePanel_9.java
index 37f37e3..2e024ad 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBasePanel_9.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBasePanel_9.java
@@ -31,7 +31,7 @@ public class MarkupInheritanceBasePanel_9 extends Panel
*
* @param id
*/
- public MarkupInheritanceBasePanel_9(final String id)
+ MarkupInheritanceBasePanel_9(final String id)
{
super(id);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_1.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_1.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_1.java
index 8756c15..05663e2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_1.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_1.java
@@ -28,7 +28,7 @@ public class MarkupInheritanceBase_1 extends WebPage
/**
* Construct.
*/
- public MarkupInheritanceBase_1()
+ MarkupInheritanceBase_1()
{
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_10.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_10.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_10.java
index 8ccb555..eba0585 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_10.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_10.java
@@ -31,7 +31,7 @@ public class MarkupInheritanceBase_10 extends WebPage
/**
* Construct.
*/
- public MarkupInheritanceBase_10()
+ MarkupInheritanceBase_10()
{
WebMarkupContainer css = new WebMarkupContainer("css");
css.add(AttributeModifier.replace("src", Model.of("myStyle.css")));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_11.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_11.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_11.java
index 2b27341..6b210b7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_11.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_11.java
@@ -28,7 +28,7 @@ public class MarkupInheritanceBase_11 extends MarkupInheritanceBaseBase_11
* Construct.
*
*/
- public MarkupInheritanceBase_11()
+ MarkupInheritanceBase_11()
{
super();
add(new Label("label3", "base label 3"));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_12.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_12.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_12.java
index e58acdd..b389134 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_12.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_12.java
@@ -34,7 +34,7 @@ public class MarkupInheritanceBase_12 extends WebPage
* Construct.
*
*/
- public MarkupInheritanceBase_12()
+ MarkupInheritanceBase_12()
{
add(new Label("label1", new PropertyModel<Integer>(this, "counter")));
add(new Link<Void>("link")
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_13.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_13.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_13.java
index 583551c..19a07fa 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_13.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_13.java
@@ -27,7 +27,7 @@ public class MarkupInheritanceBase_13 extends MarkupInheritanceBaseBase_13
* Construct.
*
*/
- public MarkupInheritanceBase_13()
+ MarkupInheritanceBase_13()
{
super();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_2.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_2.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_2.java
index d9aaf7f..bdbb679 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_2.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_2.java
@@ -30,7 +30,7 @@ public class MarkupInheritanceBase_2 extends WebPage
* Construct.
*
*/
- public MarkupInheritanceBase_2()
+ MarkupInheritanceBase_2()
{
add(new Label("label1", "base label 1"));
add(new Label("label2", "base label 2"));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_3.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_3.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_3.java
index 414ca76..517e4af 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_3.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_3.java
@@ -27,7 +27,7 @@ public class MarkupInheritanceBase_3 extends MarkupInheritanceBaseBase_3
* Construct.
*
*/
- public MarkupInheritanceBase_3()
+ MarkupInheritanceBase_3()
{
super();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_4.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_4.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_4.java
index 7d0e3d4..d09b995 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_4.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_4.java
@@ -34,7 +34,7 @@ public class MarkupInheritanceBase_4 extends WebPage
* Construct.
*
*/
- public MarkupInheritanceBase_4()
+ MarkupInheritanceBase_4()
{
add(new Label("label1", new PropertyModel<Integer>(this, "counter")));
add(new Link<Void>("link")
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_5.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_5.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_5.java
index 292be5a..1734944 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_5.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_5.java
@@ -34,7 +34,7 @@ public class MarkupInheritanceBase_5 extends WebPage
* Construct.
*
*/
- public MarkupInheritanceBase_5()
+ MarkupInheritanceBase_5()
{
add(new Label("label1", new PropertyModel<Integer>(this, "counter")));
add(new Link<Void>("link")
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_7.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_7.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_7.java
index 02c669c..889872e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_7.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_7.java
@@ -34,7 +34,7 @@ public class MarkupInheritanceBase_7 extends WebPage
* Construct.
*
*/
- public MarkupInheritanceBase_7()
+ MarkupInheritanceBase_7()
{
add(new Label("label1", new PropertyModel<Integer>(this, "counter")));
add(new Link<Void>("link")
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_8.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_8.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_8.java
index f98b4a6..4c7a570 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_8.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_8.java
@@ -29,7 +29,7 @@ public class MarkupInheritanceBase_8 extends WebPage
* Construct.
*
*/
- public MarkupInheritanceBase_8()
+ MarkupInheritanceBase_8()
{
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java
index edc4c4b..4bc494e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java
@@ -16,17 +16,18 @@
*/
package org.apache.wicket.markup;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.util.tester.DiffUtil;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
*/
-public class MarkupInheritanceTest extends WicketTestCase
+class MarkupInheritanceTest extends WicketTestCase
{
private static final Logger log = LoggerFactory.getLogger(MarkupInheritanceTest.class);
@@ -36,7 +37,7 @@ public class MarkupInheritanceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderChildPageWithStyleVariation() throws Exception
+ void renderChildPageWithStyleVariation() throws Exception
{
// first, render page with no style
executeTest(MarkupInheritanceExtension_1.class, "MarkupInheritanceExpectedResult_1.html");
@@ -58,7 +59,7 @@ public class MarkupInheritanceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_1() throws Exception
+ void renderHomePage_1() throws Exception
{
executeTest(MarkupInheritanceExtension_1.class, "MarkupInheritanceExpectedResult_1.html");
}
@@ -67,7 +68,7 @@ public class MarkupInheritanceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_2() throws Exception
+ void renderHomePage_2() throws Exception
{
executeTest(MarkupInheritanceExtension_2.class, "MarkupInheritanceExpectedResult_2.html");
}
@@ -76,7 +77,7 @@ public class MarkupInheritanceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_3() throws Exception
+ void renderHomePage_3() throws Exception
{
executeTest(MarkupInheritanceExtension_3.class, "MarkupInheritanceExpectedResult_3.html");
}
@@ -85,7 +86,7 @@ public class MarkupInheritanceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_4() throws Exception
+ void renderHomePage_4() throws Exception
{
System.out.println("=== " + MarkupInheritanceExtension_4.class.getName() + " ===");
@@ -112,7 +113,7 @@ public class MarkupInheritanceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_5() throws Exception
+ void renderHomePage_5() throws Exception
{
executeTest(MarkupInheritanceExtension_5.class, "MarkupInheritanceExpectedResult_5.html");
}
@@ -121,7 +122,7 @@ public class MarkupInheritanceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_6() throws Exception
+ void renderHomePage_6() throws Exception
{
executeTest(MarkupInheritancePage_6.class, "MarkupInheritanceExpectedResult_6.html");
}
@@ -130,7 +131,7 @@ public class MarkupInheritanceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_7() throws Exception
+ void renderHomePage_7() throws Exception
{
executeTest(MarkupInheritanceExtension_7.class, "MarkupInheritanceExpectedResult_7.html");
}
@@ -139,7 +140,7 @@ public class MarkupInheritanceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_8() throws Exception
+ void renderHomePage_8() throws Exception
{
tester.getApplication().getMarkupSettings().setStripWicketTags(true);
executeTest(MarkupInheritanceExtension_8.class, "MarkupInheritanceExpectedResult_8.html");
@@ -149,7 +150,7 @@ public class MarkupInheritanceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_9() throws Exception
+ void renderHomePage_9() throws Exception
{
executeTest(MarkupInheritancePage_9.class, "MarkupInheritanceExpectedResult_9.html");
}
@@ -158,7 +159,7 @@ public class MarkupInheritanceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_10() throws Exception
+ void renderHomePage_10() throws Exception
{
executeTest(MarkupInheritanceExtension_10.class, "MarkupInheritanceExpectedResult_10.html");
}
@@ -167,7 +168,7 @@ public class MarkupInheritanceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_11() throws Exception
+ void renderHomePage_11() throws Exception
{
executeTest(MarkupInheritanceExtension_11.class, "MarkupInheritanceExpectedResult_11.html");
}
@@ -176,7 +177,7 @@ public class MarkupInheritanceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_12() throws Exception
+ void renderHomePage_12() throws Exception
{
executeTest(MarkupInheritanceExtension_12.class, "MarkupInheritanceExpectedResult_12.html");
}
@@ -185,7 +186,7 @@ public class MarkupInheritanceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_13() throws Exception
+ void renderHomePage_13() throws Exception
{
executeTest(MarkupInheritanceExtension_13.class, "MarkupInheritanceExpectedResult_13.html");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
index 30d9268..5f6651b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
@@ -16,6 +16,11 @@
*/
package org.apache.wicket.markup;
+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 java.io.IOException;
import java.text.ParseException;
import java.util.Locale;
@@ -31,18 +36,16 @@ import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
import org.apache.wicket.util.string.StringValueConversionException;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
* Test cases for markup parser.
*
* @author Jonathan Locke
*/
-public final class MarkupParserTest extends WicketTestCase
+final class MarkupParserTest extends WicketTestCase
{
private static final Logger log = LoggerFactory.getLogger(MarkupParserTest.class);
@@ -52,7 +55,7 @@ public final class MarkupParserTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void tagParsing() throws Exception
+ void tagParsing() throws Exception
{
final MarkupParser parser = new MarkupParser(
"This is a test <a componentName:id=\"a\" href=\"foo.html\"> <b componentName:id=\"b\">Bold!</b> "
@@ -64,51 +67,51 @@ public final class MarkupParserTest extends WicketTestCase
final ComponentTag aOpen = (ComponentTag)markupStream.next();
log.info("", aOpen);
- Assert.assertTrue(aOpen.getName().equals("a"));
- Assert.assertEquals("foo.html", aOpen.getAttributes().getString("href"));
+ assertTrue(aOpen.getName().equals("a"));
+ assertEquals("foo.html", aOpen.getAttributes().getString("href"));
markupStream.next();
final ComponentTag boldOpen = (ComponentTag)markupStream.next();
log.info("", boldOpen);
- Assert.assertTrue(boldOpen.getName().equals("b"));
- Assert.assertEquals(TagType.OPEN, boldOpen.getType());
+ assertTrue(boldOpen.getName().equals("b"));
+ assertEquals(TagType.OPEN, boldOpen.getType());
markupStream.next();
final ComponentTag boldClose = (ComponentTag)markupStream.next();
log.info("", boldClose);
- Assert.assertTrue(boldClose.getName().equals("b"));
- Assert.assertEquals(TagType.CLOSE, boldClose.getType());
+ assertTrue(boldClose.getName().equals("b"));
+ assertEquals(TagType.CLOSE, boldClose.getType());
markupStream.next();
final ComponentTag img = (ComponentTag)markupStream.next();
log.info("", img);
- Assert.assertTrue(img.getName().equals("img"));
- Assert.assertEquals(9, img.getAttributes().getInt("width"));
- Assert.assertEquals(10, img.getAttributes().getInt("height"));
- Assert.assertEquals(TagType.OPEN, img.getType());
+ assertTrue(img.getName().equals("img"));
+ assertEquals(9, img.getAttributes().getInt("width"));
+ assertEquals(10, img.getAttributes().getInt("height"));
+ assertEquals(TagType.OPEN, img.getType());
markupStream.next();
final ComponentTag marker = (ComponentTag)markupStream.next();
log.info("", marker);
- Assert.assertTrue(marker.getName().equals("marker"));
- Assert.assertEquals(TagType.OPEN_CLOSE, marker.getType());
+ assertTrue(marker.getName().equals("marker"));
+ assertEquals(TagType.OPEN_CLOSE, marker.getType());
markupStream.next();
final ComponentTag aClose = (ComponentTag)markupStream.next();
log.info("", aClose);
- Assert.assertTrue(aClose.getName().equals("a"));
+ assertTrue(aClose.getName().equals("a"));
- Assert.assertNull(markupStream.next());
+ assertNull(markupStream.next());
}
/**
@@ -116,7 +119,7 @@ public final class MarkupParserTest extends WicketTestCase
* @throws Exception
*/
@Test
- public final void test1() throws Exception
+ final void test1() throws Exception
{
final MarkupParser parser = new MarkupParser(
"This is a test <a componentName:id=9> <b>bold</b> <b componentName:id=10></b></a> of the emergency broadcasting system");
@@ -130,21 +133,21 @@ public final class MarkupParserTest extends WicketTestCase
log.info("tok(4)=" + tokens.get(4));
log.info("tok(5)=" + tokens.get(5));
- Assert.assertTrue(tokens.get(0).equals("This is a test "));
+ assertTrue(tokens.get(0).equals("This is a test "));
final ComponentTag a = (ComponentTag)tokens.get(1);
- Assert.assertEquals(9, a.getAttributes().getInt("componentName:id"));
- Assert.assertTrue(tokens.get(2).equals(" <b>bold</b> "));
+ assertEquals(9, a.getAttributes().getInt("componentName:id"));
+ assertTrue(tokens.get(2).equals(" <b>bold</b> "));
final ComponentTag b = (ComponentTag)tokens.get(3);
- Assert.assertEquals(10, b.getAttributes().getInt("componentName:id"));
+ assertEquals(10, b.getAttributes().getInt("componentName:id"));
final ComponentTag closeA = (ComponentTag)tokens.get(5);
- Assert.assertEquals("a", closeA.getName());
- Assert.assertTrue(tokens.get(6).equals(" of the emergency broadcasting system"));
+ assertEquals("a", closeA.getName());
+ assertTrue(tokens.get(6).equals(" of the emergency broadcasting system"));
}
/**
@@ -152,7 +155,7 @@ public final class MarkupParserTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void xhtmlDocument() throws Exception
+ void xhtmlDocument() throws Exception
{
final String docText = ""
+ "<?xml version='1.0' encoding='iso-8859-1' ?>"
@@ -166,9 +169,9 @@ public final class MarkupParserTest extends WicketTestCase
log.info("tok(0)=" + tokens.get(0));
// without HtmlHeaderSectionHandler
- Assert.assertEquals(docText.substring(44), tokens.get(0).toString());
+ assertEquals(docText.substring(44), tokens.get(0).toString());
// with HtmlHeaderSectionHandler
- // Assert.assertEquals(docText.substring(44, 147),
+ // assertEquals(docText.substring(44, 147),
// tokens.get(0).toString());
}
@@ -190,7 +193,7 @@ public final class MarkupParserTest extends WicketTestCase
* @throws IOException
*/
@Test
- public void fileDocument() throws ParseException, ResourceStreamNotFoundException, IOException
+ void fileDocument() throws ParseException, ResourceStreamNotFoundException, IOException
{
IResourceStreamLocator locator = new ResourceStreamLocator();
MarkupResourceStream resource = newMarkupResourceStream(locator, getClass(), "1", null,
@@ -201,28 +204,28 @@ public final class MarkupParserTest extends WicketTestCase
IMarkupFragment tokens = parser.parse();
log.info("tok(0)=" + tokens.get(0));
- // Assert.assertEquals(docText, tokens.get(0).toString());
+ // assertEquals(docText, tokens.get(0).toString());
resource = newMarkupResourceStream(locator, getClass(), "2", null, null, "html");
parser = new MarkupParser(resource);
parser.setWicketNamespace("wcn");
tokens = parser.parse();
log.info("tok(0)=" + tokens.get(0));
- // Assert.assertEquals(docText, tokens.get(0).toString());
+ // assertEquals(docText, tokens.get(0).toString());
resource = newMarkupResourceStream(locator, getClass(), "3", null, null, "html");
parser = new MarkupParser(resource);
parser.setWicketNamespace("wcn");
tokens = parser.parse();
log.info("tok(0)=" + tokens.get(0));
- // Assert.assertEquals(docText, tokens.get(0).toString());
+ // assertEquals(docText, tokens.get(0).toString());
resource = newMarkupResourceStream(locator, getClass(), "4", null, null, "html");
parser = new MarkupParser(resource);
parser.setWicketNamespace("wcn");
tokens = parser.parse();
log.info("tok(0)=" + tokens.get(0));
- // Assert.assertEquals(docText, tokens.get(0).toString());
+ // assertEquals(docText, tokens.get(0).toString());
// File from jar (URL resource)
resource = newMarkupResourceStream(locator, PageExpiredErrorPage.class, null, null, null,
@@ -231,42 +234,42 @@ public final class MarkupParserTest extends WicketTestCase
parser.setWicketNamespace("wcn");
tokens = parser.parse();
log.info("tok(0)=" + tokens.get(0));
- // Assert.assertEquals(docText, tokens.get(0).toString());
+ // assertEquals(docText, tokens.get(0).toString());
resource = newMarkupResourceStream(locator, getClass(), "5", null, null, "html");
parser = new MarkupParser(resource);
parser.setWicketNamespace("wcn");
tokens = parser.parse();
log.info("tok(0)=" + tokens.get(0));
- // Assert.assertEquals(docText, tokens.get(0).toString());
+ // assertEquals(docText, tokens.get(0).toString());
resource = newMarkupResourceStream(locator, getClass(), "6", null, null, "html");
parser = new MarkupParser(resource);
parser.setWicketNamespace("wcn");
tokens = parser.parse();
log.info("tok(0)=" + tokens.get(0));
- // Assert.assertEquals(docText, tokens.get(0).toString());
+ // assertEquals(docText, tokens.get(0).toString());
resource = newMarkupResourceStream(locator, getClass(), "7", null, null, "html");
parser = new MarkupParser(resource);
parser.setWicketNamespace("wcn");
tokens = parser.parse();
log.info("tok(0)=" + tokens.get(0));
- // Assert.assertEquals(docText, tokens.get(0).toString());
+ // assertEquals(docText, tokens.get(0).toString());
resource = newMarkupResourceStream(locator, getClass(), "8", null, null, "html");
parser = new MarkupParser(resource);
parser.setWicketNamespace("wcn");
tokens = parser.parse();
log.info("tok(0)=" + tokens.get(0));
- // Assert.assertEquals(docText, tokens.get(0).toString());
+ // assertEquals(docText, tokens.get(0).toString());
resource = newMarkupResourceStream(locator, getClass(), "9", null, null, "html");
parser = new MarkupParser(resource);
parser.setWicketNamespace("wcn");
tokens = parser.parse();
log.info("tok(0)=" + tokens.get(0));
- // Assert.assertEquals(docText, tokens.get(0).toString());
+ // assertEquals(docText, tokens.get(0).toString());
}
/**
@@ -277,7 +280,7 @@ public final class MarkupParserTest extends WicketTestCase
* @throws IOException
*/
@Test
- public void wicketTag() throws ParseException, ResourceStreamNotFoundException, IOException
+ void wicketTag() throws ParseException, ResourceStreamNotFoundException, IOException
{
new MarkupParser("<span wicket:id=\"test\"/>").parse();
new MarkupParser("<span wicket:id=\"test\">Body</span>").parse();
@@ -292,7 +295,7 @@ public final class MarkupParserTest extends WicketTestCase
try
{
new MarkupParser("<wicket:remove/>").parse();
- assertTrue("Should have thrown an exception", false);
+ assertTrue(false, "Should have thrown an exception");
}
catch (MarkupException ex)
{
@@ -315,9 +318,7 @@ public final class MarkupParserTest extends WicketTestCase
try
{
new MarkupParser("<wicket:remove> <wicket:remove> </wicket:remove> </wicket:remove>").parse();
- assertTrue(
- "Should have thrown an exception: remove regions must not contain wicket-components",
- false);
+ assertTrue(false, "Should have thrown an exception: remove regions must not contain wicket-components");
}
catch (MarkupException ex)
{
@@ -338,7 +339,7 @@ public final class MarkupParserTest extends WicketTestCase
* @throws IOException
*/
@Test
- public void defaultWicketTag() throws ParseException, ResourceStreamNotFoundException,
+ void defaultWicketTag() throws ParseException, ResourceStreamNotFoundException,
IOException
{
MarkupParser parser = new MarkupParser("<image wcn:id=\"test\"/>");
@@ -365,7 +366,7 @@ public final class MarkupParserTest extends WicketTestCase
* @throws IOException
*/
@Test
- public void script() throws ParseException, ResourceStreamNotFoundException, IOException
+ void script() throws ParseException, ResourceStreamNotFoundException, IOException
{
final MarkupParser parser = new MarkupParser(
"<html wicket:id=\"test\"><script language=\"JavaScript\">... <x a> ...</script></html>");
@@ -386,7 +387,7 @@ public final class MarkupParserTest extends WicketTestCase
* @throws IOException
*/
@Test
- public void scriptWithTemplate() throws ParseException, ResourceStreamNotFoundException, IOException
+ void scriptWithTemplate() throws ParseException, ResourceStreamNotFoundException, IOException
{
final MarkupParser parser = new MarkupParser(
"<html wicket:id=\"test\"><script type=\"text/x-jquery-tmpl\" language=\"JavaScript\">... <x a/> ...</script></html>");
@@ -407,7 +408,7 @@ public final class MarkupParserTest extends WicketTestCase
* @throws IOException
*/
@Test
- public void scriptWithTemplateSingleQuotes() throws ParseException, ResourceStreamNotFoundException, IOException
+ void scriptWithTemplateSingleQuotes() throws ParseException, ResourceStreamNotFoundException, IOException
{
final MarkupParser parser = new MarkupParser(
"<html wicket:id=\"test\"><script type='text/x-jquery-tmpl' language=\"JavaScript\">... <x a/> ...</script></html>");
@@ -425,7 +426,7 @@ public final class MarkupParserTest extends WicketTestCase
* @throws ResourceStreamNotFoundException
*/
@Test
- public void balancing() throws IOException, ResourceStreamNotFoundException
+ void balancing() throws IOException, ResourceStreamNotFoundException
{
final MarkupParser parser = new MarkupParser(
"<span wicket:id=\"span\"><img wicket:id=\"img\"><span wicket:id=\"span2\"></span></span>");
@@ -449,7 +450,7 @@ public final class MarkupParserTest extends WicketTestCase
* @throws ResourceStreamNotFoundException
*/
@Test
- public void comments() throws IOException, ResourceStreamNotFoundException
+ void comments() throws IOException, ResourceStreamNotFoundException
{
tester.getApplication().getMarkupSettings().setStripComments(true);
final MarkupParser parser = new MarkupParser(
@@ -467,7 +468,7 @@ public final class MarkupParserTest extends WicketTestCase
* @throws ResourceStreamNotFoundException
*/
@Test
- public void commentsWithNestedElements() throws IOException, ResourceStreamNotFoundException
+ void commentsWithNestedElements() throws IOException, ResourceStreamNotFoundException
{
tester.getApplication().getMarkupSettings().setStripComments(true);
final MarkupParser parser = new MarkupParser(
@@ -490,7 +491,7 @@ public final class MarkupParserTest extends WicketTestCase
* @throws ResourceStreamNotFoundException
*/
@Test
- public void script1() throws IOException, ResourceStreamNotFoundException
+ void script1() throws IOException, ResourceStreamNotFoundException
{
IMarkupFragment markup = new MarkupParser("<script/>").parse();
assertEquals(1, markup.size());
@@ -566,7 +567,7 @@ public final class MarkupParserTest extends WicketTestCase
* @throws ParseException
*/
@Test
- public void parseConditionalComment() throws IOException, ResourceStreamNotFoundException,
+ void parseConditionalComment() throws IOException, ResourceStreamNotFoundException,
ParseException
{
String x = " <!--[if IE]>\r\n" + //
@@ -582,7 +583,7 @@ public final class MarkupParserTest extends WicketTestCase
* @throws ResourceStreamNotFoundException
*/
@Test
- public void parseTagToBeExpanded() throws IOException, ResourceStreamNotFoundException
+ void parseTagToBeExpanded() throws IOException, ResourceStreamNotFoundException
{
String x = "<html xmlns:wicket>\r\n<body>\r\n <span wicket:id=\"myPanel\"/>\r\n</body>\r\n</html>\r\n";
MarkupParser parser = new MarkupParser(x);
@@ -597,7 +598,7 @@ public final class MarkupParserTest extends WicketTestCase
* @throws ResourceStreamNotFoundException
*/
@Test
- public void parseBorderSintax() throws IOException, ResourceStreamNotFoundException
+ void parseBorderSintax() throws IOException, ResourceStreamNotFoundException
{
tester.getApplication().getPageSettings().addComponentResolver(new Border("test_resolver")
{
@@ -619,7 +620,7 @@ public final class MarkupParserTest extends WicketTestCase
* @throws ResourceStreamNotFoundException
*/
@Test
- public void rawMakupParsingWithStripCommentsSetTrue() throws IOException,
+ void rawMakupParsingWithStripCommentsSetTrue() throws IOException,
ResourceStreamNotFoundException
{
tester.getApplication().getMarkupSettings().setStripComments(true);
@@ -633,7 +634,7 @@ public final class MarkupParserTest extends WicketTestCase
* @see <a href="https://issues.apache.org/jira/browse/WICKET-3500">WICKET-3500</a>
*/
@Test
- public void ppenConditionalCommentPattern()
+ void ppenConditionalCommentPattern()
{
assertFalse(AbstractMarkupParser.CONDITIONAL_COMMENT_OPENING.matcher(
"<!--x--> <!--[if IE]>").find());
@@ -673,7 +674,7 @@ public final class MarkupParserTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void IEConditionalComments() throws Exception
+ void IEConditionalComments() throws Exception
{
boolean stripComments = tester.getApplication().getMarkupSettings().getStripComments();
try
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest.java
index d5e6368..89a0fe9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest.java
@@ -16,16 +16,21 @@
*/
package org.apache.wicket.markup;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests {@link Markup} class.
*/
-public class MarkupTest extends WicketTestCase
+class MarkupTest extends WicketTestCase
{
@Test
- public void testFind()
+ void testFind()
{
MarkupFactory markupFactory = tester.getApplication().getMarkupSettings().getMarkupFactory();
Markup markup = markupFactory.getMarkup(new MarkupTest_Find_3(), false);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_1.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_1.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_1.java
index f215512..71b0b71 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_1.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_1.java
@@ -18,7 +18,7 @@ package org.apache.wicket.markup;
import org.apache.wicket.markup.html.WebPage;
-public class MarkupTest_Find_1 extends WebPage
+class MarkupTest_Find_1 extends WebPage
{
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_2.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_2.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_2.java
index 26d54bc..53d3c1e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_2.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_2.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup;
-public class MarkupTest_Find_2 extends MarkupTest_Find_1
+class MarkupTest_Find_2 extends MarkupTest_Find_1
{
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_3.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_3.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_3.java
index 9b71872..a13bace 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_3.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_3.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup;
-public class MarkupTest_Find_3 extends MarkupTest_Find_2
+class MarkupTest_Find_3 extends MarkupTest_Find_2
{
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupVariationTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupVariationTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupVariationTest.java
index 705e075..bf239ad 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupVariationTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupVariationTest.java
@@ -27,19 +27,19 @@ import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests that changing component's variation will use the correct markup
*/
-public class MarkupVariationTest extends WicketTestCase
+class MarkupVariationTest extends WicketTestCase
{
/**
* https://issues.apache.org/jira/browse/WICKET-3931
*/
@Test
- public void changeVariation()
+ void changeVariation()
{
tester.startPage(new VariationPage());
tester.assertContainsNot("Two");
@@ -67,7 +67,7 @@ public class MarkupVariationTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-6231
*/
@Test
- public void changeVariationBeforeRendering() throws Exception
+ void changeVariationBeforeRendering() throws Exception
{
tester.startPage(new VariationPage());
FormTester formTester = tester.newFormTester("p:a_form");
@@ -97,7 +97,7 @@ public class MarkupVariationTest extends WicketTestCase
{
private String variation;
- public VariationPanel(String id)
+ VariationPanel(String id)
{
super(id);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/RefreshingViewOnRemoveTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/RefreshingViewOnRemoveTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/RefreshingViewOnRemoveTest.java
index 57f2c08..441f886 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/RefreshingViewOnRemoveTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/RefreshingViewOnRemoveTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
@@ -33,14 +35,14 @@ import org.apache.wicket.model.Model;
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 child's {@link Component#onRemove} is on refresh
*
* @author igor
*/
-public class RefreshingViewOnRemoveTest extends WicketTestCase
+class RefreshingViewOnRemoveTest extends WicketTestCase
{
private final List<TestComponent> components = new ArrayList<TestComponent>();
private int round = 1;
@@ -49,14 +51,14 @@ public class RefreshingViewOnRemoveTest extends WicketTestCase
* test()
*/
@Test
- public void test()
+ void test()
{
tester.startPage(new TestPage());
// check everything was detached
for (TestComponent c : components)
{
- assertTrue("Component " + c + " is not detached.", c.detached);
+ assertTrue(c.detached, "Component " + c + " is not detached.");
}
round++;
@@ -90,7 +92,7 @@ public class RefreshingViewOnRemoveTest extends WicketTestCase
}
- protected Component newComponent(String id)
+ private Component newComponent(String id)
{
TestComponent c = new TestComponent(id, round);
components.add(c);
@@ -100,11 +102,11 @@ public class RefreshingViewOnRemoveTest extends WicketTestCase
static class TestComponent extends Label
{
private static final long serialVersionUID = 1L;
- public boolean detached = false;
- public boolean removed = false;
- public final int round;
+ boolean detached = false;
+ boolean removed = false;
+ final int round;
- public TestComponent(String id, int round)
+ TestComponent(String id, int round)
{
super(id, id);
this.round = round;
@@ -129,7 +131,7 @@ public class RefreshingViewOnRemoveTest extends WicketTestCase
{
private static final long serialVersionUID = 1L;
- public TestPage()
+ TestPage()
{
add(new RefreshingView<Integer>("repeater")
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceTest.java
index 35bf4f2..632c494 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceTest.java
@@ -16,19 +16,21 @@
*/
package org.apache.wicket.markup;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*/
-public class WicketNamespaceTest extends WicketTestCase
+class WicketNamespaceTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void renderHomePage_1() throws Exception
+ void renderHomePage_1() throws Exception
{
executeTest(WicketNamespace_1.class, "WicketNamespaceExpectedResult_1.html");
}
@@ -37,7 +39,7 @@ public class WicketNamespaceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_2() throws Exception
+ void renderHomePage_2() throws Exception
{
executeTest(WicketNamespace_2.class, "WicketNamespaceExpectedResult_2.html");
}
@@ -46,7 +48,7 @@ public class WicketNamespaceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_3() throws Exception
+ void renderHomePage_3() throws Exception
{
executeTest(WicketNamespace_3.class, "WicketNamespaceExpectedResult_3.html");
}
@@ -55,7 +57,7 @@ public class WicketNamespaceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_4() throws Exception
+ void renderHomePage_4() throws Exception
{
executeTest(WicketNamespace_4.class, "WicketNamespaceExpectedResult_4.html");
}
@@ -64,7 +66,7 @@ public class WicketNamespaceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_5() throws Exception
+ void renderHomePage_5() throws Exception
{
executeTest(WicketNamespace_5.class, "WicketNamespaceExpectedResult_5.html");
}
@@ -73,7 +75,7 @@ public class WicketNamespaceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_6() throws Exception
+ void renderHomePage_6() throws Exception
{
executeTest(WicketNamespace_6.class, "WicketNamespaceExpectedResult_6.html");
}
@@ -82,7 +84,7 @@ public class WicketNamespaceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void doctype_1() throws Exception
+ void doctype_1() throws Exception
{
executeTest(Doctype_1.class, "DoctypeExpectedResult_1.html");
MarkupResourceStream rs = MarkupFactory.get()
@@ -96,7 +98,7 @@ public class WicketNamespaceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void doctype_InheritedPage() throws Exception
+ void doctype_InheritedPage() throws Exception
{
executeTest(Doctype_1_InheritedPage.class, "DoctypeExpectedResult_1_Inherited.html");
MarkupResourceStream rs = MarkupFactory.get()
@@ -110,7 +112,7 @@ public class WicketNamespaceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void doctype_2() throws Exception
+ void doctype_2() throws Exception
{
executeTest(Doctype_2.class, "DoctypeExpectedResult_2.html");
MarkupResourceStream rs = MarkupFactory.get()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/head/HeaderResponseTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/head/HeaderResponseTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/head/HeaderResponseTest.java
index ab86f6a..a98d3b1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/head/HeaderResponseTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/head/HeaderResponseTest.java
@@ -18,14 +18,14 @@ package org.apache.wicket.markup.head;
import org.apache.wicket.markup.html.header.response.ConcretePage;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* This test verifies the ordering of header items.
*
* @author papegaaij
*/
-public class HeaderResponseTest extends WicketTestCase
+class HeaderResponseTest extends WicketTestCase
{
/**
* Renders items in child-first order and priority items and parent-first order. The expected
@@ -40,7 +40,7 @@ public class HeaderResponseTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void testAllMarkup() throws Exception
+ void testAllMarkup() throws Exception
{
executeTest(ConcretePage.class, "ExpectedResult.html");
}
@@ -50,7 +50,7 @@ public class HeaderResponseTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void testAllMarkupPageFirst() throws Exception
+ void testAllMarkupPageFirst() throws Exception
{
tester.getApplication()
.getResourceSettings()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/head/HtmlImportHeaderItemTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/head/HtmlImportHeaderItemTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/head/HtmlImportHeaderItemTest.java
index 79244b6..7d5eebf 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/head/HtmlImportHeaderItemTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/head/HtmlImportHeaderItemTest.java
@@ -16,44 +16,45 @@
*/
package org.apache.wicket.markup.head;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.wicket.markup.html.basic.SimplePage;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class HtmlImportHeaderItemTest
+class HtmlImportHeaderItemTest
{
@Test
- public void basicUsage() throws Exception
+ void basicUsage() throws Exception
{
String url = "/path/to/page.html";
-
+
MetaDataHeaderItem result = HtmlImportHeaderItem.forImportLinkTag(url);
-
+
assertEquals("<link rel=\"import\" href=\"" + url + "\" />\n", result.generateString());
-
+
result = HtmlImportHeaderItem.forImportLinkTag(url, true);
-
- assertEquals("<link rel=\"import\" href=\"" + url + "\" async />\n", result.generateString());
+
+ assertEquals("<link rel=\"import\" href=\"" + url + "\" async />\n",
+ result.generateString());
}
-
+
@Test
- public void wicketPageUrl() throws Exception
+ void wicketPageUrl() throws Exception
{
- WicketTester tester = new WicketTester();
+ WicketTester tester = new WicketTester();
PageParameters parameters = new PageParameters();
parameters.add("foo", "foo");
parameters.add("bar", "bar");
-
+
CharSequence pageUrl = tester.getRequestCycle().urlFor(SimplePage.class, parameters);
-
- MetaDataHeaderItem importLink = HtmlImportHeaderItem
- .forImportLinkTag(SimplePage.class, parameters, "monitor", true);
-
- assertEquals("<link rel=\"import\" href=\"" + pageUrl + "\" media=\"monitor\" async />\n",
+
+ MetaDataHeaderItem importLink = HtmlImportHeaderItem.forImportLinkTag(SimplePage.class,
+ parameters, "monitor", true);
+
+ assertEquals("<link rel=\"import\" href=\"" + pageUrl + "\" media=\"monitor\" async />\n",
importLink.generateString());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/head/MetaDataHeaderItemTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/head/MetaDataHeaderItemTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/head/MetaDataHeaderItemTest.java
index 6cff0a5..fc2c93b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/head/MetaDataHeaderItemTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/head/MetaDataHeaderItemTest.java
@@ -16,16 +16,16 @@
*/
package org.apache.wicket.markup.head;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.wicket.model.Model;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class MetaDataHeaderItemTest
+class MetaDataHeaderItemTest
{
@Test
- public void testMetaTag() throws Exception
+ void testMetaTag() throws Exception
{
String expectedString = "<meta name=\"robots\" content=\"index,nofollow\" />\n";
MetaDataHeaderItem metaTag = MetaDataHeaderItem.forMetaTag("robots", "index,nofollow");
@@ -34,7 +34,7 @@ public class MetaDataHeaderItemTest
}
@Test
- public void testLinkTag() throws Exception
+ void testLinkTag() throws Exception
{
String expectedString = "<link rel=\"shortcut icon\" href=\"http://www.mysite.com/favicon.ico\" type=\"image/x-icon\" />\n";
MetaDataHeaderItem metaTag = MetaDataHeaderItem.forLinkTag("shortcut icon", "http://www.mysite.com/favicon.ico");
@@ -44,7 +44,7 @@ public class MetaDataHeaderItemTest
}
@Test
- public void testEscapeOnlyDoubleQuotes() throws Exception
+ void testEscapeOnlyDoubleQuotes() throws Exception
{
String expectedString = "<link rel=\"single quote \' double quotes\\\"\" href=\"\" />\n";
MetaDataHeaderItem metaTag = MetaDataHeaderItem.forLinkTag("single quote \' double quotes\"", "");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java
index 88e9c64..152dfaf 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup.head.filter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.Collections;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -26,18 +28,18 @@ import org.apache.wicket.markup.html.IHeaderResponseDecorator;
import org.apache.wicket.request.Response;
import org.apache.wicket.response.StringResponse;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for FilteringHeaderResponse
*
* @since 6.0
*/
-public class FilteringHeaderResponseTest extends WicketTestCase
+class FilteringHeaderResponseTest extends WicketTestCase
{
@Test
- public void footerDependsOnHeadItem() throws Exception
+ void footerDependsOnHeadItem() throws Exception
{
tester.getApplication().setHeaderResponseDecorator(new IHeaderResponseDecorator()
{
@@ -46,7 +48,8 @@ public class FilteringHeaderResponseTest extends WicketTestCase
{
// use this header resource decorator to load all JavaScript resources in the page
// footer (after </body>)
- return new ResourceAggregator(new JavaScriptFilteredIntoFooterHeaderResponse(response, "footerJS"));
+ return new ResourceAggregator(
+ new JavaScriptFilteredIntoFooterHeaderResponse(response, "footerJS"));
}
});
executeTest(FilteredHeaderPage.class, "FilteredHeaderPageExpected.html");
@@ -54,23 +57,26 @@ public class FilteringHeaderResponseTest extends WicketTestCase
/**
* https://issues.apache.org/jira/browse/WICKET-5057
+ *
* @throws Exception
*/
@Test
- public void createBucketOnTheFlyForFilteredHeaderItem() throws Exception
+ void createBucketOnTheFlyForFilteredHeaderItem() throws Exception
{
- try (FilteringHeaderResponse headerResponse = new FilteringHeaderResponse(new HeaderResponse()
- {
- @Override
- protected Response getRealResponse()
+ try (FilteringHeaderResponse headerResponse = new FilteringHeaderResponse(
+ new HeaderResponse()
{
- return new StringResponse();
- }
- }, "headerBucketName", Collections.emptyList()))
+ @Override
+ protected Response getRealResponse()
+ {
+ return new StringResponse();
+ }
+ }, "headerBucketName", Collections.emptyList()))
{
String filterName = "filterName";
String headerContent = "content";
- FilteredHeaderItem item = new FilteredHeaderItem(StringHeaderItem.forString(headerContent), filterName);
+ FilteredHeaderItem item = new FilteredHeaderItem(
+ StringHeaderItem.forString(headerContent), filterName);
headerResponse.render(item);
CharSequence realContent = headerResponse.getContent(filterName);
assertEquals(headerContent, realContent.toString());
@@ -82,9 +88,10 @@ public class FilteringHeaderResponseTest extends WicketTestCase
* inside a {@code document.addEventListener('DOMContentLoaded', function() {}; } hook.
*/
@Test
- public void deferred() throws Exception
+ void deferred() throws Exception
{
- tester.getApplication().setHeaderResponseDecorator(response -> new ResourceAggregator(new JavaScriptDeferHeaderResponse(response)));
+ tester.getApplication().setHeaderResponseDecorator(
+ response -> new ResourceAggregator(new JavaScriptDeferHeaderResponse(response)));
executeTest(DeferredPage.class, "DeferredPageExpected.html");
}
}
[30/45] wicket git commit: updated pom.xml with new junit dependency
Posted by mg...@apache.org.
updated pom.xml with new junit dependency
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/67e228d5
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/67e228d5
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/67e228d5
Branch: refs/heads/master
Commit: 67e228d5c57efee9894b2db41c6418ed275816fb
Parents: 7d07e19
Author: renoth <jo...@gmx.de>
Authored: Sat Sep 1 07:52:38 2018 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 26 15:39:30 2018 +0300
----------------------------------------------------------------------
.../main/resources/archetype-resources/pom.xml | 4 +--
pom.xml | 8 ------
testing/wicket-arquillian/pom.xml | 30 ++++++++++++++++++++
.../deployment/AbstractDeploymentTest.java | 21 +++++++-------
testing/wicket-common-tests/pom.xml | 5 ++--
testing/wicket-threadtest/pom.xml | 5 ++--
wicket-bean-validation/pom.xml | 5 ++--
wicket-cdi/pom.xml | 5 ----
wicket-ioc/pom.xml | 5 ----
.../wicket-native-websocket-core/pom.xml | 5 ++--
.../wicket-native-websocket-javax/pom.xml | 5 ++++
.../handler/RedirectRequestHandlerTest.java | 4 +--
12 files changed, 61 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/67e228d5/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
index b689f38..3d49b04 100644
--- a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
@@ -74,8 +74,8 @@
<!-- JUNIT DEPENDENCY FOR TESTING -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/wicket/blob/67e228d5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index df3df06..cf61347 100644
--- a/pom.xml
+++ b/pom.xml
@@ -990,14 +990,6 @@
</includes>
</configuration>
- <dependencies>
- <dependency>
- <!-- force 4.7 runner to enable excludedGroups on Categories (& parallel) -->
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${maven.surefire.version}</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/67e228d5/testing/wicket-arquillian/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-arquillian/pom.xml b/testing/wicket-arquillian/pom.xml
index 10271b3..3c47b5e 100644
--- a/testing/wicket-arquillian/pom.xml
+++ b/testing/wicket-arquillian/pom.xml
@@ -107,6 +107,36 @@
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-7.0</artifactId>
<type>pom</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-weld</artifactId>
+ <version>${wildfly.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>sun.jdk</groupId>
+ <artifactId>jconsole</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.wildfly.arquillian</groupId>
+ <artifactId>wildfly-arquillian-container-embedded</artifactId>
+ <version>2.1.0.Final</version>
+ <scope>test</scope>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <scope>test</scope>
</dependency>
<!-- Wicket CDI integration. -->
<dependency>
http://git-wip-us.apache.org/repos/asf/wicket/blob/67e228d5/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
----------------------------------------------------------------------
diff --git a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
index cb3c3eb..1615def 100644
--- a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
+++ b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
@@ -16,17 +16,9 @@
*/
package org.apache.wicket.arquillian.testing.deployment;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.File;
-import java.util.Locale;
-
-import javax.servlet.ServletContext;
-
import org.apache.wicket.arquillian.testing.TestWicketJavaEEApplication;
import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.util.SlowTests;
+import org.apache.wicket.util.WicketTestTag;
import org.apache.wicket.util.tester.WicketTester;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.shrinkwrap.api.Filters;
@@ -36,10 +28,17 @@ import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
import org.jboss.shrinkwrap.api.importer.ExplodedImporter;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.resolver.api.maven.Maven;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.servlet.ServletContext;
+import java.io.File;
+import java.util.Locale;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* <b>WARNING: If this error occurs - org.jboss.arquillian.container.spi.client.container.LifecycleException: The server is already running! Managed containers do not support connecting to running server instances due to the possible harmful effect of connecting to the wrong server. Please stop server before running or change to another type of container.
* To disable this check and allow Arquillian to connect to a running server, set allowConnectingToRunningServer to true in the container configuration.</b>
@@ -52,7 +51,7 @@ import org.slf4j.LoggerFactory;
* @since 06/23/2015
*
*/
-@Category(SlowTests.class)
+@Tag(WicketTestTag.SLOW)
public abstract class AbstractDeploymentTest {
private static final Logger log = LoggerFactory.getLogger(AbstractDeploymentTest.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/67e228d5/testing/wicket-common-tests/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-common-tests/pom.xml b/testing/wicket-common-tests/pom.xml
index 83079db..ecb8402 100644
--- a/testing/wicket-common-tests/pom.xml
+++ b/testing/wicket-common-tests/pom.xml
@@ -34,8 +34,9 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/67e228d5/testing/wicket-threadtest/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-threadtest/pom.xml b/testing/wicket-threadtest/pom.xml
index 118c71a..132727e 100644
--- a/testing/wicket-threadtest/pom.xml
+++ b/testing/wicket-threadtest/pom.xml
@@ -82,8 +82,9 @@
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/wicket/blob/67e228d5/wicket-bean-validation/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-bean-validation/pom.xml b/wicket-bean-validation/pom.xml
index 77fa72c..f1240cd 100644
--- a/wicket-bean-validation/pom.xml
+++ b/wicket-bean-validation/pom.xml
@@ -25,8 +25,9 @@
<artifactId>wicket-core</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.web</groupId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/67e228d5/wicket-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-cdi/pom.xml b/wicket-cdi/pom.xml
index 29de4bb..fb40f46 100644
--- a/wicket-cdi/pom.xml
+++ b/wicket-cdi/pom.xml
@@ -64,10 +64,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
<groupId>org.jglue.cdi-unit</groupId>
<artifactId>cdi-unit</artifactId>
<exclusions>
@@ -77,7 +73,6 @@
</exclusion>
</exclusions>
</dependency>
-
</dependencies>
<build>
<pluginManagement>
http://git-wip-us.apache.org/repos/asf/wicket/blob/67e228d5/wicket-ioc/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-ioc/pom.xml b/wicket-ioc/pom.xml
index 5eaa0ab..d557623 100644
--- a/wicket-ioc/pom.xml
+++ b/wicket-ioc/pom.xml
@@ -60,11 +60,6 @@
<artifactId>asm-util</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.weld.se</groupId>
- <artifactId>weld-se-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/wicket/blob/67e228d5/wicket-native-websocket/wicket-native-websocket-core/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-core/pom.xml b/wicket-native-websocket/wicket-native-websocket-core/pom.xml
index 267746c..090faf1 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-core/pom.xml
@@ -37,8 +37,9 @@
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/67e228d5/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
index 6c1586b..ca24277 100644
--- a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
@@ -38,6 +38,11 @@
<artifactId>javax.websocket-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/wicket/blob/67e228d5/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 ef917d3..bc200fe 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
@@ -16,13 +16,13 @@
*/
package org.apache.wicket.request.http.handler;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.wicket.request.IRequestCycle;
import org.apache.wicket.request.http.WebResponse;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
+import javax.servlet.http.HttpServletResponse;
+
/**
* RedirectRequestHandlerTest
*/
[17/45] wicket git commit: wicket-core: Migrate to Junit 5
Posted by mg...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/XmlPullParserTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/XmlPullParserTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/XmlPullParserTest.java
index ac88a6f..ec7e69e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/XmlPullParserTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/XmlPullParserTest.java
@@ -16,27 +16,32 @@
*/
package org.apache.wicket.markup.parser;
+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.assertTrue;
+
import java.io.UnsupportedEncodingException;
import java.text.ParseException;
import org.apache.wicket.markup.parser.IXmlPullParser.HttpTagType;
import org.apache.wicket.util.resource.StringResourceStream;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Quite some tests are already with MarkupParser.
*
* @author Juergen Donnerstag
*/
-public class XmlPullParserTest extends Assert
+class XmlPullParserTest
{
/**
*
* @throws Exception
*/
@Test
- public final void basics() throws Exception
+ final void basics() throws Exception
{
final XmlPullParser parser = new XmlPullParser();
parser.parse("This is a text");
@@ -128,7 +133,7 @@ public class XmlPullParserTest extends Assert
* @throws Exception
*/
@Test
- public final void encoding() throws Exception
+ final void encoding() throws Exception
{
final XmlPullParser parser = new XmlPullParser();
parser.parse(
@@ -197,7 +202,7 @@ public class XmlPullParserTest extends Assert
* WICKET-5398 parsing from String
*/
@Test
- public void encodingOfString() throws Exception
+ void encodingOfString() throws Exception
{
// use an encoding that is not the system's file encoding
final String encoding;
@@ -220,7 +225,7 @@ public class XmlPullParserTest extends Assert
* @throws Exception
*/
@Test
- public final void attributes() throws Exception
+ final void attributes() throws Exception
{
final XmlPullParser parser = new XmlPullParser();
parser.parse("<tag>");
@@ -286,7 +291,7 @@ public class XmlPullParserTest extends Assert
* @throws Exception
*/
@Test
- public final void comments() throws Exception
+ final void comments() throws Exception
{
final XmlPullParser parser = new XmlPullParser();
parser.parse("<!-- test --><tag>");
@@ -320,7 +325,7 @@ public class XmlPullParserTest extends Assert
* @throws Exception
*/
@Test
- public final void compressWhitespace() throws Exception
+ final void compressWhitespace() throws Exception
{
final XmlPullParser parser = new XmlPullParser();
parser.parse("<?xml version=\"1.0\" encoding=\"iso-8859-1\" ?>");
@@ -331,7 +336,7 @@ public class XmlPullParserTest extends Assert
* @throws Exception
*/
@Test
- public final void script() throws Exception
+ final void script() throws Exception
{
final XmlPullParser parser = new XmlPullParser();
parser.parse("<html><script language=\"JavaScript\">... <x a> ...</script></html>");
@@ -354,7 +359,7 @@ public class XmlPullParserTest extends Assert
* @throws Exception
*/
@Test
- public final void conditionalComments() throws Exception
+ final void conditionalComments() throws Exception
{
final XmlPullParser parser = new XmlPullParser();
parser.parse("<!--[if IE]><a href='test.html'>my link</a><![endif]-->");
@@ -373,7 +378,7 @@ public class XmlPullParserTest extends Assert
* @throws Exception
*/
@Test
- public final void conditionalComments2() throws Exception
+ final void conditionalComments2() throws Exception
{
final XmlPullParser parser = new XmlPullParser();
parser.parse("<!--[if IE]><a href='test.html'>my link</a><![endif]-->");
@@ -399,7 +404,7 @@ public class XmlPullParserTest extends Assert
* @throws Exception
*/
@Test
- public final void names() throws Exception
+ final void names() throws Exception
{
final XmlPullParser parser = new XmlPullParser();
parser.parse("<filter-mapping>");
@@ -423,7 +428,7 @@ public class XmlPullParserTest extends Assert
* @throws Exception
*/
@Test
- public final void doctype() throws Exception
+ final void doctype() throws Exception
{
final XmlPullParser parser = new XmlPullParser();
parser.parse("<!DOCTYPE html>");
@@ -436,7 +441,7 @@ public class XmlPullParserTest extends Assert
* @throws Exception
*/
@Test
- public final void downlevelRevealedConditionalComments() throws Exception
+ final void downlevelRevealedConditionalComments() throws Exception
{
final XmlPullParser parser = new XmlPullParser();
parser.parse("<!--[if (gt IE 9)|!(IE)]><!--><html lang=\"en\" class=\"no-js\"><!--<![endif]--> <span>test</span>");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/AbstractTest14WebPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/AbstractTest14WebPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/AbstractTest14WebPage.java
index 6075132..81dd152 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/AbstractTest14WebPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/AbstractTest14WebPage.java
@@ -28,7 +28,7 @@ public abstract class AbstractTest14WebPage extends WebPage
/**
*
*/
- public AbstractTest14WebPage()
+ AbstractTest14WebPage()
{
// Create border and add it to the page
add(new HeaderSectionBorder_2("border"));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/CustomMarkupLabel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/CustomMarkupLabel.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/CustomMarkupLabel.java
index b609f12..508e200 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/CustomMarkupLabel.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/CustomMarkupLabel.java
@@ -35,7 +35,7 @@ import org.apache.wicket.util.resource.StringResourceStream;
* https://issues.apache.org/jira/browse/WICKET-4494
* @see HtmlHandlerTest
*/
-public class CustomMarkupLabel
+class CustomMarkupLabel
extends MarkupContainer
implements IMarkupCacheKeyProvider, IMarkupResourceStreamProvider
{
@@ -75,7 +75,7 @@ public class CustomMarkupLabel
{
private final CustomMarkupLabel markupProvider;
- public MyMarkupSourcingStrategy(final CustomMarkupLabel markupProvider)
+ MyMarkupSourcingStrategy(final CustomMarkupLabel markupProvider)
{
this.markupProvider = markupProvider;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/DoubleHeaderPartPageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/DoubleHeaderPartPageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/DoubleHeaderPartPageTest.java
index 1eec781..4d67c34 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/DoubleHeaderPartPageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/DoubleHeaderPartPageTest.java
@@ -17,20 +17,20 @@
package org.apache.wicket.markup.parser.filter;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author jcompagner
*
*/
-public class DoubleHeaderPartPageTest extends WicketTestCase
+class DoubleHeaderPartPageTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void testRenderHeaderPartPage() throws Exception
+ void testRenderHeaderPartPage() throws Exception
{
executeTest(DoubleHeaderPartPage.class, "DoubleHeaderPartPageExpectedResult.html");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionBasePage_12.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionBasePage_12.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionBasePage_12.java
index 09444c5..4122a0a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionBasePage_12.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionBasePage_12.java
@@ -31,7 +31,7 @@ public class HeaderSectionBasePage_12 extends WebPage
/**
*
*/
- public HeaderSectionBasePage_12()
+ HeaderSectionBasePage_12()
{
// Create border and add it to the page
add(new HeaderSectionBorder("border"));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_20.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_20.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_20.java
index 5d3aefd..398c378 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_20.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_20.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.markup.parser.filter;
-import org.apache.wicket.markup.head.StringHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.StringHeaderItem;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
@@ -48,7 +48,7 @@ public class HeaderSectionPage_20 extends WebPage
*
* @param id
*/
- public MyLabel(final String id)
+ MyLabel(final String id)
{
super(id);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java
index 1d63c8f..d8225c2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java
@@ -16,10 +16,13 @@
*/
package org.apache.wicket.markup.parser.filter;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.markup.MarkupException;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Simple application that demonstrates the mock http application code (and checks that it is
@@ -27,13 +30,13 @@ import org.junit.Test;
*
* @author Chris Turner
*/
-public class HeaderSectionTest extends WicketTestCase
+class HeaderSectionTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void renderHomePage_1() throws Exception
+ void renderHomePage_1() throws Exception
{
executeTest(HeaderSectionPage_1.class, "HeaderSectionPageExpectedResult_1.html");
}
@@ -42,7 +45,7 @@ public class HeaderSectionTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_2() throws Exception
+ void renderHomePage_2() throws Exception
{
executeTest(HeaderSectionPage_2.class, "HeaderSectionPageExpectedResult_2.html");
}
@@ -51,7 +54,7 @@ public class HeaderSectionTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_3() throws Exception
+ void renderHomePage_3() throws Exception
{
executeTest(HeaderSectionPage_3.class, "HeaderSectionPageExpectedResult_3.html");
}
@@ -60,7 +63,7 @@ public class HeaderSectionTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_4() throws Exception
+ void renderHomePage_4() throws Exception
{
executeTest(HeaderSectionPage_4.class, "HeaderSectionPageExpectedResult_4.html");
}
@@ -69,7 +72,7 @@ public class HeaderSectionTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_5() throws Exception
+ void renderHomePage_5() throws Exception
{
executeTest(HeaderSectionPage_5.class, "HeaderSectionPageExpectedResult_5.html");
}
@@ -78,7 +81,7 @@ public class HeaderSectionTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_6() throws Exception
+ void renderHomePage_6() throws Exception
{
executeTest(HeaderSectionPage_6.class, "HeaderSectionPageExpectedResult_6.html");
}
@@ -87,7 +90,7 @@ public class HeaderSectionTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_7() throws Exception
+ void renderHomePage_7() throws Exception
{
executeTest(HeaderSectionPage_7.class, "HeaderSectionPageExpectedResult_7.html");
}
@@ -96,7 +99,7 @@ public class HeaderSectionTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_8() throws Exception
+ void renderHomePage_8() throws Exception
{
executeTest(HeaderSectionPage_8.class, "HeaderSectionPageExpectedResult_8.html");
}
@@ -105,7 +108,7 @@ public class HeaderSectionTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_9() throws Exception
+ void renderHomePage_9() throws Exception
{
executeTest(HeaderSectionPage_9.class, "HeaderSectionPageExpectedResult_9.html");
}
@@ -114,7 +117,7 @@ public class HeaderSectionTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_9a() throws Exception
+ void renderHomePage_9a() throws Exception
{
executeTest(HeaderSectionPage_9a.class, "HeaderSectionPageExpectedResult_9a.html");
}
@@ -123,7 +126,7 @@ public class HeaderSectionTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_10() throws Exception
+ void renderHomePage_10() throws Exception
{
executeTest(HeaderSectionPage_10.class, "HeaderSectionPageExpectedResult_10.html");
}
@@ -132,7 +135,7 @@ public class HeaderSectionTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_11() throws Exception
+ void renderHomePage_11() throws Exception
{
executeTest(HeaderSectionPage_11.class, "HeaderSectionPageExpectedResult_11.html");
}
@@ -141,7 +144,7 @@ public class HeaderSectionTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_13() throws Exception
+ void renderHomePage_13() throws Exception
{
boolean hit = false;
try
@@ -152,14 +155,14 @@ public class HeaderSectionTest extends WicketTestCase
{
hit = true;
}
- assertTrue("Expected a MarkupException to be thrown", hit);
+ assertTrue(hit, "Expected a MarkupException to be thrown");
}
/**
* @throws Exception
*/
@Test
- public void renderHomePage_14() throws Exception
+ void renderHomePage_14() throws Exception
{
executeTest(HeaderSectionPage_14.class, "HeaderSectionPageExpectedResult_14.html");
}
@@ -168,7 +171,7 @@ public class HeaderSectionTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_15() throws Exception
+ void renderHomePage_15() throws Exception
{
executeTest(HeaderSectionPage_15.class, "HeaderSectionPageExpectedResult_15.html");
}
@@ -177,7 +180,7 @@ public class HeaderSectionTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_16() throws Exception
+ void renderHomePage_16() throws Exception
{
executeTest(HeaderSectionPage_16.class, "HeaderSectionPageExpectedResult_16.html");
}
@@ -186,7 +189,7 @@ public class HeaderSectionTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_17() throws Exception
+ void renderHomePage_17() throws Exception
{
executeTest(HeaderSectionPage_17.class, "HeaderSectionPageExpectedResult_17.html");
}
@@ -195,7 +198,7 @@ public class HeaderSectionTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_18() throws Exception
+ void renderHomePage_18() throws Exception
{
executeTest(HeaderSectionPage_18.class, "HeaderSectionPageExpectedResult_18.html");
}
@@ -204,7 +207,7 @@ public class HeaderSectionTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_19() throws Exception
+ void renderHomePage_19() throws Exception
{
executeTest(HeaderSectionPage_19.class, "HeaderSectionPageExpectedResult_19.html");
}
@@ -213,7 +216,7 @@ public class HeaderSectionTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_20() throws Exception
+ void renderHomePage_20() throws Exception
{
executeTest(HeaderSectionPage_20.class, "HeaderSectionPageExpectedResult_20.html");
}
@@ -221,9 +224,11 @@ public class HeaderSectionTest extends WicketTestCase
/**
* https://issues.apache.org/jira/browse/WICKET-5908
*/
- @Test(expected = MarkupException.class)
- public void doubleHeadTagPage()
+ @Test
+ void doubleHeadTagPage()
{
- tester.startPage(DoubleHeadTagPage.class);
+ assertThrows(MarkupException.class, () -> {
+ tester.startPage(DoubleHeadTagPage.class);
+ });
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHandlerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHandlerTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHandlerTest.java
index 2bd2ee6..4b3379e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHandlerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHandlerTest.java
@@ -22,12 +22,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;
/**
* @since 1.5.6
*/
-public class HtmlHandlerTest extends WicketTestCase
+class HtmlHandlerTest extends WicketTestCase
{
/**
* https://issues.apache.org/jira/browse/WICKET-4494
@@ -38,7 +38,7 @@ public class HtmlHandlerTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void loadMarkupWithNonClosedTagsDynamically() throws Exception
+ void loadMarkupWithNonClosedTagsDynamically() throws Exception
{
CustomMarkupPage page = new CustomMarkupPage();
tester.executeTest(HtmlHandlerTest.class, page, "DynamicMarkupPageWithNonClosedTags_expected.html");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandlerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandlerTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandlerTest.java
index fb74ded..954bc8d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandlerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandlerTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup.parser.filter;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.MarkupException;
@@ -23,9 +25,9 @@ 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 HtmlHeaderSectionHandlerTest extends WicketTestCase
+class HtmlHeaderSectionHandlerTest extends WicketTestCase
{
/**
* https://issues.apache.org/jira/browse/WICKET-4511
@@ -35,11 +37,16 @@ public class HtmlHeaderSectionHandlerTest extends WicketTestCase
*
* @throws Exception
*/
- @Test(expected = MarkupException.class)
- public void loadMarkupWithBodyInsideHead() throws Exception
+ @Test
+ void loadMarkupWithBodyInsideHead() throws Exception
{
CustomMarkupPage customMarkupPage = new CustomMarkupPage();
- tester.startPage(customMarkupPage);
+
+ assertThrows(MarkupException.class, () -> {
+ tester.startPage(customMarkupPage);
+ });
+
+
}
private static class CustomMarkupPage extends WebPage implements IMarkupResourceStreamProvider
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java
index c71db14..c81125f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java
@@ -16,7 +16,9 @@
*/
package org.apache.wicket.markup.parser.filter;
-import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.text.ParseException;
@@ -28,19 +30,18 @@ import org.apache.wicket.markup.parser.IMarkupFilter;
import org.apache.wicket.markup.parser.XmlTag;
import org.apache.wicket.markup.resolver.HtmlHeaderResolver;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.hamcrest.CoreMatchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class OpenCloseTagExpanderTest extends WicketTestCase
+class OpenCloseTagExpanderTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void renderHomePage() throws Exception
+ void renderHomePage() throws Exception
{
executeTest(OpenCloseTagExpanderPage_1.class,
"OpenCloseTagExpanderPageExpectedResult_1.html");
@@ -52,7 +53,7 @@ public class OpenCloseTagExpanderTest extends WicketTestCase
* @throws ParseException
*/
@Test
- public void doNotExpandVoidElements() throws ParseException
+ void doNotExpandVoidElements() throws ParseException
{
String[] htmlVoidElements = new String[] { "area", "base", "br", "col", "command", "embed",
"hr", "img", "input", "keygen", "link", "meta", "param", "source", "track", "wbr" };
@@ -88,7 +89,7 @@ public class OpenCloseTagExpanderTest extends WicketTestCase
MarkupElement markupElement = expander.nextElement();
// assert the next element is returned by the parent
- assertThat(markupElement, instanceOf(TestMarkupElement.class));
+ assertThat(markupElement).isInstanceOf(TestMarkupElement.class);
}
}
@@ -98,7 +99,7 @@ public class OpenCloseTagExpanderTest extends WicketTestCase
* @throws ParseException
*/
@Test
- public void expandNonVoidElements() throws ParseException
+ void expandNonVoidElements() throws ParseException
{
for (String htmlNonVoidElement : OpenCloseTagExpander.REPLACE_FOR_TAGS)
{
@@ -143,7 +144,7 @@ public class OpenCloseTagExpanderTest extends WicketTestCase
* @throws ParseException
*/
@Test
- public void expandWicketTagWithSameNamespace() throws ParseException
+ void expandWicketTagWithSameNamespace() throws ParseException
{
final String namespace = "customNS";
@@ -162,14 +163,14 @@ public class OpenCloseTagExpanderTest extends WicketTestCase
MarkupElement markupElement = expander.nextElement();
- assertThat(markupElement, CoreMatchers.instanceOf(WicketTag.class));
+ assertThat(markupElement).isInstanceOf(WicketTag.class);
assertTrue(markupElement.closes(tag));
assertEquals(namespace, ((ComponentTag) markupElement).getNamespace());
}
private static class TestMarkupElement extends WicketTag
{
- public TestMarkupElement()
+ TestMarkupElement()
{
super(new XmlTag());
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/StyleAndScriptIdentifierTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/StyleAndScriptIdentifierTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/StyleAndScriptIdentifierTest.java
index df814b3..c197329 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/StyleAndScriptIdentifierTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/StyleAndScriptIdentifierTest.java
@@ -16,15 +16,18 @@
*/
package org.apache.wicket.markup.parser.filter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
import org.apache.wicket.markup.Markup;
import org.apache.wicket.markup.MarkupElement;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @since 6.0
*/
-public class StyleAndScriptIdentifierTest extends WicketTestCase
+class StyleAndScriptIdentifierTest extends WicketTestCase
{
/**
* https://issues.apache.org/jira/browse/WICKET-4425
@@ -36,13 +39,13 @@ public class StyleAndScriptIdentifierTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void doNotWrapScriptTemplates() throws Exception
+ void doNotWrapScriptTemplates() throws Exception
{
executeTest(PageWithScriptTemplate.class, "PageWithScriptTemplate_expected.html");
}
@Test
- public void showWrapInCdata()
+ void showWrapInCdata()
{
StyleAndScriptIdentifier filter = new StyleAndScriptIdentifier();
@@ -84,7 +87,7 @@ public class StyleAndScriptIdentifierTest extends WicketTestCase
* The second time it realizes that the element body is already wrapped and skips it.
*/
@Test
- public void postProcess()
+ void postProcess()
{
String rawMarkup = "<script>someJS()</script>";
Markup createMarkupElementsMarkup = Markup.of(rawMarkup);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategyTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategyTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategyTest.java
index 9d5db6d..62466dd 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategyTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategyTest.java
@@ -16,23 +16,25 @@
*/
package org.apache.wicket.markup.renderStrategy;
-import org.apache.wicket.Page;
-import org.apache.wicket.util.tester.WicketTestCase;
-import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.wicket.Page;
+import org.apache.wicket.util.tester.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTester;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* @author juergen donnerstag
*/
-public class ChildFirstHeaderRenderStrategyTest extends WicketTestCase
+class ChildFirstHeaderRenderStrategyTest extends WicketTestCase
{
/** Log. */
private static final Logger log = LoggerFactory.getLogger(ChildFirstHeaderRenderStrategyTest.class);
@@ -41,7 +43,7 @@ public class ChildFirstHeaderRenderStrategyTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void test1() throws Exception
+ void test1() throws Exception
{
executeCombinedTest(SimplePage1.class, "SimplePage1_ExpectedResult.html");
}
@@ -50,7 +52,7 @@ public class ChildFirstHeaderRenderStrategyTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void test2() throws Exception
+ void test2() throws Exception
{
executeCombinedTest(SimplePage2.class, "SimplePage2_ExpectedResult.html");
}
@@ -63,7 +65,7 @@ public class ChildFirstHeaderRenderStrategyTest extends WicketTestCase
*
*/
@Test
- public void testAjaxAndEnclosures() throws Exception
+ void testAjaxAndEnclosures() throws Exception
{
tester.startPage(EnclosureAjaxRenderPage.class);
@@ -111,8 +113,8 @@ public class ChildFirstHeaderRenderStrategyTest extends WicketTestCase
* @param filename
* @throws Exception
*/
- private <T extends Page> void executeCombinedTestPre1_5(final Class<T> pageClass,
- final String filename) throws Exception
+ <T extends Page> void executeCombinedTestPre1_5(final Class<T> pageClass,
+ final String filename) throws Exception
{
// Default Config: parent first header render strategy
log.error("=== PARENT first header render strategy ===");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/AutoLinkResolverTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/AutoLinkResolverTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/AutoLinkResolverTest.java
index d517fcc..7381757 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/AutoLinkResolverTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/AutoLinkResolverTest.java
@@ -17,23 +17,24 @@
package org.apache.wicket.markup.resolver;
import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
import java.util.Locale;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Pedro Santos
*/
-public class AutoLinkResolverTest extends WicketTestCase
+class AutoLinkResolverTest extends WicketTestCase
{
private static final Locale DEFAULT_LOCALE = Locale.US;
private static final Locale EXISTENT_RESOURCE_LOCALE = Locale.CANADA;
private static final Locale NON_EXISTENT_RESOURCE_LOCALE = Locale.FRANCE;
@Test
- public void shouldAutoLinkLocalizedResources()
+ void shouldAutoLinkLocalizedResources()
{
PageWithAutoLinkedLocalResource instance = new PageWithAutoLinkedLocalResource();
@@ -50,7 +51,7 @@ public class AutoLinkResolverTest extends WicketTestCase
}
@Test
- public void shouldAutoLinkExistentLocalizedResources()
+ void shouldAutoLinkExistentLocalizedResources()
{
tester.getSession().setLocale(NON_EXISTENT_RESOURCE_LOCALE);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimpleBasePage_6.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimpleBasePage_6.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimpleBasePage_6.java
index 3003306..f9d1586 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimpleBasePage_6.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimpleBasePage_6.java
@@ -31,7 +31,7 @@ public abstract class SimpleBasePage_6 extends WebPage
/**
* Construct.
*/
- public SimpleBasePage_6()
+ SimpleBasePage_6()
{
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/TestHomePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/TestHomePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/TestHomePage.java
index 0754d44..ba5a431 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/TestHomePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/TestHomePage.java
@@ -17,16 +17,16 @@
package org.apache.wicket.markup.resolver;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Simple test using the WicketTester
*/
-public class TestHomePage extends WicketTestCase
+class TestHomePage extends WicketTestCase
{
@Test
- public void testRenderMyPage_1()
+ void testRenderMyPage_1()
{
// start and render the test page
tester.startPage(HomePage_1.class);
@@ -50,7 +50,7 @@ public class TestHomePage extends WicketTestCase
}
@Test
- public void testRenderMyPage_2()
+ void testRenderMyPage_2()
{
// start and render the test page
tester.startPage(HomePage_2.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketContainerResolverTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketContainerResolverTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketContainerResolverTest.java
index 028188f..06217b9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketContainerResolverTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketContainerResolverTest.java
@@ -17,19 +17,19 @@
package org.apache.wicket.markup.resolver;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class WicketContainerResolverTest extends WicketTestCase
+class WicketContainerResolverTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void test_1() throws Exception
+ void test_1() throws Exception
{
executeTest(SimpleContainerPage_1.class, "SimpleContainerPageExpectedResult_1.html");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketMessageResolverTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketMessageResolverTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketMessageResolverTest.java
index bdb986e..e5a8c3a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketMessageResolverTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketMessageResolverTest.java
@@ -16,21 +16,24 @@
*/
package org.apache.wicket.markup.resolver;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.util.string.StringValueConversionException;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class WicketMessageResolverTest extends WicketTestCase
+class WicketMessageResolverTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void test_1() throws Exception
+ void test_1() throws Exception
{
tester.getApplication().getResourceSettings().setThrowExceptionOnMissingResource(false);
executeTest(SimplePage_1.class, "SimplePageExpectedResult_1.html");
@@ -40,7 +43,7 @@ public class WicketMessageResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void test_2() throws Exception
+ void test_2() throws Exception
{
executeTest(SimplePage_2.class, "SimplePageExpectedResult_2.html");
}
@@ -49,7 +52,7 @@ public class WicketMessageResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void test_2a() throws Exception
+ void test_2a() throws Exception
{
tester.getApplication().getMarkupSettings().setStripWicketTags(true);
executeTest(SimplePage_2.class, "SimplePageExpectedResult_2a.html");
@@ -59,7 +62,7 @@ public class WicketMessageResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void test_3() throws Exception
+ void test_3() throws Exception
{
executeTest(SimplePage_3.class, "SimplePageExpectedResult_3.html");
}
@@ -68,7 +71,7 @@ public class WicketMessageResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void test_4() throws Exception
+ void test_4() throws Exception
{
try
{
@@ -88,7 +91,7 @@ public class WicketMessageResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void test_5() throws Exception
+ void test_5() throws Exception
{
executeTest(SimplePage_5.class, "SimplePageExpectedResult_5.html");
}
@@ -97,19 +100,19 @@ public class WicketMessageResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void test_6() throws Exception
+ void test_6() throws Exception
{
executeTest(SimplePage_6.class, "SimplePageExpectedResult_6.html");
}
@Test
- public void shouldEscapeMessageWhenEscapeAttributeIsSetToTrue() throws Exception
+ void shouldEscapeMessageWhenEscapeAttributeIsSetToTrue() throws Exception
{
executeTest(WicketMessageResolverEscapePage.class, "WicketMessageResolverEscapePageExpectedResult.html");
}
@Test
- public void shouldFailWithEscapeSetToUnsupportedValue()
+ void shouldFailWithEscapeSetToUnsupportedValue()
{
try
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/BasePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/BasePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/BasePage.java
index 025fe43..df2ba14 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/BasePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/BasePage.java
@@ -33,7 +33,7 @@ public class BasePage extends WebPage
/**
* Construct.
*/
- public BasePage()
+ BasePage()
{
super();
}
@@ -43,7 +43,7 @@ public class BasePage extends WebPage
* @param child
* @return child
*/
- public final MarkupContainer add(final Component child)
+ final MarkupContainer add(final Component child)
{
if (borderMustBeInitialized())
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/WicketMessageResolverTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/WicketMessageResolverTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/WicketMessageResolverTest.java
index 448bbcc..6fef633 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/WicketMessageResolverTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/WicketMessageResolverTest.java
@@ -17,18 +17,18 @@
package org.apache.wicket.markup.resolver.border;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class WicketMessageResolverTest extends WicketTestCase
+class WicketMessageResolverTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void test_1() throws Exception
+ void test_1() throws Exception
{
executeTest(HomePage.class, "HomePageExpectedResult.html");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/inparent/AutoLinkResolveInParentsMarkupTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/inparent/AutoLinkResolveInParentsMarkupTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/inparent/AutoLinkResolveInParentsMarkupTest.java
index 120e2b7..a73ee21 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/inparent/AutoLinkResolveInParentsMarkupTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/inparent/AutoLinkResolveInParentsMarkupTest.java
@@ -20,13 +20,13 @@ import org.apache.wicket.markup.resolver.inparent.base.BasePage;
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test validating that an auto linked resource from the parent's page is properly resolved in the
* child page
*/
-public class AutoLinkResolveInParentsMarkupTest extends WicketTestCase
+class AutoLinkResolveInParentsMarkupTest extends WicketTestCase
{
@Override
@@ -60,7 +60,7 @@ public class AutoLinkResolveInParentsMarkupTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void resolveResourceFromMarkupInParent() throws Exception
+ void resolveResourceFromMarkupInParent() throws Exception
{
tester.startPage(HomePage.class);
tester.assertContains("wicket/resource/org.apache.wicket.markup.resolver.inparent.base.BasePage/theme/logo.png");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/BasePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/BasePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/BasePage.java
index 910fc0d..f3a4c24 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/BasePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/BasePage.java
@@ -28,7 +28,7 @@ public class BasePage extends WebPage
/**
* Construct.
*/
- public BasePage()
+ BasePage()
{
add(new MenuPanel("menu"));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/MyTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/MyTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/MyTest.java
index ba67996..463d966 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/MyTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/MyTest.java
@@ -16,20 +16,22 @@
*/
package org.apache.wicket.markup.resolver.issue3559;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import org.apache.wicket.Page;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* issue-3559
*/
-public class MyTest extends WicketTestCase
+class MyTest extends WicketTestCase
{
/**
*
*/
@Test
- public void test1()
+ void test1()
{
tester.startPage(HomePage.class);
Page page = tester.getLastRenderedPage();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/WicketApplication.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/WicketApplication.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/WicketApplication.java
index 58d0a5b..60ef358 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/WicketApplication.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/WicketApplication.java
@@ -21,7 +21,7 @@ import org.apache.wicket.protocol.http.WebApplication;
/**
*
*/
-public class WicketApplication extends WebApplication
+class WicketApplication extends WebApplication
{
@Override
public Class<HomePage> getHomePage()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3989/Issue3989Test.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3989/Issue3989Test.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3989/Issue3989Test.java
index 2835e4f..570ae24 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3989/Issue3989Test.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3989/Issue3989Test.java
@@ -17,7 +17,7 @@
package org.apache.wicket.markup.resolver.issue3989;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* When the {@link org.apache.wicket.Component#markup markup of a component} has been reset at the
@@ -26,14 +26,14 @@ import org.junit.Test;
* The cause is that the {@code PanelMarkupSourcingStrategy} fails to look for markup in
* {@code IComponentResolver}s like {@code TransparentWebMarkupContainer}.
*/
-public class Issue3989Test
+class Issue3989Test
{
/**
* This will fail unless the markup sourcing strategies look for the label {@code innerpanel} in
* the transparent markup container.
*/
@Test
- public void ajaxRenderOfTransparentlyResolvedLabel()
+ void ajaxRenderOfTransparentlyResolvedLabel()
{
WicketTester tester = new WicketTester();
tester.startPage(HomePage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue5569/HomePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue5569/HomePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue5569/HomePage.java
index 84eafac..c2fd6bc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue5569/HomePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue5569/HomePage.java
@@ -66,7 +66,7 @@ public class HomePage extends WebPage
{
private final MarkupContainer resolveTarget;
- public ComponentResolvingWebMarkupContainer(String id, MarkupContainer resolveTarget)
+ ComponentResolvingWebMarkupContainer(String id, MarkupContainer resolveTarget)
{
super(id);
this.resolveTarget = resolveTarget;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue5569/Issue5569Test.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue5569/Issue5569Test.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue5569/Issue5569Test.java
index bacb17f..7f9f455 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue5569/Issue5569Test.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue5569/Issue5569Test.java
@@ -17,12 +17,12 @@
package org.apache.wicket.markup.resolver.issue5569;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class Issue5569Test extends WicketTestCase
+class Issue5569Test extends WicketTestCase
{
@Test
- public void testIssue5569()
+ void testIssue5569()
{
tester.startPage(HomePage.class);
tester.assertRenderedPage(HomePage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/transformer/AbstractTransformerBehaviorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/transformer/AbstractTransformerBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/transformer/AbstractTransformerBehaviorTest.java
index adc3024..0384bb8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/transformer/AbstractTransformerBehaviorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/transformer/AbstractTransformerBehaviorTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup.transformer;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -26,16 +28,16 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Pedro Santos
*/
-public class AbstractTransformerBehaviorTest extends WicketTestCase
+class AbstractTransformerBehaviorTest extends WicketTestCase
{
/** */
@Test
- public void responseTransformation()
+ void responseTransformation()
{
TestPage testPage = new TestPage();
testPage.add(new AbstractTransformerBehavior()
@@ -58,7 +60,7 @@ public class AbstractTransformerBehaviorTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-4105
*/
@Test
- public void transformationInAjaxRequest()
+ void transformationInAjaxRequest()
{
tester.startPage(new AjaxTestPage());
tester.assertRenderedPage(AjaxTestPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markupFragments/MarkupFragmentTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markupFragments/MarkupFragmentTest.java b/wicket-core/src/test/java/org/apache/wicket/markupFragments/MarkupFragmentTest.java
index 26123f5..1a2a86f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markupFragments/MarkupFragmentTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markupFragments/MarkupFragmentTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markupFragments;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
@@ -25,12 +27,12 @@ import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.InlinePanelPage_1;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class MarkupFragmentTest extends WicketTestCase
+class MarkupFragmentTest extends WicketTestCase
{
/**
* page.getAssociatedMarkup(), page.getMarkup() and page.getMarkup(null) must all return the
@@ -39,7 +41,7 @@ public class MarkupFragmentTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void page() throws Exception
+ void page() throws Exception
{
IMarkupFragment markup = new MyPage().getAssociatedMarkup();
compareMarkupWithFile(markup, "MyPage_ExpectedResult.html", MyPage.class);
@@ -56,7 +58,7 @@ public class MarkupFragmentTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void panel() throws Exception
+ void panel() throws Exception
{
Page page = new MyPage();
Panel panel = new MyPanel("panel");
@@ -91,7 +93,7 @@ public class MarkupFragmentTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void panelWithAutoComponent() throws Exception
+ void panelWithAutoComponent() throws Exception
{
Page page = new MyPage();
Panel panel = new MyPanelWithAutoComponent("panel");
@@ -123,7 +125,7 @@ public class MarkupFragmentTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void label() throws Exception
+ void label() throws Exception
{
Component label = new MyPage().get("label");
IMarkupFragment markup = label.getMarkup();
@@ -139,7 +141,7 @@ public class MarkupFragmentTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void webMarkupContainer() throws Exception
+ void webMarkupContainer() throws Exception
{
MarkupContainer container = (MarkupContainer)new MyPage().get("container");
IMarkupFragment markup = container.getMarkup();
@@ -159,7 +161,7 @@ public class MarkupFragmentTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void border() throws Exception
+ void border() throws Exception
{
Page page = new MyBorderPage();
Border border = (Border)page.get("border");
@@ -198,7 +200,7 @@ public class MarkupFragmentTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void border2() throws Exception
+ void border2() throws Exception
{
Page page = new MyBorderPage();
Border border = (Border)page.get("border2");
@@ -236,7 +238,7 @@ public class MarkupFragmentTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void fragments() throws Exception
+ void fragments() throws Exception
{
Page page = new InlinePanelPage_1();
Fragment fragment = (Fragment)page.get("myPanel1");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/AbstractPropertyModelObjectClassTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/AbstractPropertyModelObjectClassTest.java b/wicket-core/src/test/java/org/apache/wicket/model/AbstractPropertyModelObjectClassTest.java
index 1d141fc..ec90011 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/AbstractPropertyModelObjectClassTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/AbstractPropertyModelObjectClassTest.java
@@ -16,11 +16,12 @@
*/
package org.apache.wicket.model;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import java.io.Serializable;
-import junit.framework.TestCase;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* <p>
@@ -31,14 +32,14 @@ import org.junit.Test;
* @see <a href="https://issues.apache.org/jira/browse/WICKET-2937">WICKET-2937</a>
* @author Pedro Santos
*/
-public class AbstractPropertyModelObjectClassTest extends Assert
+public class AbstractPropertyModelObjectClassTest
{
/**
*
*/
@Test
- public void testCompoundPropertyModel()
+ void testCompoundPropertyModel()
{
assertPropertyModelTargetTypeIsInteger(new CompoundPropertyModel<CustomType>(
new CustomType()));
@@ -48,7 +49,7 @@ public class AbstractPropertyModelObjectClassTest extends Assert
*
*/
@Test
- public void testCompoundPropertyModelBind()
+ void testCompoundPropertyModelBind()
{
CompoundPropertyModel<CustomBean> compoundPropertyModel = new CompoundPropertyModel<CustomBean>(
new CustomBean());
@@ -60,7 +61,7 @@ public class AbstractPropertyModelObjectClassTest extends Assert
*
*/
@Test
- public void testModel()
+ void testModel()
{
assertPropertyModelTargetTypeIsInteger(new Model<CustomType>(new CustomType()));
}
@@ -84,7 +85,7 @@ public class AbstractPropertyModelObjectClassTest extends Assert
* @see <a href="https://issues.apache.org/jira/browse/WICKET-3253">WICKET-3253</a>
*/
@Test
- public void testLazyClassResolution()
+ void testLazyClassResolution()
{
Model<CustomBean> modelCustomBean = new Model<CustomBean>(null);
PropertyModel<CustomType> customTypeModel = new PropertyModel<CustomType>(modelCustomBean,
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/ChainingModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/ChainingModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/ChainingModelTest.java
index 3239136..6ef6be7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/ChainingModelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/ChainingModelTest.java
@@ -16,30 +16,21 @@
*/
package org.apache.wicket.model;
-import static org.hamcrest.core.StringContains.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import java.io.StringWriter;
-
-import org.apache.log4j.Level;
-import org.apache.log4j.SimpleLayout;
-import org.apache.log4j.WriterAppender;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link ChainingModel}.
*
* @author svenmeier
*/
-public class ChainingModelTest
+class ChainingModelTest
{
@Test
- public void testNonModel() {
+ void testNonModel() {
ChainingModel<Integer> model = new ChainingModel<>(1);
assertEquals(Integer.valueOf(1), model.getObject());
@@ -48,12 +39,12 @@ public class ChainingModelTest
}
@Test
- public void testNonSerializable() {
+ void testNonSerializable() {
new ChainingModel<>(Thread.currentThread());
}
@Test
- public void testDetachable() {
+ void testDetachable() {
class TestDetachable implements IDetachable
{
boolean detached = false;
@@ -78,7 +69,7 @@ public class ChainingModelTest
}
@Test
- public void testModel() {
+ void testModel() {
class TestModel implements IModel<Integer>
{
boolean detached = false;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTest.java
index 19c2b84..d4cd222 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTest.java
@@ -17,15 +17,15 @@
package org.apache.wicket.model;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for CompoundPropertyModel
*/
-public class CompoundPropertyModelTest extends WicketTestCase
+class CompoundPropertyModelTest extends WicketTestCase
{
@Test
- public void twoLevelsDeepHierarchy()
+ void twoLevelsDeepHierarchy()
{
tester.startPage(CompoundPropertyModelTwoLevelsDeepPage.class);
tester.assertRenderedPage(CompoundPropertyModelTwoLevelsDeepPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTwoLevelsDeepPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTwoLevelsDeepPage.java b/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTwoLevelsDeepPage.java
index 8b993e7..01c3392 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTwoLevelsDeepPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTwoLevelsDeepPage.java
@@ -41,12 +41,12 @@ public class CompoundPropertyModelTwoLevelsDeepPage extends WebPage
addressContainer.add(new Label("address.street1"));
}
- public static class Person implements Serializable
+ static class Person implements Serializable
{
private String name;
private Address address;
- public Person(String name, Address address)
+ Person(String name, Address address)
{
this.name = name;
this.address = address;
@@ -67,7 +67,7 @@ public class CompoundPropertyModelTwoLevelsDeepPage extends WebPage
{
private String street1;
- public Address(String street1)
+ Address(String street1)
{
this.street1 = street1;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/DetachableTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/DetachableTest.java b/wicket-core/src/test/java/org/apache/wicket/model/DetachableTest.java
index f1ea647..3aad02d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/DetachableTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/DetachableTest.java
@@ -16,25 +16,28 @@
*/
package org.apache.wicket.model;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.Serializable;
import org.apache.wicket.Component;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Pedro Santos
*/
-public class DetachableTest extends WicketTestCase
+class DetachableTest extends WicketTestCase
{
/**
* <a href="https://issues.apache.org/jira/browse/WICKET-3872">WICKET-3872</a>
*/
@Test
- public void testDetachRemovedChildrenTree()
+ void testDetachRemovedChildrenTree()
{
DetachableComponent a = new DetachableComponent("a");
DetachableComponent ab = new DetachableComponent("b");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/HomePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/HomePage.java b/wicket-core/src/test/java/org/apache/wicket/model/HomePage.java
index 6c6820d..e9449f1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/HomePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/HomePage.java
@@ -53,7 +53,7 @@ public class HomePage extends WebPage
String name;
- public BookingForm(String s)
+ BookingForm(String s)
{
super(s);
setDefaultModel(new CompoundPropertyModel<Booking>(booking));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/IModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/IModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/IModelTest.java
index 8f7b585..e0cf82d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/IModelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/IModelTest.java
@@ -16,30 +16,29 @@
*/
package org.apache.wicket.model;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.nullValue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+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 org.apache.wicket.core.util.lang.WicketObjects;
import org.apache.wicket.model.lambda.Address;
import org.apache.wicket.model.lambda.Person;
import org.danekja.java.util.function.serializable.SerializableBiFunction;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link IModel}'s methods
*/
-public class IModelTest extends Assert
+class IModelTest
{
private Person person;
private final String name = "John";
private final String street = "Strasse";
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
person = new Person();
person.setName(name);
@@ -51,114 +50,128 @@ public class IModelTest extends Assert
}
@Test
- public void filterMatch()
+ void filterMatch()
{
IModel<Person> johnModel = Model.of(person).filter((p) -> p.getName().equals(name));
- assertThat(johnModel.getObject(), is(person));
+ assertEquals(person, johnModel.getObject());
}
@Test
- public void filterNoMatch()
+ void filterNoMatch()
{
IModel<Person> johnModel = Model.of(person).filter((p) -> p.getName().equals("Jane"));
- assertThat(johnModel.getObject(), is(nullValue()));
+ assertNull(johnModel.getObject());
}
- @Test(expected = IllegalArgumentException.class)
- public void nullFilter()
+ @Test
+ void nullFilter()
{
- Model.of(person).filter(null);
+ assertThrows(IllegalArgumentException.class, () -> {
+ Model.of(person).filter(null);
+ });
}
@Test
- public void map()
+ void map()
{
IModel<String> personNameModel = Model.of(person).map(Person::getName);
- assertThat(personNameModel.getObject(), is(equalTo(name)));
+ assertEquals(name, personNameModel.getObject());
}
@Test
- public void map2()
+ void map2()
{
IModel<String> streetModel = Model.of(person)
.map(Person::getAddress)
.map(Address::getStreet);
- assertThat(streetModel.getObject(), is(equalTo(street)));
+ assertEquals(street, streetModel.getObject());
}
- @Test(expected = IllegalArgumentException.class)
- public void nullMapper()
+ @Test
+ void nullMapper()
{
- Model.of(person).map(null);
+ assertThrows(IllegalArgumentException.class, () -> {
+ Model.of(person).map(null);
+ });
+
}
@Test
- public void combineWith()
+ void combineWith()
{
IModel<String> janeModel = Model.of("Jane");
SerializableBiFunction<Person, String, String> function = (SerializableBiFunction<Person, String, String>)(
person1, other) -> person1.getName() + " is in relationship with " + other;
IModel<String> relationShipModel = Model.of(person).combineWith(janeModel, function);
- assertThat(relationShipModel.getObject(), is(equalTo("John is in relationship with Jane")));
+ assertEquals("John is in relationship with Jane", relationShipModel.getObject());
}
@Test
- public void combineWithNullObject()
+ void combineWithNullObject()
{
IModel<String> janeModel = Model.of((String)null);
SerializableBiFunction<Person, String, String> function = (SerializableBiFunction<Person, String, String>)(
person1, other) -> person1.getName() + " is in relationship with " + other;
IModel<String> relationShipModel = Model.of(person).combineWith(janeModel, function);
- assertThat(relationShipModel.getObject(), is(nullValue()));
+ assertNull(relationShipModel.getObject());
}
- @Test(expected = IllegalArgumentException.class)
- public void combineWithNullModel()
+ @Test
+ void combineWithNullModel()
{
IModel<String> janeModel = null;
SerializableBiFunction<Person, String, String> function = (SerializableBiFunction<Person, String, String>)(
person1, other) -> person1.getName() + " is in relationship with " + other;
- Model.of(person).combineWith(janeModel, function);
+
+ assertThrows(IllegalArgumentException.class, () -> {
+ Model.of(person).combineWith(janeModel, function);
+ });
+
}
- @Test(expected = IllegalArgumentException.class)
- public void combineWithNullCombiner()
+ @Test
+ void combineWithNullCombiner()
{
- Model.of(person).combineWith(Model.of("Jane"), null);
+ assertThrows(IllegalArgumentException.class, () -> {
+ Model.of(person).combineWith(Model.of("Jane"), null);
+ });
+
}
@Test
- public void flatMap()
+ void flatMap()
{
IModel<String> heirModel = Model.of(person)
.flatMap(john -> LambdaModel.of(() -> john.getName() + " is my parent", john::setName));
- assertThat(heirModel.getObject(), is(equalTo("John is my parent")));
+ assertEquals("John is my parent", heirModel.getObject());
String newValue = "Matthias";
heirModel.setObject(newValue);
- assertThat(heirModel.getObject(), is(equalTo("Matthias is my parent")));
+ assertEquals("Matthias is my parent", heirModel.getObject());
}
- @Test(expected = IllegalArgumentException.class)
- public void nullFlatMapper()
+ @Test
+ void nullFlatMapper()
{
- Model.of(person).flatMap(null);
+ assertThrows(IllegalArgumentException.class, () -> {
+ Model.of(person).flatMap(null);
+ });
}
@Test
- public void orElse()
+ void orElse()
{
person.setName(null);
String defaultName = "Default name";
IModel<String> defaultNameModel = Model.of(person).map(Person::getName).orElse(defaultName);
- assertThat(defaultNameModel.getObject(), is(equalTo(defaultName)));
+ assertEquals(defaultName, defaultNameModel.getObject());
}
@Test
- public void orElseGet()
+ void orElseGet()
{
person.setName(null);
String defaultName = "Default name";
@@ -166,33 +179,35 @@ public class IModelTest extends Assert
.map(Person::getName)
.orElseGet(() -> defaultName);
- assertThat(defaultNameModel.getObject(), is(equalTo(defaultName)));
+ assertEquals(defaultName, defaultNameModel.getObject());
}
- @Test(expected = IllegalArgumentException.class)
- public void orElseGetNullOther()
+ @Test
+ void orElseGetNullOther()
{
- Model.of(person).map(Person::getName).orElseGet(null);
+ assertThrows(IllegalArgumentException.class, () -> {
+ Model.of(person).map(Person::getName).orElseGet(null);
+ });
}
@Test
- public void isPresent()
+ void isPresent()
{
- assertThat(Model.of(person).isPresent().getObject(), is(equalTo(true)));
+ assertEquals(true, Model.of(person).isPresent().getObject());
}
@Test
- public void isPresentNot()
+ void isPresentNot()
{
- assertThat(Model.of((Person)null).isPresent().getObject(), is(equalTo(false)));
+ assertEquals(false, Model.of((Person)null).isPresent().getObject());
}
@Test
- public void serializableMethodReference()
+ void serializableMethodReference()
{
Person p = new Person();
IModel<String> m = p::getName;
- assertThat(WicketObjects.cloneObject(m), is(not(nullValue())));
+ assertNotNull(WicketObjects.cloneObject(m));
}
static class Account
@@ -202,21 +217,21 @@ public class IModelTest extends Assert
person.setName("Some Name");
}
- public Person getPerson()
+ Person getPerson()
{
return person;
}
}
@Test
- public void serializableMethodChainReference()
+ void serializableMethodChainReference()
{
IModel<Account> accountModel = LoadableDetachableModel.of(Account::new);
IModel<Person> personModel = accountModel.map(Account::getPerson);
IModel<String> nameModel = personModel.map(Person::getName);
IModel<String> clone = WicketObjects.cloneObject(nameModel);
- assertThat(clone, is(not(nullValue())));
- assertThat(clone.getObject(), is("Some Name"));
+ assertNotNull(clone);
+ assertEquals("Some Name", clone.getObject());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/InheritedModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/InheritedModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/InheritedModelTest.java
index 3d407ab..6b46916 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/InheritedModelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/InheritedModelTest.java
@@ -16,22 +16,24 @@
*/
package org.apache.wicket.model;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.value.ValueMap;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the inheritance of models.
*/
-public class InheritedModelTest extends WicketTestCase
+class InheritedModelTest extends WicketTestCase
{
/**
* Tests the CPM inheritance by setting a different root model using a rendered scenario.
*/
@Test
- public void testCompoundPropertyModelRendered()
+ void testCompoundPropertyModelRendered()
{
ValueMap data1 = new ValueMap();
data1.put("label", "foo");
@@ -55,7 +57,7 @@ public class InheritedModelTest extends WicketTestCase
* Tests the CPM by setting a different root model using a direct scenario.
*/
@Test
- public void testCompoundPropertyModelDirect()
+ void testCompoundPropertyModelDirect()
{
ValueMap data1 = new ValueMap();
data1.put("label", "foo");
@@ -81,7 +83,7 @@ public class InheritedModelTest extends WicketTestCase
* Tests if Component#FLAG_INHERITABLE_MODEL reset after model change (WICKET-3413).
*/
@Test
- public void testResetInheritedModelFlag()
+ void testResetInheritedModelFlag()
{
ValueMap data1 = new ValueMap();
data1.put("label", "foo");
@@ -109,7 +111,7 @@ public class InheritedModelTest extends WicketTestCase
* Tests if Component#FLAG_INHERITABLE_MODEL reset after model change (WICKET-5655).
*/
@Test
- public void testResetInheritedModelFlag2()
+ void testResetInheritedModelFlag2()
{
ValueMap data1 = new ValueMap();
data1.put("label", "foo");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/LambdaModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/LambdaModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/LambdaModelTest.java
index 3a51a02..905ed62 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/LambdaModelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/LambdaModelTest.java
@@ -16,23 +16,23 @@
*/
package org.apache.wicket.model;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.wicket.core.util.lang.WicketObjects;
import org.apache.wicket.model.lambda.Person;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link LambdaModel}
*/
@SuppressWarnings("javadoc")
-public class LambdaModelTest
+class LambdaModelTest
{
@Test
- public void methodReference()
+ void methodReference()
{
Person person = new Person();
IModel<String> personNameModel = LambdaModel.of(person::getName, person::setName);
@@ -40,7 +40,7 @@ public class LambdaModelTest
}
@Test
- public void explicitLambdas()
+ void explicitLambdas()
{
Person person = new Person();
IModel<String> personNameModel = LambdaModel.<String>of(
@@ -50,7 +50,7 @@ public class LambdaModelTest
}
@Test
- public void targetModel()
+ void targetModel()
{
IModel<Person> target = Model.of(new Person());
@@ -59,32 +59,35 @@ public class LambdaModelTest
}
@Test
- public void targetModelNull()
+ void targetModelNull()
{
IModel<Person> target = Model.of((Person)null);
IModel<String> personNameModel = LambdaModel.of(target, Person::getName, Person::setName);
personNameModel.setObject("new name");
- assertThat(personNameModel.getObject(), is(nullValue()));
+ assertNull(personNameModel.getObject());
}
- @Test(expected=UnsupportedOperationException.class)
- public void targetReadOnly()
+ @Test
+ void targetReadOnly()
{
IModel<Person> target = Model.of(new Person());
IModel<String> personNameModel = LambdaModel.of(target, Person::getName);
- check(personNameModel);
+
+ assertThrows(UnsupportedOperationException.class, () -> {
+ check(personNameModel);
+ });
}
private void check(IModel<String> personNameModel)
{
- assertThat(personNameModel.getObject(), is(nullValue()));
+ assertNull(personNameModel.getObject());
final String personName = "new name";
personNameModel.setObject(personName);
- assertThat(personNameModel.getObject(), is(personName));
+ assertEquals(personName, personNameModel.getObject());
serialize(personNameModel, personName);
}
@@ -92,7 +95,7 @@ public class LambdaModelTest
private void serialize(IModel<String> personNameModel, String personName)
{
final IModel<String> clone = WicketObjects.cloneObject(personNameModel);
- assertThat(clone, is(instanceOf(LambdaModel.class)));
- assertThat(clone.getObject(), is(personName));
+ assertThat(clone).isInstanceOf(LambdaModel.class);
+ assertEquals(personName, clone.getObject());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/LoadableDetachableModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/LoadableDetachableModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/LoadableDetachableModelTest.java
index fe599fe..6035a08 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/LoadableDetachableModelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/LoadableDetachableModelTest.java
@@ -16,7 +16,9 @@
*/
package org.apache.wicket.model;
-import static org.hamcrest.core.Is.is;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -26,19 +28,19 @@ import java.io.ObjectOutputStream;
import java.io.Serializable;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the states of a LoadableDetachableModel
*/
@SuppressWarnings("javadoc")
-public class LoadableDetachableModelTest extends WicketTestCase
+class LoadableDetachableModelTest extends WicketTestCase
{
/**
* Checks whether the LDM can escape recursive calls.
*/
@Test
- public void recursiveGetObjectDoesntCauseInfiteLoop()
+ void recursiveGetObjectDoesntCauseInfiteLoop()
{
class RecursiveLoad extends LoadableDetachableModel<Integer>
{
@@ -57,13 +59,13 @@ public class LoadableDetachableModelTest extends WicketTestCase
RecursiveLoad ldm = new RecursiveLoad();
- assertThat(ldm.isAttached(), is(false));
- assertThat(ldm.getObject(), is(1));
- assertThat(ldm.isAttached(), is(true));
+ assertEquals(false, ldm.isAttached());
+ assertThat(ldm.getObject()).isEqualTo(1);
+ assertEquals(true, ldm.isAttached());
}
@Test
- public void onAttachCalled()
+ void onAttachCalled()
{
class AttachingLoadableModel extends LoadableDetachableModel<Integer>
{
@@ -87,15 +89,15 @@ public class LoadableDetachableModelTest extends WicketTestCase
AttachingLoadableModel m = new AttachingLoadableModel();
m.getObject();
- assertThat(m.isAttached(), is(true));
- assertThat(m.attachCalled, is(true));
+ assertEquals(true, m.isAttached());
+ assertEquals(true, m.attachCalled);
}
/**
* Checks whether the LDM can escape recursive calls.
*/
@Test
- public void exceptionDuringLoadKeepsLDMDetached()
+ void exceptionDuringLoadKeepsLDMDetached()
{
class ExceptionalLoad extends LoadableDetachableModel<Integer>
{
@@ -118,18 +120,18 @@ public class LoadableDetachableModelTest extends WicketTestCase
ExceptionalLoad ldm = new ExceptionalLoad();
- assertThat(ldm.isAttached(), is(false));
+ assertEquals(false, ldm.isAttached());
try
{
- assertThat(ldm.getObject(), is(1));
+ assertThat(ldm.getObject()).isEqualTo(1);
fail("shouldn't get here");
}
catch (RuntimeException e)
{
}
ldm.detach();
- assertThat(ldm.isAttached(), is(false));
- assertThat(ldm.detachCalled, is(true));
+ assertEquals(false, ldm.isAttached());
+ assertEquals(true, ldm.detachCalled);
}
private static class SerializedLoad extends LoadableDetachableModel<Integer>
@@ -151,21 +153,21 @@ public class LoadableDetachableModelTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void serializationDeserializationRetainsInternalState() throws Exception
+ void serializationDeserializationRetainsInternalState() throws Exception
{
SerializedLoad ldm = new SerializedLoad();
- assertThat(ldm.getObject(), is(1));
+ assertThat(ldm.getObject()).isEqualTo(1);
ldm.detach();
byte[] serialized = serialize(ldm);
LoadableDetachableModel<Integer> deserialized = deserialize(serialized);
- assertThat(deserialized.isAttached(), is(false));
- assertThat(deserialized.getObject(), is(2));
- assertThat(deserialized.isAttached(), is(true));
+ assertEquals(false, deserialized.isAttached());
+ assertThat(deserialized.getObject()).isEqualTo(2);
+ assertEquals(true, deserialized.isAttached());
deserialized.detach();
- assertThat(deserialized.isAttached(), is(false));
+ assertEquals(false, deserialized.isAttached());
}
/** Serialization helper */
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/ModelDetachTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/ModelDetachTest.java b/wicket-core/src/test/java/org/apache/wicket/model/ModelDetachTest.java
index 460e68b..a8f684c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/ModelDetachTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/ModelDetachTest.java
@@ -16,33 +16,21 @@
*/
package org.apache.wicket.model;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
/**
* Tests the detach behavior for compatibility with IDetachable nested objects, ensuring that the
* detach method is called for those nested objects.
*/
-public class ModelDetachTest extends Assert
+class ModelDetachTest
{
- static class Detachable implements IDetachable
- {
- private static final long serialVersionUID = 1L;
-
- private boolean detached = false;
-
- @Override
- public void detach()
- {
- detached = true;
- }
- }
-
/**
* Performs the nested test for CompoundPropertyModel.
*/
@Test
- public void compoundPropertyModelDetach()
+ void compoundPropertyModelDetach()
{
Detachable detachable = new Detachable();
IModel<Detachable> model = new CompoundPropertyModel<Detachable>(detachable);
@@ -54,7 +42,7 @@ public class ModelDetachTest extends Assert
* Performs the nested test for BoundCompoundPropertyModel.
*/
@Test
- public void boundCompoundPropertyModelDetach()
+ void boundCompoundPropertyModelDetach()
{
Detachable detachable = new Detachable();
IModel<Detachable> model = new CompoundPropertyModel<Detachable>(detachable);
@@ -66,7 +54,7 @@ public class ModelDetachTest extends Assert
* Performs the nested test for AbstractPropertyModel.
*/
@Test
- public void abstractPropertyModelDetach()
+ void abstractPropertyModelDetach()
{
Detachable detachable = new Detachable();
IModel<?> model = new AbstractPropertyModel<Void>(detachable)
@@ -87,11 +75,24 @@ public class ModelDetachTest extends Assert
* Performs the nested test for PropertyModel.
*/
@Test
- public void propertyModelDetach()
+ void propertyModelDetach()
{
Detachable detachable = new Detachable();
IModel<?> model = new PropertyModel<Void>(detachable, "foo");
model.detach();
assertTrue(detachable.detached);
}
+
+ static class Detachable implements IDetachable
+ {
+ private static final long serialVersionUID = 1L;
+
+ private boolean detached = false;
+
+ @Override
+ public void detach()
+ {
+ detached = true;
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/ModelToStringTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/ModelToStringTest.java b/wicket-core/src/test/java/org/apache/wicket/model/ModelToStringTest.java
index f248916..c21f77d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/ModelToStringTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/ModelToStringTest.java
@@ -16,16 +16,18 @@
*/
package org.apache.wicket.model;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.Properties;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Tests the toString() method on the models in the org.apache.wicket.model package.
*/
-public class ModelToStringTest extends WicketTestCase
+class ModelToStringTest extends WicketTestCase
{
/**
* Used for models in testing.
@@ -54,7 +56,7 @@ public class ModelToStringTest extends WicketTestCase
* Tests the BoundCompoundPropertyModel.toString() method.
*/
@Test
- public void boundCompoundPropertyModel()
+ void boundCompoundPropertyModel()
{
CompoundPropertyModel<String> emptyModel = new CompoundPropertyModel<String>("");
String expected = "Model:classname=[org.apache.wicket.model.CompoundPropertyModel]:nestedModel=[]";
@@ -85,7 +87,7 @@ public class ModelToStringTest extends WicketTestCase
* Tests the CompoundPropertyModel.toString() method.
*/
@Test
- public void compoundPropertyModel()
+ void compoundPropertyModel()
{
CompoundPropertyModel<?> emptyModel = new CompoundPropertyModel<String>("");
String expected = "Model:classname=[org.apache.wicket.model.CompoundPropertyModel]:nestedModel=[]";
@@ -116,7 +118,7 @@ public class ModelToStringTest extends WicketTestCase
* Tests LoadableDetachableModel.toString()
*/
@Test
- public void loadableDetachableModel()
+ void loadableDetachableModel()
{
LoadableDetachableModel<String> model = new MyLoadableDetachableModel();
assertTrue(model.toString().contains(":attached=false"));
@@ -136,7 +138,7 @@ public class ModelToStringTest extends WicketTestCase
* Tests the Model.toString() method.
*/
@Test
- public void model()
+ void model()
{
Model<?> emptyModel = new Model<String>();
String expected = "Model:classname=[org.apache.wicket.model.Model]:object=[null]";
@@ -151,7 +153,7 @@ public class ModelToStringTest extends WicketTestCase
* Tests the PropertyModel.toString() method.
*/
@Test
- public void propertyModel()
+ void propertyModel()
{
PropertyModel<Void> emptyModel = new PropertyModel<Void>("", null);
String expected = "Model:classname=[org.apache.wicket.model.PropertyModel]:nestedModel=[]:expression=[null]";
[19/45] wicket git commit: wicket-core: Migrate to Junit 5
Posted by mg...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java
index 233dc3b..ae64b6e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java
@@ -17,7 +17,7 @@
package org.apache.wicket.markup.html.header.inheritance;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
@@ -25,14 +25,14 @@ import org.junit.Test;
*
* @author Martijn Dashorst
*/
-public class InheritanceHeadTest extends WicketTestCase
+class InheritanceHeadTest extends WicketTestCase
{
/**
*
* @throws Exception
*/
@Test
- public void test_2() throws Exception
+ void test_2() throws Exception
{
executeTest(ConcretePage2.class, "ExpectedResult2.html");
}
@@ -42,7 +42,7 @@ public class InheritanceHeadTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void test_3() throws Exception
+ void test_3() throws Exception
{
tester.getSession().setStyle("myStyle");
executeTest(ConcretePage2.class, "ExpectedResult3.html");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/response/PanelWithHeader.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/response/PanelWithHeader.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/response/PanelWithHeader.java
index 2121a75..8ac6b1d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/response/PanelWithHeader.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/response/PanelWithHeader.java
@@ -33,7 +33,7 @@ public class PanelWithHeader extends Panel
private static class StringHeaderItemWithDependency extends StringHeaderItem
{
- public StringHeaderItemWithDependency(CharSequence string)
+ StringHeaderItemWithDependency(CharSequence string)
{
super(string);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/HeaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/HeaderTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/HeaderTest.java
index a031bc0..1d6bb41 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/HeaderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/HeaderTest.java
@@ -17,20 +17,20 @@
package org.apache.wicket.markup.html.header.testing;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
* @author Juergen Donnerstag
*/
-public class HeaderTest extends WicketTestCase
+class HeaderTest extends WicketTestCase
{
/**
*
* @throws Exception
*/
@Test
- public void test_1() throws Exception
+ void test_1() throws Exception
{
executeTest(TestPage.class, "TestPage_ExpectedResult.html");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/TestBasePanel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/TestBasePanel.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/TestBasePanel.java
index 0a31d58..59354db 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/TestBasePanel.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/TestBasePanel.java
@@ -29,7 +29,7 @@ public class TestBasePanel extends Panel
/**
* Construct.
*/
- public TestBasePanel()
+ TestBasePanel()
{
super("panel");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/HeaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/HeaderTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/HeaderTest.java
index 9aa1eac..a6b18fe 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/HeaderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/HeaderTest.java
@@ -17,20 +17,20 @@
package org.apache.wicket.markup.html.header.testing2;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
* @author Juergen Donnerstag
*/
-public class HeaderTest extends WicketTestCase
+class HeaderTest extends WicketTestCase
{
/**
*
* @throws Exception
*/
@Test
- public void test_1() throws Exception
+ void test_1() throws Exception
{
executeTest(TestExtendedPage.class, "TestExtendedPage_ExpectedResult.html");
}
@@ -40,7 +40,7 @@ public class HeaderTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void test_2() throws Exception
+ void test_2() throws Exception
{
executeTest(TestExtendedPage2.class, "TestExtendedPage2_ExpectedResult.html");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/TestBasePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/TestBasePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/TestBasePage.java
index 58964e5..be5293e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/TestBasePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/TestBasePage.java
@@ -29,7 +29,7 @@ public class TestBasePage extends WebPage
/**
* Construct.
*/
- public TestBasePage()
+ TestBasePage()
{
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/HeaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/HeaderTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/HeaderTest.java
index 36794ea..57efd00 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/HeaderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/HeaderTest.java
@@ -17,13 +17,13 @@
package org.apache.wicket.markup.html.header.testing3;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
* @author Juergen Donnerstag
*/
-public class HeaderTest extends WicketTestCase
+class HeaderTest extends WicketTestCase
{
/**
* Replace a Panel which has a body onLoad modifier
@@ -31,7 +31,7 @@ public class HeaderTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void test_1() throws Exception
+ void test_1() throws Exception
{
executeTest(TestPage.class, "TestPage_ExpectedResult-1.html");
TestPage page = (TestPage)tester.getLastRenderedPage();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage.java
index 8ff4cc3..8a69ec6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage.java
@@ -56,7 +56,7 @@ public class TestPage extends WebPage
/**
*
*/
- public void replacePanel()
+ private void replacePanel()
{
current = (current == panel1 ? panel2 : panel1);
replace(current);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractBasePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractBasePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractBasePage.java
index 98beb61..34c2ddb 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractBasePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractBasePage.java
@@ -29,7 +29,7 @@ public abstract class AbstractBasePage extends WebPage
/**
* Construct.
*/
- public AbstractBasePage()
+ AbstractBasePage()
{
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractMeldingPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractMeldingPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractMeldingPage.java
index efe44a1..bd01a77 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractMeldingPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractMeldingPage.java
@@ -29,7 +29,7 @@ public abstract class AbstractMeldingPage extends AbstractSecurePage
/**
* Construct.
*/
- public AbstractMeldingPage()
+ AbstractMeldingPage()
{
add(new Label("foo", "FooBar"));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractSecurePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractSecurePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractSecurePage.java
index 14f958e..911b069 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractSecurePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractSecurePage.java
@@ -29,7 +29,7 @@ public abstract class AbstractSecurePage extends AbstractBasePage
/**
* Construct.
*/
- public AbstractSecurePage()
+ AbstractSecurePage()
{
add(new Label("username", "Pietje Puk"));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/InheritanceHeadTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/InheritanceHeadTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/InheritanceHeadTest.java
index 20e5b11..b37d991 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/InheritanceHeadTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/InheritanceHeadTest.java
@@ -17,21 +17,21 @@
package org.apache.wicket.markup.html.header.threelayers;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the inclusion of the wicket:head section from a panel in a subclassed page.
*
* @author Martijn Dashorst
*/
-public class InheritanceHeadTest extends WicketTestCase
+class InheritanceHeadTest extends WicketTestCase
{
/**
*
* @throws Exception
*/
@Test
- public void test_1() throws Exception
+ void test_1() throws Exception
{
executeTest(MeldingPage.class, "ExpectedResult.html");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractBasePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractBasePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractBasePage.java
index a42407a..5e0f36d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractBasePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractBasePage.java
@@ -29,7 +29,7 @@ public abstract class AbstractBasePage extends WebPage
/**
* Construct.
*/
- public AbstractBasePage()
+ AbstractBasePage()
{
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractMeldingPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractMeldingPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractMeldingPage.java
index cae518a..8b37a40 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractMeldingPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractMeldingPage.java
@@ -29,7 +29,7 @@ public abstract class AbstractMeldingPage extends AbstractSecurePage
/**
* Construct.
*/
- public AbstractMeldingPage()
+ AbstractMeldingPage()
{
add(new Label("foo", "FooBar"));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractSecurePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractSecurePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractSecurePage.java
index 4b7cadf..d3b7e61 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractSecurePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractSecurePage.java
@@ -29,7 +29,7 @@ public abstract class AbstractSecurePage extends AbstractBasePage
/**
* Construct.
*/
- public AbstractSecurePage()
+ AbstractSecurePage()
{
add(new Label("username", "Pietje Puk"));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/InheritanceHeadTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/InheritanceHeadTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/InheritanceHeadTest.java
index 610b585..0243443 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/InheritanceHeadTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/InheritanceHeadTest.java
@@ -17,21 +17,21 @@
package org.apache.wicket.markup.html.header.threelayers2;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the inclusion of the wicket:head section from a panel in a subclassed page.
*
* @author Martijn Dashorst
*/
-public class InheritanceHeadTest extends WicketTestCase
+class InheritanceHeadTest extends WicketTestCase
{
/**
*
* @throws Exception
*/
@Test
- public void test_1() throws Exception
+ void test_1() throws Exception
{
executeTest(MeldingPage.class, "ExpectedResult.html");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/image/AjaxUpdatedImageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/AjaxUpdatedImageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/AjaxUpdatedImageTest.java
index 68d8a77..012b38e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/AjaxUpdatedImageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/AjaxUpdatedImageTest.java
@@ -16,37 +16,38 @@
*/
package org.apache.wicket.markup.html.image;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.util.tester.TagTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for WICKET-1382
*/
-public class AjaxUpdatedImageTest extends WicketTestCase
+class AjaxUpdatedImageTest extends WicketTestCase
{
/**
* Tests that Image re-rendered in Ajax request have 'wicket:antiCache' parameter in its 'src'
* attribute value
*/
@Test
- public void wicket1382()
+ void wicket1382()
{
AjaxyImagesPage page = tester.startPage(AjaxyImagesPage.class);
TagTester tagTester = tester.getTagById(page.image.getMarkupId());
final String srcAttr = tagTester.getAttribute("src");
- assertFalse(
- "Image has not be rendered in Ajax request so it has no wicket:antiCache' parameter",
- srcAttr.contains("antiCache"));
+ assertFalse(srcAttr.contains("antiCache"),
+ "Image has not be rendered in Ajax request so it has no wicket:antiCache' parameter");
// make an ajax call
tester.clickLink("link", true);
page = (AjaxyImagesPage)tester.getLastRenderedPage();
tagTester = tester.getTagById(page.image.getMarkupId());
final String srcAttr1 = tagTester.getAttribute("src");
- assertTrue(
- "Image has not be rendered in Ajax request so it has no wicket:antiCache' parameter",
- srcAttr1.contains("antiCache"));
+ assertTrue(srcAttr1.contains("antiCache"),
+ "Image has not be rendered in Ajax request so it has no wicket:antiCache' parameter");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTest.java
index c0a77c7..796b3d7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.markup.html.image;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.Serializable;
import java.util.List;
@@ -23,8 +26,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.wicket.util.tester.TagTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test cases to test the external image components
@@ -32,26 +34,26 @@ import org.junit.Test;
* @author Tobias Soloschenko
*
*/
-public class ExternalImageTest extends WicketTestCase
+class ExternalImageTest extends WicketTestCase
{
@Test
- public void testExternalImage()
+ void testExternalImage()
{
tester.startPage(ExternalImageTestPage.class);
String lastResponseAsString = tester.getLastResponse().getDocument();
- Assert.assertTrue(lastResponseAsString.contains(
+ assertTrue(lastResponseAsString.contains(
"<img wicket:id=\"externalImage1\" src=\"http://wicket.apache.org/img/wicket-7-bg.jpg\"/>"));
- Assert.assertTrue(lastResponseAsString.contains(
+ assertTrue(lastResponseAsString.contains(
"<img id=\"externalImage2\" wicket:id=\"externalImage2\" src=\"http://wicket.apache.org/img/wicket-7-bg.jpg\" srcset=\"http://wicket.apache.org/img/wicket-7-bg-1.jpg x1, http://wicket.apache.org/img/wicket-7-bg-2.jpg x2\" sizes=\"s1,s2\"/>"));
- Assert.assertTrue(lastResponseAsString.contains(
+ assertTrue(lastResponseAsString.contains(
"<source wicket:id=\"externalSource\" srcset=\"http://wicket.apache.org/img/wicket-7-bg-1.jpg , http://wicket.apache.org/img/wicket-7-bg-2.jpg x2\" sizes=\"1\" media=\"(min-width: 650px)\"/>"));
- Assert.assertTrue(lastResponseAsString.contains(
- "<img wicket:id=\"url\" src=\"http://www.google.de/test.jpg\"/>"));
+ assertTrue(lastResponseAsString
+ .contains("<img wicket:id=\"url\" src=\"http://www.google.de/test.jpg\"/>"));
}
@Test
- public void testExternalImageModel()
+ void testExternalImageModel()
{
tester.startPage(ExternalImageTestPage.class);
tester.getLastResponse().getDocument();
@@ -60,14 +62,14 @@ public class ExternalImageTest extends WicketTestCase
ExternalImage externalImage2 = (ExternalImage)externalImage2Component;
TagTester tagById = tester.getTagById("externalImage2");
- IModel<List<Serializable>> srcSet = externalImage2.getSrcSetModel();
- for (Serializable model :srcSet.getObject())
+ IModel<List<Serializable>> srcSet = externalImage2.getSrcSetModel();
+ for (Serializable model : srcSet.getObject())
{
String attribute = tagById.getAttribute("srcset");
- Assert.assertTrue(attribute.contains(model.toString()));
+ assertTrue(attribute.contains(model.toString()));
}
String attribute = tagById.getAttribute("src");
- Assert.assertEquals(externalImage2.getDefaultModelObject(), attribute);
+ assertEquals(externalImage2.getDefaultModelObject(), attribute);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTestPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTestPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTestPage.java
index 5c4a670..4fcc6d9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTestPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTestPage.java
@@ -97,7 +97,7 @@ public class ExternalImageTestPage extends WebPage
* @param url
* the url to be used
*/
- public void setUrl(String url)
+ void setUrl(String url)
{
this.url = url;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ImageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ImageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ImageTest.java
index 8cc8c26..04e8ad9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ImageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ImageTest.java
@@ -19,7 +19,7 @@ package org.apache.wicket.markup.html.image;
import java.util.Locale;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Juergen Donnerstag
@@ -32,7 +32,7 @@ public class ImageTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void test_1() throws Exception
+ void test_1() throws Exception
{
Locale.setDefault(new Locale("en", "US"));
tester.startPage(Home.class);
@@ -60,7 +60,7 @@ public class ImageTest extends WicketTestCase
* testParentRelativeImage()
*/
@Test
- public void testParentRelativeImage()
+ void testParentRelativeImage()
{
tester.getApplication().getResourceSettings().setParentFolderPlaceholder("$up$");
tester.startPage(Home.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InlineImageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InlineImageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InlineImageTest.java
index f1c5068..5a7d045 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InlineImageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InlineImageTest.java
@@ -16,22 +16,21 @@
*/
package org.apache.wicket.markup.html.image;
+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;
-
-public class InlineImageTest extends WicketTestCase
+class InlineImageTest extends WicketTestCase
{
@Test
- public void inlineImageTest()
+ void inlineImageTest()
{
tester.startPage(InlineImageTestPage.class);
String lastResponseAsString = tester.getLastResponse().getDocument();
- Assert.assertTrue(
- "inline image is in html",
- lastResponseAsString.contains("<img wicket:id=\"inlineimage\" src=\"data:image/gif;base64,R0lGODlhQAHwAPf8AAAAAAwMDAsNABUZABUXBRIS"));
+ assertTrue(lastResponseAsString.contains(
+ "<img wicket:id=\"inlineimage\" src=\"data:image/gif;base64,R0lGODlhQAHwAPf8AAAAAAwMDAsNABUZABUXBRIS"),
+ "inline image is in html");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InvalidImageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InvalidImageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InvalidImageTest.java
index ccd9d33..230d8ca 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InvalidImageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InvalidImageTest.java
@@ -17,17 +17,17 @@
package org.apache.wicket.markup.html.image;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*/
-public class InvalidImageTest extends WicketTestCase
+class InvalidImageTest extends WicketTestCase
{
/**
* testInvalidImage()
*/
@Test
- public void invalidImage()
+ void invalidImage()
{
tester.startPage(InvalidImagePage.class);
tester.assertRenderedPage(InvalidImagePage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/image/NonCachingImageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/NonCachingImageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/NonCachingImageTest.java
index 9e9ddf8..6a2d270 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/NonCachingImageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/NonCachingImageTest.java
@@ -16,23 +16,25 @@
*/
package org.apache.wicket.markup.html.image;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.util.tester.TagTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link NonCachingImage}.
*
* @author svenmeier
*/
-public class NonCachingImageTest extends WicketTestCase
+class NonCachingImageTest extends WicketTestCase
{
/**
* {@link NonCachingImage} always adds anticache.
*/
@Test
- public void test()
+ void test()
{
NonCachingImagePage page = tester.startPage(NonCachingImagePage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java
index 56b44f6..30a9b6d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java
@@ -24,7 +24,7 @@ import org.apache.wicket.protocol.http.WebApplication;
*
* @author Jonathan Locke
*/
-public class PubApplication extends WebApplication
+class PubApplication extends WebApplication
{
/**
* Constructor
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ResponsiveImageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ResponsiveImageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ResponsiveImageTest.java
index 05c3030..c2e330c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ResponsiveImageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ResponsiveImageTest.java
@@ -16,13 +16,16 @@
*/
package org.apache.wicket.markup.html.image;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.TagTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class ResponsiveImageTest extends WicketTestCase
+class ResponsiveImageTest extends WicketTestCase
{
@Override
protected WebApplication newApplication()
@@ -31,37 +34,37 @@ public class ResponsiveImageTest extends WicketTestCase
}
@Test
- public void testSrcSetIsNotAvailableOnDefaultUsage()
+ void testSrcSetIsNotAvailableOnDefaultUsage()
{
tester.startPage(ImageResourceReferenceTestPage.class);
String lastResponseAsString = tester.getLastResponse().getDocument();
TagTester createTagByAttribute = TagTester.createTagByAttribute(lastResponseAsString, "img");
- Assert.assertFalse(createTagByAttribute.hasAttribute("srcset"));
- Assert.assertEquals(Image.Cors.ANONYMOUS.getRealName(), createTagByAttribute.getAttribute("crossorigin"));
+ assertFalse(createTagByAttribute.hasAttribute("srcset"));
+ assertEquals(Image.Cors.ANONYMOUS.getRealName(), createTagByAttribute.getAttribute("crossorigin"));
}
@Test
- public void testPictureTagIsRenderedRight()
+ void testPictureTagIsRenderedRight()
{
tester.startPage(ImagePictureTestPage.class);
String lastResponseAsString = tester.getLastResponse().getDocument();
TagTester pictureTagTester = TagTester.createTagByAttribute(lastResponseAsString, "picture");
- Assert.assertTrue(pictureTagTester.hasChildTag("img"));
- Assert.assertTrue(pictureTagTester.hasChildTag("source"));
+ assertTrue(pictureTagTester.hasChildTag("img"));
+ assertTrue(pictureTagTester.hasChildTag("source"));
TagTester sourceTagTester = TagTester.createTagByAttribute(lastResponseAsString, "source");
- Assert.assertTrue(sourceTagTester.hasAttribute("media"));
- Assert.assertEquals("(min-width: 650px)", sourceTagTester.getAttribute("media"));
- Assert.assertEquals("(min-width: 50em) 33vw", sourceTagTester.getAttribute("sizes"));
+ assertTrue(sourceTagTester.hasAttribute("media"));
+ assertEquals("(min-width: 650px)", sourceTagTester.getAttribute("media"));
+ assertEquals("(min-width: 50em) 33vw", sourceTagTester.getAttribute("sizes"));
}
@Test
- public void testImageTagIsRenderedWithXValuesAndSrcSet()
+ void testImageTagIsRenderedWithXValuesAndSrcSet()
{
tester.startPage(ImageSrcSetTestPage.class);
String lastResponseAsString = tester.getLastResponse().getDocument();
TagTester imgTagTester = TagTester.createTagByAttribute(lastResponseAsString, "img");
- Assert.assertTrue(imgTagTester.hasAttribute("src"));
- Assert.assertTrue(imgTagTester.hasAttribute("srcset"));
+ assertTrue(imgTagTester.hasAttribute("src"));
+ assertTrue(imgTagTester.hasAttribute("srcset"));
String attribute = imgTagTester.getAttribute("srcset");
String[] srcSetElements = attribute.split(",");
int i = 0;
@@ -69,19 +72,19 @@ public class ResponsiveImageTest extends WicketTestCase
{
if (i == 0)
{
- Assert.assertTrue(srcSetElement.endsWith("320w"));
+ assertTrue(srcSetElement.endsWith("320w"));
}
if (i == 1)
{
- Assert.assertTrue(srcSetElement.endsWith("2x"));
+ assertTrue(srcSetElement.endsWith("2x"));
}
if (i == 2)
{
- Assert.assertTrue(srcSetElement.endsWith("900w"));
+ assertTrue(srcSetElement.endsWith("900w"));
}
i++;
}
- Assert.assertEquals("(min-width: 50em) 33vw,(min-width: 28em) 50vw,100vw",
+ assertEquals("(min-width: 50em) 33vw,(min-width: 28em) 50vw,100vw",
imgTagTester.getAttribute("sizes"));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
index cd72924..5273c78 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.markup.html.internal;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.concurrent.atomic.AtomicInteger;
import java.util.regex.Pattern;
@@ -28,15 +31,14 @@ import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Simple test using the WicketTester
*
* @author Joonas Hamalainen
*/
-public class AjaxEnclosureTest extends WicketTestCase
+class AjaxEnclosureTest extends WicketTestCase
{
private final String inlineEnclosureIdPrefix = "wicket__InlineEnclosure_";
private final String inlineEnclosureHiddenPattern = "<div id=\"" + inlineEnclosureIdPrefix +
@@ -63,7 +65,7 @@ public class AjaxEnclosureTest extends WicketTestCase
* Test toggling the controlling child inside the inline enclosure
*/
@Test
- public void ajaxTogglingControllingChildShouldToggleInlineEnclosure()
+ void ajaxTogglingControllingChildShouldToggleInlineEnclosure()
{
{
// enclosure On
@@ -106,7 +108,7 @@ public class AjaxEnclosureTest extends WicketTestCase
* Test toggling a non-controlling child inside the inline enclosure
*/
@Test
- public void ajaxTogglingNonControllingChildShouldNotToggleEnclosure()
+ void ajaxTogglingNonControllingChildShouldNotToggleEnclosure()
{
{
// label 2 On
@@ -146,7 +148,7 @@ public class AjaxEnclosureTest extends WicketTestCase
*
*/
@Test
- public void nestedInlineEnclosuresShouldToggleNormally()
+ void nestedInlineEnclosuresShouldToggleNormally()
{
{
// 1. test that enclosure1, enclosure2, label1, label2 are visible, click link1,
@@ -234,7 +236,7 @@ public class AjaxEnclosureTest extends WicketTestCase
*
*/
@Test
- public void controllingChildShouldDefaultToTheSingleComponentInsideEnclosure()
+ void controllingChildShouldDefaultToTheSingleComponentInsideEnclosure()
{
{
// enclosure On
@@ -272,7 +274,7 @@ public class AjaxEnclosureTest extends WicketTestCase
private void ensureEnclosureIsVisible(Page ajaxPage, AtomicInteger n)
{
InlineEnclosure enclosure = findNthComponent(InlineEnclosure.class, ajaxPage, n);
- assertTrue("Is not visible", enclosure.determineVisibility());
+ assertTrue(enclosure.determineVisibility(), "Is not visible");
}
private void ensureEnclosureIsInvisible(Page ajaxPage, AtomicInteger n)
@@ -280,7 +282,7 @@ public class AjaxEnclosureTest extends WicketTestCase
InlineEnclosure enclosure = findNthComponent(InlineEnclosure.class, ajaxPage, n);
if (enclosure != null)
{
- assertFalse("Is visible", enclosure.determineVisibility());
+ assertFalse(enclosure.determineVisibility(), "Is not visible");
}
}
@@ -301,7 +303,7 @@ public class AjaxEnclosureTest extends WicketTestCase
return type.cast(instance);
}
- protected void assertVisible(Label label, boolean checkAlsoMarkup)
+ private void assertVisible(Label label, boolean checkAlsoMarkup)
{
tester.assertVisible(label.getPageRelativePath());
if (checkAlsoMarkup)
@@ -310,15 +312,14 @@ public class AjaxEnclosureTest extends WicketTestCase
}
}
- protected void assertInvisible(Label label)
+ private void assertInvisible(Label label)
{
// tester.assertInvisible(label.getPageRelativePath());
assertDoesNotContain(Pattern.quote(label.getInnermostModel().getObject().toString()));
}
- protected void assertDoesNotContain(String string)
+ private void assertDoesNotContain(String string)
{
- assertFalse("Should not contain: " + string,
- tester.getLastResponseAsString().contains(string));
+ assertFalse(tester.getLastResponseAsString().contains(string), "Should not contain: " + string);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/BasePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/BasePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/BasePage.java
index 643c098..b672adb 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/BasePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/BasePage.java
@@ -21,7 +21,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
public class BasePage extends WebPage {
- public BasePage(PageParameters parameters)
+ BasePage(PageParameters parameters)
{
super(parameters);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_9.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_9.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_9.java
index d388aec..78487a8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_9.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_9.java
@@ -33,7 +33,7 @@ public class EnclosurePage_9 extends WebPage
private static final long serialVersionUID = 1L;
/** */
- public boolean formValidate;
+ private boolean formValidate;
/** */
public boolean inputOnBeforeRender;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java
index 7067c7d..b6cebc2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.wicket.markup.html.internal;
+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 java.io.IOException;
import org.apache.wicket.Component;
@@ -36,20 +40,19 @@ import org.apache.wicket.util.tester.DiffUtil;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
*
* @author Juergen Donnerstag
*/
-public class EnclosureTest extends WicketTestCase
+class EnclosureTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void testRenderHomePage() throws Exception
+ void testRenderHomePage() throws Exception
{
executeTest(EnclosurePage_1.class, "EnclosurePageExpectedResult_1.html");
@@ -62,7 +65,7 @@ public class EnclosureTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void testRenderHomePage2() throws Exception
+ void testRenderHomePage2() throws Exception
{
executeTest(EnclosurePage_2.class, "EnclosurePageExpectedResult_2.html");
}
@@ -71,7 +74,7 @@ public class EnclosureTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void testRenderHomePage3() throws Exception
+ void testRenderHomePage3() throws Exception
{
executeTest(EnclosurePage_3.class, "EnclosurePageExpectedResult_3.html");
}
@@ -80,7 +83,7 @@ public class EnclosureTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void testRenderHomePage4() throws Exception
+ void testRenderHomePage4() throws Exception
{
executeTest(EnclosurePage_4.class, new PageParameters().set("visible", false),
"EnclosurePageExpectedResult_4.html");
@@ -90,7 +93,7 @@ public class EnclosureTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void testRenderHomePage4_1() throws Exception
+ void testRenderHomePage4_1() throws Exception
{
executeTest(EnclosurePage_4.class, new PageParameters().set("visible", true),
"EnclosurePageExpectedResult_4-1.html");
@@ -100,7 +103,7 @@ public class EnclosureTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void testRenderHomePage5() throws Exception
+ void testRenderHomePage5() throws Exception
{
executeTest(EnclosurePage_5.class, new PageParameters().set("visible", false),
"EnclosurePageExpectedResult_5.html");
@@ -110,7 +113,7 @@ public class EnclosureTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void testRenderHomePage5_1() throws Exception
+ void testRenderHomePage5_1() throws Exception
{
executeTest(EnclosurePage_5.class, new PageParameters().set("visible", true),
"EnclosurePageExpectedResult_5-1.html");
@@ -122,7 +125,7 @@ public class EnclosureTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void testVisibilityOfChildren() throws Exception
+ void testVisibilityOfChildren() throws Exception
{
// render with enclosure initially visible
tester.startPage(EnclosurePage_6.class);
@@ -147,7 +150,7 @@ public class EnclosureTest extends WicketTestCase
*
*/
@Test
- public void testRender()
+ void testRender()
{
tester.startPage(EnclosurePage_7.class);
}
@@ -157,7 +160,7 @@ public class EnclosureTest extends WicketTestCase
*
*/
@Test
- public void testRender8() throws Exception
+ void testRender8() throws Exception
{
executeTest(EnclosurePage_8.class, "EnclosurePageExpectedResult_8.html");
}
@@ -186,7 +189,7 @@ public class EnclosureTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void testRender9() throws Exception
+ void testRender9() throws Exception
{
executePage(new EnclosurePage_9(), "EnclosurePageExpectedResult_9.html");
EnclosurePage_9 page = (EnclosurePage_9)tester.getLastRenderedPage();
@@ -243,7 +246,7 @@ public class EnclosureTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void testRender9a() throws Exception
+ void testRender9a() throws Exception
{
Class<? extends Page> clazz = EnclosurePage_9.class;
@@ -286,7 +289,7 @@ public class EnclosureTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void testRender10() throws Exception
+ void testRender10() throws Exception
{
Class<? extends Page> clazz = EnclosurePage_10.class;
executeTest(clazz, "EnclosurePageExpectedResult_10.html");
@@ -327,7 +330,7 @@ public class EnclosureTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void testRenderPage11() throws Exception
+ void testRenderPage11() throws Exception
{
executeTest(EnclosurePage_11.class, "EnclosurePageExpectedResult_11.html");
}
@@ -336,7 +339,7 @@ public class EnclosureTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void testRenderPage12() throws Exception
+ void testRenderPage12() throws Exception
{
executeTest(EnclosurePage_12.class, "EnclosurePageExpectedResult_12.html");
}
@@ -345,7 +348,7 @@ public class EnclosureTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void testRenderPage13() throws Exception
+ void testRenderPage13() throws Exception
{
tester = new WicketTester(new MockApplication()
{
@@ -373,7 +376,7 @@ public class EnclosureTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-3842
*/
@Test
- public void testAtrribute()
+ void testAtrribute()
{
/**
* Page for the test
@@ -382,7 +385,7 @@ public class EnclosureTest extends WicketTestCase
{
private static final long serialVersionUID = 1L;
- public TestPage()
+ TestPage()
{
final Label l = new Label("msg", "$label$");
add(l);
@@ -423,7 +426,7 @@ public class EnclosureTest extends WicketTestCase
* Test case for https://issues.apache.org/jira/browse/WICKET-4172
*/
@Test
- public void childWithDeeperPathInTransparentContainer()
+ void childWithDeeperPathInTransparentContainer()
{
boolean enclosureChildVisible = true;
tester.startPage(new ChildWithDeeperPathInTransparentContainerPage(enclosureChildVisible));
@@ -437,7 +440,7 @@ public class EnclosureTest extends WicketTestCase
}
@Test
- public void nestedEnclousers()
+ void nestedEnclousers()
{
TestPageMarkup p = new TestPageMarkup();
p.setPageMarkup("<wicket:enclosure child='labelOuter'>tOuter Enclosure <span wicket:id='labelOuter'/>"
@@ -452,7 +455,7 @@ public class EnclosureTest extends WicketTestCase
* Test case for https://issues.apache.org/jira/browse/WICKET-6043
*/
@Test
- public void enclosureInsideContainererAndInheritance() throws Exception
+ void enclosureInsideContainererAndInheritance() throws Exception
{
tester.startPage(ListViewInContainerPage.class);
tester.assertRenderedPage(ListViewInContainerPage.class);
@@ -462,7 +465,7 @@ public class EnclosureTest extends WicketTestCase
{
private String markup;
- public TestPageMarkup()
+ TestPageMarkup()
{
}
@@ -471,12 +474,12 @@ public class EnclosureTest extends WicketTestCase
this.markup = markup;
}
- protected String getPageMarkup()
+ String getPageMarkup()
{
return markup;
}
- public void setPageMarkup(String markup)
+ void setPageMarkup(String markup)
{
this.markup = markup;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HeaderResponseTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HeaderResponseTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HeaderResponseTest.java
index 6bab883..3e3649b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HeaderResponseTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HeaderResponseTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.markup.html.internal;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -37,15 +38,14 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.IResource;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.response.StringResponse;
-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;
/**
* Tests for {@link IHeaderResponse}'s methods
*/
-public class HeaderResponseTest
+class HeaderResponseTest
{
private static final String RESOURCE_NAME = "resource.name";
@@ -56,8 +56,8 @@ public class HeaderResponseTest
/**
* Prepare
*/
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
final Response realResponse = new StringResponse();
@@ -99,8 +99,8 @@ public class HeaderResponseTest
/**
* Tear down
*/
- @After
- public void after()
+ @AfterEach
+ void after()
{
ThreadContext.setRequestCycle(null);
}
@@ -109,25 +109,25 @@ public class HeaderResponseTest
* Tests the creation of a proper IE conditional comment
*/
@Test
- public void conditionalRenderCSSReference()
+ void conditionalRenderCSSReference()
{
headerResponse.render(CssHeaderItem.forReference(reference, null, "screen", "lt IE 8"));
String expected = "<!--[if lt IE 8]><link rel=\"stylesheet\" type=\"text/css\" href=\"" +
RESOURCE_NAME + "\" media=\"screen\" /><![endif]-->\n";
String actual = headerResponse.getResponse().toString();
- Assert.assertEquals(expected, actual);
+ assertEquals(expected, actual);
}
/**
* Tests the creation of a proper IE conditional comment
*/
@Test
- public void conditionalRenderCSSReferenceWithUrl()
+ void conditionalRenderCSSReferenceWithUrl()
{
headerResponse.render(CssHeaderItem.forUrl("resource.css", "screen", "lt IE 8"));
String expected = "<!--[if lt IE 8]><link rel=\"stylesheet\" type=\"text/css\" href=\""+RESOURCE_NAME+"\" media=\"screen\" /><![endif]-->\n";
String actual = headerResponse.getResponse().toString();
- Assert.assertEquals(expected, actual);
+ assertEquals(expected, actual);
}
@@ -135,14 +135,14 @@ public class HeaderResponseTest
* Tests the creation of a proper IE conditional comment
*/
@Test
- public void conditionalRenderCSSContent()
+ void conditionalRenderCSSContent()
{
headerResponse.render(CssHeaderItem.forCSS(".className { font-size: 10px}", "id", "lt IE 8"));
String expected = "<!--[if lt IE 8]><style type=\"text/css\" id=\"id\">\n" +
".className { font-size: 10px}</style>\n" +
"<![endif]-->\n";
String actual = headerResponse.getResponse().toString();
- Assert.assertEquals(expected, actual);
+ assertEquals(expected, actual);
}
/**
@@ -151,14 +151,14 @@ public class HeaderResponseTest
* WICKET-3661
*/
@Test
- public void deferJavaScriptReference()
+ void deferJavaScriptReference()
{
boolean defer = true;
headerResponse.render(JavaScriptHeaderItem.forUrl("js-resource.js", "some-id", defer));
String expected = "<script type=\"text/javascript\" id=\"some-id\" defer=\"defer\" src=\"" +
RESOURCE_NAME + "\"></script>\n";
String actual = headerResponse.getResponse().toString();
- Assert.assertEquals(expected, actual);
+ assertEquals(expected, actual);
}
/**
@@ -167,14 +167,14 @@ public class HeaderResponseTest
* WICKET-3661
*/
@Test
- public void deferFalseJavaScriptReference()
+ void deferFalseJavaScriptReference()
{
boolean defer = false;
headerResponse.render(JavaScriptHeaderItem.forUrl("js-resource.js", "some-id", defer));
String expected = "<script type=\"text/javascript\" id=\"some-id\" src=\"" + RESOURCE_NAME +
"\"></script>\n";
String actual = headerResponse.getResponse().toString();
- Assert.assertEquals(expected, actual);
+ assertEquals(expected, actual);
}
/**
@@ -183,7 +183,7 @@ public class HeaderResponseTest
* WICKET-3909
*/
@Test
- public void charsetSetJavaScriptReference()
+ void charsetSetJavaScriptReference()
{
String charset = "foo";
headerResponse.render(JavaScriptHeaderItem.forUrl("js-resource.js", "some-id", false,
@@ -191,7 +191,7 @@ public class HeaderResponseTest
String expected = "<script type=\"text/javascript\" id=\"some-id\" charset=\"" + charset +
"\" src=\"" + RESOURCE_NAME + "\"></script>\n";
String actual = headerResponse.getResponse().toString();
- Assert.assertEquals(expected, actual);
+ assertEquals(expected, actual);
}
/**
@@ -200,20 +200,20 @@ public class HeaderResponseTest
* WICKET-3909
*/
@Test
- public void charsetNotSetJavaScriptReference()
+ void charsetNotSetJavaScriptReference()
{
headerResponse.render(JavaScriptHeaderItem.forUrl("js-resource.js", "some-id", false, null));
String expected = "<script type=\"text/javascript\" id=\"some-id\" src=\"" + RESOURCE_NAME +
"\"></script>\n";
String actual = headerResponse.getResponse().toString();
- Assert.assertEquals(expected, actual);
+ assertEquals(expected, actual);
}
/**
* Tests the creation of a proper IE conditional comment
*/
@Test
- public void conditionalRenderJSReference()
+ void conditionalRenderJSReference()
{
headerResponse.render(
JavaScriptHeaderItem.forReference(reference, new PageParameters(), "id", false, null, "lt IE 8"));
@@ -222,14 +222,14 @@ public class HeaderResponseTest
String actual = headerResponse.getResponse().toString();
- Assert.assertEquals(expected, actual);
+ assertEquals(expected, actual);
}
/**
* Tests the creation of a proper IE conditional comment
*/
@Test
- public void conditionalRenderJSReferenceWithUrl()
+ void conditionalRenderJSReferenceWithUrl()
{
headerResponse.render(JavaScriptHeaderItem.forUrl("js-resource.js", "id", true, "cp1251", "lt IE 8"));
@@ -238,7 +238,7 @@ public class HeaderResponseTest
String actual = headerResponse.getResponse().toString();
- Assert.assertEquals(expected, actual);
+ assertEquals(expected, actual);
}
@@ -246,7 +246,7 @@ public class HeaderResponseTest
* Tests the creation of a proper IE conditional comment
*/
@Test
- public void conditionalRenderJSContent()
+ void conditionalRenderJSContent()
{
headerResponse.render(JavaScriptHeaderItem.forScript("someJSMethod();", "id", "lt IE 8"));
@@ -259,6 +259,6 @@ public class HeaderResponseTest
String actual = headerResponse.getResponse().toString();
- Assert.assertEquals(expected, actual);
+ assertEquals(expected, actual);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainerTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainerTest.java
index 6c614fa..a34b58e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainerTest.java
@@ -16,27 +16,29 @@
*/
package org.apache.wicket.markup.html.internal;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for the {@link org.apache.wicket.markup.html.internal.HtmlHeaderContainer}.
*
* @author svenmeier
*/
-public class HtmlHeaderContainerTest extends WicketTestCase
+class HtmlHeaderContainerTest extends WicketTestCase
{
/**
* Test clean-up of auto added components after removal of the HtmlHeaderContainer.
*/
@Test
- public void cleanUpOfAutoAddedComponents()
+ void cleanUpOfAutoAddedComponents()
{
tester.startPage(ComponentResolvingPage.class);
// onEndRequest() of auto added component was not called in
// MarkupContainer#internalEndRequest() using an iterator
ComponentResolvingPage page = (ComponentResolvingPage)tester.getLastRenderedPage();
- assertTrue("onDetach() should have been called", page.onDetachWasCalledOnAutoAddedComponent);
+ assertTrue(page.onDetachWasCalledOnAutoAddedComponent, "onDetach() should have been called");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureTest.java
index cb18393..a3ed468 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup.html.internal;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.wicket.Component;
@@ -26,15 +28,14 @@ import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Test for {@link InlineEnclosure} and {@link InlineEnclosureHandler}.
*
* @author Joonas Hamalainen
*/
-public class InlineEnclosureTest extends WicketTestCase
+class InlineEnclosureTest extends WicketTestCase
{
/**
* WICKET-5085: Since {@link InlineEnclosure}s are not removed as other auto-Components, they must be
@@ -43,7 +44,7 @@ public class InlineEnclosureTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void inlineEnclosuresAreResolvedOnceOnly() throws Exception
+ void inlineEnclosuresAreResolvedOnceOnly() throws Exception
{
InlineEnclosurePanelPage page = new InlineEnclosurePanelPage();
@@ -79,7 +80,7 @@ public class InlineEnclosureTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void inlineEnclosurePage_1() throws Exception
+ void inlineEnclosurePage_1() throws Exception
{
executeTest(InlineEnclosurePage_1.class, "InlineEnclosurePageExpectedResult_1.html");
}
@@ -88,7 +89,7 @@ public class InlineEnclosureTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void inlineEnclosurePage_2() throws Exception
+ void inlineEnclosurePage_2() throws Exception
{
executeTest(InlineEnclosurePage_2.class, "InlineEnclosurePageExpectedResult_2.html");
}
@@ -97,13 +98,13 @@ public class InlineEnclosureTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void inlineEnclosurePanelPage() throws Exception
+ void inlineEnclosurePanelPage() throws Exception
{
executeTest(InlineEnclosurePanelPage.class, "InlineEnclosurePanelPageExpectedResult.html");
}
@Test
- public void inlineEnclosurePageDifferentNamespace() throws Exception
+ void inlineEnclosurePageDifferentNamespace() throws Exception
{
executeTest(InlineEnclosureDifferentNamespacePage.class,
"InlineEnclosureDifferentNamespaceExpectedResult.html");
@@ -117,7 +118,7 @@ public class InlineEnclosureTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void inlineEnclosureWithWicketMessageVisible() throws Exception
+ void inlineEnclosureWithWicketMessageVisible() throws Exception
{
executeTest(new InlineEnclosureWithWicketMessagePage(true),
"InlineEnclosureWithWicketMessagePage_visible_expected.html");
@@ -132,7 +133,7 @@ public class InlineEnclosureTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void inlineEnclosureWithWicketMessageInvisible() throws Exception
+ void inlineEnclosureWithWicketMessageInvisible() throws Exception
{
executeTest(new InlineEnclosureWithWicketMessagePage(false),
"InlineEnclosureWithWicketMessagePage_invisible_expected.html");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage.java
index aebf680..f2e56a6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage.java
@@ -27,7 +27,7 @@ import org.apache.wicket.markup.html.basic.Label;
*
* @since 1.5.6
*/
-public class InlineEnclosureWithWicketMessagePage extends WebPage
+class InlineEnclosureWithWicketMessagePage extends WebPage
{
public InlineEnclosureWithWicketMessagePage(boolean childVisible)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/ListViewInContainerPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/ListViewInContainerPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/ListViewInContainerPage.java
index 58f9e3f..cb9787f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/ListViewInContainerPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/ListViewInContainerPage.java
@@ -42,7 +42,7 @@ public class ListViewInContainerPage extends BasePage
add(new ListView<Integer>("liste", values)
{
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
@@ -51,7 +51,7 @@ public class ListViewInContainerPage extends BasePage
{
final Label testenc = new Label("testenc", Model.of("enclosure " + item.getModelObject()));
item.queue(testenc);
-
+
final Label testlib = new Label("testlib", Model.of("no enclosure " + item.getModelObject()));
item.queue(testlib);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTest.java
index 0c10a51..eaf2a90 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup.html.internal;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
import java.util.regex.Pattern;
import org.apache.wicket.Component;
@@ -25,13 +27,12 @@ import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Simple test using the WicketTester
*/
-public class TogglePageTest extends WicketTestCase
+class TogglePageTest extends WicketTestCase
{
@Override
@@ -50,7 +51,7 @@ public class TogglePageTest extends WicketTestCase
}
@Test
- public void testNoAjaxPage()
+ void testNoAjaxPage()
{
{
// On
@@ -78,7 +79,7 @@ public class TogglePageTest extends WicketTestCase
}
@Test
- public void testTraditionalAjaxEnclosurePage()
+ void testTraditionalAjaxEnclosurePage()
{
{
// On
@@ -109,7 +110,7 @@ public class TogglePageTest extends WicketTestCase
}
@Test
- public void testInlineEnclosureWithAdditionalAjaxTarget()
+ void testInlineEnclosureWithAdditionalAjaxTarget()
{
{
// On
@@ -156,7 +157,7 @@ public class TogglePageTest extends WicketTestCase
}
@Test
- public void testInlineEnclosureAjaxPage()
+ void testInlineEnclosureAjaxPage()
{
String inlineEnclosureIdPrefix = "wicket__InlineEnclosure_";
@@ -200,7 +201,7 @@ public class TogglePageTest extends WicketTestCase
/**
* @param toggleable
*/
- protected void assertInvisible(Component toggleable)
+ private void assertInvisible(Component toggleable)
{
tester.assertInvisible(toggleable.getPageRelativePath());
assertDoesNotContain(toggledText);
@@ -210,7 +211,7 @@ public class TogglePageTest extends WicketTestCase
/**
* @param toggleable
*/
- protected void assertVisible(Component toggleable)
+ private void assertVisible(Component toggleable)
{
tester.assertVisible(toggleable.getPageRelativePath());
tester.assertContains(Pattern.quote(toggledText));
@@ -221,7 +222,7 @@ public class TogglePageTest extends WicketTestCase
/**
* @param label
*/
- protected void assertVisible(Label label)
+ private void assertVisible(Label label)
{
tester.assertVisible(label.getPageRelativePath());
tester.assertContains(Pattern.quote(label.getInnermostModel().getObject().toString()));
@@ -230,7 +231,7 @@ public class TogglePageTest extends WicketTestCase
/**
* @param label
*/
- protected void assertInVisible(Label label)
+ private void assertInVisible(Label label)
{
tester.assertInvisible(label.getPageRelativePath());
}
@@ -240,8 +241,7 @@ public class TogglePageTest extends WicketTestCase
*/
private void assertDoesNotContain(String string)
{
- assertFalse("Should not contain: " + string,
- tester.getLastResponseAsString().contains(string));
+ assertFalse(tester.getLastResponseAsString().contains(string), "Should not contain: " + string);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TraditionalEnclosureAjaxPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TraditionalEnclosureAjaxPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TraditionalEnclosureAjaxPage.java
index 712a9c8..55ade90 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TraditionalEnclosureAjaxPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TraditionalEnclosureAjaxPage.java
@@ -16,13 +16,13 @@
*/
package org.apache.wicket.markup.html.internal;
-import org.junit.Assert;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.WebPage;
-
/**
*/
public class TraditionalEnclosureAjaxPage extends WebPage
@@ -49,11 +49,13 @@ public class TraditionalEnclosureAjaxPage extends WebPage
return get(toggleableChildId).isVisible();
}
}).setOutputMarkupPlaceholderTag(true));
- Assert.assertEquals("Ajax requires tag to remain in DOM even if not visible", true,
- traditionalAjaxVisibilityToggleRequiresPlaceholder.getOutputMarkupPlaceholderTag());
+ assertEquals(true,
+ traditionalAjaxVisibilityToggleRequiresPlaceholder.getOutputMarkupPlaceholderTag(),
+ "Ajax requires tag to remain in DOM even if not visible");
{
- traditionalAjaxVisibilityToggleRequiresPlaceholder.add((toggleable = new WebMarkupContainer(
- toggleableChildId = "toggleable")).setOutputMarkupPlaceholderTag(true));
+ traditionalAjaxVisibilityToggleRequiresPlaceholder
+ .add((toggleable = new WebMarkupContainer(toggleableChildId = "toggleable"))
+ .setOutputMarkupPlaceholderTag(true));
add(link = new AjaxLink<Void>("link")
{
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/BasePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/BasePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/BasePage.java
index 192bc77..0ca3f70 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/BasePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/BasePage.java
@@ -28,7 +28,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
public class BasePage extends WebPage {
private static final long serialVersionUID = 1L;
- public BasePage(final PageParameters parameters) {
+ BasePage(final PageParameters parameters) {
super(parameters);
add(new PanelA("panel"));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/BasePageWithHeaderItems.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/BasePageWithHeaderItems.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/BasePageWithHeaderItems.java
index 5b26b3b..9e3bc9f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/BasePageWithHeaderItems.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/BasePageWithHeaderItems.java
@@ -26,7 +26,7 @@ public class BasePageWithHeaderItems extends WebPage
{
private static final long serialVersionUID = 1L;
- public BasePageWithHeaderItems(final PageParameters parameters) {
+ BasePageWithHeaderItems(final PageParameters parameters) {
super(parameters);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/HtmlHeaderItemsContainerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/HtmlHeaderItemsContainerTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/HtmlHeaderItemsContainerTest.java
index 5141590..9271cdf 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/HtmlHeaderItemsContainerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/HtmlHeaderItemsContainerTest.java
@@ -16,23 +16,25 @@
*/
package org.apache.wicket.markup.html.internal.headeritems;
-import static org.hamcrest.number.OrderingComparison.lessThan;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
-import org.apache.wicket.markup.MarkupException;
-import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.Page;
+import org.apache.wicket.markup.MarkupException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.tester.DummyPanelPage;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for <wicket:header-items/> element
*/
-public class HtmlHeaderItemsContainerTest extends WicketTestCase
+class HtmlHeaderItemsContainerTest extends WicketTestCase
{
@Test
- public void withHeaderItems()
+ void withHeaderItems()
{
tester.startPage(PageWithHeaderItems.class);
String responseAsString = tester.getLastResponseAsString();
@@ -43,21 +45,21 @@ public class HtmlHeaderItemsContainerTest extends WicketTestCase
int idxTitleElement = responseAsString.indexOf("<title>Apache Wicket Quickstart</title>");
int idxMetaFromBasePage = responseAsString.indexOf("<meta name='fromBasePage' content='1'");
- assertThat("<meta charset> should be rendered before <meta name=\"panel-wicket-head\"",
- idxMetaCharset, lessThan(idxMetaPanelWicketHead));
+ assertThat(idxMetaCharset).isLessThan(idxMetaPanelWicketHead).withFailMessage(
+ "<meta charset> should be rendered before <meta name=\"panel-wicket-head\"");
- assertThat("<meta name=\"panel-wicket-head\"> should be rendered before <script src=wicket-ajax-jquery.js>",
- idxMetaPanelWicketHead, lessThan(idxWicketAjaxJs));
+ assertThat(idxMetaPanelWicketHead).isLessThan(idxWicketAjaxJs).withFailMessage(
+ "<meta name=\"panel-wicket-head\"> should be rendered before <script src=wicket-ajax-jquery.js>");
- assertThat("<script src=wicket-ajax-jquery.js> should be rendered before the <title> element",
- idxWicketAjaxJs, lessThan(idxTitleElement));
+ assertThat(idxWicketAjaxJs).isLessThan(idxTitleElement).withFailMessage(
+ "<script src=wicket-ajax-jquery.js> should be rendered before the <title> element");
- assertThat("<meta name='fromBasePage'> should be rendered before the <title> element",
- idxMetaFromBasePage, lessThan(idxTitleElement));
+ assertThat(idxMetaFromBasePage).isLessThan(idxTitleElement).withFailMessage(
+ "<meta name='fromBasePage'> should be rendered before the <title> element");
}
@Test
- public void withoutHeaderItems()
+ void withoutHeaderItems()
{
tester.startPage(PageWithoutHeaderItems.class);
String responseAsString = tester.getLastResponseAsString();
@@ -68,21 +70,21 @@ public class HtmlHeaderItemsContainerTest extends WicketTestCase
int idxTitleElement = responseAsString.indexOf("<title>Apache Wicket Quickstart</title>");
int idxMetaFromBasePage = responseAsString.indexOf("<meta name='fromBasePage' content='1'");
- assertThat("<meta name=\"panel-wicket-head\"> should be rendered before <script src=wicket-ajax-jquery.js>",
- idxMetaPanelWicketHead, lessThan(idxWicketAjaxJs));
+ assertThat(idxMetaPanelWicketHead).isLessThan(idxWicketAjaxJs).withFailMessage(
+ "<meta name=\"panel-wicket-head\"> should be rendered before <script src=wicket-ajax-jquery.js>");
- assertThat("<script src=wicket-ajax-jquery.js> should be rendered before <meta charset>",
- idxWicketAjaxJs, lessThan(idxMetaCharset));
+ assertThat(idxWicketAjaxJs).isLessThan(idxMetaCharset).withFailMessage(
+ "<script src=wicket-ajax-jquery.js> should be rendered before <meta charset>");
- assertThat("<meta charset> should be rendered before the <title> element",
- idxMetaCharset, lessThan(idxTitleElement));
+ assertThat(idxMetaCharset).isLessThan(idxTitleElement)
+ .withFailMessage("<meta charset> should be rendered before the <title> element");
- assertThat("<title> should be rendered before the <meta name='fromBasePage'> element",
- idxTitleElement, lessThan(idxMetaFromBasePage));
+ assertThat(idxTitleElement).isLessThan(idxMetaFromBasePage).withFailMessage(
+ "<title> should be rendered before the <meta name='fromBasePage'> element");
}
@Test
- public void withoutHeaderItemsWithWicketHead()
+ void withoutHeaderItemsWithWicketHead()
{
tester.startPage(SubPageWithoutHeaderItemsAndWicketHead.class);
String responseAsString = tester.getLastResponseAsString();
@@ -92,26 +94,27 @@ public class HtmlHeaderItemsContainerTest extends WicketTestCase
int idxWicketAjaxJs = responseAsString.indexOf("wicket-ajax-jquery.js");
int idxTitleElement = responseAsString.indexOf("<title>Apache Wicket Quickstart</title>");
int idxMetaFromBasePage = responseAsString.indexOf("<meta name='fromBasePage' content='1'");
- int idxMetaFromSubPage = responseAsString.indexOf("<meta name=\"SubPageWithoutHeaderItemsAndWicketHead\"");
+ int idxMetaFromSubPage = responseAsString
+ .indexOf("<meta name=\"SubPageWithoutHeaderItemsAndWicketHead\"");
- assertThat("<meta name=\"panel-wicket-head\"> should be rendered before <script src=wicket-ajax-jquery.js>",
- idxMetaPanelWicketHead, lessThan(idxWicketAjaxJs));
+ assertThat(idxMetaPanelWicketHead).isLessThan(idxWicketAjaxJs).withFailMessage(
+ "<meta name=\"panel-wicket-head\"> should be rendered before <script src=wicket-ajax-jquery.js>");
- assertThat("<script src=wicket-ajax-jquery.js> should be rendered before <meta charset>",
- idxWicketAjaxJs, lessThan(idxMetaCharset));
+ assertThat(idxWicketAjaxJs).isLessThan(idxMetaCharset).withFailMessage(
+ "<script src=wicket-ajax-jquery.js> should be rendered before <meta charset>");
- assertThat("<meta charset> should be rendered before the <title> element",
- idxMetaCharset, lessThan(idxTitleElement));
+ assertThat(idxMetaCharset).isLessThan(idxTitleElement)
+ .withFailMessage("<meta charset> should be rendered before the <title> element");
- assertThat("<title> should be rendered before the <meta name=\"SubPageWithoutHeaderItemsAndWicketHead\" element",
- idxTitleElement, lessThan(idxMetaFromSubPage));
+ assertThat(idxTitleElement).isLessThan(idxMetaFromSubPage).withFailMessage(
+ "<title> should be rendered before the <meta name=\"SubPageWithoutHeaderItemsAndWicketHead\" element");
- assertThat("<meta name='fromBasePage'> should be rendered before the <meta name=\"SubPageWithoutHeaderItemsAndWicketHead\" element",
- idxMetaFromSubPage, lessThan(idxMetaFromBasePage));
+ assertThat(idxMetaFromSubPage).isLessThan(idxMetaFromBasePage).withFailMessage(
+ "<meta name='fromBasePage'> should be rendered before the <meta name=\"SubPageWithoutHeaderItemsAndWicketHead\" element");
}
@Test
- public void withHeaderItemsWithWicketHead()
+ void withHeaderItemsWithWicketHead()
{
tester.startPage(SubPageWithHeaderItemsAndWicketHead.class);
String responseAsString = tester.getLastResponseAsString();
@@ -121,59 +124,68 @@ public class HtmlHeaderItemsContainerTest extends WicketTestCase
int idxWicketAjaxJs = responseAsString.indexOf("wicket-ajax-jquery.js");
int idxTitleElement = responseAsString.indexOf("<title>Apache Wicket Quickstart</title>");
int idxMetaFromBasePage = responseAsString.indexOf("<meta name='fromBasePage' content='1'");
- int idxMetaFromSubPage = responseAsString.indexOf("<meta name=\"SubPageWithHeaderItemsAndWicketHead\"");
+ int idxMetaFromSubPage = responseAsString
+ .indexOf("<meta name=\"SubPageWithHeaderItemsAndWicketHead\"");
- assertThat("<meta charset> should be rendered before <meta name=\"panel-wicket-head\"",
- idxMetaCharset, lessThan(idxMetaPanelWicketHead));
+ assertThat(idxMetaCharset).isLessThan(idxMetaPanelWicketHead).withFailMessage(
+ "<meta charset> should be rendered before <meta name=\"panel-wicket-head\"");
- assertThat("<meta name=\"panel-wicket-head\"> should be rendered before <script src=wicket-ajax-jquery.js>",
- idxMetaPanelWicketHead, lessThan(idxWicketAjaxJs));
+ assertThat(idxMetaPanelWicketHead).isLessThan(idxWicketAjaxJs).withFailMessage(
+ "<meta name=\"panel-wicket-head\"> should be rendered before <script src=wicket-ajax-jquery.js>");
- assertThat("<script src=wicket-ajax-jquery.js> should be rendered before the <title> element",
- idxWicketAjaxJs, lessThan(idxTitleElement));
+ assertThat(idxWicketAjaxJs).isLessThan(idxTitleElement).withFailMessage(
+ "<script src=wicket-ajax-jquery.js> should be rendered before the <title> element");
- assertThat("<meta name=\"SubPageWithoutHeaderItemsAndWicketHead\"> should be rendered before the <meta name='fromBasePage'> element",
- idxMetaFromSubPage, lessThan(idxMetaFromBasePage));
+ assertThat(idxMetaFromSubPage).isLessThan(idxMetaFromBasePage).withFailMessage(
+ "<meta name=\"SubPageWithoutHeaderItemsAndWicketHead\"> should be rendered before the <meta name='fromBasePage'> element");
- assertThat("<meta name='fromBasePage'> should be rendered before the <title> element",
- idxMetaFromBasePage, lessThan(idxTitleElement));
+ assertThat(idxMetaFromBasePage).isLessThan(idxTitleElement).withFailMessage(
+ "<meta name='fromBasePage'> should be rendered before the <title> element");
}
/**
* Only one <wicket:header-items/> is allowed only in <head>
+ *
* @see org.apache.wicket.markup.parser.filter.HtmlHeaderSectionHandler
*/
- @Test(expected = MarkupException.class)
- public void pageWithTwoHeaderItems()
+ @Test
+ void pageWithTwoHeaderItems()
{
- tester.startPage(PageWithTwoHeaderItems.class);
+ assertThrows(MarkupException.class, () -> {
+ tester.startPage(PageWithTwoHeaderItems.class);
+ });
}
/**
* <wicket:header-items/> is allowed only in <head>
+ *
* @see org.apache.wicket.markup.parser.filter.HtmlHeaderSectionHandler
*/
- @Test(expected = MarkupException.class)
- public void pageWithHeaderItemsOutOfHead()
+ @Test
+ void pageWithHeaderItemsOutOfHead()
{
- tester.startPage(PageWithHeaderItemsOutOfHead.class);
+ assertThrows(MarkupException.class, () -> {
+ tester.startPage(PageWithHeaderItemsOutOfHead.class);
+ });
}
/**
- * Verifies that all header contributions from <wicket:head> containers
- * and IHeaderResponse are rendered exactly once
+ * Verifies that all header contributions from <wicket:head> containers and IHeaderResponse are
+ * rendered exactly once
*
* https://issues.apache.org/jira/browse/WICKET-5531
*/
@Test
- public void withHeaderItemsWithWicketHeadNoDuplicates()
+ void withHeaderItemsWithWicketHeadNoDuplicates()
{
tester.startPage(SubPageWithHeaderItemsAndWicketHead.class);
String responseAsString = tester.getLastResponseAsString();
{
- int idxMetaPanelWicketHead = responseAsString.indexOf("meta name=\"panel-wicket-head\"");
- int lastIdxMetaPanelWicketHead = responseAsString.lastIndexOf("meta name=\"panel-wicket-head\"");
+ int idxMetaPanelWicketHead = responseAsString
+ .indexOf("meta name=\"panel-wicket-head\"");
+ int lastIdxMetaPanelWicketHead = responseAsString
+ .lastIndexOf("meta name=\"panel-wicket-head\"");
assertEquals(idxMetaPanelWicketHead, lastIdxMetaPanelWicketHead);
}
@@ -184,20 +196,26 @@ public class HtmlHeaderItemsContainerTest extends WicketTestCase
}
{
- int idxTitleElement = responseAsString.indexOf("<title>Apache Wicket Quickstart</title>");
- int lastIdxTitleElement = responseAsString.lastIndexOf("<title>Apache Wicket Quickstart</title>");
+ int idxTitleElement = responseAsString
+ .indexOf("<title>Apache Wicket Quickstart</title>");
+ int lastIdxTitleElement = responseAsString
+ .lastIndexOf("<title>Apache Wicket Quickstart</title>");
assertEquals(idxTitleElement, lastIdxTitleElement);
}
{
- int idxMetaFromBasePage = responseAsString.indexOf("<meta name='fromBasePage' content='1'");
- int lastIdxMetaFromBasePage = responseAsString.lastIndexOf("<meta name='fromBasePage' content='1'");
+ int idxMetaFromBasePage = responseAsString
+ .indexOf("<meta name='fromBasePage' content='1'");
+ int lastIdxMetaFromBasePage = responseAsString
+ .lastIndexOf("<meta name='fromBasePage' content='1'");
assertEquals(idxMetaFromBasePage, lastIdxMetaFromBasePage);
}
{
- int idxMetaFromSubPage = responseAsString.indexOf("<meta name=\"SubPageWithHeaderItemsAndWicketHead\"");
- int lastIdxMetaFromSubPage = responseAsString.lastIndexOf("<meta name=\"SubPageWithHeaderItemsAndWicketHead\"");
+ int idxMetaFromSubPage = responseAsString
+ .indexOf("<meta name=\"SubPageWithHeaderItemsAndWicketHead\"");
+ int lastIdxMetaFromSubPage = responseAsString
+ .lastIndexOf("<meta name=\"SubPageWithHeaderItemsAndWicketHead\"");
assertEquals(idxMetaFromSubPage, lastIdxMetaFromSubPage);
}
}
@@ -206,7 +224,8 @@ public class HtmlHeaderItemsContainerTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-5989
*/
@Test
- public void pageWithBasePageWithHeaderItems() {
+ void pageWithBasePageWithHeaderItems()
+ {
WicketTesterForBasePageWithHeaderItems tester = new WicketTesterForBasePageWithHeaderItems();
try
{
@@ -221,14 +240,17 @@ public class HtmlHeaderItemsContainerTest extends WicketTestCase
private static class WicketTesterForBasePageWithHeaderItems extends WicketTester
{
@Override
- protected Page createPage() {
+ protected Page createPage()
+ {
return new PageExtendingBasePageWithHeaderItems(new PageParameters());
}
@Override
- protected String createPageMarkup(final String componentId) {
- return new PageExtendingBasePageWithHeaderItems(new PageParameters()).getMarkup().toString(true);
+ protected String createPageMarkup(final String componentId)
+ {
+ return new PageExtendingBasePageWithHeaderItems(new PageParameters()).getMarkup()
+ .toString(true);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/PageExtendingBasePageWithHeaderItems.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/PageExtendingBasePageWithHeaderItems.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/PageExtendingBasePageWithHeaderItems.java
index 54df07f..e64b37a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/PageExtendingBasePageWithHeaderItems.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/PageExtendingBasePageWithHeaderItems.java
@@ -21,7 +21,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
/**
* https://issues.apache.org/jira/browse/WICKET-5989
*/
-public class PageExtendingBasePageWithHeaderItems extends BasePageWithHeaderItems
+class PageExtendingBasePageWithHeaderItems extends BasePageWithHeaderItems
{
public PageExtendingBasePageWithHeaderItems(PageParameters parameters) {
super(parameters);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/PanelA.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/PanelA.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/PanelA.java
index d0ccdb1..2edf47a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/PanelA.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/PanelA.java
@@ -24,7 +24,7 @@ import org.apache.wicket.resource.CoreLibrariesContributor;
* A panel that contributes all Ajax header items
* and uses <wicket:head> to contribute a <meta> element
*/
-public class PanelA extends Panel
+class PanelA extends Panel
{
public PanelA(String id)
{
[24/45] wicket git commit: wicket-core: Migrate to Junit 5
Posted by mg...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/LocaleAwarePageParametersTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/LocaleAwarePageParametersTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/LocaleAwarePageParametersTest.java
index 6a4bc88..b833fac 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/LocaleAwarePageParametersTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/LocaleAwarePageParametersTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.core.request.mapper;
-import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.Locale;
@@ -33,26 +33,26 @@ 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.After;
-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;
/**
* https://issues.apache.org/jira/browse/WICKET-6419
*/
-public class LocaleAwarePageParametersTest extends WicketTestCase
+class LocaleAwarePageParametersTest extends WicketTestCase
{
private Locale defaultLocale = null;
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
defaultLocale = Locale.getDefault(Locale.Category.DISPLAY);
Locale.setDefault(Locale.Category.DISPLAY, Locale.ENGLISH);
}
- @After
- public void after()
+ @AfterEach
+ void after()
{
if (defaultLocale != null)
{
@@ -93,26 +93,26 @@ public class LocaleAwarePageParametersTest extends WicketTestCase
}
@Test
- public void localeUnaware()
+ void localeUnaware()
{
tester.executeUrl("unaware?number=1.234,0");
final Page page = tester.getLastRenderedPage();
- assertThat(page.getPageParameters().get("number").toDouble(), is(1.234));
+ assertEquals(1.234, page.getPageParameters().get("number").toDouble());
}
@Test
- public void localeAware()
+ void localeAware()
{
tester.executeUrl("aware?number=1.234,0");
final Page page = tester.getLastRenderedPage();
- assertThat(page.getPageParameters().get("number").toDouble(), is(1234d));
+ assertEquals(1234d, page.getPageParameters().get("number").toDouble());
}
private static class BasePage extends WebPage implements IMarkupResourceStreamProvider
{
- protected BasePage(PageParameters parameters)
+ BasePage(PageParameters parameters)
{
super(parameters);
}
@@ -124,17 +124,17 @@ public class LocaleAwarePageParametersTest extends WicketTestCase
}
}
- public static class LocaleUnawarePageParametersPage extends BasePage
+ public static class LocaleUnawarePageParametersPage extends BasePage
{
- public LocaleUnawarePageParametersPage(PageParameters parameters)
+ public LocaleUnawarePageParametersPage(PageParameters parameters)
{
super(parameters);
}
}
- public static class LocaleAwarePageParametersPage extends BasePage
+ public static class LocaleAwarePageParametersPage extends BasePage
{
- public LocaleAwarePageParametersPage(PageParameters parameters)
+ public LocaleAwarePageParametersPage(PageParameters parameters)
{
super(parameters);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MoreSpecificResourceMountPathTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MoreSpecificResourceMountPathTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MoreSpecificResourceMountPathTest.java
index 9d5f582..c815172 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MoreSpecificResourceMountPathTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MoreSpecificResourceMountPathTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.wicket.core.request.mapper;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.net.URL;
+
import org.apache.wicket.Application;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.protocol.http.WebApplication;
@@ -27,95 +31,62 @@ import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.tester.DummyHomePage;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.net.URL;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
+import org.junit.jupiter.api.Test;
/**
* https://issues.apache.org/jira/browse/WICKET-6094
*/
-public class MoreSpecificResourceMountPathTest
+class MoreSpecificResourceMountPathTest
{
@Test
- public void can_use_resource_mounted_without_parameter()
+ void can_use_resource_mounted_without_parameter()
{
WicketTester browser = new WicketTester(new WicketApplication());
browser.executeUrl(WicketApplication.urlFor("howdy"));
- Assert.assertThat(browser.getLastResponseAsString(), is(equalTo("howdy")));
+ assertEquals("howdy", browser.getLastResponseAsString());
}
@Test
- public void can_use_resource_mounted_with_parameter()
+ void can_use_resource_mounted_with_parameter()
{
WicketTester browser = new WicketTester(new WicketApplication());
browser.executeUrl(WicketApplication.urlFor(1L));
- Assert.assertThat(browser.getLastResponseAsString(), is(equalTo("1")));
+ assertEquals("1", browser.getLastResponseAsString());
}
- public static class WicketApplication extends WebApplication
+ static class WicketApplication extends WebApplication
{
+ static final String PARAM_ID = "id";
+ static final String PARAM_NAME = "name";
private static final String OWNER_BY_ID_LOADER = "owner-by-id-loader";
private static final String OWNERS_LISTER = "owners-lister";
- public static final String PARAM_ID = "id";
- public static final String PARAM_NAME = "name";
- @Override
- public Class<? extends WebPage> getHomePage()
- {
- return DummyHomePage.class;
- }
-
- @Override
- public void init()
- {
- super.init();
-
- String path = "/ajax/owners"; // shared by both references
-
- mountResource(path, new ResourceReference(OWNERS_LISTER)
- {
- @Override
- public IResource getResource()
- {
- return new DummyResource(PARAM_NAME);
- }
- });
-
- mountResource(path + "/${" + PARAM_ID + "}", new ResourceReference(OWNER_BY_ID_LOADER)
- {
- @Override
- public IResource getResource()
- {
- return new DummyResource(PARAM_ID);
- }
- });
- }
-
- public static String urlFor(String name)
+ static String urlFor(String name)
{
return urlFor(name, PARAM_NAME, OWNERS_LISTER);
}
- public static String urlFor(Long id)
+ static String urlFor(Long id)
{
return urlFor(id, PARAM_ID, OWNER_BY_ID_LOADER);
}
- /** <Test-Helper>
- * Generate an {@link URL} to access the mounted resource reference.
- * @param value of dummy attribute used to have some testable response output.
- * @param parameterName of dummy attribute
- * @param resourceReferenceName used to mount instance
+ /**
+ * <Test-Helper> Generate an {@link URL} to access the mounted resource reference.
+ *
+ * @param value
+ * of dummy attribute used to have some testable response output.
+ * @param parameterName
+ * of dummy attribute
+ * @param resourceReferenceName
+ * used to mount instance
* @return {@link CharSequence} url for resource reference
*/
- private static String urlFor(Object value, String parameterName, String resourceReferenceName)
+ private static String urlFor(Object value, String parameterName,
+ String resourceReferenceName)
{
PageParameters parameters = new PageParameters();
- if (value != null)
+ if (value != null)
{
parameters.set(parameterName, value);
}
@@ -124,46 +95,70 @@ public class MoreSpecificResourceMountPathTest
return string;
}
- /** <Test-Helper>
- * Find resource reference mounted in application.
- * @param name of resource reference used to mount instance
+ /**
+ * <Test-Helper> Find resource reference mounted in application.
+ *
+ * @param name
+ * of resource reference used to mount instance
* @return {@link ResourceReference} found
*/
- private static ResourceReference findResourceReference(String name)
+ private static ResourceReference findResourceReference(String name)
+ {
+ return Application.get().getResourceReferenceRegistry().getResourceReference(
+ new ResourceReference.Key(Application.class.getName(), name, null, null, null),
+ false, false);
+ }
+
+ @Override
+ public Class<? extends WebPage> getHomePage()
+ {
+ return DummyHomePage.class;
+ }
+
+ @Override
+ public void init()
{
- return Application.get()
- .getResourceReferenceRegistry()
- .getResourceReference(
- new ResourceReference.Key(
- Application.class.getName(),
- name,
- null,
- null,
- null
- ),
- false,
- false
- );
+ super.init();
+
+ String path = "/ajax/owners"; // shared by both references
+
+ mountResource(path, new ResourceReference(OWNERS_LISTER)
+ {
+ @Override
+ public IResource getResource()
+ {
+ return new DummyResource(PARAM_NAME);
+ }
+ });
+
+ mountResource(path + "/${" + PARAM_ID + "}", new ResourceReference(OWNER_BY_ID_LOADER)
+ {
+ @Override
+ public IResource getResource()
+ {
+ return new DummyResource(PARAM_ID);
+ }
+ });
}
- /** <Test-Helper>
- * This is only a dummy to be referenced. It is possible to
- * exchange this by a mock or whatever.
+ /**
+ * <Test-Helper> This is only a dummy to be referenced. It is possible to exchange this by a
+ * mock or whatever.
*
* @author rene.dieckmann@menoto.de
*/
- private static class DummyResource extends ByteArrayResource
+ private static class DummyResource extends ByteArrayResource
{
private final String parameterName;
- public DummyResource(String parameterName)
+ DummyResource(String parameterName)
{
super("application/text");
this.parameterName = parameterName;
}
@Override
- protected byte[] getData(Attributes attributes)
+ protected byte[] getData(Attributes attributes)
{
StringValue value = attributes.getParameters().get(parameterName);
return value == null ? new byte[0] : value.toString().getBytes();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
index 5b809a7..1b91f8a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
@@ -16,7 +16,13 @@
*/
package org.apache.wicket.core.request.mapper;
-import static org.hamcrest.CoreMatchers.instanceOf;
+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 org.apache.wicket.MockPage;
import org.apache.wicket.core.request.handler.BookmarkableListenerRequestHandler;
@@ -36,21 +42,14 @@ import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.mapper.parameter.INamedParameters;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Matej Knopp
*/
-public class MountedMapperTest extends AbstractMapperTest
+class MountedMapperTest extends AbstractMapperTest
{
- /**
- * Construct.
- */
- public MountedMapperTest()
- {
- }
-
private final MountedMapper encoder = new MountedMapper("/some/mount/path", MockPage.class)
{
@Override
@@ -65,7 +64,6 @@ public class MountedMapperTest extends AbstractMapperTest
return true;
}
};
-
private final MountedMapper placeholderEncoder = new MountedMapper(
"/some/${param1}/path/${param2}", MockPage.class)
{
@@ -81,7 +79,6 @@ public class MountedMapperTest extends AbstractMapperTest
return true;
}
};
-
private final MountedMapper optionPlaceholderEncoder = new MountedMapper(
"/some/#{param1}/path/${param2}/#{param3}", MockPage.class)
{
@@ -99,15 +96,22 @@ public class MountedMapperTest extends AbstractMapperTest
};
/**
+ * Construct.
+ */
+ MountedMapperTest()
+ {
+ }
+
+ /**
*
*/
@Test
- public void decode1()
+ void decode1()
{
Url url = Url.parse("some/mount/path");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(0, page.getPageParameters().getIndexedCount());
@@ -118,12 +122,12 @@ public class MountedMapperTest extends AbstractMapperTest
* https://issues.apache.org/jira/browse/WICKET-4994
*/
@Test
- public void decode1CaseInsensitively()
+ void decode1CaseInsensitively()
{
Url url = Url.parse("somE/moUnt/paTh");
IRequestHandler handler = encoder.setCaseSensitiveMatch(false).mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(0, page.getPageParameters().getIndexedCount());
@@ -134,12 +138,12 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode2()
+ void decode2()
{
Url url = Url.parse("some/mount/path/indexed1?a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
PageParameters p = page.getPageParameters();
@@ -152,46 +156,42 @@ public class MountedMapperTest extends AbstractMapperTest
}
/**
- * The tests resolves pages by id as if they were existed in the page store.
- * These pages have no page parameters (i.e. page.getPageParameters() == null).
+ * The tests resolves pages by id as if they were existed in the page store. These pages have no
+ * page parameters (i.e. page.getPageParameters() == null).
*
- * The request that the encoder does also has no parameters (neither in the path
- * nor in the query string) so the resolved page is assumed to be valid.
+ * The request that the encoder does also has no parameters (neither in the path nor in the
+ * query string) so the resolved page is assumed to be valid.
*/
@Test
- public void decode3()
+ void decode3()
{
Url url = Url.parse("some/mount/path?15");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
}
/**
- * The tests resolves pages by id as if they were existed in the page store.
- * These pages have no page parameters (i.e. page.getPageParameters() == null).
+ * The tests resolves pages by id as if they were existed in the page store. These pages have no
+ * page parameters (i.e. page.getPageParameters() == null).
*
- * Since Wicket 7.0.0 (WICKET-4441) if a new request to hybrid url
- * (a url with both mount path and pageId) has different page parameters
- * than the resolved page then a new page instance with the new parameters
- * is created.
- * This way if a user manipulates manually the product id in url like:
- * /products/23?3
- * to
- * /products/24?3
- * then Wicket will create a new page that will show product=24
+ * Since Wicket 7.0.0 (WICKET-4441) if a new request to hybrid url (a url with both mount path
+ * and pageId) has different page parameters than the resolved page then a new page instance
+ * with the new parameters is created. This way if a user manipulates manually the product id in
+ * url like: /products/23?3 to /products/24?3 then Wicket will create a new page that will show
+ * product=24
*/
@Test
- public void decode4()
+ void decode4()
{
Url url = Url.parse("some/mount/path/i1/i2?15&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
- RenderPageRequestHandler h = (RenderPageRequestHandler) handler;
- ((PageProvider) h.getPageProvider()).setPageSource(context);
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
+ RenderPageRequestHandler h = (RenderPageRequestHandler)handler;
+ ((PageProvider)h.getPageProvider()).setPageSource(context);
IRequestablePage page = h.getPage();
checkPage(page, 1);
@@ -205,12 +205,12 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode5()
+ void decode5()
{
Url url = Url.parse("some/mount/path?15--foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
@@ -225,12 +225,12 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode6()
+ void decode6()
{
Url url = Url.parse("some/mount/path/i1/i2?15--foo-bar&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
IRequestablePage page = h.getPage();
@@ -248,12 +248,12 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode7()
+ void decode7()
{
Url url = Url.parse("some/mount/path?param1=value1&15-.4-foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
@@ -268,7 +268,7 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode8()
+ void decode8()
{
Url url = Url.parse("some/mmount/path?15-.4-foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
@@ -280,25 +280,25 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode9()
+ void decode9()
{
// capture the home page
Url url = Url.parse("");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
}
/**
*
*/
@Test
- public void decode10()
+ void decode10()
{
Url url = Url.parse("some/mount/path?15-5.4-foo-bar");
context.setNextPageRenderCount(5);
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
@@ -309,27 +309,29 @@ public class MountedMapperTest extends AbstractMapperTest
/**
*
*/
- @Test(expected = StalePageException.class)
- public void decode11()
+ @Test
+ void decode11()
{
- Url url = Url.parse("some/mount/path?15-5.4-foo-bar");
- context.setNextPageRenderCount(7);
+ assertThrows(StalePageException.class, () -> {
+ Url url = Url.parse("some/mount/path?15-5.4-foo-bar");
+ context.setNextPageRenderCount(7);
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
- ((IPageRequestHandler)handler).getPage();
+ ((IPageRequestHandler)handler).getPage();
+ });
}
/**
*
*/
@Test
- public void decode12()
+ void decode12()
{
Url url = Url.parse("some/mount/path/i1/i2?-1.-foo-bar&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
IRequestablePage page = h.getPage();
@@ -348,7 +350,7 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode1()
+ void encode1()
{
PageProvider provider = new PageProvider(MockPage.class, new PageParameters());
provider.setPageSource(context);
@@ -361,7 +363,7 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode2()
+ void encode2()
{
PageParameters parameters = new PageParameters();
parameters.set(0, "i1");
@@ -379,7 +381,7 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode3()
+ void encode3()
{
PageParameters parameters = new PageParameters();
parameters.set(0, "i1");
@@ -399,7 +401,7 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode4()
+ void encode4()
{
MockPage page = new MockPage(15);
page.getPageParameters().set(0, "i1");
@@ -419,7 +421,7 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode5()
+ void encode5()
{
MockPage page = new MockPage(15);
page.getPageParameters().set(0, "i1");
@@ -445,7 +447,7 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode6()
+ void encode6()
{
MockPage page = new MockPage(15);
page.getPageParameters().set(0, "i1");
@@ -471,11 +473,11 @@ public class MountedMapperTest extends AbstractMapperTest
/**
* https://issues.apache.org/jira/browse/WICKET-4014
*
- * The difference with testEncode7 is that here ListenerRequestHandler is used instead
- * of BookmarkableListenerRequestHandler
+ * The difference with testEncode7 is that here ListenerRequestHandler is used instead of
+ * BookmarkableListenerRequestHandler
*/
@Test
- public void encode6_1()
+ void encode6_1()
{
MockPage page = new MockPage(15);
page.getPageParameters().set(0, "i1");
@@ -484,8 +486,10 @@ public class MountedMapperTest extends AbstractMapperTest
page.getPageParameters().set("b", "c", INamedParameters.Type.QUERY_STRING);
// WICKET-4038
- page.getPageParameters().add(WebRequest.PARAM_AJAX, "true", INamedParameters.Type.QUERY_STRING);
- page.getPageParameters().add(WebRequest.PARAM_AJAX_BASE_URL, "some/base/url", INamedParameters.Type.QUERY_STRING);
+ page.getPageParameters().add(WebRequest.PARAM_AJAX, "true",
+ INamedParameters.Type.QUERY_STRING);
+ page.getPageParameters().add(WebRequest.PARAM_AJAX_BASE_URL, "some/base/url",
+ INamedParameters.Type.QUERY_STRING);
page.setRenderCount(4);
@@ -507,7 +511,7 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode7()
+ void encode7()
{
MockPage page = new MockPage(15);
page.getPageParameters().set(0, "i1");
@@ -533,11 +537,11 @@ public class MountedMapperTest extends AbstractMapperTest
/**
* https://issues.apache.org/jira/browse/WICKET-4014
*
- * The difference with testEncode7 is that here ListenerRequestHandler is used instead
- * of BookmarkableListenerRequestHandler
+ * The difference with testEncode7 is that here ListenerRequestHandler is used instead of
+ * BookmarkableListenerRequestHandler
*/
@Test
- public void encode7_1()
+ void encode7_1()
{
MockPage page = new MockPage(15);
page.getPageParameters().set(0, "i1");
@@ -564,7 +568,7 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode8()
+ void encode8()
{
MockPage page = new MockPage(15);
page.setBookmarkable(true);
@@ -582,17 +586,19 @@ public class MountedMapperTest extends AbstractMapperTest
/**
*
*/
- @Test(expected = IllegalArgumentException.class)
- public void construct1()
+ @Test
+ void construct1()
{
- IRequestMapper e = new MountedMapper("", MockPage.class);
+ assertThrows(IllegalArgumentException.class, () -> {
+ IRequestMapper e = new MountedMapper("", MockPage.class);
+ });
}
/**
* Overriding mounting on '/' (see HomePageMapper) should be possible
*/
@Test
- public void construct2()
+ void construct2()
{
IRequestMapper homePageMapper = new MountedMapper("/", MockPage.class);
assertNotNull(homePageMapper);
@@ -602,12 +608,12 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void placeholderDecode1()
+ void placeholderDecode1()
{
Url url = Url.parse("some/p1/path/p2");
IRequestHandler handler = placeholderEncoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(0, page.getPageParameters().getIndexedCount());
@@ -620,12 +626,12 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void placeholderDecode2()
+ void placeholderDecode2()
{
Url url = Url.parse("some/p1/path/p2/indexed1?a=b&b=c");
IRequestHandler handler = placeholderEncoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
PageParameters p = page.getPageParameters();
@@ -641,12 +647,12 @@ public class MountedMapperTest extends AbstractMapperTest
/** */
@Test
- public void placeholderDecodeWithIndexedParameters()
+ void placeholderDecodeWithIndexedParameters()
{
Url url = Url.parse("some/p1/path/p2/p3/p4");
IRequestHandler handler = placeholderEncoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(2, page.getPageParameters().getIndexedCount());
@@ -661,7 +667,7 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void placeholderEncode2()
+ void placeholderEncode2()
{
PageParameters parameters = new PageParameters();
parameters.set(0, "i1");
@@ -684,7 +690,7 @@ public class MountedMapperTest extends AbstractMapperTest
* new, this way the produced Url has version '1' in the page info parameter
*/
@Test
- public void placeholderEncode3()
+ void placeholderEncode3()
{
PageParameters parameters = new PageParameters();
parameters.set(0, "i1");
@@ -712,7 +718,7 @@ public class MountedMapperTest extends AbstractMapperTest
* WICKET-5247 page instantiated without required parameters won't be mapped
*/
@Test
- public void placeholderEncode4()
+ void placeholderEncode4()
{
PageProvider provider = new PageProvider(MockPage.class)
{
@@ -730,12 +736,12 @@ public class MountedMapperTest extends AbstractMapperTest
/** */
@Test
- public void optionPlaceholderDecode1()
+ void optionPlaceholderDecode1()
{
Url url = Url.parse("some/p1/path/p2/p3");
IRequestHandler handler = optionPlaceholderEncoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(0, page.getPageParameters().getIndexedCount());
@@ -747,73 +753,72 @@ public class MountedMapperTest extends AbstractMapperTest
/** */
@Test
- public void optionPlaceholderDecodeEagerMatchParameters()
+ void optionPlaceholderDecodeEagerMatchParameters()
{
Url url = Url.parse("some/path/path/path");
IRequestHandler handler = optionPlaceholderEncoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(0, page.getPageParameters().getIndexedCount());
assertTrue(page.getPageParameters().getNamedKeys().size() == 2);
assertEquals("path", page.getPageParameters().get("param1").toString());
assertEquals("path", page.getPageParameters().get("param2").toString());
- assertFalse("param3 should not be set",
- page.getPageParameters().getNamedKeys().contains("param3"));
+ assertFalse(page.getPageParameters().getNamedKeys().contains("param3"),
+ "param3 should not be set");
}
/** */
@Test
- public void optionPlaceholderDecode2()
+ void optionPlaceholderDecode2()
{
Url url = Url.parse("some/p1/path/p2");
IRequestHandler handler = optionPlaceholderEncoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(0, page.getPageParameters().getIndexedCount());
assertTrue(page.getPageParameters().getNamedKeys().size() == 2);
assertEquals("p1", page.getPageParameters().get("param1").toString());
assertEquals("p2", page.getPageParameters().get("param2").toString());
- assertFalse("param3 should not be set",
- page.getPageParameters().getNamedKeys().contains("param3"));
+ assertFalse(page.getPageParameters().getNamedKeys().contains("param3"));
}
/** */
@Test
- public void optionPlaceholderDecode3()
+ void optionPlaceholderDecode3()
{
Url url = Url.parse("some/path/p2");
IRequestHandler handler = optionPlaceholderEncoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(0, page.getPageParameters().getIndexedCount());
assertTrue(page.getPageParameters().getNamedKeys().size() == 1);
- assertFalse("param1 should not be set",
- page.getPageParameters().getNamedKeys().contains("param1"));
+ assertFalse(page.getPageParameters().getNamedKeys().contains("param1"),
+ "param1 should not be set");
assertEquals("p2", page.getPageParameters().get("param2").toString());
- assertFalse("param3 should not be set",
- page.getPageParameters().getNamedKeys().contains("param3"));
+ assertFalse(page.getPageParameters().getNamedKeys().contains("param3"),
+ "param3 should not be set");
}
/** */
@Test
- public void optionPlaceholderDecodeWithIndexParams()
+ void optionPlaceholderDecodeWithIndexParams()
{
Url url = Url.parse("some/path/p2/p3/p4");
IRequestHandler handler = optionPlaceholderEncoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(1, page.getPageParameters().getIndexedCount());
assertEquals(2, page.getPageParameters().getNamedKeys().size());
- assertFalse("param1 should not be set",
- page.getPageParameters().getNamedKeys().contains("param1"));
+ assertFalse(page.getPageParameters().getNamedKeys().contains("param1"),
+ "param1 should not be set");
assertEquals("p2", page.getPageParameters().get("param2").toString());
assertEquals("p3", page.getPageParameters().get("param3").toString());
assertEquals("p4", page.getPageParameters().get(0).toString());
@@ -821,7 +826,7 @@ public class MountedMapperTest extends AbstractMapperTest
/** */
@Test
- public void optionPlaceholderEncode1()
+ void optionPlaceholderEncode1()
{
PageParameters parameters = new PageParameters();
parameters.set(0, "i1");
@@ -841,7 +846,7 @@ public class MountedMapperTest extends AbstractMapperTest
/** */
@Test
- public void optionPlaceholderEncode2()
+ void optionPlaceholderEncode2()
{
PageParameters parameters = new PageParameters();
parameters.set(0, "i1");
@@ -863,9 +868,11 @@ public class MountedMapperTest extends AbstractMapperTest
* WICKET-6461
*/
@Test
- public void optionalPlaceholdersBeforeRequiredPlaceholder() throws Exception
+ void optionalPlaceholdersBeforeRequiredPlaceholder() throws Exception
{
- final MountedMapper mapper = new MountedMapper("/params/#{optional1}/#{optional2}/${required}", MockPage.class) {
+ final MountedMapper mapper = new MountedMapper(
+ "/params/#{optional1}/#{optional2}/${required}", MockPage.class)
+ {
@Override
protected IMapperContext getContext()
{
@@ -878,24 +885,24 @@ public class MountedMapperTest extends AbstractMapperTest
return true;
}
};
-
+
IRequestHandler handler = mapper.mapRequest(getRequest(Url.parse("params/required")));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
PageParameters p = page.getPageParameters();
assertEquals(1, p.getNamedKeys().size());
assertEquals("required", p.get("required").toString());
-
+
handler = mapper.mapRequest(getRequest(Url.parse("params/optional1/required")));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
page = ((RenderPageRequestHandler)handler).getPage();
p = page.getPageParameters();
assertEquals(2, p.getNamedKeys().size());
assertEquals("required", p.get("required").toString());
assertEquals("optional1", p.get("optional1").toString());
-
+
handler = mapper.mapRequest(getRequest(Url.parse("params/optional1/optional2/required")));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
page = ((RenderPageRequestHandler)handler).getPage();
p = page.getPageParameters();
assertEquals(3, p.getNamedKeys().size());
@@ -908,7 +915,7 @@ public class MountedMapperTest extends AbstractMapperTest
* WICKET-5056
*/
@Test
- public void optionalParameterGetsLowerScore_ThanExactOne() throws Exception
+ void optionalParameterGetsLowerScore_ThanExactOne() throws Exception
{
final Url url = Url.parse("all/sindex");
final MountedMapper exactMount = new MountedMapper("/all/sindex", MockPage.class);
@@ -916,13 +923,13 @@ public class MountedMapperTest extends AbstractMapperTest
Request request = getRequest(url);
final int exactCompatScore = exactMount.getCompatibilityScore(request);
final int optCompatScore = optionalParameter.getCompatibilityScore(request);
- assertTrue("exactCompatScore should have greater compatibility score than optional one"
- + " got exact = " + exactCompatScore + " and optional = " + optCompatScore,
- exactCompatScore > optCompatScore);
+ assertTrue(exactCompatScore > optCompatScore,
+ "exactCompatScore should have greater compatibility score than optional one" +
+ " got exact = " + exactCompatScore + " and optional = " + optCompatScore);
}
@Test
- public void exactMountGetsBetterScore_ThanParameterOne() throws Exception
+ void exactMountGetsBetterScore_ThanParameterOne() throws Exception
{
final Url url = Url.parse("all/sindex");
final MountedMapper exactMount = new MountedMapper("/all/sindex", MockPage.class);
@@ -930,13 +937,13 @@ public class MountedMapperTest extends AbstractMapperTest
Request request = getRequest(url);
final int exactCompatScore = exactMount.getCompatibilityScore(request);
final int requiredParamScore = requiredParam.getCompatibilityScore(request);
- assertTrue("exactCompatScore should have greater compatibility score than required one"
- + " got exact = " + exactCompatScore + " and required= " + requiredParamScore,
- exactCompatScore > requiredParamScore);
+ assertTrue(exactCompatScore > requiredParamScore,
+ "exactCompatScore should have greater compatibility score than required one" +
+ " got exact = " + exactCompatScore + " and required= " + requiredParamScore);
}
@Test
- public void exactMountGetsBetterScore_ThanParameterOne_ThenOptionalOne() throws Exception
+ void exactMountGetsBetterScore_ThanParameterOne_ThenOptionalOne() throws Exception
{
final Url url = Url.parse("all/sindex");
final MountedMapper exactMount = new MountedMapper("/all/sindex", MockPage.class);
@@ -950,24 +957,28 @@ public class MountedMapperTest extends AbstractMapperTest
final int requiredParamScore = requiredParam.getCompatibilityScore(request);
final int optCompatScore = optionalParameter.getCompatibilityScore(request);
final int requiredOptCompatScore = requiredOptionalParam.getCompatibilityScore(request);
-
- //all the mappers above must be eligible for the give URL (i.e. their score must be > 0)
- assertTrue("exactMount mapper must be eligible to handle the request", exactCompatScore > 0);
- assertTrue("requiredParam mapper must be eligible to handle the request", requiredParamScore > 0);
- assertTrue("optionalParameter mapper must be eligible to handle the request", optCompatScore > 0);
- assertTrue("requiredOptionalParam mapper must be eligible to handle the request", requiredOptCompatScore > 0);
-
- assertTrue("exactCompatScore should have greater compatibility score than required one"
- + " got exact = " + exactCompatScore + " and required= " + requiredParamScore,
- exactCompatScore > requiredParamScore);
-
- assertTrue(
- "exactCompatScore should have greater compatibility score than required+optional one"
- + " got exact = " + exactCompatScore + " and requiredOptional= "
- + requiredOptCompatScore, exactCompatScore > requiredOptCompatScore);
-
- assertTrue("exactCompatScore should have greater compatibility score than optional one"
- + " got exact = " + exactCompatScore + " and optional = " + optCompatScore,
- requiredParamScore > optCompatScore);
+
+ // all the mappers above must be eligible for the give URL (i.e. their score must be > 0)
+ assertTrue(exactCompatScore > 0,
+ "exactMount mapper must be eligible to handle the request");
+ assertTrue(requiredParamScore > 0,
+ "requiredParam mapper must be eligible to handle the request");
+ assertTrue(optCompatScore > 0,
+ "optionalParameter mapper must be eligible to handle the request");
+ assertTrue(requiredOptCompatScore > 0,
+ "requiredOptionalParam mapper must be eligible to handle the request");
+
+ assertTrue(exactCompatScore > requiredParamScore,
+ "exactCompatScore should have greater compatibility score than required one" +
+ " got exact = " + exactCompatScore + " and required= " + requiredParamScore);
+
+ assertTrue(exactCompatScore > requiredOptCompatScore,
+ "exactCompatScore should have greater compatibility score than required+optional one" +
+ " got exact = " + exactCompatScore + " and requiredOptional= " +
+ requiredOptCompatScore);
+
+ assertTrue(requiredParamScore > optCompatScore,
+ "exactCompatScore should have greater compatibility score than optional one" +
+ " got exact = " + exactCompatScore + " and optional = " + optCompatScore);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
index b75f70b..72ab8a1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
@@ -16,9 +16,11 @@
*/
package org.apache.wicket.core.request.mapper;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+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 org.apache.wicket.MockPage;
import org.apache.wicket.core.request.handler.BookmarkableListenerRequestHandler;
@@ -38,18 +40,19 @@ import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.mapper.parameter.INamedParameters;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.lang.PackageName;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link PackageMapper}
*/
-public class PackageMapperTest extends AbstractMapperTest
+class PackageMapperTest extends AbstractMapperTest
{
private static final String MOUNT_PATH = "mount/path";
private static final String ALIAS = "alias";
-
- private final PackageMapper encoder = new PackageMapper(MOUNT_PATH, PackageName.forClass(MockPage.class))
+ private static final String PAGE_CLASS_NAME = MockPage.class.getSimpleName();
+ private final PackageMapper encoder = new PackageMapper(MOUNT_PATH,
+ PackageName.forClass(MockPage.class))
{
@Override
protected IMapperContext getContext()
@@ -63,9 +66,6 @@ public class PackageMapperTest extends AbstractMapperTest
return true;
}
};
-
- private static final String PAGE_CLASS_NAME = MockPage.class.getSimpleName();
-
private final PackageMapper aliasEncoder = new PackageMapper(MOUNT_PATH,
PackageName.forClass(MockPage.class))
{
@@ -106,7 +106,17 @@ public class PackageMapperTest extends AbstractMapperTest
}
};
- private final PackageMapper namedParametersEncoder = new PackageMapper(MOUNT_PATH + "/${foo}/${bar}", PackageName.forClass(MockPage.class))
+ private final PackageMapper namedParametersEncoder = new PackageMapper(
+ MOUNT_PATH + "/${foo}/${bar}", PackageName.forClass(MockPage.class))
+ {
+ @Override
+ protected IMapperContext getContext()
+ {
+ return context;
+ }
+ };
+ private final PackageMapper innerClassEncoder = new PackageMapper(MOUNT_PATH,
+ PackageName.forClass(OuterPage.class))
{
@Override
protected IMapperContext getContext()
@@ -119,12 +129,12 @@ public class PackageMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode1()
+ void decode1()
{
Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME);
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(PAGE_CLASS_NAME, page.getClass().getSimpleName());
assertEquals(0, page.getPageParameters().getIndexedCount());
@@ -135,22 +145,23 @@ public class PackageMapperTest extends AbstractMapperTest
* https://issues.apache.org/jira/browse/WICKET-4994
*/
@Test
- public void decode1CaseInsensitively()
+ void decode1CaseInsensitively()
{
Url url = Url.parse(MOUNT_PATH.replace('o', 'O').replace('p', 'P') + '/' + PAGE_CLASS_NAME);
IRequestHandler handler = encoder.setCaseSensitiveMatch(false).mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(PAGE_CLASS_NAME, page.getClass().getSimpleName());
assertEquals(0, page.getPageParameters().getIndexedCount());
assertTrue(page.getPageParameters().getNamedKeys().isEmpty());
}
+
/**
* https://issues.apache.org/jira/browse/WICKET-5500
*/
@Test
- public void decodePageClassWithPathParameters()
+ void decodePageClassWithPathParameters()
{
Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + ";something=else");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
@@ -166,12 +177,12 @@ public class PackageMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode2()
+ void decode2()
{
Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/indexed1?a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(PAGE_CLASS_NAME, page.getClass().getSimpleName());
@@ -185,46 +196,42 @@ public class PackageMapperTest extends AbstractMapperTest
}
/**
- * The tests resolves pages by id as if they were existed in the page store.
- * These pages have no page parameters (i.e. page.getPageParameters() == null).
+ * The tests resolves pages by id as if they were existed in the page store. These pages have no
+ * page parameters (i.e. page.getPageParameters() == null).
*
- * The request that the encoder does also has no parameters (neither in the path
- * nor in the query string) so the resolved page is assumed to be valid.
+ * The request that the encoder does also has no parameters (neither in the path nor in the
+ * query string) so the resolved page is assumed to be valid.
*/
@Test
- public void decode3()
+ void decode3()
{
Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "?15");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
}
/**
- * The tests resolves pages by id as if they were existed in the page store.
- * These pages have no page parameters (i.e. page.getPageParameters() == null).
+ * The tests resolves pages by id as if they were existed in the page store. These pages have no
+ * page parameters (i.e. page.getPageParameters() == null).
*
- * Since Wicket 7.0.0 (WICKET-4441) if a new request to hybrid url
- * (a url with both mount path and pageId) has different page parameters
- * than the resolved page then a new page instance with the new parameters
- * is created.
- * This way if a user manipulates manually the product id in url like:
- * /mount/path/Products/23?3
- * to
- * /mount/path/Products/24?3
- * then Wicket will create a new page that will show product=24
+ * Since Wicket 7.0.0 (WICKET-4441) if a new request to hybrid url (a url with both mount path
+ * and pageId) has different page parameters than the resolved page then a new page instance
+ * with the new parameters is created. This way if a user manipulates manually the product id in
+ * url like: /mount/path/Products/23?3 to /mount/path/Products/24?3 then Wicket will create a
+ * new page that will show product=24
*/
@Test
- public void decode4()
+ void decode4()
{
Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
- RenderPageRequestHandler h = (RenderPageRequestHandler) handler;
- ((PageProvider) h.getPageProvider()).setPageSource(context);
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
+ RenderPageRequestHandler h = (RenderPageRequestHandler)handler;
+ ((PageProvider)h.getPageProvider()).setPageSource(context);
IRequestablePage page = h.getPage();
checkPage(page, 1);
@@ -238,12 +245,12 @@ public class PackageMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode5()
+ void decode5()
{
Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "?15--foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
@@ -258,12 +265,12 @@ public class PackageMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode6()
+ void decode6()
{
Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15--foo-bar&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
IRequestablePage page = h.getPage();
@@ -281,12 +288,12 @@ public class PackageMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode7()
+ void decode7()
{
Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "?15-.4-foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
@@ -301,7 +308,7 @@ public class PackageMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode8()
+ void decode8()
{
Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15-5.-foo-bar&a=b&b=c");
@@ -309,7 +316,7 @@ public class PackageMapperTest extends AbstractMapperTest
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
IRequestablePage page = h.getPage();
@@ -319,26 +326,27 @@ public class PackageMapperTest extends AbstractMapperTest
/**
*
*/
- @Test(expected = StalePageException.class)
- public void decode9()
+ @Test
+ void decode9()
{
- Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15-5.-foo-bar&a=b&b=c");
+ assertThrows(StalePageException.class, () -> {
+ Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15-5.-foo-bar&a=b&b=c");
- context.setNextPageRenderCount(6);
-
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
-
- ((IPageRequestHandler)handler).getPage();
+ context.setNextPageRenderCount(6);
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ ((IPageRequestHandler)handler).getPage();
+ });
}
/**
*
*/
@Test
- public void decodeNamedParameters()
+ void decodeNamedParameters()
{
- Url url = Url.parse(MOUNT_PATH + "/fooValue/barValue/" + PAGE_CLASS_NAME + "/i1/i2?a=b&b=c");
+ Url url = Url
+ .parse(MOUNT_PATH + "/fooValue/barValue/" + PAGE_CLASS_NAME + "/i1/i2?a=b&b=c");
IRequestHandler handler = namedParametersEncoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
@@ -360,44 +368,44 @@ public class PackageMapperTest extends AbstractMapperTest
* WICKET-2993
*/
@Test
- public void decode10()
+ void decode10()
{
// use String.class but any other non-Page will do the job as well
Url url = Url.parse(String.class.getSimpleName());
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertNull("A non-page class should not create a request handler!", handler);
+ assertNull(handler, "A non-page class should not create a request handler!");
}
/**
* https://issues.apache.org/jira/browse/WICKET-5996
*/
@Test
- public void decode11()
+ void decode11()
{
Url url = Url.parse(MOUNT_PATH);
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, is(nullValue()));
+ assertNull(handler);
}
/**
* https://issues.apache.org/jira/browse/WICKET-5996
*/
@Test
- public void decode12()
+ void decode12()
{
Url url = Url.parse(MOUNT_PATH + '/');
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, is(nullValue()));
+ assertNull(handler);
}
/**
*
*/
@Test
- public void encode1()
+ void encode1()
{
PageProvider provider = new PageProvider(MockPage.class, new PageParameters());
provider.setPageSource(context);
@@ -410,7 +418,7 @@ public class PackageMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode2()
+ void encode2()
{
PageParameters parameters = new PageParameters();
parameters.set(0, "i1");
@@ -428,7 +436,7 @@ public class PackageMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode3()
+ void encode3()
{
PageParameters parameters = new PageParameters();
parameters.set(0, "i1");
@@ -448,7 +456,7 @@ public class PackageMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode4()
+ void encode4()
{
MockPage page = new MockPage(15);
page.getPageParameters().set(0, "i1");
@@ -468,7 +476,7 @@ public class PackageMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode5()
+ void encode5()
{
MockPage page = new MockPage(15);
page.getPageParameters().set(0, "i1");
@@ -489,7 +497,7 @@ public class PackageMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode6()
+ void encode6()
{
MockPage page = new MockPage(15);
page.getPageParameters().set(0, "i1");
@@ -508,14 +516,15 @@ public class PackageMapperTest extends AbstractMapperTest
Url url = encoder.mapHandler(handler);
- assertEquals(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15-0.-foo-bar&a=b&b=c", url.toString());
+ assertEquals(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15-0.-foo-bar&a=b&b=c",
+ url.toString());
}
/**
*
*/
@Test
- public void encode7()
+ void encode7()
{
MockPage page = new MockPage(15);
page.getPageParameters().set(0, "i1");
@@ -542,7 +551,7 @@ public class PackageMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode8()
+ void encode8()
{
MockPage page = new MockPage(15);
page.setBookmarkable(true);
@@ -561,7 +570,7 @@ public class PackageMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encodeNamedPageParameters()
+ void encodeNamedPageParameters()
{
MockPage page = new MockPage(15);
page.setBookmarkable(true);
@@ -578,32 +587,11 @@ public class PackageMapperTest extends AbstractMapperTest
assertEquals(MOUNT_PATH + "/fooValue/barValue/" + PAGE_CLASS_NAME, url.toString());
}
-
- private final PackageMapper innerClassEncoder = new PackageMapper(MOUNT_PATH,
- PackageName.forClass(OuterPage.class))
- {
- @Override
- protected IMapperContext getContext()
- {
- return context;
- }
- };
-
- public static class OuterPage extends MockPage
- {
- private static final long serialVersionUID = 1L;
-
- public static class InnerPage extends MockPage
- {
- private static final long serialVersionUID = 1L;
- }
- }
-
/**
* https://issues.apache.org/jira/browse/WICKET-3838
*/
@Test
- public void encodeInnerClass()
+ void encodeInnerClass()
{
InnerPage page = new OuterPage.InnerPage();
IPageProvider provider = new PageProvider(page);
@@ -618,12 +606,12 @@ public class PackageMapperTest extends AbstractMapperTest
* https://issues.apache.org/jira/browse/WICKET-3838
*/
@Test
- public void decodeInnerClass()
+ void decodeInnerClass()
{
Url url = Url.parse(MOUNT_PATH + '/' + "PackageMapperTest$OuterPage$InnerPage");
IRequestHandler handler = innerClassEncoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals("InnerPage", page.getClass().getSimpleName());
assertEquals(0, page.getPageParameters().getIndexedCount());
@@ -634,7 +622,7 @@ public class PackageMapperTest extends AbstractMapperTest
* https://issues.apache.org/jira/browse/WICKET-3941
*/
@Test
- public void encodeAlias()
+ void encodeAlias()
{
MockPage page = new MockPage(15);
page.setBookmarkable(true);
@@ -653,33 +641,43 @@ public class PackageMapperTest extends AbstractMapperTest
* https://issues.apache.org/jira/browse/WICKET-3941
*/
@Test
- public void decodeAlias()
+ void decodeAlias()
{
Url url = Url.parse(MOUNT_PATH + '/' + ALIAS + "?15");
IRequestHandler handler = aliasEncoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
assertEquals(PAGE_CLASS_NAME, page.getClass().getSimpleName());
}
-
+
/**
* https://issues.apache.org/jira/browse/WICKET-5565
*/
@Test
- public void testGetCompatibilityScore()
- {
- Url url = Url.parse(MOUNT_PATH + '/' + "MyPage");
- MockWebRequest request = new MockWebRequest(url);
- int score = encoder.getCompatibilityScore(request);
-
- assertEquals(4, score);
-
- url = Url.parse(MOUNT_PATH + "/foo/bar/" + "MyPage");
- request = new MockWebRequest(url);
- score = namedParametersEncoder.getCompatibilityScore(request);
-
- assertEquals(6, score);
+ void testGetCompatibilityScore()
+ {
+ Url url = Url.parse(MOUNT_PATH + '/' + "MyPage");
+ MockWebRequest request = new MockWebRequest(url);
+ int score = encoder.getCompatibilityScore(request);
+
+ assertEquals(4, score);
+
+ url = Url.parse(MOUNT_PATH + "/foo/bar/" + "MyPage");
+ request = new MockWebRequest(url);
+ score = namedParametersEncoder.getCompatibilityScore(request);
+
+ assertEquals(6, score);
+ }
+
+ public static class OuterPage extends MockPage
+ {
+ private static final long serialVersionUID = 1L;
+
+ public static class InnerPage extends MockPage
+ {
+ private static final long serialVersionUID = 1L;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
index 2c99a7b..e2281c8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
@@ -16,10 +16,14 @@
*/
package org.apache.wicket.core.request.mapper;
-import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.nio.charset.Charset;
import java.util.Locale;
+
import org.apache.wicket.MockPage;
import org.apache.wicket.core.request.handler.IPageProvider;
import org.apache.wicket.core.request.handler.IPageRequestHandler;
@@ -32,13 +36,13 @@ import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.component.IRequestableComponent;
import org.apache.wicket.request.component.IRequestablePage;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
* @author Matej Knopp
*/
-public class PageInstanceMapperTest extends AbstractMapperTest
+class PageInstanceMapperTest extends AbstractMapperTest
{
private final PageInstanceMapper encoder = new PageInstanceMapper()
@@ -54,12 +58,12 @@ public class PageInstanceMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode1()
+ void decode1()
{
Url url = Url.parse("wicket/page?4");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
RenderPageRequestHandler h = (RenderPageRequestHandler)handler;
checkPage(h.getPage(), 4);
@@ -69,12 +73,12 @@ public class PageInstanceMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode2()
+ void decode2()
{
Url url = Url.parse("wicket/page?4&a=3&b=3");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
RenderPageRequestHandler h = (RenderPageRequestHandler)handler;
checkPage(h.getPage(), 4);
@@ -84,7 +88,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
*
*/
@Test
- public void ignoreIfPageIdentifierHasSegmentsAfterIt()
+ void ignoreIfPageIdentifierHasSegmentsAfterIt()
{
Url url = Url.parse("wicket/page/ingore/me?4&a=3&b=3");
@@ -96,12 +100,12 @@ public class PageInstanceMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode3()
+ void decode3()
{
Url url = Url.parse("wicket/page?4--a-b-c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
checkPage(h.getPage(), 4);
@@ -113,7 +117,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode4()
+ void decode4()
{
Url url = Url.parse("wickett/pagee?4--a:b-c");
@@ -125,7 +129,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode5()
+ void decode5()
{
Url url = Url.parse("wicket/page?abc");
@@ -137,12 +141,12 @@ public class PageInstanceMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode6()
+ void decode6()
{
Url url = Url.parse("wicket/page?4-ILinkListener.5-a-b-c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
checkPage(h.getPage(), 4);
@@ -154,14 +158,14 @@ public class PageInstanceMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode7()
+ void decode7()
{
Url url = Url.parse("wicket/page?4-6.5-a-b-c");
context.setNextPageRenderCount(6);
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
assertEquals(6, h.getPage().getRenderCount());
@@ -170,8 +174,8 @@ public class PageInstanceMapperTest extends AbstractMapperTest
/**
*
*/
- @Test(expected = StalePageException.class)
- public void decode8()
+ @Test
+ void decode8()
{
Url url = Url.parse("wicket/page?4-6.5-a-b-c");
@@ -179,11 +183,13 @@ public class PageInstanceMapperTest extends AbstractMapperTest
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- ((IPageRequestHandler)handler).getPage();
+ assertThrows(StalePageException.class, () -> {
+ ((IPageRequestHandler)handler).getPage();
+ });
}
@Test
- public void decode9()
+ void decode9()
{
final Url url = Url.parse("page?4");
@@ -228,7 +234,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
@Test
- public void decode10()
+ void decode10()
{
final Url url = Url.parse("page?4");
@@ -275,7 +281,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode1()
+ void encode1()
{
MockPage page = new MockPage(15);
IPageProvider provider = new PageProvider(page);
@@ -290,7 +296,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode2()
+ void encode2()
{
MockPage page = new MockPage(15);
page.setRenderCount(5);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/ResourceMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/ResourceMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/ResourceMapperTest.java
index cc00db8..a31c508 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/ResourceMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/ResourceMapperTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.wicket.core.request.mapper;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import java.nio.charset.Charset;
import java.util.List;
import java.util.Locale;
@@ -31,10 +35,10 @@ import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.request.resource.SharedResourceReference;
import org.apache.wicket.util.string.StringValue;
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;
-public class ResourceMapperTest extends WicketTestCase
+class ResourceMapperTest extends WicketTestCase
{
private static final Charset CHARSET = Charset.forName("UTF-8");
private static final String SHARED_NAME = "test-resource";
@@ -46,8 +50,8 @@ public class ResourceMapperTest extends WicketTestCase
/**
* @throws Exception
*/
- @Before
- public void before() throws Exception
+ @BeforeEach
+ void before() throws Exception
{
resource = new TestResource();
tester.getApplication().getSharedResources().add(SHARED_NAME, resource);
@@ -97,7 +101,7 @@ public class ResourceMapperTest extends WicketTestCase
* testInvalidPathIsEmpty()
*/
@Test
- public void invalidPathIsEmpty()
+ void invalidPathIsEmpty()
{
IRequestHandler requestHandler = mapper.mapRequest(createRequest(""));
assertNull(requestHandler);
@@ -107,7 +111,7 @@ public class ResourceMapperTest extends WicketTestCase
* testInvalidPathIsMismatch()
*/
@Test
- public void invalidPathIsMismatch()
+ void invalidPathIsMismatch()
{
IRequestHandler requestHandler = mapper.mapRequest(createRequest("test/resourcex"));
assertNull(requestHandler);
@@ -117,7 +121,7 @@ public class ResourceMapperTest extends WicketTestCase
* testInvalidPathIsTooShort()
*/
@Test
- public void invalidPathIsTooShort()
+ void invalidPathIsTooShort()
{
IRequestHandler requestHandler = mapper.mapRequest(createRequest("test"));
assertNull(requestHandler);
@@ -127,7 +131,7 @@ public class ResourceMapperTest extends WicketTestCase
* testValidPathWithParams()
*/
@Test
- public void validPathWithParams()
+ void validPathWithParams()
{
Request request = createRequest("test/resource/1/fred");
IRequestHandler requestHandler = mapper.mapRequest(request);
@@ -154,7 +158,7 @@ public class ResourceMapperTest extends WicketTestCase
* testValidPathWithParamsAndQueryPath()
*/
@Test
- public void validPathWithParamsAndQueryPath()
+ void validPathWithParamsAndQueryPath()
{
Request request = createRequest("test/resource/1/fred?foo=bar&foo=baz&value=12");
IRequestHandler requestHandler = mapper.mapRequest(request);
@@ -189,7 +193,7 @@ public class ResourceMapperTest extends WicketTestCase
* testPlaceholders()
*/
@Test
- public void placeholders()
+ void placeholders()
{
Request request = createRequest("test2/image/resource/foo/bar?a=abc&b=123");
IRequestHandler requestHandler = mapperWithPlaceholder.mapRequest(request);
@@ -215,7 +219,7 @@ public class ResourceMapperTest extends WicketTestCase
* testPlaceholdersWithQueryParamDuplicate()
*/
@Test
- public void placeholdersWithQueryParamDuplicate()
+ void placeholdersWithQueryParamDuplicate()
{
// we have one named parameter that exists twice
Request request = createRequest("test2/image/resource/foo/bar?name=name-2&val=123");
@@ -251,7 +255,7 @@ public class ResourceMapperTest extends WicketTestCase
*
*/
@Test
- public void requestWithEmptyFilename()
+ void requestWithEmptyFilename()
{
// request invalid path with empty filename
// this must not return a handler
@@ -264,7 +268,7 @@ public class ResourceMapperTest extends WicketTestCase
{
private static final long serialVersionUID = -3130204487473856574L;
- public PageParameters pageParameters;
+ PageParameters pageParameters;
@Override
public void respond(Attributes attributes)
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/ResourceMapperWithDecoratedResourcesTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/ResourceMapperWithDecoratedResourcesTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/ResourceMapperWithDecoratedResourcesTest.java
index 6cacfbb..72b73e8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/ResourceMapperWithDecoratedResourcesTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/ResourceMapperWithDecoratedResourcesTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.core.request.mapper;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.protocol.http.request.HomePage;
@@ -24,38 +26,44 @@ import org.apache.wicket.request.resource.caching.FilenameWithVersionResourceCac
import org.apache.wicket.request.resource.caching.version.CachingResourceVersion;
import org.apache.wicket.request.resource.caching.version.MessageDigestResourceVersion;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Assert;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Simple test using the WicketTester
*/
-public class ResourceMapperWithDecoratedResourcesTest extends WicketTestCase {
+class ResourceMapperWithDecoratedResourcesTest extends WicketTestCase
+{
@Override
- protected WebApplication newApplication() {
- return new MockApplication() {
+ protected WebApplication newApplication()
+ {
+ return new MockApplication()
+ {
@Override
- public void init() {
+ public void init()
+ {
super.init();
- getResourceSettings().setCachingStrategy(new FilenameWithVersionResourceCachingStrategy(
+ getResourceSettings()
+ .setCachingStrategy(new FilenameWithVersionResourceCachingStrategy(
new CachingResourceVersion(new MessageDigestResourceVersion())));
- mountResource("stylesheet.css", new CssResourceReference(ResourceMapperWithDecoratedResourcesTest.class, "decorated-resource.css"));
+ mountResource("stylesheet.css", new CssResourceReference(
+ ResourceMapperWithDecoratedResourcesTest.class, "decorated-resource.css"));
mountPage("/", HomePage.class);
}
};
}
@Test
- public void resourceNoCacheDecorationSuccessfully() {
+ void resourceNoCacheDecorationSuccessfully()
+ {
tester.executeUrl("stylesheet.css");
- Assert.assertEquals("body { background-color: lightblue; }", tester.getLastResponseAsString());
+ assertEquals("body { background-color: lightblue; }", tester.getLastResponseAsString());
}
-
+
@Test
- public void resourceWithCacheDecorationSuccessfully() {
+ void resourceWithCacheDecorationSuccessfully()
+ {
tester.executeUrl("stylesheet-ver-9876543210.css");
- Assert.assertEquals("body { background-color: lightblue; }", tester.getLastResponseAsString());
+ assertEquals("body { background-color: lightblue; }", tester.getLastResponseAsString());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java
index 15518c6..2fff6cc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java
@@ -43,10 +43,10 @@ public class TestMapperContext implements IMapperContext
{
private static final String APP_NAME = "test_app";
private static int count;
- IDataStore dataStore;
- IPageStore pageStore;
- IPageManagerContext pageManagerContext;
- PageStoreManager pageManager;
+ private IDataStore dataStore;
+ private IPageStore pageStore;
+ private IPageManagerContext pageManagerContext;
+ private PageStoreManager pageManager;
private String appName;
private boolean createMockPageIfInstanceNotFound = true;
@@ -175,7 +175,7 @@ public class TestMapperContext implements IMapperContext
}
- int idCounter = 0;
+ private int idCounter = 0;
@Override
public IRequestablePage newPageInstance(Class<? extends IRequestablePage> pageClass,
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/UrlInfoTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/UrlInfoTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/UrlInfoTest.java
index 1014f52..5e2fc1f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/UrlInfoTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/UrlInfoTest.java
@@ -16,24 +16,25 @@
*/
package org.apache.wicket.core.request.mapper;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import org.apache.wicket.MockPage;
import org.apache.wicket.core.request.mapper.AbstractBookmarkableMapper.UrlInfo;
import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link UrlInfo}
*/
-public class UrlInfoTest extends Assert
+class UrlInfoTest
{
/**
* WICKET-4038 & WICKET-4054
*/
@Test
- public void wicket4038()
+ void wicket4038()
{
PageParameters parameters = new PageParameters();
parameters.add(WebRequest.PARAM_AJAX, "true");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/util/license/ApacheLicenceHeaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/util/license/ApacheLicenceHeaderTest.java b/wicket-core/src/test/java/org/apache/wicket/core/util/license/ApacheLicenceHeaderTest.java
index b627374..96e6633 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/util/license/ApacheLicenceHeaderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/util/license/ApacheLicenceHeaderTest.java
@@ -25,12 +25,12 @@ import org.apache.wicket.util.license.ApacheLicenseHeaderTestCase;
*
* @author Frank Bille Jensen (frankbille)
*/
-public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase
+class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase
{
/**
* Construct.
*/
- public ApacheLicenceHeaderTest()
+ ApacheLicenceHeaderTest()
{
// addHeaders = true;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/AbstractObjectCheckerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/AbstractObjectCheckerTest.java b/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/AbstractObjectCheckerTest.java
index 20cd873..468a885 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/AbstractObjectCheckerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/AbstractObjectCheckerTest.java
@@ -16,19 +16,20 @@
*/
package org.apache.wicket.core.util.objects.checker;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.Collections;
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for AbstractObjectChecker
*/
-public class AbstractObjectCheckerTest extends Assert
+class AbstractObjectCheckerTest
{
@Test
- public void doCheckIsNotCalledForExcludedTypes()
+ void doCheckIsNotCalledForExcludedTypes()
{
List<Class<?>> exclusions = Collections.singletonList(CharSequence.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/DifferentPageCheckerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/DifferentPageCheckerTest.java b/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/DifferentPageCheckerTest.java
index 8752d2d..f31e6f1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/DifferentPageCheckerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/DifferentPageCheckerTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.core.util.objects.checker;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.io.OutputStream;
@@ -27,9 +29,9 @@ import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.markup.html.form.login.MockHomePage;
import org.apache.wicket.serialize.java.JavaSerializer;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class DifferentPageCheckerTest extends WicketTestCase
+class DifferentPageCheckerTest extends WicketTestCase
{
/**
* https://issues.apache.org/jira/browse/WICKET-5634
@@ -39,7 +41,7 @@ public class DifferentPageCheckerTest extends WicketTestCase
* keeps a reference to a page which is not component.getPage()..
*/
@Test
- public void serializingAnotherPage()
+ void serializingAnotherPage()
{
JavaSerializer serializer = new JavaSerializer("JavaSerializerTest")
{
@@ -55,7 +57,7 @@ public class DifferentPageCheckerTest extends WicketTestCase
MockPageWithLink rootPage = new MockPageWithLink();
rootPage.add(component);
byte[] serialized = serializer.serialize(rootPage);
- assertNull("The produced byte[] must be null if there was an error", serialized);
+ assertNull(serialized, "The produced byte[] must be null if there was an error");
}
private static class ComponentThatKeepsAReferenceToAnotherPage extends WebComponent
@@ -64,7 +66,7 @@ public class DifferentPageCheckerTest extends WicketTestCase
private final Page anotherPage = new MockHomePage();
};
- public ComponentThatKeepsAReferenceToAnotherPage(final String id)
+ ComponentThatKeepsAReferenceToAnotherPage(final String id)
{
super(id);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/OrphanComponentCheckerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/OrphanComponentCheckerTest.java b/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/OrphanComponentCheckerTest.java
index 96c9df7..89a9566 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/OrphanComponentCheckerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/OrphanComponentCheckerTest.java
@@ -16,19 +16,21 @@
*/
package org.apache.wicket.core.util.objects.checker;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.TestPage_1;
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for OrphanComponentChecker
*/
-public class OrphanComponentCheckerTest extends WicketTestCase
+class OrphanComponentCheckerTest extends WicketTestCase
{
@Test
- public void checkOrphanComponent()
+ void checkOrphanComponent()
{
WebComponent component = new WebComponent("a");
IObjectChecker checker = new OrphanComponentChecker();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/SessionCheckerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/SessionCheckerTest.java b/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/SessionCheckerTest.java
index 94e8ea7..2b6eb5d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/SessionCheckerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/SessionCheckerTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.core.util.objects.checker;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.io.OutputStream;
@@ -29,9 +31,9 @@ import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.request.Url;
import org.apache.wicket.serialize.java.JavaSerializer;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class SessionCheckerTest extends WicketTestCase
+class SessionCheckerTest extends WicketTestCase
{
/**
* https://issues.apache.org/jira/browse/WICKET-5634
@@ -41,7 +43,7 @@ public class SessionCheckerTest extends WicketTestCase
* keeps a reference to the Wicket Session.
*/
@Test
- public void serializingTheSession()
+ void serializingTheSession()
{
JavaSerializer serializer = new JavaSerializer("JavaSerializerTest")
{
@@ -59,14 +61,14 @@ public class SessionCheckerTest extends WicketTestCase
container.add(new ComponentWithAReferenceToTheSession("id2"));
byte[] serialized = serializer.serialize(container);
- assertNull("The produced byte[] must be null if there was an error", serialized);
+ assertNull(serialized, "The produced byte[] must be null if there was an error");
}
private static class ComponentWithAReferenceToTheSession extends WebComponent
{
private final Session member = new WebSession(new MockWebRequest(Url.parse("")));
- public ComponentWithAReferenceToTheSession(final String id)
+ ComponentWithAReferenceToTheSession(final String id)
{
super(id);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/util/resource/ClassPathResourceFinderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/util/resource/ClassPathResourceFinderTest.java b/wicket-core/src/test/java/org/apache/wicket/core/util/resource/ClassPathResourceFinderTest.java
index 3167209..74044f8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/util/resource/ClassPathResourceFinderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/util/resource/ClassPathResourceFinderTest.java
@@ -16,19 +16,21 @@
*/
package org.apache.wicket.core.util.resource;
-import static org.apache.wicket.util.resource.ResourceStreamLocatorTest.*;
+import static org.apache.wicket.util.resource.ResourceStreamLocatorTest.getFilename;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.File;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class ClassPathResourceFinderTest extends WicketTestCase
+class ClassPathResourceFinderTest extends WicketTestCase
{
@Test
- public void loadStartingFromClasspathRoot() throws Exception
+ void loadStartingFromClasspathRoot() throws Exception
{
ClassPathResourceFinder finder = new ClassPathResourceFinder("");
String filename = ClassPathResourceFinderTest.class.getName().replace('.',
@@ -40,7 +42,7 @@ public class ClassPathResourceFinderTest extends WicketTestCase
}
@Test
- public void loadStartingFromPrefix() throws Exception
+ void loadStartingFromPrefix() throws Exception
{
ClassPathResourceFinder finder = new ClassPathResourceFinder(
ClassPathResourceFinderTest.class.getPackage()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/util/string/CssUtilsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/util/string/CssUtilsTest.java b/wicket-core/src/test/java/org/apache/wicket/core/util/string/CssUtilsTest.java
index 696953b..4598d66 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/util/string/CssUtilsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/util/string/CssUtilsTest.java
@@ -16,14 +16,15 @@
*/
package org.apache.wicket.core.util.string;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.response.StringResponse;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @since 1.5.7
*/
-public class CssUtilsTest extends Assert
+class CssUtilsTest
{
/**
* https://issues.apache.org/jira/browse/WICKET-4546
@@ -31,7 +32,7 @@ public class CssUtilsTest extends Assert
* @throws Exception
*/
@Test
- public void writeLinkUrl() throws Exception
+ void writeLinkUrl() throws Exception
{
StringResponse response = new StringResponse();
String url = "some/url;jsessionid=1234?with=parameters&p1=v1";
[03/45] wicket git commit: removed import, added some imports
Posted by mg...@apache.org.
removed import, added some imports
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9afecd50
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9afecd50
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9afecd50
Branch: refs/heads/master
Commit: 9afecd504a78d8f980388f4067ecec4f8bcc570f
Parents: 978ea5c
Author: renoth <jo...@gmx.de>
Authored: Tue Jul 31 12:45:28 2018 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 26 15:36:17 2018 +0300
----------------------------------------------------------------------
.../markup/xhtml/WellFormedXmlTestCase.java | 1 -
.../util/convert/converters/ConvertersTest.java | 22 ++++++--------------
.../wicket/util/io/FullyBufferedReaderTest.java | 15 ++++---------
3 files changed, 10 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/9afecd50/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java b/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
index bf330de..1ad3a27 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
@@ -17,7 +17,6 @@
package org.apache.wicket.util.markup.xhtml;
import org.junit.jupiter.api.Test;
-import org.testng.annotations.Test;
import org.xml.sax.*;
import javax.xml.parsers.DocumentBuilder;
http://git-wip-us.apache.org/repos/asf/wicket/blob/9afecd50/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java b/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
index b520a72..0f4d69c 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
@@ -16,10 +16,6 @@
*/
package org.apache.wicket.util.convert.converters;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
import java.math.BigDecimal;
import java.text.ChoiceFormat;
import java.text.NumberFormat;
@@ -28,18 +24,12 @@ import java.util.Date;
import java.util.Locale;
import org.apache.wicket.util.convert.ConversionException;
-import org.apache.wicket.util.convert.converter.BigDecimalConverter;
-import org.apache.wicket.util.convert.converter.BooleanConverter;
-import org.apache.wicket.util.convert.converter.ByteConverter;
-import org.apache.wicket.util.convert.converter.CalendarConverter;
-import org.apache.wicket.util.convert.converter.CharacterConverter;
-import org.apache.wicket.util.convert.converter.DateConverter;
-import org.apache.wicket.util.convert.converter.DoubleConverter;
-import org.apache.wicket.util.convert.converter.FloatConverter;
-import org.apache.wicket.util.convert.converter.IntegerConverter;
-import org.apache.wicket.util.convert.converter.LongConverter;
-import org.apache.wicket.util.convert.converter.ShortConverter;
-import org.junit.Test;
+import org.apache.wicket.util.convert.converter.*;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
@SuppressWarnings("javadoc")
public final class ConvertersTest
http://git-wip-us.apache.org/repos/asf/wicket/blob/9afecd50/wicket-util/src/test/java/org/apache/wicket/util/io/FullyBufferedReaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/io/FullyBufferedReaderTest.java b/wicket-util/src/test/java/org/apache/wicket/util/io/FullyBufferedReaderTest.java
index d2f1738..d9fef49 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/io/FullyBufferedReaderTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/io/FullyBufferedReaderTest.java
@@ -18,15 +18,14 @@ package org.apache.wicket.util.io;
import java.text.ParseException;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Tests for {@link FullyBufferedReader}
*/
-public class FullyBufferedReaderTest extends Assert
+public class FullyBufferedReaderTest
{
/**
@@ -70,12 +69,6 @@ public class FullyBufferedReaderTest extends Assert
}
/**
- * A rule for expecting ParseExceptions
- */
- @Rule
- public ExpectedException thrown = ExpectedException.none();
-
- /**
* https://issues.apache.org/jira/browse/WICKET-4117
*
* Test exception when we forgot to close quote
[15/45] wicket git commit: wicket-core: Migrate to Junit 5
Posted by mg...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/CsrfPreventionRequestCycleListenerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/CsrfPreventionRequestCycleListenerTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/CsrfPreventionRequestCycleListenerTest.java
index 9882bd6..3fd010e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/CsrfPreventionRequestCycleListenerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/CsrfPreventionRequestCycleListenerTest.java
@@ -17,6 +17,8 @@
package org.apache.wicket.protocol.http;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import javax.servlet.http.HttpServletRequest;
@@ -26,20 +28,20 @@ import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.http.WebRequest;
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;
/**
* Test cases for the CsrfPreventionRequestCycleListener. FirstPage has a link that when clicked
* should render SecondPage.
*/
-public class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
+class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
{
/**
* Sets up the test cases. Installs the CSRF listener and renders the FirstPage.
*/
- @Before
- public void startWithFirstPageRender()
+ @BeforeEach
+ void startWithFirstPageRender()
{
WebApplication application = tester.getApplication();
@@ -59,7 +61,7 @@ public class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
/** Tests that disabling the CSRF listener doesn't check Origin headers. */
@Test
- public void disabledListenerDoesntCheckAnything()
+ void disabledListenerDoesntCheckAnything()
{
csrfEnabled = false;
tester.clickLink("link");
@@ -70,7 +72,7 @@ public class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
/** Tests that disabling the CSRF listener doesn't check Origin headers. */
@Test
- public void disabledListenerDoesntCheckMismatchedOrigin()
+ void disabledListenerDoesntCheckMismatchedOrigin()
{
csrfEnabled = false;
tester.addRequestHeader(WebRequest.HEADER_ORIGIN, "http://malicioussite.com/");
@@ -81,7 +83,7 @@ public class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
/** Tests the default setting of aborting a missing Origin. */
@Test
- public void withoutOriginAllowed()
+ void withoutOriginAllowed()
{
csrfListener.setNoOriginAction(CsrfAction.ALLOW);
tester.addRequestHeader(WebRequest.HEADER_ORIGIN, null);
@@ -91,7 +93,7 @@ public class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
/** Tests the alternative action of suppressing a request without Origin header */
@Test
- public void withoutOriginSuppressed()
+ void withoutOriginSuppressed()
{
csrfListener.setNoOriginAction(CsrfAction.SUPPRESS);
tester.addRequestHeader(WebRequest.HEADER_ORIGIN, null);
@@ -102,7 +104,7 @@ public class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
/** Tests the alternative action of aborting a request without Origin header */
@Test
- public void withoutOriginAborted()
+ void withoutOriginAborted()
{
csrfListener.setNoOriginAction(CsrfAction.ABORT);
tester.addRequestHeader(WebRequest.HEADER_ORIGIN, null);
@@ -112,7 +114,7 @@ public class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
/** Tests when the Origin header matches the request. */
@Test
- public void matchingOriginsAllowed()
+ void matchingOriginsAllowed()
{
csrfListener.setConflictingOriginAction(CsrfAction.ALLOW);
tester.addRequestHeader(WebRequest.HEADER_ORIGIN, "http://localhost/");
@@ -125,7 +127,7 @@ public class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
/** Tests when the default action is changed to ALLOW when origins conflict. */
@Test
- public void conflictingOriginsAllowed()
+ void conflictingOriginsAllowed()
{
csrfListener.setConflictingOriginAction(CsrfAction.ALLOW);
tester.addRequestHeader(WebRequest.HEADER_ORIGIN, "http://example.com/");
@@ -138,7 +140,7 @@ public class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
/** Tests when the default action is changed to SUPPRESS when origins conflict. */
@Test
- public void conflictingOriginsSuppressed()
+ void conflictingOriginsSuppressed()
{
tester.addRequestHeader(WebRequest.HEADER_ORIGIN, "http://example.com/");
csrfListener.setConflictingOriginAction(CsrfAction.SUPPRESS);
@@ -151,7 +153,7 @@ public class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
/** Tests the default action to ABORT when origins conflict. */
@Test
- public void conflictingOriginsAborted()
+ void conflictingOriginsAborted()
{
tester.addRequestHeader(WebRequest.HEADER_ORIGIN, "http://example.com/");
@@ -162,7 +164,7 @@ public class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
/** Tests custom error code/message when the default action is ABORT. */
@Test
- public void conflictingOriginsAbortedWith401Unauhorized()
+ void conflictingOriginsAbortedWith401Unauhorized()
{
setErrorCode(401);
setErrorMessage("NOT AUTHORIZED");
@@ -177,7 +179,7 @@ public class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
/** Tests whitelisting for conflicting origins. */
@Test
- public void conflictingButWhitelistedOriginAllowed()
+ void conflictingButWhitelistedOriginAllowed()
{
csrfListener.setConflictingOriginAction(CsrfAction.ALLOW);
csrfListener.addAcceptedOrigin("example.com");
@@ -191,7 +193,7 @@ public class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
/** Tests whitelisting with conflicting subdomain origin. */
@Test
- public void conflictingButWhitelistedSubdomainOriginAllowed()
+ void conflictingButWhitelistedSubdomainOriginAllowed()
{
csrfListener.addAcceptedOrigin("example.com");
csrfListener.setConflictingOriginAction(CsrfAction.ALLOW);
@@ -209,7 +211,7 @@ public class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
* {@link CsrfPreventionRequestCycleListener#isChecked(IRequestablePage)})
*/
@Test
- public void conflictingOriginPageNotCheckedAllowed()
+ void conflictingOriginPageNotCheckedAllowed()
{
tester.addRequestHeader(WebRequest.HEADER_ORIGIN, "http://example.com/");
csrfListener.setConflictingOriginAction(CsrfAction.ABORT);
@@ -225,7 +227,7 @@ public class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
/** Tests overriding the onSuppressed method for a conflicting origin. */
@Test
- public void conflictingOriginSuppressedCallsCustomHandler()
+ void conflictingOriginSuppressedCallsCustomHandler()
{
// redirect to third page to ensure we are not suppressed to the first page, nor that the
// request was not suppressed and the second page was rendered erroneously
@@ -251,7 +253,7 @@ public class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
/** Tests overriding the onAllowed method for a conflicting origin. */
@Test
- public void conflictingOriginAllowedCallsCustomHandler()
+ void conflictingOriginAllowedCallsCustomHandler()
{
// redirect to third page to ensure we are not suppressed to the first page, nor that the
// request was not allowed and the second page was rendered erroneously
@@ -277,7 +279,7 @@ public class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
/** Tests overriding the onAborted method for a conflicting origin. */
@Test
- public void conflictingOriginAbortedCallsCustomHandler()
+ void conflictingOriginAbortedCallsCustomHandler()
{
// redirect to third page to ensure we are not suppressed to the first page, nor that the
// request was not aborted and the second page was rendered erroneously
@@ -308,7 +310,7 @@ public class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
/** Tests whether a different port, but same scheme and hostname is considered a conflict. */
@Test
- public void differentPortOriginAborted()
+ void differentPortOriginAborted()
{
tester.addRequestHeader(WebRequest.HEADER_ORIGIN, "http://localhost:8080");
csrfListener.setConflictingOriginAction(CsrfAction.ABORT);
@@ -320,7 +322,7 @@ public class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
/** Tests whether a different scheme, but same port and hostname is considered a conflict. */
@Test
- public void differentSchemeOriginAborted()
+ void differentSchemeOriginAborted()
{
tester.addRequestHeader(WebRequest.HEADER_ORIGIN, "https://localhost");
csrfListener.setConflictingOriginAction(CsrfAction.ABORT);
@@ -332,7 +334,7 @@ public class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
/** Tests whether only the hostname is considered when matching the Origin header. */
@Test
- public void longerOriginAllowed()
+ void longerOriginAllowed()
{
tester.addRequestHeader(WebRequest.HEADER_ORIGIN, "http://localhost/supercalifragilisticexpialidocious");
csrfListener.setConflictingOriginAction(CsrfAction.ABORT);
@@ -345,7 +347,7 @@ public class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
/** Tests whether AJAX Links are checked through the CSRF listener */
@Test
- public void simulatedCsrfAttackThroughAjaxIsPrevented()
+ void simulatedCsrfAttackThroughAjaxIsPrevented()
{
csrfListener.setConflictingOriginAction(CsrfAction.ABORT);
@@ -365,7 +367,7 @@ public class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
/** Tests whether AJAX Links are checked through the CSRF listener */
@Test
- public void simulatedCsrfAttackIsSuppressed()
+ void simulatedCsrfAttackIsSuppressed()
{
csrfListener.setConflictingOriginAction(CsrfAction.SUPPRESS);
@@ -386,7 +388,7 @@ public class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
/** Tests whether form submits are checked through the CSRF listener */
@Test
- public void simulatedCsrfAttackOnFormIsSuppressed()
+ void simulatedCsrfAttackOnFormIsSuppressed()
{
csrfListener.setConflictingOriginAction(CsrfAction.SUPPRESS);
@@ -445,7 +447,7 @@ public class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
csrfListener.setErrorCode(errorCode);
}
- private void setCustomRequestHandlerCheck(Predicate<IRequestHandler> check)
+ void setCustomRequestHandlerCheck(Predicate<IRequestHandler> check)
{
this.customRequestHandlerCheck = check;
}
@@ -471,12 +473,12 @@ public class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
this.suppressHandler = suppressHandler;
}
- private void setWhitelistHandler(Runnable whitelistHandler)
+ void setWhitelistHandler(Runnable whitelistHandler)
{
this.whitelistHandler = whitelistHandler;
}
- private void setMatchedHandler(Runnable matchedHandler)
+ void setMatchedHandler(Runnable matchedHandler)
{
this.matchedHandler = matchedHandler;
}
@@ -508,7 +510,7 @@ public class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
if (!aborted)
throw new AssertionError("Request was not aborted");
- assertThat("Response error code", tester.getLastResponse().getStatus(), is(errorCode));
+ assertEquals(errorCode, tester.getLastResponse().getStatus(), "Response error code");
assertThat("Response error message", tester.getLastResponse().getErrorMessage(),
is(errorMessage));
}
@@ -534,7 +536,7 @@ public class CsrfPreventionRequestCycleListenerTest extends WicketTestCase
/**
* Asserts that the origins were checked and found non-conflicting.
*/
- private void assertOriginsCheckedButNotConflicting()
+ void assertOriginsCheckedButNotConflicting()
{
if (aborted)
throw new AssertionError("Origin was checked and aborted");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/HeaderBufferingWebResponseTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/HeaderBufferingWebResponseTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/HeaderBufferingWebResponseTest.java
index 1383b4b..cb01b2f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/HeaderBufferingWebResponseTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/HeaderBufferingWebResponseTest.java
@@ -16,24 +16,26 @@
*/
package org.apache.wicket.protocol.http;
-import org.apache.wicket.mock.MockWebResponse;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.apache.wicket.mock.MockWebResponse;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link HeaderBufferingWebResponse}.
*
* @author svenmeier
*/
-public class HeaderBufferingWebResponseTest extends Assert
+class HeaderBufferingWebResponseTest
{
/**
* WICKET-4927
*/
@Test
- public void additionalHeaderAfterWrittenContent()
+ void additionalHeaderAfterWrittenContent()
{
MockWebResponse originalResponse = new MockWebResponse();
@@ -55,7 +57,7 @@ public class HeaderBufferingWebResponseTest extends Assert
/**
*/
@Test
- public void resetAfterWrittenContent()
+ void resetAfterWrittenContent()
{
MockWebResponse originalResponse = new MockWebResponse();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/ModifyCookiePageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/ModifyCookiePageTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/ModifyCookiePageTest.java
index 58f3843..768da40 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/ModifyCookiePageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/ModifyCookiePageTest.java
@@ -16,23 +16,25 @@
*/
package org.apache.wicket.protocol.http;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import java.util.List;
import javax.servlet.http.Cookie;
import org.apache.wicket.protocol.http.mock.MockHttpServletResponse;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*/
-public class ModifyCookiePageTest extends WicketTestCase
+class ModifyCookiePageTest extends WicketTestCase
{
/**
* testSetCookieWithinLinkListener()
*/
@Test
- public void testSetCookieWithinLinkListener()
+ void testSetCookieWithinLinkListener()
{
// render page
tester.startPage(ModifyCookiePage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/RequestLoggerLiveSessionsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/RequestLoggerLiveSessionsTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/RequestLoggerLiveSessionsTest.java
index edbc552..96bbe04 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/RequestLoggerLiveSessionsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/RequestLoggerLiveSessionsTest.java
@@ -16,28 +16,29 @@
*/
package org.apache.wicket.protocol.http;
-import org.apache.wicket.util.SlowTests;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.ArrayList;
import java.util.Random;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.wicket.util.WicketTestTag;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
/**
* Test for https://issues.apache.org/jira/browse/WICKET-6169
*/
-@Category(SlowTests.class)
-public class RequestLoggerLiveSessionsTest
+@Tag(WicketTestTag.SLOW)
+class RequestLoggerLiveSessionsTest
{
private final RequestLogger requestLogger = new RequestLogger();
private final ArrayList<String> sessionIds = new ArrayList<>();
@Test
- public void concurrentModification() {
+ void concurrentModification() {
SessionCreateThread sct = new SessionCreateThread();
SessionDestroyThread sdt = new SessionDestroyThread();
sct.start();
@@ -63,7 +64,7 @@ public class RequestLoggerLiveSessionsTest
sdt.interrupt();
if (nullPointerExceptionThrown.get()) {
- Assert.fail("The test should not fail with NullPointerException");
+ fail("The test should not fail with NullPointerException");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/RequestUtilsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/RequestUtilsTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/RequestUtilsTest.java
index 4c41951..80da4ed 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/RequestUtilsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/RequestUtilsTest.java
@@ -16,27 +16,28 @@
*/
package org.apache.wicket.protocol.http;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.nio.charset.Charset;
import org.apache.wicket.protocol.http.mock.MockHttpServletRequest;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
* @author Johan
*/
-public class RequestUtilsTest extends Assert
+class RequestUtilsTest
{
- public static final Charset UTF_8_CHARSET = Charset.forName("UTF-8");
+ private static final Charset UTF_8_CHARSET = Charset.forName("UTF-8");
/**
*
*/
@Test
- public void doubleDotsMiddle()
+ void doubleDotsMiddle()
{
assertEquals("/a/b", RequestUtils.removeDoubleDots("/a/b/../b"));
assertEquals("a/b", RequestUtils.removeDoubleDots("a/b/../b"));
@@ -47,7 +48,7 @@ public class RequestUtilsTest extends Assert
*
*/
@Test
- public void doubleDotsEnd()
+ void doubleDotsEnd()
{
assertEquals("/a/b", RequestUtils.removeDoubleDots("/a/b/c/.."));
assertEquals("a/b", RequestUtils.removeDoubleDots("a/b/c/.."));
@@ -57,7 +58,7 @@ public class RequestUtilsTest extends Assert
*
*/
@Test
- public void doubleDotsStart()
+ void doubleDotsStart()
{
assertEquals("/../a/b", RequestUtils.removeDoubleDots("/../a/b"));
assertEquals("../a/b", RequestUtils.removeDoubleDots("../a/b"));
@@ -67,7 +68,7 @@ public class RequestUtilsTest extends Assert
*
*/
@Test
- public void emptyDoubleDots()
+ void emptyDoubleDots()
{
assertEquals("", RequestUtils.removeDoubleDots(""));
}
@@ -76,7 +77,7 @@ public class RequestUtilsTest extends Assert
*
*/
@Test
- public void oneDoubleDots()
+ void oneDoubleDots()
{
assertEquals("..", RequestUtils.removeDoubleDots(".."));
assertEquals("../", RequestUtils.removeDoubleDots("../"));
@@ -87,7 +88,7 @@ public class RequestUtilsTest extends Assert
*
*/
@Test
- public void toAbsolutePath()
+ void toAbsolutePath()
{
assertEquals(RequestUtils.toAbsolutePath("http://aif.ru/test/test", "../blah/zzz"),
"http://aif.ru/blah/zzz");
@@ -109,7 +110,7 @@ public class RequestUtilsTest extends Assert
* WICKET-4664 - remove leading ? if present
*/
@Test
- public void removeLeadingQuestionMark_simpleParam()
+ void removeLeadingQuestionMark_simpleParam()
{
final PageParameters params = new PageParameters();
RequestUtils.decodeParameters("?key=value", params, UTF_8_CHARSET);
@@ -120,7 +121,7 @@ public class RequestUtilsTest extends Assert
* WICKET-4664 - remove leading ? if present
*/
@Test
- public void removeLeadingQuestionMark_simpleParamWithoutValueAndAnotherParam()
+ void removeLeadingQuestionMark_simpleParamWithoutValueAndAnotherParam()
{
final PageParameters params = new PageParameters();
RequestUtils.decodeParameters("?123&key=value", params, UTF_8_CHARSET);
@@ -132,7 +133,7 @@ public class RequestUtilsTest extends Assert
* WICKET-4664 - remove leading ? if present
*/
@Test
- public void removeLeadingQuestionMark_simpleParamWithoutValue()
+ void removeLeadingQuestionMark_simpleParamWithoutValue()
{
final PageParameters params = new PageParameters();
RequestUtils.decodeParameters("?123", params, UTF_8_CHARSET);
@@ -143,7 +144,7 @@ public class RequestUtilsTest extends Assert
*
*/
@Test
- public void decodeParam_simpleParam_noQuestionMark()
+ void decodeParam_simpleParam_noQuestionMark()
{
final PageParameters params = new PageParameters();
RequestUtils.decodeParameters("key=value", params, UTF_8_CHARSET);
@@ -154,7 +155,7 @@ public class RequestUtilsTest extends Assert
*
*/
@Test
- public void decodeParam_simpleParamWithoutValueAndAnotherParam_NoQuestionMark()
+ void decodeParam_simpleParamWithoutValueAndAnotherParam_NoQuestionMark()
{
final PageParameters params = new PageParameters();
RequestUtils.decodeParameters("123&key=value", params, UTF_8_CHARSET);
@@ -166,7 +167,7 @@ public class RequestUtilsTest extends Assert
*
*/
@Test
- public void decodeParam_simpleParamWithoutValue_NoQuestionMark()
+ void decodeParam_simpleParamWithoutValue_NoQuestionMark()
{
final PageParameters params = new PageParameters();
RequestUtils.decodeParameters("123", params, UTF_8_CHARSET);
@@ -175,7 +176,7 @@ public class RequestUtilsTest extends Assert
@Test
- public void charset() throws Exception
+ void charset() throws Exception
{
MockHttpServletRequest request = new MockHttpServletRequest(null, null, null);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/ResponseIOExceptionTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/ResponseIOExceptionTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/ResponseIOExceptionTest.java
index 7c93956..44088a8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/ResponseIOExceptionTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/ResponseIOExceptionTest.java
@@ -16,10 +16,9 @@
*/
package org.apache.wicket.protocol.http;
-import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.assertj.core.api.Assertions.assertThat;
import java.net.SocketException;
-
import javax.servlet.http.HttpServletResponse;
import org.apache.wicket.protocol.http.servlet.ResponseIOException;
@@ -33,24 +32,22 @@ import org.apache.wicket.request.handler.EmptyRequestHandler;
import org.apache.wicket.request.resource.ResourceStreamResource;
import org.apache.wicket.util.resource.StringResourceStream;
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;
/**
* @author Pedro Santos
*/
-public class ResponseIOExceptionTest extends Assert
+class ResponseIOExceptionTest
{
private WicketTester tester;
/**
* @throws Exception
*/
- @Before
- public void before() throws Exception
+ @BeforeEach
+ void before() throws Exception
{
tester = new WicketTester()
{
@@ -66,8 +63,8 @@ public class ResponseIOExceptionTest extends Assert
/**
* @throws Exception
*/
- @After
- public void after() throws Exception
+ @AfterEach
+ void after() throws Exception
{
tester.destroy();
}
@@ -76,13 +73,12 @@ public class ResponseIOExceptionTest extends Assert
* WICKET-3570
*/
@Test
- public void giveUpRespondingOnIOExceptions()
+ void giveUpRespondingOnIOExceptions()
{
TestRequestCycleListener testRequestCycleListener = new TestRequestCycleListener();
tester.getApplication().getRequestCycleListeners().add(testRequestCycleListener);
tester.startResource(new ResourceStreamResource(new StringResourceStream("asdf")));
- assertThat(testRequestCycleListener.lastExceptionRequestHandlerResolved,
- instanceOf(EmptyRequestHandler.class));
+ assertThat(testRequestCycleListener.lastExceptionRequestHandlerResolved).isInstanceOf(EmptyRequestHandler.class);
}
static class TestRequestCycleListener implements IRequestCycleListener
@@ -100,15 +96,15 @@ public class ResponseIOExceptionTest extends Assert
/**
* Mock response simulating connection lost problems.
*/
- public static class ProblematicResponse extends ServletWebResponse
+ static class ProblematicResponse extends ServletWebResponse
{
/**
* @param webRequest
* @param httpServletResponse
*/
- public ProblematicResponse(ServletWebRequest webRequest,
- HttpServletResponse httpServletResponse)
+ ProblematicResponse(ServletWebRequest webRequest,
+ HttpServletResponse httpServletResponse)
{
super(webRequest, httpServletResponse);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/SessionDestroyTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/SessionDestroyTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/SessionDestroyTest.java
index 51ba825..0eee65c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/SessionDestroyTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/SessionDestroyTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.protocol.http;
-import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
@@ -27,15 +27,15 @@ import java.util.Locale;
import org.apache.wicket.mock.MockWebRequest;
import org.apache.wicket.request.Url;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class SessionDestroyTest extends WicketTestCase
+class SessionDestroyTest extends WicketTestCase
{
/**
* https://issues.apache.org/jira/browse/WICKET-6310
*/
@Test
- public void whenSessionIsDestroyed_thenItShouldResetItsState()
+ void whenSessionIsDestroyed_thenItShouldResetItsState()
{
final Locale locale = Locale.ENGLISH;
MockWebRequest request = new MockWebRequest(Url.parse("/"))
@@ -51,20 +51,20 @@ public class SessionDestroyTest extends WicketTestCase
// initially #invalidateNow() (and destroy()) are not called
verify(session, never()).invalidateNow();
- assertThat(session.isSessionInvalidated(), is(false));
+ assertEquals(false, session.isSessionInvalidated());
// schedule invalidation
session.invalidate();
// the invalidation will happen on #detach(), so #destroy() is still not called
verify(session, never()).invalidateNow();
- assertThat(session.isSessionInvalidated(), is(true));
+ assertEquals(true, session.isSessionInvalidated());
session.detach();
// the session has been detached so #destroy() has been called and 'sessionInvalidated' is reset
verify(session, times(1)).invalidateNow();
- assertThat(session.isSessionInvalidated(), is(false));
+ assertEquals(false, session.isSessionInvalidated());
// no matter how many times #detach() is called #destroy() should not be called
session.detach();
@@ -72,7 +72,7 @@ public class SessionDestroyTest extends WicketTestCase
session.detach();
session.detach();
verify(session, times(1)).invalidateNow();
- assertThat(session.isSessionInvalidated(), is(false));
+ assertEquals(false, session.isSessionInvalidated());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/StoredResponsesMapTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/StoredResponsesMapTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/StoredResponsesMapTest.java
index d28bbd9..f525314 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/StoredResponsesMapTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/StoredResponsesMapTest.java
@@ -16,24 +16,28 @@
*/
package org.apache.wicket.protocol.http;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+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.security.SecureRandom;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.apache.wicket.util.SlowTests;
+import org.apache.wicket.util.WicketTestTag;
import org.apache.wicket.util.time.Duration;
import org.apache.wicket.util.time.Time;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
/**
* @see <a href="https://issues.apache.org/jira/browse/WICKET-3209">WICKET-3209</a>
*/
-@Category(SlowTests.class)
-public class StoredResponsesMapTest extends Assert
+@Tag(WicketTestTag.SLOW)
+class StoredResponsesMapTest
{
/**
* Verifies that {@link StoredResponsesMap} will expire the oldest entry if it is older than 2
@@ -42,7 +46,7 @@ public class StoredResponsesMapTest extends Assert
* @throws Exception
*/
@Test
- public void entriesLife2Seconds() throws Exception
+ void entriesLife2Seconds() throws Exception
{
StoredResponsesMap map = new StoredResponsesMap(1000, Duration.seconds(2));
assertEquals(0, map.size());
@@ -60,7 +64,7 @@ public class StoredResponsesMapTest extends Assert
* @throws Exception
*/
@Test
- public void getExpiredValue() throws Exception
+ void getExpiredValue() throws Exception
{
Time start = Time.now();
Duration timeout = Duration.milliseconds(50);
@@ -69,7 +73,7 @@ public class StoredResponsesMapTest extends Assert
map.put("1", new BufferedWebResponse(null));
assertEquals(1, map.size());
TimeUnit.MILLISECONDS.sleep(timeout.getMilliseconds() * 2); // sleep for twice longer than the timeout
- assertTrue("The timeout has passed.", Time.now().subtract(start).compareTo(timeout) == 1);
+ assertTrue(Time.now().subtract(start).compareTo(timeout) == 1, "The timeout has passed.");
Object value = map.get("1");
assertNull(value);
}
@@ -77,11 +81,14 @@ public class StoredResponsesMapTest extends Assert
/**
* Verifies that {@link StoredResponsesMap} can have only {@link BufferedWebResponse} values
*/
- @Test(expected = IllegalArgumentException.class)
- public void cannotPutArbitraryValue()
+ @Test
+ void cannotPutArbitraryValue()
{
StoredResponsesMap map = new StoredResponsesMap(1000, Duration.days(1));
- map.put("1", new Object());
+ assertThrows(IllegalArgumentException.class, () -> {
+ map.put("1", new Object());
+ });
+
}
/**
@@ -89,14 +96,11 @@ public class StoredResponsesMapTest extends Assert
*
* Tries to simulate heavy load on the {@link StoredResponsesMap} by putting many entries and
* removing randomly them.
- *
- * The test is disabled by default because it is slow (~ 30secs). Enable it when we have
- * categorized tests ({@link Category}) and run slow ones only at Apache CI servers
- *
+ *
* @throws InterruptedException
*/
@Test
- public void heavyLoad() throws InterruptedException
+ void heavyLoad() throws InterruptedException
{
final int numberOfThreads = 100;
final int iterations = 1000;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebApplicationTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebApplicationTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebApplicationTest.java
index ba6b175..951f64b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebApplicationTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebApplicationTest.java
@@ -16,12 +16,16 @@
*/
package org.apache.wicket.protocol.http;
+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.nio.charset.Charset;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
-
import javax.servlet.http.HttpServletRequest;
import org.apache.wicket.mock.MockRequestParameters;
@@ -35,26 +39,79 @@ import org.apache.wicket.request.mapper.CompoundRequestMapper;
import org.apache.wicket.request.mapper.ICompoundRequestMapper;
import org.apache.wicket.request.mapper.IRequestMapperDelegate;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test WebApplication
*/
-public class WebApplicationTest extends WicketTestCase
+class WebApplicationTest extends WicketTestCase
{
private static final String MOUNT_PATH_1 = "mount/path/1";
private static final String MOUNT_PATH_2 = "mount/path/2";
private static final String MOUNT_PATH_3 = "mount/path/3";
private static final String MOUNT_PATH_4 = "mount/path/4";
+ private static Request createMockRequest(String path)
+ {
+ final Url url = Url.parse(path);
+
+ return new Request()
+ {
+ @Override
+ public Url getUrl()
+ {
+ return url;
+ }
+
+ @Override
+ public Url getClientUrl()
+ {
+ return url;
+ }
+
+ @Override
+ public Locale getLocale()
+ {
+ return null;
+ }
+
+ @Override
+ public Charset getCharset()
+ {
+ return null;
+ }
+
+ @Override
+ public Object getContainerRequest()
+ {
+ return null;
+ }
+ };
+ }
+
+ private static int getCompoundRequestMapperSize(ICompoundRequestMapper compound)
+ {
+ int retv = 0;
+
+ for (Iterator<IRequestMapper> it = compound.iterator(); it.hasNext();)
+ {
+ it.next();
+ retv++;
+ }
+
+ return retv;
+ }
+
/**
* WICKET-6260
*/
@Test
- public void testBodyNotReadBeforeApplicationSetsCharacterEncoding() throws Exception {
+ void testBodyNotReadBeforeApplicationSetsCharacterEncoding() throws Exception
+ {
WebApplication application = tester.getApplication();
- HttpServletRequest request = new MockHttpServletRequest(application, null, null) {
+ HttpServletRequest request = new MockHttpServletRequest(application, null, null)
+ {
@Override
public Map<String, String[]> getParameterMap()
{
@@ -94,7 +151,7 @@ public class WebApplicationTest extends WicketTestCase
// character encoding not set yet
request.setCharacterEncoding(null);
- application.createWebRequest(request , "/");
+ application.createWebRequest(request, "/");
assertEquals("UTF-8", request.getCharacterEncoding());
}
@@ -103,7 +160,7 @@ public class WebApplicationTest extends WicketTestCase
* Test basic unmounting from a compound mapper.
*/
@Test
- public void testUnmountSimple()
+ void testUnmountSimple()
{
CompoundRequestMapper compound = new CompoundRequestMapper();
@@ -117,23 +174,27 @@ public class WebApplicationTest extends WicketTestCase
tester.getApplication().unmount(MOUNT_PATH_1);
- assertEquals("Compound size should be 3", 3, getCompoundRequestMapperSize(compound));
+ assertEquals(3, getCompoundRequestMapperSize(compound), "Compound size should be 3");
- assertNull("Mount path 1 should not be mounted",
- tester.getApplication().getRootRequestMapper().mapRequest(createMockRequest(MOUNT_PATH_1)));
+ assertNull(tester.getApplication().getRootRequestMapper().mapRequest(
+ createMockRequest(MOUNT_PATH_1)), "Mount path 1 should not be mounted");
- assertTrue("Mount path 2 should match",
- tester.getApplication().getRootRequestMapper().mapRequest(createMockRequest(MOUNT_PATH_2)) instanceof EmptyRequestHandler);
+ assertTrue(
+ tester.getApplication().getRootRequestMapper().mapRequest(
+ createMockRequest(MOUNT_PATH_2)) instanceof EmptyRequestHandler,
+ "Mount path 2 should match");
- assertTrue("Mount path 3 should match",
- tester.getApplication().getRootRequestMapper().mapRequest(createMockRequest(MOUNT_PATH_3)) instanceof EmptyRequestHandler);
+ assertTrue(
+ tester.getApplication().getRootRequestMapper().mapRequest(
+ createMockRequest(MOUNT_PATH_3)) instanceof EmptyRequestHandler,
+ "Mount path 3 should match");
}
/**
* See https://issues.apache.org/jira/browse/WICKET-5698
*/
@Test
- public void testUnmountComplex()
+ void testUnmountComplex()
{
CompoundRequestMapper nestedCompound = new CompoundRequestMapper();
@@ -153,84 +214,42 @@ public class WebApplicationTest extends WicketTestCase
tester.getApplication().unmount(MOUNT_PATH_1);
- assertEquals("Compound size should be 2", 2, getCompoundRequestMapperSize(nestedCompound));
-
- assertNull("Mount path 1 should not be mounted",
- tester.getApplication().getRootRequestMapper().mapRequest(createMockRequest(MOUNT_PATH_1)));
+ assertEquals(2, getCompoundRequestMapperSize(nestedCompound), "Compound size should be 2");
+ assertNull(tester.getApplication().getRootRequestMapper().mapRequest(
+ createMockRequest(MOUNT_PATH_1)), "Mount path 1 should not be mounted");
- assertTrue("Mount path 2 should match",
- tester.getApplication().getRootRequestMapper().mapRequest(createMockRequest(MOUNT_PATH_2)) instanceof EmptyRequestHandler);
+ assertTrue(
+ tester.getApplication().getRootRequestMapper().mapRequest(
+ createMockRequest(MOUNT_PATH_2)) instanceof EmptyRequestHandler,
+ "Mount path 2 should match");
- assertTrue("Mount path 3 should match",
- tester.getApplication().getRootRequestMapper().mapRequest(createMockRequest(MOUNT_PATH_3)) instanceof EmptyRequestHandler);
+ assertTrue(
+ tester.getApplication().getRootRequestMapper().mapRequest(
+ createMockRequest(MOUNT_PATH_3)) instanceof EmptyRequestHandler,
+ "Mount path 3 should match");
- assertTrue("Mount path 4 should match",
- tester.getApplication().getRootRequestMapper().mapRequest(createMockRequest(MOUNT_PATH_4)) instanceof EmptyRequestHandler);
+ assertTrue(
+ tester.getApplication().getRootRequestMapper().mapRequest(
+ createMockRequest(MOUNT_PATH_4)) instanceof EmptyRequestHandler,
+ "Mount path 4 should match");
tester.getApplication().unmount(MOUNT_PATH_3);
- assertNull("Mount path 1 should not be mounted",
- tester.getApplication().getRootRequestMapper().mapRequest(createMockRequest(MOUNT_PATH_1)));
+ assertNull(tester.getApplication().getRootRequestMapper().mapRequest(
+ createMockRequest(MOUNT_PATH_1)), "Mount path 1 should not be mounted");
- assertTrue("Mount path 2 should match",
- tester.getApplication().getRootRequestMapper().mapRequest(createMockRequest(MOUNT_PATH_2)) instanceof EmptyRequestHandler);
+ assertTrue(
+ tester.getApplication().getRootRequestMapper().mapRequest(
+ createMockRequest(MOUNT_PATH_2)) instanceof EmptyRequestHandler,
+ "Mount path 2 should match");
- assertNull("Mount path 3 should not be mounted",
- tester.getApplication().getRootRequestMapper().mapRequest(createMockRequest(MOUNT_PATH_3)));
-
- assertTrue("Mount path 4 should match",
- tester.getApplication().getRootRequestMapper().mapRequest(createMockRequest(MOUNT_PATH_4)) instanceof EmptyRequestHandler);
- }
-
- private static Request createMockRequest(String path)
- {
- final Url url = Url.parse(path);
+ assertNull(tester.getApplication().getRootRequestMapper().mapRequest(
+ createMockRequest(MOUNT_PATH_3)), "Mount path 3 should not be mounted");
- return new Request()
- {
- @Override
- public Url getUrl()
- {
- return url;
- }
-
- @Override
- public Url getClientUrl()
- {
- return url;
- }
-
- @Override
- public Locale getLocale()
- {
- return null;
- }
-
- @Override
- public Charset getCharset()
- {
- return null;
- }
-
- @Override
- public Object getContainerRequest()
- {
- return null;
- }
- };
- }
-
- private static int getCompoundRequestMapperSize(ICompoundRequestMapper compound)
- {
- int retv = 0;
-
- for (Iterator<IRequestMapper> it = compound.iterator(); it.hasNext();)
- {
- it.next();
- retv++;
- }
-
- return retv;
+ assertTrue(
+ tester.getApplication().getRootRequestMapper().mapRequest(
+ createMockRequest(MOUNT_PATH_4)) instanceof EmptyRequestHandler,
+ "Mount path 4 should match");
}
private static class MountMapper implements IRequestMapper
@@ -238,7 +257,7 @@ public class WebApplicationTest extends WicketTestCase
private final String path;
private final IRequestHandler handler;
- public MountMapper(String path, EmptyRequestHandler handler)
+ MountMapper(String path, EmptyRequestHandler handler)
{
this.path = path;
this.handler = handler;
@@ -271,7 +290,7 @@ public class WebApplicationTest extends WicketTestCase
{
private final IRequestMapper delegate;
- public SimpleRequestMapperDelegate(IRequestMapper delegate)
+ SimpleRequestMapperDelegate(IRequestMapper delegate)
{
this.delegate = delegate;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java
index 9152f0a..ba45ee5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java
@@ -16,35 +16,36 @@
*/
package org.apache.wicket.protocol.http;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
+import org.apache.wicket.core.util.resource.WebExternalResourceStream;
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.request.handler.resource.ResourceStreamRequestHandler;
import org.apache.wicket.request.handler.resource.WebExternalResourceRequestHandler;
import org.apache.wicket.util.io.Streams;
-import org.apache.wicket.core.util.resource.WebExternalResourceStream;
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 WebExternalResourceRequestTarget and WebExternalResourceStream
*
* @author <a href="mailto:jbq@apache.org">Jean-Baptiste Quenot</a>
*/
-public class WebExternalResourceTest extends Assert
+class WebExternalResourceTest
{
private WicketTester tester;
/**
* @throws Exception
*/
- @Before
- public void before() throws Exception
+ @BeforeEach
+ void before() throws Exception
{
File tempDir = new File("target/webapp");
tempDir.mkdir();
@@ -62,8 +63,8 @@ public class WebExternalResourceTest extends Assert
}
- @After
- public void after() throws Exception
+ @AfterEach
+ void after() throws Exception
{
tester.destroy();
}
@@ -73,7 +74,7 @@ public class WebExternalResourceTest extends Assert
* @throws Exception
*/
@Test
- public void webExternalResourceRequestTarget() throws Exception
+ void webExternalResourceRequestTarget() throws Exception
{
WebExternalResourceRequestHandler rt = new WebExternalResourceRequestHandler("/index.html");
tester.processRequest(rt);
@@ -87,7 +88,7 @@ public class WebExternalResourceTest extends Assert
*/
// FIXME WebExternalResourceStream does not implement length()
@Test
- public void webExternalResource() throws Exception
+ void webExternalResource() throws Exception
{
WebExternalResourceStream resource = new WebExternalResourceStream("/index.html");
ResourceStreamRequestHandler rt = new ResourceStreamRequestHandler(resource);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java
index 06298cf..bcfb644 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java
@@ -16,27 +16,29 @@
*/
package org.apache.wicket.protocol.http;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.pages.PageExpiredErrorPage;
import org.apache.wicket.settings.ExceptionSettings;
import org.apache.wicket.settings.RequestCycleSettings;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Test exceptions thrown during request
*
* @author <a href="mailto:jbq@apache.org">Jean-Baptiste Quenot</a>
*/
-public class WebResponseExceptionsTest extends WicketTestCase
+class WebResponseExceptionsTest extends WicketTestCase
{
/**
* Tests buffered exception error page.
*/
@Test
- public void bufferedExceptionErrorPage()
+ void bufferedExceptionErrorPage()
{
tester.getApplication()
.getRequestCycleSettings()
@@ -51,7 +53,7 @@ public class WebResponseExceptionsTest extends WicketTestCase
* Tests exception error page.
*/
@Test
- public void exceptionErrorPage()
+ void exceptionErrorPage()
{
tester.getApplication()
.getExceptionSettings()
@@ -63,7 +65,7 @@ public class WebResponseExceptionsTest extends WicketTestCase
* Tests page expired.
*/
@Test
- public void expirePage()
+ void expirePage()
{
tester.startPage(TestExpirePage.class);
String document = tester.getLastResponseAsString();
@@ -85,7 +87,7 @@ public class WebResponseExceptionsTest extends WicketTestCase
* Tests internal error page.
*/
@Test
- public void internalErrorPage()
+ void internalErrorPage()
{
tester.startPage(TestErrorPage.class);
tester.setExposeExceptions(false);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebSessionTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebSessionTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebSessionTest.java
index 23ac0b0..27b3e85 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebSessionTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebSessionTest.java
@@ -16,23 +16,24 @@
*/
package org.apache.wicket.protocol.http;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.Locale;
import org.apache.wicket.mock.MockWebRequest;
import org.apache.wicket.request.Url;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Timo Rantalaiho
*/
-public class WebSessionTest extends Assert
+class WebSessionTest
{
/**
* testReadsLocaleFromRequestOnConstruction()
*/
@Test
- public void readsLocaleFromRequestOnConstruction()
+ void readsLocaleFromRequestOnConstruction()
{
final Locale locale = Locale.TRADITIONAL_CHINESE;
MockWebRequest request = new MockWebRequest(Url.parse("/"))
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java
index 54141c4..c12737c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java
@@ -16,8 +16,16 @@
*/
package org.apache.wicket.protocol.http;
-import static org.hamcrest.CoreMatchers.is;
-import static org.mockito.Mockito.*;
+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.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import java.io.IOException;
import java.io.InputStream;
@@ -34,7 +42,6 @@ import java.util.TimeZone;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
@@ -55,16 +62,14 @@ import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.resource.AbstractResource;
import org.apache.wicket.request.resource.DynamicImageResource;
import org.apache.wicket.request.resource.IResource;
-import org.apache.wicket.util.SlowTests;
+import org.apache.wicket.util.WicketTestTag;
import org.apache.wicket.util.file.WebXmlFile;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.tester.DummyHomePage;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentMatchers;
-import org.mockito.Matchers;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -72,7 +77,7 @@ import org.xml.sax.SAXException;
/**
*/
-public class WicketFilterTest extends Assert
+public class WicketFilterTest
{
private static WebApplication application;
private final DateFormat headerDateFormat = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss z",
@@ -81,8 +86,8 @@ public class WicketFilterTest extends Assert
/**
* @throws Exception
*/
- @After
- public void after() throws Exception
+ @AfterEach
+ void after() throws Exception
{
if (application != null)
{
@@ -108,7 +113,7 @@ public class WicketFilterTest extends Assert
* @throws Exception
*/
@Test
- public void parsingOfAnnotatedServlet3FiltersWorks() throws Exception
+ void parsingOfAnnotatedServlet3FiltersWorks() throws Exception
{
FilterTestingConfig config = new FilterTestingConfig();
config.initParameters.clear();
@@ -118,19 +123,19 @@ public class WicketFilterTest extends Assert
// creates an Application
filter.init(config);
- // get a reference to the application, so that @After is able to clean it up
+ // get a reference to the application, so that @AfterEach is able to clean it up
application = filter.getApplication();
// assert that the filter path is not /web/*/
- assertThat(filter.getFilterPath(), is("web/"));
+ assertEquals("web/", filter.getFilterPath());
}
/**
* testFilterPath1()
*/
@Test
- @Category(SlowTests.class)
- public void filterPath1()
+ @Tag(WicketTestTag.SLOW)
+ void filterPath1()
{
InputStream in = WicketFilterTest.class.getResourceAsStream("web1.xml");
String filterPath = getFilterPath("FilterTestApplication", in);
@@ -141,8 +146,8 @@ public class WicketFilterTest extends Assert
* testFilterPath2()
*/
@Test
- @Category(SlowTests.class)
- public void filterPath2()
+ @Tag(WicketTestTag.SLOW)
+ void filterPath2()
{
InputStream in = WicketFilterTest.class.getResourceAsStream("web2.xml");
String filterPath = getFilterPath("FilterTestApplication", in);
@@ -155,7 +160,7 @@ public class WicketFilterTest extends Assert
* @throws ParseException
*/
@Test
- public void notModifiedResponseIncludesExpiresHeader() throws IOException, ServletException,
+ void notModifiedResponseIncludesExpiresHeader() throws IOException, ServletException,
ParseException
{
try
@@ -198,12 +203,10 @@ public class WicketFilterTest extends Assert
});
assertEquals(HttpServletResponse.SC_NOT_MODIFIED, response.getStatus());
String responseExpiresHeader = response.getHeader("Expires");
- assertNotNull("Expires header must be set on not modified response",
- responseExpiresHeader);
+ assertNotNull(responseExpiresHeader, "Expires header must be set on not modified response");
Date responseExpires = headerDateFormat.parse(responseExpiresHeader);
- assertTrue("Expected later than current date but was " + responseExpires,
- responseExpires.after(new Date()));
+ assertTrue(responseExpires.after(new Date()), "Expected later than current date but was " + responseExpires);
}
finally
{
@@ -212,7 +215,7 @@ public class WicketFilterTest extends Assert
}
@Test
- public void options() throws IOException, ServletException, ParseException
+ void options() throws IOException, ServletException, ParseException
{
try
{
@@ -305,11 +308,11 @@ public class WicketFilterTest extends Assert
}
}
- private static class FilterTestingConfig implements FilterConfig
+ public static class FilterTestingConfig implements FilterConfig
{
private final Map<String, String> initParameters = new HashMap<>();
- public FilterTestingConfig()
+ public FilterTestingConfig()
{
initParameters.put(WicketFilter.APP_FACT_PARAM,
FilterTestingApplicationFactory.class.getName());
@@ -346,7 +349,7 @@ public class WicketFilterTest extends Assert
/**
*/
- public static class FilterTestingApplicationFactory implements IWebApplicationFactory
+ public static class FilterTestingApplicationFactory implements IWebApplicationFactory
{
@Override
public WebApplication createApplication(WicketFilter filter)
@@ -365,13 +368,13 @@ public class WicketFilterTest extends Assert
* testCheckRedirect_1()
*/
@Test
- public void checkRedirect_1()
+ void checkRedirect_1()
{
WicketFilter filter = new WicketFilter();
// Simulate url-pattern = "/*" and request = http://localhost:8080 => null == no redirect
filter.setFilterPath("");
- assertNull("", filter.checkIfRedirectRequired("/", ""));
+ assertNull(filter.checkIfRedirectRequired("/", ""));
}
private static class CheckRedirectWorker implements Runnable
@@ -381,8 +384,8 @@ public class WicketFilterTest extends Assert
private final CountDownLatch finishLatch;
private final AtomicInteger successCount;
- public CheckRedirectWorker(WicketFilter filter, CountDownLatch startLatch,
- CountDownLatch finishLatch, AtomicInteger successCount)
+ CheckRedirectWorker(WicketFilter filter, CountDownLatch startLatch,
+ CountDownLatch finishLatch, AtomicInteger successCount)
{
this.filter = filter;
this.startLatch = startLatch;
@@ -440,8 +443,8 @@ public class WicketFilterTest extends Assert
{
fail();
}
- assertEquals("all threads finished", 0, finishLatch.getCount());
- assertEquals("all redirects correct", threadCount, successCount.get());
+ assertEquals(0, finishLatch.getCount(), "all threads finished");
+ assertEquals(threadCount, successCount.get(), "all threads finished");
}
/**
@@ -450,7 +453,7 @@ public class WicketFilterTest extends Assert
* Runs 1000 times 8 simultaneous threads which try to initialize WicketFilter#filterPathLength
*/
@Test
- public void repeatedParallelCheckRedirect()
+ void repeatedParallelCheckRedirect()
{
int threadCount = 8;
int repeatCount = 1000;
@@ -466,7 +469,7 @@ public class WicketFilterTest extends Assert
* @throws Exception
*/
@Test
- public void ignorePaths() throws Exception
+ void ignorePaths() throws Exception
{
application = spy(new MockApplication());
WicketFilter filter = new WicketFilter();
@@ -519,7 +522,7 @@ public class WicketFilterTest extends Assert
* </p>
*/
@Test
- public void canonicaliseFilterPath()
+ void canonicaliseFilterPath()
{
String s;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/WicketURLTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/WicketURLTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/WicketURLTest.java
index 2098ec8..52e3158 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/WicketURLTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/WicketURLTest.java
@@ -16,21 +16,22 @@
*/
package org.apache.wicket.protocol.http;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.util.encoding.UrlDecoder;
import org.apache.wicket.util.encoding.UrlEncoder;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Doug Donohoe
*/
-public class WicketURLTest extends Assert
+class WicketURLTest
{
/**
* testPathEncoder()
*/
@Test
- public void pathEncoder()
+ void pathEncoder()
{
assertEquals("+", UrlEncoder.PATH_INSTANCE.encode("+", "UTF-8"));
assertEquals("%20", UrlEncoder.PATH_INSTANCE.encode(" ", "UTF-8"));
@@ -40,7 +41,7 @@ public class WicketURLTest extends Assert
* testQueryEncoder()
*/
@Test
- public void queryEncoder()
+ void queryEncoder()
{
assertEquals("+", UrlEncoder.QUERY_INSTANCE.encode(" ", "UTF-8"));
assertEquals("%2B", UrlEncoder.QUERY_INSTANCE.encode("+", "UTF-8"));
@@ -50,7 +51,7 @@ public class WicketURLTest extends Assert
* testPathDecoder()
*/
@Test
- public void pathDecoder()
+ void pathDecoder()
{
assertEquals("+", UrlDecoder.PATH_INSTANCE.decode("+", "UTF-8"));
assertEquals(" ", UrlDecoder.PATH_INSTANCE.decode("%20", "UTF-8"));
@@ -60,7 +61,7 @@ public class WicketURLTest extends Assert
* testQueryDecoder()
*/
@Test
- public void queryDecoder()
+ void queryDecoder()
{
assertEquals(" ", UrlDecoder.QUERY_INSTANCE.decode("+", "UTF-8"));
assertEquals("+", UrlDecoder.QUERY_INSTANCE.decode("%2B", "UTF-8"));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/mock/CookiesTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/mock/CookiesTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/mock/CookiesTest.java
index f9c8b2e..bdf87ec 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/mock/CookiesTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/mock/CookiesTest.java
@@ -16,18 +16,20 @@
*/
package org.apache.wicket.protocol.http.mock;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import javax.servlet.http.Cookie;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for Cookies helper class
*/
-public class CookiesTest extends Assert
+class CookiesTest
{
@Test
- public void testIsEqual() throws Exception
+ void testIsEqual() throws Exception
{
Cookie c1 = new Cookie("Name", "Value");
Cookie c2 = new Cookie("Name", "Value");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequestTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequestTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequestTest.java
index 5219518..640154e 100755
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequestTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequestTest.java
@@ -16,26 +16,28 @@
*/
package org.apache.wicket.protocol.http.mock;
+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.assertSame;
+
import java.util.Enumeration;
import java.util.Locale;
-
import javax.servlet.http.HttpSession;
import org.apache.wicket.Session;
import org.apache.wicket.request.Url;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import static org.hamcrest.Matchers.is;
-
/**
* test features of {@link MockHttpServletRequest}
*/
-public class MockHttpServletRequestTest extends WicketTestCase
+class MockHttpServletRequestTest extends WicketTestCase
{
@Test
- public void setAbsoluteUrlWithHost()
+ void setAbsoluteUrlWithHost()
{
MockHttpServletRequest request = tester.getRequest();
assertEquals("http", request.getScheme());
@@ -59,7 +61,7 @@ public class MockHttpServletRequestTest extends WicketTestCase
}
@Test
- public void setAbsoluteUrlWithoutHost()
+ void setAbsoluteUrlWithoutHost()
{
MockHttpServletRequest request = tester.getRequest();
assertEquals("http", request.getScheme());
@@ -83,7 +85,7 @@ public class MockHttpServletRequestTest extends WicketTestCase
}
@Test
- public void setRelativeUrl()
+ void setRelativeUrl()
{
MockHttpServletRequest request = tester.getRequest();
assertEquals("http", request.getScheme());
@@ -110,7 +112,7 @@ public class MockHttpServletRequestTest extends WicketTestCase
* WICKET-4664 - no query string returns null as per HttpServletRequest
*/
@Test
- public void testNoQueryString_returnsNull()
+ void testNoQueryString_returnsNull()
{
MockHttpServletRequest request = tester.getRequest();
request.setURL("my/servlet/without/query/param");
@@ -120,43 +122,43 @@ public class MockHttpServletRequestTest extends WicketTestCase
}
@Test
- public void getSessionFromNonMockHttpSession()
+ void getSessionFromNonMockHttpSession()
{
HttpSession httpSession = Mockito.mock(HttpSession.class);
MockHttpServletRequest request = new MockHttpServletRequest(null, httpSession, null);
- assertNull("MockHttpServletRequest knows how to work only with MockHttpSession", request.getSession(true));
- assertNull("MockHttpServletRequest knows how to work only with MockHttpSession", request.getSession(false));
+ assertNull(request.getSession(true), "MockHttpServletRequest knows how to work only with MockHttpSession");
+ assertNull(request.getSession(false), "MockHttpServletRequest knows how to work only with MockHttpSession");
}
@Test
- public void getSessionFalseFromMockHttpSession()
+ void getSessionFalseFromMockHttpSession()
{
HttpSession httpSession = new MockHttpSession(null);
MockHttpServletRequest request = new MockHttpServletRequest(null, httpSession, null);
- assertNull("HttpSession should not be created!", request.getSession(false));
+ assertNull(request.getSession(false), "HttpSession should not be created!");
}
@Test
- public void getSessionDefaultFromMockHttpSession()
+ void getSessionDefaultFromMockHttpSession()
{
HttpSession httpSession = new MockHttpSession(null);
MockHttpServletRequest request = new MockHttpServletRequest(null, httpSession, null);
- assertSame("HttpSession should be created!", httpSession, request.getSession());
+ assertSame(httpSession, request.getSession(), "HttpSession should be created!");
}
@Test
- public void getSessionTrueFromMockHttpSession()
+ void getSessionTrueFromMockHttpSession()
{
HttpSession httpSession = new MockHttpSession(null);
MockHttpServletRequest request = new MockHttpServletRequest(null, httpSession, null);
- assertSame("HttpSession should be created!", httpSession, request.getSession(true));
+ assertSame(httpSession, request.getSession(true), "HttpSession should be created!");
}
/**
* https://issues.apache.org/jira/browse/WICKET-4481
*/
@Test
- public void setHeader()
+ void setHeader()
{
HttpSession httpSession = new MockHttpSession(null);
MockHttpServletRequest request = new MockHttpServletRequest(null, httpSession, null);
@@ -177,13 +179,13 @@ public class MockHttpServletRequestTest extends WicketTestCase
}
@Test
- public void setLocale() {
+ void setLocale() {
Session session = tester.getSession();
session.setLocale(Locale.US);
tester.getRequest().setLocale(Locale.CANADA_FRENCH);
session.invalidateNow();
- assertThat(tester.getSession().getLocale(), is(Locale.CANADA_FRENCH));
+ assertEquals(Locale.CANADA_FRENCH, tester.getSession().getLocale());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponseTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponseTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponseTest.java
index 0fecf8e..990ea0d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponseTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponseTest.java
@@ -16,27 +16,28 @@
*/
package org.apache.wicket.protocol.http.mock;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import java.util.List;
import javax.servlet.http.Cookie;
-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;
/**
* Tests for {@link MockHttpServletResponse}
*/
-public class MockHttpServletResponseTest extends Assert
+class MockHttpServletResponseTest
{
private MockHttpServletResponse response;
/**
* Prepare
*/
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
response = new MockHttpServletResponse(null);
}
@@ -44,8 +45,8 @@ public class MockHttpServletResponseTest extends Assert
/**
* Clean up
*/
- @After
- public void after()
+ @AfterEach
+ void after()
{
response = null;
}
@@ -54,7 +55,7 @@ public class MockHttpServletResponseTest extends Assert
* Add a cookie
*/
@Test
- public void addCookie()
+ void addCookie()
{
Cookie cookie = new Cookie("name", "value");
response.addCookie(cookie);
@@ -76,7 +77,7 @@ public class MockHttpServletResponseTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-4292
*/
@Test
- public void addDuplicateCookie()
+ void addDuplicateCookie()
{
Cookie cookie1 = new Cookie("name", "value");
response.addCookie(cookie1);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategyTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategyTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategyTest.java
index 98e1bf4..ead2b87 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategyTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategyTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.protocol.http.request;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.Base64;
import org.apache.wicket.core.request.mapper.CryptoMapper;
@@ -27,12 +29,12 @@ import org.apache.wicket.request.mapper.CompoundRequestMapper;
import org.apache.wicket.util.crypt.ICrypt;
import org.apache.wicket.util.crypt.ICryptFactory;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Simple test using the WicketTester
*/
-public class CryptedUrlWebRequestCodingStrategyTest extends WicketTestCase
+class CryptedUrlWebRequestCodingStrategyTest extends WicketTestCase
{
@Override
@@ -57,7 +59,7 @@ public class CryptedUrlWebRequestCodingStrategyTest extends WicketTestCase
*
*/
@Test
- public void clientBidListPage()
+ void clientBidListPage()
{
WebPage page = new SimplePage();
WebPage p = (WebPage)tester.startPage(page);
@@ -68,7 +70,7 @@ public class CryptedUrlWebRequestCodingStrategyTest extends WicketTestCase
* testRenderMyPagePost()
*/
@Test
- public void renderMyPagePost()
+ void renderMyPagePost()
{
// start and render the test page
tester.startPage(HomePage.class);
@@ -83,7 +85,7 @@ public class CryptedUrlWebRequestCodingStrategyTest extends WicketTestCase
* testRenderMyPageGet()
*/
@Test
- public void renderMyPageGet()
+ void renderMyPageGet()
{
// start and render the test page
tester.startPage(HomePage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/WebClientInfoTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/WebClientInfoTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/WebClientInfoTest.java
index ca7089f..033e597 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/WebClientInfoTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/WebClientInfoTest.java
@@ -16,30 +16,23 @@
*/
package org.apache.wicket.protocol.http.request;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.greaterThan;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.lessThan;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import java.util.Arrays;
-import java.util.List;
-
import javax.servlet.http.HttpServletRequest;
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
/**
* Tests the WebClientInfo class
*/
-public class WebClientInfoTest
+class WebClientInfoTest
{
private RequestCycle requestCycleMock;
private ServletWebRequest webRequest;
@@ -48,8 +41,8 @@ public class WebClientInfoTest
/**
* Prepare RequestCycle to be able to extract the remote address of the client
*/
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
requestCycleMock = mock(RequestCycle.class);
@@ -64,13 +57,13 @@ public class WebClientInfoTest
* Test X-Forwarded-For ip address extraction.
*/
@Test
- public void testExtractFromXForwardedForHeader()
+ void testExtractFromXForwardedForHeader()
{
String expected = "127.0.0.1";
when(webRequest.getHeader("X-Forwarded-For")).thenReturn(expected);
WebClientInfo clientInfo = new WebClientInfo(requestCycleMock, "No user agent");
String actual = clientInfo.getRemoteAddr(requestCycleMock);
- assertThat(actual, is(equalTo(expected)));
+ assertEquals(expected, actual);
Mockito.verifyZeroInteractions(servletRequest);
}
@@ -81,55 +74,55 @@ public class WebClientInfoTest
* will resolve to some DNS service saying "'blah' domain is free. Buy it."
*/
@Test
- @Ignore
- public void testExtractFromContainerRequestUnknownXForwardedFor()
+ @Disabled
+ void testExtractFromContainerRequestUnknownXForwardedFor()
{
String expected = "10.17.37.8";
when(servletRequest.getRemoteAddr()).thenReturn(expected);
when(webRequest.getHeader("X-Forwarded-For")).thenReturn("unknown");
WebClientInfo clientInfo = new WebClientInfo(requestCycleMock, "No user agent");
String actual = clientInfo.getRemoteAddr(requestCycleMock);
- assertThat(actual, is(equalTo(expected)));
+ assertEquals(expected, actual);
}
/**
* Test default ip address extraction for container request.
*/
@Test
- public void testExtractFromContainerRequestNoXForwardedFor()
+ void testExtractFromContainerRequestNoXForwardedFor()
{
String expected = "10.17.37.8";
when(servletRequest.getRemoteAddr()).thenReturn(expected);
WebClientInfo clientInfo = new WebClientInfo(requestCycleMock, "No user agent");
String actual = clientInfo.getRemoteAddr(requestCycleMock);
- assertThat(actual, is(equalTo(expected)));
+ assertEquals(expected, actual);
}
/**
* Test X-Forwarded-For ip address extraction when proxy chain is given.
*/
@Test
- public void testExtractFromXForwardedForHeaderChainedIps()
+ void testExtractFromXForwardedForHeaderChainedIps()
{
String expected = "10.17.37.156";
when(servletRequest.getRemoteAddr()).thenReturn("10.17.1.1");
when(webRequest.getHeader("X-Forwarded-For")).thenReturn(expected + ", 10.17.37.1");
WebClientInfo clientInfo = new WebClientInfo(requestCycleMock, "No user agent");
String actual = clientInfo.getRemoteAddr(requestCycleMock);
- assertThat(actual, is(equalTo(expected)));
+ assertEquals(expected, actual);
}
/**
* Test X-Forwarded-For ipv6 address extraction.
*/
@Test
- public void testExtractFromXForwardedForHeaderIPv6()
+ void testExtractFromXForwardedForHeaderIPv6()
{
String expected = "2001:db8::1428:57";
when(webRequest.getHeader("X-Forwarded-For")).thenReturn("2001:db8::1428:57");
WebClientInfo clientInfo = new WebClientInfo(requestCycleMock, "No user agent");
String actual = clientInfo.getRemoteAddr(requestCycleMock);
- assertThat(actual, is(equalTo(expected)));
+ assertEquals(expected, actual);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/SecuredRemoteAddressRequestWrapperFactoryTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/SecuredRemoteAddressRequestWrapperFactoryTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/SecuredRemoteAddressRequestWrapperFactoryTest.java
index dead915..1c3fb53 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/SecuredRemoteAddressRequestWrapperFactoryTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/SecuredRemoteAddressRequestWrapperFactoryTest.java
@@ -16,21 +16,24 @@
*/
package org.apache.wicket.protocol.http.servlet;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.protocol.http.mock.MockHttpServletRequest;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
* @author Juergen Donnerstag
*/
-public class SecuredRemoteAddressRequestWrapperFactoryTest extends WicketTestCase
+class SecuredRemoteAddressRequestWrapperFactoryTest extends WicketTestCase
{
/**
*
*/
@Test
- public void test1()
+ void test1()
{
SecuredRemoteAddressRequestWrapperFactory factory = new SecuredRemoteAddressRequestWrapperFactory();
MockHttpServletRequest request = tester.getRequest();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebRequestTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebRequestTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebRequestTest.java
index 33d9914..5033a20 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebRequestTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebRequestTest.java
@@ -16,7 +16,9 @@
*/
package org.apache.wicket.protocol.http.servlet;
-import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -33,13 +35,12 @@ import org.apache.wicket.request.http.flow.AbortWithHttpErrorCodeException;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link ServletWebRequest}
*/
-public class ServletWebRequestTest extends Assert
+class ServletWebRequestTest
{
/**
@@ -48,7 +49,7 @@ public class ServletWebRequestTest extends Assert
* returns just the request uri to the error page without the query string
*/
@Test
- public void wicket3599()
+ void wicket3599()
{
MockHttpServletRequest httpRequest = new MockHttpServletRequest(null, null, null);
httpRequest.setURL(httpRequest.getContextPath() + "/request/Uri");
@@ -71,7 +72,7 @@ public class ServletWebRequestTest extends Assert
* <a href="https://issues.apache.org/jira/browse/WICKET-4168">WICKET-4168</a>
*/
@Test
- public void testClientURLIsContextRelativeInErrorResponses()
+ void testClientURLIsContextRelativeInErrorResponses()
{
MockHttpServletRequest httpRequest = new MockHttpServletRequest(null, null, null);
httpRequest.setURL(httpRequest.getContextPath() + "/request/Uri");
@@ -93,7 +94,7 @@ public class ServletWebRequestTest extends Assert
* Relative Urls should be calculated against 'javax.servlet.forward.request_uri'
*/
@Test
- public void parseForwardAttributes()
+ void parseForwardAttributes()
{
MockHttpServletRequest httpRequest = new MockHttpServletRequest(null, null, null);
httpRequest.setURL(httpRequest.getContextPath() + "/request/Uri");
@@ -115,7 +116,7 @@ public class ServletWebRequestTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-4123
*/
@Test
- public void useCustomServletWebRequest()
+ void useCustomServletWebRequest()
{
WebApplication application = new WebApplication()
{
@@ -150,7 +151,7 @@ public class ServletWebRequestTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-4841
*/
@Test
- public void getClientUrlAjaxWithoutBaseUrl()
+ void getClientUrlAjaxWithoutBaseUrl()
{
MockHttpServletRequest httpRequest = new MockHttpServletRequest(null, null, null);
@@ -173,7 +174,7 @@ public class ServletWebRequestTest extends Assert
* returns just the request uri to the error page without the query string
*/
@Test
- public void wicket5203()
+ void wicket5203()
{
String filterPath = "filterPath";
MockHttpServletRequest httpRequest = new MockHttpServletRequest(null, null, null);
@@ -197,7 +198,7 @@ public class ServletWebRequestTest extends Assert
* WICKET-5287
*/
@Test
- public void parseUrlWhichLooksLikeFullInItsContextRelativePart()
+ void parseUrlWhichLooksLikeFullInItsContextRelativePart()
{
String filterPath = "filterPath";
MockHttpServletRequest httpRequest = new MockHttpServletRequest(null, null, null);
@@ -215,7 +216,7 @@ public class ServletWebRequestTest extends Assert
private CustomRequestPage()
{
- assertThat(getRequest(), instanceOf(CustomServletWebRequest.class));
+ assertThat(getRequest()).isInstanceOf(CustomServletWebRequest.class);
}
@Override
@@ -228,7 +229,7 @@ public class ServletWebRequestTest extends Assert
private static class CustomServletWebRequest extends ServletWebRequest
{
- public CustomServletWebRequest(HttpServletRequest httpServletRequest, String filterPrefix)
+ CustomServletWebRequest(HttpServletRequest httpServletRequest, String filterPrefix)
{
super(httpServletRequest, filterPrefix);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebResponseTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebResponseTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebResponseTest.java
index 71626da..0dc54a8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebResponseTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebResponseTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.protocol.http.servlet;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -23,7 +25,6 @@ import static org.mockito.Mockito.when;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -33,15 +34,13 @@ import org.apache.wicket.protocol.http.mock.MockHttpServletResponse;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.UrlRenderer;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentMatchers;
-import org.mockito.Matchers;
/**
* Tests for {@link ServletWebResponse}
*/
-public class ServletWebResponseTest extends Assert
+class ServletWebResponseTest
{
/**
@@ -52,7 +51,7 @@ public class ServletWebResponseTest extends Assert
* @throws IOException
*/
@Test
- public void sendRedirectAjax() throws IOException
+ void sendRedirectAjax() throws IOException
{
final String url = "./relative/path";
@@ -98,7 +97,7 @@ public class ServletWebResponseTest extends Assert
* @throws IOException
*/
@Test
- public void sendRedirect() throws IOException
+ void sendRedirect() throws IOException
{
final String url = "./relative/path";
@@ -124,7 +123,7 @@ public class ServletWebResponseTest extends Assert
* WICKET-4934 DownloadLink uses wrong encoding for spaces/non-ASCII characters
*/
@Test
- public void setDispositionHeader()
+ void setDispositionHeader()
{
ServletWebRequest webRequest = mock(ServletWebRequest.class);
MockHttpServletRequest httpRequest = mock(MockHttpServletRequest.class);
@@ -162,7 +161,7 @@ public class ServletWebResponseTest extends Assert
* WICKET-5582 absolute URLs stay absolute after encoding
*/
@Test
- public void encodeAbsoluteUrl()
+ void encodeAbsoluteUrl()
{
final String url = "http://localhost:8080/path";
@@ -191,7 +190,7 @@ public class ServletWebResponseTest extends Assert
* WICKET-5582 absolute URLs stay absolute after encoding
*/
@Test
- public void encodeRedirectAbsoluteUrl()
+ void encodeRedirectAbsoluteUrl()
{
final String url = "http://localhost:8080/path";
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilterTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilterTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilterTest.java
index adeaf94..0e05b72 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilterTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilterTest.java
@@ -16,11 +16,13 @@
*/
package org.apache.wicket.protocol.http.servlet;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.IOException;
import java.lang.Thread.UncaughtExceptionHandler;
import java.util.Enumeration;
import java.util.concurrent.atomic.AtomicBoolean;
-
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
@@ -36,13 +38,12 @@ import org.apache.wicket.session.HttpSessionStore;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.tester.WicketTester;
import org.apache.wicket.util.time.Duration;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link WicketSessionFilter}
*/
-public class WicketSessionFilterTest extends WicketTestCase
+class WicketSessionFilterTest extends WicketTestCase
{
@Override
@@ -67,7 +68,7 @@ public class WicketSessionFilterTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void applicationAndSessionAreExported() throws Exception
+ void applicationAndSessionAreExported() throws Exception
{
// bind the session so it can be found in TestSessionFilter
tester.getSession().bind();
@@ -83,14 +84,14 @@ public class WicketSessionFilterTest extends WicketTestCase
{
TestSessionFilter sessionFilter = new TestSessionFilter(tester);
- Assert.assertFalse(Application.exists());
- Assert.assertFalse(Session.exists());
+ assertFalse(Application.exists());
+ assertFalse(Session.exists());
sessionFilter.doFilter(tester.getRequest(), tester.getResponse(),
new TestFilterChain());
- Assert.assertFalse(Application.exists());
- Assert.assertFalse(Session.exists());
+ assertFalse(Application.exists());
+ assertFalse(Session.exists());
}
catch (Exception e)
@@ -115,7 +116,7 @@ public class WicketSessionFilterTest extends WicketTestCase
testThread.start();
testThread.join(Duration.seconds(1).getMilliseconds());
- Assert.assertTrue(failMessage.toString(), passed.get());
+ assertTrue(passed.get(), failMessage.toString());
}
/**
@@ -124,7 +125,7 @@ public class WicketSessionFilterTest extends WicketTestCase
*/
private static class TestSessionFilter extends WicketSessionFilter
{
- public TestSessionFilter(final WicketTester tester) throws ServletException
+ TestSessionFilter(final WicketTester tester) throws ServletException
{
init(new FilterConfig()
{
[09/45] wicket git commit: wicket-core: Migrate to Junit 5
Posted by mg...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/tester/TagTesterTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/TagTesterTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/TagTesterTest.java
index d4fe36e..1f040f1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/TagTesterTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/TagTesterTest.java
@@ -16,21 +16,22 @@
*/
package org.apache.wicket.util.tester;
-import static org.hamcrest.Matchers.endsWith;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
+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.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test of TagTester
*/
-public class TagTesterTest extends Assert
+class TagTesterTest
{
/** Mock markup 1 */
private static final String MARKUP_1 = "<p id=\"test\" class=\"class1\"><span class=\"class2\" id=\"test2\">mock</span></p>";
@@ -45,7 +46,7 @@ public class TagTesterTest extends Assert
* WICKET-6278
*/
@Test
- public void tagNoRequiredClose() {
+ void tagNoRequiredClose() {
TagTester tester = TagTester.createTagByAttribute(NON_CLOSED_INPUT, "wicket:id", "p");
assertEquals("<input wicket:id=\"wicketId\" type=\"text\">", tester.getValue());
@@ -55,38 +56,38 @@ public class TagTesterTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-5874
*/
@Test
- public void getTagTesterForNonClosedTag()
+ void getTagTesterForNonClosedTag()
{
TagTester tester = TagTester.createTagByAttribute(NON_CLOSED_INPUT, "wicket:id", "wicketId");
- assertThat(tester, is(notNullValue()));
+ assertNotNull(tester);
String type = tester.getAttribute("type");
- assertThat(type, is(equalTo("text")));
+ assertEquals("text", type);
- assertThat(tester.getValue(), is(nullValue()));
+ assertNull(tester.getValue());
}
/**
* https://issues.apache.org/jira/browse/WICKET-6172
*/
@Test
- public void getTagTestersForNonClosedTag()
+ void getTagTestersForNonClosedTag()
{
List<TagTester> testers = TagTester.createTagsByAttribute(NON_CLOSED_INPUT, "wicket:id", "wicketId", false);
- assertThat(testers, is(notNullValue()));
- assertThat(testers.size(), is(1));
+ assertNotNull(testers);
+ assertEquals(1, testers.size());
String type = testers.get(0).getAttribute("type");
- assertThat(type, is(equalTo("text")));
+ assertEquals("text", type);
- assertThat(testers.get(0).getValue(), is(nullValue()));
+ assertNull(testers.get(0).getValue());
}
/**
* https://issues.apache.org/jira/browse/WICKET-5137
*/
@Test
- public void getTagInAjaxResponse()
+ void getTagInAjaxResponse()
{
TagTester tester = TagTester.createTagByAttribute(AJAX_MARKUP_1, "id", "compId");
assertNotNull(tester);
@@ -99,7 +100,7 @@ public class TagTesterTest extends Assert
* Test the static factory method
*/
@Test
- public void createTagByAttribute()
+ void createTagByAttribute()
{
TagTester tester = TagTester.createTagByAttribute(null, null, null);
assertNull(tester);
@@ -118,7 +119,7 @@ public class TagTesterTest extends Assert
* Test that getName returns the correct tag name.
*/
@Test
- public void getName()
+ void getName()
{
TagTester tester = TagTester.createTagByAttribute(MARKUP_1, "id", "test");
assertNotNull(tester);
@@ -138,7 +139,7 @@ public class TagTesterTest extends Assert
* It also tests that the order of the attributes doesn't matter.
*/
@Test
- public void hasAttribute()
+ void hasAttribute()
{
TagTester tester = TagTester.createTagByAttribute(MARKUP_1, "id", "test");
assertNotNull(tester);
@@ -158,7 +159,7 @@ public class TagTesterTest extends Assert
* If the attribute doesn't exist on the tag, the method should return null.
*/
@Test
- public void getAttribute()
+ void getAttribute()
{
TagTester tester = TagTester.createTagByAttribute(MARKUP_1, "id", "test");
assertNotNull(tester);
@@ -195,7 +196,7 @@ public class TagTesterTest extends Assert
* value. It should not be case in-sensitive and not trim the attribute value.
*/
@Test
- public void getAttributeContains()
+ void getAttributeContains()
{
TagTester tester = TagTester.createTagByAttribute(MARKUP_1, "id", "test");
assertNotNull(tester);
@@ -217,7 +218,7 @@ public class TagTesterTest extends Assert
* exactly the same as the parameter.
*/
@Test
- public void getAttributeIs()
+ void getAttributeIs()
{
TagTester tester = TagTester.createTagByAttribute(MARKUP_1, "id", "test");
assertNotNull(tester);
@@ -237,7 +238,7 @@ public class TagTesterTest extends Assert
* be contained must only be at the end.
*/
@Test
- public void getAttributeEndsWith()
+ void getAttributeEndsWith()
{
TagTester tester = TagTester.createTagByAttribute(MARKUP_1, "id", "test");
assertNotNull(tester);
@@ -257,7 +258,7 @@ public class TagTesterTest extends Assert
*
*/
@Test
- public void hasChildTag()
+ void hasChildTag()
{
TagTester tester = TagTester.createTagByAttribute(MARKUP_1, "id", "test");
@@ -303,7 +304,7 @@ public class TagTesterTest extends Assert
}
@Test
- public void getChildByTagName()
+ void getChildByTagName()
{
TagTester tester = TagTester.createTagByAttribute(
"<div id=\"id\">" +
@@ -313,19 +314,19 @@ public class TagTesterTest extends Assert
"</label>" +
"</div>" +
"</div>", "id", "id");
- assertThat(tester.getChild("DIV"), is(notNullValue())); // case-insensitive
+ assertNotNull(tester.getChild("DIV")); // case-insensitive
TagTester divClassRadioTagTester = tester.getChild("div");
- assertThat(divClassRadioTagTester, is(notNullValue()));
+ assertNotNull(divClassRadioTagTester);
TagTester labelTagTester = divClassRadioTagTester.getChild("label");
String labelMarkup = labelTagTester.getValue();
- assertThat(labelMarkup, endsWith(" One"));
+ assertThat(labelMarkup).endsWith(" One");
}
/**
* Test getMarkup returns the open-tag + content + close-tag
*/
@Test
- public void getMarkup()
+ void getMarkup()
{
TagTester tagTester = TagTester.createTagByAttribute(MARKUP_1, "id", "test2");
@@ -336,7 +337,7 @@ public class TagTesterTest extends Assert
* Test getValue returns the data between the open and close tag.
*/
@Test
- public void getValue()
+ void getValue()
{
TagTester tagTester = TagTester.createTagByAttribute(MARKUP_1, "id", "test2");
assertEquals("mock", tagTester.getValue());
@@ -350,7 +351,7 @@ public class TagTesterTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-6173
*/
@Test
- public void valueFromTagsByAttribute()
+ void valueFromTagsByAttribute()
{
TagTester tagTester = TagTester.createTagByAttribute(MARKUP_1, "id", "test2");
assertEquals("mock", tagTester.getValue());
@@ -398,7 +399,7 @@ public class TagTesterTest extends Assert
* WICKET-6220
*/
@Test
- public void testOpenAndClose() {
+ void testOpenAndClose() {
List<TagTester> tags = TagTester.createTagsByAttribute(MARKUP, "wicket:id", "item", false);
assertEquals(2, tags.size());
assertEquals("li", tags.get(0).getName());
@@ -413,7 +414,7 @@ public class TagTesterTest extends Assert
* WICKET-6220
*/
@Test
- public void testWrongHtmlStructure() {
+ void testWrongHtmlStructure() {
List<TagTester> tags = TagTester.createTagsByAttribute(WRONG_MARKUP, "wicket:id", "p", false);
assertEquals(1, tags.size());
assertEquals("span", tags.get(0).getName());
@@ -425,7 +426,7 @@ public class TagTesterTest extends Assert
* WICKET-6220
*/
@Test
- public void testOpenOrClose() {
+ void testOpenOrClose() {
List<TagTester> tags = TagTester.createTagsByAttribute(MARKUP, "wicket:id", "p", false);
assertEquals(2, tags.size());
assertEquals("p", tags.get(0).getName());
@@ -440,7 +441,7 @@ public class TagTesterTest extends Assert
* WICKET-6220
*/
@Test
- public void testOpen() {
+ void testOpen() {
List<TagTester> tags = TagTester.createTagsByAttribute(MARKUP, "wicket:id", "img", false);
assertEquals(2, tags.size());
assertEquals("img", tags.get(0).getName());
@@ -455,7 +456,7 @@ public class TagTesterTest extends Assert
* WICKET-6220
*/
@Test
- public void testOpenClose() {
+ void testOpenClose() {
List<TagTester> tags = TagTester.createTagsByAttribute(MARKUP, "wicket:id", "hr", false);
assertEquals(2, tags.size());
assertEquals("hr", tags.get(0).getName());
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterClickExternalLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterClickExternalLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterClickExternalLinkTest.java
index 7cab37e..5789165 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterClickExternalLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterClickExternalLinkTest.java
@@ -18,15 +18,15 @@ package org.apache.wicket.util.tester;
import org.apache.wicket.MockPageWithLink;
import org.apache.wicket.markup.html.link.ExternalLink;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for https://issues.apache.org/jira/browse/WICKET-5840
*/
-public class WicketTesterClickExternalLinkTest extends WicketTestCase
+class WicketTesterClickExternalLinkTest extends WicketTestCase
{
@Test
- public void clickExternalLink()
+ void clickExternalLink()
{
MockPageWithLink page = new MockPageWithLink();
String href = "http://wicket.apache.org";
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterCookieTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterCookieTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterCookieTest.java
index c99b1e6..c4aa53c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterCookieTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterCookieTest.java
@@ -16,13 +16,17 @@
*/
package org.apache.wicket.util.tester;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-
import javax.servlet.http.Cookie;
import org.apache.wicket.protocol.http.mock.Cookies;
@@ -30,21 +34,101 @@ import org.apache.wicket.util.tester.apps_1.CreateBook;
import org.apache.wicket.util.tester.cookies.CollectAllRequestCookiesPage;
import org.apache.wicket.util.tester.cookies.EndPage;
import org.apache.wicket.util.tester.cookies.SetCookiePage;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* test code for wicket tester cookie handling
*
* @author mosmann
*/
-public class WicketTesterCookieTest extends WicketTestCase
+class WicketTesterCookieTest extends WicketTestCase
{
/**
+ * creates a new cookie with maxAge set
+ *
+ * @param name
+ * name
+ * @param value
+ * value
+ * @param maxAge
+ * maxAge
+ * @return a cookie
+ */
+ private static Cookie newCookie(String name, String value, int maxAge)
+ {
+ Cookie cookie = new Cookie(name, value);
+ cookie.setMaxAge(maxAge);
+ return cookie;
+ }
+
+ /**
+ * make cookie map more readable
+ *
+ * @param cookieMap
+ * cookie map
+ * @return string
+ */
+ private static String asString(Map<String, Cookie> cookieMap)
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append('{');
+ for (Map.Entry<String, Cookie> e : cookieMap.entrySet())
+ {
+ sb.append(e.getKey()).append('=').append(asString(e.getValue()));
+ sb.append(",");
+ }
+ sb.append('}');
+ return sb.toString();
+ }
+
+ /**
+ * make cookie more readable
+ *
+ * @param c
+ * cookie
+ * @return string
+ */
+ private static String asString(Cookie c)
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append('[');
+ sb.append("name=").append(c.getName()).append(',');
+ sb.append("value=").append(c.getValue()).append(',');
+ sb.append("maxAge=").append(c.getMaxAge());
+ sb.append(']');
+ return sb.toString();
+ }
+
+ /**
+ * create a cookie map based on cookie name
+ *
+ * @param cookies
+ * cookie list
+ * @return as map
+ * @throws RuntimeException
+ * if more than one cookie with the same name
+ */
+ private static Map<String, Cookie> cookiesFromList(List<Cookie> cookies)
+ {
+ Map<String, Cookie> ret = new LinkedHashMap<String, Cookie>();
+ for (Cookie cookie : cookies)
+ {
+ Cookie oldValue = ret.put(cookie.getName(), cookie);
+ if (oldValue != null)
+ {
+ throw new RuntimeException(
+ String.format("Cookie with name '%s' ('%s') already in map %s",
+ cookie.getName(), asString(oldValue), asString(ret)));
+ }
+ }
+ return ret;
+ }
+
+ /**
*
*/
@Test
- public void cookieIsFoundWhenAddedToRequest()
+ void cookieIsFoundWhenAddedToRequest()
{
tester.getRequest().addCookie(new Cookie("name", "value"));
assertEquals("value", tester.getRequest().getCookie("name").getValue());
@@ -54,20 +138,20 @@ public class WicketTesterCookieTest extends WicketTestCase
*
*/
@Test
- public void cookieIsFoundWhenAddedToResponse()
+ void cookieIsFoundWhenAddedToResponse()
{
tester.startPage(CreateBook.class);
tester.getLastResponse().addCookie(new Cookie("name", "value"));
Collection<Cookie> cookies = tester.getLastResponse().getCookies();
assertEquals(cookies.iterator().next().getValue(), "value");
}
-
+
/**
* Tests that setting a cookie with age > 0 before creating the page will survive after the
* rendering of the page and it will be used for the next request cycle.
*/
@Test
- public void transferCookies()
+ void transferCookies()
{
String cookieName = "wicket4289Name";
String cookieValue = "wicket4289Value";
@@ -97,7 +181,7 @@ public class WicketTesterCookieTest extends WicketTestCase
* Tests that setting a cookie with age == 0 will not be stored after the request cycle.
*/
@Test
- public void dontTransferCookiesWithNegativeAge()
+ void dontTransferCookiesWithNegativeAge()
{
String cookieName = "wicket4289Name";
String cookieValue = "wicket4289Value";
@@ -119,7 +203,7 @@ public class WicketTesterCookieTest extends WicketTestCase
* Tests that setting a cookie with age < 0 will not be stored after the request cycle.
*/
@Test
- public void dontTransferCookiesWithZeroAge()
+ void dontTransferCookiesWithZeroAge()
{
String cookieName = "wicket4289Name";
String cookieValue = "wicket4289Value";
@@ -138,73 +222,72 @@ public class WicketTesterCookieTest extends WicketTestCase
}
/**
- * A cookie set in the request headers should not be
- * expected in the response headers unless the page
- * sets it explicitly.
+ * A cookie set in the request headers should not be expected in the response headers unless the
+ * page sets it explicitly.
*
* https://issues.apache.org/jira/browse/WICKET-4989
*/
@Test
- public void cookieSetInRequestShouldNotBeInResponse()
+ void cookieSetInRequestShouldNotBeInResponse()
{
- //start and render the test page
+ // start and render the test page
tester.getRequest().addCookie(new Cookie("dummy", "sample"));
tester.startPage(tester.getApplication().getHomePage());
- //assert rendered page class
+ // assert rendered page class
tester.assertRenderedPage(tester.getApplication().getHomePage());
- Assert.assertEquals("The cookie should not be in the response unless explicitly set",
- 0, tester.getLastResponse().getCookies().size());
+ assertEquals(0, tester.getLastResponse().getCookies().size(),
+ "The cookie should not be in the response unless explicitly set");
// The cookie should be in each following request unless the server code
// schedules it for removal it with cookie.setMaxAge(0)
- Assert.assertEquals("The cookie should be in each following request",
- 1, tester.getRequest().getCookies().length);
+ assertEquals(1, tester.getRequest().getCookies().length,
+ "The cookie should be in each following request");
}
/**
- * The response cookie should not be the same instance as the request
- * cookie.
+ * The response cookie should not be the same instance as the request cookie.
*
* https://issues.apache.org/jira/browse/WICKET-4989
*/
@Test
- public void doNotReuseTheSameInstanceOfTheCookieForRequestAndResponse()
+ void doNotReuseTheSameInstanceOfTheCookieForRequestAndResponse()
{
- //start and render the test page
+ // start and render the test page
String cookieName = "cookieName";
String cookieValue = "cookieValue";
Cookie requestCookie = new Cookie(cookieName, cookieValue);
tester.getRequest().addCookie(requestCookie);
tester.startPage(new CookiePage(cookieName, cookieValue));
- //assert rendered page class
+ // assert rendered page class
tester.assertRenderedPage(CookiePage.class);
Cookie responseCookie = tester.getLastResponse().getCookies().get(0);
requestCookie.setValue("valueChanged");
- Assert.assertEquals(cookieValue, responseCookie.getValue());
+ assertEquals(cookieValue, responseCookie.getValue());
}
/**
* @see WicketTester
- *
- * TODO add a cookie to request, which should override cookie from last response and last request
- * https://issues.apache.org/jira/browse/WICKET-5147
+ *
+ * TODO add a cookie to request, which should override cookie from last response and last
+ * request https://issues.apache.org/jira/browse/WICKET-5147
*/
@Test
- public void wicketTesterCookieHandlingWithoutRedirect() {
+ void wicketTesterCookieHandlingWithoutRedirect()
+ {
// no cookies set
CollectAllRequestCookiesPage collectingPage = collectAllRequestCookiesOnThisPage();
- Assert.assertTrue("no cookie in first request",collectingPage.getCookies().isEmpty());
+ assertTrue(collectingPage.getCookies().isEmpty(), "no cookie in first request");
lastResponseDoesNotHaveAnyCookies();
responseDoesNotHaveAnyCookies();
requestDoesNotHaveAnyCookies();
-
+
// set cookie on request
- Cookie firstCookie = newCookie("a","firstValue",1);
+ Cookie firstCookie = newCookie("a", "firstValue", 1);
tester.getRequest().addCookie(firstCookie);
collectingPage = collectAllRequestCookiesOnThisPage();
requestOnPageShouldHaveTheseCookies(collectingPage, firstCookie);
@@ -220,24 +303,24 @@ public class WicketTesterCookieTest extends WicketTestCase
responseDoesNotHaveAnyCookies();
// cookie will be overwritten if response will do so
- Cookie cookieSetInResponse = newCookie("a","overwriteWithNewValue",1);
+ Cookie cookieSetInResponse = newCookie("a", "overwriteWithNewValue", 1);
setCookieInResponse(cookieSetInResponse);
lastResponseShouldHaveTheseCookies(cookieSetInResponse);
requestShouldHaveTheseCookies(cookieSetInResponse);
-
+
// cookies from last response then should appear on following requests
collectingPage = collectAllRequestCookiesOnThisPage();
requestOnPageShouldHaveTheseCookies(collectingPage, cookieSetInResponse);
lastResponseDoesNotHaveAnyCookies();
requestShouldHaveTheseCookies(cookieSetInResponse);
-
+
// cookies from requests will be deleted if the response will do so
- Cookie expiredCookieSetInResponse = newCookie("a","removeMe",0);
+ Cookie expiredCookieSetInResponse = newCookie("a", "removeMe", 0);
setCookieInResponse(expiredCookieSetInResponse);
lastResponseShouldHaveTheseCookies(expiredCookieSetInResponse);
responseDoesNotHaveAnyCookies();
requestDoesNotHaveAnyCookies();
-
+
// no cookies in next request while last cookie was deleted
collectingPage = collectAllRequestCookiesOnThisPage();
requestOnPageShouldHaveTheseCookies(collectingPage);
@@ -248,48 +331,49 @@ public class WicketTesterCookieTest extends WicketTestCase
/**
* @see WicketTesterCookieTest#wicketTesterCookieHandlingWithoutRedirect()
- *
- * https://issues.apache.org/jira/browse/WICKET-5147
+ *
+ * https://issues.apache.org/jira/browse/WICKET-5147
*/
@Test
- public void wicketTesterCookieHandlingWithRedirect() {
+ void wicketTesterCookieHandlingWithRedirect()
+ {
// set cookie in response then redirect to other page
- Cookie firstCookie = newCookie("a","firstValue",1);
+ Cookie firstCookie = newCookie("a", "firstValue", 1);
setCookieInResponseAndRedirect(firstCookie);
lastResponseShouldHaveTheseCookies(firstCookie);
requestShouldHaveTheseCookies(firstCookie);
// cookie in response after redirect should appear in next request
CollectAllRequestCookiesPage collectingPage = collectAllRequestCookiesOnThisPage();
- requestOnPageShouldHaveTheseCookies(collectingPage,firstCookie);
+ requestOnPageShouldHaveTheseCookies(collectingPage, firstCookie);
lastResponseDoesNotHaveAnyCookies();
requestShouldHaveTheseCookies(firstCookie);
responseDoesNotHaveAnyCookies();
-
+
// set cookie on request and overwrite in response then redirect to other page
- Cookie cookieSetInRequest = newCookie("a","valueFromRequest",1);
- Cookie cookieSetInResponse = newCookie("a","overwriteInResponse",1);
+ Cookie cookieSetInRequest = newCookie("a", "valueFromRequest", 1);
+ Cookie cookieSetInResponse = newCookie("a", "overwriteInResponse", 1);
tester.getRequest().addCookie(cookieSetInRequest);
setCookieInResponseAndRedirect(cookieSetInResponse);
lastResponseShouldHaveTheseCookies(cookieSetInResponse);
requestShouldHaveTheseCookies(cookieSetInResponse);
-
+
// cookie in response after redirect should appear in next request
collectingPage = collectAllRequestCookiesOnThisPage();
- requestOnPageShouldHaveTheseCookies(collectingPage,cookieSetInResponse);
+ requestOnPageShouldHaveTheseCookies(collectingPage, cookieSetInResponse);
lastResponseDoesNotHaveAnyCookies();
requestShouldHaveTheseCookies(cookieSetInResponse);
responseDoesNotHaveAnyCookies();
-
+
// set cookie on request and remove it in response then redirect to other page
- Cookie nextCookieSetInRequest = newCookie("a","nextValueFromRequest",1);
- Cookie nextCookieSetInResponse = newCookie("a","newValue",0);
+ Cookie nextCookieSetInRequest = newCookie("a", "nextValueFromRequest", 1);
+ Cookie nextCookieSetInResponse = newCookie("a", "newValue", 0);
tester.getRequest().addCookie(nextCookieSetInRequest);
setCookieInResponseAndRedirect(nextCookieSetInResponse);
lastResponseShouldHaveTheseCookies(nextCookieSetInResponse);
requestDoesNotHaveAnyCookies();
responseDoesNotHaveAnyCookies();
-
+
// no cookies left
collectingPage = collectAllRequestCookiesOnThisPage();
requestOnPageShouldHaveTheseCookies(collectingPage);
@@ -297,22 +381,10 @@ public class WicketTesterCookieTest extends WicketTestCase
requestDoesNotHaveAnyCookies();
responseDoesNotHaveAnyCookies();
}
-
- /**
- * creates a new cookie with maxAge set
- * @param name name
- * @param value value
- * @param maxAge maxAge
- * @return a cookie
- */
- private static Cookie newCookie(String name,String value, int maxAge) {
- Cookie cookie = new Cookie(name,value);
- cookie.setMaxAge(maxAge);
- return cookie;
- }
-
+
/**
- * start a page which collects all cookies from request
+ * start a page which collects all cookies from request
+ *
* @return the page
*/
private CollectAllRequestCookiesPage collectAllRequestCookiesOnThisPage()
@@ -322,7 +394,9 @@ public class WicketTesterCookieTest extends WicketTestCase
/**
* start a page which set a cookie in response
- * @param cookie cookie
+ *
+ * @param cookie
+ * cookie
*/
private void setCookieInResponse(Cookie cookie)
{
@@ -331,88 +405,74 @@ public class WicketTesterCookieTest extends WicketTestCase
/**
* start a page which set a cookie in response and then redirect to different page
- * @param cookie cookie
+ *
+ * @param cookie
+ * cookie
*/
private void setCookieInResponseAndRedirect(Cookie cookie)
{
- tester.startPage(new SetCookiePage(cookie,EndPage.class));
+ tester.startPage(new SetCookiePage(cookie, EndPage.class));
}
/**
* check cookies collected by page
- * @param page page
- * @param cookies cookies
+ *
+ * @param page
+ * page
+ * @param cookies
+ * cookies
*/
- private void requestOnPageShouldHaveTheseCookies(CollectAllRequestCookiesPage page, Cookie...cookies) {
+ private void requestOnPageShouldHaveTheseCookies(CollectAllRequestCookiesPage page,
+ Cookie... cookies)
+ {
listShouldMatchAll(page.getCookies(), cookies);
}
/**
* check cookies in current request
- * @param cookies cookies
+ *
+ * @param cookies
+ * cookies
*/
- private void requestShouldHaveTheseCookies(Cookie...cookies) {
+ private void requestShouldHaveTheseCookies(Cookie... cookies)
+ {
Cookie[] cookieFromRequest = tester.getRequest().getCookies();
- listShouldMatchAll(cookieFromRequest!=null ? Arrays.asList(cookieFromRequest) : new ArrayList<Cookie>(), cookies);
+ listShouldMatchAll(
+ cookieFromRequest != null ? Arrays.asList(cookieFromRequest) : new ArrayList<Cookie>(),
+ cookies);
}
-
+
/**
- * check if every cookie is found in the list and no cookie is left
- * @param cookieList cookie list
- * @param cookies cookies to check
+ * check if every cookie is found in the list and no cookie is left
+ *
+ * @param cookieList
+ * cookie list
+ * @param cookies
+ * cookies to check
*/
private void listShouldMatchAll(List<Cookie> cookieList, Cookie... cookies)
{
Map<String, Cookie> cookieMap = cookiesFromList(cookieList);
- for (Cookie cookie : cookies) {
+ for (Cookie cookie : cookies)
+ {
Cookie removed = cookieMap.remove(cookie.getName());
- Assert.assertNotNull("Cookie "+cookie.getName(),removed);
- Assert.assertTrue("Cookie "+cookie.getName()+" matches",Cookies.isEqual(cookie, removed));
+ assertNotNull(removed, "Cookie " + cookie.getName());
+ assertTrue(Cookies.isEqual(cookie, removed), "Cookie " + cookie.getName() + " matches");
}
- Assert.assertTrue("no cookies left "+asString(cookieMap),cookieMap.isEmpty());
- }
-
- /**
- * make cookie map more readable
- * @param cookieMap cookie map
- * @return string
- */
- private static String asString(Map<String, Cookie> cookieMap)
- {
- StringBuilder sb=new StringBuilder();
- sb.append('{');
- for (Map.Entry<String, Cookie> e : cookieMap.entrySet()) {
- sb.append(e.getKey()).append('=').append(asString(e.getValue()));
- sb.append(",");
- }
- sb.append('}');
- return sb.toString();
- }
-
- /**
- * make cookie more readable
- * @param c cookie
- * @return string
- */
- private static String asString(Cookie c)
- {
- StringBuilder sb=new StringBuilder();
- sb.append('[');
- sb.append("name=").append(c.getName()).append(',');
- sb.append("value=").append(c.getValue()).append(',');
- sb.append("maxAge=").append(c.getMaxAge());
- sb.append(']');
- return sb.toString();
+ assertTrue(cookieMap.isEmpty(), "no cookies left " + asString(cookieMap));
}
/**
* check last response cookies
- * @param cookies cookies
+ *
+ * @param cookies
+ * cookies
*/
- private void lastResponseShouldHaveTheseCookies(Cookie...cookies) {
+ private void lastResponseShouldHaveTheseCookies(Cookie... cookies)
+ {
listShouldMatchAll(tester.getLastResponse().getCookies(), cookies);
}
-
+
/**
* response should not have any cookies
*/
@@ -420,7 +480,7 @@ public class WicketTesterCookieTest extends WicketTestCase
{
listShouldMatchAll(tester.getLastResponse().getCookies());
}
-
+
/**
* response should not have any cookies
*/
@@ -428,7 +488,7 @@ public class WicketTesterCookieTest extends WicketTestCase
{
listShouldMatchAll(tester.getResponse().getCookies());
}
-
+
/**
* request should not have any cookies
*/
@@ -436,25 +496,5 @@ public class WicketTesterCookieTest extends WicketTestCase
{
requestShouldHaveTheseCookies();
}
-
- /**
- * create a cookie map based on cookie name
- * @param cookies cookie list
- * @return as map
- * @throws RuntimeException if more than one cookie with the same name
- */
- private static Map<String,Cookie> cookiesFromList(List<Cookie> cookies) {
- Map<String, Cookie> ret = new LinkedHashMap<String, Cookie>();
- for (Cookie cookie : cookies)
- {
- Cookie oldValue = ret.put(cookie.getName(), cookie);
- if (oldValue != null)
- {
- throw new RuntimeException(String.format("Cookie with name '%s' ('%s') already in map %s",
- cookie.getName(), asString(oldValue), asString(ret)));
- }
- }
- return ret;
- }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessBase.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessBase.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessBase.java
index 18ef601..fb62b82 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessBase.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessBase.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.util.tester;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -27,12 +29,12 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* https://issues.apache.org/jira/browse/WICKET-5426
*/
-public abstract class WicketTesterLazyIsPageStatelessBase extends WicketTestCase
+abstract class WicketTesterLazyIsPageStatelessBase extends WicketTestCase
{
/**
* The page must be stateless because the stateful component
@@ -41,7 +43,7 @@ public abstract class WicketTesterLazyIsPageStatelessBase extends WicketTestCase
* @throws Exception
*/
@Test
- public void isStateless() throws Exception
+ void isStateless() throws Exception
{
tester.startPage(MyPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessOnePassTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessOnePassTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessOnePassTest.java
index 8787dc4..1bfd770 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessOnePassTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessOnePassTest.java
@@ -23,7 +23,7 @@ import org.apache.wicket.settings.RequestCycleSettings;
/**
* https://issues.apache.org/jira/browse/WICKET-5426
*/
-public class WicketTesterLazyIsPageStatelessOnePassTest extends WicketTesterLazyIsPageStatelessBase
+class WicketTesterLazyIsPageStatelessOnePassTest extends WicketTesterLazyIsPageStatelessBase
{
@Override
protected WebApplication newApplication()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToBufferTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToBufferTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToBufferTest.java
index 6a41fe6..c7f3c48 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToBufferTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToBufferTest.java
@@ -25,7 +25,7 @@ import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.settings.RequestCycleSettings;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* https://issues.apache.org/jira/browse/WICKET-5426
@@ -54,7 +54,7 @@ public class WicketTesterLazyIsPageStatelessRedirectToBufferTest extends WicketT
* @throws Exception
*/
@Test
- public void statelessListenerInvoked() throws Exception
+ void statelessListenerInvoked() throws Exception
{
tester.startPage(StatelessListenerPage.class);
tester.assertRenderedPage(StatelessListenerPage.class);
@@ -67,7 +67,7 @@ public class WicketTesterLazyIsPageStatelessRedirectToBufferTest extends WicketT
public static class StatelessListenerPage extends MyPage
{
- public StatelessListenerPage()
+ public StatelessListenerPage()
{
super();
add(new StatelessForm("statelessForm")
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToRenderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToRenderTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToRenderTest.java
index 0f228e5..5cec01a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToRenderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToRenderTest.java
@@ -23,7 +23,7 @@ import org.apache.wicket.settings.RequestCycleSettings;
/**
* https://issues.apache.org/jira/browse/WICKET-5426
*/
-public class WicketTesterLazyIsPageStatelessRedirectToRenderTest extends WicketTesterLazyIsPageStatelessBase
+class WicketTesterLazyIsPageStatelessRedirectToRenderTest extends WicketTesterLazyIsPageStatelessBase
{
@Override
protected WebApplication newApplication()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterSessionCreationTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterSessionCreationTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterSessionCreationTest.java
index 225570b..efda451 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterSessionCreationTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterSessionCreationTest.java
@@ -16,14 +16,16 @@
*/
package org.apache.wicket.util.tester;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.Locale;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* WICKET-1215
*/
-public class WicketTesterSessionCreationTest extends WicketTestCase
+class WicketTesterSessionCreationTest extends WicketTestCase
{
private static Locale EXPECTED = Locale.FRENCH;
@@ -32,7 +34,7 @@ public class WicketTesterSessionCreationTest extends WicketTestCase
* WicketTester recreates session after setting attributes on it
*/
@Test
- public void wicket1215()
+ void wicket1215()
{
tester.getSession().setLocale(EXPECTED);
tester.startPage(LocalePage.class);
@@ -45,7 +47,7 @@ public class WicketTesterSessionCreationTest extends WicketTestCase
private static final long serialVersionUID = 1L;
/***/
- public LocalePage()
+ public LocalePage()
{
assertEquals(EXPECTED, getSession().getLocale());
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterSessionInvalidateTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterSessionInvalidateTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterSessionInvalidateTest.java
index da14cec..ce207f4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterSessionInvalidateTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterSessionInvalidateTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.util.tester;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.html.WebPage;
@@ -23,18 +26,18 @@ import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*/
-public class WicketTesterSessionInvalidateTest extends WicketTestCase
+class WicketTesterSessionInvalidateTest extends WicketTestCase
{
/**
* https://issues.apache.org/jira/browse/WICKET-3212
*/
@Test
- public void sessionInvalidate()
+ void sessionInvalidate()
{
tester.startPage(MyPage.class);
@@ -61,7 +64,7 @@ public class WicketTesterSessionInvalidateTest extends WicketTestCase
*
* @param pageParameters
*/
- public MyPage(PageParameters pageParameters)
+ public MyPage(PageParameters pageParameters)
{
super(pageParameters);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
index 33ea646..1d967f1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
@@ -16,10 +16,17 @@
*/
package org.apache.wicket.util.tester;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.util.List;
import java.util.Locale;
import java.util.concurrent.atomic.AtomicBoolean;
-
import javax.servlet.http.HttpServletResponse;
import org.apache.wicket.Component;
@@ -43,7 +50,6 @@ import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Button;
-import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.link.Link;
@@ -75,22 +81,22 @@ import org.apache.wicket.util.tester.apps_1.ViewBook;
import org.apache.wicket.util.tester.apps_6.LinkPage;
import org.apache.wicket.util.tester.apps_6.ResultPage;
import org.apache.wicket.util.tester.apps_8.ComponentFeedbackResourceTestingPage;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* @see WicketTesterCookieTest for cookie related test
* @author Juergen Donnerstag
*/
-public class WicketTesterTest extends WicketTestCase
+class WicketTesterTest extends WicketTestCase
{
private boolean eventExecuted;
/**
* @throws Exception
*/
- @Before
- public void before() throws Exception
+ @BeforeEach
+ void before() throws Exception
{
eventExecuted = false;
}
@@ -106,7 +112,7 @@ public class WicketTesterTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void viewBook() throws Exception
+ void viewBook() throws Exception
{
Book mockBook = new Book("xxId", "xxName");
Page page = new ViewBook(mockBook);
@@ -123,7 +129,7 @@ public class WicketTesterTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void createBook_validateFail() throws Exception
+ void createBook_validateFail() throws Exception
{
Session.get().setLocale(Locale.US); // fix locale
tester.startPage(CreateBook.class);
@@ -145,7 +151,7 @@ public class WicketTesterTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void createBook_validatePass() throws Exception
+ void createBook_validatePass() throws Exception
{
tester.startPage(CreateBook.class);
@@ -169,7 +175,7 @@ public class WicketTesterTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void bookmarkableLink() throws Exception
+ void bookmarkableLink() throws Exception
{
// for WebPage without default constructor, I define a TestPageSource to
// let the page be instatiated lately.
@@ -186,7 +192,7 @@ public class WicketTesterTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void clickLink_setResponsePageClass() throws Exception
+ void clickLink_setResponsePageClass() throws Exception
{
tester.startPage(LinkPage.class);
tester.assertRenderedPage(LinkPage.class);
@@ -201,7 +207,7 @@ public class WicketTesterTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void clickLink_setResponsePage() throws Exception
+ void clickLink_setResponsePage() throws Exception
{
tester.startPage(LinkPage.class);
tester.assertRenderedPage(LinkPage.class);
@@ -216,7 +222,7 @@ public class WicketTesterTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void clickLink_ajaxLink_setResponsePageClass() throws Exception
+ void clickLink_ajaxLink_setResponsePageClass() throws Exception
{
tester.startPage(LinkPage.class);
tester.assertRenderedPage(LinkPage.class);
@@ -233,13 +239,13 @@ public class WicketTesterTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void clickLink_ajaxLink_notEnabled() throws Exception
+ void clickLink_ajaxLink_notEnabled() throws Exception
{
tester.startPage(LinkPage.class);
tester.assertRenderedPage(LinkPage.class);
- tester.getComponentFromLastRenderedPage("ajaxLinkWithSetResponsePageClass").setEnabled(
- false);
+ tester.getComponentFromLastRenderedPage("ajaxLinkWithSetResponsePageClass")
+ .setEnabled(false);
try
{
tester.clickLink("ajaxLinkWithSetResponsePageClass");
@@ -257,13 +263,13 @@ public class WicketTesterTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void executeAjaxEvent_componentNotEnabled() throws Exception
+ void executeAjaxEvent_componentNotEnabled() throws Exception
{
tester.startPage(LinkPage.class);
tester.assertRenderedPage(LinkPage.class);
- tester.getComponentFromLastRenderedPage("ajaxLinkWithSetResponsePageClass").setEnabled(
- false);
+ tester.getComponentFromLastRenderedPage("ajaxLinkWithSetResponsePageClass")
+ .setEnabled(false);
try
{
tester.executeAjaxEvent("ajaxLinkWithSetResponsePageClass", "click");
@@ -281,13 +287,13 @@ public class WicketTesterTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void assertEnabled() throws Exception
+ void assertEnabled() throws Exception
{
tester.startPage(LinkPage.class);
tester.assertRenderedPage(LinkPage.class);
- tester.getComponentFromLastRenderedPage("ajaxLinkWithSetResponsePageClass").setEnabled(
- false);
+ tester.getComponentFromLastRenderedPage("ajaxLinkWithSetResponsePageClass")
+ .setEnabled(false);
try
{
tester.assertEnabled("ajaxLinkWithSetResponsePageClass");
@@ -305,7 +311,7 @@ public class WicketTesterTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void assertDisabled() throws Exception
+ void assertDisabled() throws Exception
{
tester.startPage(LinkPage.class);
tester.assertRenderedPage(LinkPage.class);
@@ -329,7 +335,7 @@ public class WicketTesterTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void assertRequired() throws Exception
+ void assertRequired() throws Exception
{
tester.startPage(CreateBook.class);
tester.assertRenderedPage(CreateBook.class);
@@ -337,7 +343,8 @@ public class WicketTesterTest extends WicketTestCase
// test #1: "id" is required by default
tester.assertRequired("createForm:id");
- FormComponent<?> bookId = (FormComponent<?>)tester.getComponentFromLastRenderedPage("createForm:id");
+ FormComponent<?> bookId = (FormComponent<?>)tester
+ .getComponentFromLastRenderedPage("createForm:id");
try
{
// test #2: set it manually to not required
@@ -365,7 +372,7 @@ public class WicketTesterTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void clickLink_ajaxLink_setResponsePage() throws Exception
+ void clickLink_ajaxLink_setResponsePage() throws Exception
{
tester.startPage(LinkPage.class);
tester.assertRenderedPage(LinkPage.class);
@@ -380,7 +387,7 @@ public class WicketTesterTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void clickLink_ajaxFallbackLink_setResponsePageClass() throws Exception
+ void clickLink_ajaxFallbackLink_setResponsePageClass() throws Exception
{
tester.startPage(LinkPage.class);
tester.assertRenderedPage(LinkPage.class);
@@ -395,7 +402,7 @@ public class WicketTesterTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void clickLink_ajaxFallbackLink_setResponsePage() throws Exception
+ void clickLink_ajaxFallbackLink_setResponsePage() throws Exception
{
tester.startPage(LinkPage.class);
tester.assertRenderedPage(LinkPage.class);
@@ -410,7 +417,7 @@ public class WicketTesterTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void clickLink_ajaxSubmitLink_setResponsePage() throws Exception
+ void clickLink_ajaxSubmitLink_setResponsePage() throws Exception
{
tester.startPage(LinkPage.class);
tester.assertRenderedPage(LinkPage.class);
@@ -425,7 +432,7 @@ public class WicketTesterTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void pageConstructor() throws Exception
+ void pageConstructor() throws Exception
{
Book mockBook = new Book("xxId", "xxName");
Page page = new ViewBook(mockBook);
@@ -443,7 +450,7 @@ public class WicketTesterTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void constructorAndInnerPage() throws Exception
+ void constructorAndInnerPage() throws Exception
{
tester.startPage(new MockInnerClassPage());
@@ -457,7 +464,7 @@ public class WicketTesterTest extends WicketTestCase
*
*/
@Test
- public void assertComponentOnAjaxResponse()
+ void assertComponentOnAjaxResponse()
{
final Page page = new MockPageWithLink();
AjaxLink<Void> ajaxLink = new AjaxLink<Void>(MockPageWithLink.LINK_ID)
@@ -507,7 +514,7 @@ public class WicketTesterTest extends WicketTestCase
* encoded.
*/
@Test
- public void assertComponentOnAjaxResponse_encoding()
+ void assertComponentOnAjaxResponse_encoding()
{
final IModel<String> labelModel = new IModel<String>()
{
@@ -567,7 +574,7 @@ public class WicketTesterTest extends WicketTestCase
* Test that the executeAjaxEvent on the WicketTester works.
*/
@Test
- public void executeAjaxEvent()
+ void executeAjaxEvent()
{
// Setup mocks
final MockPageWithOneComponent page = new MockPageWithOneComponent();
@@ -600,7 +607,7 @@ public class WicketTesterTest extends WicketTestCase
* Test that the clickLink works when submitting a form with a checkgroup inside.
*/
@Test
- public void clickLink_ajaxSubmitLink_checkGroup()
+ void clickLink_ajaxSubmitLink_checkGroup()
{
tester.startPage(MockPageWithFormAndCheckGroup.class);
@@ -613,7 +620,7 @@ public class WicketTesterTest extends WicketTestCase
* components WICKET-3053
*/
@Test
- public void clickLink_ajaxSubmitLink_preservesFormComponentValues()
+ void clickLink_ajaxSubmitLink_preservesFormComponentValues()
{
tester.startPage(MockPageAjaxSubmitLinkSubmitsWholeForm.class);
@@ -650,12 +657,13 @@ public class WicketTesterTest extends WicketTestCase
* Test that the executeAjaxEvent "submits" the form if the event is a AjaxFormSubmitBehavior.
*/
@Test
- public void executeAjaxEvent_ajaxFormSubmitLink()
+ void executeAjaxEvent_ajaxFormSubmitLink()
{
tester.startPage(MockPageWithFormAndAjaxFormSubmitBehavior.class);
// Get the page
- MockPageWithFormAndAjaxFormSubmitBehavior page = (MockPageWithFormAndAjaxFormSubmitBehavior)tester.getLastRenderedPage();
+ MockPageWithFormAndAjaxFormSubmitBehavior page = (MockPageWithFormAndAjaxFormSubmitBehavior)tester
+ .getLastRenderedPage();
Pojo pojo = page.getPojo();
@@ -670,8 +678,9 @@ public class WicketTesterTest extends WicketTestCase
// Execute the ajax event
tester.executeAjaxEvent(MockPageWithFormAndAjaxFormSubmitBehavior.EVENT_COMPONENT, "click");
- assertTrue("AjaxFormSubmitBehavior.onSubmit() has not been executed in " +
- MockPageWithFormAndAjaxFormSubmitBehavior.class, page.isExecuted());
+ assertTrue(page.isExecuted(),
+ "AjaxFormSubmitBehavior.onSubmit() has not been executed in " +
+ MockPageWithFormAndAjaxFormSubmitBehavior.class);
assertEquals("Mock name",
((TextField<?>)tester.getComponentFromLastRenderedPage("form:name")).getValue());
@@ -688,14 +697,15 @@ public class WicketTesterTest extends WicketTestCase
*
*/
@Test
- public void submittingFormWithAjaxEventSubmitsFormValues()
+ void submittingFormWithAjaxEventSubmitsFormValues()
{
tester.startPage(MockPageWithFormAndAjaxFormSubmitBehavior.class);
FormTester form = tester.newFormTester("form");
form.setValue("name", "New name");
tester.executeAjaxEvent(MockPageWithFormAndAjaxFormSubmitBehavior.EVENT_COMPONENT, "click");
- MockPageWithFormAndAjaxFormSubmitBehavior page = (MockPageWithFormAndAjaxFormSubmitBehavior)tester.getLastRenderedPage();
+ MockPageWithFormAndAjaxFormSubmitBehavior page = (MockPageWithFormAndAjaxFormSubmitBehavior)tester
+ .getLastRenderedPage();
Pojo pojo = page.getPojo();
assertEquals("New name", pojo.getName());
}
@@ -704,7 +714,7 @@ public class WicketTesterTest extends WicketTestCase
*
*/
@Test
- public void redirectWithPageParameters()
+ void redirectWithPageParameters()
{
tester.startPage(MockPageParameterPage.class);
@@ -724,7 +734,7 @@ public class WicketTesterTest extends WicketTestCase
* parameters
*/
@Test
- public void setQueryParameter()
+ void setQueryParameter()
{
tester.getRequest().setParameter("p1", "v1");
@@ -739,11 +749,12 @@ public class WicketTesterTest extends WicketTestCase
* query parameters
*/
@Test
- public void setQueryParameterWhenRequestHasAnQueryUrl()
+ void setQueryParameterWhenRequestHasAnQueryUrl()
{
PageParameters parameters = new PageParameters();
parameters.set("q_1", "q_1_value");
- IPageProvider testPageProvider = new PageProvider(MockPageParametersAware.class, parameters);
+ IPageProvider testPageProvider = new PageProvider(MockPageParametersAware.class,
+ parameters);
IRequestHandler pageRequestHandler = new BookmarkablePageRequestHandler(testPageProvider);
Url url = tester.getApplication().getRootRequestMapper().mapHandler(pageRequestHandler);
tester.getRequest().setParameter("q_2", "q_2_value");
@@ -752,20 +763,23 @@ public class WicketTesterTest extends WicketTestCase
tester.processRequest();
MockPageParametersAware page = (MockPageParametersAware)tester.getLastRenderedPage();
- assertEquals("q_1_value", page.getLastQueryParameters().getParameterValue("q_1").toString());
- assertEquals("q_2_value", page.getLastQueryParameters().getParameterValue("q_2").toString());
+ assertEquals("q_1_value",
+ page.getLastQueryParameters().getParameterValue("q_1").toString());
+ assertEquals("q_2_value",
+ page.getLastQueryParameters().getParameterValue("q_2").toString());
}
/**
* Asserting that multiple parameters added in request and PageParameters get processed
*/
@Test
- public void setMultiValueQueryParameter()
+ void setMultiValueQueryParameter()
{
PageParameters parameters = new PageParameters();
parameters.add("q_1", "q_1_value_1");
parameters.add("q_1", "q_1_value_2");
- IPageProvider testPageProvider = new PageProvider(MockPageParametersAware.class, parameters);
+ IPageProvider testPageProvider = new PageProvider(MockPageParametersAware.class,
+ parameters);
IRequestHandler pageRequestHandler = new BookmarkablePageRequestHandler(testPageProvider);
Url url = tester.getApplication().getRootRequestMapper().mapHandler(pageRequestHandler);
tester.getRequest().addParameter("q_2", "q_2_value_1");
@@ -788,7 +802,7 @@ public class WicketTesterTest extends WicketTestCase
* Asserting the parameters set by user in request get processed when submitting a form
*/
@Test
- public void parametersOnFormSubmit()
+ void parametersOnFormSubmit()
{
tester.startPage(MockPageParametersAware.class);
@@ -802,14 +816,15 @@ public class WicketTesterTest extends WicketTestCase
MockPageParametersAware page = (MockPageParametersAware)tester.getLastRenderedPage();
assertEquals("v1", page.getLastPostParameters().getParameterValue("textfield").toString());
assertEquals("p_1_value", page.getLastPostParameters().getParameterValue("p_1").toString());
- assertEquals("q_1_value", page.getLastQueryParameters().getParameterValue("q_1").toString());
+ assertEquals("q_1_value",
+ page.getLastQueryParameters().getParameterValue("q_1").toString());
}
/**
* Asserting the parameters set by user on request get processed when submitting a form
*/
@Test
- public void multiValueParametersOnFormSubmit()
+ void multiValueParametersOnFormSubmit()
{
tester.startPage(MockPageParametersAware.class);
@@ -823,25 +838,29 @@ public class WicketTesterTest extends WicketTestCase
MockPageParametersAware page = (MockPageParametersAware)tester.getLastRenderedPage();
assertEquals("v1", page.getLastPostParameters().getParameterValue("textfield").toString());
assertEquals("p_1_value", page.getLastPostParameters().getParameterValue("p_1").toString());
- assertEquals("q_1_value", page.getLastQueryParameters().getParameterValue("q_1").toString());
+ assertEquals("q_1_value",
+ page.getLastQueryParameters().getParameterValue("q_1").toString());
}
/**
* Loading of page markup resource should not be allowed
*/
- @Test(expected = PackageResourceBlockedException.class)
- public void loadPageMarkupTemplate()
+ @Test
+ void loadPageMarkupTemplate()
{
String url = "wicket/resource/" + BlockedResourceLinkPage.class.getName() + "/" +
BlockedResourceLinkPage.class.getSimpleName() + ".html";
- tester.executeUrl(url);
+
+ assertThrows(PackageResourceBlockedException.class, () -> {
+ tester.executeUrl(url);
+ });
}
/**
* WICKET-280 Allow to access html resources (non-page markup templates)
*/
@Test
- public void loadNonPageMarkupTemplate()
+ void loadNonPageMarkupTemplate()
{
String url = "wicket/resource/" + BlockedResourceLinkPage.class.getName() + "/test.html";
tester.executeUrl(url);
@@ -853,21 +872,21 @@ public class WicketTesterTest extends WicketTestCase
* (resource not found)
*/
@Test
- public void clickResourceLinkWithSomeCommaAppendedUrl()
+ void clickResourceLinkWithSomeCommaAppendedUrl()
{
String url = "wicket/resource/" + BlockedResourceLinkPage.class.getName() + "/" +
BlockedResourceLinkPage.class.getSimpleName() + ".html,xml";
tester.getRequest().setURL(url);
- assertFalse("Comma separated extensions are not supported and wont find any resource",
- tester.processRequest());
+ assertFalse(tester.processRequest(),
+ "Comma separated extensions are not supported and wont find any resource");
}
/**
* Toggle submit button to disabled state.
*/
@Test
- public void toggleButtonEnabledState()
+ void toggleButtonEnabledState()
{
tester.startPage(MockFormPage.class);
Component submit = tester.getComponentFromLastRenderedPage("form:submit");
@@ -880,7 +899,7 @@ public class WicketTesterTest extends WicketTestCase
* Toggle submit button to enabled when text field validates.
*/
@Test
- public void toggleAjaxFormButton()
+ void toggleAjaxFormButton()
{
tester.startPage(new MockAjaxFormPage());
Button submit = getSubmitButton();
@@ -902,7 +921,7 @@ public class WicketTesterTest extends WicketTestCase
* Test for WICKET-3123
*/
@Test
- public void sessionBinding()
+ void sessionBinding()
{
Session session = tester.getSession();
assertTrue(session.isTemporary());
@@ -927,11 +946,10 @@ public class WicketTesterTest extends WicketTestCase
* <a href="https://issues.apache.org/jira/browse/WICKET-3543">WICKET-3543</a>
*/
@Test
- public void startResourceReference()
+ void startResourceReference()
{
- tester.startResourceReference(tester.getApplication()
- .getJavaScriptLibrarySettings()
- .getWicketAjaxReference());
+ tester.startResourceReference(
+ tester.getApplication().getJavaScriptLibrarySettings().getWicketAjaxReference());
// verify that a random string from that resource is in the response
tester.assertContains("getAjaxBaseUrl");
}
@@ -940,7 +958,7 @@ public class WicketTesterTest extends WicketTestCase
* <a href="https://issues.apache.org/jira/browse/WICKET-3543">WICKET-3543</a>
*/
@Test
- public void startResource()
+ void startResource()
{
tester.startResource(tester.getApplication()
.getJavaScriptLibrarySettings()
@@ -956,7 +974,7 @@ public class WicketTesterTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void assertRenderedPageErrorMessage() throws Exception
+ void assertRenderedPageErrorMessage() throws Exception
{
tester.startPage(MockPageParametersAware.class);
tester.assertRenderedPage(MockPageParametersAware.class);
@@ -970,7 +988,7 @@ public class WicketTesterTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-3913
*/
@Test
- public void startPanelGoesToAnotherPage()
+ void startPanelGoesToAnotherPage()
{
tester.startComponentInPage(new MockPanelWithLink("testPanel")
{
@@ -992,7 +1010,7 @@ public class WicketTesterTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-3940
*/
@Test
- public void rerenderComponentInPage()
+ void rerenderComponentInPage()
{
tester.startComponentInPage(new Label("testLabel"));
tester.startPage(tester.getLastRenderedPage());
@@ -1003,10 +1021,11 @@ public class WicketTesterTest extends WicketTestCase
* permission anymore
*/
@Test
- public void rerenderNotAllowed()
+ void rerenderNotAllowed()
{
tester.setExposeExceptions(false);
- class YesNoPageAuthorizationStrategy extends IAuthorizationStrategy.AllowAllAuthorizationStrategy
+ class YesNoPageAuthorizationStrategy
+ extends IAuthorizationStrategy.AllowAllAuthorizationStrategy
{
private boolean allowed = true;
@@ -1033,9 +1052,8 @@ public class WicketTesterTest extends WicketTestCase
tester.assertRenderedPage(DummyHomePage.class);
strategy.allowed = false;
tester.startPage(start);
- tester.assertRenderedPage(tester.getApplication()
- .getApplicationSettings()
- .getAccessDeniedPage());
+ tester.assertRenderedPage(
+ tester.getApplication().getApplicationSettings().getAccessDeniedPage());
}
/**
@@ -1044,7 +1062,7 @@ public class WicketTesterTest extends WicketTestCase
* Clicking on ResourceLink should deliver the resource content
*/
@Test
- public void clickResourceLinkWithResource()
+ void clickResourceLinkWithResource()
{
MockPageWithLink page = new MockPageWithLink();
String content = "content";
@@ -1064,13 +1082,14 @@ public class WicketTesterTest extends WicketTestCase
* Clicking on ResourceLink should deliver the resource reference's content
*/
@Test
- public void clickResourceLinkWithResourceReference()
+ void clickResourceLinkWithResourceReference()
{
MockPageWithLink page = new MockPageWithLink();
String content = "content";
final ByteArrayResource resource = new ByteArrayResource("text/plain", content.getBytes(),
- "fileName.txt");
- ResourceReference reference = new ResourceReference(WicketTesterTest.class, "resourceLinkWithResourceReferenceTest")
+ "fileName.txt");
+ ResourceReference reference = new ResourceReference(WicketTesterTest.class,
+ "resourceLinkWithResourceReferenceTest")
{
@Override
public IResource getResource()
@@ -1093,7 +1112,7 @@ public class WicketTesterTest extends WicketTestCase
* return only the component's markup, without the autogenerated markup for the page
*/
@Test
- public void renderOnlyComponentsMarkup()
+ void renderOnlyComponentsMarkup()
{
tester.startComponentInPage(new Label("label", "content")
{
@@ -1112,7 +1131,7 @@ public class WicketTesterTest extends WicketTestCase
}
@Test
- public void catchExternalRedirect() throws Exception
+ void catchExternalRedirect() throws Exception
{
class RedirectPage extends WebPage
{
@@ -1128,7 +1147,7 @@ public class WicketTesterTest extends WicketTestCase
}
@Test
- public void catchExternalRedirectFailure() throws Exception
+ void catchExternalRedirectFailure() throws Exception
{
class RedirectPage extends WebPage
{
@@ -1153,35 +1172,26 @@ public class WicketTesterTest extends WicketTestCase
}
@Test
- public void dontCatchInternalRedirect() throws Exception
+ void dontCatchInternalRedirect() throws Exception
{
class RedirectPage extends WebPage
{
@Override
protected void onConfigure()
{
- throw new RedirectToUrlException("wicket/bookmarkable/" +
- CreateBook.class.getName());
+ throw new RedirectToUrlException(
+ "wicket/bookmarkable/" + CreateBook.class.getName());
}
}
tester.startPage(new RedirectPage());
tester.assertRenderedPage(CreateBook.class);
}
- public static class AlwaysRedirectPage extends WebPage
- {
- public AlwaysRedirectPage()
- {
- // redirects to another web server on the same computer
- throw new RedirectToUrlException("http://localhost:4333/");
- }
- }
-
/**
* https://issues.apache.org/jira/browse/WICKET-4610
*/
@Test
- public void redirectToAbsoluteUrlTest()
+ void redirectToAbsoluteUrlTest()
{
tester.setFollowRedirects(false);
tester.startPage(AlwaysRedirectPage.class);
@@ -1193,7 +1203,7 @@ public class WicketTesterTest extends WicketTestCase
* WICKET-5017
*/
@Test
- public void formSubmitSendsFormInputInRequest()
+ void formSubmitSendsFormInputInRequest()
{
final AtomicBoolean ajaxButtonSubmitted = new AtomicBoolean(false);
final AtomicBoolean ajaxSubmitLinkSubmitted = new AtomicBoolean(false);
@@ -1241,29 +1251,31 @@ public class WicketTesterTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-5128
*/
@Test
- public void renderComponentRelativeErrorMessage()
+ void renderComponentRelativeErrorMessage()
{
tester.startPage(new ComponentFeedbackResourceTestingPage());
Component label = tester.getComponentFromLastRenderedPage("label");
- tester.assertComponentFeedbackMessage(label, "error.msg", null, new ExactLevelFeedbackMessageFilter(FeedbackMessage.ERROR));
+ tester.assertComponentFeedbackMessage(label, "error.msg", null,
+ new ExactLevelFeedbackMessageFilter(FeedbackMessage.ERROR));
}
/**
* https://issues.apache.org/jira/browse/WICKET-5128
*/
@Test
- public void renderComponentRelativeInfoMessage()
+ void renderComponentRelativeInfoMessage()
{
tester.startPage(new ComponentFeedbackResourceTestingPage());
Component label = tester.getComponentFromLastRenderedPage("label");
- tester.assertComponentFeedbackMessage(label, "info.msg", null, new ExactLevelFeedbackMessageFilter(FeedbackMessage.INFO));
+ tester.assertComponentFeedbackMessage(label, "info.msg", null,
+ new ExactLevelFeedbackMessageFilter(FeedbackMessage.INFO));
}
/**
* WICKET-5389 reuse WicketTester after preceeding exception
*/
@Test
- public void reuseAfterException()
+ void reuseAfterException()
{
try
{
@@ -1282,12 +1294,12 @@ public class WicketTesterTest extends WicketTestCase
tester.startPage(new MockPageParameterPage(new PageParameters()));
}
-
+
/**
* https://issues.apache.org/jira/browse/WICKET-5665
*/
@Test
- public void assertInvisibleComponentInAjaxResponse()
+ void assertInvisibleComponentInAjaxResponse()
{
MockPageWithLinkAndLabel page = new MockPageWithLinkAndLabel();
final Label label = new Label(MockPageWithLinkAndLabel.LABEL_ID, "Some text");
@@ -1317,7 +1329,8 @@ public class WicketTesterTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-6062
*/
@Test
- public void renewSessionIdAfterInvalidation() {
+ void renewSessionIdAfterInvalidation()
+ {
tester.getApplication().setSessionStoreProvider(HttpSessionStore::new);
tester.getSession().bind();
String firstId = tester.getSession().getId();
@@ -1329,7 +1342,7 @@ public class WicketTesterTest extends WicketTestCase
}
@Test
- public void assertComponentInEnclosureInAjaxResponse()
+ void assertComponentInEnclosureInAjaxResponse()
{
MockPageWithLabelInEnclosure page = new MockPageWithLabelInEnclosure();
AjaxLink<Void> testLink = page.getSelfRefreshingAjaxLink();
@@ -1339,4 +1352,13 @@ public class WicketTesterTest extends WicketTestCase
tester.assertComponentOnAjaxResponse(testLink);
}
+
+ public static class AlwaysRedirectPage extends WebPage
+ {
+ public AlwaysRedirectPage()
+ {
+ // redirects to another web server on the same computer
+ throw new RedirectToUrlException("http://localhost:4333/");
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_1/CreateBook.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_1/CreateBook.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_1/CreateBook.java
index 673d7c5..ed52918 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_1/CreateBook.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_1/CreateBook.java
@@ -53,7 +53,7 @@ public class CreateBook extends WebPage
*
* @param id
*/
- public CreateForm(String id)
+ CreateForm(String id)
{
super(id);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_2/Test.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_2/Test.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_2/Test.java
index 3124a4c..fc9a5b0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_2/Test.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_2/Test.java
@@ -24,13 +24,13 @@ import org.apache.wicket.util.tester.WicketTestCase;
*
* @author Juergen Donnerstag
*/
-public class Test extends WicketTestCase
+class Test extends WicketTestCase
{
/**
*
*/
- @org.junit.Test
- public void testRedirect()
+ @org.junit.jupiter.api.Test
+ void testRedirect()
{
final IAuthorizationStrategy authorizationStrategy = new SimplePageAuthorizationStrategy(
RedirectPage.class, LoginPage.class)
@@ -42,9 +42,8 @@ public class Test extends WicketTestCase
}
};
- tester.getApplication()
- .getSecuritySettings()
- .setAuthorizationStrategy(authorizationStrategy);
+ tester.getApplication().getSecuritySettings().setAuthorizationStrategy(
+ authorizationStrategy);
tester.startPage(RedirectPage.class);
tester.assertRenderedPage(LoginPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_3/FormTesterTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_3/FormTesterTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_3/FormTesterTest.java
index d5b9741..ff65101 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_3/FormTesterTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_3/FormTesterTest.java
@@ -16,6 +16,11 @@
*/
package org.apache.wicket.util.tester.apps_3;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.Arrays;
import java.util.List;
@@ -23,14 +28,13 @@ import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.tester.apps_1.Book;
-import org.junit.Before;
-import org.junit.Test;
-
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* @author Ingram Chen
*/
-public class FormTesterTest extends WicketTestCase
+class FormTesterTest extends WicketTestCase
{
private Book[] books;
@@ -41,8 +45,8 @@ public class FormTesterTest extends WicketTestCase
/**
*
*/
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
books = new Book[] { new Book("1", "book1"), new Book("2", "book2"),
new Book("3", "book3"), new Book("4", "book4") };
@@ -55,7 +59,7 @@ public class FormTesterTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void singleChoice() throws Exception
+ void singleChoice() throws Exception
{
assertSame(books[1], choicePage.dropDownChoice);
assertSame(books[3], choicePage.listChoice);
@@ -76,7 +80,7 @@ public class FormTesterTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void singleChoice_toggle() throws Exception
+ void singleChoice_toggle() throws Exception
{
assertSame(books[1], choicePage.dropDownChoice);
assertSame(null, choicePage.radioGroup);
@@ -93,7 +97,7 @@ public class FormTesterTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void singleChoiceComponentNotAllowSelectMuliple() throws Exception
+ void singleChoiceComponentNotAllowSelectMuliple() throws Exception
{
try
{
@@ -118,7 +122,7 @@ public class FormTesterTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void selectMultiple() throws Exception
+ void selectMultiple() throws Exception
{
assertBooksEquals(new Book[0], choicePage.listMultipleChoice);
assertBooksEquals(new Book[0], choicePage.checkBoxMultipleChoice);
@@ -138,7 +142,7 @@ public class FormTesterTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void multipleChoiceComponent_cumulate() throws Exception
+ void multipleChoiceComponent_cumulate() throws Exception
{
assertBooksEquals(new Book[0], choicePage.listMultipleChoice);
assertBooksEquals(new Book[0], choicePage.checkGroup);
@@ -166,7 +170,7 @@ public class FormTesterTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void multipleButtonSubmit() throws Exception
+ void multipleButtonSubmit() throws Exception
{
formTester.submit();
@@ -184,7 +188,7 @@ public class FormTesterTest extends WicketTestCase
* Tests proper initialization.
*/
@Test
- public void initialValues()
+ void initialValues()
{
assertInitialValues();
formTester.submit();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_4/FormTesterTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_4/FormTesterTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_4/FormTesterTest.java
index 61da3f7..8a4b12e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_4/FormTesterTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_4/FormTesterTest.java
@@ -16,25 +16,28 @@
*/
package org.apache.wicket.util.tester.apps_4;
+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 java.util.List;
import org.apache.wicket.feedback.FeedbackMessage;
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 Ingram Chen
*/
-public class FormTesterTest extends WicketTestCase
+class FormTesterTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void test_1() throws Exception
+ void test_1() throws Exception
{
tester.startPage(EmailPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java
index 8077100..cf9a8e5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.wicket.util.tester.apps_5;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.Optional;
import org.apache.wicket.Page;
@@ -23,16 +27,15 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
import org.apache.wicket.ajax.markup.html.AjaxLink;
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;
/**
* Test that the clickLink method also works with AjaxLinks
*
* @author Frank Bille
*/
-public class AjaxLinkClickTest extends WicketTestCase
+class AjaxLinkClickTest extends WicketTestCase
{
private boolean linkClicked;
private AjaxRequestTarget ajaxRequestTarget;
@@ -40,8 +43,8 @@ public class AjaxLinkClickTest extends WicketTestCase
/**
* Make sure that our test flags are reset between every test.
*/
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
linkClicked = false;
ajaxRequestTarget = null;
@@ -51,7 +54,7 @@ public class AjaxLinkClickTest extends WicketTestCase
* Test that an AjaxLink's onClick method is actually invoked.
*/
@Test
- public void testBasicAjaxLinkClick()
+ void testBasicAjaxLinkClick()
{
// Create a link, which we test is actually invoked
final AjaxLink<Void> ajaxLink = new AjaxLink<Void>("ajaxLink")
@@ -82,7 +85,7 @@ public class AjaxLinkClickTest extends WicketTestCase
* AjaxRequestTarget is not null.
*/
@Test
- public void testAjaxFallbackLinkClick()
+ void testAjaxFallbackLinkClick()
{
final Page page = new MockPageWithLink();
@@ -110,7 +113,7 @@ public class AjaxLinkClickTest extends WicketTestCase
* AjaxRequestTarget.
*/
@Test
- public void testFallbackLinkWithAjaxDisabled()
+ void testFallbackLinkWithAjaxDisabled()
{
final Page page = new MockPageWithLink();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java
index 6c1bec8..d482026 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java
@@ -16,29 +16,30 @@
*/
package org.apache.wicket.util.tester.apps_5;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
-import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.tester.apps_5.MockPageWithFormAndLink.MockPojo;
-import org.junit.Before;
-import org.junit.Test;
-
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test that the clickLink method works with AjaxSubmitLinks
*
* @author Frank Bille
*/
-public class AjaxSubmitLinkClickTest extends WicketTestCase
+class AjaxSubmitLinkClickTest extends WicketTestCase
{
private boolean linkClicked;
/**
*
*/
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
linkClicked = false;
}
@@ -47,7 +48,7 @@ public class AjaxSubmitLinkClickTest extends WicketTestCase
*
*/
@Test
- public void testClickLinkInsideForm_ajaxSubmitLink()
+ void testClickLinkInsideForm_ajaxSubmitLink()
{
MockPojo mockPojo = new MockPageWithFormAndLink.MockPojo();
mockPojo.setName("Mock name");
@@ -92,7 +93,7 @@ public class AjaxSubmitLinkClickTest extends WicketTestCase
*
*/
@Test
- public void testClickLink_ajaxSubmitLink()
+ void testClickLink_ajaxSubmitLink()
{
MockPojo mockPojo = new MockPageWithFormAndLink.MockPojo();
mockPojo.setName("Mock name");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_7/TestHomePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_7/TestHomePage.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_7/TestHomePage.java
index 13fd28d..1246034 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_7/TestHomePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_7/TestHomePage.java
@@ -17,16 +17,16 @@
package org.apache.wicket.util.tester.apps_7;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Simple test using the WicketTester
*/
-public class TestHomePage extends WicketTestCase
+class TestHomePage extends WicketTestCase
{
/** */
@Test
- public void testAjaxSubmitWhileAnotherButtonIsNotVisible()
+ void testAjaxSubmitWhileAnotherButtonIsNotVisible()
{
// start and render the test page
tester.startPage(HomePage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_7/WicketApplication.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_7/WicketApplication.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_7/WicketApplication.java
index b415adf..e5ab674 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_7/WicketApplication.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_7/WicketApplication.java
@@ -24,7 +24,7 @@ import org.apache.wicket.protocol.http.WebApplication;
*
* @see com.mycompany.Start#main(String[])
*/
-public class WicketApplication extends WebApplication
+class WicketApplication extends WebApplication
{
/**
* Constructor
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_8/TestResourceProvidingLabel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_8/TestResourceProvidingLabel.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_8/TestResourceProvidingLabel.java
index 3858cb8..b3a30ca 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_8/TestResourceProvidingLabel.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_8/TestResourceProvidingLabel.java
@@ -22,7 +22,7 @@ import org.apache.wicket.markup.html.basic.Label;
* A simple Label that renders some Feedback Messages.
* @author Martin Dilger
*/
-public class TestResourceProvidingLabel extends Label
+class TestResourceProvidingLabel extends Label
{
public TestResourceProvidingLabel(String id)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/validation/CompoundValidatorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/validation/CompoundValidatorTest.java b/wicket-core/src/test/java/org/apache/wicket/validation/CompoundValidatorTest.java
index 22091e5..5e5fe50 100644
--- a/wicket-core/src/test/java/org/apache/wicket/validation/CompoundValidatorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/validation/CompoundValidatorTest.java
@@ -18,20 +18,20 @@ package org.apache.wicket.validation;
import org.apache.wicket.Component;
import org.apache.wicket.validation.validator.RangeValidator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
/**
* Test for {@link CompoundValidator}.
*/
-public class CompoundValidatorTest
+class CompoundValidatorTest
{
/**
* WICKET-6482 delegate to nested behaviors
*/
@SuppressWarnings("unchecked")
@Test
- public void delegate() {
+ void delegate() {
CompoundValidator<String> compound = new CompoundValidator<>();
compound.add(new IValidator<String>()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/validation/ValidationErrorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/validation/ValidationErrorTest.java b/wicket-core/src/test/java/org/apache/wicket/validation/ValidationErrorTest.java
index 824b591..496aad1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/validation/ValidationErrorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/validation/ValidationErrorTest.java
@@ -16,28 +16,27 @@
*/
package org.apache.wicket.validation;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.Serializable;
import java.util.Map;
import org.apache.wicket.markup.html.form.ValidationErrorFeedback;
-import org.hamcrest.Matchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* {@link ValidationError} related tests
*
* @author igor
*/
-public class ValidationErrorTest
+class ValidationErrorTest
{
/**
* tests standard key values
*/
@Test
- public void standardKeys()
+ void standardKeys()
{
ValidationError e = new ValidationError();
e.addKey(new TestValidator());
@@ -77,12 +76,12 @@ public class ValidationErrorTest
}
@Test
- public void calculateMessageWithoutKeys()
+ void calculateMessageWithoutKeys()
{
String message = "foo message";
ValidationError error = new ValidationError(message);
Serializable errorMessage = error.getErrorMessage(new TestMessageSource());
- assertThat(errorMessage, Matchers.instanceOf(ValidationErrorFeedback.class));
+ assertThat(errorMessage).isInstanceOf(ValidationErrorFeedback.class);
ValidationErrorFeedback vef = (ValidationErrorFeedback) errorMessage;
assertEquals(message, vef.getMessage());
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/validation/ValidatorBehaviorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/validation/ValidatorBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/validation/ValidatorBehaviorTest.java
index ea8093b..0973203 100644
--- a/wicket-core/src/test/java/org/apache/wicket/validation/ValidatorBehaviorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/validation/ValidatorBehaviorTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.wicket.validation;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.behavior.Behavior;
@@ -30,21 +34,21 @@ import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests validator work as validators and behaviors
*
* @author igor
*/
-public class ValidatorBehaviorTest extends WicketTestCase
+class ValidatorBehaviorTest extends WicketTestCase
{
/**
* Tests validators are treated as behaviors
*/
@Test
- public void actAsBehavior()
+ void actAsBehavior()
{
TestPage page = new TestPage();
@@ -67,7 +71,7 @@ public class ValidatorBehaviorTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-5897
*/
@Test
- public void disabledValidator()
+ void disabledValidator()
{
TestPage page = new TestPage();
page.name.add(new DisabledValidator());
@@ -87,7 +91,7 @@ public class ValidatorBehaviorTest extends WicketTestCase
* Tests validators are treated as validators
*/
@Test
- public void actAsValidator()
+ void actAsValidator()
{
TestPage page = new TestPage();
@@ -205,7 +209,7 @@ public class ValidatorBehaviorTest extends WicketTestCase
/**
* Construct.
*/
- public TestPage()
+ TestPage()
{
Form<Void> form = new Form<>("form");
add(form);
[16/45] wicket git commit: wicket-core: Migrate to Junit 5
Posted by mg...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/PropertyModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/PropertyModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/PropertyModelTest.java
index b7b8109..ca72596 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/PropertyModelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/PropertyModelTest.java
@@ -16,12 +16,15 @@
*/
package org.apache.wicket.model;
-import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test class for exercising the {@link PropertyModel}.
@@ -44,7 +47,7 @@ public class PropertyModelTest extends WicketTestCase
public static abstract class AbstractAddress implements IAddress
{
/** street field for assignment in property expressions. */
- public String street;
+ String street;
}
/**
@@ -58,16 +61,16 @@ public class PropertyModelTest extends WicketTestCase
/**
* Person class for keeping the various different references for use in the test cases.
*/
- public static class Person
+ static class Person
{
/** tests a <code>null</code> interface property. */
public IAddress interfaceAddress;
/** tests a <code>null</code> abstract class property. */
public AbstractAddress abstractAddress;
/** tests a <code>null</code> concrete class property. */
- public ConcreteAddress concreteAddress;
+ ConcreteAddress concreteAddress;
/** tests a <code>null</code> final concrete class property. */
- public final ConcreteAddress finalAddress = null;
+ final ConcreteAddress finalAddress = null;
}
/**
@@ -76,7 +79,7 @@ public class PropertyModelTest extends WicketTestCase
* instantiate on behalf of the program.
*/
@Test
- public void setWithNullPathInterface()
+ void setWithNullPathInterface()
{
Person person = new Person();
PropertyModel<String> model = new PropertyModel<String>(person, "interfaceAddress.street");
@@ -96,12 +99,15 @@ public class PropertyModelTest extends WicketTestCase
* abstract class type. This should end in an exception because Wicket can't decide what to
* instantiate on behalf of the program.
*/
- @Test(expected = WicketRuntimeException.class)
- public void setWithNullPathAbstract()
+ @Test
+ void setWithNullPathAbstract()
{
Person person = new Person();
PropertyModel<String> model = new PropertyModel<String>(person, "abstractAddress.street");
- model.setObject("foo");
+ assertThrows(WicketRuntimeException.class, ()->{
+ model.setObject("foo");
+ });
+
}
/**
@@ -110,13 +116,13 @@ public class PropertyModelTest extends WicketTestCase
* the program: the concrete class.
*/
@Test
- public void setWithNullPathConcrete()
+ void setWithNullPathConcrete()
{
Person person = new Person();
PropertyModel<String> model = new PropertyModel<String>(person, "concreteAddress.street");
model.setObject("foo");
- assertNotNull("concreteAddress", person.concreteAddress);
- assertThat(person.concreteAddress, instanceOf(ConcreteAddress.class));
+ assertNotNull(person.concreteAddress, "concreteAddress");
+ assertThat(person.concreteAddress).isInstanceOf(ConcreteAddress.class);
assertEquals("foo", person.concreteAddress.street);
}
@@ -125,13 +131,13 @@ public class PropertyModelTest extends WicketTestCase
* should pass when run using JDK 1.5 or newer.
*/
@Test
- public void setWithNullPathFinalJdk15()
+ void setWithNullPathFinalJdk15()
{
Person person = new Person();
PropertyModel<String> model = new PropertyModel<String>(person, "finalAddress.street");
model.setObject("foo");
- assertThat(person.finalAddress, instanceOf(ConcreteAddress.class));
+ assertThat(person.finalAddress).isInstanceOf(ConcreteAddress.class);
assertEquals("foo", person.finalAddress.street);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/PropertyModelWithListTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/PropertyModelWithListTest.java b/wicket-core/src/test/java/org/apache/wicket/model/PropertyModelWithListTest.java
index c0ee2da..db98435 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/PropertyModelWithListTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/PropertyModelWithListTest.java
@@ -16,21 +16,22 @@
*/
package org.apache.wicket.model;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.ArrayList;
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* https://issues.apache.org/jira/browse/WICKET-3929
*
* @author Carl-Eric Menzel
*/
-public class PropertyModelWithListTest extends Assert
+class PropertyModelWithListTest
{
/** */
- public static class BeansContainer
+ static class BeansContainer
{
private List<Bean> beans = new ArrayList<Bean>();
@@ -38,7 +39,7 @@ public class PropertyModelWithListTest extends Assert
* @return the beans
*
*/
- public List<Bean> getBeans()
+ List<Bean> getBeans()
{
return beans;
}
@@ -54,7 +55,7 @@ public class PropertyModelWithListTest extends Assert
}
/** */
- public static class Bean
+ static class Bean
{
private String text;
@@ -70,7 +71,7 @@ public class PropertyModelWithListTest extends Assert
* @param text
* the bean's text
*/
- public void setText(String text)
+ void setText(String text)
{
this.text = text;
}
@@ -81,7 +82,7 @@ public class PropertyModelWithListTest extends Assert
* @throws Exception
*/
@Test
- public void listPropertyModel() throws Exception
+ void listPropertyModel() throws Exception
{
List<Bean> beans = new ArrayList<PropertyModelWithListTest.Bean>();
Bean bean = new Bean();
@@ -95,7 +96,7 @@ public class PropertyModelWithListTest extends Assert
* @throws Exception
*/
@Test
- public void containerPropertyModel() throws Exception
+ void containerPropertyModel() throws Exception
{
BeansContainer container = new BeansContainer();
Bean bean = new Bean();
@@ -109,7 +110,7 @@ public class PropertyModelWithListTest extends Assert
* @throws Exception
*/
@Test
- public void nestedListPropertyModel() throws Exception
+ void nestedListPropertyModel() throws Exception
{
List<List<Bean>> outer = new ArrayList<List<Bean>>();
List<Bean> inner = new ArrayList<Bean>();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/ResourceModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/ResourceModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/ResourceModelTest.java
index b076e6d..8060aa8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/ResourceModelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/ResourceModelTest.java
@@ -16,10 +16,12 @@
*/
package org.apache.wicket.model;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests {@link ResourceModel}.
@@ -36,7 +38,7 @@ public class ResourceModelTest extends WicketTestCase
/**
* Construct.
*/
- public TestPage()
+ public TestPage()
{
add(new Label("testlabel", new ResourceModel("testlabel")));
@@ -58,7 +60,7 @@ public class ResourceModelTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void resourceModel() throws Exception
+ void resourceModel() throws Exception
{
executeTest(TestPage.class, "ResourceModelTest$TestPage_expected.html");
}
@@ -67,7 +69,7 @@ public class ResourceModelTest extends WicketTestCase
* Test forwarding of detach().
*/
@Test
- public void detaching()
+ void detaching()
{
final boolean[] detached = { false };
@@ -89,6 +91,6 @@ public class ResourceModelTest extends WicketTestCase
wrapped.getObject();
wrapped.detach();
- assertTrue(null, detached[0]);
+ assertTrue(detached[0]);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
index be5314e..986d389 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
@@ -16,6 +16,13 @@
*/
package org.apache.wicket.model;
+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.Serializable;
import java.text.MessageFormat;
import java.util.Calendar;
@@ -25,8 +32,8 @@ import org.apache.wicket.Session;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test cases for the {@link StringResourceModel}.
@@ -44,8 +51,8 @@ public class StringResourceModelTest extends WicketTestCase
/**
* @throws Exception
*/
- @Before
- public void before() throws Exception
+ @BeforeEach
+ void before() throws Exception
{
page = new TestPage();
ws = new WeatherStation();
@@ -55,84 +62,81 @@ public class StringResourceModelTest extends WicketTestCase
/** */
@Test
- public void getSimpleResource()
+ void getSimpleResource()
{
StringResourceModel model = new StringResourceModel("simple.text", page);
- assertEquals("Text should be as expected", "Simple text", model.getString());
- assertEquals("Text should be as expected", "Simple text", model.getObject());
+ assertEquals("Simple text", model.getString(), "Text should be as expected");
+ assertEquals("Simple text", model.getObject(), "Text should be as expected");
}
/** */
@Test
- public void getWrappedOnAssignmentResource()
+ void getWrappedOnAssignmentResource()
{
- Label label1 = new Label("resourceModelWithComponent", new StringResourceModel(
- "wrappedOnAssignment.text", page));
+ Label label1 = new Label("resourceModelWithComponent",
+ new StringResourceModel("wrappedOnAssignment.text", page));
page.add(label1);
- assertEquals("Text should be as expected", "Non-wrapped text",
- label1.getDefaultModelObject());
+ assertEquals("Non-wrapped text", label1.getDefaultModelObject(),
+ "Text should be as expected");
- Label label2 = new Label("resourceModelWithoutComponent", new StringResourceModel(
- "wrappedOnAssignment.text"));
+ Label label2 = new Label("resourceModelWithoutComponent",
+ new StringResourceModel("wrappedOnAssignment.text"));
page.add(label2);
- assertEquals("Text should be as expected", "Wrapped text",
- label2.getDefaultModelObject());
+ assertEquals("Wrapped text", label2.getDefaultModelObject(), "Text should be as expected");
}
/** */
- @Test(expected = IllegalArgumentException.class)
- public void nullResourceKey()
+ @Test
+ void nullResourceKey()
{
- new StringResourceModel(null, page);
+ assertThrows(IllegalArgumentException.class, () -> {
+ new StringResourceModel(null, page);
+
+ });
}
/** */
@Test
- public void getSimpleResourceWithKeySubstitution()
+ void getSimpleResourceWithKeySubstitution()
{
- StringResourceModel model = new StringResourceModel("weather.${currentStatus}", page, wsModel);
- assertEquals("Text should be as expected", "It's sunny, wear sunscreen",
- model.getString());
+ StringResourceModel model = new StringResourceModel("weather.${currentStatus}", page,
+ wsModel);
+ assertEquals("It's sunny, wear sunscreen", model.getString(), "Text should be as expected");
ws.setCurrentStatus("raining");
- assertEquals("Text should be as expected", "It's raining, take an umbrella",
- model.getString());
+ assertEquals("It's raining, take an umbrella",
+ model.getString(), "Text should be as expected");
ws.setCurrentStatus(null);
- assertEquals("Text should be as expected", "It's ... i don't know",
- model.getString());
+ assertEquals("It's ... i don't know", model.getString(), "Text should be as expected");
}
/** */
@Test
- public void getSimpleResourceWithKeySubstitutionForNonString()
+ void getSimpleResourceWithKeySubstitutionForNonString()
{
// German uses comma (,) as decimal separator
Session.get().setLocale(Locale.GERMAN);
- StringResourceModel model = new StringResourceModel("weather.${currentTemperature}", page, wsModel);
- assertEquals("Text should be as expected", "Twenty-five dot seven",
- model.getString());
+ StringResourceModel model = new StringResourceModel("weather.${currentTemperature}", page,
+ wsModel);
+ assertEquals("Twenty-five dot seven", model.getString(), "Text should be as expected");
}
/** */
@Test
- public void getPropertySubstitutedResource()
+ void getPropertySubstitutedResource()
{
tester.getSession().setLocale(Locale.ENGLISH);
StringResourceModel model = new StringResourceModel("weather.message", page, wsModel);
- assertEquals(
- "Text should be as expected",
- "Weather station \"Europe's main weather station\" reports that the temperature is 25.7 \u00B0C",
- model.getString());
+ assertEquals("Weather station \"Europe's main weather station\" reports that the temperature is 25.7 \u00B0C",
+ model.getString(), "Text should be as expected");
ws.setCurrentTemperature(11.5);
- assertEquals(
- "Text should be as expected",
- "Weather station \"Europe's main weather station\" reports that the temperature is 11.5 \u00B0C",
- model.getString());
+ assertEquals("Weather station \"Europe's main weather station\" reports that the temperature is 11.5 \u00B0C",
+ model.getString(), "Text should be as expected");
}
/** */
@Test
- public void substitutedPropertyAndParameterResource()
+ void substitutedPropertyAndParameterResource()
{
StringResourceModel model = new StringResourceModel("weather.mixed", page).setModel(wsModel)
.setParameters(new PropertyModel<Double>(wsModel, "currentTemperature"),
@@ -143,68 +147,71 @@ public class StringResourceModelTest extends WicketTestCase
ws.setCurrentTemperature(25.7);
String expected = format.format(new Object[] { 25.7, "\u00B0C" });
- assertEquals("Text should be as expected", expected, model.getString());
+ assertEquals(expected, model.getString(), "Text should be as expected");
ws.setCurrentTemperature(11.5);
expected = format.format(new Object[] { 11.5, "\u00B0C" });
- assertEquals("Text should be as expected", expected, model.getString());
+ assertEquals(expected, model.getString(), "Text should be as expected");
}
/** */
@Test
- public void substitutionParametersResource()
+ void substitutionParametersResource()
{
Calendar cal = Calendar.getInstance();
cal.set(2004, Calendar.OCTOBER, 15, 13, 21);
MessageFormat format = new MessageFormat(
"The report for {0,date,medium}, shows the temperature as {2,number,###.##} {3} and the weather to be {1}",
page.getLocale());
- StringResourceModel model = new StringResourceModel("weather.detail", page).setModel(wsModel)
+ StringResourceModel model = new StringResourceModel("weather.detail", page)
+ .setModel(wsModel)
.setParameters(cal.getTime(), "${currentStatus}",
new PropertyModel<Double>(wsModel, "currentTemperature"),
new PropertyModel<String>(wsModel, "units"));
String expected = format.format(new Object[] { cal.getTime(), "sunny", 25.7, "\u00B0C" });
- assertEquals("Text should be as expected", expected, model.getString());
+ assertEquals(expected, model.getString(), "Text should be as expected");
ws.setCurrentStatus("raining");
ws.setCurrentTemperature(11.568);
expected = format.format(new Object[] { cal.getTime(), "raining", 11.568, "\u00B0C" });
- assertEquals("Text should be as expected", expected, model.getString());
+ assertEquals(expected, model.getString(), "Text should be as expected");
}
/** */
@Test
- public void substitutionParametersResourceWithSingleQuote()
+ void substitutionParametersResourceWithSingleQuote()
{
tester.getSession().setLocale(Locale.ENGLISH);
- StringResourceModel model = new StringResourceModel("with.quote", page).setParameters(10, 20);
+ StringResourceModel model = new StringResourceModel("with.quote", page).setParameters(10,
+ 20);
assertEquals("2010.00", model.getString());
}
/** */
@Test
- public void textResourceWithSubstitutionAndSingleQuote()
+ void textResourceWithSubstitutionAndSingleQuote()
{
tester.getSession().setLocale(Locale.ENGLISH);
StringResourceModel model = new StringResourceModel("with.quote.and.no.substitution", page);
assertEquals("Let's play in the rain!", model.getString());
- model = new StringResourceModel("with.quote.substitution", page)
- .setParameters("rain!");
+ model = new StringResourceModel("with.quote.substitution", page).setParameters("rain!");
assertEquals("Let's play in the rain!", model.getString());
}
/** */
- @Test(expected = UnsupportedOperationException.class)
- public void setObject()
+ @Test
+ void setObject()
{
StringResourceModel model = new StringResourceModel("simple.text", page);
- model.setObject("Some value");
+ assertThrows(UnsupportedOperationException.class, () -> {
+ model.setObject("Some value");
+ });
}
/** */
@Test
- public void detachAttachDetachableModel()
+ void detachAttachDetachableModel()
{
IModel<WeatherStation> wsDetachModel = new LoadableDetachableModel<WeatherStation>()
{
@@ -227,7 +234,7 @@ public class StringResourceModelTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-4323
*/
@Test
- public void detachSubstituteModelFromAssignmentWrapper()
+ void detachSubstituteModelFromAssignmentWrapper()
{
IModel<WeatherStation> nullOnDetachModel = new Model<WeatherStation>()
{
@@ -241,16 +248,16 @@ public class StringResourceModelTest extends WicketTestCase
};
nullOnDetachModel.setObject(ws);
- Label label1 = new Label("resourceModelWithComponent", new StringResourceModel(
- "wrappedOnAssignment.text", page, nullOnDetachModel));
+ Label label1 = new Label("resourceModelWithComponent",
+ new StringResourceModel("wrappedOnAssignment.text", page, nullOnDetachModel));
page.add(label1);
label1.getDefaultModelObject();
label1.detach();
assertNull(nullOnDetachModel.getObject());
nullOnDetachModel.setObject(ws);
- Label label2 = new Label("resourceModelWithoutComponent", new StringResourceModel(
- "wrappedOnAssignment.text").setModel(nullOnDetachModel));
+ Label label2 = new Label("resourceModelWithoutComponent",
+ new StringResourceModel("wrappedOnAssignment.text").setModel(nullOnDetachModel));
page.add(label2);
label2.getDefaultModelObject();
label2.detach();
@@ -261,33 +268,40 @@ public class StringResourceModelTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-5176
*/
@Test
- public void detachEvenNotAttached() {
+ void detachEvenNotAttached()
+ {
Wicket5176Model wrappedModel = new Wicket5176Model();
- StringResourceModel stringResourceModel = new StringResourceModel("test").setModel(wrappedModel);
+ StringResourceModel stringResourceModel = new StringResourceModel("test")
+ .setModel(wrappedModel);
assertFalse(stringResourceModel.isAttached());
assertTrue(wrappedModel.isAttached());
stringResourceModel.detach();
assertFalse(wrappedModel.isAttached());
}
- private static class Wicket5176Model implements IModel {
+ private static class Wicket5176Model implements IModel
+ {
private boolean attached = true;
@Override
- public Object getObject() {
+ public Object getObject()
+ {
return null;
}
@Override
- public void setObject(Object object) {
+ public void setObject(Object object)
+ {
}
@Override
- public void detach() {
+ public void detach()
+ {
attached = false;
}
- private boolean isAttached() {
+ private boolean isAttached()
+ {
return attached;
}
}
@@ -316,7 +330,7 @@ public class StringResourceModelTest extends WicketTestCase
/**
* @param currentStatus
*/
- public void setCurrentStatus(String currentStatus)
+ void setCurrentStatus(String currentStatus)
{
this.currentStatus = currentStatus;
}
@@ -332,7 +346,7 @@ public class StringResourceModelTest extends WicketTestCase
/**
* @param currentTemperature
*/
- public void setCurrentTemperature(double currentTemperature)
+ void setCurrentTemperature(double currentTemperature)
{
this.currentTemperature = currentTemperature;
}
@@ -364,7 +378,7 @@ public class StringResourceModelTest extends WicketTestCase
/**
* Construct.
*/
- public TestPage()
+ TestPage()
{
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/TestHomePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/TestHomePage.java b/wicket-core/src/test/java/org/apache/wicket/model/TestHomePage.java
index 828ba02..461f2a5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/TestHomePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/TestHomePage.java
@@ -18,15 +18,15 @@ package org.apache.wicket.model;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Simple test for CompoundPropertyModel and id's like "A.B"
*/
-public class TestHomePage extends WicketTestCase
+class TestHomePage extends WicketTestCase
{
@Test
- public void testRenderMyPage()
+ void testRenderMyPage()
{
// start and render the test page
tester.startPage(HomePage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/noheadnobody/NoHeadNoBodyTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/noheadnobody/NoHeadNoBodyTest.java b/wicket-core/src/test/java/org/apache/wicket/noheadnobody/NoHeadNoBodyTest.java
index 305bbb9..21f8c77 100644
--- a/wicket-core/src/test/java/org/apache/wicket/noheadnobody/NoHeadNoBodyTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/noheadnobody/NoHeadNoBodyTest.java
@@ -16,7 +16,8 @@
*/
package org.apache.wicket.noheadnobody;
-import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -25,7 +26,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.mock.MockHomePage;
import org.apache.wicket.resource.CoreLibrariesContributor;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests that if a page has neither <head> nor <body>
@@ -34,10 +35,10 @@ import org.junit.Test;
*
* https://issues.apache.org/jira/browse/WICKET-5895
*/
-public class NoHeadNoBodyTest extends WicketTestCase
+class NoHeadNoBodyTest extends WicketTestCase
{
@Test
- public void noHeadNoBody()
+ void noHeadNoBody()
{
final AtomicBoolean reported = new AtomicBoolean(false);
@@ -51,14 +52,14 @@ public class NoHeadNoBodyTest extends WicketTestCase
};
tester.startPage(page);
- assertThat(reported.get(), is(true));
+ assertEquals(true, reported.get());
}
/**
* https://issues.apache.org/jira/browse/WICKET-5955
*/
@Test
- public void interceptedRenderDoesNotReportMissingHeader()
+ void interceptedRenderDoesNotReportMissingHeader()
{
tester.startPage(new MockHomePage()
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/page/PageAccessSynchronizerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/page/PageAccessSynchronizerTest.java b/wicket-core/src/test/java/org/apache/wicket/page/PageAccessSynchronizerTest.java
index e2053df..c686d6a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/page/PageAccessSynchronizerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/page/PageAccessSynchronizerTest.java
@@ -16,44 +16,43 @@
*/
package org.apache.wicket.page;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.Random;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.wicket.MockPage;
import org.apache.wicket.core.util.lang.WicketObjects;
import org.apache.wicket.mock.MockPageManager;
import org.apache.wicket.page.PageAccessSynchronizer.PageLock;
-import org.apache.wicket.util.SlowTests;
+import org.apache.wicket.util.WicketTestTag;
import org.apache.wicket.util.time.Duration;
import org.apache.wicket.util.time.Time;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.Timeout;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
*/
-@Category(SlowTests.class)
-public class PageAccessSynchronizerTest extends Assert
+@Tag(WicketTestTag.SLOW)
+class PageAccessSynchronizerTest
{
private static final Logger logger = LoggerFactory.getLogger(PageAccessSynchronizerTest.class);
- /** */
- @Rule
- public Timeout globalTimeout = new Timeout(30, TimeUnit.SECONDS);
+ // TODO had a 30 second timeout rule, Junit 5 atm does not support timeouts (see discussion at
+ // https://github.com/junit-team/junit5/issues/80)
/**
* @throws Exception
*/
@Test
- public void testReentrant() throws Exception
+ void testReentrant() throws Exception
{
final PageAccessSynchronizer sync = new PageAccessSynchronizer(Duration.seconds(5));
sync.lockPage(0);
@@ -64,7 +63,7 @@ public class PageAccessSynchronizerTest extends Assert
* @throws Exception
*/
@Test
- public void testBlocking() throws Exception
+ void testBlocking() throws Exception
{
final PageAccessSynchronizer sync = new PageAccessSynchronizer(Duration.seconds(5));
final Duration hold = Duration.seconds(1);
@@ -114,7 +113,7 @@ public class PageAccessSynchronizerTest extends Assert
* @param duration
* @throws Exception
*/
- public void runContentionTest(final int pages, final int workers, final Duration duration)
+ private void runContentionTest(final int pages, final int workers, final Duration duration)
throws Exception
{
final PageAccessSynchronizer sync = new PageAccessSynchronizer(Duration.seconds(1));
@@ -251,7 +250,7 @@ public class PageAccessSynchronizerTest extends Assert
* @throws Exception
*/
@Test
- public void testConcurrency() throws Exception
+ void testConcurrency() throws Exception
{
runContentionTest(20, 10, Duration.seconds(10));
}
@@ -260,7 +259,7 @@ public class PageAccessSynchronizerTest extends Assert
* @throws Exception
*/
@Test
- public void testContention() throws Exception
+ void testContention() throws Exception
{
runContentionTest(10, 20, Duration.seconds(10));
}
@@ -269,14 +268,14 @@ public class PageAccessSynchronizerTest extends Assert
* @throws Exception
*/
@Test
- public void testSerialization() throws Exception
+ void testSerialization() throws Exception
{
// a simple worker that acquires a lock on page 5
class Locker extends Thread
{
private final PageAccessSynchronizer sync;
- public Locker(PageAccessSynchronizer sync)
+ Locker(PageAccessSynchronizer sync)
{
this.sync = sync;
}
@@ -312,7 +311,7 @@ public class PageAccessSynchronizerTest extends Assert
* https://issues.apache.org/jira/browse/WICKET-4009
*/
@Test
- public void unlockIfNoSuchPage()
+ void unlockIfNoSuchPage()
{
PageAccessSynchronizer synchronizer = new PageAccessSynchronizer(Duration.seconds(2));
IPageManager pageManager = new MockPageManager();
@@ -336,15 +335,16 @@ public class PageAccessSynchronizerTest extends Assert
* @throws Exception
*/
@Test
- public void failToReleaseUnderLoad() throws Exception
+ void failToReleaseUnderLoad() throws Exception
{
final Duration duration = Duration.seconds(20); /* seconds */
final ConcurrentLinkedQueue<Exception> errors = new ConcurrentLinkedQueue<Exception>();
final long endTime = System.currentTimeMillis() + duration.getMilliseconds();
- // set the synchronizer timeout one second longer than the test runs to prevent
+ // set the synchronizer timeout one second longer than the test runs to prevent
// starvation to become an issue
- final PageAccessSynchronizer sync = new PageAccessSynchronizer(duration.add(Duration.ONE_SECOND));
+ final PageAccessSynchronizer sync = new PageAccessSynchronizer(
+ duration.add(Duration.ONE_SECOND));
final CountDownLatch latch = new CountDownLatch(100);
for (int count = 0; count < 100; count++)
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/page/PersistentPageManagerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/page/PersistentPageManagerTest.java b/wicket-core/src/test/java/org/apache/wicket/page/PersistentPageManagerTest.java
index 23fe264..04c4f19 100644
--- a/wicket-core/src/test/java/org/apache/wicket/page/PersistentPageManagerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/page/PersistentPageManagerTest.java
@@ -16,8 +16,9 @@
*/
package org.apache.wicket.page;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+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 java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -32,13 +33,12 @@ import org.apache.wicket.pageStore.IPageStore;
import org.apache.wicket.pageStore.memory.DummyPageManagerContext;
import org.apache.wicket.serialize.java.JavaSerializer;
import org.apache.wicket.versioning.InMemoryPageStore;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Pedro Santos
*/
-public class PersistentPageManagerTest
+class PersistentPageManagerTest
{
private static final String APP_NAME = "test_app";
@@ -52,7 +52,7 @@ public class PersistentPageManagerTest
* @throws IOException
*/
@Test
- public void serializationOutsideWicketLifecyle() throws IOException, ClassNotFoundException
+ void serializationOutsideWicketLifecyle() throws IOException, ClassNotFoundException
{
// make sure no leaked threadlocals are present
ThreadContext.detach();
@@ -71,26 +71,24 @@ public class PersistentPageManagerTest
// simulate persisting of the http sessions initiated by the web container
byte[] serializedSessionEntry = new JavaSerializer(APP_NAME).serialize(sessionEntry);
- assertNotNull("Wicket needs to be able to serialize the session entry",
- serializedSessionEntry);
+ assertNotNull(serializedSessionEntry,
+ "Wicket needs to be able to serialize the session entry");
// simulate loading of the persisted http session initiated by the web container
// when starting an application
- ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(
- serializedSessionEntry));
+ ObjectInputStream in = new ObjectInputStream(
+ new ByteArrayInputStream(serializedSessionEntry));
// WicketFilter is not initialized so there is no Application available yet
- Assert.assertFalse("Worker thread should be unaware of Wicket application",
- Application.exists());
+ assertFalse(Application.exists(), "Worker thread should be unaware of Wicket application");
assertEquals(APP_NAME, in.readObject());
// without available IPageStore the read SessionEntry holds
// the IManageablePage itself, not SerializedPage
Serializable loadedSessionEntry = (Serializable)in.readObject();
- assertNotNull(
- "Wicket needs to be able to deserialize the session entry regardless the application availability",
- loadedSessionEntry);
+ assertNotNull(loadedSessionEntry,
+ "Wicket needs to be able to deserialize the session entry regardless the application availability");
// provide new IPageStore which will read IManageablePage's or SerializedPage's
// from the SessionEntry's
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/page/XmlPartialPageUpdateTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/page/XmlPartialPageUpdateTest.java b/wicket-core/src/test/java/org/apache/wicket/page/XmlPartialPageUpdateTest.java
index a7570de..c5a3089 100644
--- a/wicket-core/src/test/java/org/apache/wicket/page/XmlPartialPageUpdateTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/page/XmlPartialPageUpdateTest.java
@@ -16,24 +16,27 @@
*/
package org.apache.wicket.page;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.parser.filter.HtmlHeaderSectionHandler;
import org.apache.wicket.mock.MockWebResponse;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link XmlPartialPageUpdate}.
*/
-public class XmlPartialPageUpdateTest extends WicketTestCase
+class XmlPartialPageUpdateTest extends WicketTestCase
{
/**
* CData start "]]>" has to be encoded in "]]]]><![CDATA[>".
*/
@Test
- public void encodeCdataEnd()
+ void encodeCdataEnd()
{
PageForPartialUpdate page = new PageForPartialUpdate();
@@ -59,7 +62,7 @@ public class XmlPartialPageUpdateTest extends WicketTestCase
* see https://issues.apache.org/jira/browse/WICKET-6162
*/
@Test
- public void keepTheSameHeaderContainer() throws Exception
+ void keepTheSameHeaderContainer() throws Exception
{
PageForPartialUpdate page = new PageForPartialUpdate();
@@ -82,7 +85,7 @@ public class XmlPartialPageUpdateTest extends WicketTestCase
* WICKET-6503 removed components are not written, but no exception raised either.
*/
@Test
- public void removedComponentAreNotWritten() throws Exception
+ void removedComponentAreNotWritten() throws Exception
{
PageForPartialUpdate page = new PageForPartialUpdate();
@@ -96,6 +99,6 @@ public class XmlPartialPageUpdateTest extends WicketTestCase
update.writeTo(response, "UTF-8");
- assertFalse("notInPage not written", response.getTextResponse().toString().contains("notInPage"));
+ assertFalse(response.getTextResponse().toString().contains("notInPage"), "notInPage not written");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/page/expirationrecovery/PageExpirationRecoveryTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/page/expirationrecovery/PageExpirationRecoveryTest.java b/wicket-core/src/test/java/org/apache/wicket/page/expirationrecovery/PageExpirationRecoveryTest.java
index 88e94d1..29bbd3a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/page/expirationrecovery/PageExpirationRecoveryTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/page/expirationrecovery/PageExpirationRecoveryTest.java
@@ -16,16 +16,18 @@
*/
package org.apache.wicket.page.expirationrecovery;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.wicket.protocol.http.PageExpiredException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.settings.PageSettings;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests for
@@ -33,15 +35,15 @@ import org.junit.Test;
* WICKET-5070 Optionally execute Callback Behavior on Re-construction after Expiry
* WICKET-5001 Recovery of bookmarkable Page after Session Expiry
*/
-public class PageExpirationRecoveryTest extends WicketTestCase
+class PageExpirationRecoveryTest extends WicketTestCase
{
private final PageParameters parameters = new PageParameters()
.set("a", "b")
.set("c", "d");
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
tester.getApplication().mountPage("under/test", ExpirationRecoveryPage.class);
@@ -52,8 +54,8 @@ public class PageExpirationRecoveryTest extends WicketTestCase
ExpirationRecoveryPage.ajaxSubmitLinkSubmitted.set(false);
}
- @Test(expected = PageExpiredException.class)
- public void cannotRecreatePageShouldThrowPEE()
+ @Test
+ void cannotRecreatePageShouldThrowPEE()
{
PageSettings pageSettings = tester.getApplication().getPageSettings();
pageSettings.setRecreateBookmarkablePagesAfterExpiry(false); // CANNOT recreate
@@ -64,11 +66,14 @@ public class PageExpirationRecoveryTest extends WicketTestCase
tester.getSession().invalidateNow();
assertFalse(page.linkClicked.get());
- tester.clickLink("link", false); // leads to PageExpiredException
+
+ assertThrows(PageExpiredException.class, () -> {
+ tester.clickLink("link", false);
+ });
}
@Test
- public void cannotExecuteListener()
+ void cannotExecuteListener()
{
PageSettings pageSettings = tester.getApplication().getPageSettings();
pageSettings.setRecreateBookmarkablePagesAfterExpiry(true); // CAN recreate
@@ -83,33 +88,33 @@ public class PageExpirationRecoveryTest extends WicketTestCase
tester.clickLink("link", false);
page = (ExpirationRecoveryPage) tester.getLastRenderedPage();
// the page is properly recreated
- assertEquals("PageParameters should be preserved", parameters, page.getPageParameters());
+ assertEquals(parameters, page.getPageParameters(), "PageParameters should be preserved");
// but the listener interface is not executed
- assertFalse("Link should not be clicked!", page.linkClicked.get());
+ assertFalse(page.linkClicked.get(), "Link should not be clicked!");
tester.getSession().invalidateNow();
assertFalse(page.ajaxLinkClicked.get());
tester.clickLink("alink", true);
page = (ExpirationRecoveryPage) tester.getLastRenderedPage();
- assertFalse("AjaxLink should not be clicked!", page.ajaxLinkClicked.get());
- assertEquals("PageParameters should be preserved", parameters, page.getPageParameters());
+ assertFalse(page.ajaxLinkClicked.get(), "AjaxLink should not be clicked!");
+ assertEquals(parameters, page.getPageParameters(), "PageParameters should be preserved");
tester.getSession().invalidateNow();
assertFalse(page.submitLinkSubmitted.get());
tester.clickLink("f:sl", false);
page = (ExpirationRecoveryPage) tester.getLastRenderedPage();
- assertFalse("SubmitLink should not be submitted!", page.submitLinkSubmitted.get());
- assertEquals("PageParameters should be preserved", parameters, page.getPageParameters());
+ assertFalse(page.submitLinkSubmitted.get(), "SubmitLink should not be submitted!");
+ assertEquals(parameters, page.getPageParameters(), "PageParameters should be preserved");
tester.getSession().invalidateNow();
assertFalse(page.ajaxSubmitLinkSubmitted.get());
tester.clickLink("f:asl", true);
page = (ExpirationRecoveryPage) tester.getLastRenderedPage();
- assertFalse("AjaxSubmitLink should not be submitted", page.ajaxSubmitLinkSubmitted.get());
- assertEquals("PageParameters should be preserved", parameters, page.getPageParameters());
+ assertFalse(page.ajaxSubmitLinkSubmitted.get(), "AjaxSubmitLink should not be submitted");
+ assertEquals(parameters, page.getPageParameters(), "PageParameters should be preserved");
tester.getSession().invalidateNow();
@@ -119,36 +124,36 @@ public class PageExpirationRecoveryTest extends WicketTestCase
formTester.setValue("text", "newValue");
formTester.submit();
page = (ExpirationRecoveryPage) tester.getLastRenderedPage();
- assertFalse("Form should not be submitted", page.formSubmitted.get());
- assertEquals("TextField's value should not be modified", textOldValue, page.textModel.getObject());
- assertEquals("PageParameters should be preserved", parameters, page.getPageParameters());
+ assertFalse(page.formSubmitted.get(), "Form should not be submitted");
+ assertEquals(textOldValue, page.textModel.getObject(), "TextField's value should not be modified");
+ assertEquals(parameters, page.getPageParameters(), "PageParameters should be preserved");
}
@Test
- public void canExecuteListener()
+ void canExecuteListener()
{
PageSettings pageSettings = tester.getApplication().getPageSettings();
pageSettings.setCallListenerAfterExpiry(true);
pageSettings.setRecreateBookmarkablePagesAfterExpiry(true);
ExpirationRecoveryPage page = tester.startPage(ExpirationRecoveryPage.class, parameters);
- assertThat(parameters, is(equalTo(page.getPageParameters())));
+ assertEquals(page.getPageParameters(), parameters);
tester.getSession().invalidateNow();
assertFalse(page.linkClicked.get());
tester.clickLink("link", false);
page = (ExpirationRecoveryPage) tester.getLastRenderedPage();
- assertTrue("Link should be clicked!", page.linkClicked.get());
- assertEquals("PageParameters should be preserved", parameters, page.getPageParameters());
+ assertTrue(page.linkClicked.get(), "Link should be clicked!");
+ assertEquals(parameters, page.getPageParameters(), "PageParameters should be preserved");
tester.getSession().invalidateNow();
assertFalse(page.ajaxLinkClicked.get());
tester.clickLink("alink", true);
page = (ExpirationRecoveryPage) tester.getLastRenderedPage();
- assertTrue("AjaxLink should be clicked!", page.ajaxLinkClicked.get());
- assertEquals("PageParameters should be preserved", parameters, page.getPageParameters());
+ assertTrue(page.ajaxLinkClicked.get(), "AjaxLink should be clicked!");
+ assertEquals(parameters, page.getPageParameters(), "PageParameters should be preserved");
tester.getSession().invalidateNow();
@@ -158,24 +163,24 @@ public class PageExpirationRecoveryTest extends WicketTestCase
formTester.setValue("text", newValue);
formTester.submit();
page = (ExpirationRecoveryPage) tester.getLastRenderedPage();
- assertTrue("Form should be submitted", page.formSubmitted.get());
- assertEquals("TextField's value should be modified", newValue, page.textModel.getObject());
- assertEquals("PageParameters should be preserved", parameters, page.getPageParameters());
+ assertTrue(page.formSubmitted.get(), "Form should be submitted");
+ assertEquals(newValue, page.textModel.getObject(), "TextField's value should be modified");
+ assertEquals(parameters, page.getPageParameters(), "PageParameters should be preserved");
tester.getSession().invalidateNow();
assertFalse(page.submitLinkSubmitted.get());
tester.clickLink("f:sl", false);
page = (ExpirationRecoveryPage) tester.getLastRenderedPage();
- assertTrue("SubmitLink should be submitted!", page.submitLinkSubmitted.get());
- assertEquals("PageParameters should be preserved", parameters, page.getPageParameters());
+ assertTrue(page.submitLinkSubmitted.get(), "SubmitLink should be submitted!");
+ assertEquals(parameters, page.getPageParameters(), "PageParameters should be preserved");
tester.getSession().invalidateNow();
assertFalse(page.ajaxSubmitLinkSubmitted.get());
tester.clickLink("f:asl", true);
page = (ExpirationRecoveryPage) tester.getLastRenderedPage();
- assertTrue("AjaxSubmitLink should be submitted", page.ajaxSubmitLinkSubmitted.get());
- assertEquals("PageParameters should be preserved", parameters, page.getPageParameters());
+ assertTrue(page.ajaxSubmitLinkSubmitted.get(), "AjaxSubmitLink should be submitted");
+ assertEquals(parameters, page.getPageParameters(), "PageParameters should be preserved");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/page/persistent/disk/PageWindowManagerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/page/persistent/disk/PageWindowManagerTest.java b/wicket-core/src/test/java/org/apache/wicket/page/persistent/disk/PageWindowManagerTest.java
index 1270800..c4ae2fa 100644
--- a/wicket-core/src/test/java/org/apache/wicket/page/persistent/disk/PageWindowManagerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/page/persistent/disk/PageWindowManagerTest.java
@@ -16,6 +16,11 @@
*/
package org.apache.wicket.page.persistent.disk;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.security.SecureRandom;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
@@ -23,19 +28,18 @@ import java.util.concurrent.Executors;
import org.apache.wicket.pageStore.PageWindowManager;
import org.apache.wicket.pageStore.PageWindowManager.PageWindow;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Matej Knopp
*/
-public class PageWindowManagerTest extends Assert
+public class PageWindowManagerTest
{
/**
* https://issues.apache.org/jira/browse/WICKET-4572
*/
@Test
- public void removeObsoleteIndices()
+ void removeObsoleteIndices()
{
int page0id = 0,
page1id = 1,
@@ -56,21 +60,21 @@ public class PageWindowManagerTest extends Assert
assertWindow(page1Window, page1id, page1Window.getFilePartOffset(), page1Window.getFilePartSize());
// Try to get a page which has been lost with the adding of page1
- assertNull("Page0 must be lost when Page1 has been added.", manager.getPageWindow(page0id));
+ assertNull(manager.getPageWindow(page0id), "Page0 must be lost when Page1 has been added.");
manager.createPageWindow(page2id, maxSize);
PageWindow page2Window = manager.getPageWindow(page2id);
assertWindow(page2Window, page2id, page2Window.getFilePartOffset(), page2Window.getFilePartSize());
// Try to get a page which has been lost with the adding of page2
- assertNull("Page1 must be lost when Page2 has been added.", manager.getPageWindow(page1id));
+ assertNull(manager.getPageWindow(page1id), "Page1 must be lost when Page2 has been added.");
}
/**
*
*/
@Test
- public void addRemove()
+ void addRemove()
{
PageWindowManager manager = new PageWindowManager(300);
PageWindow window;
@@ -99,7 +103,7 @@ public class PageWindowManagerTest extends Assert
*
*/
@Test
- public void pageWindowCycle()
+ void pageWindowCycle()
{
PageWindowManager manager = new PageWindowManager(100);
PageWindow window;
@@ -211,7 +215,7 @@ public class PageWindowManagerTest extends Assert
* @throws Exception
*/
@Test
- public void randomOperations() throws Exception
+ void randomOperations() throws Exception
{
ExecutorService executorService = Executors.newFixedThreadPool(50);
@@ -229,7 +233,7 @@ public class PageWindowManagerTest extends Assert
/** the ids for the stored/removed pages */
private static final int[] PAGE_IDS = new int[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
- protected final PageWindowManager pageWindowManager;
+ final PageWindowManager pageWindowManager;
private AbstractTask(PageWindowManager pageWindowManager)
{
@@ -251,7 +255,7 @@ public class PageWindowManagerTest extends Assert
}
}
- protected int getPageId()
+ int getPageId()
{
return PAGE_IDS[RND.nextInt(PAGE_IDS.length)];
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/pageStore/AbstractPageStoreTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/pageStore/AbstractPageStoreTest.java b/wicket-core/src/test/java/org/apache/wicket/pageStore/AbstractPageStoreTest.java
index 0ab35fd..17dd2c3 100644
--- a/wicket-core/src/test/java/org/apache/wicket/pageStore/AbstractPageStoreTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/pageStore/AbstractPageStoreTest.java
@@ -16,33 +16,35 @@
*/
package org.apache.wicket.pageStore;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import org.apache.wicket.MockPage;
import org.apache.wicket.serialize.ISerializer;
import org.apache.wicket.serialize.java.JavaSerializer;
-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;
-public abstract class AbstractPageStoreTest extends Assert
+abstract class AbstractPageStoreTest
{
- protected final String sessionId = "1234567890";
- protected final int pageId = 123;
- protected final ISerializer serializer = new JavaSerializer(getClass().getName());
- protected final IDataStore dataStore = new NoopDataStore();
- protected int maxEntries = 1;
- protected IPageStore pageStore = null;
-
- @Before
- public void before()
+ final String sessionId = "1234567890";
+ final int pageId = 123;
+ private final ISerializer serializer = new JavaSerializer(getClass().getName());
+ private final IDataStore dataStore = new NoopDataStore();
+ private int maxEntries = 1;
+ IPageStore pageStore = null;
+
+ @BeforeEach
+ void before()
{
pageStore = createPageStore(serializer, dataStore, maxEntries);
}
- protected abstract IPageStore createPageStore(ISerializer serializer, IDataStore dataStore, int maxEntries);
+ abstract IPageStore createPageStore(ISerializer serializer, IDataStore dataStore, int maxEntries);
- @After
- public void after()
+ @AfterEach
+ void after()
{
if (pageStore != null)
{
@@ -55,7 +57,7 @@ public abstract class AbstractPageStoreTest extends Assert
* Assert that a stored page is available to be read
*/
@Test
- public void storePage()
+ void storePage()
{
pageStore.storePage(sessionId, new MockPage(pageId));
@@ -66,7 +68,7 @@ public abstract class AbstractPageStoreTest extends Assert
* Assert that storing a page twice won't keep two entries
*/
@Test
- public void storePage2()
+ void storePage2()
{
int maxEntries = 10;
@@ -83,7 +85,7 @@ public abstract class AbstractPageStoreTest extends Assert
}
@Test
- public void removePage()
+ void removePage()
{
pageStore.storePage(sessionId, new MockPage(pageId));
@@ -98,7 +100,7 @@ public abstract class AbstractPageStoreTest extends Assert
* Verify that at most {@code maxEntries} per session can be put in the cache
*/
@Test
- public void maxSizeSameSession()
+ void maxSizeSameSession()
{
pageStore.storePage(sessionId, new MockPage(pageId));
@@ -115,7 +117,7 @@ public abstract class AbstractPageStoreTest extends Assert
* if they are in different sessions
*/
@Test
- public void maxSizeDifferentSessions()
+ void maxSizeDifferentSessions()
{
String sessionId2 = "0987654321";
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/pageStore/AsynchronousDataStoreTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/pageStore/AsynchronousDataStoreTest.java b/wicket-core/src/test/java/org/apache/wicket/pageStore/AsynchronousDataStoreTest.java
index 7f5b2c1..3c02261 100644
--- a/wicket-core/src/test/java/org/apache/wicket/pageStore/AsynchronousDataStoreTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/pageStore/AsynchronousDataStoreTest.java
@@ -22,7 +22,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import org.apache.wicket.versioning.InMemoryPageStore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link AsynchronousDataStore}
@@ -63,7 +63,7 @@ public class AsynchronousDataStoreTest
* @throws Exception
*/
@Test
- public void randomOperations() throws Exception
+ void randomOperations() throws Exception
{
ExecutorService executorService = Executors.newFixedThreadPool(50);
@@ -94,12 +94,12 @@ public class AsynchronousDataStoreTest
}
}
- protected String getSessionId()
+ String getSessionId()
{
return SESSIONS[RND.nextInt(SESSIONS.length)];
}
- protected int getPageId()
+ int getPageId()
{
return PAGE_IDS[RND.nextInt(PAGE_IDS.length)];
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/pageStore/AsynchronousPageStoreTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/pageStore/AsynchronousPageStoreTest.java b/wicket-core/src/test/java/org/apache/wicket/pageStore/AsynchronousPageStoreTest.java
index 4b17f69..b4fb451 100644
--- a/wicket-core/src/test/java/org/apache/wicket/pageStore/AsynchronousPageStoreTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/pageStore/AsynchronousPageStoreTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.wicket.pageStore;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
+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 static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
@@ -30,18 +30,18 @@ import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import com.google.common.base.Stopwatch;
import org.apache.commons.lang3.RandomUtils;
import org.apache.wicket.page.IManageablePage;
import org.apache.wicket.serialize.ISerializer;
import org.apache.wicket.serialize.java.DeflatedJavaSerializer;
-import org.apache.wicket.util.SlowTests;
+import org.apache.wicket.util.WicketTestTag;
import org.apache.wicket.util.file.File;
import org.apache.wicket.util.lang.Bytes;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.base.Stopwatch;
/**
@@ -49,8 +49,8 @@ import org.slf4j.LoggerFactory;
*
* @author manuelbarzi
*/
-@Category(SlowTests.class)
-public class AsynchronousPageStoreTest
+@Tag(WicketTestTag.SLOW)
+class AsynchronousPageStoreTest
{
/** Log for reporting. */
private static final Logger log = LoggerFactory.getLogger(AsynchronousPageStoreTest.class);
@@ -153,7 +153,7 @@ public class AsynchronousPageStoreTest
* @throws InterruptedException
*/
@Test
- public void storeReturnsSameInstanceOnClosePageRequest() throws InterruptedException
+ void storeReturnsSameInstanceOnClosePageRequest() throws InterruptedException
{
ISerializer serializer = new DeflatedJavaSerializer("applicationKey");
@@ -189,7 +189,7 @@ public class AsynchronousPageStoreTest
* @throws InterruptedException
*/
@Test
- public void storeReturnsRestoredInstanceOnDistantPageRequest() throws InterruptedException
+ void storeReturnsRestoredInstanceOnDistantPageRequest() throws InterruptedException
{
ISerializer serializer = new DeflatedJavaSerializer("applicationKey");
@@ -225,7 +225,7 @@ public class AsynchronousPageStoreTest
* @throws InterruptedException
*/
@Test
- public void storeBehavesAsyncWhenNotExceedingStoreCapacity() throws InterruptedException
+ void storeBehavesAsyncWhenNotExceedingStoreCapacity() throws InterruptedException
{
int sessions = 2;
int pages = 5;
@@ -254,7 +254,7 @@ public class AsynchronousPageStoreTest
* @throws InterruptedException
*/
@Test
- public void storeBehavesSyncFromWhenExceedingStoreCapacity() throws InterruptedException
+ void storeBehavesSyncFromWhenExceedingStoreCapacity() throws InterruptedException
{
int sessions = 2;
int pages = 5;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/pageStore/DiskDataStoreTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/pageStore/DiskDataStoreTest.java b/wicket-core/src/test/java/org/apache/wicket/pageStore/DiskDataStoreTest.java
index e69ead6..9187f79 100644
--- a/wicket-core/src/test/java/org/apache/wicket/pageStore/DiskDataStoreTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/pageStore/DiskDataStoreTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.wicket.pageStore;
+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 java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -27,18 +31,17 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.wicket.settings.StoreSettings;
-import org.apache.wicket.util.SlowTests;
+import org.apache.wicket.util.WicketTestTag;
import org.apache.wicket.util.lang.Bytes;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
*/
-@Category(SlowTests.class)
-public class DiskDataStoreTest extends Assert
+@Tag(WicketTestTag.SLOW)
+public class DiskDataStoreTest
{
/** Log for reporting. */
private static final Logger log = LoggerFactory.getLogger(DiskDataStoreTest.class);
@@ -46,7 +49,7 @@ public class DiskDataStoreTest extends Assert
/**
* Construct.
*/
- public DiskDataStoreTest()
+ DiskDataStoreTest()
{
}
@@ -69,23 +72,23 @@ public class DiskDataStoreTest extends Assert
private byte last;
private int length;
- public File(String sessionId, int id)
+ File(String sessionId, int id)
{
this.sessionId = sessionId;
this.id = id;
}
- public String getSessionId()
+ String getSessionId()
{
return sessionId;
}
- public int getId()
+ int getId()
{
return id;
}
- public byte[] generateData()
+ byte[] generateData()
{
length = FILE_SIZE_MIN + random.nextInt(FILE_SIZE_MAX - FILE_SIZE_MIN);
byte data[] = new byte[length];
@@ -95,7 +98,7 @@ public class DiskDataStoreTest extends Assert
return data;
}
- public boolean checkData(byte data[])
+ boolean checkData(byte data[])
{
if (data == null)
{
@@ -364,7 +367,7 @@ public class DiskDataStoreTest extends Assert
* store()
*/
@Test
- public void store()
+ void store()
{
generateFiles();
@@ -387,7 +390,7 @@ public class DiskDataStoreTest extends Assert
* it is put in folders which names are automatically calculated on the fly.
*/
@Test
- public void sessionFolderName()
+ void sessionFolderName()
{
StoreSettings storeSettings = new StoreSettings(null);
java.io.File fileStoreFolder = storeSettings.getFileStoreFolder();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/pageStore/NoopDataStore.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/pageStore/NoopDataStore.java b/wicket-core/src/test/java/org/apache/wicket/pageStore/NoopDataStore.java
index 0cadaee..8242d4f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/pageStore/NoopDataStore.java
+++ b/wicket-core/src/test/java/org/apache/wicket/pageStore/NoopDataStore.java
@@ -19,7 +19,7 @@ package org.apache.wicket.pageStore;
/**
* An implementation of IDataStore that does nothing
*/
-public class NoopDataStore implements IDataStore
+class NoopDataStore implements IDataStore
{
@Override
public byte[] getData(String sessionId, int id)
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/pageStore/PerSessionPageStoreTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/pageStore/PerSessionPageStoreTest.java b/wicket-core/src/test/java/org/apache/wicket/pageStore/PerSessionPageStoreTest.java
index 0cd4a2a..7205659 100644
--- a/wicket-core/src/test/java/org/apache/wicket/pageStore/PerSessionPageStoreTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/pageStore/PerSessionPageStoreTest.java
@@ -16,9 +16,11 @@
*/
package org.apache.wicket.pageStore;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import org.apache.wicket.MockPage;
import org.apache.wicket.serialize.ISerializer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for PerSessionPageStore
@@ -26,7 +28,7 @@ import org.junit.Test;
public class PerSessionPageStoreTest extends AbstractPageStoreTest
{
@Override
- protected IPageStore createPageStore(ISerializer serializer, IDataStore dataStore, int maxEntries)
+ IPageStore createPageStore(ISerializer serializer, IDataStore dataStore, int maxEntries)
{
return new PerSessionPageStore(serializer, dataStore, maxEntries);
}
@@ -37,7 +39,7 @@ public class PerSessionPageStoreTest extends AbstractPageStoreTest
*/
@Test
@Override
- public void maxSizeDifferentSessions()
+ void maxSizeDifferentSessions()
{
String sessionId2 = "0987654321";
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/DummyPageManagerContext.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/DummyPageManagerContext.java b/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/DummyPageManagerContext.java
index 99d4c90..6018ded 100644
--- a/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/DummyPageManagerContext.java
+++ b/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/DummyPageManagerContext.java
@@ -25,8 +25,8 @@ import org.apache.wicket.page.IPageManagerContext;
public class DummyPageManagerContext implements IPageManagerContext
{
- Serializable attribute = null;
- Object requestData;
+ private Serializable attribute = null;
+ private Object requestData;
@Override
public void setRequestData(Object data)
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/HttpSessionDataStoreTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/HttpSessionDataStoreTest.java b/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/HttpSessionDataStoreTest.java
index 10b5268..a1010c4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/HttpSessionDataStoreTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/HttpSessionDataStoreTest.java
@@ -16,31 +16,33 @@
*/
package org.apache.wicket.pageStore.memory;
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.After;
-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;
/**
*/
-public class HttpSessionDataStoreTest extends WicketTestCase
+class HttpSessionDataStoreTest extends WicketTestCase
{
- final String sessionId = "anything";
+ private final String sessionId = "anything";
- final int pageId = 1;
+ private final int pageId = 1;
- final byte[] PAGE1 = new byte[] { 1 };
+ private final byte[] PAGE1 = new byte[] { 1 };
final byte[] PAGE2 = new byte[] { 2 };
- HttpSessionDataStore store;
+ private HttpSessionDataStore store;
/**
* before()
*/
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
store = new HttpSessionDataStore(new DummyPageManagerContext(), new NoopEvictionStrategy());
}
@@ -48,8 +50,8 @@ public class HttpSessionDataStoreTest extends WicketTestCase
/**
* after()
*/
- @After
- public void after()
+ @AfterEach
+ void after()
{
store.destroy();
}
@@ -58,7 +60,7 @@ public class HttpSessionDataStoreTest extends WicketTestCase
* storePage()
*/
@Test
- public void storePage()
+ void storePage()
{
assertNull(store.getData(sessionId, pageId));
@@ -70,7 +72,7 @@ public class HttpSessionDataStoreTest extends WicketTestCase
* removePage1()
*/
@Test
- public void removePage1()
+ void removePage1()
{
assertNull(store.getData(sessionId, pageId));
@@ -87,7 +89,7 @@ public class HttpSessionDataStoreTest extends WicketTestCase
* removePage2()
*/
@Test
- public void removePage2()
+ void removePage2()
{
assertNull(store.getData(sessionId, pageId));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/MemorySizeEvictionStrategyTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/MemorySizeEvictionStrategyTest.java b/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/MemorySizeEvictionStrategyTest.java
index 50033fa..daacc62 100644
--- a/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/MemorySizeEvictionStrategyTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/MemorySizeEvictionStrategyTest.java
@@ -16,22 +16,22 @@
*/
package org.apache.wicket.pageStore.memory;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.apache.wicket.util.lang.Bytes;
import org.apache.wicket.core.util.lang.WicketObjects;
-import org.junit.Test;
+import org.apache.wicket.util.lang.Bytes;
+import org.junit.jupiter.api.Test;
/***/
-public class MemorySizeEvictionStrategyTest
+class MemorySizeEvictionStrategyTest
{
- final byte[] PAGE1 = new byte[] { 1 };
- final byte[] PAGE2 = new byte[] { 2, 3 };
+ private final byte[] PAGE1 = new byte[] { 1 };
+ private final byte[] PAGE2 = new byte[] { 2, 3 };
/***/
@Test
- public void evict()
+ void evict()
{
PageTable pageTable = new PageTable();
@@ -45,8 +45,8 @@ public class MemorySizeEvictionStrategyTest
strategy.evict(pageTable);
assertEquals(0, pageTable.size());
long currentSize = WicketObjects.sizeof(pageTable);
- assertTrue("Current size: |" + currentSize + "|, strategy size: |" + sizeOfEmptyPageTable +
- "|", currentSize <= sizeOfEmptyPageTable);
+ assertTrue(currentSize <= sizeOfEmptyPageTable, "Current size: |" + currentSize + "|, strategy size: |" + sizeOfEmptyPageTable +
+ "|");
// evict to page table with size: empty + PAGE2
pageTable.storePage(PAGE2.length, PAGE2);
@@ -59,7 +59,6 @@ public class MemorySizeEvictionStrategyTest
// bigger size than PAGE1
assertEquals(1, pageTable.size());
currentSize = WicketObjects.sizeof(pageTable);
- assertTrue("Current size: |" + currentSize + "|, strategy size: |" + sizeOfWithPage2 + "|",
- currentSize <= sizeOfWithPage2);
+ assertTrue(currentSize <= sizeOfWithPage2, "Current size: |" + currentSize + "|, strategy size: |" + sizeOfWithPage2 + "|");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/PageNumberEvictionStrategyTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/PageNumberEvictionStrategyTest.java b/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/PageNumberEvictionStrategyTest.java
index d3bf35b..f0ca167 100644
--- a/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/PageNumberEvictionStrategyTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/PageNumberEvictionStrategyTest.java
@@ -16,22 +16,23 @@
*/
package org.apache.wicket.pageStore.memory;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+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 org.junit.Test;
+import org.junit.jupiter.api.Test;
/***/
-public class PageNumberEvictionStrategyTest
+class PageNumberEvictionStrategyTest
{
- final byte[] PAGE1 = new byte[] { 1 };
- final byte[] PAGE2 = new byte[] { 2, 3 };
+ private final byte[] PAGE1 = new byte[] { 1 };
+ private final byte[] PAGE2 = new byte[] { 2, 3 };
/***/
@Test
- public void evict()
+ void evict()
{
// evict to page table with one page only
PageNumberEvictionStrategy strategy = new PageNumberEvictionStrategy(1);
@@ -55,9 +56,11 @@ public class PageNumberEvictionStrategyTest
/**
* The number of pages must be at least '1'
*/
- @Test(expected = IllegalArgumentException.class)
- public void greaterThanZero()
+ @Test
+ void greaterThanZero()
{
- new PageNumberEvictionStrategy(0);
+ assertThrows(IllegalArgumentException.class, () -> {
+ new PageNumberEvictionStrategy(0);
+ });
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/PageTableTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/PageTableTest.java b/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/PageTableTest.java
index 062068f..9c03545 100644
--- a/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/PageTableTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/PageTableTest.java
@@ -16,20 +16,20 @@
*/
package org.apache.wicket.pageStore.memory;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/***/
-public class PageTableTest
+class PageTableTest
{
- final byte[] data = new byte[] { 1 };
+ private final byte[] data = new byte[] { 1 };
/***/
@Test
- public void getOldest()
+ void getOldest()
{
PageTable pageTable = new PageTable();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/properties/MyTesterApplication.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/properties/MyTesterApplication.java b/wicket-core/src/test/java/org/apache/wicket/properties/MyTesterApplication.java
index 556d08b..ef9c704 100644
--- a/wicket-core/src/test/java/org/apache/wicket/properties/MyTesterApplication.java
+++ b/wicket-core/src/test/java/org/apache/wicket/properties/MyTesterApplication.java
@@ -20,7 +20,7 @@ import org.apache.wicket.mock.MockApplication;
/**
*/
-public class MyTesterApplication extends MockApplication
+class MyTesterApplication extends MockApplication
{
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/properties/PropertiesTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/properties/PropertiesTest.java b/wicket-core/src/test/java/org/apache/wicket/properties/PropertiesTest.java
index a5fbc64..da1f76a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/properties/PropertiesTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/properties/PropertiesTest.java
@@ -16,17 +16,19 @@
*/
package org.apache.wicket.properties;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.Locale;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
* @author Juergen Donnerstag
*/
-public class PropertiesTest extends WicketTestCase
+class PropertiesTest extends WicketTestCase
{
@Override
protected WebApplication newApplication()
@@ -37,7 +39,7 @@ public class PropertiesTest extends WicketTestCase
/**
*/
@Test
- public void test_1()
+ void test_1()
{
tester.getSession().setLocale(Locale.GERMANY);
tester.getSession().setStyle("mystyle");
@@ -58,7 +60,7 @@ public class PropertiesTest extends WicketTestCase
/**
*/
@Test
- public void test_2()
+ void test_2()
{
tester.getSession().setLocale(Locale.GERMANY);
TestPage page = new TestPage()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/properties/TestPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/properties/TestPage.java b/wicket-core/src/test/java/org/apache/wicket/properties/TestPage.java
index e11aa65..6ff7c85 100644
--- a/wicket-core/src/test/java/org/apache/wicket/properties/TestPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/properties/TestPage.java
@@ -223,7 +223,7 @@ public class TestPage extends WebPage
* @param id
* @param input
*/
- public MyTextField(final String id, final String input)
+ MyTextField(final String id, final String input)
{
super(id);
this.input = input;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/AbstractRequestLoggerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/AbstractRequestLoggerTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/AbstractRequestLoggerTest.java
index 86ec61e..d72574d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/AbstractRequestLoggerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/AbstractRequestLoggerTest.java
@@ -16,19 +16,21 @@
*/
package org.apache.wicket.protocol.http;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.protocol.http.IRequestLogger.RequestData;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link AbstractRequestLogger}.
*/
-public class AbstractRequestLoggerTest extends WicketTestCase
+class AbstractRequestLoggerTest extends WicketTestCase
{
private int counter;
@Test
- public void foo()
+ void foo()
{
tester.getApplication().getRequestLoggerSettings().setRequestsWindowSize(4);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/BufferedWebResponseTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/BufferedWebResponseTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/BufferedWebResponseTest.java
index bf71075..9f1d2e1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/BufferedWebResponseTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/BufferedWebResponseTest.java
@@ -16,13 +16,14 @@
*/
package org.apache.wicket.protocol.http;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.ArrayList;
import org.apache.wicket.mock.MockWebResponse;
import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* @author Pedro Santos
@@ -39,7 +40,7 @@ public class BufferedWebResponseTest extends WicketTestCase
* WICKET-3618
*/
@Test
- public void testBufferedResponsePostponeWriteResponseAction()
+ void testBufferedResponsePostponeWriteResponseAction()
{
final ArrayList<TestAction> actionsSequence = new ArrayList<TestAction>();
WebResponse originalResponse = new MockWebResponse()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/ClientPropertiesTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/ClientPropertiesTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/ClientPropertiesTest.java
index 560c9e5..aeb69dc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/ClientPropertiesTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/ClientPropertiesTest.java
@@ -16,23 +16,26 @@
*/
package org.apache.wicket.protocol.http;
+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 java.util.TimeZone;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for ClientProperties that failed on Mac OS X Java platform.
*
* @author Martijn Dashorst
*/
-public class ClientPropertiesTest extends Assert
+class ClientPropertiesTest
{
/**
* Tests GMT-2:00
*/
@Test
- public void timezoneMinus2()
+ void timezoneMinus2()
{
String utc = "-2.0";
ClientProperties props = new ClientProperties();
@@ -45,7 +48,7 @@ public class ClientPropertiesTest extends Assert
* Tests GMT+2:00
*/
@Test
- public void timezonePlus2()
+ void timezonePlus2()
{
String utc = "+2.0";
ClientProperties props = new ClientProperties();
@@ -58,7 +61,7 @@ public class ClientPropertiesTest extends Assert
* Tests GMT+11:00
*/
@Test
- public void timezonePlus10()
+ void timezonePlus10()
{
String utc = "+11.0";
ClientProperties props = new ClientProperties();
@@ -71,7 +74,7 @@ public class ClientPropertiesTest extends Assert
* Tests GMT+2:30
*/
@Test
- public void timezonePlus2andAHalf()
+ void timezonePlus2andAHalf()
{
String utc = "+2.5";
ClientProperties props = new ClientProperties();
@@ -84,7 +87,7 @@ public class ClientPropertiesTest extends Assert
* Tests GMT-2:30
*/
@Test
- public void timezoneMinus2andAHalf()
+ void timezoneMinus2andAHalf()
{
String utc = "-2.5";
ClientProperties props = new ClientProperties();
@@ -97,7 +100,7 @@ public class ClientPropertiesTest extends Assert
* Tests GMT+3:00
*/
@Test
- public void timezonePlus3()
+ void timezonePlus3()
{
String utc = "3";
ClientProperties props = new ClientProperties();
@@ -110,7 +113,7 @@ public class ClientPropertiesTest extends Assert
* Tests GMT-3:00
*/
@Test
- public void timezoneMinus3()
+ void timezoneMinus3()
{
String utc = "-3";
ClientProperties props = new ClientProperties();
@@ -123,7 +126,7 @@ public class ClientPropertiesTest extends Assert
* WICKET-5396.
*/
@Test
- public void integerToString()
+ void integerToString()
{
ClientProperties props = new ClientProperties();
[34/45] wicket git commit: - wicket-arquilian / wicket-cdi-1.1 :
Enable Junit Vintage Engine to run old Testrunners - BaseWicketTester.java:
remove dependency on AssertionFailedException - global: use AssertionError
instead of AssertionFailedError - upda
Posted by mg...@apache.org.
- wicket-arquilian / wicket-cdi-1.1 : Enable Junit Vintage Engine to run old Testrunners
- BaseWicketTester.java: remove dependency on AssertionFailedException
- global: use AssertionError instead of AssertionFailedError
- updated Templates to use Junit 5 imports and classes
- remove opentest4j as a dependency of wicket-util again
- update cdi-unit to version 4.1.0 from 4.0.2
- Excluded Tests tagged with SLOW from surefire plugin
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0b48f270
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0b48f270
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0b48f270
Branch: refs/heads/master
Commit: 0b48f2703b0856e539045a486fd362077fe947a1
Parents: 872657b
Author: renoth <jo...@gmx.de>
Authored: Sat Sep 1 12:15:17 2018 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 26 15:40:32 2018 +0300
----------------------------------------------------------------------
.../src/test/java/TestHomePage.java | 6 +-
pom.xml | 5 +-
testing/wicket-arquillian/pom.xml | 6 +
.../testing/ApacheLicenceHeaderTest.java | 12 +-
.../testing/TestWicketJavaEEApplication.java | 17 +-
.../deployment/AbstractDeploymentTest.java | 155 ++++---
.../testing/pages/InsertContactTest.java | 56 ++-
.../ArquillianContainerProvidedTest.java | 85 ++--
.../wicket/osgi/OsgiClashingPackagesTest.java | 85 ++--
.../org/apache/wicket/threadtest/App1Test.java | 2 +-
.../org/apache/wicket/threadtest/App2Test.java | 2 +-
.../authentication/panel/SignInPanelTest.java | 7 +-
.../util/markup/xhtml/WellFormedXmlTest.java | 2 +-
wicket-cdi/pom.xml | 6 +
.../apache/wicket/cdi/CdiConfigurationTest.java | 11 +-
.../org/apache/wicket/cdi/CdiWicketTester.java | 22 +-
.../wicket/cdi/ConversationPropagatorTest.java | 5 +-
.../apache/wicket/cdi/WicketCdiTestCase.java | 8 +-
.../wicket/util/tester/BaseWicketTester.java | 433 ++++++++++---------
.../apache/wicket/util/tester/WicketTester.java | 28 +-
.../test/java/org/apache/wicket/TesterTest.java | 4 +-
.../handler/render/WebPageRendererTest.java | 4 +-
.../inspector/SessionSizeModelTest.java | 7 +-
.../stateless/StatelessCheckerTest.java | 16 +-
.../util/markup/xhtml/WellFormedXmlTest.java | 2 +-
.../wicket/examples/JettyTestCaseDecorator.java | 14 +-
.../wicket/examples/WicketWebTestCase.java | 9 +-
.../examples/ajax/prototype/AjaxTest.java | 4 +-
.../wicket/examples/compref/ComprefTest.java | 10 +-
.../wicket/examples/encodings/EncodingTest.java | 10 +-
.../examples/forminput/FormInputTest.java | 2 +-
.../examples/guestbook/GuestbookTest.java | 12 +-
.../wicket/examples/hangman/HangManTest.java | 20 +-
.../examples/hangman/WordGeneratorTest.java | 28 +-
.../examples/helloworld/HelloWorldTest.java | 10 +-
.../wicket/examples/images/ImagesTest.java | 13 +-
.../wicket/examples/library/LibraryTest.java | 13 +-
.../examples/linkomatic/LinkomaticTest.java | 2 +-
.../wicket/examples/niceurl/NiceUrlTest.java | 13 +-
.../wicket/examples/repeater/RepeaterTest.java | 2 +-
.../wicket/examples/signin2/Signin2Test.java | 8 +-
.../wicket/examples/template/TemplateTest.java | 5 +-
.../wicket/filtertest/WithCPWithFPTest.java | 5 +-
.../wicket/filtertest/WithCPWithoutFPTest.java | 4 +-
.../wicket/filtertest/WithoutCPWithFPTest.java | 11 +-
.../filtertest/WithoutCPWithoutFPTest.java | 11 +-
.../util/markup/xhtml/WellFormedXmlTest.java | 2 +-
.../ajax/markup/html/AjaxEditableTest.java | 13 +-
.../ajax/markup/html/AjaxLazyLoadPanelTest.java | 2 +-
.../html/autocomplete/AutoCompleteTest.java | 4 +-
.../html/AjaxLazyLoadPanelTesterTest.java | 4 +-
.../html/basic/DefaultLinkParserTest.java | 19 +-
.../html/captcha/CaptchaImageResourceTest.java | 20 +-
.../markup/html/form/DateTextFieldTest.java | 31 +-
.../html/form/datetime/DateTimeFieldTest.java | 9 +-
.../form/datetime/LocalDateTextFieldTest.java | 5 +-
.../html/form/datetime/TimeFieldTest.java | 6 +-
.../datetime/ZonedToLocalDateTimeModelTest.java | 4 +-
.../markup/html/form/palette/PaletteTest.java | 5 +-
.../markup/html/form/select/SelectTest.java | 13 +-
.../resource/ThumbnailImageResourceTest.java | 5 +-
.../html/repeater/data/table/DataTableTest.java | 34 +-
.../data/table/export/CSVDataExporterTest.java | 8 +-
.../data/table/filter/FilterFormTest.java | 2 +-
.../repeater/tree/table/NodeBorderTest.java | 2 +-
.../html/repeater/tree/table/NodeModelTest.java | 22 +-
.../tree/table/TreeDataProviderTest.java | 8 +-
.../html/repeater/util/ProviderSubsetTest.java | 10 +-
.../repeater/util/TreeModelProviderTest.java | 9 +-
.../markup/html/tabs/TabbedPanelTest.java | 50 +--
.../html/tabs/TabbedPanelVisibilityTest.java | 4 +-
.../upload/UploadFormWithProgressBarTest.java | 4 +-
.../RfcCompliantEmailValidatorTest.java | 12 +-
.../extensions/wizard/WizardModelTest.java | 11 +-
.../wizard/dynamic/DynamicWizardModelTest.java | 7 +-
.../util/markup/xhtml/WellFormedXmlTest.java | 2 +-
.../wicket/guice/AbstractInjectorTest.java | 40 +-
.../guice/GuiceFieldValueFactoryTest.java | 4 +-
.../guice/GuiceWebApplicationFactoryTest.java | 5 +-
.../guice/JavaxInjectGuiceInjectorTest.java | 23 +-
.../wicket/guice/JavaxInjectTestBehavior.java | 8 +-
.../org/apache/wicket/guice/TestBehavior.java | 11 +-
wicket-util/pom.xml | 6 -
.../license/AbstractLicenseHeaderHandler.java | 17 +-
.../license/ApacheLicenseHeaderTestCase.java | 3 +-
.../util/license/CssLicenseHeaderHandler.java | 4 +-
.../util/license/JavaLicenseHeaderHandler.java | 9 +-
.../license/PropertiesLicenseHeaderHandler.java | 9 +-
.../license/VelocityLicenseHeaderHandler.java | 9 +-
.../util/license/XmlLicenseHeaderHandler.java | 13 +-
.../util/license/XmlPrologHeaderHandler.java | 4 +-
91 files changed, 910 insertions(+), 774 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/TestHomePage.java
----------------------------------------------------------------------
diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/TestHomePage.java b/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/TestHomePage.java
index 2088135..b48d999 100644
--- a/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/TestHomePage.java
+++ b/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/TestHomePage.java
@@ -1,8 +1,8 @@
package ${package};
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Simple test using the WicketTester
@@ -11,7 +11,7 @@ public class TestHomePage
{
private WicketTester tester;
- @Before
+ @BeforeEach
public void setUp()
{
tester = new WicketTester(new WicketApplication());
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 73ff1e1..39b9e56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -989,7 +989,10 @@
<includes>
<include>**/*Test.java</include>
</includes>
-
+ <properties>
+ <excludeTags>SLOW</excludeTags>
+ </properties>
+ <argLine>--add-opens java.base/jdk.internal.loader=ALL-UNNAMED --add-modules=ALL-SYSTEM</argLine>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/testing/wicket-arquillian/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-arquillian/pom.xml b/testing/wicket-arquillian/pom.xml
index 3c47b5e..13023a6 100644
--- a/testing/wicket-arquillian/pom.xml
+++ b/testing/wicket-arquillian/pom.xml
@@ -138,6 +138,12 @@
<artifactId>arquillian-junit-container</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- Wicket CDI integration. -->
<dependency>
<groupId>org.apache.wicket</groupId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/ApacheLicenceHeaderTest.java
----------------------------------------------------------------------
diff --git a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/ApacheLicenceHeaderTest.java b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/ApacheLicenceHeaderTest.java
index ac5aa02..8331475 100644
--- a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/ApacheLicenceHeaderTest.java
+++ b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/ApacheLicenceHeaderTest.java
@@ -16,14 +16,11 @@
*/
package org.apache.wicket.arquillian.testing;
-import java.util.Arrays;
-
import org.apache.wicket.util.license.ApacheLicenseHeaderTestCase;
/**
- * Test that the license headers are in place in this project. The tests are run
- * from {@link ApacheLicenseHeaderTestCase}, but you can add project specific
- * tests here if needed.
+ * Test that the license headers are in place in this project. The tests are run from
+ * {@link ApacheLicenseHeaderTestCase}, but you can add project specific tests here if needed.
*
* @author Frank Bille Jensen (frankbille)
*/
@@ -34,9 +31,6 @@ public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase
*/
public ApacheLicenceHeaderTest()
{
-// xmlIgnore.add(".settings");
-// xmlIgnore.add("src/main/resources/META-INF/beans.xml");
-// xmlIgnore.add("src/test/java/simplelogger.properties");
-// xmlPrologIgnore = Arrays.asList("src");
+
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/TestWicketJavaEEApplication.java
----------------------------------------------------------------------
diff --git a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/TestWicketJavaEEApplication.java b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/TestWicketJavaEEApplication.java
index 9f2d146..8d4d57b 100644
--- a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/TestWicketJavaEEApplication.java
+++ b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/TestWicketJavaEEApplication.java
@@ -24,12 +24,15 @@ import org.apache.wicket.arquillian.testing.util.ResourceWebApplicationPath;
* @author felipecalmeida
* @since 06/20/2015
*/
-public class TestWicketJavaEEApplication extends WicketJavaEEApplication {
-
+public class TestWicketJavaEEApplication extends WicketJavaEEApplication
+{
+
// Has some security ignores during the test (example: accept all roles).
-
- @Override
- protected void initResourceFinder() {
- getResourceSettings().getResourceFinders().add(new ResourceWebApplicationPath(TestWicketJavaEEApplication.class.getPackage().getName(), getServletContext()));
- }
+
+ @Override
+ protected void initResourceFinder()
+ {
+ getResourceSettings().getResourceFinders().add(new ResourceWebApplicationPath(
+ TestWicketJavaEEApplication.class.getPackage().getName(), getServletContext()));
+ }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
----------------------------------------------------------------------
diff --git a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
index 1615def..52b9014 100644
--- a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
+++ b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
@@ -16,6 +16,14 @@
*/
package org.apache.wicket.arquillian.testing.deployment;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import java.io.File;
+import java.util.Locale;
+
+import javax.servlet.ServletContext;
+
import org.apache.wicket.arquillian.testing.TestWicketJavaEEApplication;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.WicketTestTag;
@@ -32,119 +40,142 @@ import org.junit.jupiter.api.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.ServletContext;
-import java.io.File;
-import java.util.Locale;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
/**
- * <b>WARNING: If this error occurs - org.jboss.arquillian.container.spi.client.container.LifecycleException: The server is already running! Managed containers do not support connecting to running server instances due to the possible harmful effect of connecting to the wrong server. Please stop server before running or change to another type of container.
- * To disable this check and allow Arquillian to connect to a running server, set allowConnectingToRunningServer to true in the container configuration.</b>
- *
- * <b>SOLUTION: Search and kill wildfly or jboss proccess instance that are using port 8080.</b>
- *
- * <b> If you can't run inside eclipse, add as source the folder src/test/resources and try again. </b>
- *
+ * <b>WARNING: If this error occurs -
+ * org.jboss.arquillian.container.spi.client.container.LifecycleException: The server is already
+ * running! Managed containers do not support connecting to running server instances due to the
+ * possible harmful effect of connecting to the wrong server. Please stop server before running or
+ * change to another type of container. To disable this check and allow Arquillian to connect to a
+ * running server, set allowConnectingToRunningServer to true in the container configuration.</b>
+ *
+ * <b>SOLUTION: Search and kill wildfly or jboss proccess instance that are using port 8080.</b>
+ *
+ * <b> If you can't run inside eclipse, add as source the folder src/test/resources and try again.
+ * </b>
+ *
* @author felipecalmeida
* @since 06/23/2015
*
*/
@Tag(WicketTestTag.SLOW)
-public abstract class AbstractDeploymentTest {
-
+public abstract class AbstractDeploymentTest
+{
+
private static final Logger log = LoggerFactory.getLogger(AbstractDeploymentTest.class);
-
+
private static final String WEBAPP_SRC = "src/main/webapp";
private static final String WEBAPP_TEST_SRC = "src/test/webapp";
+ protected WicketTester wicketTester;
@Deployment
- public static WebArchive deployment() {
+ public static WebArchive deployment()
+ {
// Create webapp files from src/main/webapp. (WEB AS NORMAL)
- GenericArchive webapp = ShrinkWrap.create(GenericArchive.class).as(ExplodedImporter.class).importDirectory(WEBAPP_SRC).as(GenericArchive.class);
-
+ GenericArchive webapp = ShrinkWrap.create(GenericArchive.class)
+ .as(ExplodedImporter.class)
+ .importDirectory(WEBAPP_SRC)
+ .as(GenericArchive.class);
+
// Create webapptest files from src/test/webapp. (TEST)
- GenericArchive webappTest = ShrinkWrap.create(GenericArchive.class).as(ExplodedImporter.class).importDirectory(WEBAPP_TEST_SRC).as(GenericArchive.class);
-
+ GenericArchive webappTest = ShrinkWrap.create(GenericArchive.class)
+ .as(ExplodedImporter.class)
+ .importDirectory(WEBAPP_TEST_SRC)
+ .as(GenericArchive.class);
+
// Some configurations to create a manifest.mf.
ByteArrayAsset resource = new ByteArrayAsset("Dependencies: org.jboss.msc".getBytes());
-
+
// Create libs from POM.XML.
File[] asFile = Maven.configureResolver()
- .withMavenCentralRepo(true)
- // Load everything from pom, that is compile and runtime, as a file and transitivity to don't loose anything and cause exceptions.
- .loadPomFromFile("./pom.xml").importCompileAndRuntimeDependencies()
- .resolve().withTransitivity().asFile();
-
+ .withMavenCentralRepo(true)
+ // Load everything from pom, that is compile and runtime, as a file and transitivity to
+ // don't loose anything and cause exceptions.
+ .loadPomFromFile("./pom.xml")
+ .importCompileAndRuntimeDependencies()
+ .resolve()
+ .withTransitivity()
+ .asFile();
+
// Create the WAR.
return ShrinkWrap.create(WebArchive.class, "wicket-servletContext8.war")
- // Add packages and/or classes.
- .addPackages(true, TestWicketJavaEEApplication.class.getPackage())
- // Add the persistence.xml
- .addAsResource("META-INF/persistence.xml")
- // Add a manifest.
- .addAsManifestResource(resource, "MANIFEST.MF")
- // Add WEBAPP files.
- .merge(webapp,"/",Filters.exclude(".*\\web.xml"))
- // Add WEBAPP TEST files.
- .merge(webappTest,"/",Filters.includeAll())
- // Add LIBS from POM.XML.
- .addAsLibraries(asFile);
+ // Add packages and/or classes.
+ .addPackages(true, TestWicketJavaEEApplication.class.getPackage())
+ // Add the persistence.xml
+ .addAsResource("META-INF/persistence.xml")
+ // Add a manifest.
+ .addAsManifestResource(resource, "MANIFEST.MF")
+ // Add WEBAPP files.
+ .merge(webapp, "/", Filters.exclude(".*\\web.xml"))
+ // Add WEBAPP TEST files.
+ .merge(webappTest, "/", Filters.includeAll())
+ // Add LIBS from POM.XML.
+ .addAsLibraries(asFile);
}
-
- protected WicketTester wicketTester;
-
+
/**
* Set a new instance of wicketTester.
*
* @param wicketTester
*/
- public void setWicketTester(WicketTester wicketTester) {
+ public void setWicketTester(WicketTester wicketTester)
+ {
this.wicketTester = wicketTester;
}
-
+
/**
* Get an instance of wicketTester. The first time verify and create a new one.
*
* @return
*/
- public WicketTester getWicketTester() {
- if(wicketTester == null) {
- wicketTester = new WicketTester(useServletContextContainer(),false) {
+ public WicketTester getWicketTester()
+ {
+ if (wicketTester == null)
+ {
+ wicketTester = new WicketTester(useServletContextContainer(), false)
+ {
@Override
- protected Locale servletRequestLocale() {
+ protected Locale servletRequestLocale()
+ {
return Locale.US;
}
};
}
return wicketTester;
}
-
+
/**
* Loading the TestWicketJavaEEApplication from src/test/webapp/WEB-INF/web.xml.
- *
+ *
* @return
*/
- protected WebApplication useServletContextContainer() {
+ protected WebApplication useServletContextContainer()
+ {
WebApplication webApplication = null;
- try {
+ try
+ {
webApplication = TestWicketJavaEEApplication.get();
- } catch (Exception e) {
- log.error("If not using arquillian, maybe org.apache.wicket.Application has a message for you " + e.getMessage());
- // I didn't test it, just supposing that i'm not using arquillian, so should show this message.
- assertEquals("There is no application attached to current thread " + Thread.currentThread().getName(), e.getMessage());
}
-
+ catch (Exception e)
+ {
+ log.error(
+ "If not using arquillian, maybe org.apache.wicket.Application has a message for you " +
+ e.getMessage());
+ // I didn't test it, just supposing that i'm not using arquillian, so should show this
+ // message.
+ assertEquals("There is no application attached to current thread " +
+ Thread.currentThread().getName(), e.getMessage());
+ }
+
assertNotNull(webApplication);
-
+
log.info("WebApplication Name: " + webApplication.getName());
-
+
ServletContext servletContext = webApplication.getServletContext();
assertNotNull(servletContext);
log.info("ServletContext Name: " + servletContext.getServletContextName());
- assertEquals("Wicket Arquillian WildFly Quickstart: Wicket TEST WAR",servletContext.getServletContextName());
-
+ assertEquals("Wicket Arquillian WildFly Quickstart: Wicket TEST WAR",
+ servletContext.getServletContextName());
+
log.info("Server info: " + servletContext.getServerInfo());
return webApplication;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/pages/InsertContactTest.java
----------------------------------------------------------------------
diff --git a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/pages/InsertContactTest.java b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/pages/InsertContactTest.java
index 38df500..181235f 100644
--- a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/pages/InsertContactTest.java
+++ b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/pages/InsertContactTest.java
@@ -16,7 +16,8 @@
*/
package org.apache.wicket.arquillian.testing.pages;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import java.util.List;
import java.util.Locale;
@@ -35,12 +36,17 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * <b>WARNING: If this error occurs - org.jboss.arquillian.container.spi.client.container.LifecycleException: The server is already running! Managed containers do not support connecting to running server instances due to the possible harmful effect of connecting to the wrong server. Please stop server before running or change to another type of container.
- * To disable this check and allow Arquillian to connect to a running server, set allowConnectingToRunningServer to true in the container configuration.</b>
- *
- * <b>SOLUTION: Search and kill wildfly or jboss proccess instance that are using port 8080.</b>
+ * <b>WARNING: If this error occurs -
+ * org.jboss.arquillian.container.spi.client.container.LifecycleException: The server is already
+ * running! Managed containers do not support connecting to running server instances due to the
+ * possible harmful effect of connecting to the wrong server. Please stop server before running or
+ * change to another type of container. To disable this check and allow Arquillian to connect to a
+ * running server, set allowConnectingToRunningServer to true in the container configuration.</b>
*
- * <b> If you can't run inside eclipse, add as source the folder src/test/resources and try again. </b>
+ * <b>SOLUTION: Search and kill wildfly or jboss proccess instance that are using port 8080.</b>
+ *
+ * <b> If you can't run inside eclipse, add as source the folder src/test/resources and try again.
+ * </b>
*
* Just a class test to show that everything is working.
*
@@ -49,8 +55,9 @@ import org.slf4j.LoggerFactory;
*
*/
@RunWith(Arquillian.class)
-public class InsertContactTest extends AbstractDeploymentTest {
-
+public class InsertContactTest extends AbstractDeploymentTest
+{
+
private static final String EMAIL_IS_REQUIRED = "'email' is required.";
private static final String NAME_IS_REQUIRED = "'name' is required.";
@@ -68,8 +75,8 @@ public class InsertContactTest extends AbstractDeploymentTest {
private static final Logger log = LoggerFactory.getLogger(InsertContactTest.class);
@Inject
- private ContactDao contactDao;
-
+ private ContactDao contactDao;
+
@Before
public void before()
{
@@ -77,45 +84,48 @@ public class InsertContactTest extends AbstractDeploymentTest {
}
@Test
- public void testErrorMessagesInsertContact() {
+ public void testErrorMessagesInsertContact()
+ {
Class<InsertContact> pageClass = InsertContact.class;
getWicketTester().startPage(pageClass);
getWicketTester().assertRenderedPage(pageClass);
-
+
FormTester formTester = getWicketTester().newFormTester(INSERT_FORM);
formTester.submit();
getWicketTester().assertErrorMessages(NAME_IS_REQUIRED, EMAIL_IS_REQUIRED);
log.info("Required Messages: " + NAME_IS_REQUIRED + " and " + EMAIL_IS_REQUIRED);
-
+
getWicketTester().assertRenderedPage(pageClass);
}
-
+
@Test
- public void testInsertContact() {
+ public void testInsertContact()
+ {
Class<InsertContact> pageClass = InsertContact.class;
getWicketTester().startPage(pageClass);
getWicketTester().assertRenderedPage(pageClass);
-
+
FormTester formTester = getWicketTester().newFormTester(INSERT_FORM);
formTester.setValue(NAME, WICKET_ARQUILLIAN_TEST);
formTester.setValue(EMAIL, WICKET_ARQUILLIAN_TEST_APACHE_ORG);
formTester.submit();
-
+
getWicketTester().assertNoErrorMessage();
getWicketTester().assertRenderedPage(ListContacts.class);
-
+
log.info("Retrieving contacts to assert:");
List<Contact> contacts = contactDao.getContacts();
int contactsSize = contacts.size();
assertEquals(1, contactsSize);
-
+
Contact contact = contacts.get(0);
assertNotNull(contact.getId());
- assertEquals(WICKET_ARQUILLIAN_TEST,contact.getName());
- assertEquals(WICKET_ARQUILLIAN_TEST_APACHE_ORG,contact.getEmail());
-
+ assertEquals(WICKET_ARQUILLIAN_TEST, contact.getName());
+ assertEquals(WICKET_ARQUILLIAN_TEST_APACHE_ORG, contact.getEmail());
+
log.info("Contacts size: " + contactsSize);
- for (Contact infoContact : contacts) {
+ for (Contact infoContact : contacts)
+ {
log.info("Contacts info: " + infoContact);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/servletcontext/ArquillianContainerProvidedTest.java
----------------------------------------------------------------------
diff --git a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/servletcontext/ArquillianContainerProvidedTest.java b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/servletcontext/ArquillianContainerProvidedTest.java
index a3ec33c..f045a3c 100644
--- a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/servletcontext/ArquillianContainerProvidedTest.java
+++ b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/servletcontext/ArquillianContainerProvidedTest.java
@@ -36,37 +36,48 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * <b>WARNING: If this error occurs - org.jboss.arquillian.container.spi.client.container.LifecycleException: The server is already running! Managed containers do not support connecting to running server instances due to the possible harmful effect of connecting to the wrong server. Please stop server before running or change to another type of container.
- * To disable this check and allow Arquillian to connect to a running server, set allowConnectingToRunningServer to true in the container configuration.</b>
- *
- * <b>SOLUTION: Search and kill wildfly or jboss proccess instance that are using port 8080.</b>
+ * <b>WARNING: If this error occurs -
+ * org.jboss.arquillian.container.spi.client.container.LifecycleException: The server is already
+ * running! Managed containers do not support connecting to running server instances due to the
+ * possible harmful effect of connecting to the wrong server. Please stop server before running or
+ * change to another type of container. To disable this check and allow Arquillian to connect to a
+ * running server, set allowConnectingToRunningServer to true in the container configuration.</b>
*
- * <b> If you can't run inside eclipse, add as source the folder src/test/resources and try again. </b>
+ * <b>SOLUTION: Search and kill wildfly or jboss proccess instance that are using port 8080.</b>
+ *
+ * <b> If you can't run inside eclipse, add as source the folder src/test/resources and try again.
+ * </b>
*
* @author felipecalmeida
* @since 06/23/2015
*
*/
-@RunWith(Arquillian.class)
-public class ArquillianContainerProvidedTest extends AbstractDeploymentTest {
+@RunWith(Arquillian.class) // TODO upgrade to junit 5 ExtendWith when Arquillian project has Junit 5
+ // support
+public class ArquillianContainerProvidedTest extends AbstractDeploymentTest
+{
- private static final Logger log = LoggerFactory.getLogger(ArquillianContainerProvidedTest.class);
+ private static final Logger log = LoggerFactory
+ .getLogger(ArquillianContainerProvidedTest.class);
private static final String RESOURCE_PAGES_INSERT_CONTACT_HTML_NOT_FOUND = "Resource /pages/InsertContact.html not found.";
/**
- * Using container's servlet context and/or filter provided configured in web.xml and using Arquillian.
+ * Using container's servlet context and/or filter provided configured in web.xml and using
+ * Arquillian.
*/
@Test
public void testFindResourcesServletContextFromContainer() throws MalformedURLException
{
- WebApplication webApplication = useServletContextContainer();
- setWicketTester(new WicketTester(webApplication, webApplication.getServletContext(), false));
+ WebApplication webApplication = useServletContextContainer();
+ setWicketTester(
+ new WicketTester(webApplication, webApplication.getServletContext(), false));
findResourcesServletContext();
}
-
+
/**
- * Using container's servlet context and/or filter provided configured in web.xml and using Arquillian.
+ * Using container's servlet context and/or filter provided configured in web.xml and using
+ * Arquillian.
*/
@Test
public void testFindResourcesWebApplicationFromContainer() throws MalformedURLException
@@ -75,38 +86,48 @@ public class ArquillianContainerProvidedTest extends AbstractDeploymentTest {
setWicketTester(new WicketTester(webApplication, false));
findResourcesServletContext();
}
-
+
/**
* Creating another application and trying to reuse the ServletContext/Filter.
*/
@Test
- public void testNewApplicationTryReuseServletContextFilter() {
- try {
+ public void testNewApplicationTryReuseServletContextFilter()
+ {
+ try
+ {
log.info("Trying to reuse container's ServletContext/Filter.");
setWicketTester(new WicketTester(new TestWicketJavaEEApplication(), false));
fail("Should not be able to reuse the servlet context");
- } catch (IllegalStateException e) {
- assertEquals("servletContext is not set yet. Any code in your Application object that uses the wicket filter instance should be put in the init() method instead of your constructor", e.getMessage());
+ }
+ catch (IllegalStateException e)
+ {
+ assertEquals(
+ "servletContext is not set yet. Any code in your Application object that uses the wicket filter instance should be put in the init() method instead of your constructor",
+ e.getMessage());
}
assertNull(wicketTester);
}
-
+
/**
* Null application to test error.
*/
@Test
- public void testNullApplication() {
- try {
+ public void testNullApplication()
+ {
+ try
+ {
log.info("Trying to use a null application.");
setWicketTester(new WicketTester(null, false));
fail("WebApplication cannot be null");
- } catch (IllegalArgumentException iax) {
+ }
+ catch (IllegalArgumentException iax)
+ {
assertEquals("Argument 'application' may not be null.", iax.getMessage());
}
assertNull(wicketTester);
}
-
+
/**
* Test with new application.
*/
@@ -116,16 +137,20 @@ public class ArquillianContainerProvidedTest extends AbstractDeploymentTest {
setWicketTester(new WicketTester(new TestWicketJavaEEApplication()));
assertNotNull(getWicketTester().getApplication());
log.info("Using mock servletcontext.");
- log.info("WebApplication MOCK after wicketTester Name: " + getWicketTester().getApplication().getName());
- log.info("ServletContext MOCK after wicketTester Name: " + getWicketTester().getServletContext().getServletContextName());
+ log.info("WebApplication MOCK after wicketTester Name: " +
+ getWicketTester().getApplication().getName());
+ log.info("ServletContext MOCK after wicketTester Name: " +
+ getWicketTester().getServletContext().getServletContextName());
log.info("Server info: " + getWicketTester().getServletContext().getServerInfo());
- assertEquals("Wicket Mock Test Environment v1.0", getWicketTester().getServletContext().getServerInfo());
+ assertEquals("Wicket Mock Test Environment v1.0",
+ getWicketTester().getServletContext().getServerInfo());
// USING MOCK.
try
{
findResourcesServletContext();
- fail("Should not be able to find '/pages/InsertContact.html' in the mocked servlet context");
+ fail(
+ "Should not be able to find '/pages/InsertContact.html' in the mocked servlet context");
}
catch (IllegalStateException isx)
{
@@ -139,8 +164,10 @@ public class ArquillianContainerProvidedTest extends AbstractDeploymentTest {
private void findResourcesServletContext() throws MalformedURLException
{
// Doing the same thing that ResourceWebApplicationPath does.
- URL resource = getWicketTester().getServletContext().getResource("/pages/InsertContact.html");
- if (resource == null) {
+ URL resource = getWicketTester().getServletContext()
+ .getResource("/pages/InsertContact.html");
+ if (resource == null)
+ {
throw new IllegalStateException(RESOURCE_PAGES_INSERT_CONTACT_HTML_NOT_FOUND);
}
log.info("Resource found " + resource.getFile());
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java
----------------------------------------------------------------------
diff --git a/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java b/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java
index 6672cc6..bd6701a 100644
--- a/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java
+++ b/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java
@@ -14,16 +14,16 @@ import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import org.apache.wicket.util.string.Strings;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
/**
- * A test that verifies that there are no non-empty packages with the same name in
- * two or more wicket modules.
+ * A test that verifies that there are no non-empty packages with the same name in two or more
+ * wicket modules.
*
* Based on https://gist.github.com/1977817, contributed by Andreas Pieber
*/
-public class OsgiClashingPackagesTest extends Assert
+public class OsgiClashingPackagesTest
{
@Test
@@ -47,26 +47,33 @@ public class OsgiClashingPackagesTest extends Assert
String projectName = Strings.afterLast(dependency, '/');
Project project = new Project(projectName, jarFile);
project.addTo(projectBuckets);
- } finally {
+ }
+ finally
+ {
jarFile.close();
}
}
}
Set<Entry<String, List<Project>>> entrySet = projectBuckets.entrySet();
- for (Entry<String, List<Project>> entry : entrySet) {
+ for (Entry<String, List<Project>> entry : entrySet)
+ {
List<Project> projects = entry.getValue();
- if (projects.size() > 1) {
+ if (projects.size() > 1)
+ {
fail(entry);
}
}
}
- private void fail(Entry<String, List<Project>> entry) {
+ private void fail(Entry<String, List<Project>> entry)
+ {
StringBuilder builder = new StringBuilder();
String packageName = entry.getKey();
- builder.append("Package '").append(packageName).append("' has files in two or more modules: ");
- for (Project conflict : entry.getValue()) {
+ builder.append("Package '").append(packageName).append(
+ "' has files in two or more modules: ");
+ for (Project conflict : entry.getValue())
+ {
builder.append(conflict.getName()).append(", ");
}
try
@@ -78,33 +85,41 @@ public class OsgiClashingPackagesTest extends Assert
URL resource = resources.nextElement();
builder.append("\n\t").append(resource.toExternalForm());
}
- } catch (IOException e)
+ }
+ catch (IOException e)
{
e.printStackTrace();
}
- fail(builder.toString());
+ Assertions.fail(builder.toString());
}
- private static class Project {
+ private static class Project
+ {
// a set with all package names in a dependency
private final Set<String> packagesWithContent = new TreeSet<>();
// the name of the dependency
private final String name;
- public Project(String name, JarFile jarFile) {
+ public Project(String name, JarFile jarFile)
+ {
this.name = name;
collectPackageNames(jarFile);
}
/**
- * Adds this project to as a value in the global map that contains 'packageName -> List[Project]'
+ * Adds this project to as a value in the global map that contains 'packageName ->
+ * List[Project]'
+ *
* @param projectBuckets
- * the global map
+ * the global map
*/
- public void addTo(Map<String, List<Project>> projectBuckets) {
- for (String packageWithContent : packagesWithContent) {
- if (!projectBuckets.containsKey(packageWithContent)) {
+ public void addTo(Map<String, List<Project>> projectBuckets)
+ {
+ for (String packageWithContent : packagesWithContent)
+ {
+ if (!projectBuckets.containsKey(packageWithContent))
+ {
projectBuckets.put(packageWithContent, new ArrayList<Project>());
}
projectBuckets.get(packageWithContent).add(this);
@@ -113,8 +128,9 @@ public class OsgiClashingPackagesTest extends Assert
/**
* Collects the names of all packages in this JarFile
+ *
* @param jarFile
- * the jar file to analyze
+ * the jar file to analyze
*/
private void collectPackageNames(final JarFile jarFile)
{
@@ -131,36 +147,27 @@ public class OsgiClashingPackagesTest extends Assert
}
}
- public String getName() {
+ public String getName()
+ {
return name;
}
@Override
public String toString()
{
- return "Project{" +
- "name='" + name + '\'' +
- '}';
+ return "Project{" + "name='" + name + '\'' + '}';
}
private boolean shouldCollect(final String entryName)
{
- if (
- // ignore folder names. count just files/resources
- entryName.endsWith("/") ||
+ return !entryName.endsWith("/") &&
- // all modules have META-INF {MANIFEST.MF, Maven stuff, ..}
- entryName.startsWith("META-INF/") ||
+ // all modules have META-INF {MANIFEST.MF, Maven stuff, ..}
+ !entryName.startsWith("META-INF/") &&
- // ignore Wicket's IInitializer conf files
- (entryName.startsWith("META-INF/wicket") && entryName.endsWith(".properties"))
- )
- {
- return false;
- }
-
- return true;
- }
+ // ignore Wicket's IInitializer conf files
+ (!entryName.startsWith("META-INF/wicket") || !entryName.endsWith(".properties"));
+ }
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/testing/wicket-threadtest/src/test/java/org/apache/wicket/threadtest/App1Test.java
----------------------------------------------------------------------
diff --git a/testing/wicket-threadtest/src/test/java/org/apache/wicket/threadtest/App1Test.java b/testing/wicket-threadtest/src/test/java/org/apache/wicket/threadtest/App1Test.java
index 88e4874..27e299d 100644
--- a/testing/wicket-threadtest/src/test/java/org/apache/wicket/threadtest/App1Test.java
+++ b/testing/wicket-threadtest/src/test/java/org/apache/wicket/threadtest/App1Test.java
@@ -23,7 +23,7 @@ import java.util.List;
import org.apache.wicket.threadtest.apps.app1.ResourceTestPage;
import org.apache.wicket.threadtest.tester.SimpleGetCommand;
import org.apache.wicket.threadtest.tester.Tester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author eelcohillenius
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/testing/wicket-threadtest/src/test/java/org/apache/wicket/threadtest/App2Test.java
----------------------------------------------------------------------
diff --git a/testing/wicket-threadtest/src/test/java/org/apache/wicket/threadtest/App2Test.java b/testing/wicket-threadtest/src/test/java/org/apache/wicket/threadtest/App2Test.java
index f23d1d4..7a8153b 100644
--- a/testing/wicket-threadtest/src/test/java/org/apache/wicket/threadtest/App2Test.java
+++ b/testing/wicket-threadtest/src/test/java/org/apache/wicket/threadtest/App2Test.java
@@ -21,7 +21,7 @@ import java.util.List;
import org.apache.wicket.threadtest.tester.SimpleGetCommand;
import org.apache.wicket.threadtest.tester.Tester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author eelcohillenius
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authentication/panel/SignInPanelTest.java
----------------------------------------------------------------------
diff --git a/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authentication/panel/SignInPanelTest.java b/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authentication/panel/SignInPanelTest.java
index 73735f5..e4208c5 100644
--- a/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authentication/panel/SignInPanelTest.java
+++ b/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authentication/panel/SignInPanelTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.authroles.authentication.panel;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.wicket.MarkupContainer;
@@ -29,13 +31,12 @@ import org.apache.wicket.request.Request;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link SignInPanel}
*/
-public class SignInPanelTest extends Assert
+public class SignInPanelTest
{
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-auth-roles/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java
----------------------------------------------------------------------
diff --git a/wicket-auth-roles/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java b/wicket-auth-roles/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java
index a8e7628..88d9025 100644
--- a/wicket-auth-roles/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java
+++ b/wicket-auth-roles/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.util.markup.xhtml;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Checks that the html markup files are well formed xml-s.
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-cdi/pom.xml b/wicket-cdi/pom.xml
index fb40f46..ac6c3c2 100644
--- a/wicket-cdi/pom.xml
+++ b/wicket-cdi/pom.xml
@@ -64,6 +64,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.jglue.cdi-unit</groupId>
<artifactId>cdi-unit</artifactId>
<exclusions>
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java
----------------------------------------------------------------------
diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java b/wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java
index 723db16..0b51437 100644
--- a/wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java
+++ b/wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.cdi;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import org.apache.wicket.cdi.testapp.TestConversationPage;
import org.apache.wicket.cdi.testapp.TestPage;
import org.apache.wicket.util.tester.WicketTester;
@@ -46,11 +49,15 @@ public class CdiConfigurationTest extends WicketCdiTestCase
}
}
- @Test(expected = Exception.class)
+ @Test
public void testConfigureTwice()
{
configure(new CdiConfiguration());
- new CdiConfiguration().configure(tester.getApplication());
+
+ assertThrows(Exception.class, () -> {
+ new CdiConfiguration().configure(tester.getApplication());
+ });
+
}
@Test
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiWicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiWicketTester.java b/wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiWicketTester.java
index 275a9bc..c887cd5 100644
--- a/wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiWicketTester.java
+++ b/wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiWicketTester.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.cdi;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -53,10 +53,9 @@ public class CdiWicketTester extends WicketTester
}
/**
- * Process the request by first activating the contexts on initial call.
- * This call is called recursively in the super class so keep track of the
- * topmost call and only activate and deactivate the contexts during that
- * time.
+ * Process the request by first activating the contexts on initial call. This call is called
+ * recursively in the super class so keep track of the topmost call and only activate and
+ * deactivate the contexts during that time.
*
* @param forcedRequest
* @param forcedRequestHandler
@@ -65,7 +64,7 @@ public class CdiWicketTester extends WicketTester
*/
@Override
protected boolean processRequest(final MockHttpServletRequest forcedRequest,
- final IRequestHandler forcedRequestHandler, final boolean redirect)
+ final IRequestHandler forcedRequestHandler, final boolean redirect)
{
if (getLastRequest() != null)
{
@@ -111,17 +110,16 @@ public class CdiWicketTester extends WicketTester
}
/**
- * Asserts that the response contains the right count. This can only be done
- * by parsing the markup because models only contain valid values during a
- * request, not after.
+ * Asserts that the response contains the right count. This can only be done by parsing the
+ * markup because models only contain valid values during a request, not after.
*
* @param count
* TODO
*/
public void assertCount(int count)
{
- assertTrue("Response does not contain a count",
- getLastResponseAsString().contains("COUNT=x"));
+ assertTrue(getLastResponseAsString().contains("COUNT=x"),
+ "Response does not contain a count");
Matcher matcher = COUNT_PATTERN.matcher(getLastResponseAsString());
assertTrue(matcher.find());
assertEquals(Integer.toString(count), matcher.group(1));
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-cdi/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java
----------------------------------------------------------------------
diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java b/wicket-cdi/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java
index 945c9cf..0cd536f 100644
--- a/wicket-cdi/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java
+++ b/wicket-cdi/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.cdi;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import javax.enterprise.context.Conversation;
import javax.inject.Inject;
@@ -23,7 +25,6 @@ import org.apache.wicket.cdi.testapp.TestConversationPage;
import org.apache.wicket.cdi.testapp.TestConversationalPage;
import org.apache.wicket.core.request.mapper.MountedMapper;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.hamcrest.CoreMatchers;
import org.junit.Test;
/**
@@ -134,7 +135,7 @@ public class ConversationPropagatorTest extends WicketCdiTestCase
tester.executeUrl("segment/hybrid?"+pageId+"&cid="+cid);
- assertThat(tester.getLastRenderedPage().getId(), CoreMatchers.is(pageId));
+ assertEquals(pageId, tester.getLastRenderedPage().getId());
}
@Test
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-cdi/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java
----------------------------------------------------------------------
diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java b/wicket-cdi/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java
index 3f82075..3e64077 100644
--- a/wicket-cdi/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java
+++ b/wicket-cdi/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java
@@ -32,20 +32,19 @@ import org.apache.wicket.util.tester.WicketTester;
import org.jglue.cdiunit.AdditionalClasses;
import org.jglue.cdiunit.CdiRunner;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.runner.RunWith;
/**
* @author jsarman
*/
-@RunWith(CdiRunner.class)
+@RunWith(CdiRunner.class) // TODO upgrade to junit 5 ExtendWith when Cdi project has Junit 5 support
@AdditionalClasses({ CdiWicketTester.class, BehaviorInjector.class, CdiConfiguration.class,
CdiShutdownCleaner.class, ComponentInjector.class, ConversationExpiryChecker.class,
ConversationPropagator.class, DetachEventEmitter.class, SessionInjector.class,
TestAppScope.class, TestConversationBean.class, TestCdiApplication.class,
AutoConversation.class })
-public abstract class WicketCdiTestCase extends Assert
+public abstract class WicketCdiTestCase
{
@Inject
private ContextManager contextManager;
@@ -72,9 +71,6 @@ public abstract class WicketCdiTestCase extends Assert
}
}
- /**
- * @see junit.framework.TestCase#setUp()
- */
@Before
public void commonBefore()
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
index 532cd10..313cb2d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
@@ -34,6 +34,7 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.regex.Pattern;
+
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
import javax.servlet.http.Cookie;
@@ -128,13 +129,11 @@ import org.apache.wicket.settings.RequestCycleSettings.RenderStrategy;
import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.util.lang.Generics;
-import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.time.Duration;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
-import org.opentest4j.AssertionFailedError;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -159,19 +158,14 @@ public class BaseWicketTester
private static final Logger log = LoggerFactory.getLogger(BaseWicketTester.class);
private final ServletContext servletContext;
- private MockHttpSession httpSession;
-
private final WebApplication application;
-
+ private final List<MockHttpServletRequest> previousRequests = Generics.newArrayList();
+ private final List<MockHttpServletResponse> previousResponses = Generics.newArrayList();
+ private MockHttpSession httpSession;
private boolean followRedirects = true;
private int redirectCount;
-
private MockHttpServletRequest lastRequest;
private MockHttpServletResponse lastResponse;
-
- private final List<MockHttpServletRequest> previousRequests = Generics.newArrayList();
- private final List<MockHttpServletResponse> previousResponses = Generics.newArrayList();
-
/** current request and response */
private MockHttpServletRequest request;
private MockHttpServletResponse response;
@@ -287,7 +281,8 @@ public class BaseWicketTester
* @param init
* force the application to be initialized (default = true)
*/
- public BaseWicketTester(final WebApplication application, final ServletContext servletCtx, boolean init)
+ public BaseWicketTester(final WebApplication application, final ServletContext servletCtx,
+ boolean init)
{
if (!init)
{
@@ -297,10 +292,10 @@ public class BaseWicketTester
servletContext = servletCtx != null ? servletCtx
// If it's provided from the container it's not necessary to mock.
: !init && application.getServletContext() != null ? application.getServletContext()
- : new MockServletContext(application, null);
+ : new MockServletContext(application, null);
// If using Arquillian and it's configured in a web.xml it'll be provided. If not, mock it.
- if(application.getWicketFilter() == null)
+ if (application.getWicketFilter() == null)
{
final FilterConfig filterConfig = new TestFilterConfig();
WicketFilter filter = new WicketFilter()
@@ -339,16 +334,16 @@ public class BaseWicketTester
application.getResourceSettings().setResourcePollFrequency(getResourcePollFrequency());
// reconfigure application for the test environment
- application.setPageRendererProvider(new LastPageRecordingPageRendererProvider(
- application.getPageRendererProvider()));
- application.setRequestCycleProvider(new TestRequestCycleProvider(
- application.getRequestCycleProvider()));
+ application.setPageRendererProvider(
+ new LastPageRecordingPageRendererProvider(application.getPageRendererProvider()));
+ application.setRequestCycleProvider(
+ new TestRequestCycleProvider(application.getRequestCycleProvider()));
// set a feedback message filter that will not remove any messages
originalFeedbackMessageCleanupFilter = application.getApplicationSettings()
.getFeedbackMessageCleanupFilter();
- application.getApplicationSettings().setFeedbackMessageCleanupFilter(
- IFeedbackMessageFilter.NONE);
+ application.getApplicationSettings()
+ .setFeedbackMessageCleanupFilter(IFeedbackMessageFilter.NONE);
IPageManagerProvider pageManagerProvider = newTestPageManagerProvider();
if (pageManagerProvider != null)
{
@@ -391,7 +386,8 @@ public class BaseWicketTester
private void setupNextRequestCycle()
{
- request = new MockHttpServletRequest(application, httpSession, servletContext, servletRequestLocale());
+ request = new MockHttpServletRequest(application, httpSession, servletContext,
+ servletRequestLocale());
request.setURL(request.getContextPath() + request.getServletPath() + "/");
// assign protocol://host:port to next request unless the last request was ajax
@@ -412,7 +408,8 @@ public class BaseWicketTester
// Preserve response cookies in redirects
// XXX: is this really needed ? Browsers wont do that, but some
// Wicket tests assert that a cookie is in the response,
- // even after redirects (see org.apache.wicket.util.cookies.SetCookieAndRedirectTest.statefulPage())
+ // even after redirects (see
+ // org.apache.wicket.util.cookies.SetCookieAndRedirectTest.statefulPage())
// They should assert that the cookie is in the next *request*
if (lastResponse != null)
{
@@ -469,7 +466,8 @@ public class BaseWicketTester
}
}
- protected Locale servletRequestLocale() {
+ protected Locale servletRequestLocale()
+ {
return Locale.getDefault();
}
@@ -725,7 +723,7 @@ public class BaseWicketTester
{
if (redirectCount++ >= 100)
{
- throw new AssertionFailedError("Possible infinite redirect detected. Bailing out.");
+ throw new AssertionError("Possible infinite redirect detected. Bailing out.");
}
Url newUrl = Url.parse(lastResponse.getRedirectLocation(),
@@ -995,11 +993,10 @@ public class BaseWicketTester
*
* @return Wicket-Ajax-BaseURL set on last response by {@link AbstractDefaultAjaxBehavior}
* @throws IOException
- * @throws ResourceStreamNotFoundException
* @throws ParseException
*/
- public String getWicketAjaxBaseUrlEncodedInLastResponse() throws IOException,
- ResourceStreamNotFoundException, ParseException
+ public String getWicketAjaxBaseUrlEncodedInLastResponse()
+ throws IOException, ParseException
{
XmlPullParser parser = new XmlPullParser();
parser.parse(getLastResponseAsString());
@@ -1080,10 +1077,10 @@ public class BaseWicketTester
}
/**
- * Simulates processing URL that invokes an {@link IRequestListener} on a component.
+ * Simulates processing URL that invokes an {@link IRequestListener} on a component.
*
- * After the listener is invoked the page containing the component will be rendered
- * (with an optional redirect - depending on {@link RenderStrategy}).
+ * After the listener is invoked the page containing the component will be rendered (with an
+ * optional redirect - depending on {@link RenderStrategy}).
*
* @param component
*/
@@ -1118,8 +1115,8 @@ public class BaseWicketTester
* Simulates invoking an {@link IRequestListener} on a component. As opposed to the
* {@link #executeListener(Component)} method, current request/response objects will be used
*
- * After the listener is invoked the page containing the component will be rendered
- * (with an optional redirect - depending on {@link RenderStrategy}).
+ * After the listener is invoked the page containing the component will be rendered (with an
+ * optional redirect - depending on {@link RenderStrategy}).
*
* @param component
*/
@@ -1129,8 +1126,8 @@ public class BaseWicketTester
// there are two ways to do this. RequestCycle could be forced to call the handler
// directly but constructing and parsing the URL increases the chance of triggering bugs
- IRequestHandler handler = new ListenerRequestHandler(new PageAndComponentProvider(
- component.getPage(), component));
+ IRequestHandler handler = new ListenerRequestHandler(
+ new PageAndComponentProvider(component.getPage(), component));
processRequest(handler);
}
@@ -1139,8 +1136,8 @@ public class BaseWicketTester
* Simulates invoking an {@link IRequestListener} on a component. As opposed to the
* {@link #executeListener(Component)} method, current request/response objects will be used
*
- * After the listener is invoked the page containing the component will be rendered
- * (with an optional redirect - depending on {@link RenderStrategy}).
+ * After the listener is invoked the page containing the component will be rendered (with an
+ * optional redirect - depending on {@link RenderStrategy}).
*
* @param component
* @param behavior
@@ -1152,8 +1149,9 @@ public class BaseWicketTester
// there are two ways to do this. RequestCycle could be forced to call the handler
// directly but constructing and parsing the URL increases the chance of triggering bugs
- IRequestHandler handler = new ListenerRequestHandler(new PageAndComponentProvider(
- component.getPage(), component), component.getBehaviorId(behavior));
+ IRequestHandler handler = new ListenerRequestHandler(
+ new PageAndComponentProvider(component.getPage(), component),
+ component.getBehaviorId(behavior));
processRequest(handler);
}
@@ -1184,8 +1182,8 @@ public class BaseWicketTester
serializeFormToRequest(form);
// mark behavior's component as the form submitter,
- String name = Form.getRootFormRelativeId(new PropertyModel<Component>(behavior,
- "component").getObject());
+ String name = Form.getRootFormRelativeId(
+ new PropertyModel<Component>(behavior, "component").getObject());
if (!request.getPostParameters().getParameterNames().contains(name))
{
request.getPostParameters().setParameterValue(name, "marked");
@@ -1200,9 +1198,10 @@ public class BaseWicketTester
*
* @return Origin header
*/
- protected String createOriginHeader(){
+ protected String createOriginHeader()
+ {
Url url = RequestCycle.get().getRequest().getUrl();
- return url.getProtocol() + "://" +url.getHost() + ":" + url.getPort();
+ return url.getProtocol() + "://" + url.getHost() + ":" + url.getPort();
}
/**
@@ -1453,7 +1452,8 @@ public class BaseWicketTester
}
catch (Exception e)
{
- String errorMessage = "Error while parsing the markup for the autogenerated page: " + e.getMessage();
+ String errorMessage = "Error while parsing the markup for the autogenerated page: " +
+ e.getMessage();
log.error(errorMessage, e);
fail(errorMessage);
}
@@ -1516,57 +1516,6 @@ public class BaseWicketTester
}
/**
- * A page that is used as the automatically created page for
- * {@link BaseWicketTester#startComponentInPage(Class)} and the other variations.
- * <p>
- * This page caches the generated markup so that it is available even after
- * {@link Component#detach()} where the {@link Component#markup component's markup cache} is
- * cleared.
- */
- public static class StartComponentInPage extends WebPage
- {
- private transient IMarkupFragment pageMarkup = null;
-
- /**
- * Construct.
- */
- public StartComponentInPage()
- {
- setStatelessHint(false);
- }
-
- @Override
- public IMarkupFragment getMarkup()
- {
- IMarkupFragment calculatedMarkup = null;
- if (pageMarkup == null)
- {
- IMarkupFragment markup = super.getMarkup();
- if (markup != null && markup != Markup.NO_MARKUP)
- {
- calculatedMarkup = markup;
- pageMarkup = markup;
- }
- }
- else
- {
- calculatedMarkup = pageMarkup;
- }
-
- return calculatedMarkup;
- }
-
- /**
- * @param markup
- */
- public void setPageMarkup(IMarkupFragment markup)
- {
- setMarkup(markup);
- pageMarkup = markup;
- }
- }
-
- /**
* Gets the component with the given path from last rendered page. This method fails in case the
* component couldn't be found.
*
@@ -1651,8 +1600,9 @@ public class BaseWicketTester
{
Component component = assertExists(path);
- return isTrue("component '" + Classes.name(component.getClass()) + "' is not of type: " +
- Classes.name(expectedComponentClass),
+ return isTrue(
+ "component '" + Classes.name(component.getClass()) + "' is not of type: " +
+ Classes.name(expectedComponentClass),
expectedComponentClass.isAssignableFrom(component.getClass()));
}
@@ -1736,24 +1686,26 @@ public class BaseWicketTester
return isFalse("component '" + path + "' is enabled", component.isEnabledInHierarchy());
}
- protected Component assertExists(final String path) {
+ protected Component assertExists(final String path)
+ {
Component component = getComponentFromLastRenderedPage(path);
if (component == null)
{
fail("path: '" + path + "' does no exist for page: " +
- Classes.simpleName(getLastRenderedPage().getClass()));
+ Classes.simpleName(getLastRenderedPage().getClass()));
}
return component;
}
- private FormComponent assertFormComponent(final String path) {
+ private FormComponent assertFormComponent(final String path)
+ {
Component component = assertExists(path);
if (component instanceof FormComponent == false)
{
fail("path: '" + path + "' is not a form component");
}
- return (FormComponent) component;
+ return (FormComponent)component;
}
/**
@@ -1908,8 +1860,8 @@ public class BaseWicketTester
"not be invoked when AJAX (javascript) is disabled.");
}
- List<AjaxEventBehavior> behaviors = WicketTesterHelper.findAjaxEventBehaviors(
- linkComponent, "click");
+ List<AjaxEventBehavior> behaviors = WicketTesterHelper
+ .findAjaxEventBehaviors(linkComponent, "click");
for (AjaxEventBehavior behavior : behaviors)
{
executeBehavior(behavior);
@@ -1935,10 +1887,11 @@ public class BaseWicketTester
(AjaxFormSubmitBehavior)WicketTesterHelper.findAjaxEventBehavior(link, "click"));
}
// if the link is an IAjaxLink, use it (do check if AJAX is expected)
- else if (isAjax && (linkComponent instanceof IAjaxLink || linkComponent instanceof AjaxFallbackLink))
+ else if (isAjax &&
+ (linkComponent instanceof IAjaxLink || linkComponent instanceof AjaxFallbackLink))
{
- List<AjaxEventBehavior> behaviors = WicketTesterHelper.findAjaxEventBehaviors(
- linkComponent, "click");
+ List<AjaxEventBehavior> behaviors = WicketTesterHelper
+ .findAjaxEventBehaviors(linkComponent, "click");
for (AjaxEventBehavior behavior : behaviors)
{
executeBehavior(behavior);
@@ -1959,7 +1912,7 @@ public class BaseWicketTester
}
else if (linkComponent instanceof ExternalLink)
{
- ExternalLink externalLink = (ExternalLink) linkComponent;
+ ExternalLink externalLink = (ExternalLink)linkComponent;
String href = externalLink.getDefaultModelObjectAsString();
try
{
@@ -1969,7 +1922,8 @@ public class BaseWicketTester
}
catch (IOException iox)
{
- throw new WicketRuntimeException("An error occurred while redirecting to: " + href, iox);
+ throw new WicketRuntimeException("An error occurred while redirecting to: " + href,
+ iox);
}
}
// if the link is a normal link (or ResourceLink)
@@ -1986,34 +1940,34 @@ public class BaseWicketTester
BookmarkablePageLink<?> bookmarkablePageLink = (BookmarkablePageLink<?>)link;
try
{
- Method getParametersMethod = BookmarkablePageLink.class.getDeclaredMethod(
- "getPageParameters", (Class<?>[])null);
+ Method getParametersMethod = BookmarkablePageLink.class
+ .getDeclaredMethod("getPageParameters", (Class<?>[])null);
getParametersMethod.setAccessible(true);
- PageParameters parameters = (PageParameters)getParametersMethod.invoke(
- bookmarkablePageLink, (Object[])null);
+ PageParameters parameters = (PageParameters)getParametersMethod
+ .invoke(bookmarkablePageLink, (Object[])null);
startPage(bookmarkablePageLink.getPageClass(), parameters);
}
catch (Exception e)
{
- throw new WicketRuntimeException("Internal error in WicketTester. "
- + "Please report this in Wicket's Issue Tracker.", e);
+ throw new WicketRuntimeException("Internal error in WicketTester. " +
+ "Please report this in Wicket's Issue Tracker.", e);
}
}
else if (link instanceof ResourceLink)
{
try
{
- Method getURL = ResourceLink.class.getDeclaredMethod("getURL", new Class[0]);
+ Method getURL = ResourceLink.class.getDeclaredMethod("getURL");
getURL.setAccessible(true);
CharSequence url = (CharSequence)getURL.invoke(link);
executeUrl(url.toString());
}
catch (Exception x)
{
- throw new RuntimeException(
- "An error occurred while clicking on a ResourceLink", x);
+ throw new RuntimeException("An error occurred while clicking on a ResourceLink",
+ x);
}
}
else
@@ -2057,10 +2011,8 @@ public class BaseWicketTester
public void submitForm(String path)
{
Form<?> form = (Form<?>)getComponentFromLastRenderedPage(path);
- Url url = Url.parse(
- form.getRootForm()
- .urlForListener(new PageParameters())
- .toString(), Charset.forName(request.getCharacterEncoding()));
+ Url url = Url.parse(form.getRootForm().urlForListener(new PageParameters()).toString(),
+ Charset.forName(request.getCharacterEncoding()));
// make url absolute
transform(url);
@@ -2138,10 +2090,8 @@ public class BaseWicketTester
* @param expectedDocument
* expected output
* @return a <code>Result</code>
- * @throws Exception
- */
- public Result isResultPage(final String expectedDocument) throws Exception
- {
+ */
+ public Result isResultPage(final String expectedDocument) {
// Validate the document
String document = getLastResponseAsString();
return isTrue("expected rendered page equals", document.equals(expectedDocument));
@@ -2173,16 +2123,15 @@ public class BaseWicketTester
* Asserts there are no feedback messages with the given level.
*
* @param level
- * the level of the feedback message
+ * the level of the feedback message
* @return a <code>Result</code>
*/
public Result hasNoFeedbackMessage(int level)
{
List<Serializable> messages = getMessages(level);
- return isTrue(
- String.format("expected no %s message, but contains\n%s",
- new FeedbackMessage(null, "", level).getLevelAsString().toLowerCase(Locale.ENGLISH), WicketTesterHelper.asLined(messages)),
- messages.isEmpty());
+ return isTrue(String.format("expected no %s message, but contains\n%s",
+ new FeedbackMessage(null, "", level).getLevelAsString().toLowerCase(Locale.ENGLISH),
+ WicketTesterHelper.asLined(messages)), messages.isEmpty());
}
/**
@@ -2196,7 +2145,8 @@ public class BaseWicketTester
*/
public List<Serializable> getMessages(final int level)
{
- List<FeedbackMessage> messages = getFeedbackMessages(new ExactLevelFeedbackMessageFilter(level));
+ List<FeedbackMessage> messages = getFeedbackMessages(
+ new ExactLevelFeedbackMessageFilter(level));
List<Serializable> actualMessages = Generics.newArrayList();
for (FeedbackMessage message : messages)
@@ -2245,11 +2195,13 @@ public class BaseWicketTester
public void debugComponentTrees(String filter)
{
log.info("debugging ----------------------------------------------");
- for (WicketTesterHelper.ComponentData obj : WicketTesterHelper.getComponentData(getLastRenderedPage()))
+ for (WicketTesterHelper.ComponentData obj : WicketTesterHelper
+ .getComponentData(getLastRenderedPage()))
{
if (obj.path.matches(".*" + filter + ".*"))
{
- log.info("[{}{}] path\t" + obj.path + " \t" + obj.type + " \t[" + obj.value + "]", obj.isEnabled?"E":"-", obj.isVisible?"V":"-");
+ log.info("[{}{}] path\t" + obj.path + " \t" + obj.type + " \t[" + obj.value + "]",
+ obj.isEnabled ? "E" : "-", obj.isVisible ? "V" : "-");
}
}
}
@@ -2279,9 +2231,9 @@ public class BaseWicketTester
String componentInfo = component.toString();
if (!component.isVisible())
{
- failMessage = "A component which is invisible and doesn't render a placeholder tag"
- + " will not be rendered at all and thus won't be accessible for subsequent AJAX interaction. " +
- componentInfo;
+ failMessage = "A component which is invisible and doesn't render a placeholder tag" +
+ " will not be rendered at all and thus won't be accessible for subsequent AJAX interaction. " +
+ componentInfo;
result = isTrue(failMessage, component.getOutputMarkupPlaceholderTag());
if (result.wasFailed())
{
@@ -2293,11 +2245,11 @@ public class BaseWicketTester
String ajaxResponse = getLastResponseAsString();
// Test that the previous response was actually a AJAX response
- failMessage = "The previous response was not an AJAX response. "+
- "You need to execute an AJAX event, using #clickLink() or " +
- "#executeAjaxEvent(), before using this assertion method";
- boolean isAjaxResponse = Pattern.compile(
- "^<\\?xml version=\"1.0\" encoding=\".*?\"\\?><ajax-response>")
+ failMessage = "The previous response was not an AJAX response. " +
+ "You need to execute an AJAX event, using #clickLink() or " +
+ "#executeAjaxEvent(), before using this assertion method";
+ boolean isAjaxResponse = Pattern
+ .compile("^<\\?xml version=\"1.0\" encoding=\".*?\"\\?><ajax-response>")
.matcher(ajaxResponse)
.find();
result = isTrue(failMessage, isAjaxResponse);
@@ -2310,8 +2262,7 @@ public class BaseWicketTester
String markupId = component.getMarkupId();
failMessage = "The component doesn't have a markup id, " +
- "which means that it can't have been added to the AJAX response. " +
- componentInfo;
+ "which means that it can't have been added to the AJAX response. " + componentInfo;
result = isTrue(failMessage, !Strings.isEmpty(markupId));
if (result.wasFailed())
{
@@ -2319,23 +2270,27 @@ public class BaseWicketTester
}
// Look for that the component is on the response, using the markup id
- boolean isComponentInAjaxResponse = ajaxResponse.matches("(?s).*<component id=\"" +
- markupId + "\"[^>]*?>.*");
+ boolean isComponentInAjaxResponse = ajaxResponse
+ .matches("(?s).*<component id=\"" + markupId + "\"[^>]*?>.*");
failMessage = "Component wasn't found in the AJAX response. " + componentInfo;
result = isTrue(failMessage, isComponentInAjaxResponse);
- if (!result.wasFailed()) {
+ if (!result.wasFailed())
+ {
return result;
}
// Check if the component has been included as part of an enclosure render
- Enclosure enclosure = getLastRenderedPage().visitChildren(Enclosure.class, (Enclosure enc, IVisit<Enclosure> visit) -> {
- if (AjaxEnclosureListener.isControllerOfEnclosure(component, enc)){
- visit.stop(enc);
- }
- });
+ Enclosure enclosure = getLastRenderedPage().visitChildren(Enclosure.class,
+ (Enclosure enc, IVisit<Enclosure> visit) -> {
+ if (AjaxEnclosureListener.isControllerOfEnclosure(component, enc))
+ {
+ visit.stop(enc);
+ }
+ });
- if (enclosure == null) {
+ if (enclosure == null)
+ {
return result;
}
@@ -2387,7 +2342,8 @@ public class BaseWicketTester
private void internalExecuteAllTimerBehaviors(final Component component)
{
- List<AbstractAjaxTimerBehavior> behaviors = component.getBehaviors(AbstractAjaxTimerBehavior.class);
+ List<AbstractAjaxTimerBehavior> behaviors = component
+ .getBehaviors(AbstractAjaxTimerBehavior.class);
for (AbstractAjaxTimerBehavior timer : behaviors)
{
checkUsability(component, true);
@@ -2447,8 +2403,8 @@ public class BaseWicketTester
checkUsability(component, true);
- List<AjaxEventBehavior> ajaxEventBehaviors = WicketTesterHelper.findAjaxEventBehaviors(
- component, event);
+ List<AjaxEventBehavior> ajaxEventBehaviors = WicketTesterHelper
+ .findAjaxEventBehaviors(component, event);
for (AjaxEventBehavior ajaxEventBehavior : ajaxEventBehaviors)
{
executeBehavior(ajaxEventBehavior);
@@ -2696,19 +2652,21 @@ public class BaseWicketTester
if (component.isVisibleInHierarchy() == false)
{
- res = Result.fail("The component is currently not visible in the hierarchy and thus you can not be used." +
- " Component: " + component);
+ res = Result.fail(
+ "The component is currently not visible in the hierarchy and thus you can not be used." +
+ " Component: " + component);
}
if (component.isEnabledInHierarchy() == false)
{
- res = Result.fail("The component is currently not enabled in the hierarchy and thus you can not be used." +
- " Component: " + component);
+ res = Result.fail(
+ "The component is currently not enabled in the hierarchy and thus you can not be used." +
+ " Component: " + component);
}
if (throwException && res.wasFailed())
{
- throw new AssertionFailedError(res.getMessage());
+ throw new AssertionError(res.getMessage());
}
return res;
}
@@ -2784,6 +2742,109 @@ public class BaseWicketTester
processRequest();
}
+ /**
+ * A page that is used as the automatically created page for
+ * {@link BaseWicketTester#startComponentInPage(Class)} and the other variations.
+ * <p>
+ * This page caches the generated markup so that it is available even after
+ * {@link Component#detach()} where the {@link Component#markup component's markup cache} is
+ * cleared.
+ */
+ public static class StartComponentInPage extends WebPage
+ {
+ private transient IMarkupFragment pageMarkup = null;
+
+ /**
+ * Construct.
+ */
+ public StartComponentInPage()
+ {
+ setStatelessHint(false);
+ }
+
+ @Override
+ public IMarkupFragment getMarkup()
+ {
+ IMarkupFragment calculatedMarkup = null;
+ if (pageMarkup == null)
+ {
+ IMarkupFragment markup = super.getMarkup();
+ if (markup != null && markup != Markup.NO_MARKUP)
+ {
+ calculatedMarkup = markup;
+ pageMarkup = markup;
+ }
+ }
+ else
+ {
+ calculatedMarkup = pageMarkup;
+ }
+
+ return calculatedMarkup;
+ }
+
+ /**
+ * @param markup
+ */
+ public void setPageMarkup(IMarkupFragment markup)
+ {
+ setMarkup(markup);
+ pageMarkup = markup;
+ }
+ }
+
+ private static class TestPageManagerProvider implements IPageManagerProvider
+ {
+ @Override
+ public IPageManager apply(IPageManagerContext pageManagerContext)
+ {
+ return new MockPageManager();
+ }
+ }
+
+ private static class WicketTesterServletWebResponse extends ServletWebResponse
+ implements
+ IMetaDataBufferingWebResponse
+ {
+ private List<Cookie> cookies = new ArrayList<Cookie>();
+
+ private WicketTesterServletWebResponse(ServletWebRequest request,
+ MockHttpServletResponse response)
+ {
+ super(request, response);
+ }
+
+ @Override
+ public void addCookie(Cookie cookie)
+ {
+ super.addCookie(cookie);
+ cookies.add(cookie);
+ }
+
+ @Override
+ public void writeMetaData(WebResponse webResponse)
+ {
+ for (Cookie cookie : cookies)
+ {
+ webResponse.addCookie(cookie);
+ }
+ }
+
+ @Override
+ public void sendRedirect(String url)
+ {
+ super.sendRedirect(url);
+ try
+ {
+ getContainerResponse().sendRedirect(url);
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+
private class LastPageRecordingPageRendererProvider implements IPageRendererProvider
{
private final IPageRendererProvider delegate;
@@ -2809,8 +2870,8 @@ public class BaseWicketTester
if (handler.getPageProvider().hasPageInstance())
{
Page renderedPage = (Page)handler.getPageProvider().getPageInstance();
- if (componentInPage != null && lastPage != null && renderedPage != null
- && lastPage.getPageClass() != renderedPage.getPageClass())
+ if (componentInPage != null && lastPage != null && renderedPage != null &&
+ lastPage.getPageClass() != renderedPage.getPageClass())
{
// WICKET-3913: reset startComponent if a new page
// type is rendered
@@ -2919,15 +2980,6 @@ public class BaseWicketTester
}
}
- private static class TestPageManagerProvider implements IPageManagerProvider
- {
- @Override
- public IPageManager apply(IPageManagerContext pageManagerContext)
- {
- return new MockPageManager();
- }
- }
-
public class TestFilterConfig implements FilterConfig
{
private final Map<String, String> initParameters = new HashMap<String, String>();
@@ -2961,47 +3013,4 @@ public class BaseWicketTester
throw new UnsupportedOperationException("Not implemented");
}
}
-
- private static class WicketTesterServletWebResponse extends ServletWebResponse
- implements
- IMetaDataBufferingWebResponse
- {
- private List<Cookie> cookies = new ArrayList<Cookie>();
-
- private WicketTesterServletWebResponse(ServletWebRequest request,
- MockHttpServletResponse response)
- {
- super(request, response);
- }
-
- @Override
- public void addCookie(Cookie cookie)
- {
- super.addCookie(cookie);
- cookies.add(cookie);
- }
-
- @Override
- public void writeMetaData(WebResponse webResponse)
- {
- for (Cookie cookie : cookies)
- {
- webResponse.addCookie(cookie);
- }
- }
-
- @Override
- public void sendRedirect(String url)
- {
- super.sendRedirect(url);
- try
- {
- getContainerResponse().sendRedirect(url);
- }
- catch (IOException e)
- {
- throw new RuntimeException(e);
- }
- }
- }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
index 7420526..dc352b6 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
@@ -18,14 +18,15 @@ package org.apache.wicket.util.tester;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
+
import javax.servlet.ServletContext;
import org.apache.commons.collections4.CollectionUtils;
@@ -50,7 +51,6 @@ import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Objects;
-import org.opentest4j.AssertionFailedError;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -283,21 +283,19 @@ public class WicketTester extends BaseWicketTester
{
if (null != getLastResponse().getHeader("Location"))
{
- throw new AssertionFailedError(
- "Location header should *not* be present when using Ajax");
+ fail("Location header should *not* be present when using Ajax");
}
String ajaxLocation = getLastResponse().getHeader("Ajax-Location");
if (null == ajaxLocation)
{
- throw new AssertionFailedError(
- "Ajax-Location header should be present when using Ajax");
+ fail("Ajax-Location header should be present when using Ajax");
}
int statusCode = getLastResponse().getStatus();
if (statusCode != 200)
{
- throw new AssertionFailedError("Expected HTTP status code to be 200 (OK)");
+ fail("Expected HTTP status code to be 200 (OK)");
}
}
@@ -479,7 +477,7 @@ public class WicketTester extends BaseWicketTester
if (markup == null)
{
- throw new AssertionFailedError(String.format("Cannot find the markup of component: %s",
+ fail(String.format("Cannot find the markup of component: %s",
component.getPageRelativePath()));
}
@@ -599,12 +597,12 @@ public class WicketTester extends BaseWicketTester
final List<FeedbackMessage> renderedMessages = model.getObject();
if (renderedMessages == null)
{
- throw new AssertionFailedError(
+ fail(
String.format("feedback panel at path [%s] returned null messages", path));
}
if (messages.length != renderedMessages.size())
{
- throw new AssertionFailedError(String.format(
+ fail(String.format(
"you expected '%d' messages for the feedback panel [%s], but there were actually '%d'",
messages.length, path, renderedMessages.size()));
}
@@ -748,10 +746,8 @@ public class WicketTester extends BaseWicketTester
*
* @param expectedDocument
* expected output <code>String</code>
- * @throws Exception
*/
- public void assertResultPage(final String expectedDocument) throws Exception
- {
+ public void assertResultPage(final String expectedDocument) {
// Validate the document
String document = getLastResponseAsString();
assertEquals(expectedDocument, document);
@@ -821,7 +817,7 @@ public class WicketTester extends BaseWicketTester
{
if (result.wasFailed())
{
- throw new AssertionFailedError(result.getMessage());
+ fail(result.getMessage());
}
}
@@ -962,7 +958,7 @@ public class WicketTester extends BaseWicketTester
public void executeListener(final Class<?> testClass, final Component component,
final String filename) throws Exception
{
- assertNotNull(component);
+ assert(component != null);
log.info("=== " + testClass.getName() + " : " + component.getPageRelativePath() + " ===");
@@ -980,7 +976,7 @@ public class WicketTester extends BaseWicketTester
public void executeBehavior(final Class<?> testClass, final AbstractAjaxBehavior behavior,
final String filename) throws Exception
{
- assertNotNull(behavior);
+ assert(behavior != null);
log.info("=== " + testClass.getName() + " : " + behavior.toString() + " ===");
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-core/src/test/java/org/apache/wicket/TesterTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/TesterTest.java b/wicket-core/src/test/java/org/apache/wicket/TesterTest.java
index 3258c33..692324d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/TesterTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/TesterTest.java
@@ -22,7 +22,7 @@ import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.jupiter.api.Test;
-import org.opentest4j.AssertionFailedError;
+
/**
* @author jcompagner
@@ -42,7 +42,7 @@ class TesterTest extends WicketTestCase
tester.assertVisible("label");
fail("Should fail, because label is invisible");
}
- catch (AssertionFailedError e)
+ catch (AssertionError e)
{
}
catch (NullPointerException e)
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java
index 882c39d..5956c33 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java
@@ -42,7 +42,7 @@ import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.http.WebResponse;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.opentest4j.AssertionFailedError;
+
/**
* Tests for the calculation whether or not to redirect or directly render a page
@@ -397,7 +397,7 @@ class WebPageRendererTest
renderer.redirectToRender = true;
when(provider.getPageInstance()).thenThrow(
- new AssertionFailedError("no page instance should be created"));
+ new AssertionError("no page instance should be created"));
when(urlRenderer.getBaseUrl()).thenReturn(Url.parse("a"));
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-devutils/src/test/java/org/apache/wicket/devutils/inspector/SessionSizeModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/test/java/org/apache/wicket/devutils/inspector/SessionSizeModelTest.java b/wicket-devutils/src/test/java/org/apache/wicket/devutils/inspector/SessionSizeModelTest.java
index af5b583..6510171 100644
--- a/wicket-devutils/src/test/java/org/apache/wicket/devutils/inspector/SessionSizeModelTest.java
+++ b/wicket-devutils/src/test/java/org/apache/wicket/devutils/inspector/SessionSizeModelTest.java
@@ -16,19 +16,20 @@
*/
package org.apache.wicket.devutils.inspector;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.Session;
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Response;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Pedro Santos
*/
-public class SessionSizeModelTest extends Assert
+public class SessionSizeModelTest
{
/**
[28/45] wicket git commit: wicket-core: Migrate to Junit 5
Posted by mg...@apache.org.
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");
}
}
[21/45] wicket git commit: wicket-core: Migrate to Junit 5
Posted by mg...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelTest.java
index cee2003..36cf933 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelTest.java
@@ -16,30 +16,34 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.Page;
import org.apache.wicket.markup.IMarkupFragment;
import org.apache.wicket.markup.Markup;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests {@code wicket:for} attribute functionality
*
* @author igor
*/
-public class AutoLabelTest extends WicketTestCase
+class AutoLabelTest extends WicketTestCase
{
/** */
@Test
- public void labelIntoMarkupInsertion()
+ void labelIntoMarkupInsertion()
{
class MyTestPage extends TestPage
{
private static final long serialVersionUID = 1L;
- public MyTestPage(String labelMarkup)
+ MyTestPage(String labelMarkup)
{
super("<label wicket:for='t'>" + labelMarkup + "</label>");
field.setLabel(Model.of("t"));
@@ -72,13 +76,13 @@ public class AutoLabelTest extends WicketTestCase
/** */
@Test
- public void markupIntoLabelInsertion()
+ void markupIntoLabelInsertion()
{
class MyTestPage extends TestPage
{
private static final long serialVersionUID = 1L;
- public MyTestPage(String labelMarkup)
+ MyTestPage(String labelMarkup)
{
super("<label wicket:for='t'>" + labelMarkup + "</label>");
}
@@ -88,19 +92,19 @@ public class AutoLabelTest extends WicketTestCase
MyTestPage page = new MyTestPage("<wicket:label>text</wicket:label>");
tester.startPage(page);
- assertEquals("text", ((MyTestPage)tester.getLastRenderedPage()).field.getLabel()
- .getObject());
+ assertEquals("text",
+ ((MyTestPage)tester.getLastRenderedPage()).field.getLabel().getObject());
}
/** */
@Test
- public void labelTagClasses()
+ void labelTagClasses()
{
class MyTestPage extends TestPage
{
private static final long serialVersionUID = 1L;
- public MyTestPage()
+ MyTestPage()
{
super("<label wicket:for='t'><span class='label-text'>field</span></label>");
}
@@ -143,7 +147,7 @@ public class AutoLabelTest extends WicketTestCase
{
private static final long serialVersionUID = 1L;
- public MyTestPage2()
+ MyTestPage2()
{
super(
"<label class='long' wicket:for='t'><wicket:label>field</wicket:label></label>");
@@ -164,8 +168,8 @@ public class AutoLabelTest extends WicketTestCase
tester.startPage(page);
String markup = tester.getLastResponse().getDocument();
markup = markup.replace("'", "\"");
- assertTrue("fragment: [" + markupFragment + "] not found in generated markup: [" + markup +
- "]", markup.contains(markupFragment.replace("'", "\"")));
+ assertTrue(markup.contains(markupFragment.replace("'", "\"")),
+ "fragment: [" + markupFragment + "] not found in generated markup: [" + markup + "]");
}
private void assertNotRendered(Page page, String markupFragment)
@@ -173,19 +177,17 @@ public class AutoLabelTest extends WicketTestCase
tester.startPage(page);
String markup = tester.getLastResponse().getDocument();
markup = markup.replace("'", "\"");
- assertFalse("fragment: [" + markupFragment + "] not found in generated markup: [" + markup +
- "]", markup.contains(markupFragment.replace("'", "\"")));
+ assertFalse(markup.contains(markupFragment.replace("'", "\"")),
+ "fragment: [" + markupFragment + "] not found in generated markup: [" + markup + "]");
}
private static class TestPage extends WebPage
{
private static final long serialVersionUID = 1L;
-
- TextField<String> field;
-
private final String labelMarkup;
+ TextField<String> field;
- public TestPage(String labelMarkup)
+ TestPage(String labelMarkup)
{
this.labelMarkup = labelMarkup;
Form<?> form = new Form<Void>("f");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithContentTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithContentTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithContentTest.java
index 0cef9a8..ee1ebb5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithContentTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithContentTest.java
@@ -19,7 +19,7 @@ package org.apache.wicket.markup.html.form;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Make sure AutoLabelForInputTagResolver works with nested {@literal <wicket:message>} and nested
@@ -29,7 +29,7 @@ import org.junit.Test;
* @author Carl-Eric Menzel <cm...@wicketbuch.de>
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
-public class AutoLabelWithContentTest extends WicketTestCase
+class AutoLabelWithContentTest extends WicketTestCase
{
public static class LabelWithMessagePage extends WebPage
{
@@ -42,7 +42,7 @@ public class AutoLabelWithContentTest extends WicketTestCase
}
@Test
- public void labelWithMessage() throws Exception
+ void labelWithMessage() throws Exception
{
tester.startPage(LabelWithMessagePage.class);
tester.assertContains("<label wicket:for=\"textfield\" id=\"textfield2-w-lbl\" for=\"textfield2\"><wicket:message key=\"foo\">my test text</wicket:message></label>");
@@ -59,7 +59,7 @@ public class AutoLabelWithContentTest extends WicketTestCase
}
@Test
- public void labelWithNestedComponent()
+ void labelWithNestedComponent()
{
tester.startPage(LabelWithNestedComponentsPage.class);
tester.assertContains("<label wicket:for=\"textfield\" id=\"textfield2-w-lbl\" for=\"textfield2\"><input type=\"text\" wicket:id=\"textfield\" value=\"\" name=\"textfield\" id=\"textfield2\"/></label>");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithinEnclosureTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithinEnclosureTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithinEnclosureTest.java
index dac1263..398b9c2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithinEnclosureTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithinEnclosureTest.java
@@ -19,14 +19,14 @@ package org.apache.wicket.markup.html.form;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
@SuppressWarnings({ "rawtypes", "serial", "unchecked" })
-public class AutoLabelWithinEnclosureTest extends WicketTestCase
+class AutoLabelWithinEnclosureTest extends WicketTestCase
{
- public static class LabelWithinEnclosurePage extends WebPage
+ static class LabelWithinEnclosurePage extends WebPage
{
- public LabelWithinEnclosurePage(final boolean textFieldVisible)
+ LabelWithinEnclosurePage(final boolean textFieldVisible)
{
Form form = new Form("form");
add(form);
@@ -42,7 +42,7 @@ public class AutoLabelWithinEnclosureTest extends WicketTestCase
}
@Test
- public void labelWithinEnclosure_Visible() throws Exception
+ void labelWithinEnclosure_Visible() throws Exception
{
tester.startPage(new LabelWithinEnclosurePage(true));
tester.dumpPage();
@@ -50,7 +50,7 @@ public class AutoLabelWithinEnclosureTest extends WicketTestCase
}
@Test
- public void labelWithinEnclosure_Invisible() throws Exception
+ void labelWithinEnclosure_Invisible() throws Exception
{
tester.startPage(new LabelWithinEnclosurePage(false));
tester.dumpPage();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ButtonTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ButtonTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ButtonTest.java
index fe303e6..dcb2d26 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ButtonTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ButtonTest.java
@@ -16,10 +16,9 @@
*/
package org.apache.wicket.markup.html.form;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
@@ -31,19 +30,19 @@ import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.TagTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author svenmeier
*/
-public class ButtonTest extends WicketTestCase
+class ButtonTest extends WicketTestCase
{
/**
* WICKET-4734 Asserting that the value attribute on tag input is escaped once by default
*/
@Test
- public void whenInputElement_thenModelObjectIsUsedForValueAttribute()
+ void whenInputElement_thenModelObjectIsUsedForValueAttribute()
{
tester.getApplication().getMarkupSettings().setStripWicketTags(false);
String text = "some text & another text";
@@ -51,16 +50,16 @@ public class ButtonTest extends WicketTestCase
tester.startPage(testPage);
TagTester buttonTagTester = tester.getTagByWicketId("button");
- assertThat(buttonTagTester, is(notNullValue()));
- assertThat(buttonTagTester.getAttribute("value"), is(equalTo(text)));
- assertThat(buttonTagTester.getValue(), is(nullValue()));
+ assertNotNull(buttonTagTester);
+ assertEquals(text, buttonTagTester.getAttribute("value"));
+ assertNull(buttonTagTester.getValue());
}
/**
* https://issues.apache.org/jira/browse/WICKET-6225
*/
@Test
- public void whenButtonElement_thenModelObjectIsUsedAsTextContent()
+ void whenButtonElement_thenModelObjectIsUsedAsTextContent()
{
tester.getApplication().getMarkupSettings().setStripWicketTags(false);
String text = "some text & another text";
@@ -75,16 +74,16 @@ public class ButtonTest extends WicketTestCase
tester.startPage(testPage);
TagTester buttonTagTester = tester.getTagByWicketId("button");
- assertThat(buttonTagTester, is(notNullValue()));
- assertThat(buttonTagTester.getAttribute("value"), is(nullValue()));
- assertThat(buttonTagTester.getValue(), is(equalTo(text)));
+ assertNotNull(buttonTagTester);
+ assertNull(buttonTagTester.getAttribute("value"));
+ assertEquals(text, buttonTagTester.getValue());
}
/**
* https://issues.apache.org/jira/browse/WICKET-6225
*/
@Test
- public void whenButtonElementWithoutModelObject_thenUseTextContentFromHtml()
+ void whenButtonElementWithoutModelObject_thenUseTextContentFromHtml()
{
tester.getApplication().getMarkupSettings().setStripWicketTags(false);
String text = "some text & another text";
@@ -102,16 +101,16 @@ public class ButtonTest extends WicketTestCase
tester.startPage(testPage);
TagTester buttonTagTester = tester.getTagByWicketId("button");
- assertThat(buttonTagTester, is(notNullValue()));
- assertThat(buttonTagTester.getAttribute("value"), is(nullValue()));
- assertThat(buttonTagTester.getValue(), is(equalTo(textInHtml)));
+ assertNotNull(buttonTagTester);
+ assertNull(buttonTagTester.getAttribute("value"));
+ assertEquals(textInHtml, buttonTagTester.getValue());
}
/**
* WICKET-5235 button does not use an inherited model
*/
@Test
- public void buttonDoesNotInheritModel()
+ void buttonDoesNotInheritModel()
{
TestPage testPage = new TestPage(null);
tester.startPage(testPage);
@@ -125,7 +124,7 @@ public class ButtonTest extends WicketTestCase
Button button;
/** */
- public TestPage(IModel<String> buttonModel)
+ TestPage(IModel<String> buttonModel)
{
add(form = new Form<Object>("form", new CompoundPropertyModel<>(new Object())));
form.add(button = new Button("button", buttonModel));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceTest.java
index 095da3a..465eb17 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceTest.java
@@ -26,7 +26,7 @@ import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.value.IValueMap;
import org.apache.wicket.util.value.ValueMap;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test the dynamic prefix/suffix feature introduced with
@@ -34,7 +34,7 @@ import org.junit.Test;
*
* @author Carl-Eric Menzel <cm...@wicketbuch.de> <ca...@c1-setcon.de>
*/
-public class CheckBoxMultipleChoiceTest extends WicketTestCase
+class CheckBoxMultipleChoiceTest extends WicketTestCase
{
/** */
public static class TestPage extends WebPage
@@ -48,7 +48,7 @@ public class CheckBoxMultipleChoiceTest extends WicketTestCase
* @param show2
* @param show3
*/
- public TestPage(final boolean show1, final boolean show2, final boolean show3, boolean show4)
+ TestPage(final boolean show1, final boolean show2, final boolean show3, boolean show4)
{
List<? extends String> choices = Arrays.asList("a", "b", "c");
add(new CheckBoxMultipleChoice<String>("checkWithoutPrefix", choices)
@@ -115,7 +115,7 @@ public class CheckBoxMultipleChoiceTest extends WicketTestCase
/** */
@Test
- public void noPrefix()
+ void noPrefix()
{
tester.startPage(new TestPage(true, false, false, false));
tester.assertContains("<div wicket:id=\"checkWithoutPrefix\"><input name=\"checkWithoutPrefix\"");
@@ -123,7 +123,7 @@ public class CheckBoxMultipleChoiceTest extends WicketTestCase
/** */
@Test
- public void fixedPrefix()
+ void fixedPrefix()
{
tester.startPage(new TestPage(false, true, false, false));
tester.assertContains("<div wicket:id=\"checkWithFixedPrefix\">pre<input name=\"checkWithFixedPrefix\"");
@@ -133,7 +133,7 @@ public class CheckBoxMultipleChoiceTest extends WicketTestCase
/** */
@Test
- public void dynamicPrefix()
+ void dynamicPrefix()
{
tester.startPage(new TestPage(false, false, true, false));
tester.assertContains("<div wicket:id=\"checkWithDynamicPrefix\">pre0a<input name=\"checkWithDynamicPrefix\"");
@@ -142,14 +142,14 @@ public class CheckBoxMultipleChoiceTest extends WicketTestCase
}
@Test
- public void disabledInHierarchy()
+ void disabledInHierarchy()
{
tester.startPage(new TestPage(false, false, false, true));
tester.assertContains("disabled=\"disabled\"");
}
@Test
- public void defaultLabelPositionIsAfter() throws Exception
+ void defaultLabelPositionIsAfter() throws Exception
{
CheckBoxMultipleChoice<Integer> radioChoice = new CheckBoxMultipleChoice<Integer>("testid", Arrays.asList(1)) {
@Override
@@ -165,11 +165,12 @@ public class CheckBoxMultipleChoiceTest extends WicketTestCase
};
tester.startComponentInPage(radioChoice);
- tester.assertResultPage("<span wicket:id=\"testid\"><input name=\"testid\" type=\"checkbox\" value=\"0\" id=\"testid1-testid_0\" class=\"input0\"/><label for=\"testid1-testid_0\" class=\"label0\">1</label>\n</span>");
+ tester.assertResultPage(
+ "<span wicket:id=\"testid\"><input name=\"testid\" type=\"checkbox\" value=\"0\" id=\"testid1-testid_0\" class=\"input0\"/><label for=\"testid1-testid_0\" class=\"label0\">1</label>\n</span>");
}
@Test
- public void labelPositionBefore() throws Exception
+ void labelPositionBefore() throws Exception
{
CheckBoxMultipleChoice<Integer> radioChoice = new CheckBoxMultipleChoice<Integer>("testid", Arrays.asList(1)) {
@Override
@@ -186,11 +187,12 @@ public class CheckBoxMultipleChoiceTest extends WicketTestCase
radioChoice.setLabelPosition(AbstractChoice.LabelPosition.BEFORE);
tester.startComponentInPage(radioChoice);
- tester.assertResultPage("<span wicket:id=\"testid\"><label for=\"testid1-testid_0\" class=\"label0\">1</label><input name=\"testid\" type=\"checkbox\" value=\"0\" id=\"testid1-testid_0\" class=\"input0\"/>\n</span>");
+ tester.assertResultPage(
+ "<span wicket:id=\"testid\"><label for=\"testid1-testid_0\" class=\"label0\">1</label><input name=\"testid\" type=\"checkbox\" value=\"0\" id=\"testid1-testid_0\" class=\"input0\"/>\n</span>");
}
@Test
- public void labelPositionWrapBefore() throws Exception
+ void labelPositionWrapBefore() throws Exception
{
CheckBoxMultipleChoice<Integer> radioChoice = new CheckBoxMultipleChoice<Integer>("testid", Arrays.asList(1)) {
@Override
@@ -207,11 +209,12 @@ public class CheckBoxMultipleChoiceTest extends WicketTestCase
radioChoice.setLabelPosition(AbstractChoice.LabelPosition.WRAP_BEFORE);
tester.startComponentInPage(radioChoice);
- tester.assertResultPage("<span wicket:id=\"testid\"><label class=\"label0\">1 <input name=\"testid\" type=\"checkbox\" value=\"0\" id=\"testid1-testid_0\" class=\"input0\"/></label>\n</span>");
+ tester.assertResultPage(
+ "<span wicket:id=\"testid\"><label class=\"label0\">1 <input name=\"testid\" type=\"checkbox\" value=\"0\" id=\"testid1-testid_0\" class=\"input0\"/></label>\n</span>");
}
@Test
- public void labelPositionWrapAfter() throws Exception
+ void labelPositionWrapAfter() throws Exception
{
CheckBoxMultipleChoice<Integer> radioChoice = new CheckBoxMultipleChoice<Integer>("testid", Arrays.asList(1)) {
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java
index 9c0da29..205b478 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java
@@ -16,13 +16,15 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* @author jcompagner
@@ -33,13 +35,13 @@ import org.junit.Test;
* @author igor
*
*/
-public class CheckGroupTest extends WicketTestCase
+class CheckGroupTest extends WicketTestCase
{
/**
* test component form processing
*/
@Test
- public void formProcessing()
+ void formProcessing()
{
// test model constructors
@@ -52,42 +54,36 @@ public class CheckGroupTest extends WicketTestCase
tester.submitForm(page.form);
- assertTrue("running with nothing selected - model must be empty", list.size() == 0);
+ assertTrue(list.size() == 0, "running with nothing selected - model must be empty");
- tester.getRequest()
- .getPostParameters()
- .setParameterValue(page.group.getInputName(), page.check1.getValue());
+ tester.getRequest().getPostParameters().setParameterValue(page.group.getInputName(),
+ page.check1.getValue());
tester.submitForm(page.form);
- assertTrue("running with choice1 selected - model must only contain value of check1",
- list.size() == 1 && list.contains("check1"));
+ assertTrue(list.size() == 1 && list.contains("check1"),
+ "running with choice1 selected - model must only contain value of check1");
- tester.getRequest()
- .getPostParameters()
- .setParameterValue(page.group.getInputName(), page.check2.getValue());
+ tester.getRequest().getPostParameters().setParameterValue(page.group.getInputName(),
+ page.check2.getValue());
tester.submitForm(page.form);
- assertTrue("running with choice2 selected - model must only contain value of check2",
- list.size() == 1 && list.contains("check2"));
+ assertTrue(list.size() == 1 && list.contains("check2"),
+ "running with choice2 selected - model must only contain value of check2");
// throw in some nulls into the request param to make sure they are
// ignored
tester.getRequest().getPostParameters().addParameterValue(page.group.getInputName(), null);
- tester.getRequest()
- .getPostParameters()
- .addParameterValue(page.group.getInputName(), page.check1.getValue());
- tester.getRequest()
- .getPostParameters()
- .addParameterValue(page.group.getInputName(), page.check2.getValue());
+ tester.getRequest().getPostParameters().addParameterValue(page.group.getInputName(),
+ page.check1.getValue());
+ tester.getRequest().getPostParameters().addParameterValue(page.group.getInputName(),
+ page.check2.getValue());
tester.submitForm(page.form);
- assertTrue(
- "running with choice1 and choice2 selected - model must only contain values of check1 and check2",
- list.size() == 2 && list.contains("check1") && list.contains("check2"));
+ assertTrue(list.size() == 2 && list.contains("check1") && list.contains("check2"),
+ "running with choice1 and choice2 selected - model must only contain values of check1 and check2");
- tester.getRequest()
- .getPostParameters()
- .setParameterValue(page.group.getInputName(), "some weird choice uuid to test error");
+ tester.getRequest().getPostParameters().setParameterValue(page.group.getInputName(),
+ "some weird choice uuid to test error");
try
{
tester.submitForm(page.form);
@@ -104,7 +100,7 @@ public class CheckGroupTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void rendering() throws Exception
+ void rendering() throws Exception
{
executeTest(CheckGroupTestPage1.class, "CheckGroupTestPage1_expected.html");
executeTest(CheckGroupTestPage2.class, "CheckGroupTestPage2_expected.html");
@@ -117,8 +113,8 @@ public class CheckGroupTest extends WicketTestCase
}
catch (WicketRuntimeException e)
{
- if (!e.getMessage().contains(
- "Check component [4:form:check2] cannot find its parent CheckGroup"))
+ if (!e.getMessage()
+ .contains("Check component [4:form:check2] cannot find its parent CheckGroup"))
{
fail("failed with wrong exception");
}
@@ -130,7 +126,7 @@ public class CheckGroupTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void disabledCheckGroup() throws Exception
+ void disabledCheckGroup() throws Exception
{
executeTest(CheckGroupDisabledTestPage.class, "CheckGroupDisabledTestPage_expected.html");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CollectionFormComponentTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CollectionFormComponentTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CollectionFormComponentTest.java
index 55ca02b..e1c970a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CollectionFormComponentTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CollectionFormComponentTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -29,8 +33,7 @@ import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Testing updating model collections through
@@ -38,10 +41,10 @@ import org.junit.Test;
*
* @author svenmeier
*/
-public class CollectionFormComponentTest extends WicketTestCase
+class CollectionFormComponentTest extends WicketTestCase
{
@Test
- public void getSetNullList()
+ void getSetNullList()
{
final AtomicBoolean setCalled = new AtomicBoolean();
@@ -71,7 +74,7 @@ public class CollectionFormComponentTest extends WicketTestCase
}
@Test
- public void getSetNullSet()
+ void getSetNullSet()
{
final AtomicBoolean setCalled = new AtomicBoolean();
@@ -100,8 +103,8 @@ public class CollectionFormComponentTest extends WicketTestCase
assertEquals("[A, B]", choice.getDefaultModelObjectAsString());
}
- @Test(expected = WicketRuntimeException.class)
- public void getNullCollectionFails()
+ @Test
+ void getNullCollectionFails()
{
Object object = new Object()
{
@@ -115,11 +118,14 @@ public class CollectionFormComponentTest extends WicketTestCase
Choice choice = new Choice(object);
choice.setConvertedInput(Arrays.asList("A", "B"));
- FormComponent.updateCollectionModel(choice);
+
+ assertThrows(WicketRuntimeException.class, () -> {
+ FormComponent.updateCollectionModel(choice);
+ });
}
@Test
- public void getSetModifiableCollection()
+ void getSetModifiableCollection()
{
final AtomicBoolean setCalled = new AtomicBoolean();
@@ -149,7 +155,7 @@ public class CollectionFormComponentTest extends WicketTestCase
}
@Test
- public void getModifiableCollection()
+ void getModifiableCollection()
{
Object object = new Object()
{
@@ -172,7 +178,7 @@ public class CollectionFormComponentTest extends WicketTestCase
* WICKET-5518
*/
@Test
- public void getSetUnmodifiableList()
+ void getSetUnmodifiableList()
{
final AtomicBoolean setCalled = new AtomicBoolean();
@@ -202,7 +208,7 @@ public class CollectionFormComponentTest extends WicketTestCase
}
@Test
- public void getSetUnmodifiableSet()
+ void getSetUnmodifiableSet()
{
final AtomicBoolean setCalled = new AtomicBoolean();
@@ -231,8 +237,8 @@ public class CollectionFormComponentTest extends WicketTestCase
assertEquals("[A, B]", choice.getDefaultModelObjectAsString());
}
- @Test(expected = WicketRuntimeException.class)
- public void getUnmodifiableFails()
+ @Test
+ void getUnmodifiableFails()
{
Object object = new Object()
{
@@ -246,11 +252,14 @@ public class CollectionFormComponentTest extends WicketTestCase
Choice choice = new Choice(object);
choice.setConvertedInput(Arrays.asList("A", "B"));
- FormComponent.updateCollectionModel(choice);
+
+ assertThrows(WicketRuntimeException.class, () -> {
+ FormComponent.updateCollectionModel(choice);
+ });
}
@Test
- public void getUnmodifiableInCaseOfNoConvertedInput()
+ void getUnmodifiableInCaseOfNoConvertedInput()
{
LoadableDetachableModel<Collection<String>> model = new LoadableDetachableModel<Collection<String>>()
{
@@ -269,11 +278,11 @@ public class CollectionFormComponentTest extends WicketTestCase
};
formComponent.setConvertedInput(null);
FormComponent.updateCollectionModel(formComponent);
- Assert.assertTrue(formComponent.getModelObject().isEmpty());
+ assertTrue(formComponent.getModelObject().isEmpty());
}
@Test
- public void getModelCollectionIsNullInCaseOfNoConvertedInput()
+ void getModelCollectionIsNullInCaseOfNoConvertedInput()
{
LoadableDetachableModel<Collection<String>> model = new LoadableDetachableModel<Collection<String>>()
{
@@ -292,13 +301,13 @@ public class CollectionFormComponentTest extends WicketTestCase
};
formComponent.setConvertedInput(null);
FormComponent.updateCollectionModel(formComponent);
- Assert.assertTrue(formComponent.getModelObject().isEmpty());
+ assertTrue(formComponent.getModelObject().isEmpty());
}
private class Choice extends FormComponent<Collection<String>>
{
- public Choice(Object object)
+ Choice(Object object)
{
super("choice", new PropertyModel(object, "strings"));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DisabledItemRetainingCheckBoxTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DisabledItemRetainingCheckBoxTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DisabledItemRetainingCheckBoxTest.java
index 979ba16..1a65e68 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DisabledItemRetainingCheckBoxTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DisabledItemRetainingCheckBoxTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.wicket.markup.html.form;
+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 java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -25,18 +29,18 @@ import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for the retainDisabledSelected flag on ListMultipleChoice.
*/
-public class DisabledItemRetainingCheckBoxTest extends WicketTestCase
+class DisabledItemRetainingCheckBoxTest extends WicketTestCase
{
/**
* testRenderMyPage()
*/
@Test
- public void renderMyPage()
+ void renderMyPage()
{
TestPage page = tester.startPage(TestPage.class);
tester.assertRenderedPage(TestPage.class);
@@ -50,7 +54,7 @@ public class DisabledItemRetainingCheckBoxTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void retainDisabledSelected_On() throws Exception
+ void retainDisabledSelected_On() throws Exception
{
TestPage page = tester.startPage(TestPage.class);
FormTester form = tester.newFormTester("form");
@@ -65,7 +69,7 @@ public class DisabledItemRetainingCheckBoxTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void retainDisabledSelected_Off() throws Exception
+ void retainDisabledSelected_Off() throws Exception
{
TestPage page = tester.startPage(TestPage.class);
FormTester form = tester.newFormTester("form");
@@ -80,7 +84,7 @@ public class DisabledItemRetainingCheckBoxTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void retainDisabledSelected_NoSelection() throws Exception
+ void retainDisabledSelected_NoSelection() throws Exception
{
TestPage page = tester.startPage(TestPage.class);
FormTester form = tester.newFormTester("form");
@@ -94,7 +98,7 @@ public class DisabledItemRetainingCheckBoxTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void retainDisabledSelected_Off_NoSelection() throws Exception
+ void retainDisabledSelected_Off_NoSelection() throws Exception
{
TestPage page = tester.startPage(TestPage.class);
FormTester form = tester.newFormTester("form");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTest.java
index feb8404..ec00657 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTest.java
@@ -19,21 +19,21 @@ package org.apache.wicket.markup.html.form;
import java.util.Locale;
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 Juergen Donnerstag
* @author svenmeier
*/
-public class DropDownChoiceTest extends WicketTestCase
+class DropDownChoiceTest extends WicketTestCase
{
/**
* @throws Exception
*/
- @Before
- public void before() throws Exception
+ @BeforeEach
+ void before() throws Exception
{
tester.getSession().setLocale(Locale.ENGLISH);
}
@@ -44,7 +44,7 @@ public class DropDownChoiceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void nullWithNullValidFalse() throws Exception
+ void nullWithNullValidFalse() throws Exception
{
executeTest(new DropDownChoiceTestPage(null, false),
"DropDownChoiceTestPage_null_false_expected.html");
@@ -56,7 +56,7 @@ public class DropDownChoiceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void nullWithNullValidTrue() throws Exception
+ void nullWithNullValidTrue() throws Exception
{
executeTest(new DropDownChoiceTestPage(null, true),
"DropDownChoiceTestPage_null_true_expected.html");
@@ -68,7 +68,7 @@ public class DropDownChoiceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void nonNullWithNullValidFalse() throws Exception
+ void nonNullWithNullValidFalse() throws Exception
{
executeTest(new DropDownChoiceTestPage("A", false),
"DropDownChoiceTestPage_A_false_expected.html");
@@ -80,7 +80,7 @@ public class DropDownChoiceTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void nonNullWithNullValidTrue() throws Exception
+ void nonNullWithNullValidTrue() throws Exception
{
executeTest(new DropDownChoiceTestPage("A", true),
"DropDownChoiceTestPage_A_true_expected.html");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EnumChoiceRendererTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EnumChoiceRendererTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EnumChoiceRendererTest.java
index d33414e..c3b1c82 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EnumChoiceRendererTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EnumChoiceRendererTest.java
@@ -16,21 +16,23 @@
*/
package org.apache.wicket.markup.html.form;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
/**
* Tests {@link EnumChoiceRenderer}
*
* @author igor.vaynberg
*/
-public class EnumChoiceRendererTest extends org.junit.Assert
+public class EnumChoiceRendererTest
{
/**
*
*/
@Test
- public void testResourceKeyGenerationForAnonymousEnums()
+ void testResourceKeyGenerationForAnonymousEnums()
{
final EnumChoiceRenderer<TestEnum> renderer = new EnumChoiceRenderer<TestEnum>();
assertEquals("TestEnum.ANONYMOUS", renderer.resourceKey(TestEnum.ANONYMOUS));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EscapeAttributesInChoicesTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EscapeAttributesInChoicesTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EscapeAttributesInChoicesTest.java
index 0953587..142cf3f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EscapeAttributesInChoicesTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EscapeAttributesInChoicesTest.java
@@ -16,19 +16,22 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.apache.wicket.util.tester.TagTester.createTagByAttribute;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import org.apache.wicket.util.tester.TagTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
-import static org.apache.wicket.util.tester.TagTester.createTagByAttribute;
+import org.junit.jupiter.api.Test;
/**
* Test XSS vulnerability in RadioChoice and CheckBoxMultipleChoice
*/
-public class EscapeAttributesInChoicesTest extends WicketTestCase
+class EscapeAttributesInChoicesTest extends WicketTestCase
{
@Test
- public void escapeAttributes()
+ void escapeAttributes()
{
tester.startPage(EscapeAttributesInChoicesPage.class);
String lastResponseAsString = tester.getLastResponseAsString();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java
index 4562d24..2566511 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java
@@ -16,7 +16,8 @@
*/
package org.apache.wicket.markup.html.form;
-import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.Serializable;
@@ -29,14 +30,14 @@ import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test form component panel related form processing
*
* @author ivaynberg
*/
-public class FormComponentPanelProcessingTest extends WicketTestCase
+class FormComponentPanelProcessingTest extends WicketTestCase
{
/**
@@ -44,7 +45,7 @@ public class FormComponentPanelProcessingTest extends WicketTestCase
* should be processed first.
*/
@Test
- public void processingOrder()
+ void processingOrder()
{
tester.startPage(new TestPage());
tester.assertRenderedPage(TestPage.class);
@@ -53,16 +54,16 @@ public class FormComponentPanelProcessingTest extends WicketTestCase
}
@Test
- public void clearInput()
+ void clearInput()
{
tester.startPage(new TestPage());
tester.assertRenderedPage(TestPage.class);
TestFormComponentPanel fcp = (TestFormComponentPanel) tester.getComponentFromLastRenderedPage("form:panel");
- assertThat(fcp.isChildClearInputCalled(), is(false));
+ assertEquals(false, fcp.isChildClearInputCalled());
fcp.clearInput();
- assertThat(fcp.isChildClearInputCalled(), is(true));
+ assertEquals(true, fcp.isChildClearInputCalled());
}
private static class TestFormComponentPanel extends FormComponentPanel<Serializable>
@@ -152,7 +153,7 @@ public class FormComponentPanelProcessingTest extends WicketTestCase
{
private static final long serialVersionUID = 1L;
- public TestPage()
+ TestPage()
{
Form<Void> form = new Form<>("form");
add(form);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentTest.java
index 3a84940..f7de1c4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentTest.java
@@ -16,7 +16,10 @@
*/
package org.apache.wicket.markup.html.form;
-import org.junit.Assert;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.html.WebPage;
@@ -25,39 +28,39 @@ import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.validation.INullAcceptingValidator;
import org.apache.wicket.validation.IValidatable;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class FormComponentTest extends WicketTestCase
+class FormComponentTest extends WicketTestCase
{
@Test
- public void arrayType()
+ void arrayType()
{
final FormComponent<?> fc = new TextField<String>("foo");
fc.setType(String[].class);
- Assert.assertSame(String[].class, fc.getType());
+ assertSame(String[].class, fc.getType());
}
@Test
- public void multiDimentionalArrayType()
+ void multiDimentionalArrayType()
{
final FormComponent<?> fc = new TextField<String>("foo");
fc.setType(String[][][].class);
- Assert.assertSame(String[][][].class, fc.getType());
+ assertSame(String[][][].class, fc.getType());
}
@Test
- public void primitiveArrayType()
+ void primitiveArrayType()
{
final FormComponent<?> fc = new TextField<String>("foo");
fc.setType(boolean[].class);
- Assert.assertSame(boolean[].class, fc.getType());
+ assertSame(boolean[].class, fc.getType());
}
@Test
- public void getDefaultlabel()
+ void getDefaultlabel()
{
tester.startPage(TestPage1.class);
TestPage1 page = (TestPage1)tester.getLastRenderedPage();
@@ -66,7 +69,7 @@ public class FormComponentTest extends WicketTestCase
}
@Test
- public void nullAcceptingValidators()
+ void nullAcceptingValidators()
{
class MyValidator implements INullAcceptingValidator
{
@@ -88,11 +91,12 @@ public class FormComponentTest extends WicketTestCase
assertTrue(validator.called);
}
- public static class TestPage1 extends WebPage implements IMarkupResourceStreamProvider
+ public static class TestPage1 extends WebPage implements IMarkupResourceStreamProvider
{
- public final TextField field1, field2;
+ final TextField field1;
+ final TextField field2;
- public TestPage1()
+ public TestPage1()
{
Form form = new Form("form");
add(form);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java
index 546005c..1c2aef6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.form;
-import org.junit.Assert;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
@@ -42,7 +42,7 @@ public class FormHasErrorPage extends WebPage
*
* @param id
*/
- public InvalidPanel(String id)
+ InvalidPanel(String id)
{
super(id);
}
@@ -88,7 +88,7 @@ public class FormHasErrorPage extends WebPage
{
super.onSubmit();
labelModel.setObject("Test FAILED - an error was expected");
- Assert.fail("A validation error should've been detected by the Form processing");
+ fail("A validation error should've been detected by the Form processing");
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodMismatchTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodMismatchTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodMismatchTest.java
index 83c3ab2..341ae2c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodMismatchTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodMismatchTest.java
@@ -16,25 +16,25 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.Test;
-public class FormMethodMismatchTest {
+class FormMethodMismatchTest {
- public static class PlainFormPage extends WebPage {
- public PlainFormPage(Form<Void> underTest) {
+ static class PlainFormPage extends WebPage {
+ PlainFormPage(Form<Void> underTest) {
add(underTest);
}
}
@Test
- public void formSubmittedContinuesWithCorrectMethod() {
+ void formSubmittedContinuesWithCorrectMethod() {
final WicketTester tester = new WicketTester();
final boolean[] onSubmitCalled = new boolean[1];
final Form<Void> underTest = new Form<Void>("underTest") {
@@ -50,7 +50,7 @@ public class FormMethodMismatchTest {
}
@Test
- public void formSubmittedContinuesByDefaultWithMismatchingMethod() {
+ void formSubmittedContinuesByDefaultWithMismatchingMethod() {
final WicketTester tester = new WicketTester();
final boolean[] onSubmitCalled = new boolean[1];
final Form<Void> underTest = new Form<Void>("underTest") {
@@ -67,7 +67,7 @@ public class FormMethodMismatchTest {
}
@Test
- public void formSubmittedAbortsByWithMismatchingMethodWhenDesired() {
+ void formSubmittedAbortsByWithMismatchingMethodWhenDesired() {
final WicketTester tester = new WicketTester();
final boolean[] onSubmitCalled = new boolean[1];
final Form<Void> underTest = new Form<Void>("underTest") {
@@ -89,7 +89,7 @@ public class FormMethodMismatchTest {
}
@Test
- public void formSubmittedContinuesByWithCorrectMethodWhenDesired() {
+ void formSubmittedContinuesByWithCorrectMethodWhenDesired() {
final WicketTester tester = new WicketTester();
final boolean[] onSubmitCalled = new boolean[1];
final Form<Void> underTest = new Form<Void>("underTest") {
@@ -109,15 +109,15 @@ public class FormMethodMismatchTest {
assertTrue(onSubmitCalled[0]);
}
- public static class FormWithButtonPage extends WebPage {
- public FormWithButtonPage(Form<Void> underTest) {
+ static class FormWithButtonPage extends WebPage {
+ FormWithButtonPage(Form<Void> underTest) {
add(underTest);
underTest.add(new Button("button"));
}
}
@Test
- public void withButtonFormSubmittedContinuesWithCorrectMethod() {
+ void withButtonFormSubmittedContinuesWithCorrectMethod() {
final WicketTester tester = new WicketTester();
final boolean[] onSubmitCalled = new boolean[1];
final Form<Void> underTest = new Form<Void>("underTest") {
@@ -133,7 +133,7 @@ public class FormMethodMismatchTest {
}
@Test
- public void withButtonFormSubmittedContinuesByDefaultWithMismatchingMethod() {
+ void withButtonFormSubmittedContinuesByDefaultWithMismatchingMethod() {
final WicketTester tester = new WicketTester();
final boolean[] onSubmitCalled = new boolean[1];
final Form<Void> underTest = new Form<Void>("underTest") {
@@ -150,7 +150,7 @@ public class FormMethodMismatchTest {
}
@Test
- public void withButtonFormSubmittedAbortsByWithMismatchingMethodWhenDesired() {
+ void withButtonFormSubmittedAbortsByWithMismatchingMethodWhenDesired() {
final WicketTester tester = new WicketTester();
final boolean[] onSubmitCalled = new boolean[1];
final Form<Void> underTest = new Form<Void>("underTest") {
@@ -172,7 +172,7 @@ public class FormMethodMismatchTest {
}
@Test
- public void withButtonFormSubmittedContinuesByWithCorrectMethodWhenDesired() {
+ void withButtonFormSubmittedContinuesByWithCorrectMethodWhenDesired() {
final WicketTester tester = new WicketTester();
final boolean[] onSubmitCalled = new boolean[1];
final Form<Void> underTest = new Form<Void>("underTest") {
@@ -192,8 +192,8 @@ public class FormMethodMismatchTest {
assertTrue(onSubmitCalled[0]);
}
- public static class FormWithAjaxButtonPage extends WebPage {
- public FormWithAjaxButtonPage(Form<Void> underTest) {
+ static class FormWithAjaxButtonPage extends WebPage {
+ FormWithAjaxButtonPage(Form<Void> underTest) {
add(underTest);
underTest.add(new AjaxButton("button") {
@@ -201,7 +201,7 @@ public class FormMethodMismatchTest {
}
}
@Test
- public void withAjaxButtonFormSubmittedContinuesWithCorrectMethod() {
+ void withAjaxButtonFormSubmittedContinuesWithCorrectMethod() {
final WicketTester tester = new WicketTester();
final boolean[] onSubmitCalled = new boolean[1];
final Form<Void> underTest = new Form<Void>("underTest") {
@@ -217,7 +217,7 @@ public class FormMethodMismatchTest {
}
@Test
- public void withAjaxButtonFormSubmittedContinuesByDefaultWithMismatchingMethod() {
+ void withAjaxButtonFormSubmittedContinuesByDefaultWithMismatchingMethod() {
final WicketTester tester = new WicketTester();
final boolean[] onSubmitCalled = new boolean[1];
final Form<Void> underTest = new Form<Void>("underTest") {
@@ -234,7 +234,7 @@ public class FormMethodMismatchTest {
}
@Test
- public void withAjaxButtonFormSubmittedAbortsByWithMismatchingMethodWhenDesired() {
+ void withAjaxButtonFormSubmittedAbortsByWithMismatchingMethodWhenDesired() {
final WicketTester tester = new WicketTester();
final boolean[] onSubmitCalled = new boolean[1];
final Form<Void> underTest = new Form<Void>("underTest") {
@@ -256,7 +256,7 @@ public class FormMethodMismatchTest {
}
@Test
- public void withAjaxButtonFormSubmittedContinuesByWithCorrectMethodWhenDesired() {
+ void withAjaxButtonFormSubmittedContinuesByWithCorrectMethodWhenDesired() {
final WicketTester tester = new WicketTester();
final boolean[] onSubmitCalled = new boolean[1];
final Form<Void> underTest = new Form<Void>("underTest") {
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMultiPartTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMultiPartTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMultiPartTest.java
index cb8effb..4c273b0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMultiPartTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMultiPartTest.java
@@ -16,19 +16,21 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*/
-public class FormMultiPartTest extends WicketTestCase
+class FormMultiPartTest extends WicketTestCase
{
-
+
@Test
- public void multipartHard()
+ void multipartHard()
{
MultiPartFormPage page = new MultiPartFormPage();
-
+
page.form.setMultiPart(true);
tester.startPage(page);
@@ -38,7 +40,7 @@ public class FormMultiPartTest extends WicketTestCase
}
@Test
- public void multipartHint()
+ void multipartHint()
{
MultiPartFormPage page = new MultiPartFormPage();
@@ -46,20 +48,20 @@ public class FormMultiPartTest extends WicketTestCase
tester.startPage(page);
assertEquals(1, page.asked);
assertEquals(false, page.form.isMultiPart());
-
+
page.multiPart = true;
tester.newFormTester("form").submit(page.button1);
assertEquals(2, page.asked);
assertEquals(true, page.form.isMultiPart());
-
+
page.multiPart = false;
tester.newFormTester("form").submit(page.button1);
assertEquals(3, page.asked);
- assertEquals(false, page.form.isMultiPart());
+ assertEquals(false, page.form.isMultiPart());
}
-
+
@Test
- public void multipartHintAjax()
+ void multipartHintAjax()
{
MultiPartFormPage page = new MultiPartFormPage();
@@ -67,15 +69,15 @@ public class FormMultiPartTest extends WicketTestCase
tester.startPage(page);
assertEquals(1, page.asked);
assertEquals(false, page.form.isMultiPart());
-
+
page.multiPart = true;
tester.executeAjaxEvent(page.button1, "click");
assertEquals(2, page.asked);
assertEquals(true, page.form.isMultiPart());
-
+
page.multiPart = false;
tester.executeAjaxEvent(page.button1, "click");
assertEquals(3, page.asked);
- assertEquals(false, page.form.isMultiPart());
+ assertEquals(false, page.form.isMultiPart());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormParentDisabledRawInputTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormParentDisabledRawInputTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormParentDisabledRawInputTest.java
index 63a6cc5..307a761 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormParentDisabledRawInputTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormParentDisabledRawInputTest.java
@@ -16,17 +16,21 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.Component;
+import org.apache.wicket.core.request.handler.ListenerInvocationNotAllowedException;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.PropertyModel;
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;
/**
*/
-public class FormParentDisabledRawInputTest extends WicketTestCase
+class FormParentDisabledRawInputTest extends WicketTestCase
{
/**
*/
@@ -39,7 +43,7 @@ public class FormParentDisabledRawInputTest extends WicketTestCase
/**
* Construct.
*/
- public TestPage()
+ TestPage()
{
setStatelessHint(false);
@@ -61,11 +65,9 @@ public class FormParentDisabledRawInputTest extends WicketTestCase
}
/**
- * @throws Exception
*/
- @Test(expected = ListenerInvocationNotAllowedException.class)
- public void disabledParent() throws Exception
- {
+ @Test
+ void disabledParent() {
TestPage page = new TestPage();
page.enabled = false;
tester.startPage(page);
@@ -76,6 +78,9 @@ public class FormParentDisabledRawInputTest extends WicketTestCase
assertFalse(check.isEnabledInHierarchy());
// nothing should change with a submit that changes no values
- tester.newFormTester("container:form").submit();
+
+ assertThrows(ListenerInvocationNotAllowedException.class, () -> {
+ tester.newFormTester("container:form").submit();
+ });
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitOrderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitOrderTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitOrderTest.java
index 29bea53..f9dee74 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitOrderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitOrderTest.java
@@ -16,19 +16,21 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class FormSubmitOrderTest extends WicketTestCase
+class FormSubmitOrderTest extends WicketTestCase
{
- public static class TestPage extends WebPage
+ public static class TestPage extends WebPage
{
String result = "";
- public TestPage()
+ public TestPage()
{
- Form form = new Form("form")
+ Form form = new Form<>("form")
{
@Override
protected void onSubmit()
@@ -58,7 +60,7 @@ public class FormSubmitOrderTest extends WicketTestCase
}
@Test
- public void submitOrder() throws Exception
+ void submitOrder() throws Exception
{
TestPage page = tester.startPage(TestPage.class);
tester.newFormTester("form").submit("button");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitTest.java
index 2c53348..9830627 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitTest.java
@@ -16,13 +16,16 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.wicket.Component;
import org.apache.wicket.core.request.handler.ListenerInvocationNotAllowedException;
import org.apache.wicket.markup.html.form.NestedFormsPage.NestableForm;
import org.apache.wicket.util.tester.FormTester;
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;
/**
* Please see <a href="http://cwiki.apache.org/WICKET/nested-forms.html">"Nested Forms"</a> for more
@@ -30,7 +33,7 @@ import org.junit.Test;
*
* @author Gerolf Seitz
*/
-public class FormSubmitTest extends WicketTestCase
+class FormSubmitTest extends WicketTestCase
{
private NestedFormsPage page;
private NestableForm outerForm;
@@ -40,8 +43,8 @@ public class FormSubmitTest extends WicketTestCase
/**
*
*/
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
tester.startPage(new NestedFormsPage());
page = (NestedFormsPage)tester.getLastRenderedPage();
@@ -54,7 +57,7 @@ public class FormSubmitTest extends WicketTestCase
*
*/
@Test
- public void allFormsEnabledSubmitOuterForm()
+ void allFormsEnabledSubmitOuterForm()
{
assertEnabledState(true, true, true);
@@ -68,7 +71,7 @@ public class FormSubmitTest extends WicketTestCase
private void assertSubmitOrder(NestableForm... forms)
{
- assertEquals("not submitted in expected order!", joinIds(forms), page.submitOrder);
+ assertEquals(joinIds(forms), page.submitOrder, "not submitted in expected order!");
}
private String joinIds(Component[] comps)
@@ -83,14 +86,14 @@ public class FormSubmitTest extends WicketTestCase
private void assertErrorOrder(NestableForm... forms)
{
- assertEquals("not onError'd in expected order!", joinIds(forms), page.errorOrder);
+ assertEquals(joinIds(forms), page.errorOrder, "not onError'd in expected order!");
}
/**
*
*/
@Test
- public void allFormsEnabledSubmitMiddleForm()
+ void allFormsEnabledSubmitMiddleForm()
{
assertEnabledState(true, true, true);
@@ -106,7 +109,7 @@ public class FormSubmitTest extends WicketTestCase
*
*/
@Test
- public void allFormsEnabledSubmitInnerForm()
+ void allFormsEnabledSubmitInnerForm()
{
assertEnabledState(true, true, true);
@@ -122,7 +125,7 @@ public class FormSubmitTest extends WicketTestCase
*
*/
@Test
- public void middleFormDisabledSubmitOuterForm()
+ void middleFormDisabledSubmitOuterForm()
{
// disable middle form
middleForm.setEnabled(false);
@@ -141,7 +144,7 @@ public class FormSubmitTest extends WicketTestCase
*
*/
@Test
- public void innerFormDisabledSubmitOuterForm()
+ void innerFormDisabledSubmitOuterForm()
{
// disable middle form
innerForm.setEnabled(false);
@@ -160,7 +163,7 @@ public class FormSubmitTest extends WicketTestCase
*
*/
@Test
- public void submitDisabledOuterForm()
+ void submitDisabledOuterForm()
{
outerForm.setEnabled(false);
assertEnabledState(false, true, true);
@@ -183,7 +186,7 @@ public class FormSubmitTest extends WicketTestCase
*
*/
@Test
- public void errorOnInnerFormSubmitOuterForm()
+ void errorOnInnerFormSubmitOuterForm()
{
assertEnabledState(true, true, true);
@@ -198,7 +201,7 @@ public class FormSubmitTest extends WicketTestCase
*
*/
@Test
- public void errorOnMiddleFormSubmitOuterForm()
+ void errorOnMiddleFormSubmitOuterForm()
{
assertEnabledState(true, true, true);
@@ -213,7 +216,7 @@ public class FormSubmitTest extends WicketTestCase
*
*/
@Test
- public void errorOnMiddleFormSubmitMiddleForm()
+ void errorOnMiddleFormSubmitMiddleForm()
{
assertEnabledState(true, true, true);
@@ -228,7 +231,7 @@ public class FormSubmitTest extends WicketTestCase
*
*/
@Test
- public void errorOnInnerFormSubmitMiddleForm()
+ void errorOnInnerFormSubmitMiddleForm()
{
assertEnabledState(true, true, true);
@@ -243,7 +246,7 @@ public class FormSubmitTest extends WicketTestCase
*
*/
@Test
- public void middleFormDisabledErrorOnOuterFormSubmitOuterForm()
+ void middleFormDisabledErrorOnOuterFormSubmitOuterForm()
{
middleForm.setEnabled(false);
assertEnabledState(true, false, true);
@@ -259,7 +262,7 @@ public class FormSubmitTest extends WicketTestCase
*
*/
@Test
- public void errorOnInnerFormDisabledMiddleFormSubmitOuterForm()
+ void errorOnInnerFormDisabledMiddleFormSubmitOuterForm()
{
middleForm.setEnabled(false);
assertEnabledState(true, false, true);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java
index b05740e..f6275f9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.MockPageParametersAware;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
@@ -26,9 +30,8 @@ import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.visit.IVisitor;
-import org.junit.Before;
-import org.junit.Test;
-
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* @author Pekka Enberg
@@ -41,8 +44,8 @@ public class FormTest extends WicketTestCase
/**
*
*/
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
visitor = new Form.ValidationVisitor()
{
@@ -57,7 +60,7 @@ public class FormTest extends WicketTestCase
* WICKET-6540
*/
@Test
- public void defaultButton() throws Exception
+ void defaultButton() throws Exception
{
executeTest(FormDefaultButtonTestPage.class, "FormDefaultButtonTestPage_expected.html");
}
@@ -66,7 +69,7 @@ public class FormTest extends WicketTestCase
* WICKET-6525 / WICKET-6348
*/
@Test
- public void formMethods() throws Exception
+ void formMethods() throws Exception
{
executeTest(FormMethodTestPage.class, "FormMethodTestPage_expected.html");
@@ -85,7 +88,7 @@ public class FormTest extends WicketTestCase
* WICKET-3488
*/
@Test
- public void formReplacement()
+ void formReplacement()
{
tester.startPage(TestPage.class);
tester.newFormTester("form").submit();
@@ -96,7 +99,7 @@ public class FormTest extends WicketTestCase
*
*/
@Test
- public void actionUrlNotDoubleEscaped()
+ void actionUrlNotDoubleEscaped()
{
tester.startPage(TestPage.class);
String response = tester.getLastResponseAsString();
@@ -104,14 +107,14 @@ public class FormTest extends WicketTestCase
}
@Test
- public void onValidateModelObjects()
+ void onValidateModelObjects()
{
class TestPage extends WebPage implements IMarkupResourceStreamProvider
{
boolean shouldFail, submit, error;
- public TestPage()
+ TestPage()
{
add(new Form<Void>("form")
{
@@ -163,7 +166,7 @@ public class FormTest 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";
@Override
protected Form<Void> newForm(String id)
@@ -188,7 +191,7 @@ public class FormTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void pageWithParameters() throws Exception
+ void pageWithParameters() throws Exception
{
PageParameters parameters = new PageParameters();
parameters.add("first", "foo");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormValidationDisabledFormComponentTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormValidationDisabledFormComponentTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormValidationDisabledFormComponentTest.java
index faf9d7f..d5e496b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormValidationDisabledFormComponentTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormValidationDisabledFormComponentTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.wicket.MarkupContainer;
@@ -30,12 +33,12 @@ import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test case for https://issues.apache.org/jira/browse/WICKET-5883
*/
-public class FormValidationDisabledFormComponentTest extends WicketTestCase
+class FormValidationDisabledFormComponentTest extends WicketTestCase
{
@Override
protected WebApplication newApplication()
@@ -68,7 +71,7 @@ public class FormValidationDisabledFormComponentTest extends WicketTestCase
}
@Test
- public void formSubmitsEvenWithInvalidButInvisibleFormComponent()
+ void formSubmitsEvenWithInvalidButInvisibleFormComponent()
{
TestPage page = tester.startPage(TestPage.class);
assertFalse(page.onSubmitCalled.get());
@@ -90,7 +93,7 @@ public class FormValidationDisabledFormComponentTest extends WicketTestCase
}
@Test
- public void formSubmitsEvenWithInvalidButDisabledFormComponent()
+ void formSubmitsEvenWithInvalidButDisabledFormComponent()
{
TestPage page = tester.startPage(TestPage.class);
assertFalse(page.onSubmitCalled.get());
@@ -113,14 +116,14 @@ public class FormValidationDisabledFormComponentTest extends WicketTestCase
public static class TestPage extends WebPage implements IMarkupResourceStreamProvider
{
- public final AtomicBoolean onSubmitCalled = new AtomicBoolean(false);
- public final AtomicBoolean onErrorCalled = new AtomicBoolean(false);
- public final TextField field1;
- public final Form form;
+ final AtomicBoolean onSubmitCalled = new AtomicBoolean(false);
+ final AtomicBoolean onErrorCalled = new AtomicBoolean(false);
+ final TextField field1;
+ final Form form;
public TestPage()
{
- form = new Form("form")
+ form = new Form<>("form")
{
@Override
protected void onSubmit()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormValidationTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormValidationTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormValidationTest.java
index b3dede8..0437ade 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormValidationTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormValidationTest.java
@@ -16,7 +16,8 @@
*/
package org.apache.wicket.markup.html.form;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
@@ -25,19 +26,19 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.FormTester;
-import org.apache.wicket.util.tester.WicketTesterScope;
-import org.junit.Rule;
-import org.junit.Test;
+import org.apache.wicket.util.tester.WicketTesterExtension;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
/**
* Form validation related tests
*
* @author igor
*/
-public class FormValidationTest
+class FormValidationTest
{
- @Rule
- public WicketTesterScope scope = new WicketTesterScope();
+ @RegisterExtension
+ public WicketTesterExtension scope = new WicketTesterExtension();
/**
* Tests validation of form components when all errors are rendered using a feedback panel.
@@ -47,7 +48,7 @@ public class FormValidationTest
* end of the request.
*/
@Test
- public void renderedFeedbackMessages()
+ void renderedFeedbackMessages()
{
// start the page
@@ -90,7 +91,7 @@ public class FormValidationTest
* they should not block the component from re-validating.
*/
@Test
- public void unrenderedFeedbackMessages()
+ void unrenderedFeedbackMessages()
{
// start the page
@@ -122,12 +123,12 @@ public class FormValidationTest
}
- public static class TestPage extends WebPage implements IMarkupResourceStreamProvider
+ public static class TestPage extends WebPage implements IMarkupResourceStreamProvider
{
- public final TextField field1;
- public final Form form;
+ final TextField field1;
+ final Form form;
- public TestPage()
+ public TestPage()
{
form = new Form("form");
add(form);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java
index 9a66640..447e174 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.wicket.markup.html.form;
+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 java.util.ArrayList;
import java.util.List;
import java.util.Optional;
@@ -29,19 +33,19 @@ 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;
/**
* @author Pedro Santos
*/
-public class FormWithMultipleButtonsTest extends WicketTestCase
+class FormWithMultipleButtonsTest extends WicketTestCase
{
/**
* Testing if the correct submit button is invoked in an form with multiple submit buttons. The
* browser set the clicked button input name as parameter on the HTTP request.
*/
@Test
- public void findSubmittingButton()
+ void findSubmittingButton()
{
TestPage testPage = new TestPage();
tester.startPage(testPage);
@@ -57,7 +61,7 @@ public class FormWithMultipleButtonsTest extends WicketTestCase
* @see <a href="https://issues.apache.org/jira/browse/WICKET-1894">WICKET-1894</a>
*/
@Test
- public void ajaxFallbackButtonInvokedFirst()
+ void ajaxFallbackButtonInvokedFirst()
{
TestPage testPage = new TestPage();
tester.startPage(testPage);
@@ -70,7 +74,7 @@ public class FormWithMultipleButtonsTest extends WicketTestCase
*
*/
@Test
- public void buttonInvokedFirst()
+ void buttonInvokedFirst()
{
TestPage testPage = new TestPage();
tester.startPage(testPage);
@@ -93,7 +97,7 @@ public class FormWithMultipleButtonsTest extends WicketTestCase
Button button;
AjaxFallbackButton ajaxFallbackButton;
- public TestPage()
+ TestPage()
{
add(form = new Form<Void>("form")
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ListMultipleChoiceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ListMultipleChoiceTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ListMultipleChoiceTest.java
index 3987a58..4b17a26 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ListMultipleChoiceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ListMultipleChoiceTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -25,16 +28,16 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.util.ListModel;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class ListMultipleChoiceTest extends WicketTestCase
+class ListMultipleChoiceTest extends WicketTestCase
{
- public class TestPage extends WebPage
+ class TestPage extends WebPage
{
- public IModel<List<String>> selectedValues = new ListModel<String>(new ArrayList<String>());
- public List<String> choices = Arrays.asList("a", "b", "c", "d", "e", "f");
+ IModel<List<String>> selectedValues = new ListModel<String>(new ArrayList<String>());
+ List<String> choices = Arrays.asList("a", "b", "c", "d", "e", "f");
- public TestPage()
+ TestPage()
{
Form<Void> form = new Form<>("form");
this.add(form);
@@ -43,7 +46,7 @@ public class ListMultipleChoiceTest extends WicketTestCase
}
@Test
- public void testSelectionWorks() throws Exception
+ void testSelectionWorks() throws Exception
{
TestPage page = tester.startPage(new TestPage());
FormTester form = tester.newFormTester("form");
@@ -58,7 +61,7 @@ public class ListMultipleChoiceTest extends WicketTestCase
}
@Test
- public void testSelectionAccumulates() throws Exception
+ void testSelectionAccumulates() throws Exception
{
final TestPage page = new TestPage();
page.selectedValues.getObject().add("a");
@@ -75,8 +78,8 @@ public class ListMultipleChoiceTest extends WicketTestCase
assertTrue(page.selectedValues.getObject().contains("f"));
}
- protected ListMultipleChoice<String> newListMultipleChoice(String id,
- IModel<List<String>> selectedValues, List<String> choices)
+ private ListMultipleChoice<String> newListMultipleChoice(String id,
+ IModel<List<String>> selectedValues, List<String> choices)
{
return new ListMultipleChoice<>(id, selectedValues, choices);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java
index 57795d2..9d7e45b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java
@@ -19,19 +19,19 @@ package org.apache.wicket.markup.html.form;
import java.util.Locale;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test case for checking localized error messages.
*/
-public class LocalizedErrorMessageTest extends WicketTestCase
+class LocalizedErrorMessageTest extends WicketTestCase
{
/**
* Test for checking if changing the session's locale to another language actually causes the
* feedback messages to be altered as well. Testcase for WICKET-891.
*/
@Test
- public void wicket891()
+ void wicket891()
{
tester.getSession().setLocale(new Locale("nl"));
@@ -60,7 +60,7 @@ public class LocalizedErrorMessageTest extends WicketTestCase
* WICKET-4608 vars should be properly converted
*/
@Test
- public void testConvertedVars()
+ void testConvertedVars()
{
tester.getSession().setLocale(new Locale("de"));
@@ -81,7 +81,7 @@ public class LocalizedErrorMessageTest extends WicketTestCase
*
*/
@Test
- public void wicket_1927()
+ void wicket_1927()
{
tester.getApplication().getMarkupSettings().setDefaultMarkupEncoding("UTF-8");
tester.getSession().setLocale(new Locale("de"));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedMessagePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedMessagePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedMessagePage.java
index 3fa2c55..851be86 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedMessagePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedMessagePage.java
@@ -34,7 +34,7 @@ public class LocalizedMessagePage extends WebPage
/** */
public TextField<Double> field;
/** */
- public FeedbackPanel feedback;
+ private FeedbackPanel feedback;
/**
* Construct.
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/MultiPartFormPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/MultiPartFormPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/MultiPartFormPage.java
index e354ff9..86af382 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/MultiPartFormPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/MultiPartFormPage.java
@@ -39,7 +39,7 @@ public class MultiPartFormPage extends WebPage
public AjaxFallbackButton button1;
- public AjaxFallbackButton button2;
+ private AjaxFallbackButton button2;
/**
* Construct.
@@ -54,7 +54,7 @@ public class MultiPartFormPage extends WebPage
@Override
public boolean isMultiPart() {
asked++;
-
+
return multiPart;
}
};
[45/45] wicket git commit: Re-order the dependencies
Posted by mg...@apache.org.
Re-order the dependencies
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4be82eb0
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4be82eb0
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4be82eb0
Branch: refs/heads/master
Commit: 4be82eb0cddf9c3f48cbd4be208dbf5de7813698
Parents: d08641f
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Sep 26 16:38:16 2018 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 26 16:38:16 2018 +0300
----------------------------------------------------------------------
wicket-core/pom.xml | 28 ++++----------------
.../wicket-native-websocket-javax/pom.xml | 10 +++----
2 files changed, 10 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/4be82eb0/wicket-core/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml
index faac57b..0ab47f9 100644
--- a/wicket-core/pom.xml
+++ b/wicket-core/pom.xml
@@ -51,21 +51,6 @@
<artifactId>openjson</artifactId>
</dependency>
<dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-request</artifactId>
</dependency>
@@ -78,14 +63,6 @@
<artifactId>jdk-serializable-functional</artifactId>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.github.openjson</groupId>
- <artifactId>openjson</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<scope>test</scope>
@@ -100,6 +77,11 @@
<artifactId>assertj-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>java-hamcrest</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/wicket/blob/4be82eb0/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
index ca24277..ef8cfa3 100644
--- a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
@@ -38,11 +38,6 @@
<artifactId>javax.websocket-api</artifactId>
</dependency>
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
</dependency>
@@ -62,5 +57,10 @@
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>javax-websocket-server-impl</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
[02/45] wicket git commit: proper formatting of WicketTester.java
Posted by mg...@apache.org.
proper formatting of WicketTester.java
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/dcd29c0b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/dcd29c0b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/dcd29c0b
Branch: refs/heads/master
Commit: dcd29c0bee0c07731569267964089c7e46fdbd16
Parents: f5f1c26
Author: renoth <jo...@gmx.de>
Authored: Tue Jul 31 13:54:07 2018 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 26 15:36:17 2018 +0300
----------------------------------------------------------------------
.../wicket/util/tester/BaseWicketTester.java | 3 -
.../apache/wicket/util/tester/FormTester.java | 69 ++--
.../apache/wicket/util/tester/WicketTester.java | 362 +++++++++----------
3 files changed, 212 insertions(+), 222 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/dcd29c0b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
index 54e7808..a835c6c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
@@ -16,9 +16,6 @@
*/
package org.apache.wicket.util.tester;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
import java.io.IOException;
import java.io.Serializable;
import java.lang.reflect.Constructor;
http://git-wip-us.apache.org/repos/asf/wicket/blob/dcd29c0b/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java
index 031aac4..d1780ea 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java
@@ -48,7 +48,8 @@ import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
-import org.junit.Assert;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* A helper class for testing validation and submission of <code>FormComponent</code>s.
@@ -108,7 +109,7 @@ public class FormTester
/**
* Constructor.
- *
+ *
* @param formComponent
* a <code>FormComponent</code>
*/
@@ -119,7 +120,7 @@ public class FormTester
/**
* Implements whether toggle or accumulate the selection.
- *
+ *
* @param formComponent
* a <code>FormComponent</code>
* @param value
@@ -171,7 +172,7 @@ public class FormTester
/**
* Selects a given index in a selectable <code>FormComponent</code>.
- *
+ *
* @param index
*/
protected final void doSelect(final int index)
@@ -182,7 +183,7 @@ public class FormTester
/**
* Selects a given index in a selectable <code>FormComponent</code>.
- *
+ *
* @param formComponent
* a <code>FormComponent</code>
* @param index
@@ -242,7 +243,7 @@ public class FormTester
{
/**
* Constructor.
- *
+ *
* @param formComponent
* a <code>FormComponent</code>
*/
@@ -271,7 +272,7 @@ public class FormTester
{
/**
* Constructor.
- *
+ *
* @param formComponent
* a <code>FormComponent</code>
*/
@@ -290,7 +291,7 @@ public class FormTester
/**
* Creates a <code>ChoiceSelector</code>.
- *
+ *
* @param formComponent
* a <code>FormComponent</code>
* @return ChoiceSelector a <code>ChoiceSelector</code>
@@ -321,7 +322,7 @@ public class FormTester
/**
* Creates a <code>MultipleChoiceSelector</code>.
- *
+ *
* @param formComponent
* a <code>FormComponent</code>
* @return ChoiceSelector a <code>ChoiceSelector</code>
@@ -333,7 +334,7 @@ public class FormTester
/**
* Tests if a given <code>FormComponent</code> allows multiple choice.
- *
+ *
* @param formComponent
* a <code>FormComponent</code>
* @return <code>true</code> if the given FormComponent allows multiple choice
@@ -366,7 +367,7 @@ public class FormTester
/**
* @see WicketTester#newFormTester(String)
- *
+ *
* @param path
* path to <code>FormComponent</code>
* @param workingForm
@@ -416,7 +417,7 @@ public class FormTester
/**
* Gets request parameter values for the form component that represents its current model value
- *
+ *
* @param formComponent
* @return array containing parameter values
*/
@@ -458,7 +459,7 @@ public class FormTester
/**
* Retrieves the current <code>Form</code> object.
- *
+ *
* @return the working <code>Form</code>
*/
public Form<?> getForm()
@@ -468,7 +469,7 @@ public class FormTester
/**
* Gets the value for an <code>AbstractTextComponent</code> with the provided id.
- *
+ *
* @param id
* <code>Component</code> id
* @return the value of the text component
@@ -490,7 +491,7 @@ public class FormTester
* as <code>Radio</code> or <code>DropDownList</code>, the selection will toggle each other. For
* multiple choice, such as <code>Checkbox</code> or <code>ListMultipleChoice</code>, the
* selection will accumulate.
- *
+ *
* @param formComponentId
* relative path (from <code>Form</code>) to the selectable
* <code>FormComponent</code>
@@ -516,9 +517,9 @@ public class FormTester
/**
* A convenience method to select multiple options for the <code>FormComponent</code>. The
* method only support multiple selectable <code>FormComponent</code>s.
- *
+ *
* @see #select(String, int)
- *
+ *
* @param formComponentId
* relative path (from <code>Form</code>) to the selectable
* <code>FormComponent</code>
@@ -534,9 +535,9 @@ public class FormTester
/**
* A convenience method to select multiple options for the <code>FormComponent</code>. The
* method only support multiple selectable <code>FormComponent</code>s.
- *
+ *
* @see #select(String, int)
- *
+ *
* @param formComponentId
* relative path (from <code>Form</code>) to the selectable
* <code>FormComponent</code>
@@ -569,7 +570,7 @@ public class FormTester
/**
* Simulates filling in a field on a <code>Form</code>.
- *
+ *
* @param formComponentId
* relative path (from <code>Form</code>) to the selectable
* <code>FormComponent</code> or <code>IFormSubmittingComponent</code>
@@ -580,14 +581,14 @@ public class FormTester
public FormTester setValue(final String formComponentId, final String value)
{
Component component = workingForm.get(formComponentId);
- Assert.assertNotNull("Unable to set value. Couldn't find component with name: " +
+ assertNotNull("Unable to set value. Couldn't find component with name: " +
formComponentId, component);
return setValue(component, value);
}
/**
* Simulates filling in a field on a <code>Form</code>.
- *
+ *
* @param formComponent
* relative path (from <code>Form</code>) to the selectable
* <code>FormComponent</code> or <code>IFormSubmittingComponent</code>
@@ -629,7 +630,7 @@ public class FormTester
/**
* Sets the <code>File</code> on a {@link FileUploadField}.
- *
+ *
* @param formComponentId
* relative path (from <code>Form</code>) to the selectable
* <code>FormComponent</code>. The <code>FormComponent</code> must be of a type
@@ -670,7 +671,7 @@ public class FormTester
/**
* Submits the <code>Form</code>. Note that <code>submit</code> can be executed only once.
- *
+ *
* @return This
*/
public FormTester submit()
@@ -709,12 +710,12 @@ public class FormTester
* <p>
* Note that if the button is associated with a model, it's better to use the
* <code>setValue</code> method instead:
- *
+ *
* <pre>
* formTester.setValue("to:my:button", "value on the button");
* formTester.submit();
* </pre>
- *
+ *
* @param buttonComponentId
* relative path (from <code>Form</code>) to the button
* @return This
@@ -735,12 +736,12 @@ public class FormTester
* <p>
* Note that if the button is associated with a model, it's better to use the
* <code>setValue</code> method instead:
- *
+ *
* <pre>
* formTester.setValue(myButton, "value on the button");
* formTester.submit();
* </pre>
- *
+ *
* @param buttonComponent
* relative path (from <code>Form</code>) to the button
* @return This
@@ -770,7 +771,7 @@ public class FormTester
/**
* A convenience method to submit the Form via a SubmitLink which may inside or outside of the
* Form.
- *
+ *
* @param path
* The path to the SubmitLink
* @param pageRelative
@@ -796,7 +797,7 @@ public class FormTester
/**
* Adds an additional <code>FormComponent</code>'s value into request parameter -- this method
* retains existing parameters but removes any duplicate parameters.
- *
+ *
* @param formComponent
* a <code>FormComponent</code>
* @param value
@@ -851,7 +852,7 @@ public class FormTester
/**
* Returns <code>true</code> if the parameter exists in the <code>FormComponent</code>.
- *
+ *
* @param formComponent
* a <code>FormComponent</code>
* @return <code>true</code> if the parameter exists in the <code>FormComponent</code>
@@ -868,7 +869,7 @@ public class FormTester
/**
* Set formComponent's value into request parameter, this method overwrites existing parameters.
- *
+ *
* @param formComponent
* a <code>FormComponent</code>
* @param value
@@ -883,7 +884,7 @@ public class FormTester
/**
* Set component's value into request parameter, this method overwrites existing parameters.
- *
+ *
* @param component
* an {@link IFormSubmittingComponent}
* @param value
@@ -895,7 +896,7 @@ public class FormTester
}
/**
- *
+ *
* @param message
*/
private void fail(String message)
http://git-wip-us.apache.org/repos/asf/wicket/blob/dcd29c0b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
index a35aa0d..f94304f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
@@ -49,8 +49,10 @@ import java.util.Arrays;
import java.util.List;
import java.util.Locale;
-import static org.junit.jupiter.api.Assertions.*;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* A helper class to ease unit testing of Wicket applications without the need for a servlet
@@ -145,14 +147,16 @@ import static org.junit.jupiter.api.Assertions.*;
*
* Cookie handling:
*
- * There are some expectations about wicket tester cookie handling which should match as best as it
- * can be with a real client server request response cycle: - all valid cookies set before a request
- * is made (tester.getRequest().addCookie()) should appear in the page request - all cookies set in
- * the response should appear in the last response (tester.getLastResponse()) after the request is
- * made (expired cookies and others) - all cookies set in the response should appear even after a
- * redirect response is made until the final response (tester.getLastResponse()) is written to the
- * client (wicket tester) - all valid cookies (maxAge!=0) from the last response should be added to
- * the next request cookies (tester.getRequest().getCookies())
+ * There are some expectations about wicket tester cookie handling which should match as best as
+ * it can be with a real client server request response cycle:
+ * - all valid cookies set before a request is made (tester.getRequest().addCookie()) should
+ * appear in the page request
+ * - all cookies set in the response should appear in the last response (tester.getLastResponse())
+ * after the request is made (expired cookies and others)
+ * - all cookies set in the response should appear even after a redirect response is made
+ * until the final response (tester.getLastResponse()) is written to the client (wicket tester)
+ * - all valid cookies (maxAge!=0) from the last response should be added to
+ * the next request cookies (tester.getRequest().getCookies())
*
*
* TODO General: Example usage of FormTester
@@ -255,41 +259,19 @@ public class WicketTester extends BaseWicketTester
}
/**
- * Returns the current Maven build directory taken from the <tt>basedir</tt> system property, or
- * null if not set
- *
- * @return path with a trailing slash
- */
- public static String getBasedir()
- {
- String basedir = System.getProperty("basedir");
- if (basedir != null)
- {
- basedir = basedir + "/";
- }
- else
- {
- basedir = "";
- }
- return basedir;
- }
-
- /**
* Asserts that the Ajax location header is present.
*/
public void assertAjaxLocation()
{
if (null != getLastResponse().getHeader("Location"))
{
- throw new AssertionFailedError(
- "Location header should *not* be present when using Ajax");
+ throw new AssertionFailedError("Location header should *not* be present when using Ajax");
}
String ajaxLocation = getLastResponse().getHeader("Ajax-Location");
if (null == ajaxLocation)
{
- throw new AssertionFailedError(
- "Ajax-Location header should be present when using Ajax");
+ throw new AssertionFailedError("Ajax-Location header should be present when using Ajax");
}
int statusCode = getLastResponse().getStatus();
@@ -313,19 +295,8 @@ public class WicketTester extends BaseWicketTester
}
/**
- *
- * @param result
- */
- private void assertResult(Result result)
- {
- if (result.wasFailed())
- {
- throw new AssertionFailedError(result.getMessage());
- }
- }
-
- /**
- * Asserts that the <code>Component</code> a the given path has a behavior of the given type.
+ * Asserts that the <code>Component</code> a the given path has a behavior
+ * of the given type.
*
* @param path
* path to <code>Component</code>
@@ -339,44 +310,44 @@ public class WicketTester extends BaseWicketTester
Component component = assertExists(path);
List<? extends Behavior> behaviors = component.getBehaviors(expectedBehaviorClass);
final String message = String.format("Component '%s' has no behaviors of type '%s'",
- component.getPageRelativePath(), expectedBehaviorClass);
+ component.getPageRelativePath(), expectedBehaviorClass);
assertResult(new Result(CollectionUtils.isEmpty(behaviors), message));
}
/**
* Tests that a <code>Component</code> has been added to a <code>AjaxRequestTarget</code>, using
- * {@link org.apache.wicket.ajax.AjaxRequestTarget#add(Component...)}. This method actually
- * tests that a <code>Component</code> is on the Ajax response sent back to the client.
+ * {@link org.apache.wicket.ajax.AjaxRequestTarget#add(Component...)}. This method actually tests that a
+ * <code>Component</code> is on the Ajax response sent back to the client.
* <p>
* PLEASE NOTE! This method doesn't actually insert the <code>Component</code> in the client DOM
* tree, using JavaScript. But it shouldn't be needed because you just have to trust that Wicket
* Ajax JavaScript works.
*
- * @param componentPath
- * a <code>Component</code> path to test
+ * @param component
+ * a <code>Component</code> to be tested
*/
- public void assertComponentOnAjaxResponse(String componentPath)
+ public void assertComponentOnAjaxResponse(Component component)
{
- Component component = getComponentFromLastRenderedPage(componentPath, false);
- assertComponentOnAjaxResponse(component);
+ Result result = isComponentOnAjaxResponse(component);
+ assertResult(result);
}
/**
* Tests that a <code>Component</code> has been added to a <code>AjaxRequestTarget</code>, using
- * {@link org.apache.wicket.ajax.AjaxRequestTarget#add(Component...)}. This method actually
- * tests that a <code>Component</code> is on the Ajax response sent back to the client.
+ * {@link org.apache.wicket.ajax.AjaxRequestTarget#add(Component...)}. This method actually tests that a
+ * <code>Component</code> is on the Ajax response sent back to the client.
* <p>
* PLEASE NOTE! This method doesn't actually insert the <code>Component</code> in the client DOM
* tree, using JavaScript. But it shouldn't be needed because you just have to trust that Wicket
* Ajax JavaScript works.
*
- * @param component
- * a <code>Component</code> to be tested
+ * @param componentPath
+ * a <code>Component</code> path to test
*/
- public void assertComponentOnAjaxResponse(Component component)
+ public void assertComponentOnAjaxResponse(String componentPath)
{
- Result result = isComponentOnAjaxResponse(component);
- assertResult(result);
+ Component component = getComponentFromLastRenderedPage(componentPath, false);
+ assertComponentOnAjaxResponse(component);
}
/**
@@ -405,9 +376,9 @@ public class WicketTester extends BaseWicketTester
* Asserts that a component's markup has loaded with the given variation
*
* @param component
- * The component which markup to check
+ * The component which markup to check
* @param expectedVariation
- * The expected variation of the component's markup
+ * The expected variation of the component's markup
*/
public void assertMarkupVariation(Component component, String expectedVariation)
{
@@ -417,44 +388,21 @@ public class WicketTester extends BaseWicketTester
String actualVariation = markup.getMarkupResourceStream().getVariation();
if (Objects.equal(expectedVariation, actualVariation) == false)
{
- result = Result.fail(
- String.format("Wrong variation for component '%s'. Actual: '%s', expected: '%s'",
+ result = Result.fail(String.format("Wrong variation for component '%s'. Actual: '%s', expected: '%s'",
component.getPageRelativePath(), actualVariation, expectedVariation));
}
assertResult(result);
}
- private IMarkupFragment getMarkupFragment(Component component)
- {
- IMarkupFragment markup = null;
- if (component instanceof MarkupContainer)
- {
- markup = ((MarkupContainer)component).getAssociatedMarkup();
- }
-
- if (markup == null)
- {
- markup = component.getMarkup();
- }
-
- if (markup == null)
- {
- throw new AssertionFailedError(String.format("Cannot find the markup of component: %s",
- component.getPageRelativePath()));
- }
-
- return markup;
- }
-
/**
* Asserts that a component's markup has loaded with the given style.
*
* @param component
- * The component which markup to check
+ * The component which markup to check
* @param expectedStyle
- * The expected style of the component's markup. For example: <em>green</em> in
- * <code>MyPanel_green.html</code>
+ * The expected style of the component's markup.
+ * For example: <em>green</em> in <code>MyPanel_green.html</code>
*/
public void assertMarkupStyle(Component component, String expectedStyle)
{
@@ -464,8 +412,7 @@ public class WicketTester extends BaseWicketTester
String actualStyle = markup.getMarkupResourceStream().getStyle();
if (Objects.equal(expectedStyle, actualStyle) == false)
{
- result = Result
- .fail(String.format("Wrong style for component '%s'. Actual: '%s', expected: '%s'",
+ result = Result.fail(String.format("Wrong style for component '%s'. Actual: '%s', expected: '%s'",
component.getPageRelativePath(), actualStyle, expectedStyle));
}
@@ -476,9 +423,9 @@ public class WicketTester extends BaseWicketTester
* Asserts that a component's markup has loaded with the given locale
*
* @param component
- * The component which markup to check
+ * The component which markup to check
* @param expectedLocale
- * The expected locale of the component's markup
+ * The expected locale of the component's markup
*/
public void assertMarkupLocale(Component component, Locale expectedLocale)
{
@@ -488,14 +435,34 @@ public class WicketTester extends BaseWicketTester
Locale actualLocale = markup.getMarkupResourceStream().getLocale();
if (Objects.equal(expectedLocale, actualLocale) == false)
{
- result = Result
- .fail(String.format("Wrong locale for component '%s'. Actual: '%s', expected: '%s'",
+ result = Result.fail(String.format("Wrong locale for component '%s'. Actual: '%s', expected: '%s'",
component.getPageRelativePath(), actualLocale, expectedLocale));
}
assertResult(result);
}
+ private IMarkupFragment getMarkupFragment(Component component)
+ {
+ IMarkupFragment markup = null;
+ if (component instanceof MarkupContainer)
+ {
+ markup = ((MarkupContainer) component).getAssociatedMarkup();
+ }
+
+ if (markup == null)
+ {
+ markup = component.getMarkup();
+ }
+
+ if (markup == null)
+ {
+ throw new AssertionFailedError(String.format("Cannot find the markup of component: %s", component.getPageRelativePath()));
+ }
+
+ return markup;
+ }
+
/**
* Asserts error-level feedback messages.
*
@@ -504,8 +471,18 @@ public class WicketTester extends BaseWicketTester
*/
public void assertErrorMessages(Serializable... expectedErrorMessages)
{
- assertFeedbackMessages(new ExactLevelFeedbackMessageFilter(FeedbackMessage.ERROR),
- expectedErrorMessages);
+ assertFeedbackMessages(new ExactLevelFeedbackMessageFilter(FeedbackMessage.ERROR), expectedErrorMessages);
+ }
+
+ /**
+ * Assert info-level feedback messages.
+ *
+ * @param expectedInfoMessages
+ * expected info messages
+ */
+ public void assertInfoMessages(Serializable... expectedInfoMessages)
+ {
+ assertFeedbackMessages(new ExactLevelFeedbackMessageFilter(FeedbackMessage.INFO), expectedInfoMessages);
}
/**
@@ -516,8 +493,7 @@ public class WicketTester extends BaseWicketTester
* @param expectedMessages
* expected feedback messages
*/
- public void assertFeedbackMessages(IFeedbackMessageFilter filter,
- Serializable... expectedMessages)
+ public void assertFeedbackMessages(IFeedbackMessageFilter filter, Serializable... expectedMessages)
{
List<FeedbackMessage> feedbackMessages = getFeedbackMessages(filter);
List<Serializable> actualMessages = getActualFeedbackMessages(feedbackMessages);
@@ -525,8 +501,34 @@ public class WicketTester extends BaseWicketTester
}
/**
- * Extracts the actual messages from the passed feedback messages. Specially handles
- * ValidationErrorFeedback messages by extracting their String message
+ * Asserts that there is a feedback message provided by a given component
+ *
+ * @param component
+ * the component that provided the expected feedback message. Optional.
+ * @param key
+ * the resource key for the feedback message. Mandatory.
+ * @param model
+ * the model used for interpolating the feedback message. Optional.
+ * @param filter
+ * the filter that decides in which messages to look in. E.g. with a specific
+ * level, rendered or not, etc.
+ */
+ public void assertComponentFeedbackMessage(Component component, String key, IModel<?> model, IFeedbackMessageFilter filter)
+ {
+ Args.notNull(key, "key");
+
+ String expectedMessage = getApplication().getResourceSettings().getLocalizer().getString(key, component, model);
+
+ List<FeedbackMessage> feedbackMessages = getFeedbackMessages(filter);
+ List<Serializable> actualMessages = getActualFeedbackMessages(feedbackMessages);
+
+ assertTrue(actualMessages.contains(expectedMessage),
+ String.format("Feedback message with key '%s' cannot be found in %s", key, actualMessages));
+ }
+
+ /**
+ * Extracts the actual messages from the passed feedback messages.
+ * Specially handles ValidationErrorFeedback messages by extracting their String message
*
* @param feedbackMessages
* the feedback messages
@@ -551,46 +553,6 @@ public class WicketTester extends BaseWicketTester
}
/**
- * Assert info-level feedback messages.
- *
- * @param expectedInfoMessages
- * expected info messages
- */
- public void assertInfoMessages(Serializable... expectedInfoMessages)
- {
- assertFeedbackMessages(new ExactLevelFeedbackMessageFilter(FeedbackMessage.INFO),
- expectedInfoMessages);
- }
-
- /**
- * Asserts that there is a feedback message provided by a given component
- *
- * @param component
- * the component that provided the expected feedback message. Optional.
- * @param key
- * the resource key for the feedback message. Mandatory.
- * @param model
- * the model used for interpolating the feedback message. Optional.
- * @param filter
- * the filter that decides in which messages to look in. E.g. with a specific level,
- * rendered or not, etc.
- */
- public void assertComponentFeedbackMessage(Component component, String key, IModel<?> model,
- IFeedbackMessageFilter filter)
- {
- Args.notNull(key, "key");
-
- String expectedMessage = getApplication().getResourceSettings().getLocalizer().getString(
- key, component, model);
-
- List<FeedbackMessage> feedbackMessages = getFeedbackMessages(filter);
- List<Serializable> actualMessages = getActualFeedbackMessages(feedbackMessages);
-
- assertTrue(actualMessages.contains(expectedMessage), String
- .format("Feedback message with key '%s' cannot be found in %s", key, actualMessages));
- }
-
- /**
* Assert that a particular feedback panel is rendering certain messages.
*
* NOTE: this casts the component at the specified path to a {@link FeedbackPanel}, so it will
@@ -609,13 +571,12 @@ public class WicketTester extends BaseWicketTester
final List<FeedbackMessage> renderedMessages = model.getObject();
if (renderedMessages == null)
{
- fail(String.format("feedback panel at path [%s] returned null messages", path));
+ throw new AssertionFailedError(String.format("feedback panel at path [%s] returned null messages", path));
}
if (messages.length != renderedMessages.size())
{
- fail(String.format(
- "you expected '%d' messages for the feedback panel [%s], but there were actually '%d'",
- messages.length, path, renderedMessages.size()));
+ throw new AssertionFailedError(String.format("you expected '%d' messages for the feedback panel [%s], but there were actually '%d'",
+ messages.length, path, renderedMessages.size()));
}
for (int i = 0; i < messages.length && i < renderedMessages.size(); i++)
{
@@ -694,30 +655,19 @@ public class WicketTester extends BaseWicketTester
}
/**
- * Asserts last-rendered <code>Page</code> against an expected HTML document.
- * <p>
- * Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected
- * output file.
- *
- * @param clazz
- * <code>Class</code> used to load the file (relative to <code>clazz</code> package)
- * @param filename
- * expected output filename <code>String</code>
- * @throws Exception
+ * Asserts no error-level feedback messages.
*/
- @Override
- public void assertResultPage(final Class<?> clazz, final String filename) throws Exception
+ public void assertNoErrorMessage()
{
- String document = getLastResponseAsString();
- DiffUtil.validatePage(document, clazz, filename, true);
+ assertNoFeedbackMessage(FeedbackMessage.ERROR);
}
/**
- * Asserts no error-level feedback messages.
+ * Asserts no info-level feedback messages.
*/
- public void assertNoErrorMessage()
+ public void assertNoInfoMessage()
{
- assertNoFeedbackMessage(FeedbackMessage.ERROR);
+ assertNoFeedbackMessage(FeedbackMessage.INFO);
}
/**
@@ -733,11 +683,33 @@ public class WicketTester extends BaseWicketTester
}
/**
- * Asserts no info-level feedback messages.
+ * Asserts a last-rendered <code>Page</code> class.
+ *
+ * @param expectedRenderedPageClass
+ * expected class of last rendered <code>Page</code>
*/
- public void assertNoInfoMessage()
+ public void assertRenderedPage(Class<? extends Page> expectedRenderedPageClass)
{
- assertNoFeedbackMessage(FeedbackMessage.INFO);
+ assertResult(isRenderedPage(expectedRenderedPageClass));
+ }
+
+ /**
+ * Asserts last-rendered <code>Page</code> against an expected HTML document.
+ * <p>
+ * Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected
+ * output file.
+ *
+ * @param clazz
+ * <code>Class</code> used to load the file (relative to <code>clazz</code> package)
+ * @param filename
+ * expected output filename <code>String</code>
+ * @throws Exception
+ */
+ @Override
+ public void assertResultPage(final Class<?> clazz, final String filename) throws Exception
+ {
+ String document = getLastResponseAsString();
+ DiffUtil.validatePage(document, clazz, filename, true);
}
/**
@@ -812,6 +784,18 @@ public class WicketTester extends BaseWicketTester
}
/**
+ *
+ * @param result
+ */
+ private void assertResult(Result result)
+ {
+ if (result.wasFailed())
+ {
+ throw new AssertionFailedError(result.getMessage());
+ }
+ }
+
+ /**
* Checks whether a component is visible and/or enabled before usage
*
* @param component
@@ -848,16 +832,15 @@ public class WicketTester extends BaseWicketTester
}
catch (ClassCastException e)
{
- throw new IllegalArgumentException(
- "Component with id:" + id + " is not a BookmarkablePageLink");
+ throw new IllegalArgumentException("Component with id:" + id +
+ " is not a BookmarkablePageLink");
}
- assertEquals(pageClass, pageLink.getPageClass(),
- "BookmarkablePageLink: " + id + " is pointing to the wrong page");
+ assertEquals(pageClass,
+ pageLink.getPageClass(), "BookmarkablePageLink: " + id + " is pointing to the wrong page");
- assertEquals(parameters, pageLink.getPageParameters(),
- "One or more of the parameters associated with the BookmarkablePageLink: " + id +
- " do not match");
+ assertEquals(parameters, pageLink.getPageParameters(), "One or more of the parameters associated with the BookmarkablePageLink: " +
+ id + " do not match");
}
/**
@@ -881,17 +864,6 @@ public class WicketTester extends BaseWicketTester
}
/**
- * Asserts a last-rendered <code>Page</code> class.
- *
- * @param expectedRenderedPageClass
- * expected class of last rendered <code>Page</code>
- */
- public void assertRenderedPage(Class<? extends Page> expectedRenderedPageClass)
- {
- assertResult(isRenderedPage(expectedRenderedPageClass));
- }
-
- /**
* Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected
* output file.
*
@@ -996,4 +968,24 @@ public class WicketTester extends BaseWicketTester
String actualRedirectUrl = getLastResponse().getRedirectLocation();
assertEquals(expectedRedirectUrl, actualRedirectUrl);
}
+
+ /**
+ * Returns the current Maven build directory taken from the <tt>basedir</tt> system property, or
+ * null if not set
+ *
+ * @return path with a trailing slash
+ */
+ public static String getBasedir()
+ {
+ String basedir = System.getProperty("basedir");
+ if (basedir != null)
+ {
+ basedir = basedir + "/";
+ }
+ else
+ {
+ basedir = "";
+ }
+ return basedir;
+ }
}
[31/45] wicket git commit: use maven surefire 2.22.0 for
compatibility with Junit 5 reenable FullyBufferedReaderTest.java
Posted by mg...@apache.org.
use maven surefire 2.22.0 for compatibility with Junit 5
reenable FullyBufferedReaderTest.java
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/872657be
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/872657be
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/872657be
Branch: refs/heads/master
Commit: 872657be912e99e0c022d5974e3a9b3a0360c8df
Parents: 67e228d
Author: renoth <jo...@gmx.de>
Authored: Sat Sep 1 08:24:09 2018 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 26 15:40:03 2018 +0300
----------------------------------------------------------------------
pom.xml | 3 +-
.../wicket/util/io/FullyBufferedReaderTest.java | 82 ++++++++++----------
2 files changed, 44 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/872657be/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cf61347..73ff1e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,8 +129,9 @@
<spring.version>5.1.0.RELEASE</spring.version>
<servlet-api.version>3.1.0</servlet-api.version>
<maven.javadoc.version>3.0.1</maven.javadoc.version>
- <maven.surefire.version>2.20</maven.surefire.version>
+ <maven.surefire.version>2.22.0</maven.surefire.version>
<mockito.version>2.22.0</mockito.version>
+ <mockito.version>2.18.3</mockito.version>
<slf4j.version>1.7.25</slf4j.version>
<logback.version>1.2.3</logback.version>
<hamcrest.version>2.0.0.0</hamcrest.version>
http://git-wip-us.apache.org/repos/asf/wicket/blob/872657be/wicket-util/src/test/java/org/apache/wicket/util/io/FullyBufferedReaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/io/FullyBufferedReaderTest.java b/wicket-util/src/test/java/org/apache/wicket/util/io/FullyBufferedReaderTest.java
index 5215765..7ae2495 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/io/FullyBufferedReaderTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/io/FullyBufferedReaderTest.java
@@ -13,29 +13,28 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *//*
+ */
package org.apache.wicket.util.io;
-import java.text.ParseException;
-
import org.junit.jupiter.api.Test;
+import java.text.ParseException;
+
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
-*/
/**
* Tests for {@link FullyBufferedReader}
- *//*
+ */
public class FullyBufferedReaderTest
{
- */
-/**
+ /**
*
* @throws ParseException
- *//*
+ */
@Test
public void nestedQuotes() throws ParseException
@@ -53,11 +52,11 @@ public class FullyBufferedReaderTest
assertEquals(testTag.length(), position + 1);
}
- */
-/**
+
+ /**
*
* @throws ParseException
- *//*
+ */
@Test
public void quotedEsclamationQuotationMark() throws ParseException
@@ -75,87 +74,90 @@ public class FullyBufferedReaderTest
assertEquals(testTag.length(), position + 1);
}
- */
-/**
+
+ /**
* https://issues.apache.org/jira/browse/WICKET-4117
*
* Test exception when we forgot to close quote
*
* @throws ParseException
- *//*
+ */
@Test
public void missingClosingQuote() throws ParseException
{
- thrown.expect(ParseException.class);
- thrown.expectMessage("Opening/closing quote not found for quote at (line 1, column 9)");
-
String testTag = "<a href='blabla>";
FullyBufferedReader fullyBufferedReader = new FullyBufferedReader(testTag);
- fullyBufferedReader.findOutOfQuotes('>', 0);
+ final ParseException e = assertThrows(ParseException.class, () -> {
+ fullyBufferedReader.findOutOfQuotes('>', 0);
+ });
+
+ assertEquals("Opening/closing quote not found for quote at (line 1, column 9)", e.getMessage());
}
- */
-/**
+
+ /**
* https://issues.apache.org/jira/browse/WICKET-4117
*
* Test exception when we forgot to close quote
*
* @throws ParseException
- *//*
+ */
@Test
public void missingOpeningQuote() throws ParseException
{
- thrown.expect(ParseException.class);
- thrown.expectMessage("Opening/closing quote not found for quote at (line 1, column 15)");
-
String testTag = "<a href=blabla'>";
FullyBufferedReader fullyBufferedReader = new FullyBufferedReader(testTag);
- fullyBufferedReader.findOutOfQuotes('>', 0);
+ final ParseException e = assertThrows(ParseException.class, () -> {
+ fullyBufferedReader.findOutOfQuotes('>', 0);
+ });
+
+ assertEquals("Opening/closing quote not found for quote at (line 1, column 15)", e.getMessage());
}
- */
-/**
+ /**
* https://issues.apache.org/jira/browse/WICKET-4117
*
* Test exception when we forgot to close quote
*
* @throws ParseException
- *//*
+ */
@Test
public void missingClosingDoubleQuote() throws ParseException
{
- thrown.expect(ParseException.class);
- thrown.expectMessage("Opening/closing quote not found for quote at (line 1, column 9)");
-
String testTag = "<a href=\"blabla>";
FullyBufferedReader fullyBufferedReader = new FullyBufferedReader(testTag);
- fullyBufferedReader.findOutOfQuotes('>', 0);
+ final ParseException e = assertThrows(ParseException.class, () -> {
+ fullyBufferedReader.findOutOfQuotes('>', 0);
+ });
+
+ assertEquals("Opening/closing quote not found for quote at (line 1, column 9)", e.getMessage());
}
- */
-/**
+
+ /**
* https://issues.apache.org/jira/browse/WICKET-4117
*
* Test exception when we forgot to close quote
*
* @throws ParseException
- *//*
+ */
@Test
public void missingOpeningDoubleQuote() throws ParseException
{
- thrown.expect(ParseException.class);
- thrown.expectMessage("Opening/closing quote not found for quote at (line 1, column 15)");
-
String testTag = "<a href=blabla\">";
FullyBufferedReader fullyBufferedReader = new FullyBufferedReader(testTag);
- fullyBufferedReader.findOutOfQuotes('>', 0);
+ final ParseException e = assertThrows(ParseException.class, () -> {
+ fullyBufferedReader.findOutOfQuotes('>', 0);
+ });
+
+ assertEquals("Opening/closing quote not found for quote at (line 1, column 15)", e.getMessage());
}
-}*/
+}
[44/45] wicket git commit: uncommented and migrated
ConvertersTest.java
Posted by mg...@apache.org.
uncommented and migrated ConvertersTest.java
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d08641fa
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d08641fa
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d08641fa
Branch: refs/heads/master
Commit: d08641fae05a34f3263d0b6566729a06564aa099
Parents: 512c421
Author: renoth <jo...@gmx.de>
Authored: Fri Sep 7 08:44:45 2018 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 26 16:25:38 2018 +0300
----------------------------------------------------------------------
.../apache/wicket/util/tester/WicketTester.java | 6 +-
.../util/convert/converters/ConvertersTest.java | 65 ++++++++++++--------
2 files changed, 43 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d08641fa/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
index 74bab6c..df096ae 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
@@ -598,8 +598,7 @@ public class WicketTester extends BaseWicketTester
final List<FeedbackMessage> renderedMessages = model.getObject();
if (renderedMessages == null)
{
- fail(
- String.format("feedback panel at path [%s] returned null messages", path));
+ fail(String.format("feedback panel at path [%s] returned null messages", path));
}
if (messages.length != renderedMessages.size())
@@ -750,7 +749,8 @@ public class WicketTester extends BaseWicketTester
* @param expectedDocument
* expected output <code>String</code>
*/
- public void assertResultPage(final String expectedDocument) {
+ public void assertResultPage(final String expectedDocument)
+ {
// Validate the document
String document = getLastResponseAsString();
assertEquals(expectedDocument, document);
http://git-wip-us.apache.org/repos/asf/wicket/blob/d08641fa/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java b/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
index 35be426..ebca9ac 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
@@ -17,6 +17,10 @@
package org.apache.wicket.util.convert.converters;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import java.math.BigDecimal;
import java.text.ChoiceFormat;
import java.text.NumberFormat;
@@ -28,20 +32,27 @@ import org.apache.wicket.util.convert.ConversionException;
import org.apache.wicket.util.convert.converter.*;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.apache.wicket.util.convert.converter.BigDecimalConverter;
+import org.apache.wicket.util.convert.converter.BooleanConverter;
+import org.apache.wicket.util.convert.converter.ByteConverter;
+import org.apache.wicket.util.convert.converter.CalendarConverter;
+import org.apache.wicket.util.convert.converter.CharacterConverter;
+import org.apache.wicket.util.convert.converter.DateConverter;
+import org.apache.wicket.util.convert.converter.DoubleConverter;
+import org.apache.wicket.util.convert.converter.FloatConverter;
+import org.apache.wicket.util.convert.converter.IntegerConverter;
+import org.apache.wicket.util.convert.converter.LongConverter;
+import org.apache.wicket.util.convert.converter.ShortConverter;
+import org.junit.jupiter.api.Test;
@SuppressWarnings("javadoc")
-public final class ConvertersTest
+final class ConvertersTest
{
- /** Dutch locale for localized testing. **/
+ /** Dutch locale for localized testing. */
private static final Locale DUTCH_LOCALE = new Locale("nl", "NL");
@Test
- public void thousandSeperator()
- {
+ void thousandSeperator() {
BigDecimalConverter bdc = new BigDecimalConverter();
assertEquals(new BigDecimal(3000), bdc.convertToObject("3 000", Locale.FRENCH));
@@ -75,14 +86,18 @@ public final class ConvertersTest
}
@Test
- public void validBooleanConversions()
+ void validBooleanConversions()
{
BooleanConverter converter = new BooleanConverter();
assertEquals(Boolean.FALSE, converter.convertToObject("", Locale.US));
- assertEquals("true", converter.convertToString(Boolean.TRUE, Locale.getDefault(Locale.Category.FORMAT)));
- assertEquals("false", converter.convertToString(Boolean.FALSE, Locale.getDefault(Locale.Category.FORMAT)));
- assertEquals(Boolean.TRUE, converter.convertToObject("true", Locale.getDefault(Locale.Category.FORMAT)));
- assertEquals(Boolean.FALSE, converter.convertToObject("false", Locale.getDefault(Locale.Category.FORMAT)));
+ assertEquals("true",
+ converter.convertToString(Boolean.TRUE, Locale.getDefault(Locale.Category.FORMAT)));
+ assertEquals("false",
+ converter.convertToString(Boolean.FALSE, Locale.getDefault(Locale.Category.FORMAT)));
+ assertEquals(Boolean.TRUE,
+ converter.convertToObject("true", Locale.getDefault(Locale.Category.FORMAT)));
+ assertEquals(Boolean.FALSE,
+ converter.convertToObject("false", Locale.getDefault(Locale.Category.FORMAT)));
}
@Test
@@ -96,7 +111,7 @@ public final class ConvertersTest
}
@Test
- public void validByteConversions()
+ void validByteConversions()
{
ByteConverter converter = new ByteConverter();
assertNull(converter.convertToObject("", Locale.US));
@@ -132,7 +147,7 @@ public final class ConvertersTest
}
@Test
- public void validDoubleConversions()
+ void validDoubleConversions()
{
DoubleConverter converter = new DoubleConverter();
assertEquals("7.1", converter.convertToString(7.1, Locale.US));
@@ -170,7 +185,7 @@ public final class ConvertersTest
}
@Test
- public void validFloatConversions()
+ void validFloatConversions()
{
FloatConverter converter = new FloatConverter();
assertNull(converter.convertToObject("", Locale.US));
@@ -206,7 +221,7 @@ public final class ConvertersTest
}
@Test
- public void validIntegerConversions()
+ void validIntegerConversions()
{
IntegerConverter converter = new IntegerConverter();
assertEquals("7", converter.convertToString(7, Locale.US));
@@ -252,7 +267,7 @@ public final class ConvertersTest
}
@Test
- public void validLongConversions()
+ void validLongConversions()
{
LongConverter converter = new LongConverter();
assertNull(converter.convertToObject("", Locale.US));
@@ -316,12 +331,12 @@ public final class ConvertersTest
}
@Test
- public void shortConversions()
+ void shortConversions()
{
ShortConverter converter = new ShortConverter();
assertNull(converter.convertToObject("", Locale.US));
assertEquals(Short.valueOf((short)10), converter.convertToObject("10", Locale.US));
- assertEquals("10", converter.convertToString((short) 10, Locale.US));
+ assertEquals("10", converter.convertToString((short)10, Locale.US));
}
@Test
@@ -352,7 +367,7 @@ public final class ConvertersTest
}
@Test
- public void validCharacterConverter()
+ void validCharacterConverter()
{
CharacterConverter converter = new CharacterConverter();
@@ -371,7 +386,7 @@ public final class ConvertersTest
}
@Test
- public void validDateConverters()
+ void validDateConverters()
{
DateConverter converter = new DateConverter();
@@ -408,7 +423,7 @@ public final class ConvertersTest
}
@Test
- public void calendarConverter()
+ void calendarConverter()
{
CalendarConverter converter = new CalendarConverter();
@@ -449,7 +464,7 @@ public final class ConvertersTest
* http://java.sun.com/j2se/1.4.2/docs/api/java/math/BigDecimal.html#BigDecimal%28double%29
*/
@Test
- public void bigDecimalConverter()
+ void bigDecimalConverter()
{
BigDecimal bd = new BigDecimalConverter().convertToObject("0.1", Locale.US);
assertEquals(new BigDecimal("0.1"), bd);
@@ -463,7 +478,7 @@ public final class ConvertersTest
}
@Test
- public void customFormat()
+ void customFormat()
{
@SuppressWarnings("serial")
IntegerConverter converter = new IntegerConverter()
[39/45] wicket git commit: wicket-core: Migrate to Junit 5
Posted by mg...@apache.org.
wicket-core: Migrate to Junit 5
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/694ee32d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/694ee32d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/694ee32d
Branch: refs/heads/master
Commit: 694ee32dc63537c7fca22d0c0139a380882f2888
Parents: cba693f
Author: renoth <jo...@gmx.de>
Authored: Fri Aug 31 23:25:41 2018 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 26 16:12:57 2018 +0300
----------------------------------------------------------------------
pom.xml | 1 +
.../wicket/util/tester/BaseWicketTester.java | 4 +-
.../apache/wicket/util/tester/WicketTester.java | 156 ++++++++++---------
.../test/java/org/apache/wicket/TesterTest.java | 1 -
.../handler/render/WebPageRendererTest.java | 1 -
5 files changed, 86 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/694ee32d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 39b9e56..7e74e89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -516,6 +516,7 @@
<groupId>org.hamcrest</groupId>
<artifactId>java-hamcrest</artifactId>
<version>2.0.0.0</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/694ee32d/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
index 313cb2d..92686b5 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
@@ -34,7 +34,6 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.regex.Pattern;
-
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
import javax.servlet.http.Cookie;
@@ -134,6 +133,7 @@ import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.time.Duration;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
+import org.opentest4j.AssertionFailedError;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -723,7 +723,7 @@ public class BaseWicketTester
{
if (redirectCount++ >= 100)
{
- throw new AssertionError("Possible infinite redirect detected. Bailing out.");
+ throw new AssertionFailedError("Possible infinite redirect detected. Bailing out.");
}
Url newUrl = Url.parse(lastResponse.getRedirectLocation(),
http://git-wip-us.apache.org/repos/asf/wicket/blob/694ee32d/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
index 66af566..1b469a8 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
@@ -148,16 +148,14 @@ import org.slf4j.LoggerFactory;
*
* Cookie handling:
*
- * There are some expectations about wicket tester cookie handling which should match as best as
- * it can be with a real client server request response cycle:
- * - all valid cookies set before a request is made (tester.getRequest().addCookie()) should
- * appear in the page request
- * - all cookies set in the response should appear in the last response (tester.getLastResponse())
- * after the request is made (expired cookies and others)
- * - all cookies set in the response should appear even after a redirect response is made
- * until the final response (tester.getLastResponse()) is written to the client (wicket tester)
- * - all valid cookies (maxAge!=0) from the last response should be added to
- * the next request cookies (tester.getRequest().getCookies())
+ * There are some expectations about wicket tester cookie handling which should match as best as it
+ * can be with a real client server request response cycle: - all valid cookies set before a request
+ * is made (tester.getRequest().addCookie()) should appear in the page request - all cookies set in
+ * the response should appear in the last response (tester.getLastResponse()) after the request is
+ * made (expired cookies and others) - all cookies set in the response should appear even after a
+ * redirect response is made until the final response (tester.getLastResponse()) is written to the
+ * client (wicket tester) - all valid cookies (maxAge!=0) from the last response should be added to
+ * the next request cookies (tester.getRequest().getCookies())
*
*
* TODO General: Example usage of FormTester
@@ -260,19 +258,41 @@ public class WicketTester extends BaseWicketTester
}
/**
+ * Returns the current Maven build directory taken from the <tt>basedir</tt> system property, or
+ * null if not set
+ *
+ * @return path with a trailing slash
+ */
+ public static String getBasedir()
+ {
+ String basedir = System.getProperty("basedir");
+ if (basedir != null)
+ {
+ basedir = basedir + "/";
+ }
+ else
+ {
+ basedir = "";
+ }
+ return basedir;
+ }
+
+ /**
* Asserts that the Ajax location header is present.
*/
public void assertAjaxLocation()
{
if (null != getLastResponse().getHeader("Location"))
{
- throw new AssertionFailedError("Location header should *not* be present when using Ajax");
+ throw new AssertionFailedError(
+ "Location header should *not* be present when using Ajax");
}
String ajaxLocation = getLastResponse().getHeader("Ajax-Location");
if (null == ajaxLocation)
{
- throw new AssertionFailedError("Ajax-Location header should be present when using Ajax");
+ throw new AssertionFailedError(
+ "Ajax-Location header should be present when using Ajax");
}
int statusCode = getLastResponse().getStatus();
@@ -296,8 +316,7 @@ public class WicketTester extends BaseWicketTester
}
/**
- * Asserts that the <code>Component</code> a the given path has a behavior
- * of the given type.
+ * Asserts that the <code>Component</code> a the given path has a behavior of the given type.
*
* @param path
* path to <code>Component</code>
@@ -311,14 +330,14 @@ public class WicketTester extends BaseWicketTester
Component component = assertExists(path);
List<? extends Behavior> behaviors = component.getBehaviors(expectedBehaviorClass);
final String message = String.format("Component '%s' has no behaviors of type '%s'",
- component.getPageRelativePath(), expectedBehaviorClass);
+ component.getPageRelativePath(), expectedBehaviorClass);
assertResult(new Result(CollectionUtils.isEmpty(behaviors), message));
}
/**
* Tests that a <code>Component</code> has been added to a <code>AjaxRequestTarget</code>, using
- * {@link org.apache.wicket.ajax.AjaxRequestTarget#add(Component...)}. This method actually tests that a
- * <code>Component</code> is on the Ajax response sent back to the client.
+ * {@link org.apache.wicket.ajax.AjaxRequestTarget#add(Component...)}. This method actually
+ * tests that a <code>Component</code> is on the Ajax response sent back to the client.
* <p>
* PLEASE NOTE! This method doesn't actually insert the <code>Component</code> in the client DOM
* tree, using JavaScript. But it shouldn't be needed because you just have to trust that Wicket
@@ -335,8 +354,8 @@ public class WicketTester extends BaseWicketTester
/**
* Tests that a <code>Component</code> has been added to a <code>AjaxRequestTarget</code>, using
- * {@link org.apache.wicket.ajax.AjaxRequestTarget#add(Component...)}. This method actually tests that a
- * <code>Component</code> is on the Ajax response sent back to the client.
+ * {@link org.apache.wicket.ajax.AjaxRequestTarget#add(Component...)}. This method actually
+ * tests that a <code>Component</code> is on the Ajax response sent back to the client.
* <p>
* PLEASE NOTE! This method doesn't actually insert the <code>Component</code> in the client DOM
* tree, using JavaScript. But it shouldn't be needed because you just have to trust that Wicket
@@ -377,9 +396,9 @@ public class WicketTester extends BaseWicketTester
* Asserts that a component's markup has loaded with the given variation
*
* @param component
- * The component which markup to check
+ * The component which markup to check
* @param expectedVariation
- * The expected variation of the component's markup
+ * The expected variation of the component's markup
*/
public void assertMarkupVariation(Component component, String expectedVariation)
{
@@ -389,7 +408,8 @@ public class WicketTester extends BaseWicketTester
String actualVariation = markup.getMarkupResourceStream().getVariation();
if (Objects.equal(expectedVariation, actualVariation) == false)
{
- result = Result.fail(String.format("Wrong variation for component '%s'. Actual: '%s', expected: '%s'",
+ result = Result.fail(
+ String.format("Wrong variation for component '%s'. Actual: '%s', expected: '%s'",
component.getPageRelativePath(), actualVariation, expectedVariation));
}
@@ -400,10 +420,10 @@ public class WicketTester extends BaseWicketTester
* Asserts that a component's markup has loaded with the given style.
*
* @param component
- * The component which markup to check
+ * The component which markup to check
* @param expectedStyle
- * The expected style of the component's markup.
- * For example: <em>green</em> in <code>MyPanel_green.html</code>
+ * The expected style of the component's markup. For example: <em>green</em> in
+ * <code>MyPanel_green.html</code>
*/
public void assertMarkupStyle(Component component, String expectedStyle)
{
@@ -413,7 +433,8 @@ public class WicketTester extends BaseWicketTester
String actualStyle = markup.getMarkupResourceStream().getStyle();
if (Objects.equal(expectedStyle, actualStyle) == false)
{
- result = Result.fail(String.format("Wrong style for component '%s'. Actual: '%s', expected: '%s'",
+ result = Result
+ .fail(String.format("Wrong style for component '%s'. Actual: '%s', expected: '%s'",
component.getPageRelativePath(), actualStyle, expectedStyle));
}
@@ -424,9 +445,9 @@ public class WicketTester extends BaseWicketTester
* Asserts that a component's markup has loaded with the given locale
*
* @param component
- * The component which markup to check
+ * The component which markup to check
* @param expectedLocale
- * The expected locale of the component's markup
+ * The expected locale of the component's markup
*/
public void assertMarkupLocale(Component component, Locale expectedLocale)
{
@@ -436,7 +457,8 @@ public class WicketTester extends BaseWicketTester
Locale actualLocale = markup.getMarkupResourceStream().getLocale();
if (Objects.equal(expectedLocale, actualLocale) == false)
{
- result = Result.fail(String.format("Wrong locale for component '%s'. Actual: '%s', expected: '%s'",
+ result = Result
+ .fail(String.format("Wrong locale for component '%s'. Actual: '%s', expected: '%s'",
component.getPageRelativePath(), actualLocale, expectedLocale));
}
@@ -448,7 +470,7 @@ public class WicketTester extends BaseWicketTester
IMarkupFragment markup = null;
if (component instanceof MarkupContainer)
{
- markup = ((MarkupContainer) component).getAssociatedMarkup();
+ markup = ((MarkupContainer)component).getAssociatedMarkup();
}
if (markup == null)
@@ -458,7 +480,8 @@ public class WicketTester extends BaseWicketTester
if (markup == null)
{
- throw new AssertionFailedError(String.format("Cannot find the markup of component: %s", component.getPageRelativePath()));
+ throw new AssertionFailedError(String.format("Cannot find the markup of component: %s",
+ component.getPageRelativePath()));
}
return markup;
@@ -472,7 +495,8 @@ public class WicketTester extends BaseWicketTester
*/
public void assertErrorMessages(Serializable... expectedErrorMessages)
{
- assertFeedbackMessages(new ExactLevelFeedbackMessageFilter(FeedbackMessage.ERROR), expectedErrorMessages);
+ assertFeedbackMessages(new ExactLevelFeedbackMessageFilter(FeedbackMessage.ERROR),
+ expectedErrorMessages);
}
/**
@@ -495,7 +519,8 @@ public class WicketTester extends BaseWicketTester
* @param expectedMessages
* expected feedback messages
*/
- public void assertFeedbackMessages(IFeedbackMessageFilter filter, Serializable... expectedMessages)
+ public void assertFeedbackMessages(IFeedbackMessageFilter filter,
+ Serializable... expectedMessages)
{
List<FeedbackMessage> feedbackMessages = getFeedbackMessages(filter);
List<Serializable> actualMessages = getActualFeedbackMessages(feedbackMessages);
@@ -506,31 +531,33 @@ public class WicketTester extends BaseWicketTester
* Asserts that there is a feedback message provided by a given component
*
* @param component
- * the component that provided the expected feedback message. Optional.
+ * the component that provided the expected feedback message. Optional.
* @param key
- * the resource key for the feedback message. Mandatory.
+ * the resource key for the feedback message. Mandatory.
* @param model
- * the model used for interpolating the feedback message. Optional.
+ * the model used for interpolating the feedback message. Optional.
* @param filter
- * the filter that decides in which messages to look in. E.g. with a specific
- * level, rendered or not, etc.
+ * the filter that decides in which messages to look in. E.g. with a specific level,
+ * rendered or not, etc.
*/
- public void assertComponentFeedbackMessage(Component component, String key, IModel<?> model, IFeedbackMessageFilter filter)
+ public void assertComponentFeedbackMessage(Component component, String key, IModel<?> model,
+ IFeedbackMessageFilter filter)
{
Args.notNull(key, "key");
- String expectedMessage = getApplication().getResourceSettings().getLocalizer().getString(key, component, model);
+ String expectedMessage = getApplication().getResourceSettings().getLocalizer().getString(
+ key, component, model);
List<FeedbackMessage> feedbackMessages = getFeedbackMessages(filter);
List<Serializable> actualMessages = getActualFeedbackMessages(feedbackMessages);
- assertTrue(actualMessages.contains(expectedMessage),
- String.format("Feedback message with key '%s' cannot be found in %s", key, actualMessages));
+ assertTrue(actualMessages.contains(expectedMessage), String
+ .format("Feedback message with key '%s' cannot be found in %s", key, actualMessages));
}
/**
- * Extracts the actual messages from the passed feedback messages.
- * Specially handles ValidationErrorFeedback messages by extracting their String message
+ * Extracts the actual messages from the passed feedback messages. Specially handles
+ * ValidationErrorFeedback messages by extracting their String message
*
* @param feedbackMessages
* the feedback messages
@@ -573,13 +600,15 @@ public class WicketTester extends BaseWicketTester
final List<FeedbackMessage> renderedMessages = model.getObject();
if (renderedMessages == null)
{
- throw new AssertionFailedError(String.format("feedback panel at path [%s] returned null messages", path));
+ throw new AssertionFailedError(
+ String.format("feedback panel at path [%s] returned null messages", path));
}
if (messages.length != renderedMessages.size())
{
- throw new AssertionFailedError(String.format("you expected '%d' messages for the feedback panel [%s], but there were actually '%d'",
- messages.length, path, renderedMessages.size()));
+ throw new AssertionFailedError(String.format(
+ "you expected '%d' messages for the feedback panel [%s], but there were actually '%d'",
+ messages.length, path, renderedMessages.size()));
}
for (int i = 0; i < messages.length && i < renderedMessages.size(); i++)
@@ -834,15 +863,16 @@ public class WicketTester extends BaseWicketTester
}
catch (ClassCastException e)
{
- throw new IllegalArgumentException("Component with id:" + id +
- " is not a BookmarkablePageLink");
+ throw new IllegalArgumentException(
+ "Component with id:" + id + " is not a BookmarkablePageLink");
}
- assertEquals(pageClass,
- pageLink.getPageClass(), "BookmarkablePageLink: " + id + " is pointing to the wrong page");
+ assertEquals(pageClass, pageLink.getPageClass(),
+ "BookmarkablePageLink: " + id + " is pointing to the wrong page");
- assertEquals(parameters, pageLink.getPageParameters(), "One or more of the parameters associated with the BookmarkablePageLink: " +
- id + " do not match");
+ assertEquals(parameters, pageLink.getPageParameters(),
+ "One or more of the parameters associated with the BookmarkablePageLink: " + id +
+ " do not match");
}
/**
@@ -970,24 +1000,4 @@ public class WicketTester extends BaseWicketTester
String actualRedirectUrl = getLastResponse().getRedirectLocation();
assertEquals(expectedRedirectUrl, actualRedirectUrl);
}
-
- /**
- * Returns the current Maven build directory taken from the <tt>basedir</tt> system property, or
- * null if not set
- *
- * @return path with a trailing slash
- */
- public static String getBasedir()
- {
- String basedir = System.getProperty("basedir");
- if (basedir != null)
- {
- basedir = basedir + "/";
- }
- else
- {
- basedir = "";
- }
- return basedir;
- }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/694ee32d/wicket-core/src/test/java/org/apache/wicket/TesterTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/TesterTest.java b/wicket-core/src/test/java/org/apache/wicket/TesterTest.java
index 692324d..64bc26f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/TesterTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/TesterTest.java
@@ -23,7 +23,6 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.jupiter.api.Test;
-
/**
* @author jcompagner
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/694ee32d/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java
index 5956c33..a404885 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java
@@ -43,7 +43,6 @@ import org.apache.wicket.request.http.WebResponse;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-
/**
* Tests for the calculation whether or not to redirect or directly render a page
*/
[32/45] wicket git commit: - wicket-arquilian / wicket-cdi-1.1 :
Enable Junit Vintage Engine to run old Testrunners - BaseWicketTester.java:
remove dependency on AssertionFailedException - global: use AssertionError
instead of AssertionFailedError - upda
Posted by mg...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestBehavior.java b/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestBehavior.java
index 04988dd..96cd2ab 100644
--- a/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestBehavior.java
+++ b/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestBehavior.java
@@ -16,11 +16,13 @@
*/
package org.apache.wicket.guice;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import javax.inject.Inject;
import org.apache.wicket.Component;
import org.apache.wicket.behavior.Behavior;
-import org.junit.Assert;
/**
* A behavior that will be use injected services
@@ -40,8 +42,8 @@ public class JavaxInjectTestBehavior extends Behavior
{
super.bind(component);
- Assert.assertNotNull(injectedFieldBlue);
- Assert.assertEquals("blue", injectedFieldBlue.getString());
+ assertNotNull(injectedFieldBlue);
+ assertEquals("blue", injectedFieldBlue.getString());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-guice/src/test/java/org/apache/wicket/guice/TestBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/test/java/org/apache/wicket/guice/TestBehavior.java b/wicket-guice/src/test/java/org/apache/wicket/guice/TestBehavior.java
index 603534b..08c8b71 100644
--- a/wicket-guice/src/test/java/org/apache/wicket/guice/TestBehavior.java
+++ b/wicket-guice/src/test/java/org/apache/wicket/guice/TestBehavior.java
@@ -16,10 +16,13 @@
*/
package org.apache.wicket.guice;
-import com.google.inject.Inject;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import org.apache.wicket.Component;
import org.apache.wicket.behavior.Behavior;
-import org.junit.Assert;
+
+import com.google.inject.Inject;
/**
* A behavior that will be use injected services
@@ -39,8 +42,8 @@ public class TestBehavior extends Behavior
{
super.bind(component);
- Assert.assertNotNull(injectedFieldBlue);
- Assert.assertEquals("blue", injectedFieldBlue.getString());
+ assertNotNull(injectedFieldBlue);
+ assertEquals("blue", injectedFieldBlue.getString());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-util/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-util/pom.xml b/wicket-util/pom.xml
index 6f71806..d5777f8 100755
--- a/wicket-util/pom.xml
+++ b/wicket-util/pom.xml
@@ -44,11 +44,5 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
- <dependency>
- <groupId>org.opentest4j</groupId>
- <artifactId>opentest4j</artifactId>
- <version>RELEASE</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
index cbbc934..c6e5685 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
@@ -16,12 +16,17 @@
*/
package org.apache.wicket.util.license;
-import java.io.*;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
import java.util.List;
import org.apache.wicket.util.io.IOUtils;
import org.apache.wicket.util.string.Strings;
-import org.opentest4j.AssertionFailedError;
+
abstract class AbstractLicenseHeaderHandler implements ILicenseHeaderHandler
{
@@ -76,7 +81,7 @@ abstract class AbstractLicenseHeaderHandler implements ILicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
finally
{
@@ -86,7 +91,7 @@ abstract class AbstractLicenseHeaderHandler implements ILicenseHeaderHandler
}
catch (IOException e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
}
@@ -110,7 +115,7 @@ abstract class AbstractLicenseHeaderHandler implements ILicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
}
@@ -142,7 +147,7 @@ abstract class AbstractLicenseHeaderHandler implements ILicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
finally
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/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 596b2ed..d03f8ad 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
@@ -29,7 +29,6 @@ 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;
@@ -187,7 +186,7 @@ public abstract class ApacheLicenseHeaderTestCase
}
System.out.println(failString);
- throw new AssertionFailedError(failString.toString());
+ throw new AssertionError(failString.toString());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
index eddaaa7..2797d8a 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.wicket.util.diff.Diff;
import org.apache.wicket.util.diff.Revision;
-import org.opentest4j.AssertionFailedError;
+
class CssLicenseHeaderHandler extends AbstractLicenseHeaderHandler
{
@@ -55,7 +55,7 @@ class CssLicenseHeaderHandler extends AbstractLicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
return revision.size() == 0;
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
index e88a043..3165ebc 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
@@ -16,15 +16,14 @@
*/
package org.apache.wicket.util.license;
-import org.apache.wicket.util.string.Strings;
-import org.opentest4j.AssertionFailedError;
-
import java.io.File;
import java.util.Arrays;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.wicket.util.string.Strings;
+
class JavaLicenseHeaderHandler extends AbstractLicenseHeaderHandler
{
private final Pattern javaHeaderPattern = Pattern.compile("^(.*?)package.*$",
@@ -64,13 +63,13 @@ class JavaLicenseHeaderHandler extends AbstractLicenseHeaderHandler
}
else
{
- throw new AssertionFailedError();
+ throw new AssertionError();
}
}
catch (Exception e)
{
e.printStackTrace();
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
return added;
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
index 4a0447d..3da2788 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
@@ -16,14 +16,13 @@
*/
package org.apache.wicket.util.license;
-import org.apache.wicket.util.diff.Diff;
-import org.apache.wicket.util.diff.Revision;
-import org.opentest4j.AssertionFailedError;
-
import java.io.File;
import java.util.Arrays;
import java.util.List;
+import org.apache.wicket.util.diff.Diff;
+import org.apache.wicket.util.diff.Revision;
+
class PropertiesLicenseHeaderHandler extends AbstractLicenseHeaderHandler
{
/**
@@ -55,7 +54,7 @@ class PropertiesLicenseHeaderHandler extends AbstractLicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
return revision.size() == 0;
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
index 2d1286b..54fd6a6 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
@@ -16,14 +16,13 @@
*/
package org.apache.wicket.util.license;
-import org.apache.wicket.util.diff.Diff;
-import org.apache.wicket.util.diff.Revision;
-import org.opentest4j.AssertionFailedError;
-
import java.io.File;
import java.util.Arrays;
import java.util.List;
+import org.apache.wicket.util.diff.Diff;
+import org.apache.wicket.util.diff.Revision;
+
class VelocityLicenseHeaderHandler extends AbstractLicenseHeaderHandler
{
/**
@@ -55,7 +54,7 @@ class VelocityLicenseHeaderHandler extends AbstractLicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
return revision.size() == 0;
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
index 8287622..822cd65 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
@@ -16,17 +16,16 @@
*/
package org.apache.wicket.util.license;
-import org.apache.wicket.util.diff.Diff;
-import org.apache.wicket.util.diff.Revision;
-import org.apache.wicket.util.string.Strings;
-import org.opentest4j.AssertionFailedError;
-
import java.io.File;
import java.util.Arrays;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.wicket.util.diff.Diff;
+import org.apache.wicket.util.diff.Revision;
+import org.apache.wicket.util.string.Strings;
+
class XmlLicenseHeaderHandler extends AbstractLicenseHeaderHandler
{
private final Pattern xmlHeader = Pattern.compile(
@@ -83,7 +82,7 @@ class XmlLicenseHeaderHandler extends AbstractLicenseHeaderHandler
catch (Exception e)
{
e.printStackTrace();
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
return revision.size() == 0;
@@ -126,7 +125,7 @@ class XmlLicenseHeaderHandler extends AbstractLicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
return added;
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
index 3d652df..3206165 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.util.license;
-import org.opentest4j.AssertionFailedError;
+
import java.io.File;
import java.util.Arrays;
@@ -47,7 +47,7 @@ class XmlPrologHeaderHandler extends XmlLicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
}
[33/45] wicket git commit: - wicket-arquilian / wicket-cdi-1.1 :
Enable Junit Vintage Engine to run old Testrunners - BaseWicketTester.java:
remove dependency on AssertionFailedException - global: use AssertionError
instead of AssertionFailedError - upda
Posted by mg...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/StatelessCheckerTest.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/StatelessCheckerTest.java b/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/StatelessCheckerTest.java
index 8e588ad..bdb08ad 100644
--- a/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/StatelessCheckerTest.java
+++ b/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/StatelessCheckerTest.java
@@ -16,21 +16,23 @@
*/
package org.apache.wicket.devutils.stateless;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.tester.DummyHomePage;
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;
/**
* @author Marat Radchenko
*/
-public class StatelessCheckerTest extends Assert
+public class StatelessCheckerTest
{
@StatelessComponent
public static class StatelessPage extends DummyHomePage
@@ -97,7 +99,7 @@ public class StatelessCheckerTest extends Assert
private WicketTester tester;
- @Before
+ @BeforeEach
public void setUp()
{
tester = new WicketTester();
@@ -105,7 +107,7 @@ public class StatelessCheckerTest extends Assert
checkerQuietly = new StatelessCheckerQuietly();
}
- @After
+ @AfterEach
public void tearDown()
{
tester.destroy();
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-devutils/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java b/wicket-devutils/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java
index a8e7628..88d9025 100644
--- a/wicket-devutils/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java
+++ b/wicket-devutils/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.util.markup.xhtml;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Checks that the html markup files are well formed xml-s.
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java b/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java
index cd00729..96ba0f8 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java
@@ -16,22 +16,22 @@
*/
package org.apache.wicket.examples;
-import com.meterware.httpunit.HttpUnitOptions;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.webapp.WebAppContext;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+
+import com.meterware.httpunit.HttpUnitOptions;
/**
* Test decorator that starts a jetty instance
*
* @author ivaynberg
*/
-public class JettyTestCaseDecorator extends Assert
+public class JettyTestCaseDecorator
{
private Server server;
private String contextPath;
@@ -41,7 +41,7 @@ public class JettyTestCaseDecorator extends Assert
/**
* @throws Exception
*/
- @Before
+ @BeforeEach
public void before() throws Exception
{
HttpUnitOptions.setExceptionsThrownOnScriptError(false);
@@ -87,7 +87,7 @@ public class JettyTestCaseDecorator extends Assert
/**
* @throws Exception
*/
- @After
+ @AfterEach
public void after() throws Exception
{
contextPath = null;
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java b/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java
index 46e42f9..a82de7a 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java
@@ -16,10 +16,11 @@
*/
package org.apache.wicket.examples;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+
import com.meterware.httpunit.WebConversation;
import com.meterware.httpunit.WebResponse;
-import org.junit.After;
-import org.junit.Before;
/**
* WebTestCase for tests that need to run inside Jetty to test for example the wicket filter using
@@ -48,7 +49,7 @@ public abstract class WicketWebTestCase extends JettyTestCaseDecorator
* @throws Exception
*/
@Override
- @Before
+ @BeforeEach
public void before() throws Exception
{
super.before();
@@ -57,7 +58,7 @@ public abstract class WicketWebTestCase extends JettyTestCaseDecorator
}
@Override
- @After
+ @AfterEach
public void after() throws Exception
{
baseUrl = null;
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/prototype/AjaxTest.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/prototype/AjaxTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/prototype/AjaxTest.java
index fb50195..d07e41d 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/prototype/AjaxTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/prototype/AjaxTest.java
@@ -16,8 +16,10 @@
*/
package org.apache.wicket.examples.ajax.prototype;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* jWebUnit test for Hello World.
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/compref/ComprefTest.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/compref/ComprefTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/compref/ComprefTest.java
index c80fee9..0ebca5c 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/compref/ComprefTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/compref/ComprefTest.java
@@ -17,7 +17,7 @@
package org.apache.wicket.examples.compref;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
@@ -27,12 +27,10 @@ public class ComprefTest extends WicketTestCase
{
/**
* Test page.
- *
- * @throws Exception
- */
+ *
+ */
@Test
- public void test_1() throws Exception
- {
+ public void test_1() {
tester.startPage(Index.class);
tester.assertContains("Wicket Examples - component reference");
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/encodings/EncodingTest.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/encodings/EncodingTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/encodings/EncodingTest.java
index f97a887..9944d1d 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/encodings/EncodingTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/encodings/EncodingTest.java
@@ -17,7 +17,7 @@
package org.apache.wicket.examples.encodings;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* jWebUnit test for Hello World.
@@ -26,12 +26,10 @@ public class EncodingTest extends WicketTestCase
{
/**
* Test page.
- *
- * @throws Exception
- */
+ *
+ */
@Test
- public void test_1() throws Exception
- {
+ public void test_1() {
tester.startPage(Home.class);
tester.assertContains("Wicket Examples - encodings");
// the non-printable characters are: ���
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java
index 253bfea..e41a70d 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java
@@ -17,7 +17,7 @@
package org.apache.wicket.examples.forminput;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java
index 042f4b5..d3d64ae 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java
@@ -21,8 +21,8 @@ import java.util.ArrayList;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.util.tester.FormTester;
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;
/**
@@ -33,7 +33,7 @@ public class GuestbookTest extends WicketTestCase
/**
* Sets up the test.
*/
- @Before
+ @BeforeEach
public void setUp()
{
GuestBook.clear();
@@ -41,12 +41,10 @@ public class GuestbookTest extends WicketTestCase
/**
* Test page.
- *
- * @throws Exception
+ *
*/
@Test
- public void test_1() throws Exception
- {
+ public void test_1() {
tester.startPage(GuestBook.class);
tester.assertContains("Wicket Examples - guestbook");
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java
index b5bb61e..4d8425b 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java
@@ -20,7 +20,7 @@ import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.tester.WicketTester;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Testcase for the <code>Game</code> class.
@@ -28,16 +28,14 @@ import org.junit.Test;
* @author Chris Turner
* @version 1.0
*/
-public class HangManTest extends Assert
+public class HangManTest
{
/**
* Tests the hangman class directly for a winning game.
- *
- * @throws Exception
- */
+ *
+ */
@Test
- public void test_1() throws Exception
- {
+ public void test_1() {
Game hangman = new Game();
hangman.newGame(5, new WordGenerator(new String[] { "testing" }));
@@ -105,12 +103,10 @@ public class HangManTest extends Assert
/**
* Tests the hangman class directly for a lost game.
- *
- * @throws Exception
- */
+ *
+ */
@Test
- public void testHangmanLoseGame() throws Exception
- {
+ public void testHangmanLoseGame() {
Game hangman = new Game();
hangman.newGame(2, new WordGenerator(new String[] { "foo" }));
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/WordGeneratorTest.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/WordGeneratorTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/WordGeneratorTest.java
index cf64669..40bff2c 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/WordGeneratorTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/WordGeneratorTest.java
@@ -16,11 +16,15 @@
*/
package org.apache.wicket.examples.hangman;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.HashSet;
import java.util.Set;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,12 +40,10 @@ public class WordGeneratorTest extends WicketTestCase
/**
* Tests word generator
- *
- * @throws Exception
- */
+ *
+ */
@Test
- public void testWordGenerator() throws Exception
- {
+ public void testWordGenerator() {
WordGenerator wg = new WordGenerator();
int wordCount = wg.size();
Set<Word> words = new HashSet<>();
@@ -50,7 +52,7 @@ public class WordGeneratorTest extends WicketTestCase
{
Word word = wg.next();
log.info("Word found: " + word);
- assertFalse("Word should not be returned twice", words.contains(word));
+ Assertions.assertFalse(words.contains(word), "Word should not be returned twice");
words.add(word);
}
log.info("Second iteration...");
@@ -58,20 +60,18 @@ public class WordGeneratorTest extends WicketTestCase
{
Word word = wg.next();
log.info("Word found: " + word);
- assertTrue("Word " + word + " should have been returned only once", words.remove(word));
+ assertTrue(words.remove(word), "Word " + word + " should have been returned only once");
}
- assertTrue("All words should have been returned twice", words.isEmpty());
+ assertTrue(words.isEmpty(), "All words should have been returned twice");
}
/**
* Tests word generator
- *
- * @throws Exception
+ *
*/
@Test
- public void testSuppliedWordConstructor() throws Exception
- {
+ public void testSuppliedWordConstructor() {
WordGenerator wg = new WordGenerator(new String[] { "testing" });
- assertEquals("Word should be as expected", "testing", wg.next().asString());
+ assertEquals("testing", wg.next().asString(), "Word should be as expected");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java
index 2def352..54e4da8 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java
@@ -17,7 +17,7 @@
package org.apache.wicket.examples.helloworld;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* jWebUnit test for Hello World.
@@ -26,12 +26,10 @@ public class HelloWorldTest extends WicketTestCase
{
/**
* Test page.
- *
- * @throws Exception
- */
+ *
+ */
@Test
- public void testHelloWorld() throws Exception
- {
+ public void testHelloWorld() {
tester.startPage(HelloWorld.class);
tester.assertContains("Wicket Examples - helloworld");
tester.assertLabel("message", "Hello World!");
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/images/ImagesTest.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/images/ImagesTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/images/ImagesTest.java
index d2baaaa..4c23147 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/images/ImagesTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/images/ImagesTest.java
@@ -17,22 +17,19 @@
package org.apache.wicket.examples.images;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* jWebUnit test for Hello World.
*/
-public class ImagesTest extends Assert
+public class ImagesTest
{
/**
* Test page.
- *
- * @throws Exception
- */
+ *
+ */
@Test
- public void testImages() throws Exception
- {
+ public void testImages() {
WicketTester tester = new WicketTester(new ImagesApplication());
try
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/library/LibraryTest.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/library/LibraryTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/library/LibraryTest.java
index 20aa08d..04f97cb 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/library/LibraryTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/library/LibraryTest.java
@@ -18,22 +18,19 @@ package org.apache.wicket.examples.library;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* jWebUnit test for Hello World.
*/
-public class LibraryTest extends Assert
+public class LibraryTest
{
/**
* Test page.
- *
- * @throws Exception
- */
+ *
+ */
@Test
- public void test_1() throws Exception
- {
+ public void test_1() {
WicketTester tester = new WicketTester(new LibraryApplication());
try
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/linkomatic/LinkomaticTest.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/linkomatic/LinkomaticTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/linkomatic/LinkomaticTest.java
index adaf5ff..67c3e6e 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/linkomatic/LinkomaticTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/linkomatic/LinkomaticTest.java
@@ -17,7 +17,7 @@
package org.apache.wicket.examples.linkomatic;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* jWebUnit test for Hello World.
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/niceurl/NiceUrlTest.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/niceurl/NiceUrlTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/niceurl/NiceUrlTest.java
index 7ae0420..2c2cf8e 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/niceurl/NiceUrlTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/niceurl/NiceUrlTest.java
@@ -17,22 +17,21 @@
package org.apache.wicket.examples.niceurl;
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;
/**
* jWebUnit test for Hello World.
*/
-public class NiceUrlTest extends Assert
+public class NiceUrlTest
{
private WicketTester tester;
/**
*
*/
- @Before
+ @BeforeEach
public void before()
{
tester = new WicketTester(new NiceUrlApplication());
@@ -42,7 +41,7 @@ public class NiceUrlTest extends Assert
/**
*
*/
- @After
+ @AfterEach
public void tearDown()
{
tester.destroy();
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/repeater/RepeaterTest.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/repeater/RepeaterTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/repeater/RepeaterTest.java
index 271a4a3..ad439ea 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/repeater/RepeaterTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/repeater/RepeaterTest.java
@@ -18,7 +18,7 @@ package org.apache.wicket.examples.repeater;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for Repeater application
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/signin2/Signin2Test.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/signin2/Signin2Test.java b/wicket-examples/src/test/java/org/apache/wicket/examples/signin2/Signin2Test.java
index 0e6cd95..d672317 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/signin2/Signin2Test.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/signin2/Signin2Test.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.examples.signin2;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.Collection;
import javax.servlet.http.Cookie;
@@ -26,14 +28,12 @@ import org.apache.wicket.examples.authentication2.SignIn2Application;
import org.apache.wicket.examples.authentication2.SignOut;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Assert;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* jWebUnit test for Hello World.
*/
-public class Signin2Test extends Assert
+public class Signin2Test
{
/**
* Test page.
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/template/TemplateTest.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/template/TemplateTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/template/TemplateTest.java
index b78fbcc..a71e95f 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/template/TemplateTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/template/TemplateTest.java
@@ -17,13 +17,12 @@
package org.apache.wicket.examples.template;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for Template application
*/
-public class TemplateTest extends Assert
+public class TemplateTest
{
/**
* Test page.
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithFPTest.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithFPTest.java b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithFPTest.java
index cb8c36a..82e234d 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithFPTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithFPTest.java
@@ -16,8 +16,7 @@
*/
package org.apache.wicket.filtertest;
-import org.junit.Before;
-
+import org.junit.jupiter.api.BeforeEach;
/**
* jWebUnit test for Hello World.
@@ -29,7 +28,7 @@ public class WithCPWithFPTest extends WithoutCPWithFPTest
* @throws Exception
*/
@Override
- @Before
+ @BeforeEach
public void before() throws Exception
{
setContextPath("/somecontext");
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithoutFPTest.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithoutFPTest.java b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithoutFPTest.java
index 9eb625a..c5d8c16 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithoutFPTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithoutFPTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.filtertest;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
/**
* jWebUnit test for Hello World.
@@ -28,7 +28,7 @@ public class WithCPWithoutFPTest extends WithoutCPWithoutFPTest
*
*/
@Override
- @Before
+ @BeforeEach
public void before() throws Exception
{
setContextPath("/somecontext");
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithFPTest.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithFPTest.java b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithFPTest.java
index 1e869ca..83356e2 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithFPTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithFPTest.java
@@ -16,10 +16,13 @@
*/
package org.apache.wicket.filtertest;
-import com.meterware.httpunit.WebResponse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.examples.WicketWebTestCase;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import com.meterware.httpunit.WebResponse;
/**
* jWebUnit test for Hello World.
@@ -30,7 +33,7 @@ public class WithoutCPWithFPTest extends WicketWebTestCase
* @throws Exception
*/
@Override
- @Before
+ @BeforeEach
public void before() throws Exception
{
if (getContextPath() == null)
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithoutFPTest.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithoutFPTest.java b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithoutFPTest.java
index 2a77b16..2d85321 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithoutFPTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithoutFPTest.java
@@ -16,10 +16,13 @@
*/
package org.apache.wicket.filtertest;
-import com.meterware.httpunit.WebResponse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.examples.WicketWebTestCase;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import com.meterware.httpunit.WebResponse;
/**
* jWebUnit test for Hello World.
@@ -30,7 +33,7 @@ public class WithoutCPWithoutFPTest extends WicketWebTestCase
* @throws Exception
*/
@Override
- @Before
+ @BeforeEach
public void before() throws Exception
{
if (getContextPath() == null)
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java b/wicket-examples/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java
index 15bd94b..78f9e18 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.util.markup.xhtml;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Checks that the html markup files are well formed xml-s.
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
index f918469..4083705 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
@@ -16,7 +16,8 @@
*/
package org.apache.wicket.extensions.ajax.markup.html;
-import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Arrays;
@@ -30,8 +31,8 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.IWritableRequestParameters;
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link AjaxEditableLabel}
@@ -44,7 +45,7 @@ public class AjaxEditableTest extends WicketTestCase
/**
*
*/
- @Before
+ @BeforeEach
public void setUp()
{
tester.getApplication().getMarkupSettings().setStripWicketTags(false);
@@ -168,9 +169,9 @@ public class AjaxEditableTest extends WicketTestCase
IWritableRequestParameters postParameters = (IWritableRequestParameters)tester
.getRequestCycle().getRequest().getPostParameters();
postParameters.setParameterValues(editableLabel.getEditor().getInputName(),
- Arrays.asList(new StringValue[] { StringValue.valueOf("5") }));
+ Arrays.asList(StringValue.valueOf("5")));
editableLabel.getEditor().processInput();
- assertThat(integerModel.getObject(), instanceOf(Integer.class));
+ assertTrue(integerModel.getObject() instanceof Integer);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanelTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanelTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanelTest.java
index e24a0cf..fd7fba3 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanelTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanelTest.java
@@ -17,7 +17,7 @@
package org.apache.wicket.extensions.ajax.markup.html;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link AjaxLazyLoadPanel}.
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTest.java
index 640073c..70af775 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTest.java
@@ -16,8 +16,10 @@
*/
package org.apache.wicket.extensions.ajax.markup.html.autocomplete;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link AutoCompleteBehavior}.
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java
index 4ea40b8..c6d61a9 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java
@@ -16,12 +16,14 @@
*/
package org.apache.wicket.extensions.markup.html;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import org.apache.wicket.Component;
import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanelTester;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParserTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParserTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParserTest.java
index c5fb083..1f723b0 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParserTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParserTest.java
@@ -16,15 +16,17 @@
*/
package org.apache.wicket.extensions.markup.html.basic;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import org.junit.jupiter.api.Test;
/**
* Test for {@link DefaultLinkParser}.
*
* @author Juergen Donnerstag
*/
-public class DefaultLinkParserTest extends Assert
+public class DefaultLinkParserTest
{
/**
*
@@ -61,7 +63,8 @@ public class DefaultLinkParserTest extends Assert
assertEquals(
"line 1 <a href=\"http://www.test.com/test/murx.jsp\">http://www.test.com/test/murx.jsp</a> \nline2 <a href=\"mailto:murx@email.de\">murx@email.de</a> \r\nline3",
- parser.parse("line 1 http://www.test.com/test/murx.jsp \nline2 murx@email.de \r\nline3"));
+ parser
+ .parse("line 1 http://www.test.com/test/murx.jsp \nline2 murx@email.de \r\nline3"));
}
/**
@@ -88,8 +91,8 @@ public class DefaultLinkParserTest extends Assert
ILinkParser parser = new DefaultLinkParser();
final String result = parser.parse(testEmailAddress);
- assertEquals("Expected chars to left of + to be included in the link.", testExpectedLink,
- result);
+ assertEquals(testExpectedLink, result,
+ "Expected chars to left of + to be included in the link.");
}
/**
@@ -103,7 +106,7 @@ public class DefaultLinkParserTest extends Assert
ILinkParser parser = new DefaultLinkParser();
final String result = parser.parse(testEmailAddress);
- assertEquals("Expected chars to left of - to be included in the link.", testExpectedLink,
- result);
+ assertEquals(testExpectedLink, result,
+ "Expected chars to left of - to be included in the link.");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResourceTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResourceTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResourceTest.java
index 94cb8c8..19a655f 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResourceTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResourceTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.wicket.extensions.markup.html.captcha;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
import java.util.HashSet;
import java.util.Set;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the {@link org.apache.wicket.extensions.markup.html.captcha.CaptchaImageResource}.
@@ -37,8 +37,8 @@ public class CaptchaImageResourceTest
{
CaptchaImageResource image1 = new CaptchaImageResource("wicket");
- assertThat(image1.getChallengeId(), is("wicket"));
- assertThat(image1.getChallengeIdModel().getObject(), is("wicket"));
+ assertEquals("wicket", image1.getChallengeId());
+ assertEquals("wicket", image1.getChallengeIdModel().getObject());
}
@Test
@@ -47,7 +47,7 @@ public class CaptchaImageResourceTest
CaptchaImageResource image1 = new CaptchaImageResource("wicket");
CaptchaImageResource image2 = new CaptchaImageResource("wicket");
- assertThat(image1.getImageData(null), is(not(image2.getImageData(null))));
+ assertNotEquals(image1.getImageData(null), image2.getImageData(null));
}
@Test
@@ -55,7 +55,7 @@ public class CaptchaImageResourceTest
{
CaptchaImageResource image1 = new CaptchaImageResource("wicket");
- assertThat(image1.getImageData(null), is(image1.getImageData(null)));
+ assertSame(image1.getImageData(null), image1.getImageData(null));
}
@Test
@@ -65,7 +65,7 @@ public class CaptchaImageResourceTest
byte[] originalImageData = image1.getImageData(null);
image1.invalidate();
- assertThat(originalImageData, is(not(image1.getImageData(null))));
+ assertNotEquals(originalImageData, image1.getImageData(null));
}
@Test
@@ -79,6 +79,6 @@ public class CaptchaImageResourceTest
challengeIds.add(new CaptchaImageResource().getChallengeId());
}
- assertThat(challengeIds.size(), is(idsNumber));
+ assertEquals(idsNumber, challengeIds.size());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/DateTextFieldTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/DateTextFieldTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/DateTextFieldTest.java
index 2a1b8f7..23a9296 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/DateTextFieldTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/DateTextFieldTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.extensions.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import java.util.Date;
import org.apache.wicket.MarkupContainer;
@@ -28,17 +31,13 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
/**
*
*/
public class DateTextFieldTest extends WicketTestCase
{
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
/**
* https://issues.apache.org/jira/browse/WICKET-5286
@@ -46,7 +45,8 @@ public class DateTextFieldTest extends WicketTestCase
@Test
public void validInputType()
{
- String[] validInputTypes = { "text", "date", "datetime", "datetime-local", "month", "time", "week"};
+ String[] validInputTypes = { "text", "date", "datetime", "datetime-local", "month", "time",
+ "week" };
for (String validType : validInputTypes)
{
@@ -63,11 +63,13 @@ public class DateTextFieldTest extends WicketTestCase
{
TestPage testPage = new TestPage("unsupportedType");
- expectedException.expect(MarkupException.class);
- expectedException.expectMessage("Component [text] (path = [0:form:text]) must be applied to a tag" +
- " with [type] attribute matching any of [text, date, datetime, datetime-local, month, time, week], " +
- "not [unsupportedType]");
- tester.startPage(testPage);
+ Exception e = assertThrows(MarkupException.class, () -> {
+ tester.startPage(testPage);
+ });
+
+ assertEquals("Component [text] (path = [0:form:text]) must be applied to a tag" +
+ " with [type] attribute matching any of [text, date, datetime, datetime-local, month, time, week], " +
+ "not [unsupportedType]", e.getMessage());
}
/** */
@@ -88,10 +90,11 @@ public class DateTextFieldTest extends WicketTestCase
@Override
public IResourceStream getMarkupResourceStream(MarkupContainer container,
- Class<?> containerClass)
+ Class<?> containerClass)
{
- return new StringResourceStream(String.format("<html><body>"
- + "<form wicket:id=\"form\"><input wicket:id=\"text\" type=\"%s\"/></form></body></html>", inputType));
+ return new StringResourceStream(String.format("<html><body>" +
+ "<form wicket:id=\"form\"><input wicket:id=\"text\" type=\"%s\"/></form></body></html>",
+ inputType));
}
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/DateTimeFieldTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/DateTimeFieldTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/DateTimeFieldTest.java
index 8296ad6..22c6909 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/DateTimeFieldTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/DateTimeFieldTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.extensions.markup.html.form.datetime;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
@@ -31,17 +34,13 @@ import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link LocalDateTimeField}.
*/
public class DateTimeFieldTest extends WicketTestCase
{
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
@Test
public void dateTimeNull()
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTextFieldTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTextFieldTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTextFieldTest.java
index 0026e7f..65c25fd 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTextFieldTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTextFieldTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.extensions.markup.html.form.datetime;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import java.time.LocalDate;
import org.apache.wicket.MarkupContainer;
@@ -27,7 +30,7 @@ import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link LocalDateTextField}.
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/TimeFieldTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/TimeFieldTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/TimeFieldTest.java
index 1d698b0..0191183 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/TimeFieldTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/TimeFieldTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.wicket.extensions.markup.html.form.datetime;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import java.time.LocalTime;
import org.apache.wicket.MarkupContainer;
@@ -27,7 +31,7 @@ import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link TimeField}.
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedToLocalDateTimeModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedToLocalDateTimeModelTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedToLocalDateTimeModelTest.java
index 76caf09..ef83cb6 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedToLocalDateTimeModelTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedToLocalDateTimeModelTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.extensions.markup.html.form.datetime;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.time.LocalDateTime;
import java.time.ZoneId;
@@ -24,7 +24,7 @@ import java.time.ZonedDateTime;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link ZonedToLocalDateTimeModel}.
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTest.java
index 5bb3a4e..c20676e 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.extensions.markup.html.form.palette;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -30,7 +33,7 @@ import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.ValidationError;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link Palette}.
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTest.java
index 640efb3..6bb79d2 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTest.java
@@ -16,8 +16,11 @@
*/
package org.apache.wicket.extensions.markup.html.form.select;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link Select}.
@@ -27,12 +30,10 @@ public class SelectTest extends WicketTestCase
/**
* WICKET-4276
- *
- * @throws Exception
- */
+ *
+ */
@Test
- public void rawInputKeepsSelectionOnError() throws Exception
- {
+ public void rawInputKeepsSelectionOnError() {
SelectTestPage page = new SelectTestPage();
tester.startPage(page);
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResourceTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResourceTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResourceTest.java
index 1e28a69..03d142c 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResourceTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResourceTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.extensions.markup.html.image.resource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -25,8 +27,7 @@ import javax.imageio.ImageIO;
import org.apache.wicket.markup.html.image.resource.DefaultButtonImageResource;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* @author Pedro Santos
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java
index 74d6e1d..8570cd6 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.extensions.markup.html.repeater.data.table;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -34,9 +37,8 @@ import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
*
@@ -46,34 +48,32 @@ public class DataTableTest extends WicketTestCase
/**
*
*/
- @Before
+ @BeforeEach
public void before()
{
tester = new WicketTester(new RepeaterApplication());
}
/**
- * @throws Exception
*/
@Test
- public void test_1() throws Exception
- {
+ public void test_1() {
tester.startPage(DataTablePage.class);
tester.assertRenderedPage(DataTablePage.class);
String document = tester.getLastResponseAsString();
int index = document.indexOf("<thead");
- assertTrue("Expected at least on <thead>", index != -1);
+ assertTrue(index != -1, "Expected at least on <thead>");
index = document.indexOf("<thead", index + 1);
- assertTrue("There must be only one <thead>", index == -1);
+ assertTrue(index == -1, "There must be only one <thead>");
index = document.indexOf("<tbody");
- assertTrue("Expected at least on <tbody>", index != -1);
+ assertTrue(index != -1, "Expected at least on <tbody>");
index = document.indexOf("<tbody", index + 1);
- assertTrue("There must be only one <tbody>", index == -1);
+ assertTrue(index == -1, "There must be only one <tbody>");
index = document.indexOf("<caption", index + 1);
- assertTrue("There must be not be <caption>", index == -1);
+ assertTrue(index == -1, "There must be not be <caption>");
}
/**
@@ -87,14 +87,14 @@ public class DataTableTest extends WicketTestCase
parameters.add("empty", Boolean.TRUE);
tester.startPage(Wicket3603Page.class, parameters);
// System.err.println(tester.getLastResponseAsString());
- Assert.assertTrue(tester.getLastResponseAsString().contains("thead"));
- Assert.assertTrue(tester.getLastResponseAsString().contains("tfoot"));
+ assertTrue(tester.getLastResponseAsString().contains("thead"));
+ assertTrue(tester.getLastResponseAsString().contains("tfoot"));
parameters.set("empty", Boolean.FALSE);
tester.startPage(Wicket3603Page.class);
// System.err.println(tester.getLastResponseAsString());
- Assert.assertFalse(tester.getLastResponseAsString().contains("thead"));
- Assert.assertFalse(tester.getLastResponseAsString().contains("tfoot"));
+ assertFalse(tester.getLastResponseAsString().contains("thead"));
+ assertFalse(tester.getLastResponseAsString().contains("tfoot"));
}
/**
@@ -118,7 +118,7 @@ public class DataTableTest extends WicketTestCase
String document = tester.getLastResponseAsString();
int index = document.indexOf("<caption wicket:id=\"caption\">Caption</caption>");
- assertTrue("Caption must be rendered!", index > -1);
+ assertTrue(index > -1, "Caption must be rendered!");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/CSVDataExporterTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/CSVDataExporterTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/CSVDataExporterTest.java
index 09a2061..59bef5b 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/CSVDataExporterTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/CSVDataExporterTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.extensions.markup.html.repeater.data.table.export;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.ArrayList;
@@ -28,8 +30,8 @@ import org.apache.wicket.markup.repeater.data.IDataProvider;
import org.apache.wicket.markup.repeater.data.ListDataProvider;
import org.apache.wicket.model.Model;
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;
/**
* Test for {@link CSVDataExporter}.
@@ -39,7 +41,7 @@ public class CSVDataExporterTest extends WicketTestCase
private List<Contact> contacts;
- @Before
+ @BeforeEach
public void before() {
contacts = Arrays.asList(new Contact(), new Contact());
contacts.get(0).setFirstName("first0");
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTest.java
index 4dd1772..d939cc6 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTest.java
@@ -17,7 +17,7 @@
package org.apache.wicket.extensions.markup.html.repeater.data.table.filter;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FilterFormTest extends WicketTestCase
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeBorderTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeBorderTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeBorderTest.java
index a8c5eea..404f3a4 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeBorderTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeBorderTest.java
@@ -18,7 +18,7 @@ package org.apache.wicket.extensions.markup.html.repeater.tree.table;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link NodeBorder}.
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeModelTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeModelTest.java
index 221c8ba..6d589bf 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeModelTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeModelTest.java
@@ -16,16 +16,18 @@
*/
package org.apache.wicket.extensions.markup.html.repeater.tree.table;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
import org.apache.wicket.model.IModel;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link NodeModel}.
*
* @author svenmeier
*/
-public class NodeModelTest extends Assert
+public class NodeModelTest
{
/**
* Test equality.
@@ -33,17 +35,15 @@ public class NodeModelTest extends Assert
@Test
public void equality()
{
- NodeModel<String> model = new NodeModel<String>(new StringModel("A"), new boolean[] { true,
- false });
+ NodeModel<String> model = new NodeModel<>(new StringModel("A"),
+ new boolean[] { true, false });
- assertTrue(model.equals(new NodeModel<String>(new StringModel("A"), new boolean[] { true,
- false })));
+ assertEquals(model, new NodeModel<>(new StringModel("A"), new boolean[] { true, false }));
- assertFalse(model.equals(new NodeModel<String>(new StringModel("A"), new boolean[] { true,
- true })));
+ assertNotEquals(model, new NodeModel<>(new StringModel("A"), new boolean[] { true, true }));
- assertFalse(model.equals(new NodeModel<String>(new StringModel("B"), new boolean[] { true,
- false })));
+ assertNotEquals(model,
+ new NodeModel<>(new StringModel("B"), new boolean[] { true, false }));
}
private class StringModel implements IModel<String>
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProviderTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProviderTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProviderTest.java
index 6d36904..e2834d0 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProviderTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProviderTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.extensions.markup.html.repeater.tree.table;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
@@ -24,13 +27,12 @@ import java.util.List;
import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;
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 for {@link TreeDataProvider}.
*/
-public class TreeDataProviderTest extends Assert
+public class TreeDataProviderTest
{
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubsetTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubsetTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubsetTest.java
index dc1bac9..9efec01 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubsetTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubsetTest.java
@@ -16,6 +16,11 @@
*/
package org.apache.wicket.extensions.markup.html.repeater.util;
+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 static org.junit.jupiter.api.Assertions.fail;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
@@ -23,15 +28,14 @@ import java.util.List;
import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;
import org.apache.wicket.model.IModel;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link ProviderSubset}.
*
* @author svenmeier
*/
-public class ProviderSubsetTest extends Assert
+public class ProviderSubsetTest
{
private ITreeProvider<String> provider = new EmptyProvider();
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProviderTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProviderTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProviderTest.java
index 4f86372..4a25709 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProviderTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProviderTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.wicket.extensions.markup.html.repeater.util;
+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 java.util.Iterator;
import javax.swing.tree.DefaultMutableTreeNode;
@@ -24,15 +28,14 @@ import javax.swing.tree.MutableTreeNode;
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 for {@link TreeModelProvider}.
*
* @author svenmeier
*/
-public class TreeModelProviderTest extends Assert
+public class TreeModelProviderTest
{
private DefaultMutableTreeNode root;
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelTest.java
index b6b6070..9204061 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.extensions.markup.html.tabs;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.ArrayList;
import java.util.List;
@@ -25,7 +27,7 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
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 {@link TabbedPanel}.
@@ -95,12 +97,10 @@ public class TabbedPanelTest extends WicketTestCase
/**
* No tabs thus no tab component rendered.
- *
- * @throws Exception
- */
+ *
+ */
@Test
- public void renderNoTabs() throws Exception
- {
+ public void renderNoTabs() {
TestPage page = new TestPage();
page.tabbedPanel.getTabs().clear();
tester.startPage(page);
@@ -116,12 +116,10 @@ public class TabbedPanelTest extends WicketTestCase
/**
* Switching between tabsS.
- *
- * @throws Exception
- */
+ *
+ */
@Test
- public void renderDefaultTabsOnly() throws Exception
- {
+ public void renderDefaultTabsOnly() {
TestPage page = tester.startPage(new TestPage());
tester.assertContains("<span wicket:id=\"title\">default 1</span></a>");
tester.assertContains("<span wicket:id=\"label\">default 1</span>");
@@ -137,12 +135,10 @@ public class TabbedPanelTest extends WicketTestCase
/**
* Additional tabs are rendered.
- *
- * @throws Exception
- */
+ *
+ */
@Test
- public void renderAdditionalTabs() throws Exception
- {
+ public void renderAdditionalTabs() {
TestPage page = tester.startPage(new TestPage());
page.tabbedPanel.getTabs().add(new AbstractTab(Model.of("added 1"))
{
@@ -177,12 +173,10 @@ public class TabbedPanelTest extends WicketTestCase
/**
* Changing model switches tab.
- *
- * @throws Exception
- */
+ *
+ */
@Test
- public void renderModelChange() throws Exception
- {
+ public void renderModelChange() {
TestPage page = new TestPage();
tester.startPage(page);
@@ -196,12 +190,10 @@ public class TabbedPanelTest extends WicketTestCase
/**
* Tab's component is aquired once only.
- *
- * @throws Exception
- */
+ *
+ */
@Test
- public void tabComponentAquiredOnChangeOnly() throws Exception
- {
+ public void tabComponentAquiredOnChangeOnly() {
final int[] count = new int[1];
@@ -235,12 +227,10 @@ public class TabbedPanelTest extends WicketTestCase
/**
* An invisible tab gets replaced by another one.
- *
- * @throws Exception
+ *
*/
@Test
- public void invisibleTabGetsReplaced() throws Exception
- {
+ public void invisibleTabGetsReplaced() {
final boolean[] visible = { true, true };
TestPage page = new TestPage();
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelVisibilityTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelVisibilityTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelVisibilityTest.java
index 67bb4a4..7d27f41 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelVisibilityTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelVisibilityTest.java
@@ -16,11 +16,13 @@
*/
package org.apache.wicket.extensions.markup.html.tabs;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.List;
import org.apache.wicket.util.tester.TagTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for visibility of {@link ITab}s in a {@link TabbedPanel}.
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/upload/UploadFormWithProgressBarTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/upload/UploadFormWithProgressBarTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/upload/UploadFormWithProgressBarTest.java
index dcd9927..689c538 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/upload/UploadFormWithProgressBarTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/upload/UploadFormWithProgressBarTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.extensions.markup.html.upload;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.extensions.ajax.markup.html.form.upload.UploadProgressBar;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
@@ -26,7 +28,7 @@ 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;
/**
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java
index f56d199..eeb0d01 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java
@@ -16,17 +16,19 @@
*/
package org.apache.wicket.extensions.validation.validator;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.Validatable;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test that it really validates RFC valid email addresses.
*
* @author Frank Bille
*/
-public class RfcCompliantEmailValidatorTest extends Assert
+public class RfcCompliantEmailValidatorTest
{
/**
* Test a couple of valid email addresses.
@@ -45,7 +47,7 @@ public class RfcCompliantEmailValidatorTest extends Assert
{
Validatable<String> validatable = new Validatable<>(emailAddress);
validator.validate(validatable);
- assertTrue(emailAddress + " wasn't valid but should be", validatable.isValid());
+ assertTrue(validatable.isValid(), emailAddress + " wasn't valid but should be");
}
}
@@ -66,7 +68,7 @@ public class RfcCompliantEmailValidatorTest extends Assert
{
Validatable<String> validatable = new Validatable<>(emailAddress);
validator.validate(validatable);
- assertFalse(emailAddress + " was valid but shouldn't be", validatable.isValid());
+ assertFalse(validatable.isValid(), emailAddress + " was valid but shouldn't be");
}
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/WizardModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/WizardModelTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/WizardModelTest.java
index 38d502c..a811bfc 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/WizardModelTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/WizardModelTest.java
@@ -16,11 +16,18 @@
*/
package org.apache.wicket.extensions.wizard;
+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.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.util.Iterator;
import org.apache.wicket.extensions.wizard.WizardModel.ICondition;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link WizardModel}.
@@ -69,7 +76,7 @@ public class WizardModelTest extends WicketTestCase
return false;
}
- };
+ }
WizardStep step3 = new ConditionWizadStep();
model.add(step3);
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardModelTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardModelTest.java
index 0366b5a..46a1ddb 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardModelTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardModelTest.java
@@ -16,8 +16,13 @@
*/
package org.apache.wicket.extensions.wizard.dynamic;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link DynamicWizardModel}.
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java b/wicket-extensions/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java
index a8e7628..88d9025 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.util.markup.xhtml;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Checks that the html markup files are well formed xml-s.
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-guice/src/test/java/org/apache/wicket/guice/AbstractInjectorTest.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/test/java/org/apache/wicket/guice/AbstractInjectorTest.java b/wicket-guice/src/test/java/org/apache/wicket/guice/AbstractInjectorTest.java
index cc71e12..741effd 100644
--- a/wicket-guice/src/test/java/org/apache/wicket/guice/AbstractInjectorTest.java
+++ b/wicket-guice/src/test/java/org/apache/wicket/guice/AbstractInjectorTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.guice;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.lang.annotation.Annotation;
import java.util.HashMap;
import java.util.Map;
@@ -30,10 +32,9 @@ import org.apache.wicket.mock.MockWebRequest;
import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.protocol.http.mock.MockServletContext;
import org.apache.wicket.request.Url;
-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;
import com.google.inject.Binder;
import com.google.inject.Module;
@@ -43,7 +44,7 @@ import com.google.inject.name.Names;
/**
*/
-public abstract class AbstractInjectorTest extends Assert
+public abstract class AbstractInjectorTest
{
protected abstract TestNoComponentInterface newTestNoComponent();
@@ -52,7 +53,7 @@ public abstract class AbstractInjectorTest extends Assert
private final MockApplication app = new MockApplication();
- @Before
+ @BeforeEach
public void before()
{
app.setServletContext(new MockServletContext(app, null));
@@ -72,12 +73,8 @@ public abstract class AbstractInjectorTest extends Assert
public void configure(final Binder binder)
{
binder.bind(ITestService.class).to(TestService.class);
- binder.bind(ITestService.class)
- .annotatedWith(Red.class)
- .to(TestServiceRed.class);
- binder.bind(ITestService.class)
- .annotatedWith(Blue.class)
- .to(TestServiceBlue.class);
+ binder.bind(ITestService.class).annotatedWith(Red.class).to(TestServiceRed.class);
+ binder.bind(ITestService.class).annotatedWith(Blue.class).to(TestServiceBlue.class);
binder.bind(new TypeLiteral<Map<String, String>>()
{
}).toProvider(new Provider<Map<String, String>>()
@@ -93,19 +90,23 @@ public abstract class AbstractInjectorTest extends Assert
}
});
- binder.bind(String.class).annotatedWith(Names.named("named1")).toInstance("NAMED_1");
- binder.bind(String.class).annotatedWith(Names.named("named2")).toInstance("NAMED_2");
+ binder.bind(String.class).annotatedWith(Names.named("named1")).toInstance(
+ "NAMED_1");
+ binder.bind(String.class).annotatedWith(Names.named("named2")).toInstance(
+ "NAMED_2");
- binder.bind(String.class).annotatedWith(new Jsr330Named("named1")).toInstance("NAMED_1");
- binder.bind(String.class).annotatedWith(new Jsr330Named("named2")).toInstance("NAMED_2");
+ binder.bind(String.class).annotatedWith(new Jsr330Named("named1")).toInstance(
+ "NAMED_1");
+ binder.bind(String.class).annotatedWith(new Jsr330Named("named2")).toInstance(
+ "NAMED_2");
binder.bind(EvilTestService.class).toInstance(new EvilTestService("evil123", 5));
- }
+ }
});
app.getComponentInstantiationListeners().add(injector);
}
- @After
+ @AfterEach
public void after()
{
app.internalDestroy();
@@ -124,7 +125,8 @@ public abstract class AbstractInjectorTest extends Assert
doChecksForComponent(testComponent);
// Serialize and deserialize the object, and check it still works.
- TestComponentInterface clonedComponent = (TestComponentInterface)WicketObjects.cloneObject(testComponent);
+ TestComponentInterface clonedComponent = WicketObjects
+ .cloneObject(testComponent);
doChecksForComponent(clonedComponent);
// Test injection of a class that does not extend Component
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceFieldValueFactoryTest.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceFieldValueFactoryTest.java b/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceFieldValueFactoryTest.java
index ba0a76c..9ae355b 100644
--- a/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceFieldValueFactoryTest.java
+++ b/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceFieldValueFactoryTest.java
@@ -16,9 +16,11 @@
*/
package org.apache.wicket.guice;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import java.lang.reflect.Field;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for GuiceFieldValueFactory
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceWebApplicationFactoryTest.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceWebApplicationFactoryTest.java b/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceWebApplicationFactoryTest.java
index 3bfddb3..6bcf58a 100644
--- a/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceWebApplicationFactoryTest.java
+++ b/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceWebApplicationFactoryTest.java
@@ -21,12 +21,13 @@ import java.util.Enumeration;
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
-import com.google.inject.AbstractModule;
import org.apache.wicket.Page;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.protocol.http.WicketFilter;
import org.apache.wicket.protocol.http.mock.MockServletContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import com.google.inject.AbstractModule;
/**
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectGuiceInjectorTest.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectGuiceInjectorTest.java b/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectGuiceInjectorTest.java
index 1ea6598..7350d0a 100644
--- a/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectGuiceInjectorTest.java
+++ b/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectGuiceInjectorTest.java
@@ -16,17 +16,17 @@
*/
package org.apache.wicket.guice;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import javax.inject.Inject;
import org.apache.wicket.ajax.attributes.IAjaxCallListener;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import com.google.inject.ConfigurationException;
import com.google.inject.spi.Message;
-import javax.inject.Inject;
-
/**
*/
public class JavaxInjectGuiceInjectorTest extends AbstractInjectorTest
@@ -62,20 +62,25 @@ public class JavaxInjectGuiceInjectorTest extends AbstractInjectorTest
catch (ConfigurationException cx)
{
Message message = cx.getErrorMessages().iterator().next();
- assertThat(message.getMessage(), is(equalTo("No implementation for org.apache.wicket.ajax.attributes.IAjaxCallListener was bound.")));
+ assertEquals(
+ "No implementation for org.apache.wicket.ajax.attributes.IAjaxCallListener was bound.",
+ message.getMessage());
}
}
- private static class MyJavaxInjectWithNonExistingTestComponent extends JavaxInjectTestComponent {
+ private static class MyJavaxInjectWithNonExistingTestComponent extends JavaxInjectTestComponent
+ {
@Inject
private IAjaxCallListener nonExisting;
- public MyJavaxInjectWithNonExistingTestComponent() {
+ public MyJavaxInjectWithNonExistingTestComponent()
+ {
super("id");
}
- public IAjaxCallListener getNonExisting() {
+ public IAjaxCallListener getNonExisting()
+ {
return nonExisting;
}
}
[20/45] wicket git commit: wicket-core: Migrate to Junit 5
Posted by mg...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormSubmitTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormSubmitTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormSubmitTest.java
index 631865e..350d843 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormSubmitTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormSubmitTest.java
@@ -16,19 +16,21 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.After;
-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;
-public class NestedFormSubmitTest extends WicketTestCase
+class NestedFormSubmitTest extends WicketTestCase
{
- public class TestForm<S> extends Form<S>
+ class TestForm<S> extends Form<S>
{
private final IModel<Boolean> submitted;
private final Button submit;
@@ -66,15 +68,15 @@ public class NestedFormSubmitTest extends WicketTestCase
}
}
- public class TestPage extends WebPage
+ class TestPage extends WebPage
{
private final TestForm<?> outer;
private final TestForm<?> middle;
private final TestForm<?> inner;
- public TestPage(IModel<Boolean> submittedOuter, boolean outerWantsInclusion,
- IModel<Boolean> submittedMiddle, boolean middleWantsInclusion,
- boolean middleWantsExclusion, IModel<Boolean> submittedInner)
+ TestPage(IModel<Boolean> submittedOuter, boolean outerWantsInclusion,
+ IModel<Boolean> submittedMiddle, boolean middleWantsInclusion,
+ boolean middleWantsExclusion, IModel<Boolean> submittedInner)
{
outer = new TestForm<Void>("outer", submittedOuter, outerWantsInclusion, true);
this.add(outer);
@@ -91,16 +93,16 @@ public class NestedFormSubmitTest extends WicketTestCase
private Model<Boolean> submittedInner;
private TestPage page;
- @Before
- public void setUp() throws Exception
+ @BeforeEach
+ void setUp() throws Exception
{
submittedOuter = Model.of(false);
submittedMiddle = Model.of(false);
submittedInner = Model.of(false);
}
- @After
- public void tearDown() throws Exception
+ @AfterEach
+ void tearDown() throws Exception
{
submittedInner.setObject(false);
submittedMiddle.setObject(false);
@@ -134,55 +136,55 @@ public class NestedFormSubmitTest extends WicketTestCase
private void assertFormsAreSubmitted(boolean expectSubmittedOuter,
boolean expectSubmittedMiddle, boolean expectSubmittedInner)
{
- assertEquals("outer", expectSubmittedOuter, submittedOuter.getObject().booleanValue());
- assertEquals("middle", expectSubmittedMiddle, submittedMiddle.getObject().booleanValue());
- assertEquals("inner", expectSubmittedInner, submittedInner.getObject().booleanValue());
+ assertEquals(expectSubmittedOuter, submittedOuter.getObject().booleanValue(), "outer");
+ assertEquals(expectSubmittedMiddle, submittedMiddle.getObject().booleanValue(), "middle");
+ assertEquals(expectSubmittedInner, submittedInner.getObject().booleanValue(), "inner");
}
@Test
- public void testDefaultOuterSubmitShouldSubmitAll() throws Exception
+ void testDefaultOuterSubmitShouldSubmitAll() throws Exception
{
startPage(false, false, true);
assertFormSubmitOuter(true, true, true);
}
@Test
- public void testDefaultMiddleSubmitShouldSubmitMiddleAndInner() throws Exception
+ void testDefaultMiddleSubmitShouldSubmitMiddleAndInner() throws Exception
{
startPage(false, false, true);
assertFormSubmitMiddle(false, true, true);
}
@Test
- public void testDefaultInnerSubmitShouldSubmitOnlyInner() throws Exception
+ void testDefaultInnerSubmitShouldSubmitOnlyInner() throws Exception
{
startPage(false, false, true);
assertFormSubmitInner(false, false, true);
}
@Test
- public void testWithOuterInclusionOuterIsSubmittedOnMiddleSubmit() throws Exception
+ void testWithOuterInclusionOuterIsSubmittedOnMiddleSubmit() throws Exception
{
startPage(true, false, true);
assertFormSubmitMiddle(true, true, true);
}
@Test
- public void testWithOuterInclusionOuterIsSubmittedOnInnerSubmit() throws Exception
+ void testWithOuterInclusionOuterIsSubmittedOnInnerSubmit() throws Exception
{
startPage(true, false, true);
assertFormSubmitInner(true, true, true);
}
@Test
- public void testWithMiddleInclusionMiddleIsSubmittedOnInnerSubmit() throws Exception
+ void testWithMiddleInclusionMiddleIsSubmittedOnInnerSubmit() throws Exception
{
startPage(false, true, true);
assertFormSubmitInner(false, true, true);
}
@Test
- public void testWithMiddleAndOuterInclusionMiddleAndOuterIsSubmittedOnInnerSubmit()
+ void testWithMiddleAndOuterInclusionMiddleAndOuterIsSubmittedOnInnerSubmit()
throws Exception
{
startPage(true, true, true);
@@ -190,7 +192,7 @@ public class NestedFormSubmitTest extends WicketTestCase
}
@Test
- public void testWithMiddleExclusionAndOuterIsSubmitted() throws Exception
+ void testWithMiddleExclusionAndOuterIsSubmitted() throws Exception
{
startPage(false, false, false);
assertFormSubmitOuter(true, false, false);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsPage.java
index 494894f..8b056eb 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsPage.java
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
public class NestedFormsPage extends WebPage
{
private static final long serialVersionUID = 1L;
- static Logger logger = LoggerFactory.getLogger(NestedFormsPage.class);
+ private static Logger logger = LoggerFactory.getLogger(NestedFormsPage.class);
private final FeedbackPanel feedback;
@@ -83,7 +83,7 @@ public class NestedFormsPage extends WebPage
* @param id
* the form's id
*/
- public NestableForm(String id)
+ NestableForm(String id)
{
super(id);
setDefaultModel(new CompoundPropertyModel<NestableForm>(this));
@@ -139,7 +139,7 @@ public class NestedFormsPage extends WebPage
private final Form<?> form;
- public ToggleLink(String id, Form<?> form)
+ ToggleLink(String id, Form<?> form)
{
super(id);
this.form = form;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsTest.java
index 6b5b8c4..856d3f0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.ArrayList;
import java.util.List;
@@ -27,18 +29,18 @@ import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
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 Pedro Santos
*/
-public class NestedFormsTest extends WicketTestCase
+class NestedFormsTest extends WicketTestCase
{
/**
*
*/
@Test
- public void postOrderSequenceSubmittingRootForm()
+ void postOrderSequenceSubmittingRootForm()
{
tester.startPage(TestPage.class);
TestPage testPage = (TestPage)tester.getLastRenderedPage();
@@ -54,7 +56,7 @@ public class NestedFormsTest extends WicketTestCase
*
*/
@Test
- public void postOrderSequenceSubmittingInnerForm()
+ void postOrderSequenceSubmittingInnerForm()
{
tester.startPage(TestPage.class);
TestPage testPage = (TestPage)tester.getLastRenderedPage();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NumberTextFieldTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NumberTextFieldTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NumberTextFieldTest.java
index 04418ac..9bcb41d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NumberTextFieldTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NumberTextFieldTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.math.BigDecimal;
import java.util.Locale;
@@ -27,21 +30,21 @@ import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link NumberTextField}.
*
* @author svenmeier
*/
-public class NumberTextFieldTest extends WicketTestCase
+class NumberTextFieldTest extends WicketTestCase
{
/**
* WICKET-4884, WICKET-3591
*/
@Test
- public void convertBigDecimal()
+ void convertBigDecimal()
{
TestPage<BigDecimal> testPage = new TestPage<>();
testPage.textField.setType(BigDecimal.class);
@@ -63,7 +66,7 @@ public class NumberTextFieldTest extends WicketTestCase
* WICKET-4884, WICKET-3591
*/
@Test
- public void convertDouble()
+ void convertDouble()
{
TestPage<Double> testPage = new TestPage<Double>();
testPage.textField.setType(Double.class);
@@ -85,7 +88,7 @@ public class NumberTextFieldTest extends WicketTestCase
* WICKET-4884, WICKET-3591
*/
@Test
- public void convertLong()
+ void convertLong()
{
TestPage<Long> testPage = new TestPage<Long>();
testPage.textField.setType(Long.class);
@@ -107,7 +110,7 @@ public class NumberTextFieldTest extends WicketTestCase
* WICKET-5467
*/
@Test
- public void respectStepAny()
+ void respectStepAny()
{
TestPage<Double> testPage = new TestPage<Double>();
testPage.textField.setType(Double.class);
@@ -123,7 +126,7 @@ public class NumberTextFieldTest extends WicketTestCase
* WICKET-5467
*/
@Test
- public void respectStepWithNumberValue()
+ void respectStepWithNumberValue()
{
TestPage<Double> testPage = new TestPage<Double>();
testPage.textField.setType(Double.class);
@@ -149,7 +152,7 @@ public class NumberTextFieldTest extends WicketTestCase
NumberTextField<N> textField;
/** */
- public TestPage()
+ TestPage()
{
add(form = new Form<Void>("form")
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/OnValidateModelObjectsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/OnValidateModelObjectsTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/OnValidateModelObjectsTest.java
index ff2fc80..ac1098e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/OnValidateModelObjectsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/OnValidateModelObjectsTest.java
@@ -16,26 +16,26 @@
*/
package org.apache.wicket.markup.html.form;
-import static org.hamcrest.CoreMatchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.wicket.Page;
import org.apache.wicket.markup.html.form.onFormValidateModelObjects.AddressFormPanel;
import org.apache.wicket.markup.html.form.onFormValidateModelObjects.OnFormValidateModelObjectsPage;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test case for https://issues.apache.org/jira/browse/WICKET-4344
*/
-public class OnValidateModelObjectsTest extends WicketTestCase
+class OnValidateModelObjectsTest extends WicketTestCase
{
/**
* Asserts that submitting the outer form will call {@link Form#onValidateModelObjects()}
* for both the outer form and the inner form(s)
*/
@Test
- public void onValidateModelObjects()
+ void onValidateModelObjects()
{
tester.startPage(OnFormValidateModelObjectsPage.class);
FormTester formTester = tester.newFormTester("parentForm");
@@ -43,9 +43,9 @@ public class OnValidateModelObjectsTest extends WicketTestCase
Page page = tester.getLastRenderedPage();
OnFormValidateModelObjectsPage.ParentModel parentModel = (OnFormValidateModelObjectsPage.ParentModel) page.getDefaultModelObject();
- assertThat(parentModel.isParentValidated(), is(true));
+ assertEquals(true, parentModel.isParentValidated());
AddressFormPanel.ChildModel childPanel = (AddressFormPanel.ChildModel) page.get("parentForm:addressInfo").getDefaultModelObject();
- assertThat(childPanel.isChildValidated(), is(true));
+ assertEquals(true, childPanel.isChildValidated());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/PasswordTextFieldTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/PasswordTextFieldTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/PasswordTextFieldTest.java
index 9b93fcc..53d4951 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/PasswordTextFieldTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/PasswordTextFieldTest.java
@@ -16,20 +16,24 @@
*/
package org.apache.wicket.markup.html.form;
+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 org.apache.wicket.model.IModel;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link PasswordTextField}.
*
* @author svenmeier
*/
-public class PasswordTextFieldTest extends WicketTestCase
+class PasswordTextFieldTest extends WicketTestCase
{
@Test
- public void nullifyPassword()
+ void nullifyPassword()
{
TestModel model = new TestModel();
@@ -42,7 +46,7 @@ public class PasswordTextFieldTest extends WicketTestCase
}
@Test
- public void nullifyPasswordOnNullModel()
+ void nullifyPasswordOnNullModel()
{
PasswordTextField field = new PasswordTextField("password");
field.setVisible(false);
@@ -53,7 +57,7 @@ public class PasswordTextFieldTest extends WicketTestCase
@Test
- public void nullifyNoReset()
+ void nullifyNoReset()
{
TestModel model = new TestModel();
@@ -68,9 +72,9 @@ public class PasswordTextFieldTest extends WicketTestCase
private class TestModel implements IModel<String>
{
- public boolean detached;
+ boolean detached;
- public String password = "test";
+ String password = "test";
@Override
public String getObject()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/PrimitiveTypeRequiredTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/PrimitiveTypeRequiredTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/PrimitiveTypeRequiredTest.java
index db1520a..0b7862c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/PrimitiveTypeRequiredTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/PrimitiveTypeRequiredTest.java
@@ -16,22 +16,24 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* @author jcompagner
*/
-public class PrimitiveTypeRequiredTest extends WicketTestCase
+class PrimitiveTypeRequiredTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void primitiveClass() throws Exception
+ void primitiveClass() throws Exception
{
TextField<Integer> tf = new TextField<Integer>("test", int.class);
assertTrue(tf.isRequired());
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioChoiceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioChoiceTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioChoiceTest.java
index c5e4897..02e1184 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioChoiceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioChoiceTest.java
@@ -19,12 +19,12 @@ package org.apache.wicket.markup.html.form;
import java.util.Arrays;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class RadioChoiceTest extends WicketTestCase
+class RadioChoiceTest extends WicketTestCase
{
@Test
- public void defaultLabelPositionIsAfter() throws Exception
+ void defaultLabelPositionIsAfter() throws Exception
{
RadioChoice<Integer> radioChoice = new RadioChoice<Integer>("testid", Arrays.asList(1));
tester.startComponentInPage(radioChoice);
@@ -33,7 +33,7 @@ public class RadioChoiceTest extends WicketTestCase
}
@Test
- public void labelPositionBefore() throws Exception
+ void labelPositionBefore() throws Exception
{
RadioChoice<Integer> radioChoice = new RadioChoice<Integer>("testid", Arrays.asList(1));
radioChoice.setLabelPosition(AbstractChoice.LabelPosition.BEFORE);
@@ -43,7 +43,7 @@ public class RadioChoiceTest extends WicketTestCase
}
@Test
- public void labelPositionWrapBefore() throws Exception
+ void labelPositionWrapBefore() throws Exception
{
RadioChoice<Integer> radioChoice = new RadioChoice<Integer>("testid", Arrays.asList(1));
radioChoice.setLabelPosition(AbstractChoice.LabelPosition.WRAP_BEFORE);
@@ -53,7 +53,7 @@ public class RadioChoiceTest extends WicketTestCase
}
@Test
- public void labelPositionWrapAfter() throws Exception
+ void labelPositionWrapAfter() throws Exception
{
RadioChoice<Integer> radioChoice = new RadioChoice<Integer>("testid", Arrays.asList(1));
radioChoice.setLabelPosition(AbstractChoice.LabelPosition.WRAP_AFTER);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
index 6165a02..c8bbaa9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
@@ -16,11 +16,14 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.wicket.WicketRuntimeException;
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 RadioGroup and Radio components
@@ -28,13 +31,13 @@ import org.junit.Test;
* @author igor
*
*/
-public class RadioGroupTest extends WicketTestCase
+class RadioGroupTest extends WicketTestCase
{
/**
* test component form processing
*/
@Test
- public void formProcessing()
+ void formProcessing()
{
// object used to test regular model
Model<String> model = new Model<String>();
@@ -46,24 +49,21 @@ public class RadioGroupTest extends WicketTestCase
tester.startPage(page);
tester.submitForm(page.form);
- assertTrue("group: running with nothing selected - model must be set to null",
- model.getObject() == null);
+ assertTrue(model.getObject() == null, "group: running with nothing selected - model must be set to null");
tester.getRequest()
.getPostParameters()
.setParameterValue(page.group.getInputName(), page.radio1.getValue());
tester.submitForm(page.form);
- assertEquals("group: running with choice1 selected - model must be set to value of radio1",
- model.getObject(), "radio1");
+ assertEquals("radio1", model.getObject(), "group: running with choice1 selected - model must be set to value of radio1");
tester.getRequest()
.getPostParameters()
.setParameterValue(page.group.getInputName(), page.radio2.getValue());
tester.submitForm(page.form);
- assertEquals("group: running with choice2 selected - model must be set to value of radio2",
- model.getObject(), "radio2");
+ assertEquals("radio2", model.getObject(), "group: running with choice2 selected - model must be set to value of radio2");
tester.getRequest()
.getPostParameters()
@@ -86,7 +86,7 @@ public class RadioGroupTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void rendering() throws Exception
+ void rendering() throws Exception
{
executeTest(RadioGroupTestPage1.class, "RadioGroupTestPage1_expected.html");
try
@@ -110,7 +110,7 @@ public class RadioGroupTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void radioGroupTestPage3() throws Exception
+ void radioGroupTestPage3() throws Exception
{
// this test fails. You can make the test pass by closing the input tags
// this was not the case in beta1
@@ -121,7 +121,7 @@ public class RadioGroupTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void disabledRadioGroup() throws Exception
+ void disabledRadioGroup() throws Exception
{
executeTest(RadioGroupDisabledTestPage.class, "RadioGroupDisabledTestPage_expected.html");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TestFormHasError.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TestFormHasError.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TestFormHasError.java
index a065110..6b81374 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TestFormHasError.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TestFormHasError.java
@@ -17,18 +17,18 @@
package org.apache.wicket.markup.html.form;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*/
-public class TestFormHasError extends WicketTestCase
+class TestFormHasError extends WicketTestCase
{
/**
* testFormHasError()
*/
@Test
- public void testFormHasError()
+ void testFormHasError()
{
tester.startPage(FormHasErrorPage.class);
tester.assertRenderedPage(FormHasErrorPage.class);
@@ -40,7 +40,7 @@ public class TestFormHasError extends WicketTestCase
* testFormComponentHasError()
*/
@Test
- public void testFormComponentHasError()
+ void testFormComponentHasError()
{
tester.startPage(FormHasErrorPage.class);
tester.assertRenderedPage(FormHasErrorPage.class);
@@ -52,7 +52,7 @@ public class TestFormHasError extends WicketTestCase
* testComponentHasError()
*/
@Test
- public void testComponentHasError()
+ void testComponentHasError()
{
tester.startPage(FormHasErrorPage.class);
tester.assertRenderedPage(FormHasErrorPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextAreaTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextAreaTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextAreaTest.java
index a75bcd3..daf5b26 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextAreaTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextAreaTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.html.HTML5Attributes;
@@ -26,18 +28,18 @@ import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.TagTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class TextAreaTest extends WicketTestCase
+class TextAreaTest extends WicketTestCase
{
/**
* https://issues.apache.org/jira/browse/WICKET-5289
*/
@Test
- public void requiredAttribute()
+ void requiredAttribute()
{
TestPage testPage = new TestPage();
testPage.textArea.setOutputMarkupId(true);
@@ -60,7 +62,7 @@ public class TextAreaTest extends WicketTestCase
IModel<String> textModel = Model.of((String)null);
/** */
- public TestPage()
+ TestPage()
{
add(form = new Form<>("form"));
form.add(textArea = new TextArea<>("textarea", textModel));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextFieldTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextFieldTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextFieldTest.java
index 5af5917..be0ca52 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextFieldTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextFieldTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.html.HTML5Attributes;
@@ -29,16 +32,16 @@ import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.TagTester;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.validation.validator.StringValidator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Pedro Santos
*/
-public class TextFieldTest extends WicketTestCase
+class TextFieldTest extends WicketTestCase
{
/** */
@Test
- public void emptyInputConvertedToNull()
+ void emptyInputConvertedToNull()
{
TestPage testPage = new TestPage();
testPage.textField.setType(String.class);
@@ -54,7 +57,7 @@ public class TextFieldTest extends WicketTestCase
* Asserting that the value attribute on tag input is escaped once by default
*/
@Test
- public void valueAttribute()
+ void valueAttribute()
{
TestPage testPage = new TestPage();
String text = "some text & another text";
@@ -67,7 +70,7 @@ public class TextFieldTest extends WicketTestCase
* Assert that null input is not validated.
*/
@Test
- public void nullIsNotValidated()
+ void nullIsNotValidated()
{
TestPage testPage = new TestPage();
testPage.textField.setType(String.class);
@@ -85,7 +88,7 @@ public class TextFieldTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-5289
*/
@Test
- public void requiredAttribute()
+ void requiredAttribute()
{
TestPage testPage = new TestPage();
testPage.textField.setOutputMarkupId(true);
@@ -108,7 +111,7 @@ public class TextFieldTest extends WicketTestCase
IModel<String> textModel = Model.of((String)null);
/** */
- public TestPage()
+ TestPage()
{
add(form = new Form<>("form"));
form.add(textField = new TextField<>("text", textModel));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java
index e4231c8..8ed791d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import java.util.Locale;
import java.util.MissingResourceException;
@@ -23,7 +26,7 @@ import org.apache.wicket.properties.MyApplication;
import org.apache.wicket.properties.TestPage;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
@@ -33,7 +36,7 @@ import org.junit.Test;
*
* @author Juergen Donnerstag
*/
-public class ValidatorPropertiesTest extends WicketTestCase
+class ValidatorPropertiesTest extends WicketTestCase
{
@Override
@@ -46,7 +49,7 @@ public class ValidatorPropertiesTest extends WicketTestCase
*
*/
@Test
- public void test1()
+ void test1()
{
tester.getSession().setLocale(Locale.ENGLISH);
@@ -296,7 +299,7 @@ public class ValidatorPropertiesTest extends WicketTestCase
*
*/
@Test
- public void test2()
+ void test2()
{
tester.getApplication().getResourceSettings().setThrowExceptionOnMissingResource(false);
@@ -311,7 +314,7 @@ public class ValidatorPropertiesTest extends WicketTestCase
*
*/
@Test
- public void test3()
+ void test3()
{
tester.getApplication().getResourceSettings().setThrowExceptionOnMissingResource(true);
@@ -324,6 +327,7 @@ public class ValidatorPropertiesTest extends WicketTestCase
{
hit = true;
}
- assertEquals("MissingResourceException expected", hit, true);
+
+ assertEquals(true, hit, "MissingResourceException expected");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage.java
index aa909bf..b3c5f91 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage.java
@@ -16,22 +16,24 @@
*/
package org.apache.wicket.markup.html.form.border;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.util.tester.FormTester;
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;
/**
* Simple test using the WicketTester
*/
-public class TestHomePage extends WicketTestCase
+class TestHomePage extends WicketTestCase
{
/**
*
*/
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
// Start and render the test page
tester.startPage(HomePage.class);
@@ -39,7 +41,7 @@ public class TestHomePage extends WicketTestCase
}
@Test
- public void testWithBorder2()
+ void testWithBorder2()
{
FormTester formTester = tester.newFormTester("border:form");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage_2134.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage_2134.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage_2134.java
index 72dcf83..e93f4d4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage_2134.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage_2134.java
@@ -16,20 +16,22 @@
*/
package org.apache.wicket.markup.html.form.border;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Simple test using the WicketTester
*/
-public class TestHomePage_2134 extends WicketTestCase
+class TestHomePage_2134 extends WicketTestCase
{
/**
* WICKET-2134: two forms inside a border throw a ConversionException error
*/
@Test
- public void testRenderMyPage()
+ void testRenderMyPage()
{
// start and render the test page
tester.startPage(CommonModelPage.class);
@@ -49,7 +51,7 @@ public class TestHomePage_2134 extends WicketTestCase
* WICKET-2134: two forms inside a border throw a ConversionException error
*/
@Test
- public void testRenderMyPage2()
+ void testRenderMyPage2()
{
// start and render the test page
tester.startPage(CommonModelPage.class);
@@ -71,7 +73,7 @@ public class TestHomePage_2134 extends WicketTestCase
* WICKET-2134: two forms inside a border throw a ConversionException error
*/
@Test
- public void testRenderMyPage3()
+ void testRenderMyPage3()
{
// start and render the test page
tester.startPage(CommonModelPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/encryption/CryptTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/encryption/CryptTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/encryption/CryptTest.java
index 1211580..8eea58d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/encryption/CryptTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/encryption/CryptTest.java
@@ -16,20 +16,22 @@
*/
package org.apache.wicket.markup.html.form.encryption;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import org.apache.wicket.util.crypt.ICrypt;
import org.apache.wicket.util.crypt.NoCrypt;
import org.apache.wicket.util.crypt.SunJceCrypt;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* @author Juergen Donnerstag
*/
-public class CryptTest extends WicketTestCase
+class CryptTest extends WicketTestCase
{
@Test
- public void crypt()
+ void crypt()
{
final ICrypt crypt = new SunJceCrypt();
crypt.setKey("someStableKey");
@@ -58,7 +60,7 @@ public class CryptTest extends WicketTestCase
*
*/
@Test
- public void noCrypt()
+ void noCrypt()
{
// The NoCrypt implementation does not modify the string at all
final ICrypt crypt = new NoCrypt();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FormFeedbackTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FormFeedbackTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FormFeedbackTest.java
index 2f50b5c..57a2f9c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FormFeedbackTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FormFeedbackTest.java
@@ -18,19 +18,19 @@ package org.apache.wicket.markup.html.form.feedback;
import org.apache.wicket.Page;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author jcompagner
*/
-public class FormFeedbackTest extends WicketTestCase
+class FormFeedbackTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void formComponentFeedbackBorder() throws Exception
+ void formComponentFeedbackBorder() throws Exception
{
Page page = tester.startPage(FeedbackFormPage.class);
tester.assertRenderedPage(FeedbackFormPage.class);
@@ -44,7 +44,7 @@ public class FormFeedbackTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void formComponentFeedbackIndicator() throws Exception
+ void formComponentFeedbackIndicator() throws Exception
{
Page page = tester.startPage(FeedbackIndicatorFormPage.class);
tester.assertRenderedPage(FeedbackIndicatorFormPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/formComponentPanel/SimplePageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/formComponentPanel/SimplePageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/formComponentPanel/SimplePageTest.java
index 0137cf8..bc6fbe9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/formComponentPanel/SimplePageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/formComponentPanel/SimplePageTest.java
@@ -16,16 +16,18 @@
*/
package org.apache.wicket.markup.html.form.formComponentPanel;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
*
*/
-public class SimplePageTest extends WicketTestCase
+class SimplePageTest extends WicketTestCase
{
private static final Logger log = LoggerFactory.getLogger(SimplePageTest.class);
@@ -33,7 +35,7 @@ public class SimplePageTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage() throws Exception
+ void renderHomePage() throws Exception
{
tester.startComponentInPage(MyFormComponentPanel.class);
String doc = tester.getLastResponseAsString();
@@ -47,7 +49,7 @@ public class SimplePageTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePageWithHeaderContribution() throws Exception
+ void renderHomePageWithHeaderContribution() throws Exception
{
tester.startComponentInPage(MyFormComponentPanel.class);
String doc = tester.getLastResponse().getDocument();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/ImageButtonTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/ImageButtonTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/ImageButtonTest.java
index 1239848..7e7ffae 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/ImageButtonTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/ImageButtonTest.java
@@ -19,19 +19,19 @@ package org.apache.wicket.markup.html.form.imagebutton;
import java.util.Locale;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Juergen Donnerstag
*/
-public class ImageButtonTest extends WicketTestCase
+class ImageButtonTest extends WicketTestCase
{
/**
*
* @throws Exception
*/
@Test
- public void imageButton() throws Exception
+ void imageButton() throws Exception
{
Locale.setDefault(new Locale("en", "US"));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonTest.java
index acfcf96..b6a9160 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonTest.java
@@ -17,17 +17,17 @@
package org.apache.wicket.markup.html.form.imagebutton;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*/
-public class InvalidImageButtonTest extends WicketTestCase
+class InvalidImageButtonTest extends WicketTestCase
{
/**
* testInvalidImage()
*/
@Test
- public void invalidImage()
+ void invalidImage()
{
tester.startPage(InvalidImageButtonPage.class);
tester.assertRenderedPage(InvalidImageButtonPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java
index 8afc459..d736a0d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java
@@ -24,7 +24,7 @@ import org.apache.wicket.protocol.http.WebApplication;
*
* @author Jonathan Locke
*/
-public class PubApplication extends WebApplication
+class PubApplication extends WebApplication
{
/**
* Constructor
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
index 6eb693b..665d232 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup.html.form.login;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.Page;
import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.Session;
@@ -29,14 +31,13 @@ import org.apache.wicket.request.component.IRequestableComponent;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* @author marrink
*
*/
-public class InterceptTest extends WicketTestCase
+class InterceptTest extends WicketTestCase
{
@Override
protected WebApplication newApplication()
@@ -48,7 +49,7 @@ public class InterceptTest extends WicketTestCase
*
*/
@Test
- public void formSubmit()
+ void formSubmit()
{
// same as above but uses different technique to login
tester.startPage(tester.getApplication().getHomePage());
@@ -65,7 +66,7 @@ public class InterceptTest extends WicketTestCase
*
*/
@Test
- public void clickLink()
+ void clickLink()
{
tester.startPage(tester.getApplication().getHomePage());
MockLoginPage loginPage = (MockLoginPage)tester.getLastRenderedPage();
@@ -86,7 +87,7 @@ public class InterceptTest extends WicketTestCase
*
*/
@Test
- public void clickLink2()
+ void clickLink2()
{
// same as above but uses different technique to login
tester.startPage(tester.getApplication().getHomePage());
@@ -129,7 +130,7 @@ public class InterceptTest extends WicketTestCase
*
* @return Class
*/
- public Class<? extends Page> getLoginPage()
+ Class<? extends Page> getLoginPage()
{
return MockLoginPage.class;
}
@@ -154,7 +155,7 @@ public class InterceptTest extends WicketTestCase
/**
* @param request
*/
- protected MySession(Request request)
+ MySession(Request request)
{
super(request);
}
@@ -164,7 +165,7 @@ public class InterceptTest extends WicketTestCase
return username;
}
- protected final void setUsername(String username)
+ final void setUsername(String username)
{
this.username = username;
}
@@ -173,7 +174,7 @@ public class InterceptTest extends WicketTestCase
*
* @return boolean
*/
- public boolean isLoggedIn()
+ boolean isLoggedIn()
{
return !Strings.isEmpty(username);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java
index 52f4a8a..637543f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java
@@ -64,7 +64,7 @@ public class MockLoginPage extends WebPage
* @param username
* @return boolean
*/
- public boolean login(String username)
+ private boolean login(String username)
{
((MySession)Session.get()).setUsername(username);
continueToOriginalDestination();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/onFormValidateModelObjects/OnFormValidateModelObjectsPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/onFormValidateModelObjects/OnFormValidateModelObjectsPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/onFormValidateModelObjects/OnFormValidateModelObjectsPage.java
index bc94321..d6e93f9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/onFormValidateModelObjects/OnFormValidateModelObjectsPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/onFormValidateModelObjects/OnFormValidateModelObjectsPage.java
@@ -129,7 +129,7 @@ public class OnFormValidateModelObjectsPage extends WebPage
boolean parentValidated;
- public ParentModel()
+ ParentModel()
{
super();
}
@@ -159,7 +159,7 @@ public class OnFormValidateModelObjectsPage extends WebPage
return parentValidated;
}
- public void setParentValidated(boolean parentValid)
+ void setParentValidated(boolean parentValid)
{
this.parentValidated = parentValid;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/panelBorder/TestHomePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/panelBorder/TestHomePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/panelBorder/TestHomePage.java
index 1c9e388..d628173 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/panelBorder/TestHomePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/panelBorder/TestHomePage.java
@@ -16,18 +16,20 @@
*/
package org.apache.wicket.markup.html.form.panelBorder;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Simple test using the WicketTester
*/
-public class TestHomePage extends WicketTestCase
+class TestHomePage extends WicketTestCase
{
@Test
- public void testWithBorder2()
+ void testWithBorder2()
{
tester.startPage(HomePage.class);
tester.assertRenderedPage(HomePage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/panelBorder/TestHomePage_2134.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/panelBorder/TestHomePage_2134.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/panelBorder/TestHomePage_2134.java
index 3150d0f..b6d7054 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/panelBorder/TestHomePage_2134.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/panelBorder/TestHomePage_2134.java
@@ -16,20 +16,22 @@
*/
package org.apache.wicket.markup.html.form.panelBorder;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Simple test using the WicketTester
*/
-public class TestHomePage_2134 extends WicketTestCase
+class TestHomePage_2134 extends WicketTestCase
{
/**
* WICKET-2134: two forms inside a border throw a ConversionException error
*/
@Test
- public void testRenderMyPage()
+ void testRenderMyPage()
{
// start and render the test page
tester.startPage(CommonModelPage.class);
@@ -49,7 +51,7 @@ public class TestHomePage_2134 extends WicketTestCase
* WICKET-2134: two forms inside a border throw a ConversionException error
*/
@Test
- public void testRenderMyPage2()
+ void testRenderMyPage2()
{
// start and render the test page
tester.startPage(CommonModelPage.class);
@@ -71,7 +73,7 @@ public class TestHomePage_2134 extends WicketTestCase
* WICKET-2134: two forms inside a border throw a ConversionException error
*/
@Test
- public void testRenderMyPage3()
+ void testRenderMyPage3()
{
// start and render the test page
tester.startPage(CommonModelPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/submitlink/HomePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/submitlink/HomePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/submitlink/HomePage.java
index a8db477..8ce997b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/submitlink/HomePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/submitlink/HomePage.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.markup.html.form.submitlink;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.form.Form;
@@ -29,10 +29,10 @@ import org.apache.wicket.model.PropertyModel;
*/
public class HomePage extends WebPage
{
- boolean submitted = false;
- boolean submittedViaLinkBefore = false;
- boolean submittedViaLinkAfter = false;
- String text;
+ private boolean submitted = false;
+ private boolean submittedViaLinkBefore = false;
+ private boolean submittedViaLinkAfter = false;
+ private String text;
/**
*
*/
@@ -70,14 +70,14 @@ public class HomePage extends WebPage
public void onSubmit()
{
submittedViaLinkBefore = true;
- assertFalse("before must be the first!", submittedViaLinkAfter);
+ assertFalse(submittedViaLinkAfter, "before must be the first!");
}
@Override
public void onAfterSubmit()
{
- assertTrue("before must have been called!", submittedViaLinkBefore);
+ assertTrue(submittedViaLinkBefore, "before must have been called!");
submittedViaLinkAfter = true;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/submitlink/TestHomePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/submitlink/TestHomePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/submitlink/TestHomePage.java
index 6a9981b..f799df2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/submitlink/TestHomePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/submitlink/TestHomePage.java
@@ -16,19 +16,22 @@
*/
package org.apache.wicket.markup.html.form.submitlink;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+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;
/**
*/
-public class TestHomePage extends WicketTestCase
+class TestHomePage extends WicketTestCase
{
/**
* testSubmitLinkByClickingLink()
*/
@Test
- public void testSubmitLinkByClickingLink()
+ void testSubmitLinkByClickingLink()
{
tester.startPage(HomePage.class);
tester.assertRenderedPage(HomePage.class);
@@ -36,11 +39,10 @@ public class TestHomePage extends WicketTestCase
tester.getRequest().getPostParameters().setParameterValue("text", "Hello");
tester.clickLink("form:link");
assertEquals("Hello", home.getText());
- assertTrue("Form.onSubmit() has not been called!", home.isSubmitted());
- assertTrue("SubmitLink.onSubmit() has not been called!",
- home.isSubmittedViaLinkBefore());
- assertTrue("SubmitLink.onAfterSubmit() has not been called!",
- home.isSubmittedViaLinkAfter());
+ assertTrue(home.isSubmitted(), "Form.onSubmit() has not been called!");
+ assertTrue(home.isSubmittedViaLinkBefore(), "SubmitLink.onSubmit() has not been called!");
+ assertTrue(home.isSubmittedViaLinkAfter(),
+ "SubmitLink.onAfterSubmit() has not been called!");
}
@@ -48,7 +50,7 @@ public class TestHomePage extends WicketTestCase
* testSubmitLinkBySubmittingForm()
*/
@Test
- public void testSubmitLinkBySubmittingForm()
+ void testSubmitLinkBySubmittingForm()
{
tester.startPage(HomePage.class);
tester.assertRenderedPage(HomePage.class);
@@ -58,18 +60,17 @@ public class TestHomePage extends WicketTestCase
tester.getRequest().getPostParameters().setParameterValue("link", "");
tester.submitForm("form");
assertEquals("Hello", home.getText());
- assertTrue("Form.onSubmit() has not been called!", home.isSubmitted());
- assertTrue("SubmitLink.onSubmit() has not been called!",
- home.isSubmittedViaLinkBefore());
- assertTrue("SubmitLink.onAfterSubmit() has not been called!",
- home.isSubmittedViaLinkAfter());
+ assertTrue(home.isSubmitted(), "Form.onSubmit() has not been called!");
+ assertTrue(home.isSubmittedViaLinkBefore(), "SubmitLink.onSubmit() has not been called!");
+ assertTrue(home.isSubmittedViaLinkAfter(),
+ "SubmitLink.onAfterSubmit() has not been called!");
}
/**
* testSubmitLinkByUsingFormTester()
*/
@Test
- public void testSubmitLinkByUsingFormTester()
+ void testSubmitLinkByUsingFormTester()
{
tester.startPage(HomePage.class);
tester.assertRenderedPage(HomePage.class);
@@ -78,11 +79,10 @@ public class TestHomePage extends WicketTestCase
formTester.setValue("text", "Hello");
formTester.submit("link");
assertEquals("Hello", home.getText());
- assertTrue("Form.onSubmit() has not been called!", home.isSubmitted());
- assertTrue("SubmitLink.onSubmit() has not been called!",
- home.isSubmittedViaLinkBefore());
- assertTrue("SubmitLink.onAfterSubmit() has not been called!",
- home.isSubmittedViaLinkAfter());
+ assertTrue(home.isSubmitted(), "Form.onSubmit() has not been called!");
+ assertTrue(home.isSubmittedViaLinkBefore(), "SubmitLink.onSubmit() has not been called!");
+ assertTrue(home.isSubmittedViaLinkAfter(),
+ "SubmitLink.onAfterSubmit() has not been called!");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadErrorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadErrorTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadErrorTest.java
index a3d47c7..ccf1ea1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadErrorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadErrorTest.java
@@ -16,19 +16,21 @@
*/
package org.apache.wicket.markup.html.form.upload;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.util.Locale;
-import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.util.file.File;
import org.apache.wicket.util.tester.FormTester;
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 WICKET-2015
*/
-public class FileUploadErrorTest extends WicketTestCase
+class FileUploadErrorTest extends WicketTestCase
{
private FormTester formTester;
private final String textFieldId = "textField";
@@ -38,8 +40,8 @@ public class FileUploadErrorTest extends WicketTestCase
/**
*
*/
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
// Start and render the test page
tester.startPage(FileUploadError.class);
@@ -55,7 +57,7 @@ public class FileUploadErrorTest extends WicketTestCase
* FileUpload is empty on submit: Validation fails to see that TextField is also required.
*/
@Test
- public void testSubmit_NoInput()
+ void testSubmit_NoInput()
{
formTester.submit();
tester.assertErrorMessages("'textField' is required.");
@@ -65,7 +67,7 @@ public class FileUploadErrorTest extends WicketTestCase
* FileUpload is filled on submit: TexttField is required.
*/
@Test
- public void testSubmit_NoInput_FileUploaded()
+ void testSubmit_NoInput_FileUploaded()
{
formTester.setFile(fileUploadId, new File(testUploadFilePath), "UTF-8");
formTester.submit();
@@ -77,7 +79,7 @@ public class FileUploadErrorTest extends WicketTestCase
* FileUpload is empty on submit: Validation fails to report too short TextField input.
*/
@Test
- public void testSubmit_NotValidTextFieldValue()
+ void testSubmit_NotValidTextFieldValue()
{
formTester.setValue(textFieldId, "te");
formTester.submit();
@@ -90,7 +92,7 @@ public class FileUploadErrorTest extends WicketTestCase
* FileUpload is empty on submit: Validation fails to report too short TextField input.
*/
@Test
- public void testSubmit_NotValidTextFieldValue2()
+ void testSubmit_NotValidTextFieldValue2()
{
formTester.setValue(textFieldId, "12345678901");
formTester.submit();
@@ -103,7 +105,7 @@ public class FileUploadErrorTest extends WicketTestCase
* FileUpload is filled on submit: Validation reports too short TextField input.
*/
@Test
- public void testSubmit_NotValidTextFieldValue_FileUploaded()
+ void testSubmit_NotValidTextFieldValue_FileUploaded()
{
formTester.setValue(textFieldId, "te");
formTester.setFile(fileUploadId, new File(testUploadFilePath), "UTF-8");
@@ -117,7 +119,7 @@ public class FileUploadErrorTest extends WicketTestCase
* Throwing exception confirms that value is received.
*/
@Test
- public void testSubmit_ValidTextField_NoFile()
+ void testSubmit_ValidTextField_NoFile()
{
formTester.setValue(textFieldId, FileUploadError.THIS_VALUE_SHOULD_THROW_EXCEPTION);
try
@@ -133,7 +135,7 @@ public class FileUploadErrorTest extends WicketTestCase
}
@Test
- public void testSubmit_ValidTextField_WithFile()
+ void testSubmit_ValidTextField_WithFile()
{
formTester.setValue(textFieldId, "test value");
formTester.setFile(fileUploadId, new File(testUploadFilePath), "UTF-8");
@@ -143,7 +145,7 @@ public class FileUploadErrorTest extends WicketTestCase
}
@Test
- public void testSubmit_RequiredFileUpload_Ok()
+ void testSubmit_RequiredFileUpload_Ok()
{
((FileUploadField)tester.getLastRenderedPage().get("form:" + fileUploadId)).setRequired(true);
@@ -155,7 +157,7 @@ public class FileUploadErrorTest extends WicketTestCase
}
@Test
- public void testSubmit_RequiredFileUpload_ShouldFailWithValidationError()
+ void testSubmit_RequiredFileUpload_ShouldFailWithValidationError()
{
((FileUploadField)tester.getLastRenderedPage().get("form:" + fileUploadId)).setRequired(true);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java
index 7454602..89dc8d8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java
@@ -16,6 +16,12 @@
*/
package org.apache.wicket.markup.html.form.upload;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.io.BufferedOutputStream;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -30,15 +36,14 @@ import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.ValidationError;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Test of FileUploadField
*
* @author Frank Bille (billen)
*/
-public class FileUploadFieldTest extends WicketTestCase
+class FileUploadFieldTest extends WicketTestCase
{
private static final String TEST_FILE_NAME = FileUploadFieldTest.class.getName();
@@ -49,7 +54,7 @@ public class FileUploadFieldTest extends WicketTestCase
* '
*/
@Test
- public void internalDetach() throws IOException
+ void internalDetach() throws IOException
{
tester.startPage(MockPageWithFormAndUploadField.class);
@@ -113,7 +118,7 @@ public class FileUploadFieldTest extends WicketTestCase
* @throws IOException
*/
@Test
- public void fileUploadCanBeValidated() throws IOException
+ void fileUploadCanBeValidated() throws IOException
{
tester.startPage(TestValidationPage.class);
// creating the file expected by form validators
@@ -130,7 +135,7 @@ public class FileUploadFieldTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-5691
*/
@Test
- public void testEmptyField() throws Exception
+ void testEmptyField() throws Exception
{
tester.startPage(TestValidationPage.class);
@@ -153,7 +158,7 @@ public class FileUploadFieldTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-6270
*/
@Test
- public void testEmptyFieldAsBrowserSendsIt() throws Exception
+ void testEmptyFieldAsBrowserSendsIt() throws Exception
{
tester.startPage(TestValidationPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadServletPartTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadServletPartTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadServletPartTest.java
index 629371f..7012727 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadServletPartTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadServletPartTest.java
@@ -16,9 +16,12 @@
*/
package org.apache.wicket.markup.html.form.upload;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
+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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -29,7 +32,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
-
import javax.servlet.http.Part;
import org.apache.wicket.protocol.http.mock.MockHttpServletRequest;
@@ -37,13 +39,12 @@ import org.apache.wicket.request.resource.AbstractResource;
import org.apache.wicket.util.io.IOUtils;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Test of FileUpload with simulated Servlet 3.0 multipart config
*/
-public class FileUploadServletPartTest extends WicketTestCase
+class FileUploadServletPartTest extends WicketTestCase
{
/**
* Tests support for uploading files with Servlet 3.0 multipart upload
@@ -52,7 +53,7 @@ public class FileUploadServletPartTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void uploadServlet30Multipart() throws Exception
+ void uploadServlet30Multipart() throws Exception
{
MockPageWithFormAndUploadField page = tester.startPage(MockPageWithFormAndUploadField.class);
@@ -69,24 +70,24 @@ public class FileUploadServletPartTest extends WicketTestCase
assertEquals(Servlet3Part.CONTENT_TYPE, fileUpload.getContentType());
assertArrayEquals(Servlet3Part.DATA, IOUtils.toByteArray(fileUpload.getInputStream()));
- assertThat(part.written.get(), is(nullValue()));
+ assertNull(part.written.get());
fileUpload.writeToTempFile();
- assertThat(part.written.get(), is(notNullValue()));
+ assertNotNull(part.written.get());
- assertThat(part.deleted.get(), is(false));
+ assertFalse(part.deleted.get());
fileUpload.delete();
- assertThat(part.deleted.get(), is(true));
+ assertTrue(part.deleted.get());
}
private static class Servlet3Part implements Part
{
private static final byte[] DATA = new byte[] {1, 2, 3};
- public static final String CONTENT_TYPE = "text/plain";
+ static final String CONTENT_TYPE = "text/plain";
private final AtomicReference<String> written = new AtomicReference<>();
private final AtomicBoolean deleted = new AtomicBoolean(false);
private final LinkedHashMap<String, List<String>> headers = new LinkedHashMap<>();
- public final String fieldName;
+ final String fieldName;
private Servlet3Part(String fieldName) {
this.fieldName = fieldName;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadTest.java
index 6315d20..2de0ba0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadTest.java
@@ -16,6 +16,12 @@
*/
package org.apache.wicket.markup.html.form.upload;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Field;
@@ -30,8 +36,7 @@ import org.apache.wicket.util.file.FileCleanerTrackerAdapter;
import org.apache.wicket.util.file.IFileCleaner;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Test of FileUpload
@@ -49,7 +54,7 @@ public class FileUploadTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void getInputStream() throws Exception
+ void getInputStream() throws Exception
{
final IFileCleaner fileUploadCleaner = new FileCleaner();
@@ -110,7 +115,7 @@ public class FileUploadTest extends WicketTestCase
* @throws IOException
*/
@Test
- public void writeToTempFile() throws IOException
+ void writeToTempFile() throws IOException
{
tester.startPage(TestPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MockPageWithFormAndUploadField.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MockPageWithFormAndUploadField.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MockPageWithFormAndUploadField.java
index 75806ba..571e447 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MockPageWithFormAndUploadField.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MockPageWithFormAndUploadField.java
@@ -34,7 +34,7 @@ public class MockPageWithFormAndUploadField extends WebPage
public static final String FORM_ID = "form";
private final Form<?> form;
- protected final FileUploadField fileUploadField;
+ final FileUploadField fileUploadField;
private FileUpload fileUpload;
/**
@@ -64,7 +64,7 @@ public class MockPageWithFormAndUploadField extends WebPage
add(form);
}
- protected void handleFormSubmit() throws Exception
+ void handleFormSubmit() throws Exception
{
fileUpload = fileUploadField.getFileUpload();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadFieldTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadFieldTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadFieldTest.java
index 139f41b..ac90bbd 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadFieldTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadFieldTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.markup.html.form.upload;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -32,12 +35,12 @@ import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for MultiFileUploadField
*/
-public class MultiFileUploadFieldTest extends WicketTestCase
+class MultiFileUploadFieldTest extends WicketTestCase
{
/**
* FormTester supports MultiFileUploadField
@@ -45,7 +48,7 @@ public class MultiFileUploadFieldTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-5346
*/
@Test
- public void submitMultiFileUploadFields()
+ void submitMultiFileUploadFields()
{
final AtomicBoolean submitted = new AtomicBoolean(false);
final ListModel<FileUpload> filesModel = new ListModel<>(new ArrayList<FileUpload>());
@@ -86,14 +89,14 @@ public class MultiFileUploadFieldTest extends WicketTestCase
ft.setFile("muf", new File("target/test-classes/org/apache/wicket/markup/html/form/upload/MultiFileUploadFieldTest1.txt"), "plain/text");
ft.submit();
- assertEquals("The form is not submitted", true, submitted.get());
+ assertEquals(true, submitted.get(), "The form is not submitted");
}
/**
* https://issues.apache.org/jira/browse/WICKET-6198
*/
@Test
- public void disabledMultiFileUploadFields()
+ void disabledMultiFileUploadFields()
{
final ListModel<FileUpload> filesModel = new ListModel<>(new ArrayList<FileUpload>());
@@ -106,9 +109,9 @@ public class MultiFileUploadFieldTest extends WicketTestCase
private static class TestPage extends WebPage implements IMarkupResourceStreamProvider
{
- public TestPage(final ListModel<FileUpload> model)
+ TestPage(final ListModel<FileUpload> model)
{
- Form f = new Form("f")
+ Form f = new Form<>("f")
{
@Override
protected void onSubmit()
@@ -123,7 +126,7 @@ public class MultiFileUploadFieldTest extends WicketTestCase
f.add(new MultiFileUploadField("muf", model));
}
- protected void onSubmit()
+ void onSubmit()
{
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/FormValidatorBehaviorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/FormValidatorBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/FormValidatorBehaviorTest.java
index 863eb44..6e02842 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/FormValidatorBehaviorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/FormValidatorBehaviorTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.markup.html.form.validation;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.behavior.Behavior;
@@ -31,17 +34,17 @@ import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*/
-public class FormValidatorBehaviorTest extends WicketTestCase
+class FormValidatorBehaviorTest extends WicketTestCase
{
/**
* Tests validators are treated as behaviors
*/
@Test
- public void actAsBehavior()
+ void actAsBehavior()
{
TestPage page = new TestPage();
@@ -64,7 +67,7 @@ public class FormValidatorBehaviorTest extends WicketTestCase
* Tests validators are treated as validators
*/
@Test
- public void actAsValidator()
+ void actAsValidator()
{
TestPage page = new TestPage();
@@ -138,7 +141,7 @@ public class FormValidatorBehaviorTest extends WicketTestCase
*
* @param field
*/
- public MaxLenValidator(TextField<String> field)
+ MaxLenValidator(TextField<String> field)
{
this.field = field;
}
@@ -179,7 +182,7 @@ public class FormValidatorBehaviorTest extends WicketTestCase
*
* @param field
*/
- public MinLenValidator(TextField<String> field)
+ MinLenValidator(TextField<String> field)
{
this.field = field;
}
@@ -207,14 +210,14 @@ public class FormValidatorBehaviorTest extends WicketTestCase
{
private static final long serialVersionUID = 1L;
/** */
- public TextField<String> name;
+ TextField<String> name;
/** */
- public Form<Void> form;
+ Form<Void> form;
/**
* Construct.
*/
- public TestPage()
+ TestPage()
{
form = new Form<Void>("form");
add(form);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java
index 1128395..86e74e6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java
@@ -47,7 +47,7 @@ public class HomePage extends WebPage
public String textfield2;
/** */
- public int formSubmitted = 0;
+ private int formSubmitted = 0;
/** */
public static int AJAX = 2;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePageTest.java
index 5f544c0..73057e7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePageTest.java
@@ -16,24 +16,28 @@
*/
package org.apache.wicket.markup.html.form.validation;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.feedback.FeedbackMessage;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.util.tester.FormTester;
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;
/**
* Simple test using the WicketTester
*/
-public class HomePageTest extends WicketTestCase
+class HomePageTest extends WicketTestCase
{
/**
*
*/
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
tester.startPage(HomePage.class);
tester.assertRenderedPage(HomePage.class);
@@ -43,11 +47,10 @@ public class HomePageTest extends WicketTestCase
*
*/
@Test
- public void withoutBorder()
+ void withoutBorder()
{
tester.executeAjaxEvent("form:submit", "click");
- assertEquals("Expected one error message",
- tester.getMessages(FeedbackMessage.ERROR).size(), 2);
+ assertEquals(2, tester.getMessages(FeedbackMessage.ERROR).size(), "Expected one error message");
assertTrue(((HomePage)tester.getLastRenderedPage()).hitOnError);
assertFalse(((HomePage)tester.getLastRenderedPage()).hitOnSubmit);
}
@@ -56,7 +59,7 @@ public class HomePageTest extends WicketTestCase
*
*/
@Test
- public void withoutBorder2()
+ void withoutBorder2()
{
FormTester formTester = tester.newFormTester("form");
formTester.setValue("textfield1", "testxxx");
@@ -70,11 +73,10 @@ public class HomePageTest extends WicketTestCase
*
*/
@Test
- public void withBorder()
+ void withBorder()
{
tester.executeAjaxEvent("border:form2:submit", "click");
- assertEquals("Expected one error message",
- tester.getMessages(FeedbackMessage.ERROR).size(), 2);
+ assertEquals(2, tester.getMessages(FeedbackMessage.ERROR).size(), "Expected one error message");
assertTrue(((MyBorder)tester.getLastRenderedPage().get("border")).hitOnError);
assertFalse(((MyBorder)tester.getLastRenderedPage().get("border")).hitOnSubmit);
}
@@ -83,7 +85,7 @@ public class HomePageTest extends WicketTestCase
*
*/
@Test
- public void withBorder2()
+ void withBorder2()
{
TextField<?> textfield = (TextField<?>)tester.getLastRenderedPage().get(
"border:form2:border_body:textfield1");
@@ -100,7 +102,7 @@ public class HomePageTest extends WicketTestCase
* wicket-2202
*/
@Test
- public void withPanelAjax()
+ void withPanelAjax()
{
tester.executeAjaxEvent("form3:submit", "click");
@@ -112,7 +114,7 @@ public class HomePageTest extends WicketTestCase
* wicket-2202
*/
@Test
- public void withPanelForm()
+ void withPanelForm()
{
tester.clickLink("form3:submit2");
HomePage page = (HomePage)tester.getLastRenderedPage();
@@ -123,7 +125,7 @@ public class HomePageTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void test_2589() throws Exception
+ void test_2589() throws Exception
{
tester.startPage(HomePage1.class);
tester.assertRenderedPage(HomePage1.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/MyBorder.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/MyBorder.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/MyBorder.java
index 845f370..a9f63b7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/MyBorder.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/MyBorder.java
@@ -28,7 +28,7 @@ import org.apache.wicket.markup.html.panel.FeedbackPanel;
public class MyBorder extends Border
{
private static final long serialVersionUID = 1L;
- Form<Void> form;
+ private Form<Void> form;
boolean hitOnSubmit = false;
boolean hitOnError = false;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/BasePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/BasePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/BasePage.java
index 8829229..2911589 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/BasePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/BasePage.java
@@ -30,7 +30,7 @@ public class BasePage extends WebPage
/**
* Construct.
*/
- public BasePage()
+ BasePage()
{
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/InnerFeedbackTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/InnerFeedbackTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/InnerFeedbackTest.java
index e1848e6..e919ca9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/InnerFeedbackTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/InnerFeedbackTest.java
@@ -22,12 +22,12 @@ import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for Wicket-2974
*/
-public class InnerFeedbackTest extends WicketTestCase
+class InnerFeedbackTest extends WicketTestCase
{
@Override
@@ -60,7 +60,7 @@ public class InnerFeedbackTest extends WicketTestCase
*
*/
@Test
- public void innerFeedback()
+ void innerFeedback()
{
tester.getSession().setLocale(Locale.ENGLISH);
tester.startPage(HomePage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/BasePanel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/BasePanel.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/BasePanel.java
index f552968..ed14ec6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/BasePanel.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/BasePanel.java
@@ -31,7 +31,7 @@ public class BasePanel extends Panel
*
* @param id
*/
- public BasePanel(String id)
+ BasePanel(String id)
{
super(id);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/HeaderScopingTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/HeaderScopingTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/HeaderScopingTest.java
index 538359d..f45198c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/HeaderScopingTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/HeaderScopingTest.java
@@ -17,12 +17,12 @@
package org.apache.wicket.markup.html.header;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class HeaderScopingTest extends WicketTestCase
+class HeaderScopingTest extends WicketTestCase
{
/**
@@ -30,7 +30,7 @@ public class HeaderScopingTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void headerScoping1() throws Exception
+ void headerScoping1() throws Exception
{
executeTest(MyPage.class, "MyPageExpectedResult.html");
}
@@ -40,7 +40,7 @@ public class HeaderScopingTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void headerScoping2() throws Exception
+ void headerScoping2() throws Exception
{
executeTest(MyPage2.class, "MyPage2_ExpectedResult.html");
}
[37/45] wicket git commit: proper formatting of WicketTester.java
Posted by mg...@apache.org.
proper formatting of WicketTester.java
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c30e3291
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c30e3291
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c30e3291
Branch: refs/heads/master
Commit: c30e329162984facf76fdf3686b6bc0cd44c91aa
Parents: b0a96e9
Author: renoth <jo...@gmx.de>
Authored: Tue Jul 31 13:54:07 2018 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 26 16:10:12 2018 +0300
----------------------------------------------------------------------
.../apache/wicket/util/tester/FormTester.java | 3 +-
.../apache/wicket/util/tester/WicketTester.java | 280 +++++++++----------
2 files changed, 138 insertions(+), 145 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/c30e3291/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java
index e5d71a6..81550bd 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java
@@ -580,7 +580,8 @@ public class FormTester
public FormTester setValue(final String formComponentId, final String value)
{
Component component = workingForm.get(formComponentId);
- assertNotNull(component, "Unable to set value. Couldn't find component with name: " + formComponentId);
+ assertNotNull(component, "Unable to set value. Couldn't find component with name: " +
+ formComponentId);
return setValue(component, value);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/c30e3291/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
index e4e08df..66af566 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
@@ -148,14 +148,16 @@ import org.slf4j.LoggerFactory;
*
* Cookie handling:
*
- * There are some expectations about wicket tester cookie handling which should match as best as it
- * can be with a real client server request response cycle: - all valid cookies set before a request
- * is made (tester.getRequest().addCookie()) should appear in the page request - all cookies set in
- * the response should appear in the last response (tester.getLastResponse()) after the request is
- * made (expired cookies and others) - all cookies set in the response should appear even after a
- * redirect response is made until the final response (tester.getLastResponse()) is written to the
- * client (wicket tester) - all valid cookies (maxAge!=0) from the last response should be added to
- * the next request cookies (tester.getRequest().getCookies())
+ * There are some expectations about wicket tester cookie handling which should match as best as
+ * it can be with a real client server request response cycle:
+ * - all valid cookies set before a request is made (tester.getRequest().addCookie()) should
+ * appear in the page request
+ * - all cookies set in the response should appear in the last response (tester.getLastResponse())
+ * after the request is made (expired cookies and others)
+ * - all cookies set in the response should appear even after a redirect response is made
+ * until the final response (tester.getLastResponse()) is written to the client (wicket tester)
+ * - all valid cookies (maxAge!=0) from the last response should be added to
+ * the next request cookies (tester.getRequest().getCookies())
*
*
* TODO General: Example usage of FormTester
@@ -258,41 +260,19 @@ public class WicketTester extends BaseWicketTester
}
/**
- * Returns the current Maven build directory taken from the <tt>basedir</tt> system property, or
- * null if not set
- *
- * @return path with a trailing slash
- */
- public static String getBasedir()
- {
- String basedir = System.getProperty("basedir");
- if (basedir != null)
- {
- basedir = basedir + "/";
- }
- else
- {
- basedir = "";
- }
- return basedir;
- }
-
- /**
* Asserts that the Ajax location header is present.
*/
public void assertAjaxLocation()
{
if (null != getLastResponse().getHeader("Location"))
{
- throw new AssertionFailedError(
- "Location header should *not* be present when using Ajax");
+ throw new AssertionFailedError("Location header should *not* be present when using Ajax");
}
String ajaxLocation = getLastResponse().getHeader("Ajax-Location");
if (null == ajaxLocation)
{
- throw new AssertionFailedError(
- "Ajax-Location header should be present when using Ajax");
+ throw new AssertionFailedError("Ajax-Location header should be present when using Ajax");
}
int statusCode = getLastResponse().getStatus();
@@ -316,19 +296,8 @@ public class WicketTester extends BaseWicketTester
}
/**
- *
- * @param result
- */
- private void assertResult(Result result)
- {
- if (result.wasFailed())
- {
- throw new AssertionFailedError(result.getMessage());
- }
- }
-
- /**
- * Asserts that the <code>Component</code> a the given path has a behavior of the given type.
+ * Asserts that the <code>Component</code> a the given path has a behavior
+ * of the given type.
*
* @param path
* path to <code>Component</code>
@@ -342,44 +311,44 @@ public class WicketTester extends BaseWicketTester
Component component = assertExists(path);
List<? extends Behavior> behaviors = component.getBehaviors(expectedBehaviorClass);
final String message = String.format("Component '%s' has no behaviors of type '%s'",
- component.getPageRelativePath(), expectedBehaviorClass);
+ component.getPageRelativePath(), expectedBehaviorClass);
assertResult(new Result(CollectionUtils.isEmpty(behaviors), message));
}
/**
* Tests that a <code>Component</code> has been added to a <code>AjaxRequestTarget</code>, using
- * {@link org.apache.wicket.ajax.AjaxRequestTarget#add(Component...)}. This method actually
- * tests that a <code>Component</code> is on the Ajax response sent back to the client.
+ * {@link org.apache.wicket.ajax.AjaxRequestTarget#add(Component...)}. This method actually tests that a
+ * <code>Component</code> is on the Ajax response sent back to the client.
* <p>
* PLEASE NOTE! This method doesn't actually insert the <code>Component</code> in the client DOM
* tree, using JavaScript. But it shouldn't be needed because you just have to trust that Wicket
* Ajax JavaScript works.
*
- * @param componentPath
- * a <code>Component</code> path to test
+ * @param component
+ * a <code>Component</code> to be tested
*/
- public void assertComponentOnAjaxResponse(String componentPath)
+ public void assertComponentOnAjaxResponse(Component component)
{
- Component component = getComponentFromLastRenderedPage(componentPath, false);
- assertComponentOnAjaxResponse(component);
+ Result result = isComponentOnAjaxResponse(component);
+ assertResult(result);
}
/**
* Tests that a <code>Component</code> has been added to a <code>AjaxRequestTarget</code>, using
- * {@link org.apache.wicket.ajax.AjaxRequestTarget#add(Component...)}. This method actually
- * tests that a <code>Component</code> is on the Ajax response sent back to the client.
+ * {@link org.apache.wicket.ajax.AjaxRequestTarget#add(Component...)}. This method actually tests that a
+ * <code>Component</code> is on the Ajax response sent back to the client.
* <p>
* PLEASE NOTE! This method doesn't actually insert the <code>Component</code> in the client DOM
* tree, using JavaScript. But it shouldn't be needed because you just have to trust that Wicket
* Ajax JavaScript works.
*
- * @param component
- * a <code>Component</code> to be tested
+ * @param componentPath
+ * a <code>Component</code> path to test
*/
- public void assertComponentOnAjaxResponse(Component component)
+ public void assertComponentOnAjaxResponse(String componentPath)
{
- Result result = isComponentOnAjaxResponse(component);
- assertResult(result);
+ Component component = getComponentFromLastRenderedPage(componentPath, false);
+ assertComponentOnAjaxResponse(component);
}
/**
@@ -408,9 +377,9 @@ public class WicketTester extends BaseWicketTester
* Asserts that a component's markup has loaded with the given variation
*
* @param component
- * The component which markup to check
+ * The component which markup to check
* @param expectedVariation
- * The expected variation of the component's markup
+ * The expected variation of the component's markup
*/
public void assertMarkupVariation(Component component, String expectedVariation)
{
@@ -420,44 +389,21 @@ public class WicketTester extends BaseWicketTester
String actualVariation = markup.getMarkupResourceStream().getVariation();
if (Objects.equal(expectedVariation, actualVariation) == false)
{
- result = Result.fail(
- String.format("Wrong variation for component '%s'. Actual: '%s', expected: '%s'",
+ result = Result.fail(String.format("Wrong variation for component '%s'. Actual: '%s', expected: '%s'",
component.getPageRelativePath(), actualVariation, expectedVariation));
}
assertResult(result);
}
- private IMarkupFragment getMarkupFragment(Component component)
- {
- IMarkupFragment markup = null;
- if (component instanceof MarkupContainer)
- {
- markup = ((MarkupContainer)component).getAssociatedMarkup();
- }
-
- if (markup == null)
- {
- markup = component.getMarkup();
- }
-
- if (markup == null)
- {
- throw new AssertionFailedError(String.format("Cannot find the markup of component: %s",
- component.getPageRelativePath()));
- }
-
- return markup;
- }
-
/**
* Asserts that a component's markup has loaded with the given style.
*
* @param component
- * The component which markup to check
+ * The component which markup to check
* @param expectedStyle
- * The expected style of the component's markup. For example: <em>green</em> in
- * <code>MyPanel_green.html</code>
+ * The expected style of the component's markup.
+ * For example: <em>green</em> in <code>MyPanel_green.html</code>
*/
public void assertMarkupStyle(Component component, String expectedStyle)
{
@@ -467,8 +413,7 @@ public class WicketTester extends BaseWicketTester
String actualStyle = markup.getMarkupResourceStream().getStyle();
if (Objects.equal(expectedStyle, actualStyle) == false)
{
- result = Result
- .fail(String.format("Wrong style for component '%s'. Actual: '%s', expected: '%s'",
+ result = Result.fail(String.format("Wrong style for component '%s'. Actual: '%s', expected: '%s'",
component.getPageRelativePath(), actualStyle, expectedStyle));
}
@@ -479,9 +424,9 @@ public class WicketTester extends BaseWicketTester
* Asserts that a component's markup has loaded with the given locale
*
* @param component
- * The component which markup to check
+ * The component which markup to check
* @param expectedLocale
- * The expected locale of the component's markup
+ * The expected locale of the component's markup
*/
public void assertMarkupLocale(Component component, Locale expectedLocale)
{
@@ -491,14 +436,34 @@ public class WicketTester extends BaseWicketTester
Locale actualLocale = markup.getMarkupResourceStream().getLocale();
if (Objects.equal(expectedLocale, actualLocale) == false)
{
- result = Result
- .fail(String.format("Wrong locale for component '%s'. Actual: '%s', expected: '%s'",
+ result = Result.fail(String.format("Wrong locale for component '%s'. Actual: '%s', expected: '%s'",
component.getPageRelativePath(), actualLocale, expectedLocale));
}
assertResult(result);
}
+ private IMarkupFragment getMarkupFragment(Component component)
+ {
+ IMarkupFragment markup = null;
+ if (component instanceof MarkupContainer)
+ {
+ markup = ((MarkupContainer) component).getAssociatedMarkup();
+ }
+
+ if (markup == null)
+ {
+ markup = component.getMarkup();
+ }
+
+ if (markup == null)
+ {
+ throw new AssertionFailedError(String.format("Cannot find the markup of component: %s", component.getPageRelativePath()));
+ }
+
+ return markup;
+ }
+
/**
* Asserts error-level feedback messages.
*
@@ -507,8 +472,7 @@ public class WicketTester extends BaseWicketTester
*/
public void assertErrorMessages(Serializable... expectedErrorMessages)
{
- assertFeedbackMessages(new ExactLevelFeedbackMessageFilter(FeedbackMessage.ERROR),
- expectedErrorMessages);
+ assertFeedbackMessages(new ExactLevelFeedbackMessageFilter(FeedbackMessage.ERROR), expectedErrorMessages);
}
/**
@@ -531,8 +495,7 @@ public class WicketTester extends BaseWicketTester
* @param expectedMessages
* expected feedback messages
*/
- public void assertFeedbackMessages(IFeedbackMessageFilter filter,
- Serializable... expectedMessages)
+ public void assertFeedbackMessages(IFeedbackMessageFilter filter, Serializable... expectedMessages)
{
List<FeedbackMessage> feedbackMessages = getFeedbackMessages(filter);
List<Serializable> actualMessages = getActualFeedbackMessages(feedbackMessages);
@@ -543,33 +506,31 @@ public class WicketTester extends BaseWicketTester
* Asserts that there is a feedback message provided by a given component
*
* @param component
- * the component that provided the expected feedback message. Optional.
+ * the component that provided the expected feedback message. Optional.
* @param key
- * the resource key for the feedback message. Mandatory.
+ * the resource key for the feedback message. Mandatory.
* @param model
- * the model used for interpolating the feedback message. Optional.
+ * the model used for interpolating the feedback message. Optional.
* @param filter
- * the filter that decides in which messages to look in. E.g. with a specific level,
- * rendered or not, etc.
+ * the filter that decides in which messages to look in. E.g. with a specific
+ * level, rendered or not, etc.
*/
- public void assertComponentFeedbackMessage(Component component, String key, IModel<?> model,
- IFeedbackMessageFilter filter)
+ public void assertComponentFeedbackMessage(Component component, String key, IModel<?> model, IFeedbackMessageFilter filter)
{
Args.notNull(key, "key");
- String expectedMessage = getApplication().getResourceSettings().getLocalizer().getString(
- key, component, model);
+ String expectedMessage = getApplication().getResourceSettings().getLocalizer().getString(key, component, model);
List<FeedbackMessage> feedbackMessages = getFeedbackMessages(filter);
List<Serializable> actualMessages = getActualFeedbackMessages(feedbackMessages);
- assertTrue(actualMessages.contains(expectedMessage), String
- .format("Feedback message with key '%s' cannot be found in %s", key, actualMessages));
+ assertTrue(actualMessages.contains(expectedMessage),
+ String.format("Feedback message with key '%s' cannot be found in %s", key, actualMessages));
}
/**
- * Extracts the actual messages from the passed feedback messages. Specially handles
- * ValidationErrorFeedback messages by extracting their String message
+ * Extracts the actual messages from the passed feedback messages.
+ * Specially handles ValidationErrorFeedback messages by extracting their String message
*
* @param feedbackMessages
* the feedback messages
@@ -612,15 +573,15 @@ public class WicketTester extends BaseWicketTester
final List<FeedbackMessage> renderedMessages = model.getObject();
if (renderedMessages == null)
{
- fail(
- String.format("feedback panel at path [%s] returned null messages", path));
+ throw new AssertionFailedError(String.format("feedback panel at path [%s] returned null messages", path));
}
+
if (messages.length != renderedMessages.size())
{
- fail(String.format(
- "you expected '%d' messages for the feedback panel [%s], but there were actually '%d'",
- messages.length, path, renderedMessages.size()));
+ throw new AssertionFailedError(String.format("you expected '%d' messages for the feedback panel [%s], but there were actually '%d'",
+ messages.length, path, renderedMessages.size()));
}
+
for (int i = 0; i < messages.length && i < renderedMessages.size(); i++)
{
final Serializable expected = messages[i];
@@ -698,30 +659,19 @@ public class WicketTester extends BaseWicketTester
}
/**
- * Asserts last-rendered <code>Page</code> against an expected HTML document.
- * <p>
- * Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected
- * output file.
- *
- * @param clazz
- * <code>Class</code> used to load the file (relative to <code>clazz</code> package)
- * @param filename
- * expected output filename <code>String</code>
- * @throws Exception
+ * Asserts no error-level feedback messages.
*/
- @Override
- public void assertResultPage(final Class<?> clazz, final String filename) throws Exception
+ public void assertNoErrorMessage()
{
- String document = getLastResponseAsString();
- DiffUtil.validatePage(document, clazz, filename, true);
+ assertNoFeedbackMessage(FeedbackMessage.ERROR);
}
/**
- * Asserts no error-level feedback messages.
+ * Asserts no info-level feedback messages.
*/
- public void assertNoErrorMessage()
+ public void assertNoInfoMessage()
{
- assertNoFeedbackMessage(FeedbackMessage.ERROR);
+ assertNoFeedbackMessage(FeedbackMessage.INFO);
}
/**
@@ -748,11 +698,22 @@ public class WicketTester extends BaseWicketTester
}
/**
- * Asserts no info-level feedback messages.
+ * Asserts last-rendered <code>Page</code> against an expected HTML document.
+ * <p>
+ * Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected
+ * output file.
+ *
+ * @param clazz
+ * <code>Class</code> used to load the file (relative to <code>clazz</code> package)
+ * @param filename
+ * expected output filename <code>String</code>
+ * @throws Exception
*/
- public void assertNoInfoMessage()
+ @Override
+ public void assertResultPage(final Class<?> clazz, final String filename) throws Exception
{
- assertNoFeedbackMessage(FeedbackMessage.INFO);
+ String document = getLastResponseAsString();
+ DiffUtil.validatePage(document, clazz, filename, true);
}
/**
@@ -825,6 +786,18 @@ public class WicketTester extends BaseWicketTester
}
/**
+ *
+ * @param result
+ */
+ private void assertResult(Result result)
+ {
+ if (result.wasFailed())
+ {
+ throw new AssertionFailedError(result.getMessage());
+ }
+ }
+
+ /**
* Checks whether a component is visible and/or enabled before usage
*
* @param component
@@ -861,16 +834,15 @@ public class WicketTester extends BaseWicketTester
}
catch (ClassCastException e)
{
- throw new IllegalArgumentException(
- "Component with id:" + id + " is not a BookmarkablePageLink");
+ throw new IllegalArgumentException("Component with id:" + id +
+ " is not a BookmarkablePageLink");
}
- assertEquals(pageClass, pageLink.getPageClass(),
- "BookmarkablePageLink: " + id + " is pointing to the wrong page");
+ assertEquals(pageClass,
+ pageLink.getPageClass(), "BookmarkablePageLink: " + id + " is pointing to the wrong page");
- assertEquals(parameters, pageLink.getPageParameters(),
- "One or more of the parameters associated with the BookmarkablePageLink: " + id +
- " do not match");
+ assertEquals(parameters, pageLink.getPageParameters(), "One or more of the parameters associated with the BookmarkablePageLink: " +
+ id + " do not match");
}
/**
@@ -998,4 +970,24 @@ public class WicketTester extends BaseWicketTester
String actualRedirectUrl = getLastResponse().getRedirectLocation();
assertEquals(expectedRedirectUrl, actualRedirectUrl);
}
+
+ /**
+ * Returns the current Maven build directory taken from the <tt>basedir</tt> system property, or
+ * null if not set
+ *
+ * @return path with a trailing slash
+ */
+ public static String getBasedir()
+ {
+ String basedir = System.getProperty("basedir");
+ if (basedir != null)
+ {
+ basedir = basedir + "/";
+ }
+ else
+ {
+ basedir = "";
+ }
+ return basedir;
+ }
}
[10/45] wicket git commit: wicket-core: Migrate to Junit 5
Posted by mg...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/ExceptionTestBase.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/ExceptionTestBase.java b/wicket-core/src/test/java/org/apache/wicket/util/ExceptionTestBase.java
index ae7fc9a..05d2203 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/ExceptionTestBase.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/ExceptionTestBase.java
@@ -16,11 +16,14 @@
*/
package org.apache.wicket.util;
-import java.lang.reflect.Constructor;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
-import org.junit.Assert;
-import org.junit.Test;
+import java.lang.reflect.Constructor;
+import org.junit.jupiter.api.Test;
/**
* Base class for testing exceptions in order to make sure that they achieve 100% test coverage.
@@ -28,7 +31,7 @@ import org.junit.Test;
*
* @author Chris Turner
*/
-public abstract class ExceptionTestBase extends Assert
+public abstract class ExceptionTestBase
{
/**
@@ -45,14 +48,14 @@ public abstract class ExceptionTestBase extends Assert
* If test fails
*/
@Test
- public final void emptyConstructor() throws Exception
+ final void emptyConstructor() throws Exception
{
Class<?> c = Class.forName(getExceptionClassName());
Constructor<?> constructor = c.getConstructor((Class[])null);
Exception e = (Exception)constructor.newInstance((Object[])null);
- Assert.assertNotNull("Exception should be created", e);
- Assert.assertNull(e.getMessage());
- Assert.assertNull(e.getCause());
+ assertNotNull(e, "Exception should be created");
+ assertNull(e.getMessage());
+ assertNull(e.getCause());
}
/**
@@ -62,14 +65,14 @@ public abstract class ExceptionTestBase extends Assert
* If test fails
*/
@Test
- public final void messageConstructor() throws Exception
+ final void messageConstructor() throws Exception
{
Class<?> c = Class.forName(getExceptionClassName());
Constructor<?> constructor = c.getConstructor(new Class[] { String.class });
Exception e = (Exception)constructor.newInstance("test message");
- Assert.assertNotNull("Exception should be created", e);
- Assert.assertEquals("test message", e.getMessage());
- Assert.assertNull(e.getCause());
+ assertNotNull(e, "Exception should be created");
+ assertEquals("test message", e.getMessage());
+ assertNull(e.getCause());
}
/**
@@ -79,14 +82,14 @@ public abstract class ExceptionTestBase extends Assert
* If test fails
*/
@Test
- public final void causeConstructor() throws Exception
+ final void causeConstructor() throws Exception
{
NullPointerException npe = new NullPointerException();
Class<?> c = Class.forName(getExceptionClassName());
Constructor<?> constructor = c.getConstructor(new Class[] { Throwable.class });
Exception e = (Exception)constructor.newInstance(npe);
- Assert.assertNotNull("Exception should be created", e);
- Assert.assertSame(npe, e.getCause());
+ assertNotNull(e, "Exception should be created");
+ assertSame(npe, e.getCause());
}
/**
@@ -96,15 +99,15 @@ public abstract class ExceptionTestBase extends Assert
* If test fails
*/
@Test
- public final void messageAndCauseConstructor() throws Exception
+ final void messageAndCauseConstructor() throws Exception
{
NullPointerException npe = new NullPointerException();
Class<?> c = Class.forName(getExceptionClassName());
Constructor<?> constructor = c.getConstructor(new Class[] { String.class, Throwable.class });
Exception e = (Exception)constructor.newInstance("test message", npe);
- Assert.assertNotNull("Exception should be created", e);
- Assert.assertEquals("test message", e.getMessage());
- Assert.assertSame(npe, e.getCause());
+ assertNotNull(e, "Exception should be created");
+ assertEquals("test message", e.getMessage());
+ assertSame(npe, e.getCause());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/Log4jEventHistory.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/Log4jEventHistory.java b/wicket-core/src/test/java/org/apache/wicket/util/Log4jEventHistory.java
index a0c17e2..8d87ea9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/Log4jEventHistory.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/Log4jEventHistory.java
@@ -26,7 +26,7 @@ import org.apache.log4j.spi.LoggingEvent;
/**
* Log the log4j messages for further assertions
* */
-public class Log4jEventHistory extends AppenderSkeleton
+class Log4jEventHistory extends AppenderSkeleton
{
private List<LoggingEvent> history = new ArrayList<LoggingEvent>();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/cookies/CookieUtilsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/cookies/CookieUtilsTest.java b/wicket-core/src/test/java/org/apache/wicket/util/cookies/CookieUtilsTest.java
index ab7f8ad..9dc3347 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/cookies/CookieUtilsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/cookies/CookieUtilsTest.java
@@ -16,31 +16,30 @@
*/
package org.apache.wicket.util.cookies;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-
import javax.servlet.http.Cookie;
import org.apache.wicket.Page;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.util.cookies.CookieValuePersisterTestPage.TestForm;
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 Juergen Donnerstag
*/
-public class CookieUtilsTest extends WicketTestCase
+class CookieUtilsTest extends WicketTestCase
{
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
tester.startPage(CookieValuePersisterTestPage.class);
}
@@ -51,7 +50,7 @@ public class CookieUtilsTest extends WicketTestCase
*/
@SuppressWarnings({ "unchecked" })
@Test
- public void test1() throws Exception
+ void test1() throws Exception
{
// How does the test work: Make sure you have a page, form and form component properly set
// up (getRelativePath() etc.). See #before().
@@ -127,7 +126,7 @@ public class CookieUtilsTest extends WicketTestCase
}
@Test
- public void saveLoadValue()
+ void saveLoadValue()
{
CookieUtils utils = new CookieUtils();
String value1 = "value one";
@@ -135,11 +134,11 @@ public class CookieUtilsTest extends WicketTestCase
utils.save(key, value1);
before(); // execute a request cycle, so the response cookie is send with the next request
String result = utils.load(key);
- assertThat(result, is(equalTo(value1)));
+ assertEquals(value1, result);
}
@Test
- public void defaults()
+ void defaults()
{
CookieDefaults defaults = new CookieDefaults();
defaults.setComment("A comment");
@@ -153,7 +152,7 @@ public class CookieUtilsTest extends WicketTestCase
utils.save(key, value1);
before(); // execute a request cycle, so the response cookie is send with the next request
Cookie result = utils.getCookie(key);
- assertThat(result.getComment(), is(equalTo(defaults.getComment())));
+ assertEquals(defaults.getComment(), result.getComment());
}
private void copyCookieFromResponseToRequest()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/cookies/CookieValuePersisterTestPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/cookies/CookieValuePersisterTestPage.java b/wicket-core/src/test/java/org/apache/wicket/util/cookies/CookieValuePersisterTestPage.java
index 7aa134b..9144162 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/cookies/CookieValuePersisterTestPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/cookies/CookieValuePersisterTestPage.java
@@ -56,7 +56,7 @@ public class CookieValuePersisterTestPage extends WebPage
* @param id
* Name of form
*/
- public TestForm(final String id)
+ TestForm(final String id)
{
super(id);
add(new TextField<String>("input", new Model<String>("test")));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/cookies/PreserveRequestCookieAfterLinkClickTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/cookies/PreserveRequestCookieAfterLinkClickTest.java b/wicket-core/src/test/java/org/apache/wicket/util/cookies/PreserveRequestCookieAfterLinkClickTest.java
index 9d5213c..fde9098 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/cookies/PreserveRequestCookieAfterLinkClickTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/cookies/PreserveRequestCookieAfterLinkClickTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.util.cookies;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import javax.servlet.http.Cookie;
import org.apache.wicket.MarkupContainer;
@@ -25,15 +27,15 @@ 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;
/**
* Test for https://issues.apache.org/jira/browse/WICKET-5425
*/
-public class PreserveRequestCookieAfterLinkClickTest extends WicketTestCase
+class PreserveRequestCookieAfterLinkClickTest extends WicketTestCase
{
@Test
- public void cookiesTransferAfterClickingLink()
+ void cookiesTransferAfterClickingLink()
{
Cookie testCookie = new Cookie("lostCookie", "lostValue");
testCookie.setMaxAge(1);
@@ -48,9 +50,9 @@ public class PreserveRequestCookieAfterLinkClickTest extends WicketTestCase
assertEquals("lostValue", firstCookie.getValue());
}
- public static class Page1 extends WebPage implements IMarkupResourceStreamProvider
+ public static class Page1 extends WebPage implements IMarkupResourceStreamProvider
{
- public Page1()
+ public Page1()
{
add(new Link<Void>("testCookieTransfer")
{
@@ -68,7 +70,7 @@ public class PreserveRequestCookieAfterLinkClickTest extends WicketTestCase
}
}
- public static class Page2 extends WebPage implements IMarkupResourceStreamProvider
+ public static class Page2 extends WebPage implements IMarkupResourceStreamProvider
{
@Override
public IResourceStream getMarkupResourceStream(MarkupContainer container, Class<?> containerClass)
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/cookies/SetCookieAndRedirectStatefullTestPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/cookies/SetCookieAndRedirectStatefullTestPage.java b/wicket-core/src/test/java/org/apache/wicket/util/cookies/SetCookieAndRedirectStatefullTestPage.java
index 9c717e8..0af469b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/cookies/SetCookieAndRedirectStatefullTestPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/cookies/SetCookieAndRedirectStatefullTestPage.java
@@ -33,7 +33,7 @@ public class SetCookieAndRedirectStatefullTestPage extends WebPage
private static final long serialVersionUID = 1L;
/** */
- public static final String cookieName = "CookieValuePersisterStatelessTestPage";
+ private static final String cookieName = "CookieValuePersisterStatelessTestPage";
private IModel<String> inputModel;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/cookies/SetCookieAndRedirectStatelessTestPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/cookies/SetCookieAndRedirectStatelessTestPage.java b/wicket-core/src/test/java/org/apache/wicket/util/cookies/SetCookieAndRedirectStatelessTestPage.java
index 0b921a1..665bd9d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/cookies/SetCookieAndRedirectStatelessTestPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/cookies/SetCookieAndRedirectStatelessTestPage.java
@@ -34,7 +34,7 @@ public class SetCookieAndRedirectStatelessTestPage extends WebPage
private static final long serialVersionUID = 1L;
/** */
- public static final String cookieName = "CookieValuePersisterStatelessTestPage";
+ private static final String cookieName = "CookieValuePersisterStatelessTestPage";
private IModel<String> inputModel;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/cookies/SetCookieAndRedirectTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/cookies/SetCookieAndRedirectTest.java b/wicket-core/src/test/java/org/apache/wicket/util/cookies/SetCookieAndRedirectTest.java
index 5a253bc..4429c0c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/cookies/SetCookieAndRedirectTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/cookies/SetCookieAndRedirectTest.java
@@ -16,21 +16,22 @@
*/
package org.apache.wicket.util.cookies;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.List;
import javax.servlet.http.Cookie;
import org.apache.wicket.Page;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests setting a cookie and calling setResponsePage() in the same request.
*
* @author Bertrand Guay-Paquet
*/
-public class SetCookieAndRedirectTest extends WicketTestCase
+class SetCookieAndRedirectTest extends WicketTestCase
{
private static final String cookieValue = "cookieValue";
@@ -38,7 +39,7 @@ public class SetCookieAndRedirectTest extends WicketTestCase
* Validate proper cookie value set with stateful page
*/
@Test
- public void statefulPage()
+ void statefulPage()
{
tester.startPage(SetCookieAndRedirectStatefullTestPage.class);
FormTester formTester = tester.newFormTester("form");
@@ -55,7 +56,7 @@ public class SetCookieAndRedirectTest extends WicketTestCase
* Validate proper cookie value set with stateless page
*/
@Test
- public void statelessPage()
+ void statelessPage()
{
tester.startPage(SetCookieAndRedirectStatelessTestPage.class);
FormTester formTester = tester.newFormTester("form");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/file/WebApplicationPathTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/file/WebApplicationPathTest.java b/wicket-core/src/test/java/org/apache/wicket/util/file/WebApplicationPathTest.java
index 9532d99..81c288e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/file/WebApplicationPathTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/file/WebApplicationPathTest.java
@@ -16,25 +16,25 @@
*/
package org.apache.wicket.util.file;
-import java.net.URL;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import java.net.URL;
import javax.servlet.ServletContext;
import org.apache.wicket.core.util.file.WebApplicationPath;
import org.apache.wicket.util.resource.IResourceStream;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentMatchers;
-import org.mockito.Matchers;
import org.mockito.Mockito;
/**
* @since 1.5.5
*/
-public class WebApplicationPathTest extends Assert
+class WebApplicationPathTest
{
@Test
- public void doNotServeResourcesFromWebInf() throws Exception
+ void doNotServeResourcesFromWebInf() throws Exception
{
URL webUrl = new URL("file://dummyFile");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/io/SerializableCheckerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/io/SerializableCheckerTest.java b/wicket-core/src/test/java/org/apache/wicket/util/io/SerializableCheckerTest.java
index 0fdce37..8e7d3e1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/io/SerializableCheckerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/io/SerializableCheckerTest.java
@@ -16,28 +16,23 @@
*/
package org.apache.wicket.util.io;
-import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.io.NotSerializableException;
import java.io.Serializable;
-import java.util.Map;
-import java.util.Set;
-import org.apache.wicket.core.util.objects.checker.CheckingObjectOutputStream;
-import org.apache.wicket.core.util.objects.checker.ObjectSerializationChecker;
import org.apache.wicket.core.util.objects.checker.AbstractObjectChecker;
import org.apache.wicket.core.util.objects.checker.CheckingObjectOutputStream;
-import org.apache.wicket.core.util.objects.checker.IObjectChecker;
+import org.apache.wicket.core.util.objects.checker.ObjectSerializationChecker;
import org.apache.wicket.util.value.ValueMap;
-import org.hamcrest.Matchers;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Pedro Santos
*/
-public class SerializableCheckerTest extends Assert
+class SerializableCheckerTest
{
/**
@@ -46,10 +41,11 @@ public class SerializableCheckerTest extends Assert
* @throws IOException
*/
@Test
- public void valueMap() throws IOException
+ void valueMap() throws IOException
{
- CheckingObjectOutputStream checker = new CheckingObjectOutputStream(new ByteArrayOutputStream(),
- new ObjectSerializationChecker(new NotSerializableException()));
+ CheckingObjectOutputStream checker = new CheckingObjectOutputStream(
+ new ByteArrayOutputStream(),
+ new ObjectSerializationChecker(new NotSerializableException()));
checker.writeObject(new ValueMap());
}
@@ -62,15 +58,37 @@ public class SerializableCheckerTest extends Assert
* @throws IOException
*/
@Test
- public void checkObjectsByIdentity() throws IOException
+ void checkObjectsByIdentity() throws IOException
{
CountingChecker countingChecker = new CountingChecker();
- CheckingObjectOutputStream outputStream = new CheckingObjectOutputStream(new ByteArrayOutputStream(), countingChecker);
+ CheckingObjectOutputStream outputStream = new CheckingObjectOutputStream(
+ new ByteArrayOutputStream(), countingChecker);
final IdentityTestType type = new IdentityTestType();
type.member = new SerializableTypeWithMember(type);
outputStream.writeObject(type);
- assertThat(countingChecker.getCount(), is(2));
+ assertEquals(2, countingChecker.getCount());
+ }
+
+ /**
+ * @throws IOException
+ */
+ @Test
+ void nonSerializableTypeDetection() throws IOException
+ {
+ CheckingObjectOutputStream checker = new CheckingObjectOutputStream(
+ new ByteArrayOutputStream(),
+ new ObjectSerializationChecker(new NotSerializableException()));
+ String exceptionMessage = null;
+ try
+ {
+ checker.writeObject(new TestType2());
+ }
+ catch (CheckingObjectOutputStream.ObjectCheckException e)
+ {
+ exceptionMessage = e.getMessage();
+ }
+ assertTrue(exceptionMessage.contains(NonSerializableType.class.getName()));
}
private static class CountingChecker extends AbstractObjectChecker
@@ -100,26 +118,6 @@ public class SerializableCheckerTest extends Assert
}
}
- /**
- * @throws IOException
- */
- @Test
- public void nonSerializableTypeDetection() throws IOException
- {
- CheckingObjectOutputStream checker = new CheckingObjectOutputStream(new ByteArrayOutputStream(),
- new ObjectSerializationChecker(new NotSerializableException()));
- String exceptionMessage = null;
- try
- {
- checker.writeObject(new TestType2());
- }
- catch (CheckingObjectOutputStream.ObjectCheckException e)
- {
- exceptionMessage = e.getMessage();
- }
- assertTrue(exceptionMessage.contains(NonSerializableType.class.getName()));
- }
-
private static class IdentityTestType implements Serializable
{
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/lang/Country2.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/lang/Country2.java b/wicket-core/src/test/java/org/apache/wicket/util/lang/Country2.java
index 6f78975..04ffbad 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/lang/Country2.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/lang/Country2.java
@@ -19,7 +19,7 @@ package org.apache.wicket.util.lang;
/**
* @author jcompagner
*/
-public class Country2 extends Country
+class Country2 extends Country
{
private final Country country;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/lang/Document.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/lang/Document.java b/wicket-core/src/test/java/org/apache/wicket/util/lang/Document.java
index 11c05fd..1b59337 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/lang/Document.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/lang/Document.java
@@ -19,7 +19,7 @@ package org.apache.wicket.util.lang;
import java.util.HashMap;
import java.util.Map;
-public class Document {
+class Document {
private Map<String, Object> values = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java b/wicket-core/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
index 5041696..0f11b13 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
@@ -16,6 +16,14 @@
*/
package org.apache.wicket.util.lang;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -41,9 +49,9 @@ import org.apache.wicket.util.convert.ConversionException;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.convert.converter.AbstractConverter;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.After;
-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;
/**
* @author jcompagner
@@ -60,8 +68,8 @@ public class PropertyResolverTest extends WicketTestCase
/**
* @throws Exception
*/
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
person = new Person();
}
@@ -69,8 +77,8 @@ public class PropertyResolverTest extends WicketTestCase
/**
* @throws Exception
*/
- @After
- public void after()
+ @AfterEach
+ void after()
{
PropertyResolver.destroy(tester.getApplication());
}
@@ -79,7 +87,7 @@ public class PropertyResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void simpleExpression() throws Exception
+ void simpleExpression() throws Exception
{
String name = (String) PropertyResolver.getValue("name", person);
assertNull(name);
@@ -92,8 +100,8 @@ public class PropertyResolverTest extends WicketTestCase
/**
* @throws Exception
*/
- @Test(expected = ConversionException.class)
- public void primitiveValue() throws Exception
+ @Test
+ void primitiveValue() throws Exception
{
Integer integer = (Integer)PropertyResolver.getValue("age", person);
assertTrue(integer == 0);
@@ -102,16 +110,16 @@ public class PropertyResolverTest extends WicketTestCase
integer = (Integer)PropertyResolver.getValue("age", person);
assertTrue(integer == 10);
- PropertyResolver.setValue("age", person, null, CONVERTER);
- fail("primitive type can't be set to null");
-
+ assertThrows(ConversionException.class, () -> {
+ PropertyResolver.setValue("age", person, null, CONVERTER);
+ });
}
/**
* @throws Exception
*/
@Test
- public void pathExpression() throws Exception
+ void pathExpression() throws Exception
{
person.setAddress(new Address());
PropertyResolver.setValue("address.street", person, "wicket-street", CONVERTER);
@@ -124,7 +132,7 @@ public class PropertyResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void testNull() throws Exception
+ void testNull() throws Exception
{
String street = (String)PropertyResolver.getValue("address.street", person);
assertNull(street);
@@ -134,7 +142,7 @@ public class PropertyResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void nullCreation() throws Exception
+ void nullCreation() throws Exception
{
PropertyResolver.setValue("address.street", person, "wicket-street", CONVERTER);
String street = (String)PropertyResolver.getValue("address.street", person);
@@ -154,7 +162,7 @@ public class PropertyResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void getterOnly() throws Exception
+ void getterOnly() throws Exception
{
PropertyResolver.setValue("country", person, new Country("US"), CONVERTER);
PropertyResolver.getValue("country.name", person);
@@ -172,7 +180,7 @@ public class PropertyResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void pathExpressionWithConversion() throws Exception
+ void pathExpressionWithConversion() throws Exception
{
person.setAddress(new Address());
PropertyResolver.setValue("address.number", person, "10", CONVERTER);
@@ -194,7 +202,7 @@ public class PropertyResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void mapLookup() throws Exception
+ void mapLookup() throws Exception
{
Address address = new Address();
PropertyResolver.setValue("addressMap", person, new HashMap<String, Address>(), CONVERTER);
@@ -208,7 +216,7 @@ public class PropertyResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void mapWithDotLookup() throws Exception
+ void mapWithDotLookup() throws Exception
{
Address address = new Address();
HashMap<String, Address> hm = new HashMap<String, Address>();
@@ -225,7 +233,7 @@ public class PropertyResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void listLookup() throws Exception
+ void listLookup() throws Exception
{
PropertyResolver.setValue("addressList", person, new ArrayList<Address>(), CONVERTER);
PropertyResolver.setValue("addressList.0", person, new Address(), CONVERTER);
@@ -243,7 +251,7 @@ public class PropertyResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void arrayLookup() throws Exception
+ void arrayLookup() throws Exception
{
PropertyResolver.setValue("addressArray", person, new Address[] { new Address(), null },
CONVERTER);
@@ -260,7 +268,7 @@ public class PropertyResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void arrayLookupByBrackets() throws Exception
+ void arrayLookupByBrackets() throws Exception
{
PropertyResolver.setValue("addressArray", person, new Address[] { new Address(), null },
CONVERTER);
@@ -277,7 +285,7 @@ public class PropertyResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void propertyByIndexLookup() throws Exception
+ void propertyByIndexLookup() throws Exception
{
PropertyResolver.setValue("addressAt.0", person, new Address(), CONVERTER);
PropertyResolver.setValue("addressAt.0.street", person, "wicket-street", CONVERTER);
@@ -289,7 +297,7 @@ public class PropertyResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void getPropertyByNotExistingIndexArrayLookup() throws Exception
+ void getPropertyByNotExistingIndexArrayLookup() throws Exception
{
PropertyResolver.setValue("addressArray", person, new Address[] { }, CONVERTER);
String street = (String)PropertyResolver.getValue("addressArray.0.street", person);
@@ -302,7 +310,7 @@ public class PropertyResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void getPropertyByNotExistingIndexListLookup() throws Exception
+ void getPropertyByNotExistingIndexListLookup() throws Exception
{
PropertyResolver.setValue("addressList", person, new ArrayList<Address>(), CONVERTER);
String street = (String)PropertyResolver.getValue("addressList.0.street", person);
@@ -315,7 +323,7 @@ public class PropertyResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void getIndexPropertyDirectly() throws Exception
+ void getIndexPropertyDirectly() throws Exception
{
Address address = new Address();
Address[] addresses = new Address[] { address };
@@ -328,7 +336,7 @@ public class PropertyResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void listSizeLookup() throws Exception
+ void listSizeLookup() throws Exception
{
List<Address> addresses = new ArrayList<Address>();
addresses.add(new Address());
@@ -345,7 +353,7 @@ public class PropertyResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void mapSizeLookup() throws Exception
+ void mapSizeLookup() throws Exception
{
Map<String, Address> addresses = new HashMap<String, Address>();
Address address = new Address();
@@ -362,7 +370,7 @@ public class PropertyResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void arraySizeLookup() throws Exception
+ void arraySizeLookup() throws Exception
{
person.setAddressArray(new Address[] { new Address(), new Address() });
Object size = PropertyResolver.getValue("addressArray.length", person);
@@ -375,7 +383,7 @@ public class PropertyResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void methodLookup() throws Exception
+ void methodLookup() throws Exception
{
Address[] addresses = new Address[] { new Address(), new Address() };
person.setAddressArray(addresses);
@@ -387,7 +395,7 @@ public class PropertyResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void field() throws Exception
+ void field() throws Exception
{
Address address = new Address();
PropertyResolver.setValue("address2", person, address, CONVERTER);
@@ -409,7 +417,7 @@ public class PropertyResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void testPrivateField() throws Exception
+ void testPrivateField() throws Exception
{
Address address = new Address();
PropertyResolver.setValue("privateAddress", person, address, CONVERTER);
@@ -421,7 +429,7 @@ public class PropertyResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void privateFieldOfSuperClass() throws Exception
+ void privateFieldOfSuperClass() throws Exception
{
Person2 person2 = new Person2();
Address address = new Address();
@@ -434,7 +442,7 @@ public class PropertyResolverTest extends WicketTestCase
*
*/
@Test
- public void getTargetClass()
+ void getTargetClass()
{
Address address = new Address();
@@ -459,7 +467,7 @@ public class PropertyResolverTest extends WicketTestCase
*
*/
@Test
- public void getTargetField()
+ void getTargetField()
{
Address address = new Address();
@@ -484,7 +492,7 @@ public class PropertyResolverTest extends WicketTestCase
*
*/
@Test
- public void getTargetGetter()
+ void getTargetGetter()
{
Address address = new Address();
@@ -509,7 +517,7 @@ public class PropertyResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void onlyPrimitiveGetter() throws Exception
+ void onlyPrimitiveGetter() throws Exception
{
Person person = new Person();
@@ -524,7 +532,7 @@ public class PropertyResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void onlyStringGetter() throws Exception
+ void onlyStringGetter() throws Exception
{
Person person = new Person();
@@ -539,7 +547,7 @@ public class PropertyResolverTest extends WicketTestCase
*
*/
@Test
- public void getTargetSetter()
+ void getTargetSetter()
{
Address address = new Address();
@@ -561,7 +569,7 @@ public class PropertyResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void overriddenGetter() throws Exception
+ void overriddenGetter() throws Exception
{
Person2 person = new Person2();
person.setName("foo");
@@ -580,7 +588,7 @@ public class PropertyResolverTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void propertyClassWithSubType() throws Exception
+ void propertyClassWithSubType() throws Exception
{
Person person = new Person();
assertEquals(String.class, PropertyResolver.getPropertyClass("country.name", person));
@@ -614,7 +622,7 @@ public class PropertyResolverTest extends WicketTestCase
* Tests the PropertyModel with vector.
*/
@Test
- public void propertyModel()
+ void propertyModel()
{
String value = (String)PropertyResolver.getValue("testValue", new InnerVectorPOJO());
assertEquals("vector", value);
@@ -624,7 +632,7 @@ public class PropertyResolverTest extends WicketTestCase
*
*/
@Test
- public void directFieldSetWithDifferentTypeThanGetter()
+ void directFieldSetWithDifferentTypeThanGetter()
{
final DirectFieldSetWithDifferentTypeThanGetter obj = new DirectFieldSetWithDifferentTypeThanGetter();
PropertyResolver.setValue("value", obj, 1, null);
@@ -646,7 +654,7 @@ public class PropertyResolverTest extends WicketTestCase
* @see <a href="https://issues.apache.org/jira/browse/WICKET-1802">WICKET-1802</a>
*/
@Test
- public void conversionExceptionMessageContainsTheObjectPropertyBeingSet()
+ void conversionExceptionMessageContainsTheObjectPropertyBeingSet()
{
try
{
@@ -673,7 +681,7 @@ public class PropertyResolverTest extends WicketTestCase
* WICKET-3441
*/
@Test
- public void dateToStringConverting()
+ void dateToStringConverting()
{
IConverterLocator converterLocator = new ConverterLocator();
Locale locale = Locale.GERMAN;
@@ -694,7 +702,7 @@ public class PropertyResolverTest extends WicketTestCase
* WICKET-3441
*/
@Test
- public void dateToLongConverting()
+ void dateToLongConverting()
{
ConverterLocator converterLocator = new ConverterLocator();
final IConverter<Date> dateConverter = converterLocator.get(Date.class);
@@ -751,7 +759,7 @@ public class PropertyResolverTest extends WicketTestCase
* WICKET-5623 custom properties
*/
@Test
- public void custom() {
+ void custom() {
Document document = new Document();
document.setType("type");
document.setProperty("string", "string");
@@ -766,7 +774,7 @@ public class PropertyResolverTest extends WicketTestCase
assertEquals("string", PropertyResolver.getValue("string", document));
assertEquals("string2", PropertyResolver.getValue("nested.string", document));
}
-
+
class CustomGetAndSetLocator implements IPropertyLocator {
private IPropertyLocator locator = new DefaultPropertyLocator();
@@ -781,7 +789,7 @@ public class PropertyResolverTest extends WicketTestCase
}
return getAndSet;
}
-
+
public class DocumentPropertyGetAndSet extends AbstractGetAndSet {
private String name;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/lang/WicketObjectsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/lang/WicketObjectsTest.java b/wicket-core/src/test/java/org/apache/wicket/util/lang/WicketObjectsTest.java
index 2862945..0808a91 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/lang/WicketObjectsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/lang/WicketObjectsTest.java
@@ -16,6 +16,12 @@
*/
package org.apache.wicket.util.lang;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.io.Serializable;
import org.apache.wicket.core.util.lang.WicketObjects;
@@ -23,21 +29,20 @@ import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Tests the WicketObjects class.
*
* @author Martijn Dashorst
*/
-public class WicketObjectsTest extends WicketTestCase
+class WicketObjectsTest extends WicketTestCase
{
/**
* Test method for WicketObjects.cloneModel(null)
*/
@Test
- public void cloneModelNull()
+ void cloneModelNull()
{
Object clone = WicketObjects.cloneModel(null);
assertEquals(null, clone);
@@ -47,7 +52,7 @@ public class WicketObjectsTest extends WicketTestCase
* Test method for WicketObjects.cloneObject(null)
*/
@Test
- public void cloneObjectNull()
+ void cloneObjectNull()
{
Object clone = WicketObjects.cloneObject(null);
assertEquals(null, clone);
@@ -57,7 +62,7 @@ public class WicketObjectsTest extends WicketTestCase
* Test method for WicketObjects.cloneModel(String)
*/
@Test
- public void cloneModelString()
+ void cloneModelString()
{
String cloneMe = "Mini-me";
@@ -70,7 +75,7 @@ public class WicketObjectsTest extends WicketTestCase
* Test method for WicketObjects.cloneObject(String)
*/
@Test
- public void cloneObjectString()
+ void cloneObjectString()
{
String cloneMe = "Mini-me";
@@ -83,7 +88,7 @@ public class WicketObjectsTest extends WicketTestCase
* Test method for WicketObjects.cloneModel(nonSerializableObject)
*/
@Test
- public void cloneModelNonSerializableObject()
+ void cloneModelNonSerializableObject()
{
Object cloneMe = new Object();
@@ -102,7 +107,7 @@ public class WicketObjectsTest extends WicketTestCase
* Test method for WicketObjects.cloneObject(nonSerializableObject)
*/
@Test
- public void cloneObjectNonSerializableObject()
+ void cloneObjectNonSerializableObject()
{
Object cloneMe = new Object();
@@ -122,7 +127,7 @@ public class WicketObjectsTest extends WicketTestCase
*/
@SuppressWarnings({ "unchecked" })
@Test
- public void componentClone()
+ void componentClone()
{
PropertyModel<String> pm = new PropertyModel<>(new TextField<>("test",
Model.of("test")), "modelObject");
@@ -134,7 +139,7 @@ public class WicketObjectsTest extends WicketTestCase
* Test method for 'org.apache.wicket.util.lang.Objects.clone(Object)'
*/
@Test
- public void cloneCloneObject()
+ void cloneCloneObject()
{
CloneObject cloneMe = new CloneObject();
cloneMe.nr = 1;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java b/wicket-core/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java
index a8e7628..26cfc9d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.wicket.util.markup.xhtml;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Checks that the html markup files are well formed xml-s.
*
* @author akiraly
*/
-public class WellFormedXmlTest extends WellFormedXmlTestCase
+class WellFormedXmlTest extends WellFormedXmlTestCase
{
@Test
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/resource/PathTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/resource/PathTest.java b/wicket-core/src/test/java/org/apache/wicket/util/resource/PathTest.java
index 6dd3d0f..44d8f90 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/resource/PathTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/resource/PathTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.wicket.util.resource;
+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 java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -25,25 +29,12 @@ import java.util.Arrays;
import org.apache.wicket.util.file.Path;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class PathTest extends WicketTestCase
+class PathTest extends WicketTestCase
{
- @Test
- public void loadFromRootUsingSubpathInFilename() throws Exception
- {
- final String contents = PathTest.class.getName() + ": loaded from root";
- final File file = createTempFile(contents);
- final File root = findRoot(file);
- final Path path = new Path(root.getCanonicalPath());
- String relative = root.toURI().relativize(file.toURI()).getPath();
- IResourceStream rs = path.find(PathTest.class, relative);
- assertNotNull(rs);
- assertContents(contents, rs);
- }
-
- public static void assertContents(String expectedContents, IResourceStream rs)
+ private static void assertContents(String expectedContents, IResourceStream rs)
throws ResourceStreamNotFoundException, IOException
{
InputStream in = rs.getInputStream();
@@ -53,10 +44,10 @@ public class PathTest extends WicketTestCase
final int expectedLength = expectedBytes.length;
byte[] buf = new byte[expectedLength * 2];
int read = in.read(buf, 0, buf.length);
- assertEquals("contents do not match", expectedLength, read);
+ assertEquals(expectedLength, read, "contents do not match");
byte[] buf2 = new byte[expectedLength];
System.arraycopy(buf, 0, buf2, 0, expectedLength);
- assertTrue("contents do not match", Arrays.equals(expectedBytes, buf2));
+ assertTrue(Arrays.equals(expectedBytes, buf2), "contents do not match");
}
finally
{
@@ -64,19 +55,7 @@ public class PathTest extends WicketTestCase
}
}
- @Test
- public void loadFilenameFromPath() throws Exception
- {
- final String contents = PathTest.class.getName() + ": loaded from prefix";
- final File file = createTempFile(contents);
- final File parent = file.getParentFile();
- final Path path = new Path(parent.getCanonicalPath());
- IResourceStream rs = path.find(PathTest.class, file.getName());
- assertNotNull(rs);
- assertContents(contents, rs);
- }
-
- public static File createTempFile(String contents) throws IOException
+ private static File createTempFile(String contents) throws IOException
{
FileOutputStream out = null;
try
@@ -96,7 +75,7 @@ public class PathTest extends WicketTestCase
}
}
- public static File findRoot(File file)
+ private static File findRoot(File file)
{
final File parent = file.getParentFile();
if (parent == null)
@@ -108,4 +87,29 @@ public class PathTest extends WicketTestCase
return findRoot(parent);
}
}
+
+ @Test
+ void loadFromRootUsingSubpathInFilename() throws Exception
+ {
+ final String contents = PathTest.class.getName() + ": loaded from root";
+ final File file = createTempFile(contents);
+ final File root = findRoot(file);
+ final Path path = new Path(root.getCanonicalPath());
+ String relative = root.toURI().relativize(file.toURI()).getPath();
+ IResourceStream rs = path.find(PathTest.class, relative);
+ assertNotNull(rs);
+ assertContents(contents, rs);
+ }
+
+ @Test
+ void loadFilenameFromPath() throws Exception
+ {
+ final String contents = PathTest.class.getName() + ": loaded from prefix";
+ final File file = createTempFile(contents);
+ final File parent = file.getParentFile();
+ final Path path = new Path(parent.getCanonicalPath());
+ IResourceStream rs = path.find(PathTest.class, file.getName());
+ assertNotNull(rs);
+ assertContents(contents, rs);
+ }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/resource/ResourceStreamLocatorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/resource/ResourceStreamLocatorTest.java b/wicket-core/src/test/java/org/apache/wicket/util/resource/ResourceStreamLocatorTest.java
index 66cb967..80ae833 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/resource/ResourceStreamLocatorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/resource/ResourceStreamLocatorTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.util.resource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import java.io.File;
import java.io.IOException;
import java.net.URI;
@@ -30,8 +33,7 @@ import org.apache.wicket.core.util.resource.locator.ResourceStreamLocator;
import org.apache.wicket.util.file.IResourceFinder;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* ResourceStreamLocator test. Tests construction of resource names with
@@ -64,8 +66,8 @@ public class ResourceStreamLocatorTest extends WicketTestCase
* @param locale
* @param extension
*/
- public void createAndTestResource(IResourceFinder sourcePath, String style, String variation,
- Locale locale, String extension)
+ private void createAndTestResource(IResourceFinder sourcePath, String style, String variation,
+ Locale locale, String extension)
{
IResourceStreamLocator locator = new ResourceStreamLocator(sourcePath);
IResourceStream resource = locator.locate(this.getClass(), this.getClass()
@@ -78,7 +80,7 @@ public class ResourceStreamLocatorTest extends WicketTestCase
*
* @param sourcePath
*/
- public void executeMultiple(IResourceFinder sourcePath)
+ private void executeMultiple(IResourceFinder sourcePath)
{
createAndTestResource(sourcePath, null, null, null, "");
createAndTestResource(sourcePath, "style", null, null, "_style");
@@ -112,7 +114,7 @@ public class ResourceStreamLocatorTest extends WicketTestCase
* Test locating a resource.
*/
@Test
- public void locateInClasspath()
+ void locateInClasspath()
{
// Execute without source path
executeMultiple(new ClassPathResourceFinder(""));
@@ -133,7 +135,7 @@ public class ResourceStreamLocatorTest extends WicketTestCase
*/
private void compareFilename(IResourceStream resource, String name)
{
- assertNotNull("Did not find resource: " + name, resource);
+ assertNotNull(resource, "Did not find resource: " + name);
String filename = Strings.replaceAll(this.getClass().getName(), ".", "/").toString();
filename += name + ".txt";
@@ -143,7 +145,7 @@ public class ResourceStreamLocatorTest extends WicketTestCase
{
filename = Strings.afterLast(filename, '/');
resourcePath = Strings.afterLast(resourcePath, '/');
- assertEquals("Did not find resource", filename, resourcePath);
+ assertEquals(filename, resourcePath, "Did not find resource");
}
}
@@ -154,7 +156,7 @@ public class ResourceStreamLocatorTest extends WicketTestCase
* the resource
* @return the path of the resource as a string
*/
- public static String getPath(IResourceStream resource)
+ private static String getPath(IResourceStream resource)
{
if (resource instanceof UrlResourceStream)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/resource/UrlResourceStreamTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/resource/UrlResourceStreamTest.java b/wicket-core/src/test/java/org/apache/wicket/util/resource/UrlResourceStreamTest.java
index 5a066d9..b724dd4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/resource/UrlResourceStreamTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/resource/UrlResourceStreamTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.util.resource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
@@ -25,20 +27,19 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.wicket.core.util.resource.UrlResourceStream;
import org.apache.wicket.util.lang.Bytes;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Kent Tong
*/
-public class UrlResourceStreamTest extends Assert {
+class UrlResourceStreamTest {
/**
* lastModified() shouldn't change the content length if the file isn't really changed.
*
* @throws IOException
*/
@Test
- public void lastModifiedForResourceInJar() throws IOException {
+ void lastModifiedForResourceInJar() throws IOException {
String anyClassInJarFile = "/java/lang/String.class";
URL url = getClass().getResource(anyClassInJarFile);
UrlResourceStream stream = new UrlResourceStream(url);
@@ -59,7 +60,7 @@ public class UrlResourceStreamTest extends Assert {
* @throws ResourceStreamNotFoundException
*/
@Test
- public void loadJustOnce() throws IOException, ResourceStreamNotFoundException {
+ void loadJustOnce() throws IOException, ResourceStreamNotFoundException {
String anyClassInJarFile = "/java/lang/String.class";
URL realURL = getClass().getResource(anyClassInJarFile);
@@ -116,8 +117,8 @@ public class UrlResourceStreamTest extends Assert {
private final URL realURL;
- public CountingURLStreamHandler(URL realURL, AtomicInteger connectCounter,
- AtomicInteger streamCounter) {
+ CountingURLStreamHandler(URL realURL, AtomicInteger connectCounter,
+ AtomicInteger streamCounter) {
this.connectCounter = connectCounter;
this.streamCounter = streamCounter;
this.realURL = realURL;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/resource/locator/CachingResourceStreamLocatorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/resource/locator/CachingResourceStreamLocatorTest.java b/wicket-core/src/test/java/org/apache/wicket/util/resource/locator/CachingResourceStreamLocatorTest.java
index ca01230..21b4cf5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/resource/locator/CachingResourceStreamLocatorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/resource/locator/CachingResourceStreamLocatorTest.java
@@ -16,10 +16,8 @@
*/
package org.apache.wicket.util.resource.locator;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -38,22 +36,21 @@ import org.apache.wicket.core.util.resource.locator.caching.CachingResourceStrea
import org.apache.wicket.util.resource.FileResourceStream;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for CachingResourceStreamLocator
*
* <a href="https://issues.apache.org/jira/browse/WICKET-3511">WICKET-3511</a>
*/
-public class CachingResourceStreamLocatorTest
+class CachingResourceStreamLocatorTest
{
/**
* Tests NullResourceStreamReference
*/
@Test
- public void notExistingResource()
+ void notExistingResource()
{
IResourceStreamLocator resourceStreamLocator = mock(IResourceStreamLocator.class);
@@ -73,7 +70,7 @@ public class CachingResourceStreamLocatorTest
* Tests strict before non-strict matching without a specific locale.
*/
@Test
- public void strictBeforeNonStrictMatchingWithoutLocaleDoesntResultInInvalidNonStrictMatch()
+ void strictBeforeNonStrictMatchingWithoutLocaleDoesntResultInInvalidNonStrictMatch()
{
IResourceStreamLocator resourceStreamLocator = new ResourceStreamLocator(
new ClassPathResourceFinder(""));
@@ -91,20 +88,20 @@ public class CachingResourceStreamLocatorTest
IResourceStream strictLocate = cachingLocator.locate(AbstractDefaultAjaxBehavior.class,
filename, style, variation, locale, extension, true);
- assertThat(strictLocate, is(not(nullValue())));
+ assertNotNull(strictLocate);
// followed by a non-strict search for the same resource also finds it
IResourceStream nonStrictLocate = cachingLocator.locate(AbstractDefaultAjaxBehavior.class,
filename, style, variation, locale, extension, false);
- assertThat(nonStrictLocate, is(not(nullValue())));
+ assertNotNull(nonStrictLocate);
}
/**
* Tests strict before non-strict matching with a specific locale.
*/
@Test
- public void strictMatchingDoesntInvalidateNonStrictMatching()
+ void strictMatchingDoesntInvalidateNonStrictMatching()
{
IResourceStreamLocator resourceStreamLocator = new ResourceStreamLocator(
new ClassPathResourceFinder(""));
@@ -121,20 +118,20 @@ public class CachingResourceStreamLocatorTest
// a strict lookup of a localized resource should not find the non-localized resource
IResourceStream strictLocate = cachingLocator.locate(AbstractDefaultAjaxBehavior.class,
filename, style, variation, locale, extension, true);
- assertThat(strictLocate, is(nullValue()));
+ assertNull(strictLocate);
// but a non-strict lookup with a locale should fall back to the non-localized resource
IResourceStream nonStrictLocate = cachingLocator.locate(AbstractDefaultAjaxBehavior.class,
filename, style, variation, locale, extension, false);
- assertThat(nonStrictLocate, is(not(nullValue())));
+ assertNotNull(nonStrictLocate);
}
/**
* Tests non-strict before strict matching with a specific locale.
*/
@Test
- public void nonStrictMatchingDoesntResultInInvalidStrictMatch()
+ void nonStrictMatchingDoesntResultInInvalidStrictMatch()
{
IResourceStreamLocator resourceStreamLocator = new ResourceStreamLocator(
new ClassPathResourceFinder(""));
@@ -152,21 +149,21 @@ public class CachingResourceStreamLocatorTest
IResourceStream nonStrictLocate = cachingLocator.locate(AbstractDefaultAjaxBehavior.class,
filename, style, variation, locale, extension, false);
- assertThat(nonStrictLocate, is(not(nullValue())));
+ assertNotNull(nonStrictLocate);
// but a strict lookup with a specific locale should not fall back to the non-localized
// resource
IResourceStream strictLocate = cachingLocator.locate(AbstractDefaultAjaxBehavior.class,
filename, style, variation, locale, extension, true);
- assertThat(strictLocate, is(nullValue()));
+ assertNull(strictLocate);
}
/**
* Tests FileResourceStreamReference
*/
@Test
- public void fileResource()
+ void fileResource()
{
IResourceStreamLocator resourceStreamLocator = mock(IResourceStreamLocator.class);
@@ -190,7 +187,7 @@ public class CachingResourceStreamLocatorTest
* Tests two FileResourceStreamReferences with different extensions
*/
@Test
- public void fileResourceDifferentExtensions()
+ void fileResourceDifferentExtensions()
{
IResourceStreamLocator resourceStreamLocator = mock(IResourceStreamLocator.class);
@@ -219,7 +216,7 @@ public class CachingResourceStreamLocatorTest
* @throws Exception
*/
@Test
- public void urlResource() throws Exception
+ void urlResource() throws Exception
{
IResourceStreamLocator resourceStreamLocator = mock(IResourceStreamLocator.class);
@@ -242,7 +239,7 @@ public class CachingResourceStreamLocatorTest
* UrlResourceStream). These should <strong>not</strong> be cached.
*/
@Test
- public void lightweightResource()
+ void lightweightResource()
{
IResourceStreamLocator resourceStreamLocator = mock(IResourceStreamLocator.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/resource/locator/ResourceNameIteratorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/resource/locator/ResourceNameIteratorTest.java b/wicket-core/src/test/java/org/apache/wicket/util/resource/locator/ResourceNameIteratorTest.java
index 6c804b1..0212315 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/resource/locator/ResourceNameIteratorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/resource/locator/ResourceNameIteratorTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.wicket.util.resource.locator;
+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 java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
@@ -26,19 +30,18 @@ import org.apache.wicket.core.util.resource.locator.LocaleResourceNameIterator;
import org.apache.wicket.core.util.resource.locator.ResourceNameIterator;
import org.apache.wicket.core.util.resource.locator.StyleAndVariationResourceNameIterator;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* @author Pedro Santos
*/
-public class ResourceNameIteratorTest extends WicketTestCase
+class ResourceNameIteratorTest extends WicketTestCase
{
/**
* Asserting no duplicated locale sufix get iterated
*/
@Test
- public void localeResourceNameIterator()
+ void localeResourceNameIterator()
{
Locale locale = new Locale("a", "b", "c");
LocaleResourceNameIterator iterator = new LocaleResourceNameIterator(locale, false);
@@ -81,7 +84,7 @@ public class ResourceNameIteratorTest extends WicketTestCase
*
*/
@Test
- public void styleAndVariationResourceNameIterator()
+ void styleAndVariationResourceNameIterator()
{
StyleAndVariationResourceNameIterator iterator = new StyleAndVariationResourceNameIterator(
null, null);
@@ -120,7 +123,7 @@ public class ResourceNameIteratorTest extends WicketTestCase
*
*/
@Test
- public void extensionResourceNameIterator()
+ void extensionResourceNameIterator()
{
ExtensionResourceNameIterator iterator = new ExtensionResourceNameIterator(null);
assertTrue(iterator.hasNext());
@@ -146,7 +149,7 @@ public class ResourceNameIteratorTest extends WicketTestCase
*
*/
@Test
- public void noDuplicateVariations()
+ void noDuplicateVariations()
{
String path = "patch.extension";
String style = null;
@@ -167,7 +170,7 @@ public class ResourceNameIteratorTest extends WicketTestCase
*
*/
@Test
- public void noTrailingDotWhenNoExtension()
+ void noTrailingDotWhenNoExtension()
{
Iterator<String> iterator = new ResourceNameIterator("foo", null, null, null, null, false);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/string/JavaScriptStripperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/string/JavaScriptStripperTest.java b/wicket-core/src/test/java/org/apache/wicket/util/string/JavaScriptStripperTest.java
index 1ffe164..adf1417 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/string/JavaScriptStripperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/string/JavaScriptStripperTest.java
@@ -16,20 +16,23 @@
*/
package org.apache.wicket.util.string;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.core.util.string.JavaScriptStripper;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests {@link JavaScriptStripper}
*
* @author <a href="mailto:jbq@apache.org">Jean-Baptiste Quenot</a>
*/
-public class JavaScriptStripperTest extends Assert
+class JavaScriptStripperTest
{
/** */
@Test
- public void unixWICKET501()
+ void unixWICKET501()
{
String s = new JavaScriptStripper().stripCommentsAndWhitespace(" // Handle the common XPath // expression\n if ( !t.indexOf(\"//\") ) {");
assertEquals(" \n if ( !t.indexOf(\"//\") ) {", s);
@@ -37,7 +40,7 @@ public class JavaScriptStripperTest extends Assert
/** */
@Test
- public void dosWICKET501()
+ void dosWICKET501()
{
String s = new JavaScriptStripper().stripCommentsAndWhitespace(" // Handle the common XPath // expression\r\n if ( !t.indexOf(\"//\") ) {");
assertEquals(" \r\nif ( !t.indexOf(\"//\") ) {", s);
@@ -45,7 +48,7 @@ public class JavaScriptStripperTest extends Assert
/** */
@Test
- public void macWICKET501()
+ void macWICKET501()
{
String s = new JavaScriptStripper().stripCommentsAndWhitespace(" // Handle the common XPath // expression\r if ( !t.indexOf(\"//\") ) {");
assertEquals(" \r if ( !t.indexOf(\"//\") ) {", s);
@@ -53,7 +56,7 @@ public class JavaScriptStripperTest extends Assert
/** */
@Test
- public void regexp()
+ void regexp()
{
String s = new JavaScriptStripper().stripCommentsAndWhitespace(" t = jQuery.trim(t).replace( /^\\/\\//i, \"\" );");
assertEquals(" t = jQuery.trim(t).replace( /^\\/\\//i, \"\" );", s);
@@ -61,7 +64,7 @@ public class JavaScriptStripperTest extends Assert
/** */
@Test
- public void regexp2()
+ void regexp2()
{
String s = new JavaScriptStripper().stripCommentsAndWhitespace("foo.replace(/\"//*strip me*/, \"\"); // strip me\rdoFoo();");
assertEquals("foo.replace(/\"/, \"\"); \rdoFoo();", s);
@@ -69,7 +72,7 @@ public class JavaScriptStripperTest extends Assert
/** */
@Test
- public void regexp3()
+ void regexp3()
{
String s = new JavaScriptStripper().stripCommentsAndWhitespace("parseFloat( elem.filter.match(/alpha\\(opacity=(.*)\\)/)[1] ) / 100 : 1;\r//foo");
assertEquals("parseFloat( elem.filter.match(/alpha\\(opacity=(.*)\\)/)[1] ) / 100 : 1;\r",
@@ -78,7 +81,7 @@ public class JavaScriptStripperTest extends Assert
/** */
@Test
- public void regexp4()
+ void regexp4()
{
String before = " attr: /**/ //xyz\n /\\[((?:[\\w-]*:)?[\\w-]+)\\s*(?:([!^$*~|]?=)\\s*((['\"])([^\\4]*?)\\4|([^'\"][^\\]]*?)))?\\]/ after regex";
String after = new JavaScriptStripper().stripCommentsAndWhitespace(before);
@@ -89,7 +92,7 @@ public class JavaScriptStripperTest extends Assert
/** */
@Test
- public void WICKET1806()
+ void WICKET1806()
{
String before = "a = [ /^(\\[) *@?([\\w-]+) *([!*$^~=]*) *('?\"?)(.*?)\\4 *\\]/ ]; b()";
String after = new JavaScriptStripper().stripCommentsAndWhitespace(before);
@@ -100,7 +103,7 @@ public class JavaScriptStripperTest extends Assert
/** */
@Test
- public void WICKET2060_1()
+ void WICKET2060_1()
{
String before = " a b c";
String after = new JavaScriptStripper().stripCommentsAndWhitespace(before);
@@ -110,7 +113,7 @@ public class JavaScriptStripperTest extends Assert
/** */
@Test
- public void WICKET2060_2()
+ void WICKET2060_2()
{
String before = " a \n b c\n\n";
String after = new JavaScriptStripper().stripCommentsAndWhitespace(before);
@@ -120,7 +123,7 @@ public class JavaScriptStripperTest extends Assert
/** */
@Test
- public void WICKET2060_3()
+ void WICKET2060_3()
{
String before = "return this.__unbind__(type, fn);";
String after = new JavaScriptStripper().stripCommentsAndWhitespace(before);
@@ -130,7 +133,7 @@ public class JavaScriptStripperTest extends Assert
/** */
@Test
- public void WICKET4760()
+ void WICKET4760()
{
String before = "x++ //\nx++";
String after = new JavaScriptStripper().stripCommentsAndWhitespace(before);
@@ -140,7 +143,7 @@ public class JavaScriptStripperTest extends Assert
/** */
// @formatter:off
- public static String TESTSTRING2 =
+ private static String TESTSTRING2 =
" var test = function () {\n" +
" var c = \"!=\";\n" +
" /* from jquery 1.5.1 */\n" +
@@ -158,7 +161,7 @@ public class JavaScriptStripperTest extends Assert
/** */
@Test
- public void regExThatStartsWithExclamationMark()
+ void regExThatStartsWithExclamationMark()
{
String result = new JavaScriptStripper().stripCommentsAndWhitespace(TESTSTRING2);
assertFalse(result.contains("This code will be stripped"));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/string/interpolator/PropertyVariableInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/string/interpolator/PropertyVariableInterpolatorTest.java b/wicket-core/src/test/java/org/apache/wicket/util/string/interpolator/PropertyVariableInterpolatorTest.java
index 8438f81..e437501 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/string/interpolator/PropertyVariableInterpolatorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/string/interpolator/PropertyVariableInterpolatorTest.java
@@ -16,22 +16,23 @@
*/
package org.apache.wicket.util.string.interpolator;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.core.util.string.interpolator.PropertyVariableInterpolator;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests {@link PropertyVariableInterpolator}
*
* @author Gerolf Seitz
*/
-public class PropertyVariableInterpolatorTest extends Assert
+class PropertyVariableInterpolatorTest
{
/**
*
*/
@Test
- public void withValue()
+ void withValue()
{
TestClass object = new TestClass("value");
String result = new PropertyVariableInterpolator("${key}", object).toString();
@@ -43,7 +44,7 @@ public class PropertyVariableInterpolatorTest extends Assert
* '$' and '${key}' is interpolated to the respective value
*/
@Test
- public void withValueAndEscape()
+ void withValueAndEscape()
{
TestClass object = new TestClass("3.24");
String result = new PropertyVariableInterpolator("$$${key}", object).toString();
@@ -54,7 +55,7 @@ public class PropertyVariableInterpolatorTest extends Assert
*
*/
@Test
- public void withoutValue()
+ void withoutValue()
{
String result = new PropertyVariableInterpolator("${key}", null).toString();
assertEquals("${key}", result.toString());
@@ -64,7 +65,7 @@ public class PropertyVariableInterpolatorTest extends Assert
{
private final String key;
- public TestClass(String key)
+ TestClass(String key)
{
this.key = key;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/template/CssTemplateTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/template/CssTemplateTest.java b/wicket-core/src/test/java/org/apache/wicket/util/template/CssTemplateTest.java
index 05e1d6f..f60cc77 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/template/CssTemplateTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/template/CssTemplateTest.java
@@ -18,13 +18,13 @@ package org.apache.wicket.util.template;
import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test of {@link CssTemplate}
*/
-public class CssTemplateTest
+class CssTemplateTest
{
/**
@@ -33,7 +33,7 @@ public class CssTemplateTest
* @see <a href="https://issues.apache.org/jira/browse/WICKET-3187">WICKET-3187</a>
*/
@Test
- public void simpleConstructor()
+ void simpleConstructor()
{
new CssTemplate(new TextTemplate()
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/tester/CookiePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/CookiePage.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/CookiePage.java
index fce6756..241e9f6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/CookiePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/CookiePage.java
@@ -16,9 +16,10 @@
*/
package org.apache.wicket.util.tester;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import javax.servlet.http.Cookie;
-import org.junit.Assert;
import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.http.WebResponse;
@@ -52,7 +53,7 @@ public class CookiePage extends DummyHomePage
super.onConfigure();
Cookie cookie = ((WebRequest) getRequest()).getCookie(cookieName);
- Assert.assertEquals(cookieValue, cookie.getValue());
+ assertEquals(cookieValue, cookie.getValue());
WebResponse response = (WebResponse) getResponse();
response.addCookie(cookie);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/tester/FormTesterSubmitLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/FormTesterSubmitLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/FormTesterSubmitLinkTest.java
index 82fa25b..654fce2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/FormTesterSubmitLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/FormTesterSubmitLinkTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.util.tester;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
@@ -30,12 +33,12 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* <a href="https://issues.apache.org/jira/browse/WICKET-3711">WICKET-3711</a>
*/
-public class FormTesterSubmitLinkTest extends WicketTestCase
+class FormTesterSubmitLinkTest extends WicketTestCase
{
/**
* Submit via SubmitLink.
@@ -43,7 +46,7 @@ public class FormTesterSubmitLinkTest extends WicketTestCase
* This should work the same as regular submit
*/
@Test
- public void submitLink()
+ void submitLink()
{
tester.startPage(TestPage.class);
@@ -58,7 +61,7 @@ public class FormTesterSubmitLinkTest extends WicketTestCase
* Submit the form
*/
@Test
- public void regularSubmit()
+ void regularSubmit()
{
tester.startPage(TestPage.class);
@@ -70,7 +73,7 @@ public class FormTesterSubmitLinkTest extends WicketTestCase
}
@Test
- public void radioComponentValueEncoding()
+ void radioComponentValueEncoding()
{
class TestPage extends WebPage implements IMarkupResourceStreamProvider
@@ -80,7 +83,7 @@ public class FormTesterSubmitLinkTest extends WicketTestCase
private String value;
private boolean submitted;
- public TestPage()
+ TestPage()
{
Form<Void> form = new Form<Void>("form");
add(form);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java
index fe152ef..3f91b2c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java
@@ -16,6 +16,13 @@
*/
package org.apache.wicket.util.tester;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
@@ -37,22 +44,21 @@ import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.MockFormFileUploadPage.MockDomainObjectFileUpload;
import org.apache.wicket.util.tester.MockFormPage.MockDomainObject;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Test of FormTester.
*
* @author frankbille
*/
-public class FormTesterTest extends WicketTestCase
+class FormTesterTest extends WicketTestCase
{
/**
* Test that normal use of the formtester (no file uploads) works.
*/
@Test
- public void formTester()
+ void formTester()
{
tester.startPage(MockFormPage.class);
MockFormPage page = (MockFormPage)tester.getLastRenderedPage();
@@ -77,7 +83,7 @@ public class FormTesterTest extends WicketTestCase
/** */
@Test
- public void checkboxValuesCanBeSelectedWithBoolean()
+ void checkboxValuesCanBeSelectedWithBoolean()
{
tester.startPage(MockFormPage.class);
MockFormPage page = (MockFormPage)tester.getLastRenderedPage();
@@ -102,7 +108,7 @@ public class FormTesterTest extends WicketTestCase
* upload to a FileUploadField works.
*/
@Test
- public void addFile()
+ void addFile()
{
tester.startPage(MockFormFileUploadPage.class);
MockFormFileUploadPage page = (MockFormFileUploadPage)tester.getLastRenderedPage();
@@ -126,7 +132,7 @@ public class FormTesterTest extends WicketTestCase
FileUpload fileUpload = page.getFileUpload();
assertNotNull(fileUpload);
- assertTrue("setFile failed, no upload content detected.", fileUpload.getBytes().length > 0);
+ assertTrue(fileUpload.getBytes().length > 0, "setFile failed, no upload content detected.");
assertEquals("pom.xml", fileUpload.getClientFileName());
assertEquals("text/xml", fileUpload.getContentType());
}
@@ -137,7 +143,7 @@ public class FormTesterTest extends WicketTestCase
* upload to a FileUploadField works.
*/
@Test
- public void addBinaryFile()
+ void addBinaryFile()
{
tester.startPage(MockFormFileUploadPage.class);
MockFormFileUploadPage page = (MockFormFileUploadPage)tester.getLastRenderedPage();
@@ -149,8 +155,9 @@ public class FormTesterTest extends WicketTestCase
FormTester formTester = tester.newFormTester("form");
- formTester.setFile("file", new File(getBasedir() +
- "src/test/java/org/apache/wicket/util/tester/bg.jpg"), "image/jpeg");
+ formTester.setFile("file",
+ new File(getBasedir() + "src/test/java/org/apache/wicket/util/tester/bg.jpg"),
+ "image/jpeg");
formTester.setValue("text", "Mock value");
formTester.submit();
@@ -162,9 +169,9 @@ public class FormTesterTest extends WicketTestCase
FileUpload fileUpload = page.getFileUpload();
assertNotNull(fileUpload);
- assertTrue(
+ assertTrue(fileUpload.getBytes().length == 428,
"uploaded content does not have the right size, expected 428, got " +
- fileUpload.getBytes().length, fileUpload.getBytes().length == 428);
+ fileUpload.getBytes().length);
assertEquals("bg.jpg", fileUpload.getClientFileName());
assertEquals("image/jpeg", fileUpload.getContentType());
}
@@ -173,7 +180,7 @@ public class FormTesterTest extends WicketTestCase
* Test that formTester deal with Multipart form correctly when no actual upload
*/
@Test
- public void submitWithoutUploadFile()
+ void submitWithoutUploadFile()
{
// tester.startPage(MockFormFileUploadPage.class, new PageParameters("required=true"));
tester.startPage(MockFormFileUploadPage.class);
@@ -195,7 +202,7 @@ public class FormTesterTest extends WicketTestCase
* Test that formTester deal with Multipart form correctly when no actual upload
*/
@Test
- public void submitMultipartForm()
+ void submitMultipartForm()
{
tester.startPage(MockFormFileUploadPage.class, new PageParameters().set("required", false));
MockFormFileUploadPage page = (MockFormFileUploadPage)tester.getLastRenderedPage();
@@ -218,7 +225,7 @@ public class FormTesterTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void noParametersCreatedForDisabledComponents() throws Exception
+ void noParametersCreatedForDisabledComponents() throws Exception
{
tester.startPage(new MockFormPage()
{
@@ -254,24 +261,26 @@ public class FormTesterTest extends WicketTestCase
}
@Test
- public void wantOnChangeSelectionNotification()
+ void wantOnChangeSelectionNotification()
{
class TestPage extends WebPage implements IMarkupResourceStreamProvider
{
private String selection;
- public TestPage()
+ TestPage()
{
Form<Object> form = new Form<>("form");
add(form);
List<String> choices = Arrays.asList("opt 1", "opt 2");
- form.add(new DropDownChoice<String>("selector", Model.of(""), choices).add(new FormComponentUpdatingBehavior() {
- @Override
- protected void onUpdate()
+ form.add(new DropDownChoice<String>("selector", Model.of(""), choices)
+ .add(new FormComponentUpdatingBehavior()
{
- selection = (String)getFormComponent().getDefaultModelObject();
- }
- }));
+ @Override
+ protected void onUpdate()
+ {
+ selection = (String)getFormComponent().getDefaultModelObject();
+ }
+ }));
}
@Override
@@ -293,39 +302,39 @@ public class FormTesterTest extends WicketTestCase
}
@Test
- public void testNestedFormHandlingOnInnerSubmit() throws Exception
+ void testNestedFormHandlingOnInnerSubmit() throws Exception
{
NestedFormPage page = tester.startPage(NestedFormPage.class);
FormTester form = tester.newFormTester("outer:inner");
form.submit("submit");
- assertFalse("should not directly submit inner form - browsers submit the outer form!",
- page.url.contains("inner"));
- assertFalse("outer form should not be processed", page.outerSubmitted);
- assertTrue("inner form should be processed", page.innerSubmitted);
+ assertFalse(page.url.contains("inner"),
+ "should not directly submit inner form - browsers submit the outer form!");
+ assertFalse(page.outerSubmitted, "outer form should not be processed");
+ assertTrue(page.innerSubmitted, "inner form should be processed");
}
@Test
- public void testNestedFormHandlingOnInnerSubmitWithOuterForm() throws Exception
+ void testNestedFormHandlingOnInnerSubmitWithOuterForm() throws Exception
{
NestedFormPage page = tester.startPage(NestedFormPage.class);
FormTester form = tester.newFormTester("outer");
form.submit("inner:submit");
- assertFalse("should not directly submit inner form - browsers submit the outer form!",
- page.url.contains("inner"));
- assertFalse("outer form should not be processed", page.outerSubmitted);
- assertTrue("inner form should be processed", page.innerSubmitted);
+ assertFalse(page.url.contains("inner"),
+ "should not directly submit inner form - browsers submit the outer form!");
+ assertFalse(page.outerSubmitted, "outer form should not be processed");
+ assertTrue(page.innerSubmitted, "inner form should be processed");
}
@Test
- public void testNestedFormHandlingOnOuterSubmit() throws Exception
+ void testNestedFormHandlingOnOuterSubmit() throws Exception
{
NestedFormPage page = tester.startPage(NestedFormPage.class);
FormTester form = tester.newFormTester("outer");
form.submit();
- assertFalse("should not directly submit inner form - browsers submit the outer form!",
- page.url.contains("inner"));
- assertTrue("outer form should be processed", page.outerSubmitted);
- assertTrue("inner form should be processed", page.innerSubmitted);
+ assertFalse(page.url.contains("inner"),
+ "should not directly submit inner form - browsers submit the outer form!");
+ assertTrue(page.outerSubmitted, "outer form should be processed");
+ assertTrue(page.innerSubmitted, "inner form should be processed");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/tester/MockFormSubmitsPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/MockFormSubmitsPage.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/MockFormSubmitsPage.java
index 6117c15..05b2040 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/MockFormSubmitsPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/MockFormSubmitsPage.java
@@ -69,11 +69,11 @@ public class MockFormSubmitsPage extends WebPage
});
}
- protected void onAjaxSubmitLinkSubmit(AjaxRequestTarget target)
+ void onAjaxSubmitLinkSubmit(AjaxRequestTarget target)
{
}
- protected void onAjaxButtonSubmit(AjaxRequestTarget target)
+ void onAjaxButtonSubmit(AjaxRequestTarget target)
{
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndAjaxFormSubmitBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndAjaxFormSubmitBehavior.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndAjaxFormSubmitBehavior.java
index 8132265..cf4f07d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndAjaxFormSubmitBehavior.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndAjaxFormSubmitBehavior.java
@@ -104,7 +104,7 @@ public class MockPageWithFormAndAjaxFormSubmitBehavior extends WebPage
*
* @param name
*/
- public Pojo(String name)
+ Pojo(String name)
{
this.name = name;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithLabelInEnclosure.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithLabelInEnclosure.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithLabelInEnclosure.java
index 06e6ca2..0c1d146 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithLabelInEnclosure.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithLabelInEnclosure.java
@@ -19,14 +19,13 @@ package org.apache.wicket.util.tester;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.markup.html.basic.Label;
/**
* Mock page which has an ajax link in an enclosure. Clicking the link invokes ajax rendering the link again.
*
* @author Domas Poliakas (disblader)
*/
-public class MockPageWithLabelInEnclosure extends WebPage {
+class MockPageWithLabelInEnclosure extends WebPage {
public MockPageWithLabelInEnclosure() {
// Clicking this link re-renders the link itself
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/tester/MockResourceLinkPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/MockResourceLinkPage.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/MockResourceLinkPage.java
index 0f84693..801066c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/MockResourceLinkPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/MockResourceLinkPage.java
@@ -32,7 +32,7 @@ public class MockResourceLinkPage extends WebPage
/**
* Construct.
*/
- public MockResourceLinkPage()
+ private MockResourceLinkPage()
{
add(new ResourceLink<Void>("link", new PackageResourceReference(MockResourceLinkPage.class,
"test.html")));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/util/tester/StartComponentInPageRedirectToRenderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/StartComponentInPageRedirectToRenderTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/StartComponentInPageRedirectToRenderTest.java
index 4a766f9..5fc8db2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/StartComponentInPageRedirectToRenderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/StartComponentInPageRedirectToRenderTest.java
@@ -21,12 +21,12 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.settings.RequestCycleSettings;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* https://issues.apache.org/jira/browse/WICKET-5679
*/
-public class StartComponentInPageRedirectToRenderTest extends WicketTestCase
+class StartComponentInPageRedirectToRenderTest extends WicketTestCase
{
@Override
protected WebApplication newApplication()
@@ -43,7 +43,7 @@ public class StartComponentInPageRedirectToRenderTest extends WicketTestCase
}
@Test
- public void startComponentInPageRedirectToRender()
+ void startComponentInPageRedirectToRender()
{
tester.startComponentInPage(new Label("foo"));
}
[27/45] wicket git commit: wicket-core: Migrate to Junit 5
Posted by mg...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/MarkupContainerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/MarkupContainerTest.java b/wicket-core/src/test/java/org/apache/wicket/MarkupContainerTest.java
index 8be4fe8..a8d9178 100644
--- a/wicket-core/src/test/java/org/apache/wicket/MarkupContainerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/MarkupContainerTest.java
@@ -16,13 +16,14 @@
*/
package org.apache.wicket;
-import static org.hamcrest.CoreMatchers.equalToObject;
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.CoreMatchers.sameInstance;
-import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.lang.reflect.Field;
import java.util.Iterator;
@@ -43,11 +44,10 @@ import org.apache.wicket.markup.html.panel.EmptyPanel;
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;
@SuppressWarnings({ "javadoc", "serial" })
-public class MarkupContainerTest extends WicketTestCase
+class MarkupContainerTest extends WicketTestCase
{
private static final int NUMBER_OF_CHILDREN_FOR_A_MAP = MarkupContainer.MAPIFY_THRESHOLD + 1;
@@ -55,7 +55,7 @@ public class MarkupContainerTest extends WicketTestCase
* Make sure components are iterated in the order they were added. Required e.g. for Repeaters
*/
@Test
- public void iteratorOrder()
+ void iteratorOrder()
{
MarkupContainer container = new WebMarkupContainer("component");
for (int i = 0; i < 10; i++)
@@ -70,13 +70,13 @@ public class MarkupContainerTest extends WicketTestCase
}
@Test
- public void markupId() throws Exception
+ void markupId() throws Exception
{
executeTest(MarkupIdTestPage.class, "MarkupIdTestPageExpectedResult.html");
}
@Test
- public void get()
+ void get()
{
WebMarkupContainer a = new WebMarkupContainer("a");
WebMarkupContainer b = new WebMarkupContainer("b");
@@ -124,18 +124,20 @@ public class MarkupContainerTest extends WicketTestCase
/**
* https://issues.apache.org/jira/browse/WICKET-4006
*/
- @Test(expected = IllegalArgumentException.class)
- public void addMyself()
+ @Test
+ void addMyself()
{
WebMarkupContainer me = new WebMarkupContainer("a");
- me.add(me);
+ assertThrows(IllegalArgumentException.class, () -> {
+ me.add(me);
+ });
}
/**
* https://issues.apache.org/jira/browse/WICKET-5911
*/
@Test
- public void rerenderAfterRenderFailure()
+ void rerenderAfterRenderFailure()
{
FirstRenderFailsPage page = new FirstRenderFailsPage();
try
@@ -153,7 +155,7 @@ public class MarkupContainerTest extends WicketTestCase
}
@Test
- public void hierarchyChangeDuringRender()
+ void hierarchyChangeDuringRender()
{
HierarchyChangePage page = new HierarchyChangePage();
try
@@ -169,31 +171,11 @@ public class MarkupContainerTest extends WicketTestCase
}
}
- private static class HierarchyChangePage extends WebPage
- implements
- IMarkupResourceStreamProvider
- {
-
- @Override
- protected void onRender()
- {
- // change hierarchy during render
- add(new Label("child"));
- }
-
- @Override
- public IResourceStream getMarkupResourceStream(MarkupContainer container,
- Class<?> containerClass)
- {
- return new StringResourceStream("<html><body></body></html>");
- }
- }
-
/**
* https://issues.apache.org/jira/browse/WICKET-4012
*/
@Test
- public void afterRenderJustOnce()
+ void afterRenderJustOnce()
{
AfterRenderJustOncePage page = new AfterRenderJustOncePage();
tester.startPage(page);
@@ -205,114 +187,22 @@ public class MarkupContainerTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-4016
*/
@Test
- public void callToStringFromConstructor()
+ void callToStringFromConstructor()
{
ToStringComponent page = new ToStringComponent();
}
- private static class ToStringComponent extends WebMarkupContainer
- {
- private ToStringComponent()
- {
- super("id");
- toString(true);
- }
- }
-
- private static class AfterRenderJustOncePage extends WebPage
- implements
- IMarkupResourceStreamProvider
- {
- private int afterRenderCalls = 0;
-
- private AfterRenderJustOncePage()
- {
-
- WebMarkupContainer a1 = new WebMarkupContainer("a1");
- add(a1);
-
- WebMarkupContainer a2 = new WebMarkupContainer("a2");
- a1.add(a2);
-
- WebMarkupContainer a3 = new WebMarkupContainer("a3")
- {
-
- @Override
- protected void onAfterRender()
- {
- super.onAfterRender();
- afterRenderCalls++;
- }
-
- };
- a2.add(a3);
- }
-
- @Override
- public IResourceStream getMarkupResourceStream(MarkupContainer container,
- Class<?> containerClass)
- {
- return new StringResourceStream(
- "<html><body><div wicket:id='a1'><div wicket:id='a2'><div wicket:id='a3'></div></div></div></body></html>");
- }
- }
-
- private static class FirstRenderFailsPage extends WebPage
- implements
- IMarkupResourceStreamProvider
- {
- private boolean firstRender = true;
-
- private int beforeRenderCalls = 0;
-
- private FirstRenderFailsPage()
- {
- WebMarkupContainer a1 = new WebMarkupContainer("a1")
- {
- @Override
- protected void onBeforeRender()
- {
- super.onBeforeRender();
-
- beforeRenderCalls++;
-
- if (firstRender)
- {
- firstRender = false;
- throw new WicketRuntimeException();
- }
- }
- };
- add(a1);
- }
-
- @Override
- public IResourceStream getMarkupResourceStream(MarkupContainer container,
- Class<?> containerClass)
- {
- return new StringResourceStream("<html><body><div wicket:id='a1'></div></body></html>");
- }
- }
-
-
- /*
- * Iterator tests
- *
- * The tests below are specific for testing addition and removal of children while maintaining
- * the correct order of iterators without throwing ConcurrentModificationException.
- */
-
@Test
- public void noChildShouldNotIterate()
+ void noChildShouldNotIterate()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
Iterator<Component> iterator = wmc.iterator();
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(false, iterator.hasNext());
}
@Test
- public void noChildAddingChildAfterIteratorAcquiredShouldIterateAndReturnNewChild()
+ void noChildAddingChildAfterIteratorAcquiredShouldIterateAndReturnNewChild()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
@@ -321,15 +211,15 @@ public class MarkupContainerTest extends WicketTestCase
Label label1 = new Label("label1", "Label1");
wmc.add(label1);
- assertThat(wmc.size(), is(1));
+ assertEquals(1, wmc.size());
- Assert.assertThat(iterator.hasNext(), is(true));
- Assert.assertThat(iterator.next(), is(equalToObject(label1)));
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(true, iterator.hasNext());
+ assertEquals(label1, iterator.next());
+ assertEquals(false, iterator.hasNext());
}
@Test
- public void noChildAddingNChildrenAfterIteratorAcquiredShouldIterateAndReturnNewChildren()
+ void noChildAddingNChildrenAfterIteratorAcquiredShouldIterateAndReturnNewChildren()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
@@ -337,27 +227,27 @@ public class MarkupContainerTest extends WicketTestCase
addNChildren(wmc, NUMBER_OF_CHILDREN_FOR_A_MAP);
- assertThat(wmc.size(), is(NUMBER_OF_CHILDREN_FOR_A_MAP));
+ assertEquals(NUMBER_OF_CHILDREN_FOR_A_MAP, wmc.size());
Label label1 = new Label("label1", "Label1");
wmc.add(label1);
- Assert.assertThat(iterator.hasNext(), is(true));
+ assertEquals(true, iterator.hasNext());
takeNChildren(iterator, NUMBER_OF_CHILDREN_FOR_A_MAP);
- Assert.assertThat(iterator.next(), is(equalToObject(label1)));
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(label1, iterator.next());
+ assertEquals(false, iterator.hasNext());
}
@Test
- public void noChildAddingNChildrenAfterIteratorAcquiredShouldIterateAndReturnNewChildren2()
+ void noChildAddingNChildrenAfterIteratorAcquiredShouldIterateAndReturnNewChildren2()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
addNChildren(wmc, NUMBER_OF_CHILDREN_FOR_A_MAP);
- assertThat(wmc.size(), is(NUMBER_OF_CHILDREN_FOR_A_MAP));
+ assertEquals(NUMBER_OF_CHILDREN_FOR_A_MAP, wmc.size());
Iterator<Component> iterator = wmc.iterator();
@@ -366,13 +256,21 @@ public class MarkupContainerTest extends WicketTestCase
Label label1 = new Label("label1", "Label1");
wmc.add(label1);
- Assert.assertThat(iterator.hasNext(), is(true));
- Assert.assertThat(iterator.next(), is(equalToObject(label1)));
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(true, iterator.hasNext());
+ assertEquals(label1, iterator.next());
+ assertEquals(false, iterator.hasNext());
}
+
+ /*
+ * Iterator tests
+ *
+ * The tests below are specific for testing addition and removal of children while maintaining
+ * the correct order of iterators without throwing ConcurrentModificationException.
+ */
+
@Test
- public void noChildAddingAndRemoveChildAfterIteratorAcquiredShouldNotIterate()
+ void noChildAddingAndRemoveChildAfterIteratorAcquiredShouldNotIterate()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
Label label1 = new Label("label1", "Label1");
@@ -382,13 +280,13 @@ public class MarkupContainerTest extends WicketTestCase
wmc.add(label1);
wmc.remove(label1);
- assertThat(wmc.size(), is(0));
+ assertEquals(0, wmc.size());
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(false, iterator.hasNext());
}
@Test
- public void addingNewChildAfterIterationHasStartedShouldIterateNewChild()
+ void addingNewChildAfterIterationHasStartedShouldIterateNewChild()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
@@ -401,21 +299,21 @@ public class MarkupContainerTest extends WicketTestCase
takeNChildren(iterator, 1);
// there are no more children to iterate
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(false, iterator.hasNext());
// add the new child
Label newChild = new Label("label1", "Label1");
wmc.add(newChild);
- assertThat(wmc.size(), is(2));
+ assertEquals(2, wmc.size());
// ensure that the newChild is up next (as it was added)
- Assert.assertThat(iterator.next(), is(equalToObject(newChild)));
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(newChild, iterator.next());
+ assertEquals(false, iterator.hasNext());
}
@Test
- public void replacingTheFirstChildAfterIteratingDoesntIterateTheNewChild()
+ void replacingTheFirstChildAfterIteratingDoesntIterateTheNewChild()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
Label label1 = new Label("label1", "Label1");
@@ -436,15 +334,15 @@ public class MarkupContainerTest extends WicketTestCase
wmc.replace(newChild);
// the next child is still label 2
- assertThat(iterator.next(), is(sameInstance(label2)));
+ assertSame(label2, iterator.next());
// and the new child is not iterated (was replaced before the current position of the
// iterator).
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(false, iterator.hasNext());
}
@Test
- public void removingComponentsDuringIterationDoesntFail()
+ void removingComponentsDuringIterationDoesntFail()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
@@ -463,9 +361,9 @@ public class MarkupContainerTest extends WicketTestCase
// start iterating the 5 children
Iterator<Component> iterator = wmc.iterator();
- assertThat(iterator.next(), is(sameInstance(label1)));
- assertThat(iterator.next(), is(sameInstance(label2)));
- assertThat(iterator.next(), is(sameInstance(label3)));
+ assertSame(label1, iterator.next());
+ assertSame(label2, iterator.next());
+ assertSame(label3, iterator.next());
// remove the current, previous and next children
wmc.remove(label3);
@@ -473,14 +371,14 @@ public class MarkupContainerTest extends WicketTestCase
wmc.remove(label4);
// ensure that the next iterated child is the 5th label
- assertThat(iterator.next(), is(sameInstance(label5)));
+ assertSame(label5, iterator.next());
// and that there are no more children to iterate
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(false, iterator.hasNext());
}
@Test
- public void childrenBecomesListWhenMoreThanOneChild() throws Exception
+ void childrenBecomesListWhenMoreThanOneChild() throws Exception
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
@@ -489,11 +387,11 @@ public class MarkupContainerTest extends WicketTestCase
Field childrenField = MarkupContainer.class.getDeclaredField("children");
childrenField.setAccessible(true);
Object field = childrenField.get(wmc);
- assertThat(field, is(instanceOf(List.class)));
+ assertThat(field).isInstanceOf(List.class);
}
@Test
- public void childrenListBecomesMapWhenThresholdPassed() throws Exception
+ void childrenListBecomesMapWhenThresholdPassed() throws Exception
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
@@ -505,7 +403,7 @@ public class MarkupContainerTest extends WicketTestCase
}
@Test
- public void childrenBecomesLinkedMapWhenThresholdPassed() throws Exception
+ void childrenBecomesLinkedMapWhenThresholdPassed() throws Exception
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
@@ -515,7 +413,7 @@ public class MarkupContainerTest extends WicketTestCase
}
@Test
- public void linkedMapChildrenBecomesChild()
+ void linkedMapChildrenBecomesChild()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
@@ -531,7 +429,7 @@ public class MarkupContainerTest extends WicketTestCase
}
@Test
- public void listChildrenBecomesChild()
+ void listChildrenBecomesChild()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
@@ -547,7 +445,7 @@ public class MarkupContainerTest extends WicketTestCase
}
@Test
- public void geenIdee3() throws Exception
+ void geenIdee3() throws Exception
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
@@ -557,16 +455,16 @@ public class MarkupContainerTest extends WicketTestCase
removeNChildren(iterator, NUMBER_OF_CHILDREN_FOR_A_MAP);
- assertThat(iterator.hasNext(), is(true));
- assertThat(wmc.size(), is(1));
+ assertEquals(true, iterator.hasNext());
+ assertEquals(1, wmc.size());
iterator.next();
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(false, iterator.hasNext());
}
@Test
- public void noChildAddIterateAndRemoveChildShouldIterateChild()
+ void noChildAddIterateAndRemoveChildShouldIterateChild()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
Label label1 = new Label("label1", "Label1");
@@ -574,14 +472,14 @@ public class MarkupContainerTest extends WicketTestCase
Iterator<Component> iterator = wmc.iterator();
wmc.add(label1);
- Assert.assertThat(iterator.next(), is(equalToObject(label1)));
+ assertEquals(label1, iterator.next());
wmc.remove(label1);
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(false, iterator.hasNext());
}
@Test
- public void noChildAddIterateAndRemoveAndAddSameChildShouldIterateChildTwice()
+ void noChildAddIterateAndRemoveAndAddSameChildShouldIterateChildTwice()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
Label label1 = new Label("label1", "Label1");
@@ -589,20 +487,20 @@ public class MarkupContainerTest extends WicketTestCase
Iterator<Component> iterator = wmc.iterator();
wmc.add(label1);
- Assert.assertThat(iterator.next(), is(equalToObject(label1)));
+ assertEquals(label1, iterator.next());
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(false, iterator.hasNext());
wmc.remove(label1);
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(false, iterator.hasNext());
wmc.add(label1);
- Assert.assertThat(iterator.next(), is(equalToObject(label1)));
+ assertEquals(label1, iterator.next());
}
@Test
- public void noChildAddIterateAndRemoveAndAddDifferentChildShouldIterateNewChild()
+ void noChildAddIterateAndRemoveAndAddDifferentChildShouldIterateNewChild()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
Label label1 = new Label("label1", "Label1");
@@ -611,20 +509,20 @@ public class MarkupContainerTest extends WicketTestCase
Iterator<Component> iterator = wmc.iterator();
wmc.add(label1);
- Assert.assertThat(iterator.next(), is(equalToObject(label1)));
+ assertEquals(label1, iterator.next());
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(false, iterator.hasNext());
wmc.remove(label1);
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(false, iterator.hasNext());
wmc.add(label2);
- Assert.assertThat(iterator.next(), is(equalToObject(label2)));
+ assertEquals(label2, iterator.next());
}
@Test
- public void noChildAddingAndReplaceChildAfterIteratorAcquiredShouldIterateAndReturnNewReplacementChild()
+ void noChildAddingAndReplaceChildAfterIteratorAcquiredShouldIterateAndReturnNewReplacementChild()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
Label label1 = new Label("label1", "Label1");
@@ -635,13 +533,13 @@ public class MarkupContainerTest extends WicketTestCase
wmc.add(label1);
wmc.replace(label2);
- Assert.assertThat(iterator.hasNext(), is(true));
- Assert.assertThat(iterator.next(), is(equalToObject(label2)));
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(true, iterator.hasNext());
+ assertEquals(label2, iterator.next());
+ assertEquals(false, iterator.hasNext());
}
@Test
- public void singleChildIterateOneChild()
+ void singleChildIterateOneChild()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
Label label1;
@@ -649,13 +547,13 @@ public class MarkupContainerTest extends WicketTestCase
Iterator<Component> iterator = wmc.iterator();
- Assert.assertThat(iterator.hasNext(), is(true));
- Assert.assertThat(iterator.next(), is(equalToObject(label1)));
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(true, iterator.hasNext());
+ assertEquals(label1, iterator.next());
+ assertEquals(false, iterator.hasNext());
}
@Test
- public void singleChildShouldAllowReplacingChildAfterIterationHasStarted()
+ void singleChildShouldAllowReplacingChildAfterIterationHasStarted()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
Component label1 = new Label("label1", "Label1");
@@ -667,13 +565,13 @@ public class MarkupContainerTest extends WicketTestCase
wmc.replace(label2);
- Assert.assertThat(iterator.hasNext(), is(true));
- Assert.assertThat(iterator.next(), is(sameInstance(label2)));
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(true, iterator.hasNext());
+ assertSame(label2, iterator.next());
+ assertEquals(false, iterator.hasNext());
}
@Test
- public void singleChildShouldAllowReplacingVisitedChildButNotRevisitReplacementChild()
+ void singleChildShouldAllowReplacingVisitedChildButNotRevisitReplacementChild()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
Label label1 = new Label("label1", "Label1");
@@ -682,16 +580,16 @@ public class MarkupContainerTest extends WicketTestCase
Iterator<Component> iterator = wmc.iterator();
- Assert.assertThat(iterator.hasNext(), is(true));
- Assert.assertThat(iterator.next(), is(equalToObject(label1)));
+ assertEquals(true, iterator.hasNext());
+ assertEquals(label1, iterator.next());
wmc.replace(label2);
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(false, iterator.hasNext());
}
@Test
- public void multipleChildIteratorRetainsOrderOfAddition()
+ void multipleChildIteratorRetainsOrderOfAddition()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
Label label1;
@@ -703,15 +601,15 @@ public class MarkupContainerTest extends WicketTestCase
Iterator<Component> iterator = wmc.iterator();
- Assert.assertThat(iterator.next(), is(equalToObject(label1)));
- Assert.assertThat(iterator.next(), is(equalToObject(label2)));
- Assert.assertThat(iterator.next(), is(equalToObject(label3)));
+ assertEquals(label1, iterator.next());
+ assertEquals(label2, iterator.next());
+ assertEquals(label3, iterator.next());
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(false, iterator.hasNext());
}
@Test
- public void iteratorShouldAllowAddingComponentAfterIterationStarted()
+ void iteratorShouldAllowAddingComponentAfterIterationStarted()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
Label label1;
@@ -722,17 +620,17 @@ public class MarkupContainerTest extends WicketTestCase
Iterator<Component> iterator = wmc.iterator();
- Assert.assertThat(iterator.next(), is(equalToObject(label1)));
- Assert.assertThat(iterator.next(), is(equalToObject(label2)));
+ assertEquals(label1, iterator.next());
+ assertEquals(label2, iterator.next());
wmc.add(label3 = new Label("label3", "Label3"));
- Assert.assertThat(iterator.next(), is(equalToObject(label3)));
+ assertEquals(label3, iterator.next());
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(false, iterator.hasNext());
}
@Test
- public void iteratorShouldAllowRemovingComponentAfterIterationStarted0()
+ void iteratorShouldAllowRemovingComponentAfterIterationStarted0()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
Label label1;
@@ -746,14 +644,14 @@ public class MarkupContainerTest extends WicketTestCase
wmc.remove(label1);
- Assert.assertThat(iterator.next(), is(equalToObject(label2)));
- Assert.assertThat(iterator.next(), is(equalToObject(label3)));
+ assertEquals(label2, iterator.next());
+ assertEquals(label3, iterator.next());
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(false, iterator.hasNext());
}
@Test
- public void iteratorShouldAllowRemovingComponentAfterIterationStarted1()
+ void iteratorShouldAllowRemovingComponentAfterIterationStarted1()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
Label label1 = new Label("label1", "Label1");
@@ -765,16 +663,16 @@ public class MarkupContainerTest extends WicketTestCase
Iterator<Component> iterator = wmc.iterator();
- Assert.assertThat(iterator.next(), is(equalToObject(label1)));
+ assertEquals(label1, iterator.next());
wmc.remove(label1);
- Assert.assertThat(iterator.next(), is(equalToObject(label2)));
- Assert.assertThat(iterator.next(), is(equalToObject(label3)));
+ assertEquals(label2, iterator.next());
+ assertEquals(label3, iterator.next());
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(false, iterator.hasNext());
}
@Test
- public void iteratorShouldAllowRemovingComponentAfterIterationStarted2()
+ void iteratorShouldAllowRemovingComponentAfterIterationStarted2()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
Label label1;
@@ -786,16 +684,16 @@ public class MarkupContainerTest extends WicketTestCase
Iterator<Component> iterator = wmc.iterator();
- Assert.assertThat(iterator.next(), is(equalToObject(label1)));
- Assert.assertThat(iterator.next(), is(equalToObject(label2)));
+ assertEquals(label1, iterator.next());
+ assertEquals(label2, iterator.next());
wmc.remove(label1);
- Assert.assertThat(iterator.next(), is(equalToObject(label3)));
+ assertEquals(label3, iterator.next());
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(false, iterator.hasNext());
}
@Test
- public void iteratorShouldAllowRemovingComponentAfterIterationStarted3()
+ void iteratorShouldAllowRemovingComponentAfterIterationStarted3()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
Label label1;
@@ -807,16 +705,16 @@ public class MarkupContainerTest extends WicketTestCase
Iterator<Component> iterator = wmc.iterator();
- Assert.assertThat(iterator.next(), is(equalToObject(label1)));
- Assert.assertThat(iterator.next(), is(equalToObject(label2)));
- Assert.assertThat(iterator.next(), is(equalToObject(label3)));
+ assertEquals(label1, iterator.next());
+ assertEquals(label2, iterator.next());
+ assertEquals(label3, iterator.next());
wmc.remove(label1);
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(false, iterator.hasNext());
}
@Test
- public void iteratorShouldAllowReplacingComponentAfterIterationStarted0()
+ void iteratorShouldAllowReplacingComponentAfterIterationStarted0()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
Label label1;
@@ -829,14 +727,14 @@ public class MarkupContainerTest extends WicketTestCase
wmc.replace(label3 = new Label("label1", "Label3"));
- Assert.assertThat(iterator.next(), is(equalToObject(label3)));
- Assert.assertThat(iterator.next(), is(equalToObject(label2)));
+ assertEquals(label3, iterator.next());
+ assertEquals(label2, iterator.next());
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(false, iterator.hasNext());
}
@Test
- public void iteratorShouldAllowReplacingComponentAfterIterationStarted1()
+ void iteratorShouldAllowReplacingComponentAfterIterationStarted1()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
Label label1;
@@ -849,14 +747,14 @@ public class MarkupContainerTest extends WicketTestCase
wmc.replace(label3 = new Label("label1", "Label3"));
- Assert.assertThat(iterator.next(), is(equalToObject(label3)));
- Assert.assertThat(iterator.next(), is(equalToObject(label2)));
+ assertEquals(label3, iterator.next());
+ assertEquals(label2, iterator.next());
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(false, iterator.hasNext());
}
@Test
- public void iteratorShouldAllowReplacingComponentAfterIterationStarted()
+ void iteratorShouldAllowReplacingComponentAfterIterationStarted()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
Label label1;
@@ -867,16 +765,16 @@ public class MarkupContainerTest extends WicketTestCase
Iterator<Component> iterator = wmc.iterator();
- Assert.assertThat(iterator.next(), is(equalToObject(label1)));
- Assert.assertThat(iterator.next(), is(equalToObject(label2)));
+ assertEquals(label1, iterator.next());
+ assertEquals(label2, iterator.next());
wmc.replace(label3 = new Label("label1", "Label3"));
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(false, iterator.hasNext());
}
@Test
- public void iteratorShouldAllowReplacingComponentAfterIterationStarted24()
+ void iteratorShouldAllowReplacingComponentAfterIterationStarted24()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
Label label1;
@@ -889,19 +787,19 @@ public class MarkupContainerTest extends WicketTestCase
Iterator<Component> iterator = wmc.iterator();
- Assert.assertThat(iterator.next(), is(equalToObject(label1)));
+ assertEquals(label1, iterator.next());
wmc.replace(label3 = new Label("label2", "Label3"));
- Assert.assertThat(iterator.next(), is(equalToObject(label3)));
+ assertEquals(label3, iterator.next());
takeNChildren(iterator, NUMBER_OF_CHILDREN_FOR_A_MAP);
- Assert.assertThat(iterator.hasNext(), is(false));
+ assertEquals(false, iterator.hasNext());
}
@Test
- public void noChildLeftBehindRemoveEach()
+ void noChildLeftBehindRemoveEach()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
addNChildren(wmc, NUMBER_OF_CHILDREN_FOR_A_MAP);
@@ -912,11 +810,11 @@ public class MarkupContainerTest extends WicketTestCase
iterator.next();
iterator.remove();
}
- assertThat(wmc.size(), is(0));
+ assertEquals(0, wmc.size());
}
@Test
- public void noChildLeftBehindRemoveAll()
+ void noChildLeftBehindRemoveAll()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
addNChildren(wmc, NUMBER_OF_CHILDREN_FOR_A_MAP);
@@ -925,12 +823,12 @@ public class MarkupContainerTest extends WicketTestCase
wmc.removeAll();
- assertThat(wmc.size(), is(0));
- assertThat(iterator.hasNext(), is(false));
+ assertEquals(0, wmc.size());
+ assertEquals(false, iterator.hasNext());
}
@Test
- public void noChildLeftBehindRemoveAll2()
+ void noChildLeftBehindRemoveAll2()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
addNChildren(wmc, NUMBER_OF_CHILDREN_FOR_A_MAP);
@@ -941,37 +839,37 @@ public class MarkupContainerTest extends WicketTestCase
wmc.removeAll();
- assertThat(wmc.size(), is(0));
- assertThat(iterator.hasNext(), is(false));
+ assertEquals(0, wmc.size());
+ assertEquals(false, iterator.hasNext());
}
@Test
- public void ensureSerializationDeserializationWorks()
+ void ensureSerializationDeserializationWorks()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
Iterator<Component> iterator = wmc.iterator();
addNChildren(wmc, NUMBER_OF_CHILDREN_FOR_A_MAP);
- assertThat(wmc.size(), is(NUMBER_OF_CHILDREN_FOR_A_MAP));
+ assertEquals(NUMBER_OF_CHILDREN_FOR_A_MAP, wmc.size());
- assertThat(WicketObjects.cloneObject(wmc), is(not(nullValue())));
+ assertNotNull(WicketObjects.cloneObject(wmc));
removeNChildren(iterator, 1);
- assertThat(wmc.size(), is(NUMBER_OF_CHILDREN_FOR_A_MAP - 1));
- assertThat(WicketObjects.cloneObject(wmc), is(not(nullValue())));
+ assertEquals(NUMBER_OF_CHILDREN_FOR_A_MAP - 1, wmc.size());
+ assertNotNull(WicketObjects.cloneObject(wmc));
removeNChildren(iterator, NUMBER_OF_CHILDREN_FOR_A_MAP - 2);
- assertThat(WicketObjects.cloneObject(wmc), is(not(nullValue())));
+ assertNotNull(WicketObjects.cloneObject(wmc));
- assertThat(wmc.size(), is(1));
+ assertEquals(1, wmc.size());
removeNChildren(iterator, 1);
- assertThat(wmc.size(), is(0));
- assertThat(WicketObjects.cloneObject(wmc), is(not(nullValue())));
+ assertEquals(0, wmc.size());
+ assertNotNull(WicketObjects.cloneObject(wmc));
}
@Test
- public void detachDuringIterationWorks()
+ void detachDuringIterationWorks()
{
int halfOfChildren = NUMBER_OF_CHILDREN_FOR_A_MAP / 2;
int numberOfRemainingChildren = halfOfChildren + NUMBER_OF_CHILDREN_FOR_A_MAP % 2;
@@ -987,11 +885,11 @@ public class MarkupContainerTest extends WicketTestCase
takeNChildren(iterator, numberOfRemainingChildren);
- assertThat(iterator.hasNext(), is(false));
+ assertEquals(false, iterator.hasNext());
}
@Test
- public void detachDuringIterationWithRemovalsSucceeds()
+ void detachDuringIterationWithRemovalsSucceeds()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
@@ -1002,15 +900,15 @@ public class MarkupContainerTest extends WicketTestCase
wmc.detach();
takeNChildren(iterator, 1);
- assertThat(iterator.hasNext(), is(false));
- assertThat(wmc.size(), is(1));
+ assertEquals(false, iterator.hasNext());
+ assertEquals(1, wmc.size());
}
/**
* Tests whether two iterators being used simultaneously keep correct score of where they are.
*/
@Test
- public void twoIteratorsWorkInTandem()
+ void twoIteratorsWorkInTandem()
{
int n = NUMBER_OF_CHILDREN_FOR_A_MAP * 2;
@@ -1037,8 +935,8 @@ public class MarkupContainerTest extends WicketTestCase
}
// after 2*N removals there should not be any child left
- assertThat(iterator1.hasNext(), is(false));
- assertThat(iterator2.hasNext(), is(false));
+ assertEquals(false, iterator1.hasNext());
+ assertEquals(false, iterator2.hasNext());
}
/**
@@ -1046,7 +944,7 @@ public class MarkupContainerTest extends WicketTestCase
* state for the iterator.
*/
@Test
- public void detachWithOneIteratorOneChild()
+ void detachWithOneIteratorOneChild()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
addNChildren(wmc, 1);
@@ -1058,7 +956,7 @@ public class MarkupContainerTest extends WicketTestCase
wmc.detach();
- assertThat(iterator1.hasNext(), is(false));
+ assertEquals(false, iterator1.hasNext());
}
/**
@@ -1066,7 +964,7 @@ public class MarkupContainerTest extends WicketTestCase
* has the correct state for the iterator.
*/
@Test
- public void detachWithOneIteratorOneChildRemovedAndAdded()
+ void detachWithOneIteratorOneChildRemovedAndAdded()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
addNChildren(wmc, 1);
@@ -1078,19 +976,19 @@ public class MarkupContainerTest extends WicketTestCase
addNChildren(wmc, 1);
- assertThat(iterator1.hasNext(), is(true));
+ assertEquals(true, iterator1.hasNext());
wmc.detach();
- assertThat(iterator1.hasNext(), is(true));
- assertThat(iterator1.next(), is(not(nullValue())));
+ assertEquals(true, iterator1.hasNext());
+ assertNotNull(iterator1.next());
}
/**
* Tests the case when one child is removed from a list the iterator still works after a detach.
*/
@Test
- public void detachWithOneIteratorTwoChildren()
+ void detachWithOneIteratorTwoChildren()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
addNChildren(wmc, 2);
@@ -1100,19 +998,19 @@ public class MarkupContainerTest extends WicketTestCase
iterator1.next();
iterator1.remove();
- assertThat(iterator1.hasNext(), is(true));
+ assertEquals(true, iterator1.hasNext());
wmc.detach();
- assertThat(iterator1.hasNext(), is(true));
- assertThat(iterator1.next(), is(not(nullValue())));
+ assertEquals(true, iterator1.hasNext());
+ assertNotNull(iterator1.next());
}
/**
* Tests whether when the children is a list, removal and iteration still work after a detach.
*/
@Test
- public void detachWithOneIteratorWithListForChildren()
+ void detachWithOneIteratorWithListForChildren()
{
WebMarkupContainer wmc = new WebMarkupContainer("id");
addNChildren(wmc, NUMBER_OF_CHILDREN_FOR_A_MAP - 2);
@@ -1128,14 +1026,14 @@ public class MarkupContainerTest extends WicketTestCase
wmc.detach();
takeNChildren(iterator, NUMBER_OF_CHILDREN_FOR_A_MAP - 4);
- assertThat(iterator.hasNext(), is(false));
+ assertEquals(false, iterator.hasNext());
}
/**
* Tests whether when the children is a map, removal and iteration still work after a detach.
*/
@Test
- public void detachWithOneIteratorsWithMapForChildren()
+ void detachWithOneIteratorsWithMapForChildren()
{
int n = NUMBER_OF_CHILDREN_FOR_A_MAP * 2;
@@ -1157,11 +1055,11 @@ public class MarkupContainerTest extends WicketTestCase
iterator1.next();
iterator1.remove();
}
- assertThat(iterator1.hasNext(), is(false));
+ assertEquals(false, iterator1.hasNext());
}
@Test
- public void detachWithTwoIteratorsAndRemovals()
+ void detachWithTwoIteratorsAndRemovals()
{
int n = NUMBER_OF_CHILDREN_FOR_A_MAP * 2;
@@ -1194,7 +1092,7 @@ public class MarkupContainerTest extends WicketTestCase
}
@Test
- public void detachWithTwoIteratorsAndRemovals2()
+ void detachWithTwoIteratorsAndRemovals2()
{
int n = NUMBER_OF_CHILDREN_FOR_A_MAP * 2;
@@ -1228,13 +1126,13 @@ public class MarkupContainerTest extends WicketTestCase
iterator.remove();
}
}
- assertThat(iterator1.hasNext(), is(false));
- assertThat(iterator2.hasNext(), is(false));
+ assertEquals(false, iterator1.hasNext());
+ assertEquals(false, iterator2.hasNext());
}
/**
* Asserts that the children property of the {@code wmc} is of a particular {@code type}.
- *
+ *
* @param wmc
* the web markup container whose children property is to be checked
* @param type
@@ -1247,7 +1145,7 @@ public class MarkupContainerTest extends WicketTestCase
Field childrenField = MarkupContainer.class.getDeclaredField("children");
childrenField.setAccessible(true);
Object field = childrenField.get(wmc);
- assertThat(field, is(instanceOf(type)));
+ assertThat(field).isInstanceOf(type);
}
catch (Exception e)
{
@@ -1257,7 +1155,7 @@ public class MarkupContainerTest extends WicketTestCase
/**
* Adds {@code numberOfChildrenToAdd} anonymous children to the {@code parent}.
- *
+ *
* @param parent
* the parent to add the children to
* @param numberOfChildrenToAdd
@@ -1265,7 +1163,7 @@ public class MarkupContainerTest extends WicketTestCase
*/
private void addNChildren(WebMarkupContainer parent, int numberOfChildrenToAdd)
{
- assertThat(numberOfChildrenToAdd, is(greaterThanOrEqualTo(0)));
+ assertThat(numberOfChildrenToAdd).isGreaterThanOrEqualTo(0);
int start = parent.size();
for (int i = 0; i < numberOfChildrenToAdd; i++)
{
@@ -1277,10 +1175,10 @@ public class MarkupContainerTest extends WicketTestCase
/**
* Removes {@code numberOfChildrenToRemove} anonymous children from the parent using the
* {@code iterator}.
- *
+ *
* @param iterator
* the iterator to remove the children with
- * @param numberOfChildrenToAdd
+ * @param numberOfChildrenToRemove
* the number of children
*/
private void removeNChildren(Iterator<Component> iterator, int numberOfChildrenToRemove)
@@ -1294,7 +1192,7 @@ public class MarkupContainerTest extends WicketTestCase
/**
* Progresses the {@code iterator} with {@code numberOfChildrenToTake} anonymous children.
- *
+ *
* @param iterator
* the iterator to progress
* @param numberOfChildrenToTake
@@ -1307,50 +1205,167 @@ public class MarkupContainerTest extends WicketTestCase
}
@Test
- public void stream()
+ void stream()
{
LoginPage loginPage = new LoginPage();
- Optional<Component> first = loginPage.stream().filter(c -> c.getId().equals("form"))
+ Optional<Component> first = loginPage.stream()
+ .filter(c -> c.getId().equals("form"))
.findFirst();
- assertThat(first.isPresent(), is(false));
+ assertEquals(false, first.isPresent());
loginPage.add(new Form<>("form"));
- Optional<Component> second = loginPage.stream().filter(c -> c.getId().equals("form"))
+ Optional<Component> second = loginPage.stream()
+ .filter(c -> c.getId().equals("form"))
.findFirst();
- assertThat(second.isPresent(), is(true));
+ assertEquals(true, second.isPresent());
loginPage.add(new WebMarkupContainer("wmc"));
- Optional<Form> form = loginPage.stream().filter(Form.class::isInstance)
- .map(Form.class::cast).findFirst();
- assertThat(form.isPresent(), is(true));
+ Optional<Form> form = loginPage.stream()
+ .filter(Form.class::isInstance)
+ .map(Form.class::cast)
+ .findFirst();
+ assertEquals(true, form.isPresent());
Optional<WebMarkupContainer> wmc = loginPage.stream()
- .filter(WebMarkupContainer.class::isInstance).map(WebMarkupContainer.class::cast)
+ .filter(WebMarkupContainer.class::isInstance)
+ .map(WebMarkupContainer.class::cast)
.findFirst();
- assertThat(wmc.isPresent(), is(true));
+ assertEquals(true, wmc.isPresent());
}
@Test
- public void streamChildren()
+ void streamChildren()
{
LoginPage loginPage = new LoginPage();
- Optional<Component> first = loginPage.stream().filter(c -> c.getId().equals("form"))
+ Optional<Component> first = loginPage.stream()
+ .filter(c -> c.getId().equals("form"))
.findFirst();
- assertThat(first.isPresent(), is(false));
+ assertEquals(false, first.isPresent());
Form<Object> form = new Form<>("form");
loginPage.add(form);
form.add(new TextField<>("field"));
- assertThat(loginPage.streamChildren().filter(c -> c.getId().equals("form")).findFirst()
- .isPresent(), is(true));
+ assertTrue(loginPage.streamChildren()
+ .filter(c -> c.getId().equals("form"))
+ .findFirst()
+ .isPresent());
+
+ assertTrue(loginPage.streamChildren()
+ .filter(c -> c.getId().equals("field"))
+ .findFirst()
+ .isPresent());
+
+ assertTrue(loginPage.streamChildren()
+ .filter(TextField.class::isInstance)
+ .filter(c -> c.getId().equals("field"))
+ .findFirst()
+ .isPresent());
+ }
+
+ private static class HierarchyChangePage extends WebPage
+ implements
+ IMarkupResourceStreamProvider
+ {
+
+ @Override
+ protected void onRender()
+ {
+ // change hierarchy during render
+ add(new Label("child"));
+ }
+
+ @Override
+ public IResourceStream getMarkupResourceStream(MarkupContainer container,
+ Class<?> containerClass)
+ {
+ return new StringResourceStream("<html><body></body></html>");
+ }
+ }
+
+ private static class ToStringComponent extends WebMarkupContainer
+ {
+ private ToStringComponent()
+ {
+ super("id");
+ toString(true);
+ }
+ }
+
+ private static class AfterRenderJustOncePage extends WebPage
+ implements
+ IMarkupResourceStreamProvider
+ {
+ private int afterRenderCalls = 0;
+
+ private AfterRenderJustOncePage()
+ {
+
+ WebMarkupContainer a1 = new WebMarkupContainer("a1");
+ add(a1);
- assertThat(loginPage.streamChildren().filter(c -> c.getId().equals("field")).findFirst()
- .isPresent(), is(true));
+ WebMarkupContainer a2 = new WebMarkupContainer("a2");
+ a1.add(a2);
+
+ WebMarkupContainer a3 = new WebMarkupContainer("a3")
+ {
- assertThat(loginPage.streamChildren().filter(TextField.class::isInstance)
- .filter(c -> c.getId().equals("field")).findFirst().isPresent(), is(true));
+ @Override
+ protected void onAfterRender()
+ {
+ super.onAfterRender();
+ afterRenderCalls++;
+ }
+
+ };
+ a2.add(a3);
+ }
+
+ @Override
+ public IResourceStream getMarkupResourceStream(MarkupContainer container,
+ Class<?> containerClass)
+ {
+ return new StringResourceStream(
+ "<html><body><div wicket:id='a1'><div wicket:id='a2'><div wicket:id='a3'></div></div></div></body></html>");
+ }
+ }
+
+ private static class FirstRenderFailsPage extends WebPage
+ implements
+ IMarkupResourceStreamProvider
+ {
+ private boolean firstRender = true;
+
+ private int beforeRenderCalls = 0;
+
+ private FirstRenderFailsPage()
+ {
+ WebMarkupContainer a1 = new WebMarkupContainer("a1")
+ {
+ @Override
+ protected void onBeforeRender()
+ {
+ super.onBeforeRender();
+
+ beforeRenderCalls++;
+
+ if (firstRender)
+ {
+ firstRender = false;
+ throw new WicketRuntimeException();
+ }
+ }
+ };
+ add(a1);
+ }
+
+ @Override
+ public IResourceStream getMarkupResourceStream(MarkupContainer container,
+ Class<?> containerClass)
+ {
+ return new StringResourceStream("<html><body><div wicket:id='a1'></div></body></html>");
+ }
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/MarkupIdGeneratorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/MarkupIdGeneratorTest.java b/wicket-core/src/test/java/org/apache/wicket/MarkupIdGeneratorTest.java
index 69964cf..6613988 100644
--- a/wicket-core/src/test/java/org/apache/wicket/MarkupIdGeneratorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/MarkupIdGeneratorTest.java
@@ -16,9 +16,11 @@
*/
package org.apache.wicket;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for IMarkupIdGenerator
@@ -26,10 +28,10 @@ import org.junit.Test;
* @since 6.16.0
* @see <a href="https://issues.apache.org/jira/browse/WICKET-5577">Generation of wicket ids with prefix / suffix</a>
*/
-public class MarkupIdGeneratorTest extends WicketTestCase
+class MarkupIdGeneratorTest extends WicketTestCase
{
@Test
- public void defaultMarkupIdGenerator()
+ void defaultMarkupIdGenerator()
{
MockPageWithLink page = new MockPageWithLink();
Link link = new Link<Void>(MockPageWithLink.LINK_ID)
@@ -46,7 +48,7 @@ public class MarkupIdGeneratorTest extends WicketTestCase
}
@Test
- public void customMarkupIdGenerator()
+ void customMarkupIdGenerator()
{
final String customMarkupId = "custom";
IMarkupIdGenerator generator = new IMarkupIdGenerator()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/MetaDataTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/MetaDataTest.java b/wicket-core/src/test/java/org/apache/wicket/MetaDataTest.java
index 03fd0de..babee8f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/MetaDataTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/MetaDataTest.java
@@ -16,13 +16,16 @@
*/
package org.apache.wicket;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import org.junit.jupiter.api.Test;
/**
* Some tests for meta data.
*/
-public class MetaDataTest extends Assert
+class MetaDataTest
{
private static final MetaDataKey<String> KEY1 = new MetaDataKey<String>()
{
@@ -48,7 +51,7 @@ public class MetaDataTest extends Assert
* Test bounds and basic operations.
*/
@Test
- public void metaDataKey()
+ void metaDataKey()
{
MetaDataEntry<?>[] md = KEY1.set(null, "1");
assertNotNull(md);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/MockComponent.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/MockComponent.java b/wicket-core/src/test/java/org/apache/wicket/MockComponent.java
index d6c292f..8af8c40 100644
--- a/wicket-core/src/test/java/org/apache/wicket/MockComponent.java
+++ b/wicket-core/src/test/java/org/apache/wicket/MockComponent.java
@@ -36,7 +36,7 @@ public class MockComponent implements IRequestableComponent, IRequestListener
/**
* Construct.
*/
- public MockComponent()
+ MockComponent()
{
}
@@ -69,7 +69,7 @@ public class MockComponent implements IRequestableComponent, IRequestListener
* @param id
* @return <code>this</code>
*/
- public MockComponent setId(String id)
+ private MockComponent setId(String id)
{
this.id = id;
return this;
@@ -108,7 +108,7 @@ public class MockComponent implements IRequestableComponent, IRequestListener
* @param page
* @return <code>this</code>
*/
- public MockComponent setPage(IRequestablePage page)
+ private MockComponent setPage(IRequestablePage page)
{
this.page = page;
return this;
@@ -126,7 +126,7 @@ public class MockComponent implements IRequestableComponent, IRequestListener
* @param path
* @return <code>this</code>
*/
- public MockComponent setPath(String path)
+ MockComponent setPath(String path)
{
this.path = path;
return this;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/MockPageParametersAware.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/MockPageParametersAware.java b/wicket-core/src/test/java/org/apache/wicket/MockPageParametersAware.java
index e3e20ee..7837530 100644
--- a/wicket-core/src/test/java/org/apache/wicket/MockPageParametersAware.java
+++ b/wicket-core/src/test/java/org/apache/wicket/MockPageParametersAware.java
@@ -99,7 +99,7 @@ public class MockPageParametersAware extends WebPage
/**
* @return textField
*/
- public TextField<String> getTextField()
+ TextField<String> getTextField()
{
return textField;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/OnReAddTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/OnReAddTest.java b/wicket-core/src/test/java/org/apache/wicket/OnReAddTest.java
index be664cc..7052592 100644
--- a/wicket-core/src/test/java/org/apache/wicket/OnReAddTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/OnReAddTest.java
@@ -16,27 +16,27 @@
*/
package org.apache.wicket;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+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.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.util.tester.WicketTesterScope;
-import org.junit.Rule;
-import org.junit.Test;
+import org.apache.wicket.util.tester.WicketTesterExtension;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
-public class OnReAddTest
+class OnReAddTest
{
- @Rule
- public WicketTesterScope scope = new WicketTesterScope();
+ @RegisterExtension
+ WicketTesterExtension scope = new WicketTesterExtension();
private boolean onReAddCalled = false;
private boolean onInitializeCalled = false;
@Test
- public void onFirstAddInitializeIsCalled()
+ void onFirstAddInitializeIsCalled()
{
Page page = createPage();
page.internalInitialize();
@@ -46,7 +46,7 @@ public class OnReAddTest
}
@Test
- public void nothingIsCalledWithoutConnectionToPage()
+ void nothingIsCalledWithoutConnectionToPage()
{
MarkupContainer container = createContainer();
container.internalInitialize();
@@ -56,7 +56,7 @@ public class OnReAddTest
}
@Test
- public void uninitializedComponentIsInitializedOnConnectionToPage()
+ void uninitializedComponentIsInitializedOnConnectionToPage()
{
// "old", initialized container + "new" uninitialized component:
// oninitialize should be called on the component when the container
@@ -74,7 +74,7 @@ public class OnReAddTest
}
@Test
- public void onReAddIsOnlyCalledAfterRemove()
+ void onReAddIsOnlyCalledAfterRemove()
{
Page page = createPage();
page.internalInitialize();
@@ -93,9 +93,9 @@ public class OnReAddTest
assertTrue(onReAddCalled);
assertFalse(onInitializeCalled);
}
-
+
@Test
- public void initializeIsCalledOnFirstAdd_OnReAddIsCalledAfterEachRemoveAndAdd()
+ void initializeIsCalledOnFirstAdd_OnReAddIsCalledAfterEachRemoveAndAdd()
{
Page page = createPage();
page.internalInitialize();
@@ -115,7 +115,8 @@ public class OnReAddTest
assertFalse(onInitializeCalled);
onReAddCalled = false;
page.internalInitialize();
- // just another initialize run shouldn't call onReAdd nor onInitialize. onReAdd should only be called
+ // just another initialize run shouldn't call onReAdd nor onInitialize. onReAdd should only
+ // be called
// after remove and add
assertFalse(onReAddCalled);
assertFalse(onInitializeCalled);
@@ -126,7 +127,7 @@ public class OnReAddTest
}
@Test
- public void onReAddRecursesToChildrenLikeOnInitialize()
+ void onReAddRecursesToChildrenLikeOnInitialize()
{
Page page = createPage();
page.internalInitialize();
@@ -144,7 +145,7 @@ public class OnReAddTest
}
@Test
- public void onReAddEnforcesSuperCall()
+ void onReAddEnforcesSuperCall()
{
Page page = createPage();
page.internalInitialize();
@@ -163,7 +164,8 @@ public class OnReAddTest
{
page.add(brokenProbe);
fail("should have thrown exception");
- } catch (IllegalStateException e)
+ }
+ catch (IllegalStateException e)
{
assertTrue(e.getMessage().contains("super.onReAdd"));
}
@@ -189,7 +191,7 @@ public class OnReAddTest
};
}
- private Component createInitializedProbe()
+ Component createInitializedProbe()
{
Component probe = createUninitializedProbe();
probe.internalInitialize();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/PageFactoryTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/PageFactoryTest.java b/wicket-core/src/test/java/org/apache/wicket/PageFactoryTest.java
index c90ae0a..e2c8ac6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/PageFactoryTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/PageFactoryTest.java
@@ -16,25 +16,27 @@
*/
package org.apache.wicket;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.session.DefaultPageFactory;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Before;
-import org.junit.Test;
-
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test the Pagefactory
*/
-public class PageFactoryTest extends WicketTestCase
+class PageFactoryTest extends WicketTestCase
{
private DefaultPageFactory factory;
/**
*
*/
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
factory = new DefaultPageFactory();
}
@@ -43,7 +45,7 @@ public class PageFactoryTest extends WicketTestCase
* Test creating a new page using a class.
*/
@Test
- public void newPageClass()
+ void newPageClass()
{
// MyPage0: no constructor at all
assertEquals(MyPage0.class, factory.newPage(MyPage0.class).getClass());
@@ -65,9 +67,7 @@ public class PageFactoryTest extends WicketTestCase
{
e = ex;
}
- assertNotNull(
- "MyPage3 should have thrown an exception as it does not have a default or no constructor",
- e);
+ assertNotNull(e, "MyPage3 should have thrown an exception as it does not have a default or no constructor");
// MyPage4: Illegal String parameter constructor only
e = null;
@@ -79,9 +79,7 @@ public class PageFactoryTest extends WicketTestCase
{
e = ex;
}
- assertNotNull(
- "MyPage4 should have thrown an exception as it does not have a default or no constructor",
- e);
+ assertNotNull(e, "MyPage4 should have thrown an exception as it does not have a default or no constructor");
// MyPage5: PageParameter and default constructor
assertEquals(MyPage5.class, factory.newPage(MyPage5.class).getClass());
@@ -93,7 +91,7 @@ public class PageFactoryTest extends WicketTestCase
* Test a new page using a class and page parameters.
*/
@Test
- public void newPageClassPageParameters()
+ void newPageClassPageParameters()
{
assertEquals(MyPage0.class, factory.newPage(MyPage0.class, null).getClass());
@@ -116,9 +114,7 @@ public class PageFactoryTest extends WicketTestCase
{
e = ex;
}
- assertNotNull(
- "MyPage4 should have thrown an exception as it does not have a default or no constructor",
- e);
+ assertNotNull(e, "MyPage4 should have thrown an exception as it does not have a default or no constructor");
// MyPage4: Illegal String parameter constructor only
e = null;
@@ -130,9 +126,7 @@ public class PageFactoryTest extends WicketTestCase
{
e = ex;
}
- assertNotNull(
- "MyPage4 should have thrown an exception as it does not have a default or no constructor",
- e);
+ assertNotNull(e, "MyPage4 should have thrown an exception as it does not have a default or no constructor");
// MyPage5: PageParameter and default constructor
assertEquals(MyPage5.class, factory.newPage(MyPage5.class, new PageParameters()).getClass());
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/PageMarkupLoadingTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/PageMarkupLoadingTest.java b/wicket-core/src/test/java/org/apache/wicket/PageMarkupLoadingTest.java
index f86c02f..ccdd8d9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/PageMarkupLoadingTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/PageMarkupLoadingTest.java
@@ -20,12 +20,12 @@ import java.util.Locale;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests markup loading.
*/
-public class PageMarkupLoadingTest extends WicketTestCase
+class PageMarkupLoadingTest extends WicketTestCase
{
/**
* Test default locale loaded page.
@@ -33,7 +33,7 @@ public class PageMarkupLoadingTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void english() throws Exception
+ void english() throws Exception
{
tester.getSession().setLocale(Locale.ENGLISH);
tester.startPage(Page1.class);
@@ -47,7 +47,7 @@ public class PageMarkupLoadingTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void dutch() throws Exception
+ void dutch() throws Exception
{
tester.getSession().setLocale(new Locale("nl"));
tester.startPage(Page1.class);
@@ -61,7 +61,7 @@ public class PageMarkupLoadingTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void testDutchMyStyle() throws Exception
+ void testDutchMyStyle() throws Exception
{
tester.getSession().setLocale(new Locale("nl"));
tester.getSession().setStyle("mystyle");
@@ -76,7 +76,7 @@ public class PageMarkupLoadingTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void dutchMyStyleMyVar() throws Exception
+ void dutchMyStyleMyVar() throws Exception
{
tester.getSession().setLocale(new Locale("nl"));
tester.getSession().setStyle("mystyle");
@@ -92,7 +92,7 @@ public class PageMarkupLoadingTest extends WicketTestCase
private static final long serialVersionUID = 1L;
/** Construct. */
- public Page1()
+ public Page1()
{
}
}
@@ -103,7 +103,7 @@ public class PageMarkupLoadingTest extends WicketTestCase
private static final long serialVersionUID = 1L;
/** Construct. */
- public Page2()
+ public Page2()
{
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ParentResourceEscapePathTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ParentResourceEscapePathTest.java b/wicket-core/src/test/java/org/apache/wicket/ParentResourceEscapePathTest.java
index ba447cd..4cb7d34 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ParentResourceEscapePathTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ParentResourceEscapePathTest.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.io.InputStream;
import org.apache.wicket.markup.html.PackageResourceGuard;
@@ -23,13 +26,13 @@ import org.apache.wicket.request.Url;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
*/
-public class ParentResourceEscapePathTest extends WicketTestCase
+class ParentResourceEscapePathTest extends WicketTestCase
{
private static final Logger log = LoggerFactory.getLogger(ParentResourceEscapePathTest.class);
@@ -37,7 +40,7 @@ public class ParentResourceEscapePathTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void parentEscapeSequenceInRenderedHtmlTest() throws Exception
+ void parentEscapeSequenceInRenderedHtmlTest() throws Exception
{
tester.getApplication().getResourceSettings().setParentFolderPlaceholder("-updir-");
parentEscapeSequenceInRenderedHtml();
@@ -63,15 +66,14 @@ public class ParentResourceEscapePathTest extends WicketTestCase
private void assertContains(String html, String expected)
{
- assertTrue("Expected to find \"" + expected + "\" in \"" + html + "\"",
- html.contains(expected));
+ assertTrue(html.contains(expected), "Expected to find \"" + expected + "\" in \"" + html + "\"");
}
/**
* testResourceUrlGeneratedByResourceReference()
*/
@Test
- public void resourceUrlGeneratedByResourceReferenceTest()
+ void resourceUrlGeneratedByResourceReferenceTest()
{
tester.getApplication().getResourceSettings().setParentFolderPlaceholder("-updir-");
resourceUrlGeneratedByResourceReference();
@@ -93,7 +95,7 @@ public class ParentResourceEscapePathTest extends WicketTestCase
* testRequestHandlingOfResourceUrlWithEscapeStringInside()
*/
@Test
- public void requestHandlingOfResourceUrlWithEscapeStringInsideTest()
+ void requestHandlingOfResourceUrlWithEscapeStringInsideTest()
{
((PackageResourceGuard)tester.getApplication()
.getResourceSettings()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java b/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java
index 5eb072c..3988176 100644
--- a/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java
@@ -24,12 +24,12 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for <a href="https://issues.apache.org/jira/browse/WICKET-3563">WICKET-3563</a>
*/
-public class PlaceholderTagIdTest extends WicketTestCase
+class PlaceholderTagIdTest extends WicketTestCase
{
/**
@@ -38,7 +38,7 @@ public class PlaceholderTagIdTest extends WicketTestCase
* {@link IAjaxRegionMarkupIdProvider}
*/
@Test
- public void wicket3563()
+ void wicket3563()
{
tester.startPage(TestPage.class);
@@ -55,7 +55,7 @@ public class PlaceholderTagIdTest extends WicketTestCase
/**
* Construct.
*/
- public TestPage()
+ public TestPage()
{
Form<?> form = new Form<Void>("form");
form.setVisible(false);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/RedirectApplication.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/RedirectApplication.java b/wicket-core/src/test/java/org/apache/wicket/RedirectApplication.java
index 5b447e7..6d2035a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/RedirectApplication.java
+++ b/wicket-core/src/test/java/org/apache/wicket/RedirectApplication.java
@@ -24,7 +24,7 @@ import org.apache.wicket.mock.MockApplication;
*
* @see wicket.myproject.Start#main(String[])
*/
-public class RedirectApplication extends MockApplication
+class RedirectApplication extends MockApplication
{
private boolean showIntercept = false;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/RemoveTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/RemoveTest.java b/wicket-core/src/test/java/org/apache/wicket/RemoveTest.java
index 6ab6364..0157c29 100644
--- a/wicket-core/src/test/java/org/apache/wicket/RemoveTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/RemoveTest.java
@@ -16,45 +16,47 @@
*/
package org.apache.wicket;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test the {@link Component#onRemove()}. Test if it gets called and propagated to the Components
* children.
*/
-public class RemoveTest extends WicketTestCase
+class RemoveTest extends WicketTestCase
{
- static final String PATH = RemoveTestPage.COMPONENT + Component.PATH_SEPARATOR +
+ private static final String PATH = RemoveTestPage.COMPONENT + Component.PATH_SEPARATOR +
RemoveTestPage.LINK;
/**
* The test
*/
@Test
- public void onRemovalFromHierarchy()
+ void onRemovalFromHierarchy()
{
final RemoveTestPage page = new RemoveTestPage();
tester.startPage(page);
// on initial load of the page no calls should have occurred.
- assertEquals("componentOnRemovalFromHierarchy was called.", 0,
- page.getComponentOnRemovalFromHierarchyCalls());
- assertEquals("linkOnRemovalFromHierarchy was called.", 0,
- page.getLinkOnRemovalFromHierarchyCalls());
- assertEquals("behaviorOnRemovalFromHierarchy was called.", 0,
- page.getBehaviorOnRemovalCalls());
+ assertEquals(0, page.getComponentOnRemovalFromHierarchyCalls(),
+ "componentOnRemovalFromHierarchy was called.");
+ assertEquals(0, page.getLinkOnRemovalFromHierarchyCalls(),
+ "linkOnRemovalFromHierarchy was called.");
+ assertEquals(0, page.getBehaviorOnRemovalCalls(),
+ "behaviorOnRemovalFromHierarchy was called.");
tester.clickLink(PATH);
// first click provoked a remove, so one call.
- assertEquals("componentOnRemovalFromHierarchy wasn't called.", 1,
- page.getComponentOnRemovalFromHierarchyCalls());
+ assertEquals(1, page.getComponentOnRemovalFromHierarchyCalls(),
+ "componentOnRemovalFromHierarchy wasn't called.");
// test if it got propagated to the children.
- assertEquals("linkOnRemovalFromHierarchy wasn't called.", 1,
- page.getLinkOnRemovalFromHierarchyCalls());
- assertEquals("behaviorOnRemovalFromHierarchy wasn't called.", 1,
- page.getBehaviorOnRemovalCalls());
+ assertEquals(1, page.getLinkOnRemovalFromHierarchyCalls(),
+ "linkOnRemovalFromHierarchy wasn't called.");
+ assertEquals(1, page.getBehaviorOnRemovalCalls(),
+ "behaviorOnRemovalFromHierarchy wasn't called.");
try
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/RemoveTestPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/RemoveTestPage.java b/wicket-core/src/test/java/org/apache/wicket/RemoveTestPage.java
index de11d62..6dabfd6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/RemoveTestPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/RemoveTestPage.java
@@ -30,8 +30,8 @@ public class RemoveTestPage extends WebPage
static final String COMPONENT = "component";
static final String LINK = "link";
- MarkupContainer _1;
- MarkupContainer _2;
+ private MarkupContainer _1;
+ private MarkupContainer _2;
private int componentOnRemovalFromHierarchyCalls = 0;
private int linkOnRemovalFromHierarchyCalls = 0;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/RequestEncodingTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/RequestEncodingTest.java b/wicket-core/src/test/java/org/apache/wicket/RequestEncodingTest.java
index 8b66dce..f9d5dae 100644
--- a/wicket-core/src/test/java/org/apache/wicket/RequestEncodingTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/RequestEncodingTest.java
@@ -16,22 +16,23 @@
*/
package org.apache.wicket;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.After;
-import org.junit.Assert;
-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;
-public class RequestEncodingTest extends Assert
+class RequestEncodingTest
{
private RedirectApplication application;
private WicketTester tester;
- @Before
- public void setUp()
+ @BeforeEach
+ void setUp()
{
application = new RedirectApplication();
tester = new WicketTester(application);
@@ -39,14 +40,14 @@ public class RequestEncodingTest extends Assert
tester.assertRenderedPage(RedirectHomePage.class);
}
- @After
- public void tearDown()
+ @AfterEach
+ void tearDown()
{
tester.destroy();
}
@Test
- public void defaultTest()
+ void defaultTest()
{
tester.startPage(RedirectA.class,
new PageParameters().set("file", "umlaut-\u00E4-\u00F6-\u00FC"));
@@ -66,7 +67,7 @@ public class RequestEncodingTest extends Assert
}
@Test
- public void umlautsInRequestUri()
+ void umlautsInRequestUri()
{
application.mountPage("Aparameter", RedirectA.class);
defaultTest();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ResourceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ResourceTest.java b/wicket-core/src/test/java/org/apache/wicket/ResourceTest.java
index 2c2c3b4..3b0c9a4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ResourceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ResourceTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -28,13 +30,12 @@ import org.apache.wicket.util.resource.FileResourceStream;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Tests resources.
*/
-public class ResourceTest extends WicketTestCase
+class ResourceTest extends WicketTestCase
{
private static final String TEST_STRING = "Hello, World!";
@@ -42,7 +43,7 @@ public class ResourceTest extends WicketTestCase
* tests a resource that is not cacheable.
*/
@Test
- public void testFileResourceStream()
+ void testFileResourceStream()
{
final File testFile;
try
@@ -67,7 +68,7 @@ public class ResourceTest extends WicketTestCase
* testStringResourceStream()
*/
@Test
- public void stringResourceStream()
+ void stringResourceStream()
{
StringResourceStream resourceStream = new StringResourceStream(TEST_STRING);
bindToApplicationAsResourceAndRequestIt(resourceStream);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionInAjaxTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionInAjaxTest.java b/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionInAjaxTest.java
index c7bde8a..47cf94e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionInAjaxTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionInAjaxTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.mock.MockApplication;
@@ -26,14 +28,14 @@ import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.DummyHomePage;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* https://issues.apache.org/jira/browse/WICKET-4251
*
* Tests that an intercepted Ajax request is continued in non-Ajax response
*/
-public class RestartResponseAtInterceptPageExceptionInAjaxTest extends WicketTestCase
+class RestartResponseAtInterceptPageExceptionInAjaxTest extends WicketTestCase
{
@Override
@@ -50,7 +52,7 @@ public class RestartResponseAtInterceptPageExceptionInAjaxTest extends WicketTes
public static class HomePage extends WebPage implements IMarkupResourceStreamProvider
{
- public HomePage()
+ public HomePage()
{
// set the intercept data
new RestartResponseAtInterceptPageException(DummyHomePage.class);
@@ -70,7 +72,7 @@ public class RestartResponseAtInterceptPageExceptionInAjaxTest extends WicketTes
* in its post parameters
*/
@Test
- public void requestAPageInAjaxButReceiveItInNonAjaxResponse()
+ void requestAPageInAjaxButReceiveItInNonAjaxResponse()
{
// issue ajax request
tester.executeAjaxUrl(Url.parse("?"+WebRequest.PARAM_AJAX+"=true&"+WebRequest.PARAM_AJAX_BASE_URL+"=/"));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionTest.java b/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionTest.java
index a35b63e..c1a55a0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionTest.java
@@ -21,12 +21,12 @@ import org.apache.wicket.markup.html.pages.RedirectPage;
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link RestartResponseAtInterceptPageException}
*/
-public class RestartResponseAtInterceptPageExceptionTest extends WicketTestCase
+class RestartResponseAtInterceptPageExceptionTest extends WicketTestCase
{
@Override
protected WebApplication newApplication()
@@ -61,7 +61,7 @@ public class RestartResponseAtInterceptPageExceptionTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-3836
*/
@Test
- public void redirectToBufferForNonVersionedPage()
+ void redirectToBufferForNonVersionedPage()
{
tester.startPage(tester.getApplication().getHomePage());
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/RestartResponseExceptionTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/RestartResponseExceptionTest.java b/wicket-core/src/test/java/org/apache/wicket/RestartResponseExceptionTest.java
index 1a19385..1e566ef 100644
--- a/wicket-core/src/test/java/org/apache/wicket/RestartResponseExceptionTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/RestartResponseExceptionTest.java
@@ -21,12 +21,12 @@ import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.util.resource.AbstractStringResourceStream;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for the usages of {@link RestartResponseException}
*/
-public class RestartResponseExceptionTest extends WicketTestCase
+class RestartResponseExceptionTest extends WicketTestCase
{
/**
* Tests that following several {@link RestartResponseException}s will actually leave you at the
@@ -35,7 +35,7 @@ public class RestartResponseExceptionTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-2634
*/
@Test
- public void doubleRedirect()
+ void doubleRedirect()
{
tester.startPage(RestartPage1.class);
tester.assertRenderedPage(MyDummyPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/RestartWithMountedPageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/RestartWithMountedPageTest.java b/wicket-core/src/test/java/org/apache/wicket/RestartWithMountedPageTest.java
index f44048d..a99a79b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/RestartWithMountedPageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/RestartWithMountedPageTest.java
@@ -17,20 +17,20 @@
package org.apache.wicket;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author jcompagner
*/
-public class RestartWithMountedPageTest extends WicketTestCase
+class RestartWithMountedPageTest extends WicketTestCase
{
/**
* Tests that a protected page can redirect to a login page from mounted pages.
*/
@Test
- public void withMountedLoginPage()
+ void withMountedLoginPage()
{
tester.getApplication().mountPage("/login", LoginPage.class);
tester.startPage(ProtectedPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/SetResponsePageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/SetResponsePageTest.java b/wicket-core/src/test/java/org/apache/wicket/SetResponsePageTest.java
index 0f99a88..0d0965f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/SetResponsePageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/SetResponsePageTest.java
@@ -18,16 +18,16 @@ package org.apache.wicket;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for calling {@link Component#setResponsePage(Class)} in constructor.
*/
-public class SetResponsePageTest extends WicketTestCase
+class SetResponsePageTest extends WicketTestCase
{
/** Fix setting response page in constructor. */
@Test
- public void setResponsePage()
+ void setResponsePage()
{
tester.startPage(Page1.class);
tester.assertRenderedPage(Page3.class);
@@ -39,7 +39,7 @@ public class SetResponsePageTest extends WicketTestCase
private static final long serialVersionUID = 1L;
/** Construct. */
- public Page1()
+ public Page1()
{
setResponsePage(Page2.class);
}
@@ -63,7 +63,7 @@ public class SetResponsePageTest extends WicketTestCase
private static final long serialVersionUID = 1L;
/** Construct. */
- public Page3()
+ public Page3()
{
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/SharedResourceUrlTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/SharedResourceUrlTest.java b/wicket-core/src/test/java/org/apache/wicket/SharedResourceUrlTest.java
index 14d5083..dee6fd8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/SharedResourceUrlTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/SharedResourceUrlTest.java
@@ -16,23 +16,25 @@
*/
package org.apache.wicket;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.request.resource.SharedResourceReference;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author jcompagner
*/
-public class SharedResourceUrlTest extends WicketTestCase
+class SharedResourceUrlTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void resourceReferenceUrl() throws Exception
+ void resourceReferenceUrl() throws Exception
{
ResourceReference rr = new SharedResourceReference("test");
CharSequence url = tester.getRequestCycle().mapUrlFor(rr, null).toString();
@@ -47,7 +49,7 @@ public class SharedResourceUrlTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void resourceReferenceWithParamsUrl() throws Exception
+ void resourceReferenceWithParamsUrl() throws Exception
{
ResourceReference rr = new SharedResourceReference("test");
CharSequence url = tester.getRequestCycle()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/StyleAttributeModifierTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/StyleAttributeModifierTest.java b/wicket-core/src/test/java/org/apache/wicket/StyleAttributeModifierTest.java
index b471166..cb4ebbb 100644
--- a/wicket-core/src/test/java/org/apache/wicket/StyleAttributeModifierTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/StyleAttributeModifierTest.java
@@ -16,23 +16,25 @@
*/
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 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 StyleAttributeModifier
*/
-public class StyleAttributeModifierTest extends Assert
+class StyleAttributeModifierTest
{
/**
* Adds two style properties
*/
@Test
- public void addCssStyles()
+ void addCssStyles()
{
StyleAttributeModifier cam = new StyleAttributeModifier()
{
@@ -58,7 +60,7 @@ public class StyleAttributeModifierTest extends Assert
* Modifies one style, removes another and adds a new style
*/
@Test
- public void addRemoveCssStyles()
+ void addRemoveCssStyles()
{
StyleAttributeModifier cam = new StyleAttributeModifier()
{
@@ -86,7 +88,7 @@ public class StyleAttributeModifierTest extends Assert
* Removes all CSS style values and the attribute itself
*/
@Test
- public void removeAllCssStyles()
+ void removeAllCssStyles()
{
StyleAttributeModifier cam = new StyleAttributeModifier()
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/TesterTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/TesterTest.java b/wicket-core/src/test/java/org/apache/wicket/TesterTest.java
index 3762018..3258c33 100644
--- a/wicket-core/src/test/java/org/apache/wicket/TesterTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/TesterTest.java
@@ -16,23 +16,24 @@
*/
package org.apache.wicket;
-import junit.framework.AssertionFailedError;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.opentest4j.AssertionFailedError;
/**
* @author jcompagner
*/
-public class TesterTest extends WicketTestCase
+class TesterTest extends WicketTestCase
{
/**
*
*/
@Test
- public void assertTest()
+ void assertTest()
{
tester.startPage(new MyPage());
tester.debugComponentTrees();
@@ -57,7 +58,7 @@ public class TesterTest extends WicketTestCase
/**
* Construct.
*/
- public MyPage()
+ MyPage()
{
add(new Label("label")
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/VisitorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/VisitorTest.java b/wicket-core/src/test/java/org/apache/wicket/VisitorTest.java
index 4260eca..115e495 100644
--- a/wicket-core/src/test/java/org/apache/wicket/VisitorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/VisitorTest.java
@@ -16,7 +16,8 @@
*/
package org.apache.wicket;
-import org.junit.Assert;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.util.tester.WicketTestCase;
@@ -24,7 +25,7 @@ import org.apache.wicket.util.visit.ClassVisitFilter;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
import org.apache.wicket.util.visit.Visits;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* <code>
@@ -40,13 +41,13 @@ import org.junit.Test;
*
* @author igor.vaynberg
*/
-public class VisitorTest extends WicketTestCase
+class VisitorTest extends WicketTestCase
{
/**
* testVisit()
*/
@Test
- public void visit()
+ void visit()
{
final StringBuilder path = new StringBuilder();
@@ -61,7 +62,7 @@ public class VisitorTest extends WicketTestCase
}
});
- Assert.assertEquals("ABCDEFGH", path.toString());
+ assertEquals("ABCDEFGH", path.toString());
}
@@ -69,7 +70,7 @@ public class VisitorTest extends WicketTestCase
* testContinueTraversal()
*/
@Test
- public void continueTraversal()
+ void continueTraversal()
{
final StringBuilder path = new StringBuilder();
@@ -84,14 +85,14 @@ public class VisitorTest extends WicketTestCase
}
});
- Assert.assertEquals("BCDEFGH", path.toString());
+ assertEquals("BCDEFGH", path.toString());
}
/**
* testContinuePostOrder()
*/
@Test
- public void continuePostOrder()
+ void continuePostOrder()
{
final StringBuilder path = new StringBuilder();
@@ -105,14 +106,14 @@ public class VisitorTest extends WicketTestCase
}
});
- Assert.assertEquals("BDFECHGA", path.toString());
+ assertEquals("BDFECHGA", path.toString());
}
/**
* testStop()
*/
@Test
- public void stop()
+ void stop()
{
final StringBuilder path = new StringBuilder();
@@ -129,15 +130,15 @@ public class VisitorTest extends WicketTestCase
}
}
});
- Assert.assertEquals("BCD", path.toString());
- Assert.assertEquals("RESULT", result);
+ assertEquals("BCD", path.toString());
+ assertEquals("RESULT", result);
}
/**
* testDoNotGoDeeper1()
*/
@Test
- public void doNotGoDeeper1()
+ void doNotGoDeeper1()
{
final StringBuilder path = new StringBuilder();
@@ -154,14 +155,14 @@ public class VisitorTest extends WicketTestCase
}
}
});
- Assert.assertEquals("BCGH", path.toString());
+ assertEquals("BCGH", path.toString());
}
/**
* testDoNotGoDeeper2()
*/
@Test
- public void doNotGoDeeper2()
+ void doNotGoDeeper2()
{
final StringBuilder path = new StringBuilder();
@@ -178,7 +179,7 @@ public class VisitorTest extends WicketTestCase
}
}
});
- Assert.assertEquals("BCDEGH", path.toString());
+ assertEquals("BCDEGH", path.toString());
}
/**
@@ -187,7 +188,7 @@ public class VisitorTest extends WicketTestCase
* Visit parents with arbitrary type
*/
@Test
- public void testVisitParents()
+ void testVisitParents()
{
TestContainer testContainer = new TestContainer();
IVisitor<MarkupContainer, MarkerInterface> visitor = new IVisitor<MarkupContainer, MarkerInterface>()
@@ -214,7 +215,7 @@ public class VisitorTest extends WicketTestCase
{
private static final long serialVersionUID = 1L;
- public MarkedWebMarkupContainer(String id)
+ MarkedWebMarkupContainer(String id)
{
super(id);
}
@@ -224,7 +225,7 @@ public class VisitorTest extends WicketTestCase
{
private static final long serialVersionUID = 1L;
- public TestContainer()
+ TestContainer()
{
super("A");
WebMarkupContainer b = new WebMarkupContainer("B");
[12/45] wicket git commit: wicket-core: Migrate to Junit 5
Posted by mg...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/MetaInfStaticResourceReferenceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/MetaInfStaticResourceReferenceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/MetaInfStaticResourceReferenceTest.java
index 5333e31..dd899ca 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/MetaInfStaticResourceReferenceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/MetaInfStaticResourceReferenceTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.request.resource;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import java.lang.reflect.Field;
import java.net.MalformedURLException;
import java.net.URL;
@@ -26,17 +29,16 @@ import org.apache.wicket.protocol.http.mock.MockServletContext;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Url;
import org.apache.wicket.util.tester.BaseWicketTester;
-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;
/**
* Tests for {@link MetaInfStaticResourceReference}.
*
* @author akiraly
*/
-public class MetaInfStaticResourceReferenceTest
+class MetaInfStaticResourceReferenceTest
{
private static final String STATIC_RESOURCE_NAME = "sample.js";
@@ -47,7 +49,7 @@ public class MetaInfStaticResourceReferenceTest
* should not happen
*/
@Test
- public void testWithServlet30() throws MalformedURLException
+ void testWithServlet30() throws MalformedURLException
{
MockApplication application = new MockApplication();
MockServletContext servletContext = new MockServletContext(application, "/");
@@ -61,11 +63,9 @@ public class MetaInfStaticResourceReferenceTest
Url packUrl = tester.getRequestCycle().mapUrlFor(packRes, null);
Url metaUrl = tester.getRequestCycle().mapUrlFor(metaRes, null);
- Assert.assertNotNull(metaUrl);
- Assert.assertNotNull(packUrl);
- Assert.assertFalse(
- "Meta and pack resource should not map to the same url under servlet 3.0.",
- metaUrl.equals(packUrl));
+ assertNotNull(metaUrl);
+ assertNotNull(packUrl);
+ assertFalse(metaUrl.equals(packUrl), "Meta and pack resource should not map to the same url under servlet 3.0.");
String metaUrlStr = metaUrl.toString();
if (metaUrlStr.charAt(1) != '/')
@@ -76,7 +76,7 @@ public class MetaInfStaticResourceReferenceTest
// meta resource is served by the servlet container under 3.0
URL metaNetUrl = servletContext.getResource(metaUrlStr);
- Assert.assertNotNull("Meta resource is not found by the 3.0 servlet container.", metaNetUrl);
+ assertNotNull(metaNetUrl, "Meta resource is not found by the 3.0 servlet container.");
MockWebRequest request = new MockWebRequest(packUrl);
@@ -85,7 +85,7 @@ public class MetaInfStaticResourceReferenceTest
.mapRequest(request);
// the pack resource is still served by wicket
- Assert.assertNotNull(requestHandler);
+ assertNotNull(requestHandler);
}
/**
@@ -96,8 +96,8 @@ public class MetaInfStaticResourceReferenceTest
* @throws Exception
* if the reflection magic failed
*/
- @Before
- public void before() throws Exception
+ @BeforeEach
+ void before() throws Exception
{
Field field = MetaInfStaticResourceReference.class.getDeclaredField("META_INF_RESOURCES_SUPPORTED");
field.setAccessible(true);
@@ -110,8 +110,8 @@ public class MetaInfStaticResourceReferenceTest
* @throws Exception
* if before fails
*/
- @After
- public void after() throws Exception
+ @AfterEach
+ void after() throws Exception
{
before();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/MinifiedAwareResourceReferenceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/MinifiedAwareResourceReferenceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/MinifiedAwareResourceReferenceTest.java
index 934281c..7bec622 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/MinifiedAwareResourceReferenceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/MinifiedAwareResourceReferenceTest.java
@@ -16,16 +16,18 @@
*/
package org.apache.wicket.request.resource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Locale;
+
import org.apache.wicket.Application;
import org.apache.wicket.core.util.resource.locator.ResourceStreamLocator;
import org.apache.wicket.request.resource.IResource.Attributes;
import org.apache.wicket.response.ByteArrayResponse;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.Locale;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Testcases for minified aware resources.
@@ -34,10 +36,10 @@ import java.util.Locale;
*
* @author papegaaij
*/
-public class MinifiedAwareResourceReferenceTest extends WicketTestCase
+class MinifiedAwareResourceReferenceTest extends WicketTestCase
{
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
tester.getSession().setLocale(Locale.US);
}
@@ -55,7 +57,7 @@ public class MinifiedAwareResourceReferenceTest extends WicketTestCase
* Tests is a pre-minified resource is detected
*/
@Test
- public void minifiedResourceAvailable()
+ void minifiedResourceAvailable()
{
Application.get().getResourceSettings().setUseMinifiedResources(true);
ResourceReference reference = new JavaScriptResourceReference(
@@ -69,7 +71,7 @@ public class MinifiedAwareResourceReferenceTest extends WicketTestCase
* Tests fallback to normal resource when pre-minified is not available
*/
@Test
- public void noMinifiedResourceAvailable()
+ void noMinifiedResourceAvailable()
{
MinCountingResourceStreamLocator locator = new MinCountingResourceStreamLocator();
@@ -88,7 +90,7 @@ public class MinifiedAwareResourceReferenceTest extends WicketTestCase
private class MinCountingResourceStreamLocator extends ResourceStreamLocator
{
- public int minLocated = 0;
+ int minLocated = 0;
@Override
public IResourceStream locate(Class<?> clazz, String path)
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java
index 0af08da..426ee24 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java
@@ -16,6 +16,11 @@
*/
package org.apache.wicket.request.resource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.IOException;
import java.io.InputStream;
import java.util.Locale;
@@ -32,15 +37,13 @@ import org.apache.wicket.request.resource.ResourceReference.UrlAttributes;
import org.apache.wicket.response.ByteArrayResponse;
import org.apache.wicket.util.io.IOUtils;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Assert;
-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 PackageResourceReferenceTest extends WicketTestCase
+class PackageResourceReferenceTest extends WicketTestCase
{
private static Class<PackageResourceReferenceTest> scope = PackageResourceReferenceTest.class;
private static Locale[] locales = { null, new Locale("en"), new Locale("en", "US") };
@@ -50,8 +53,8 @@ public class PackageResourceReferenceTest extends WicketTestCase
/**
* @throws Exception
*/
- @Before
- public void before() throws Exception
+ @BeforeEach
+ void before() throws Exception
{
// some locale outside those in locales array
tester.getSession().setLocale(Locale.CHINA);
@@ -61,7 +64,7 @@ public class PackageResourceReferenceTest extends WicketTestCase
*
*/
@Test
- public void resourceResolution()
+ void resourceResolution()
{
for (Locale locale : locales)
{
@@ -106,7 +109,7 @@ public class PackageResourceReferenceTest extends WicketTestCase
*
*/
@Test
- public void resourceResponse()
+ void resourceResponse()
{
for (Locale locale : locales)
{
@@ -147,7 +150,7 @@ public class PackageResourceReferenceTest extends WicketTestCase
* Asserting if user did not set any locale or style, those from session get used if any
*/
@Test
- public void sessionAttributesRelevance()
+ void sessionAttributesRelevance()
{
for (Locale locale : new Locale[] { new Locale("en"), new Locale("en", "US") })
{
@@ -172,7 +175,7 @@ public class PackageResourceReferenceTest extends WicketTestCase
* Assert preference for specified locale and style over session ones
*/
@Test
- public void userAttributesPreference()
+ void userAttributesPreference()
{
tester.getSession().setLocale(new Locale("en"));
tester.getSession().setStyle("style");
@@ -199,19 +202,19 @@ public class PackageResourceReferenceTest extends WicketTestCase
* see WICKET-5251 : Proper detection of already minified resources
*/
@Test
- public void testMinifiedNameDetectMinInName()
+ void testMinifiedNameDetectMinInName()
{
final PackageResourceReference html5minjs = new PackageResourceReference("html5.min.js");
- Assert.assertEquals("html5.min.js", html5minjs.getMinifiedName());
+ assertEquals("html5.min.js", html5minjs.getMinifiedName());
final PackageResourceReference html5notminjs = new PackageResourceReference("html5.notmin.js");
- Assert.assertEquals("html5.notmin.min.js", html5notminjs.getMinifiedName());
+ assertEquals("html5.notmin.min.js", html5notminjs.getMinifiedName());
final PackageResourceReference html5notmin = new PackageResourceReference("html5notmin");
- Assert.assertEquals("html5notmin.min", html5notmin.getMinifiedName());
+ assertEquals("html5notmin.min", html5notmin.getMinifiedName());
final PackageResourceReference html5min = new PackageResourceReference("html5.min");
- Assert.assertEquals("html5.min", html5min.getMinifiedName());
+ assertEquals("html5.min", html5min.getMinifiedName());
}
@@ -219,47 +222,47 @@ public class PackageResourceReferenceTest extends WicketTestCase
* see WICKET-5250 - for JavaScriptResourceReference
*/
@Test
- public void testJavaScriptResourceReferenceRespectsMinifiedResourcesDetection()
+ void testJavaScriptResourceReferenceRespectsMinifiedResourcesDetection()
{
Application.get().getResourceSettings().setUseMinifiedResources(true);
final JavaScriptResourceReference notMinified = new JavaScriptResourceReference(PackageResourceReferenceTest.class, "a.js");
final JavaScriptPackageResource notMinifiedResource = notMinified.getResource();
- Assert.assertTrue("Not minified resource should got its compress flag set to true", notMinifiedResource.getCompress());
+ assertTrue(notMinifiedResource.getCompress(), "Not minified resource should got its compress flag set to true");
final JavaScriptResourceReference alreadyMinified = new JavaScriptResourceReference(PackageResourceReferenceTest.class, "b.min.js");
final JavaScriptPackageResource alreadyMinifiedResource = alreadyMinified.getResource();
- Assert.assertFalse("Already minified resource should got its compress flag set to false", alreadyMinifiedResource.getCompress());
+ assertFalse(alreadyMinifiedResource.getCompress(), "Already minified resource should got its compress flag set to false");
}
/**
* see WICKET-5250 - for CSSResourceReference
*/
@Test
- public void testCSSResourceReferenceRespectsMinifiedResourcesDetection()
+ void testCSSResourceReferenceRespectsMinifiedResourcesDetection()
{
Application.get().getResourceSettings().setUseMinifiedResources(true);
final CssResourceReference notMinified = new CssResourceReference(PackageResourceReferenceTest.class, "a.css");
final CssPackageResource notMinifiedResource = notMinified.getResource();
- Assert.assertTrue("Not minified resource should got its compress flag set to true", notMinifiedResource.getCompress());
+ assertTrue(notMinifiedResource.getCompress(), "Not minified resource should got its compress flag set to true");
final CssResourceReference alreadyMinified = new CssResourceReference(PackageResourceReferenceTest.class, "b.min.css");
final CssPackageResource alreadyMinifiedResource = alreadyMinified.getResource();
- Assert.assertFalse("Already minified resource should got its compress flag set to false", alreadyMinifiedResource.getCompress());
+ assertFalse(alreadyMinifiedResource.getCompress(), "Already minified resource should got its compress flag set to false");
}
/**
* See WICKET-5819 - Media tags
*/
@Test
- public void testContentRange()
+ void testContentRange()
{
// Test range
- Assert.assertEquals("resource", makeRangeRequest("bytes=0-7"));
- Assert.assertEquals("ource", makeRangeRequest("bytes=3-7"));
- Assert.assertEquals("resource_var_style_en.txt", makeRangeRequest("bytes=0-"));
- Assert.assertEquals("var_style_en.txt", makeRangeRequest("bytes=9-"));
- Assert.assertEquals("resource_var_style_en.txt", makeRangeRequest("bytes=-"));
- Assert.assertEquals("resource_var_style_en.txt", makeRangeRequest("bytes=-25"));
+ assertEquals("resource", makeRangeRequest("bytes=0-7"));
+ assertEquals("ource", makeRangeRequest("bytes=3-7"));
+ assertEquals("resource_var_style_en.txt", makeRangeRequest("bytes=0-"));
+ assertEquals("var_style_en.txt", makeRangeRequest("bytes=9-"));
+ assertEquals("resource_var_style_en.txt", makeRangeRequest("bytes=-"));
+ assertEquals("resource_var_style_en.txt", makeRangeRequest("bytes=-25"));
}
private String makeRangeRequest(String range)
@@ -283,7 +286,7 @@ public class PackageResourceReferenceTest extends WicketTestCase
* @throws IOException
*/
@Test
- public void testContentRangeLarge() throws IOException
+ void testContentRangeLarge() throws IOException
{
InputStream resourceAsStream = null;
try
@@ -334,7 +337,7 @@ public class PackageResourceReferenceTest extends WicketTestCase
* See WICKET-5819 - Media tags
*/
@Test
- public void testContentRangeHeaders()
+ void testContentRangeHeaders()
{
// Test header fields
ResourceReference reference = new PackageResourceReference(scope, "resource.txt",
@@ -344,7 +347,7 @@ public class PackageResourceReferenceTest extends WicketTestCase
MockHttpServletResponse mockHttpServletResponse = (MockHttpServletResponse)response.getContainerResponse();
Attributes mockAttributes = new Attributes(request, response);
reference.getResource().respond(mockAttributes);
- Assert.assertEquals(ContentRangeType.BYTES.getTypeName(),
+ assertEquals(ContentRangeType.BYTES.getTypeName(),
mockHttpServletResponse.getHeader("Accept-Range"));
// For normal: If a resource supports content range no content is delivered
// if no "Range" header is given, but we have to deliver it, because
@@ -352,7 +355,7 @@ public class PackageResourceReferenceTest extends WicketTestCase
// detecting media requests and automatically add the "Range" header for
// partial content and they don't make an initial request to detect if a media
// resource supports Content-Range (by the Accept-Range header)
- Assert.assertEquals("resource_var_style_en.txt",
+ assertEquals("resource_var_style_en.txt",
new String(mockHttpServletResponse.getBinaryContent()));
}
@@ -360,7 +363,7 @@ public class PackageResourceReferenceTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-6031
*/
@Test
- public void noRequestCycle()
+ void noRequestCycle()
{
ThreadContext.setRequestCycle(null);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/ResouceBundleTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/ResouceBundleTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/ResouceBundleTest.java
index 4bc7ff5..7bde976 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/ResouceBundleTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/ResouceBundleTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.request.resource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.Arrays;
import java.util.Locale;
@@ -24,8 +26,8 @@ import org.apache.wicket.request.Url;
import org.apache.wicket.resource.bundles.ConcatBundleResource;
import org.apache.wicket.resource.bundles.ResourceBundleReference;
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;
/**
* Test cases for resource bundles
@@ -34,8 +36,8 @@ import org.junit.Test;
*/
public class ResouceBundleTest extends WicketTestCase
{
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
tester.getSession().setLocale(Locale.ENGLISH);
}
@@ -44,7 +46,7 @@ public class ResouceBundleTest extends WicketTestCase
* Tests the concatenation of 2 javascript files
*/
@Test
- public void concatBundle()
+ void concatBundle()
{
ConcatBundleResource bundle = new ConcatBundleResource(Arrays.asList(
JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
@@ -62,7 +64,7 @@ public class ResouceBundleTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void providedResource() throws Exception
+ void providedResource() throws Exception
{
tester.getApplication()
.getResourceBundles()
@@ -79,7 +81,7 @@ public class ResouceBundleTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void providedResourceWithDefer() throws Exception
+ void providedResourceWithDefer() throws Exception
{
tester.getApplication()
.getResourceBundles()
@@ -96,7 +98,7 @@ public class ResouceBundleTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void externalBundle() throws Exception
+ void externalBundle() throws Exception
{
ResourceBundleReference bundle = new ResourceBundleReference(
new UrlResourceReference(
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceLambdaTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceLambdaTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceLambdaTest.java
index 010cb69..a31d65f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceLambdaTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceLambdaTest.java
@@ -16,12 +16,14 @@
*/
package org.apache.wicket.request.resource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class ResourceReferenceLambdaTest extends WicketTestCase
+class ResourceReferenceLambdaTest extends WicketTestCase
{
private final String output = "lambda resource";
@@ -42,7 +44,7 @@ public class ResourceReferenceLambdaTest extends WicketTestCase
}
@Test
- public void lambdaBasedResurceReference() throws Exception
+ void lambdaBasedResurceReference() throws Exception
{
tester.executeUrl("./test");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceLocatingTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceLocatingTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceLocatingTest.java
index 5b96599..e36243b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceLocatingTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceLocatingTest.java
@@ -17,6 +17,7 @@
package org.apache.wicket.request.resource;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import java.io.BufferedReader;
import java.io.InputStream;
@@ -24,25 +25,23 @@ import java.io.StringReader;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
+import java.util.stream.Stream;
import org.apache.wicket.util.io.Streams;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
/**
* Test case for WICKET-5967 - Unable to load i18n minified js.
*/
@SuppressWarnings("javadoc")
-@RunWith(Parameterized.class)
public class ResourceReferenceLocatingTest extends WicketTestCase
{
/** Loads the test cases from a spread sheet in semi-colon separated format. */
- @Parameters(name = "{0}")
- public static List<Object[]> parameters()
+ private static Stream<TestCase> parameters()
{
try (InputStream is = ResourceReferenceLocatingTest.class
.getResourceAsStream("ResourceReferenceLocatingTest.csv"))
@@ -50,15 +49,16 @@ public class ResourceReferenceLocatingTest extends WicketTestCase
String csv = Streams.readString(is);
StringReader sr = new StringReader(csv);
BufferedReader br = new BufferedReader(sr);
- List<Object[]> result = new ArrayList<>();
+ List<TestCase> result = new ArrayList<>();
String line = br.readLine(); // read header line
while ((line = br.readLine()) != null)
{
if (!line.isEmpty())
- result.add(new Object[] { TestCase.fromLine(line) });
+ result.add(TestCase.fromLine(line));
}
- return result;
+
+ return result.stream();
}
catch (Exception e)
{
@@ -66,6 +66,83 @@ public class ResourceReferenceLocatingTest extends WicketTestCase
}
}
+ @BeforeEach
+ void before()
+ {
+ tester.getSession().setLocale(Locale.ENGLISH);
+ }
+
+ /**
+ * Locate a resource without a minification requirement.
+ */
+ @ParameterizedTest
+ @MethodSource("parameters")
+ void locateNonMinifiedJavaScriptResourceReference(TestCase testCase)
+ {
+ tester.getApplication().getResourceSettings().setUseMinifiedResources(false);
+
+ checkNonStrictUsingJavaScriptResourceReference(testCase, testCase.getNonMinifiedContents());
+ }
+
+ /** */
+ @ParameterizedTest
+ @MethodSource("parameters")
+ void locateNonMinifiedPackageResourceReference(TestCase testCase)
+ {
+ tester.getApplication().getResourceSettings().setUseMinifiedResources(false);
+
+ checkNonStrictUsingPackageResourceReference(testCase, testCase.getNonMinifiedContents());
+ }
+
+ /** */
+ @ParameterizedTest
+ @MethodSource("parameters")
+ void locateMinifiedJavaScriptResourceReference(TestCase testCase)
+ {
+ tester.getApplication().getResourceSettings().setUseMinifiedResources(true);
+
+ checkNonStrictUsingJavaScriptResourceReference(testCase, testCase.getMinifiedContents());
+ }
+
+ /** */
+ @ParameterizedTest
+ @MethodSource("parameters")
+ void locateMinifiedPackageResourceReference(TestCase testCase)
+ {
+ tester.getApplication().getResourceSettings().setUseMinifiedResources(true);
+
+ checkNonStrictUsingPackageResourceReference(testCase, testCase.getMinifiedContents());
+ }
+
+ private void checkNonStrictUsingJavaScriptResourceReference(TestCase test, String expected)
+ {
+ Locale locale = test.getLocale();
+ String style = test.getStyle();
+ String variation = test.getVariation();
+ String extension = test.getExtension();
+
+ JavaScriptResourceReference reference = new JavaScriptResourceReference(
+ ResourceReferenceLocatingTest.class, "b.js", locale, style, variation);
+ tester.startResourceReference(reference);
+
+ assertThat(test.toString(), tester.getLastResponseAsString().trim(),
+ is("// " + expected));
+ }
+
+ private void checkNonStrictUsingPackageResourceReference(TestCase test, String expected)
+ {
+ Locale locale = test.getLocale();
+ String style = test.getStyle();
+ String variation = test.getVariation();
+ String extension = test.getExtension();
+
+ PackageResourceReference reference = new PackageResourceReference(
+ ResourceReferenceLocatingTest.class, "b.js", locale, style, variation);
+ tester.startResourceReference(reference);
+ assertThat(test.toString(), tester.getLastResponseAsString().trim(),
+ is("// " + expected));
+ }
+
public static class TestCase
{
private Locale locale;
@@ -101,7 +178,7 @@ public class ResourceReferenceLocatingTest extends WicketTestCase
return isNull(s) ? null : s;
}
- public static TestCase fromLine(String line)
+ static TestCase fromLine(String line)
{
String splitter;
if (line.contains("\t"))
@@ -131,32 +208,32 @@ public class ResourceReferenceLocatingTest extends WicketTestCase
return test;
}
- public Locale getLocale()
+ Locale getLocale()
{
return locale;
}
- public String getStyle()
+ String getStyle()
{
return style;
}
- public String getVariation()
+ String getVariation()
{
return variation;
}
- public String getExtension()
+ String getExtension()
{
return extension;
}
- public String getNonMinifiedContents()
+ String getNonMinifiedContents()
{
return nonMinifiedContents;
}
- public String getMinifiedContents()
+ String getMinifiedContents()
{
return minifiedContents;
}
@@ -178,83 +255,4 @@ public class ResourceReferenceLocatingTest extends WicketTestCase
", extension=" + extension + "]";
}
}
-
- private TestCase test;
-
- public ResourceReferenceLocatingTest(TestCase test)
- {
- this.test = test;
- }
-
- @Before
- public void before()
- {
- tester.getSession().setLocale(Locale.ENGLISH);
- }
-
- /**
- * Locate a resource without a minification requirement.
- */
- @Test
- public void locateNonMinifiedJavaScriptResourceReference()
- {
- tester.getApplication().getResourceSettings().setUseMinifiedResources(false);
-
- checkNonStrictUsingJavaScriptResourceReference(test.getNonMinifiedContents());
- }
-
- /** */
- @Test
- public void locateNonMinifiedPackageResourceReference()
- {
- tester.getApplication().getResourceSettings().setUseMinifiedResources(false);
-
- checkNonStrictUsingPackageResourceReference(test.getNonMinifiedContents());
- }
-
- /** */
- @Test
- public void locateMinifiedJavaScriptResourceReference()
- {
- tester.getApplication().getResourceSettings().setUseMinifiedResources(true);
-
- checkNonStrictUsingJavaScriptResourceReference(test.getMinifiedContents());
- }
-
- /** */
- @Test
- public void locateMinifiedPackageResourceReference()
- {
- tester.getApplication().getResourceSettings().setUseMinifiedResources(true);
-
- checkNonStrictUsingPackageResourceReference(test.getMinifiedContents());
- }
-
- private void checkNonStrictUsingJavaScriptResourceReference(String expectedResult)
- {
- Locale locale = test.getLocale();
- String style = test.getStyle();
- String variation = test.getVariation();
- String extension = test.getExtension();
-
- JavaScriptResourceReference reference = new JavaScriptResourceReference(
- ResourceReferenceLocatingTest.class, "b.js", locale, style, variation);
- tester.startResourceReference(reference);
- assertThat(test.toString(), tester.getLastResponseAsString().trim(),
- is("// " + expectedResult));
- }
-
- private void checkNonStrictUsingPackageResourceReference(String expectedResult)
- {
- Locale locale = test.getLocale();
- String style = test.getStyle();
- String variation = test.getVariation();
- String extension = test.getExtension();
-
- PackageResourceReference reference = new PackageResourceReference(
- ResourceReferenceLocatingTest.class, "b.js", locale, style, variation);
- tester.startResourceReference(reference);
- assertThat(test.toString(), tester.getLastResponseAsString().trim(),
- is("// " + expectedResult));
- }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceRegistryTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceRegistryTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceRegistryTest.java
index 2cd31c8..ca4c0b5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceRegistryTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceRegistryTest.java
@@ -16,23 +16,24 @@
*/
package org.apache.wicket.request.resource;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link ResourceReferenceRegistry}
*/
-public class ResourceReferenceRegistryTest extends WicketTestCase
+class ResourceReferenceRegistryTest extends WicketTestCase
{
/**
* https://issues.apache.org/jira/browse/WICKET-3890
*/
@Test
- public void addRemove()
+ void addRemove()
{
ResourceReferenceRegistry registry = new ResourceReferenceRegistry();
assertEquals(0, registry.getSize());
@@ -52,7 +53,7 @@ public class ResourceReferenceRegistryTest extends WicketTestCase
* {@link PackageResource} and register it
*/
@Test
- public void addSharedResourceReference()
+ void addSharedResourceReference()
{
ResourceReferenceRegistry registry = new ResourceReferenceRegistry();
assertEquals(0, registry.getSize());
@@ -64,26 +65,26 @@ public class ResourceReferenceRegistryTest extends WicketTestCase
}
@Test
- public void setNullResourceReferenceFactoryStillUsesTheDefault()
+ void setNullResourceReferenceFactoryStillUsesTheDefault()
{
ResourceReferenceRegistry registry = new ResourceReferenceRegistry();
registry.setResourceReferenceFactory(null);
ResourceReference.Key key = new ResourceReference.Key(ResourceReferenceRegistryTest.class.getName(),
"a.css", null, null, null);
ResourceReference reference = registry.createDefaultResourceReference(key);
- assertThat(reference, is(instanceOf(ResourceReference.class)));
- assertThat(reference.getResource(), is(instanceOf(CssPackageResource.class)));
+ assertThat(reference, instanceOf(ResourceReference.class));
+ assertThat(reference.getResource(), instanceOf(CssPackageResource.class));
}
@Test
- public void createLessResourceReference()
+ void createLessResourceReference()
{
ResourceReferenceRegistry registry = new ResourceReferenceRegistry();
registry.setResourceReferenceFactory(new LessResourceReferenceTest.LessResourceReferenceFactory());
ResourceReference.Key key = new ResourceReference.Key(ResourceReferenceRegistryTest.class.getName(),
"LessResourceReference.less", null, null, null);
ResourceReference reference = registry.createDefaultResourceReference(key);
- assertThat(reference, is(instanceOf(LessResourceReferenceTest.LessResourceReference.class)));
- assertThat(reference.getResource(), is(instanceOf(LessResourceReferenceTest.LessPackageResource.class)));
+ assertThat(reference, instanceOf(LessResourceReferenceTest.LessResourceReference.class));
+ assertThat(reference.getResource(), instanceOf(LessResourceReferenceTest.LessPackageResource.class));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/UrlResourceReferenceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/UrlResourceReferenceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/UrlResourceReferenceTest.java
index 37c9546..81b6554 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/UrlResourceReferenceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/UrlResourceReferenceTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.wicket.request.resource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -25,15 +29,15 @@ import org.apache.wicket.request.Url;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @since 6.0
*/
-public class UrlResourceReferenceTest extends WicketTestCase
+class UrlResourceReferenceTest extends WicketTestCase
{
@Test
- public void relativeUrl()
+ void relativeUrl()
{
Url url = Url.parse("some/relative/url");
UrlResourceReference reference = new UrlResourceReference(url);
@@ -45,7 +49,7 @@ public class UrlResourceReferenceTest extends WicketTestCase
}
@Test
- public void absoluteUrl()
+ void absoluteUrl()
{
Url url = Url.parse("http://www.example.com/some/path.ext");
UrlResourceReference reference = new UrlResourceReference(url);
@@ -58,7 +62,7 @@ public class UrlResourceReferenceTest extends WicketTestCase
}
@Test
- public void contextAbsoluteUrl()
+ void contextAbsoluteUrl()
{
Url url = Url.parse("/some/path.ext");
UrlResourceReference reference = new UrlResourceReference(url);
@@ -70,16 +74,19 @@ public class UrlResourceReferenceTest extends WicketTestCase
assertNull(reference.getResource());
}
- @Test(expected = IllegalStateException.class)
- public void cannotMakeAnAbsoluteUrlContextRelative()
+ @Test
+ void cannotMakeAnAbsoluteUrlContextRelative()
{
Url url = Url.parse("http://www.example.com/some/path.ext");
UrlResourceReference reference = new UrlResourceReference(url);
- reference.setContextRelative(true);
+
+ assertThrows(IllegalStateException.class, () -> {
+ reference.setContextRelative(true);
+ });
}
@Test
- public void contextRelativeUrl()
+ void contextRelativeUrl()
{
tester.getApplication().mountPage("/some/mount/path", TestPage.class);
tester.startPage(new TestPage());
@@ -90,7 +97,7 @@ public class UrlResourceReferenceTest extends WicketTestCase
/**
* A test page for #contextRelativeUrl()
*/
- public static class TestPage extends WebPage implements IMarkupResourceStreamProvider
+ public static class TestPage extends WebPage implements IMarkupResourceStreamProvider
{
@Override
public void renderHead(IHeaderResponse response)
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/WriteCallbackTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/WriteCallbackTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/WriteCallbackTest.java
index 028d9e3..1dba5f6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/WriteCallbackTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/WriteCallbackTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.request.resource;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -26,20 +28,18 @@ import org.apache.wicket.request.Url;
import org.apache.wicket.request.resource.AbstractResource.WriteCallback;
import org.apache.wicket.request.resource.IResource.Attributes;
import org.apache.wicket.response.ByteArrayResponse;
-import org.junit.Assert;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* @author Kent Tong
*/
-public class WriteCallbackTest extends Assert
+class WriteCallbackTest
{
/**
*/
@Test
- public void writeStream() throws IOException
+ void writeStream() throws IOException
{
WriteCallback callback = new WriteCallback()
{
@@ -59,7 +59,7 @@ public class WriteCallbackTest extends Assert
}
InputStream in = new ByteArrayInputStream(srcData);
callback.writeStream(attributes, in);
- assertTrue("Content not equal", Arrays.equals(response.getBytes(), srcData));
+ assertTrue(Arrays.equals(response.getBytes(), srcData), "Content not equal");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/ContextRelativeResourceCachingTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/ContextRelativeResourceCachingTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/ContextRelativeResourceCachingTest.java
index e4bfeb2..3aeac68 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/ContextRelativeResourceCachingTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/ContextRelativeResourceCachingTest.java
@@ -16,7 +16,9 @@
*/
package org.apache.wicket.request.resource.caching;
-import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.nio.charset.Charset;
import java.util.Locale;
@@ -31,12 +33,12 @@ import org.apache.wicket.request.resource.SharedResourceReference;
import org.apache.wicket.request.resource.caching.version.IResourceVersion;
import org.apache.wicket.request.resource.caching.version.StaticResourceVersion;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class ContextRelativeResourceCachingTest extends WicketTestCase
+class ContextRelativeResourceCachingTest extends WicketTestCase
{
private static final Charset CHARSET = Charset.forName("UTF-8");
private static final String SHARED_NAME = "contextresource";
@@ -93,7 +95,7 @@ public class ContextRelativeResourceCachingTest extends WicketTestCase
*
*/
@Test
- public void mapHandler()
+ void mapHandler()
{
ContextRelativeResource resource = new ContextRelativeResource("/style.css");
init(resource, "/test/resource");
@@ -101,7 +103,7 @@ public class ContextRelativeResourceCachingTest extends WicketTestCase
Request request = createRequest("test/resource-version-123?bla=4567");
final IRequestHandler handler = tester.getApplication().getRootRequestMapper()
.mapRequest(request);
- assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
+ assertThat(handler).isInstanceOf(ResourceReferenceRequestHandler.class);
assertEquals(((ResourceReferenceRequestHandler)handler).getResource(), resource);
}
@@ -109,7 +111,7 @@ public class ContextRelativeResourceCachingTest extends WicketTestCase
*
*/
@Test
- public void mapRequest()
+ void mapRequest()
{
ContextRelativeResource resource = new ContextRelativeResource("/style.css");
init(resource, "/test/resource");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/FilenameWithVersionResourceCachingStrategyTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/FilenameWithVersionResourceCachingStrategyTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/FilenameWithVersionResourceCachingStrategyTest.java
index 0c82205..0d37fbb 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/FilenameWithVersionResourceCachingStrategyTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/FilenameWithVersionResourceCachingStrategyTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.request.resource.caching;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.Application;
import org.apache.wicket.ThreadContext;
import org.apache.wicket.request.cycle.RequestCycle;
@@ -27,15 +29,14 @@ import org.apache.wicket.request.resource.caching.version.MessageDigestResourceV
import org.apache.wicket.util.tester.BaseWicketTester;
import org.apache.wicket.util.tester.WicketTester;
import org.apache.wicket.util.time.Duration;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for FilenameWithVersionResourceCachingStrategy
*/
-public class FilenameWithVersionResourceCachingStrategyTest extends Assert
+class FilenameWithVersionResourceCachingStrategyTest
{
- public static final String TEST_RESOURCE_VERSION = "9A0364B9E99BB480DD25E1F0284C8555";
+ private static final String TEST_RESOURCE_VERSION = "9A0364B9E99BB480DD25E1F0284C8555";
private final String versionPrefix = "--vers--";
private final IResourceVersion resourceVersion = new MessageDigestResourceVersion();
@@ -43,7 +44,7 @@ public class FilenameWithVersionResourceCachingStrategyTest extends Assert
new FilenameWithVersionResourceCachingStrategy(versionPrefix, resourceVersion);
@Test
- public void testDecorateUrl() throws Exception
+ void testDecorateUrl() throws Exception
{
ResourceUrl resourceUrl = new ResourceUrl("some-resource.txt", new PageParameters());
strategy.decorateUrl(resourceUrl, new TestResource());
@@ -58,7 +59,7 @@ public class FilenameWithVersionResourceCachingStrategyTest extends Assert
}
@Test
- public void testUndecorateUrl() throws Exception
+ void testUndecorateUrl() throws Exception
{
ResourceUrl resourceUrl = new ResourceUrl("some-resource--vers--"+TEST_RESOURCE_VERSION+".txt", new PageParameters());
strategy.undecorateUrl(resourceUrl);
@@ -79,7 +80,7 @@ public class FilenameWithVersionResourceCachingStrategyTest extends Assert
}
@Test
- public void testDecorateResponse() throws Exception
+ void testDecorateResponse() throws Exception
{
Duration defaultDuration = Duration.minutes(60);
@@ -115,7 +116,7 @@ public class FilenameWithVersionResourceCachingStrategyTest extends Assert
}
@Test
- public void testUrlVersionStoredInRequestCycle()
+ void testUrlVersionStoredInRequestCycle()
{
WicketTester tester = new WicketTester();
tester.getApplication().getResourceSettings().setCachingStrategy(strategy);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/QueryStringWithVersionResourceCachingStrategyTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/QueryStringWithVersionResourceCachingStrategyTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/QueryStringWithVersionResourceCachingStrategyTest.java
index 7e7b6db..0eabafe 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/QueryStringWithVersionResourceCachingStrategyTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/QueryStringWithVersionResourceCachingStrategyTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.request.resource.caching;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import org.apache.wicket.Application;
import org.apache.wicket.ThreadContext;
import org.apache.wicket.request.cycle.RequestCycle;
@@ -28,15 +31,14 @@ import org.apache.wicket.request.resource.caching.version.MessageDigestResourceV
import org.apache.wicket.util.tester.BaseWicketTester;
import org.apache.wicket.util.tester.WicketTester;
import org.apache.wicket.util.time.Duration;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for QueryStringWithVersionResourceCachingStrategy
*/
-public class QueryStringWithVersionResourceCachingStrategyTest extends Assert
+class QueryStringWithVersionResourceCachingStrategyTest
{
- public static final String TEST_RESOURCE_VERSION = "9A0364B9E99BB480DD25E1F0284C8555";
+ private static final String TEST_RESOURCE_VERSION = "9A0364B9E99BB480DD25E1F0284C8555";
private final String versionParameter = "vers";
private final IResourceVersion resourceVersion = new MessageDigestResourceVersion();
@@ -44,7 +46,7 @@ public class QueryStringWithVersionResourceCachingStrategyTest extends Assert
new QueryStringWithVersionResourceCachingStrategy(versionParameter, resourceVersion);
@Test
- public void testDecorateUrl() throws Exception
+ void testDecorateUrl() throws Exception
{
ResourceUrl resourceUrl = new ResourceUrl("some-resource.txt", new PageParameters());
strategy.decorateUrl(resourceUrl, new TestResource());
@@ -54,7 +56,7 @@ public class QueryStringWithVersionResourceCachingStrategyTest extends Assert
}
@Test
- public void testUndecorateUrl() throws Exception
+ void testUndecorateUrl() throws Exception
{
PageParameters urlParameters = new PageParameters();
urlParameters.add(versionParameter, TEST_RESOURCE_VERSION, INamedParameters.Type.QUERY_STRING);
@@ -66,7 +68,7 @@ public class QueryStringWithVersionResourceCachingStrategyTest extends Assert
}
@Test
- public void testDecorateResponse() throws Exception
+ void testDecorateResponse() throws Exception
{
Duration defaultDuration = Duration.minutes(60);
@@ -102,7 +104,7 @@ public class QueryStringWithVersionResourceCachingStrategyTest extends Assert
}
@Test
- public void testUrlVersionStoredInRequestCycle()
+ void testUrlVersionStoredInRequestCycle()
{
WicketTester tester = new WicketTester();
tester.getApplication().getResourceSettings().setCachingStrategy(strategy);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/ApplicationStringResourceLoaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/ApplicationStringResourceLoaderTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/ApplicationStringResourceLoaderTest.java
index 923b97b..17c1131 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/ApplicationStringResourceLoaderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/ApplicationStringResourceLoaderTest.java
@@ -16,11 +16,13 @@
*/
package org.apache.wicket.resource;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import java.util.Locale;
import org.apache.wicket.resource.loader.ClassStringResourceLoader;
import org.apache.wicket.resource.loader.IStringResourceLoader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for the <code>ApplicationStringResourceLoader</code> class.
@@ -48,8 +50,8 @@ public class ApplicationStringResourceLoaderTest extends StringResourceLoaderTes
public void loaderUnknownResources()
{
assertNull(
- "Unknown resource should return null",
createLoader().loadStringResource(component.getClass(),
- "test.string.that.does.not.exist", Locale.getDefault(), null, null));
+ "test.string.that.does.not.exist", Locale.getDefault(), null, null),
+ "Unknown resource should return null");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/BundleStringResourceLoaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/BundleStringResourceLoaderTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/BundleStringResourceLoaderTest.java
index c9c9e97..c92303e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/BundleStringResourceLoaderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/BundleStringResourceLoaderTest.java
@@ -16,11 +16,14 @@
*/
package org.apache.wicket.resource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import java.util.Locale;
import org.apache.wicket.resource.loader.BundleStringResourceLoader;
import org.apache.wicket.resource.loader.IStringResourceLoader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test case for the <code>BundleStringResourceLoader</code> class.
@@ -36,7 +39,7 @@ public class BundleStringResourceLoaderTest extends StringResourceLoaderTestBase
* @return The loader instance to test
*/
@Override
- protected IStringResourceLoader createLoader()
+ protected IStringResourceLoader createLoader()
{
return new BundleStringResourceLoader("org.apache.wicket.resource.DummyResources");
}
@@ -46,10 +49,11 @@ public class BundleStringResourceLoaderTest extends StringResourceLoaderTestBase
*/
@Override
@Test
- public void loaderValidKeyStyleNoLocale()
+ void loaderValidKeyStyleNoLocale()
{
- String s = loader.loadStringResource(component.getClass(), "test.string", null, "alt", null);
- assertEquals("Resource should be loaded", "This is a test", s);
+ String s = loader.loadStringResource(component.getClass(), "test.string", null, "alt",
+ null);
+ assertEquals("This is a test", s, "Resource should be loaded");
}
/**
@@ -57,11 +61,11 @@ public class BundleStringResourceLoaderTest extends StringResourceLoaderTestBase
*/
@Override
@Test
- public void loaderUnknownResources()
+ public void loaderUnknownResources()
{
IStringResourceLoader loader = new BundleStringResourceLoader("unknown.resource");
- assertNull("Unknown resource should return null", loader.loadStringResource(
- component.getClass(), "test.string", Locale.getDefault(), null, null));
+ assertNull(loader.loadStringResource(component.getClass(), "test.string",
+ Locale.getDefault(), null, null), "Unknown resource should return null");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/ComponentStringResourceLoaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/ComponentStringResourceLoaderTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/ComponentStringResourceLoaderTest.java
index 45543a9..b43dec4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/ComponentStringResourceLoaderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/ComponentStringResourceLoaderTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.resource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import java.util.Locale;
import org.apache.wicket.Component;
@@ -23,7 +26,7 @@ import org.apache.wicket.markup.html.panel.EmptyPanel;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.resource.loader.ComponentStringResourceLoader;
import org.apache.wicket.resource.loader.IStringResourceLoader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test case for the <code>ComponentStringResourceLoader</code> class.
@@ -39,7 +42,7 @@ public class ComponentStringResourceLoaderTest extends StringResourceLoaderTestB
* @return The loader instance to test
*/
@Override
- protected IStringResourceLoader createLoader()
+ protected IStringResourceLoader createLoader()
{
return new ComponentStringResourceLoader();
}
@@ -49,7 +52,7 @@ public class ComponentStringResourceLoaderTest extends StringResourceLoaderTestB
*/
@Override
@Test
- public void loaderUnknownResources()
+ public void loaderUnknownResources()
{
Component c = new DummyComponent("hello", tester.getApplication())
{
@@ -58,25 +61,25 @@ public class ComponentStringResourceLoaderTest extends StringResourceLoaderTestB
DummyPage page = new DummyPage();
page.add(c);
IStringResourceLoader loader = new ComponentStringResourceLoader();
- assertNull("Missing resource should return null", loader.loadStringResource(c.getClass(),
- "test.string.bad", Locale.getDefault(), null, null));
+ assertNull(loader.loadStringResource(c.getClass(), "test.string.bad", Locale.getDefault(),
+ null, null), "Missing resource should return null");
}
/**
*
*/
@Test
- public void nullComponent()
+ void nullComponent()
{
- assertNull("Null component should skip resource load", loader.loadStringResource(
- (Component)null, "test.string", Locale.getDefault(), null, null));
+ assertNull(loader.loadStringResource((Component)null, "test.string", Locale.getDefault(),
+ null, null), "Null component should skip resource load");
}
/**
*
*/
@Test
- public void multiLevelEmbeddedComponentLoadFromComponent()
+ void multiLevelEmbeddedComponentLoadFromComponent()
{
DummyPage p = new DummyPage();
Panel panel = new EmptyPanel("panel");
@@ -84,37 +87,36 @@ public class ComponentStringResourceLoaderTest extends StringResourceLoaderTestB
DummyComponent c = new DummyComponent("hello", tester.getApplication());
panel.add(c);
IStringResourceLoader loader = new ComponentStringResourceLoader();
- assertEquals("Valid resourse string should be found", "Component string",
- loader.loadStringResource(c.getClass(), "component.string", Locale.getDefault(), null,
- null));
+ assertEquals("Component string", loader
+ .loadStringResource(c.getClass(), "component.string", Locale.getDefault(), null, null), "Valid resourse string should be found");
}
/**
*
*/
@Test
- public void loadDirectFromPage()
+ void loadDirectFromPage()
{
DummyPage p = new DummyPage();
IStringResourceLoader loader = new ComponentStringResourceLoader();
- assertEquals("Valid resourse string should be found", "Another string",
- loader.loadStringResource(p.getClass(), "another.test.string", Locale.getDefault(),
- null, null));
+ assertEquals("Another string", loader.loadStringResource(p.getClass(),
+ "another.test.string", Locale.getDefault(), null, null),
+ "Valid resourse string should be found");
}
/**
*
*/
@Test
- public void searchClassHierarchyFromPage()
+ void searchClassHierarchyFromPage()
{
DummySubClassPage p = new DummySubClassPage();
IStringResourceLoader loader = new ComponentStringResourceLoader();
- assertEquals("Valid resource string should be found", "SubClass Test String",
- loader.loadStringResource(p.getClass(), "subclass.test.string", Locale.getDefault(),
- null, null));
- assertEquals("Valid resource string should be found", "Another string",
- loader.loadStringResource(p.getClass(), "another.test.string", Locale.getDefault(),
- null, null));
+ assertEquals("SubClass Test String", loader.loadStringResource(p.getClass(),
+ "subclass.test.string", Locale.getDefault(), null, null),
+ "Valid resource string should be found");
+ assertEquals("Another string", loader.loadStringResource(p.getClass(),
+ "another.test.string", Locale.getDefault(), null, null),
+ "Valid resource string should be found");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/CssUrlReplacerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/CssUrlReplacerTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/CssUrlReplacerTest.java
index 5681eaa..e693efe 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/CssUrlReplacerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/CssUrlReplacerTest.java
@@ -16,8 +16,10 @@
*/
package org.apache.wicket.resource;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.Locale;
@@ -32,10 +34,10 @@ import org.apache.wicket.request.resource.caching.IStaticCacheableResource;
import org.apache.wicket.request.resource.caching.ResourceUrl;
import org.apache.wicket.request.resource.caching.version.MessageDigestResourceVersion;
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;
-public class CssUrlReplacerTest extends WicketTestCase
+class CssUrlReplacerTest extends WicketTestCase
{
private static final String DECORATION_SUFFIX = "--decorated";
@@ -71,14 +73,14 @@ public class CssUrlReplacerTest extends WicketTestCase
};
}
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
tester.getSession().setLocale(Locale.ENGLISH);
}
@Test
- public void doNotProcessFullUrls()
+ void doNotProcessFullUrls()
{
String input = ".class {background-image: url('http://example.com/some.img');}";
Class<?> scope = CssUrlReplacerTest.class;
@@ -86,11 +88,11 @@ public class CssUrlReplacerTest extends WicketTestCase
CssUrlReplacer replacer = new CssUrlReplacer();
String processed = replacer.process(input, scope, cssRelativePath);
- assertThat(processed, is(input));
+ assertEquals(input, processed);
}
@Test
- public void doNotProcessDataUrls_WICKET_6290()
+ void doNotProcessDataUrls_WICKET_6290()
{
String input = ".class {background-image: url(data:image/gif;base64,R0lGODlhEAAQAMQAAORHH);}";
Class<?> scope = CssUrlReplacerTest.class;
@@ -98,11 +100,11 @@ public class CssUrlReplacerTest extends WicketTestCase
CssUrlReplacer replacer = new CssUrlReplacer();
String processed = replacer.process(input, scope, cssRelativePath);
- assertThat(processed, is(input));
+ assertEquals(input, processed);
}
@Test
- public void doNotProcessContextAbsoluteUrls()
+ void doNotProcessContextAbsoluteUrls()
{
String input = ".class {background-image: url('/some.img');}";
Class<?> scope = CssUrlReplacerTest.class;
@@ -110,11 +112,11 @@ public class CssUrlReplacerTest extends WicketTestCase
CssUrlReplacer replacer = new CssUrlReplacer();
String processed = replacer.process(input, scope, cssRelativePath);
- assertThat(processed, is(input));
+ assertEquals(input, processed);
}
@Test
- public void sameFolderSingleQuotes()
+ void sameFolderSingleQuotes()
{
String input = ".class {background-image: url('some.img');}";
Class<?> scope = CssUrlReplacerTest.class;
@@ -129,7 +131,7 @@ public class CssUrlReplacerTest extends WicketTestCase
}
@Test
- public void sameFolderDoubleQuotes()
+ void sameFolderDoubleQuotes()
{
String input = ".class {background-image: url(\"some.img\");}";
Class<?> scope = CssUrlReplacerTest.class;
@@ -144,7 +146,7 @@ public class CssUrlReplacerTest extends WicketTestCase
}
@Test
- public void parentFolderAppendFolder()
+ void parentFolderAppendFolder()
{
String input = ".class {background-image: url('../images/some.img');}";
Class<?> scope = CssUrlReplacerTest.class;
@@ -159,7 +161,7 @@ public class CssUrlReplacerTest extends WicketTestCase
}
@Test
- public void sameFolderAppendFolder()
+ void sameFolderAppendFolder()
{
String input = ".class {background-image: url('./images/some.img');}";
Class<?> scope = CssUrlReplacerTest.class;
@@ -174,7 +176,7 @@ public class CssUrlReplacerTest extends WicketTestCase
}
@Test
- public void base64EncodedImage()
+ void base64EncodedImage()
{
String input = ".class {background-image: url('Beer.gif?embedBase64');}";
Class<?> scope = ImageTest.class;
@@ -187,7 +189,7 @@ public class CssUrlReplacerTest extends WicketTestCase
}
@Test
- public void severalUrls()
+ void severalUrls()
{
String input = ".class {\n" + "a: url('../images/a.img');\n" + "b: url('./b.img');\n" + "}";
Class<?> scope = CssUrlReplacerTest.class;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/FileSystemResourceReferenceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/FileSystemResourceReferenceTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/FileSystemResourceReferenceTest.java
index dab0e44..0fa16f0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/FileSystemResourceReferenceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/FileSystemResourceReferenceTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.resource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
@@ -27,8 +29,7 @@ import org.apache.wicket.core.util.lang.WicketObjects;
import org.apache.wicket.util.io.ByteArrayOutputStream;
import org.apache.wicket.util.io.IOUtils;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for FileSystemResourceReference
@@ -36,7 +37,7 @@ import org.junit.Test;
* @author Tobias Soloschenko
*
*/
-public class FileSystemResourceReferenceTest extends WicketTestCase
+class FileSystemResourceReferenceTest extends WicketTestCase
{
/**
@@ -48,7 +49,7 @@ public class FileSystemResourceReferenceTest extends WicketTestCase
* if the URI is not readable
*/
@Test
- public void testFileSystemResourceReferenceWithZip() throws IOException, URISyntaxException
+ void testFileSystemResourceReferenceWithZip() throws IOException, URISyntaxException
{
InputStream inputStream = null;
try
@@ -69,13 +70,13 @@ public class FileSystemResourceReferenceTest extends WicketTestCase
}
};
// Size
- Assert.assertEquals(fileSystemResource.getSize(), 39);
+ assertEquals(fileSystemResource.getSize(), 39);
// Content
inputStream = fileSystemResource.getInputStream();
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
IOUtils.copy(inputStream, outputStream);
- Assert.assertEquals("FileSystemResourceReference.zip content", outputStream.toString());
+ assertEquals("FileSystemResourceReference.zip content", outputStream.toString());
}
finally
{
@@ -92,7 +93,7 @@ public class FileSystemResourceReferenceTest extends WicketTestCase
* if the URI is not readable
*/
@Test
- public void testFileSystemResourceReferenceWithNormalFile() throws IOException,
+ void testFileSystemResourceReferenceWithNormalFile() throws IOException,
URISyntaxException
{
InputStream inputStream = null;
@@ -113,13 +114,13 @@ public class FileSystemResourceReferenceTest extends WicketTestCase
}
};
// Size
- Assert.assertEquals(fileSystemResource.getSize(), 54);
+ assertEquals(fileSystemResource.getSize(), 54);
// Content
inputStream = fileSystemResource.getInputStream();
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
IOUtils.copy(inputStream, outputStream);
- Assert.assertEquals("FileSystemResourceReference.zip content in normal file",
+ assertEquals("FileSystemResourceReference.zip content in normal file",
outputStream.toString());
}
finally
@@ -137,7 +138,7 @@ public class FileSystemResourceReferenceTest extends WicketTestCase
* if the URI is not readable
*/
@Test
- public void testMimeTypeEqual() throws IOException, URISyntaxException
+ void testMimeTypeEqual() throws IOException, URISyntaxException
{
URL resource = FileSystemResourceReferenceTest.class.getResource("FileSystemResourceReference.txt");
Path path = FileSystemResourceReference.getPath(resource.toURI());
@@ -162,7 +163,7 @@ public class FileSystemResourceReferenceTest extends WicketTestCase
return fileSystemResource;
}
};
- Assert.assertEquals("test/mime1", fileSystemResource.getMimeType());
+ assertEquals("test/mime1", fileSystemResource.getMimeType());
}
/**
@@ -174,7 +175,7 @@ public class FileSystemResourceReferenceTest extends WicketTestCase
* if the
*/
@Test
- public void testMimeTypeDetection() throws IOException, URISyntaxException
+ void testMimeTypeDetection() throws IOException, URISyntaxException
{
// uke > unknown extension :-)
URL resource = FileSystemResourceReferenceTest.class.getResource("FileSystemResourceReference.uke");
@@ -192,7 +193,7 @@ public class FileSystemResourceReferenceTest extends WicketTestCase
}
};
- Assert.assertEquals("text/plain_provided_by_detector", fileSystemResource.getMimeType());
+ assertEquals("text/plain_provided_by_detector", fileSystemResource.getMimeType());
final FileSystemResource fileSystemResourceMime = new FileSystemResource(path)
{
@@ -214,14 +215,14 @@ public class FileSystemResourceReferenceTest extends WicketTestCase
return fileSystemResourceMime;
}
};
- Assert.assertEquals("text/plain", fileSystemResourceMime.getMimeType());
+ assertEquals("text/plain", fileSystemResourceMime.getMimeType());
}
/**
* Test serialization of {@link FileSystemResource}
*/
@Test
- public void testSerialization() throws IOException, URISyntaxException
+ void testSerialization() throws IOException, URISyntaxException
{
InputStream inputStream = null;
try
@@ -231,13 +232,13 @@ public class FileSystemResourceReferenceTest extends WicketTestCase
final FileSystemResource fileSystemResource = new FileSystemResource(path);
final FileSystemResource cloned = WicketObjects.cloneObject(fileSystemResource);
- Assert.assertEquals(cloned.getSize(), 54);
+ assertEquals(cloned.getSize(), 54);
// Content
inputStream = cloned.getInputStream();
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
IOUtils.copy(inputStream, outputStream);
- Assert.assertEquals("FileSystemResourceReference.zip content in normal file",
+ assertEquals("FileSystemResourceReference.zip content in normal file",
outputStream.toString());
}
finally
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/PageWithUTF8Properties.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/PageWithUTF8Properties.java b/wicket-core/src/test/java/org/apache/wicket/resource/PageWithUTF8Properties.java
index 3a41412..de5bdbb 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/PageWithUTF8Properties.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/PageWithUTF8Properties.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.resource;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.wicket.util.tester.DummyHomePage;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/PageWithXmlProperties.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/PageWithXmlProperties.java b/wicket-core/src/test/java/org/apache/wicket/resource/PageWithXmlProperties.java
index 258be1e..0ce82cf 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/PageWithXmlProperties.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/PageWithXmlProperties.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.resource;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.wicket.util.tester.DummyHomePage;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/ResourceUtilTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/ResourceUtilTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/ResourceUtilTest.java
index 7ce3980..92b84ba 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/ResourceUtilTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/ResourceUtilTest.java
@@ -16,20 +16,21 @@
*/
package org.apache.wicket.resource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import java.util.Locale;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.request.resource.ResourceReference.UrlAttributes;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-
-public class ResourceUtilTest extends Assert
+class ResourceUtilTest
{
@Test
- public void decodeResourceReferenceAttributesWithString() throws Exception
+ void decodeResourceReferenceAttributesWithString() throws Exception
{
String urlParameter = "en_GB-style-variation";
UrlAttributes attributes = ResourceUtil.decodeResourceReferenceAttributes(urlParameter);
@@ -61,7 +62,7 @@ public class ResourceUtilTest extends Assert
}
@Test
- public void decodeResourceReferenceAttributesWithUrl() throws Exception
+ void decodeResourceReferenceAttributesWithUrl() throws Exception
{
Url url = Url.parse("www.funny.url/?param1=value1");
UrlAttributes attributes = ResourceUtil.decodeResourceReferenceAttributes(url);
@@ -82,7 +83,7 @@ public class ResourceUtilTest extends Assert
}
@Test
- public void encodeResourceReferenceAttributes() throws Exception
+ void encodeResourceReferenceAttributes() throws Exception
{
UrlAttributes attributes = new UrlAttributes(null, null, null);
assertNull(ResourceUtil.encodeResourceReferenceAttributes(attributes));
@@ -97,7 +98,7 @@ public class ResourceUtilTest extends Assert
}
@Test
- public void encodeResourceReferenceAttributesWithResource() throws Exception
+ void encodeResourceReferenceAttributesWithResource() throws Exception
{
ResourceReference resourceReference = Mockito.mock(ResourceReference.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/StringResourceLoaderTestBase.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/StringResourceLoaderTestBase.java b/wicket-core/src/test/java/org/apache/wicket/resource/StringResourceLoaderTestBase.java
index e073bc9..186515d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/StringResourceLoaderTestBase.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/StringResourceLoaderTestBase.java
@@ -16,15 +16,17 @@
*/
package org.apache.wicket.resource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import java.util.Locale;
import org.apache.wicket.Component;
import org.apache.wicket.resource.loader.IStringResourceLoader;
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;
/**
* Abstract base class providing common test functionality to ensure that all loader implementations
@@ -32,15 +34,15 @@ import org.junit.Test;
*
* @author Chris Turner
*/
-public abstract class StringResourceLoaderTestBase extends Assert
+public abstract class StringResourceLoaderTestBase
{
- protected WicketTester tester;
+ WicketTester tester;
// The loader to test
protected IStringResourceLoader loader;
// The dummy component
- protected Component component;
+ Component component;
/**
@@ -53,8 +55,8 @@ public abstract class StringResourceLoaderTestBase extends Assert
/**
* @throws Exception
*/
- @Before
- public void before() throws Exception
+ @BeforeEach
+ void before() throws Exception
{
tester = new WicketTester(new DummyApplication());
component = new DummyComponent("test", tester.getApplication());
@@ -66,8 +68,8 @@ public abstract class StringResourceLoaderTestBase extends Assert
/**
* @throws Exception
*/
- @After
- public void after() throws Exception
+ @AfterEach
+ void after() throws Exception
{
tester.destroy();
}
@@ -76,57 +78,58 @@ public abstract class StringResourceLoaderTestBase extends Assert
*
*/
@Test
- public void loaderValidKeyNoStyleDefaultLocale()
+ void loaderValidKeyNoStyleDefaultLocale()
{
String s = loader.loadStringResource(component.getClass(), "test.string",
Locale.getDefault(), null, null);
- Assert.assertEquals("Resource should be loaded", "This is a test", s);
+ assertEquals("This is a test", s, "Resource should be loaded");
// And do it again to ensure caching path is exercised
s = loader.loadStringResource(component.getClass(), "test.string", Locale.getDefault(),
null, null);
- Assert.assertEquals("Resource should be loaded", "This is a test", s);
+ assertEquals("This is a test", s, "Resource should be loaded");
}
/**
*
*/
@Test
- public void loaderInvalidKeyNoStyleDefaultLocale()
+ void loaderInvalidKeyNoStyleDefaultLocale()
{
- Assert.assertNull("Missing key should return null", loader.loadStringResource(
- component.getClass(), "unknown.string", Locale.getDefault(), null, null));
+ assertNull(loader.loadStringResource(component.getClass(), "unknown.string",
+ Locale.getDefault(), null, null), "Missing key should return null");
}
/**
*
*/
@Test
- public void loaderValidKeyNoStyleAlternativeLocale()
+ void loaderValidKeyNoStyleAlternativeLocale()
{
String s = loader.loadStringResource(component.getClass(), "test.string", new Locale("zz"),
null, null);
- Assert.assertEquals("Resource should be loaded", "Flib flob", s);
+ assertEquals("Flib flob", s, "Resource should be loaded");
}
/**
*
*/
@Test
- public void loaderInvalidKeyNoStyleAlternativeLocale()
+ void loaderInvalidKeyNoStyleAlternativeLocale()
{
- Assert.assertNull("Missing key should return null", loader.loadStringResource(
- component.getClass(), "unknown.string", new Locale("zz"), null, null));
+ assertNull(loader.loadStringResource(component.getClass(), "unknown.string",
+ new Locale("zz"), null, null), "Missing key should return null");
}
/**
*
*/
@Test
- public void loaderValidKeyStyleNoLocale()
+ void loaderValidKeyStyleNoLocale()
{
- String s = loader.loadStringResource(component.getClass(), "test.string", null, "alt", null);
- Assert.assertEquals("Resource should be loaded", "Alt test string", s);
+ String s = loader.loadStringResource(component.getClass(), "test.string", null, "alt",
+ null);
+ assertEquals("Alt test string", s, "Resource should be loaded");
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/TextTemplateResourceReferenceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/TextTemplateResourceReferenceTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/TextTemplateResourceReferenceTest.java
index 7f5b039..2a37ca9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/TextTemplateResourceReferenceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/TextTemplateResourceReferenceTest.java
@@ -20,22 +20,21 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.Page;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.resource.PackageResourceReference;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* https://issues.apache.org/jira/browse/WICKET-3971
*/
-public class TextTemplateResourceReferenceTest extends WicketTestCase
+class TextTemplateResourceReferenceTest extends WicketTestCase
{
private static final String TEMPLATE_NAME = "textTemplateResRef.tmpl";
@@ -48,7 +47,7 @@ public class TextTemplateResourceReferenceTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-3971
*/
@Test
- public void renderInterpolatedTemplate()
+ void renderInterpolatedTemplate()
{
// the page will render just <script> element with url to the template
// this will register it in the application's ResourceReferenceRegistry
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/UtfPropertiesFilePropertiesLoaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/UtfPropertiesFilePropertiesLoaderTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/UtfPropertiesFilePropertiesLoaderTest.java
index 9c246cb..e124e2b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/UtfPropertiesFilePropertiesLoaderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/UtfPropertiesFilePropertiesLoaderTest.java
@@ -18,18 +18,18 @@ package org.apache.wicket.resource;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test {@link UtfPropertiesFilePropertiesLoader}.
*/
-public class UtfPropertiesFilePropertiesLoaderTest extends WicketTestCase
+class UtfPropertiesFilePropertiesLoaderTest extends WicketTestCase
{
/**
* Test encoding.
*/
@Test
- public void encoding()
+ void encoding()
{
tester.startPage(PageWithUTF8Properties.class);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/XmlFilePropertiesLoaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/XmlFilePropertiesLoaderTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/XmlFilePropertiesLoaderTest.java
index a11c233..a85cde1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/XmlFilePropertiesLoaderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/XmlFilePropertiesLoaderTest.java
@@ -16,19 +16,18 @@
*/
package org.apache.wicket.resource;
-
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* WICKET-2035 Change naming convention for xml properties files to *.properties.xml instead of
* *.xml
*/
-public class XmlFilePropertiesLoaderTest extends WicketTestCase
+class XmlFilePropertiesLoaderTest extends WicketTestCase
{
static Map<Locale, String> EXPECTED_LOCALIZATIONS = new HashMap<Locale, String>();
static
@@ -42,7 +41,7 @@ public class XmlFilePropertiesLoaderTest extends WicketTestCase
* (PageWithXmlProperties_locale).properties.xml
*/
@Test
- public void wicket2035()
+ void wicket2035()
{
for (Locale locale : EXPECTED_LOCALIZATIONS.keySet())
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorRenderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorRenderTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorRenderTest.java
index f3d475d..aa5a537 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorRenderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorRenderTest.java
@@ -17,14 +17,14 @@
package org.apache.wicket.resource.aggregator;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for the {@link org.apache.wicket.markup.head.ResourceAggregator} class.
*
* @author Hielke Hoeve
*/
-public class ResourceAggregatorRenderTest extends WicketTestCase
+class ResourceAggregatorRenderTest extends WicketTestCase
{
/**
* tests a simple script, including jquery and wicket event js as deps
@@ -32,7 +32,7 @@ public class ResourceAggregatorRenderTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void testPage1() throws Exception
+ void testPage1() throws Exception
{
tester.startPage(ResourceAggregatorTest1Page.class);
tester.assertResultPage(ResourceAggregatorTest1Page.class,
@@ -45,7 +45,7 @@ public class ResourceAggregatorRenderTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void testPage2() throws Exception
+ void testPage2() throws Exception
{
tester.startPage(ResourceAggregatorTest2Page.class);
tester.assertResultPage(ResourceAggregatorTest2Page.class,