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 2013/06/19 15:50:10 UTC
[2/2] git commit: Remove WicketJUnitRunner and upgrade all tests to
JUnit 4
Remove WicketJUnitRunner and upgrade all tests to JUnit 4
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/cd3c7c8c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/cd3c7c8c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/cd3c7c8c
Branch: refs/heads/master
Commit: cd3c7c8c59c1631c431cb86f4e59f9d35a0f033d
Parents: b61fe92
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Jun 19 15:49:37 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Jun 19 15:49:37 2013 +0200
----------------------------------------------------------------------
.../role/annotations/AnnotationsRoleTest.java | 22 ++-
.../role/metadata/ActionPermissionsTest.java | 22 ++-
.../metadata/InstantiationPermissionsTest.java | 21 ++-
.../http/BufferedHttpServletResponse.java | 6 +-
.../org/apache/wicket/AuthorizationTest.java | 5 +
.../java/org/apache/wicket/BehaviorUrlTest.java | 8 +-
.../java/org/apache/wicket/ResourceTest.java | 4 +-
.../java/org/apache/wicket/VisitorTest.java | 1 +
.../org/apache/wicket/WicketJUnitRunner.java | 181 -------------------
.../java/org/apache/wicket/WicketTestCase.java | 2 -
.../wicket/ajax/AjaxTimerBehaviorTest.java | 1 +
.../wicket/feedback/FeedbackRenderTest.java | 2 +
.../markup/html/autolink/AutolinkTest.java | 7 +-
.../markup/html/basic/HomePageRedirectTest.java | 3 +
.../html/form/ListMultipleChoiceTest.java | 9 +-
.../markup/html/form/border/TestHomePage.java | 5 +-
.../html/form/border/TestHomePage_2134.java | 4 +
.../markup/html/form/login/InterceptTest.java | 9 -
.../html/form/panelBorder/TestHomePage.java | 5 +-
.../form/panelBorder/TestHomePage_2134.java | 4 +
.../html/form/submitlink/TestHomePage.java | 4 +
.../html/form/upload/FileUploadErrorTest.java | 16 +-
.../wicket/markup/html/image/ImageTest.java | 3 +
.../markup/html/image/NonCachingImageTest.java | 2 +
.../markup/html/internal/EnclosureTest.java | 17 ++
.../markup/html/internal/TogglePageTest.java | 17 +-
.../html/link/ClientSideImageMapTest.java | 4 +-
.../markup/html/markupId/TestHomePage.java | 2 +
.../wicket/markup/html/page/TestHomePage.java | 2 +
.../markup/html/panel/FragmentTestCase.java | 5 +-
.../wicket/markup/parser/TestHomePage.java | 2 +
.../parser/filter/DoubleHeaderPartPageTest.java | 2 +
.../wicket/markup/resolver/TestHomePage.java | 13 +-
.../org/apache/wicket/model/DetachableTest.java | 2 +
.../apache/wicket/model/InheritedModelTest.java | 14 +-
.../org/apache/wicket/model/TestHomePage.java | 5 +-
.../protocol/http/BufferedWebResponseTest.java | 2 +
.../redirect/RestartWithMountedPageTest.java | 2 +
.../redirect/abort/AbortExceptionTest.java | 3 +
.../redirect/intercept/InterceptTest.java | 3 +
.../request/handler/PageIdPoliticTest.java | 17 +-
.../apache/wicket/util/tester/apps_2/Test.java | 1 +
.../util/tester/apps_5/AjaxLinkClickTest.java | 4 +
.../tester/apps_5/AjaxSubmitLinkClickTest.java | 3 +
.../wicket/util/tester/apps_7/TestHomePage.java | 2 +
.../validation/ValidatorBehaviorTest.java | 3 +
.../validator/EmailValidatorTest.java | 25 +--
.../validation/validator/UrlValidatorTest.java | 34 ++--
.../inspector/SessionSizeModelTest.java | 8 +-
.../stateless/StatelessCheckerTest.java | 19 +-
.../util/string/AppendingStringBufferTest.java | 1 +
51 files changed, 217 insertions(+), 341 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 d588185..1363b4a 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
@@ -19,7 +19,6 @@ package org.apache.wicket.authroles.authorization.strategies.role.annotations;
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
-import junit.framework.TestCase;
import org.apache.wicket.Component;
import org.apache.wicket.authorization.IUnauthorizedComponentInstantiationListener;
import org.apache.wicket.authorization.UnauthorizedInstantiationException;
@@ -27,24 +26,28 @@ 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;
/**
* Test the annotations package of the auth-roles project.
*
* @author Eelco Hillenius
*/
-public class AnnotationsRoleTest extends TestCase
+public class AnnotationsRoleTest extends Assert
{
WicketTester tester;
- @Override
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
tester = new WicketTester();
}
- @Override
- protected void tearDown() throws Exception
+ @After
+ public void tearDown() throws Exception
{
tester.destroy();
}
@@ -52,6 +55,7 @@ public class AnnotationsRoleTest extends TestCase
/**
* @throws Exception
*/
+ @Test
public void testClear() throws Exception
{
tester.getApplication()
@@ -64,6 +68,7 @@ public class AnnotationsRoleTest extends TestCase
/**
* @throws Exception
*/
+ @Test
public void testAuthorized() throws Exception
{
WicketTester tester = new WicketTester();
@@ -78,6 +83,7 @@ public class AnnotationsRoleTest extends TestCase
/**
* @throws Exception
*/
+ @Test
public void testNotAuthorized() throws Exception
{
WicketTester tester = new WicketTester();
@@ -126,8 +132,6 @@ public class AnnotationsRoleTest extends TestCase
/**
* Construct.
- *
- * @param roles
*/
public UserRolesAuthorizer(String roles)
{
@@ -135,7 +139,7 @@ public class AnnotationsRoleTest extends TestCase
}
/**
- * @see org.apache.wicket.authorization.strategies.role.IRoleCheckingStrategy#hasAnyRole(Roles)
+ * @see IRoleCheckingStrategy#hasAnyRole(Roles)
*/
@Override
public boolean hasAnyRole(Roles roles)
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 1d4583d..a2b24bc 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,30 +16,33 @@
*/
package org.apache.wicket.authroles.authorization.strategies.role.metadata;
-import junit.framework.TestCase;
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;
/**
- * Test case for {@link org.apache.wicket.authorization.strategies.role.metadata.ActionPermissions}.
+ * Test case for {@link ActionPermissions}.
*
* @author Eelco Hillenius
*/
-public class ActionPermissionsTest extends TestCase
+public class ActionPermissionsTest extends Assert
{
private WicketTester tester;
- @Override
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
tester = new WicketTester();
}
- @Override
- protected void tearDown() throws Exception
+ @After
+ public void tearDown() throws Exception
{
tester.destroy();
}
@@ -49,6 +52,7 @@ public class ActionPermissionsTest extends TestCase
*
* @throws Exception
*/
+ @Test
public void testAdd1() throws Exception
{
ActionPermissions permissions = new ActionPermissions();
@@ -69,6 +73,7 @@ public class ActionPermissionsTest extends TestCase
*
* @throws Exception
*/
+ @Test
public void testRemove1() throws Exception
{
ActionPermissions permissions = new ActionPermissions();
@@ -81,8 +86,8 @@ public class ActionPermissionsTest extends TestCase
/**
* Test for issue <a href="http://issues.apache.org/jira/browse/WICKET-1152">WICKET-1152</a>.
- *
*/
+ @Test
public void testRemove2()
{
Label label = new Label("label", "text");
@@ -106,6 +111,7 @@ public class ActionPermissionsTest extends TestCase
* Test consistency in behavior between authorizing a role for an action and then unauthorizing
* it with {@link #testRemove2()}.
*/
+ @Test
public void testRemove3()
{
Label label = new Label("label", "text");
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 aa6196e..19b7bdb 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,30 +16,33 @@
*/
package org.apache.wicket.authroles.authorization.strategies.role.metadata;
-import junit.framework.TestCase;
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;
/**
* Test case for
- * {@link org.apache.wicket.authorization.strategies.role.metadata.InstantiationPermissions}.
+ * {@link InstantiationPermissions}.
*
* @author Eelco Hillenius
*/
-public class InstantiationPermissionsTest extends TestCase
+public class InstantiationPermissionsTest extends Assert
{
private WicketTester tester;
- @Override
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
tester = new WicketTester();
}
- @Override
- protected void tearDown() throws Exception
+ @After
+ public void tearDown() throws Exception
{
tester.destroy();
}
@@ -49,6 +52,7 @@ public class InstantiationPermissionsTest extends TestCase
*
* @throws Exception
*/
+ @Test
public void testAdd1() throws Exception
{
InstantiationPermissions permissions = new InstantiationPermissions();
@@ -68,6 +72,7 @@ public class InstantiationPermissionsTest extends TestCase
*
* @throws Exception
*/
+ @Test
public void testRemove1() throws Exception
{
InstantiationPermissions permissions = new InstantiationPermissions();
@@ -81,6 +86,7 @@ public class InstantiationPermissionsTest extends TestCase
* Test for issue <a href="http://issues.apache.org/jira/browse/WICKET-1152">WICKET-1152</a>.
*
*/
+ @Test
public void testRemove2()
{
MetaDataRoleAuthorizationStrategy strategy = new MetaDataRoleAuthorizationStrategy(
@@ -103,6 +109,7 @@ public class InstantiationPermissionsTest extends TestCase
* Test consistency in behavior between authorizing a role for a class and then unauthorizing it
* with {@link #testRemove2()}.
*/
+ @Test
public void testRemove3()
{
MetaDataRoleAuthorizationStrategy strategy = new MetaDataRoleAuthorizationStrategy(
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedHttpServletResponse.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedHttpServletResponse.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedHttpServletResponse.java
index cabc78e..7d10779 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedHttpServletResponse.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedHttpServletResponse.java
@@ -89,7 +89,7 @@ class BufferedHttpServletResponse implements HttpServletResponse
isOpen();
if (cookies == null)
{
- cookies = new ArrayList<Cookie>(2);
+ cookies = new ArrayList<>(2);
}
cookies.add(cookie);
}
@@ -197,7 +197,7 @@ class BufferedHttpServletResponse implements HttpServletResponse
isOpen();
if (headers == null)
{
- headers = new MultiMap<String, Object>();
+ headers = new MultiMap<>();
}
}
@@ -628,7 +628,7 @@ class BufferedHttpServletResponse implements HttpServletResponse
{
return Collections.emptyList();
}
- List<String> ret = new ArrayList<String>(values.size());
+ List<String> ret = new ArrayList<>(values.size());
for (Object value : values)
{
ret.add(value.toString());
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 742bcf0..3cfde0a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/AuthorizationTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/AuthorizationTest.java
@@ -54,6 +54,7 @@ public class AuthorizationTest extends WicketTestCase
*
* @throws Exception
*/
+ @Test
public void testCreateDisallowedComponent() throws Exception
{
tester.getApplication()
@@ -84,6 +85,7 @@ public class AuthorizationTest extends WicketTestCase
*
* @throws Exception
*/
+ @Test
public void testRenderAllowedComponent() throws Exception
{
tester.getApplication()
@@ -100,6 +102,7 @@ public class AuthorizationTest extends WicketTestCase
*
* @throws Exception
*/
+ @Test
public void testRenderDisallowedComponent() throws Exception
{
tester.getApplication()
@@ -130,6 +133,7 @@ public class AuthorizationTest extends WicketTestCase
*
* @throws Exception
*/
+ @Test
public void testEnabledAllowedComponent() throws Exception
{
tester.getApplication()
@@ -153,6 +157,7 @@ public class AuthorizationTest extends WicketTestCase
*
* @throws Exception
*/
+ @Test
public void testEnabledDisallowedComponent() throws Exception
{
tester.getApplication()
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 e89dfcb..e30d6a3 100644
--- a/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java
@@ -38,7 +38,7 @@ import org.junit.Test;
public class BehaviorUrlTest extends WicketTestCase
{
/**
- * @see href https://issues.apache.org/jira/browse/WICKET-3097
+ * https://issues.apache.org/jira/browse/WICKET-3097
*/
@Test
public void urlRemainsStable()
@@ -60,7 +60,7 @@ public class BehaviorUrlTest extends WicketTestCase
/**
* Asserting that the component model assigning don't affect the behavior data index
*
- * @see href https://issues.apache.org/jira/browse/WICKET-3142
+ * https://issues.apache.org/jira/browse/WICKET-3142
*/
@Test
public void urlRemainsStableAfterComponentReceiveAnModel()
@@ -143,9 +143,7 @@ public class BehaviorUrlTest extends WicketTestCase
}
- /**
- *
- */
+ @Test
public void testBehaviorUrlNotDoubleEscaped()
{
tester.startPage(EscapeTestPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 6e90d0b..46c6f3b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ResourceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ResourceTest.java
@@ -28,8 +28,6 @@ import org.apache.wicket.util.resource.FileResourceStream;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
@@ -37,12 +35,12 @@ import org.slf4j.LoggerFactory;
*/
public class ResourceTest extends WicketTestCase
{
- private static final Logger log = LoggerFactory.getLogger(ResourceTest.class);
private static final String TEST_STRING = "Hello, World!";
/**
* tests a resource that is not cacheable.
*/
+ @Test
public void testFileResourceStream()
{
final File testFile;
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 fd6bffc..4347eff 100644
--- a/wicket-core/src/test/java/org/apache/wicket/VisitorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/VisitorTest.java
@@ -186,6 +186,7 @@ public class VisitorTest extends WicketTestCase
*
* Visit parents with arbitrary type
*/
+ @Test
public void testVisitParents()
{
TestContainer testContainer = new TestContainer();
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/wicket-core/src/test/java/org/apache/wicket/WicketJUnitRunner.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/WicketJUnitRunner.java b/wicket-core/src/test/java/org/apache/wicket/WicketJUnitRunner.java
deleted file mode 100644
index 64a4220..0000000
--- a/wicket-core/src/test/java/org/apache/wicket/WicketJUnitRunner.java
+++ /dev/null
@@ -1,181 +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;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.internal.runners.statements.RunAfters;
-import org.junit.internal.runners.statements.RunBefores;
-import org.junit.runners.BlockJUnit4ClassRunner;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.InitializationError;
-import org.junit.runners.model.Statement;
-import org.junit.runners.model.TestClass;
-
-/**
- * An JUnit 4 runner that also executes all JUnit3 test methods
- */
-public class WicketJUnitRunner extends BlockJUnit4ClassRunner
-{
-
- /**
- * Construct.
- *
- * @param klass
- * @throws InitializationError
- */
- public WicketJUnitRunner(Class<?> klass) throws InitializationError
- {
- super(klass);
- }
-
- @Override
- protected List<FrameworkMethod> computeTestMethods()
- {
- List<FrameworkMethod> methods = new ArrayList<>();
- methods.addAll(super.computeTestMethods());
-
- for (Method javaMethod : getTestClass().getJavaClass().getMethods())
- {
- if (isJUnitMethod(javaMethod))
- {
- FrameworkMethod junitMethod = new FrameworkMethod(javaMethod);
- methods.add(junitMethod);
- }
- }
-
- return methods;
- }
-
- @Override
- protected Statement withBefores(FrameworkMethod method, Object target, Statement statement)
- {
- List<FrameworkMethod> befores = new ArrayList<>();
- befores.addAll(getTestClass().getAnnotatedMethods(Before.class));
- findMethod(getTestClass(), befores, "setUp");
-
- return befores.isEmpty() ? statement : new RunBefores(statement, befores, target);
- }
-
- @Override
- protected Statement withAfters(FrameworkMethod method, Object target, Statement statement)
- {
- List<FrameworkMethod> afters = new ArrayList<>();
- afters.addAll(getTestClass().getAnnotatedMethods(After.class));
- findMethod(getTestClass(), afters, "tearDown");
-
- return afters.isEmpty() ? statement : new RunAfters(statement, afters, target);
- }
-
- @Override
- protected void validateZeroArgConstructor(List<Throwable> errors)
- {
- int ctorsNumber = getTestClass().getOnlyConstructor().getParameterTypes().length;
- if ((ctorsNumber == 0 || ctorsNumber == 1) == false)
- {
- String gripe = "Test class should have exactly one public zero-argument constructor";
- errors.add(new Exception(gripe));
- }
- }
-
- @Override
- protected Object createTest() throws Exception
- {
- Object testObject;
- Constructor<?> constructor = getTestClass().getOnlyConstructor();
- if (constructor.getParameterTypes().length == 0)
- {
- testObject = constructor.newInstance();
- }
- else
- {
- testObject = constructor.newInstance("junit3 test");
- }
- return testObject;
- }
-
- /**
- * Finds a method in the hierarchy of the tested class by his name
- *
- * @param testClass
- * the junit class representation
- * @param junitMethods
- * the collection where to add the found method
- * @param methodName
- * the name of the method to find
- * @param parameterTypes
- * the types of the parameters of the method to find
- */
- private void findMethod(TestClass testClass, List<FrameworkMethod> junitMethods,
- String methodName, Class<?>... parameterTypes)
- {
- try
- {
- Class<?> clazz = getTestClass().getJavaClass();
- while (clazz != null && Object.class.equals(clazz) == false)
- {
- try
- {
- Method javaMethod = clazz.getDeclaredMethod(methodName, parameterTypes);
- if (javaMethod != null &&
- Modifier.isProtected(javaMethod.getModifiers()) &&
- (javaMethod.getReturnType().equals(Void.TYPE) || javaMethod.getReturnType()
- .equals(Void.class)))
- {
- javaMethod.setAccessible(true);
- junitMethods.add(new FrameworkMethod(javaMethod));
- break;
- }
- }
- catch (NoSuchMethodException nsmx)
- {
- }
- clazz = clazz.getSuperclass();
- }
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
- }
-
- /**
- * Checks whether the passes {@code javaMethod} is JUnit 3 test method
- *
- * @param javaMethod
- * the method to check
- * @return {@code true} if the method passes all conditions to be JUnit3 method, otherwise
- * {@code false}
- */
- private boolean isJUnitMethod(final Method javaMethod)
- {
- return Modifier.isPublic(javaMethod.getModifiers()) &&
- // is not JUnit 4 test method
- javaMethod.getAnnotation(Test.class) == null &&
- (Void.TYPE.equals(javaMethod.getReturnType()) || Void.class.equals(javaMethod.getReturnType())) &&
- javaMethod.getName().startsWith("test");
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/wicket-core/src/test/java/org/apache/wicket/WicketTestCase.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/WicketTestCase.java b/wicket-core/src/test/java/org/apache/wicket/WicketTestCase.java
index b07afa3..ef86316 100644
--- a/wicket-core/src/test/java/org/apache/wicket/WicketTestCase.java
+++ b/wicket-core/src/test/java/org/apache/wicket/WicketTestCase.java
@@ -29,7 +29,6 @@ import org.apache.wicket.util.tester.WicketTester;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
-import org.junit.runner.RunWith;
/**
* Base class for tests which require comparing wicket response with a file.
@@ -37,7 +36,6 @@ import org.junit.runner.RunWith;
* To create/replace the expected result file with the new content, define the system property like
* -Dwicket.replace.expected.results=true
*/
-@RunWith(WicketJUnitRunner.class)
public abstract class WicketTestCase extends Assert
{
/** */
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 351c149..5194fd0 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
@@ -120,6 +120,7 @@ public class AjaxTimerBehaviorTest extends WicketTestCase
* WICKET-1525, WICKET-2152
*/
+ @Test
public void testRestartMethod()
{
final Integer labelInitialValue = Integer.valueOf(0);
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 91a1e40..c41b6c1 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
@@ -18,6 +18,7 @@ package org.apache.wicket.feedback;
import org.apache.wicket.Component;
import org.apache.wicket.WicketTestCase;
+import org.junit.Test;
/**
* Test calling of {@link Component#beforeRender()} for {@link IFeedback} components.
@@ -28,6 +29,7 @@ public class FeedbackRenderTest extends WicketTestCase
/**
* @throws Exception
*/
+ @Test
public void test() throws Exception
{
final FeedbacksPage page = new FeedbacksPage();
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 a09fd86..21ca99d 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,10 +18,7 @@ package org.apache.wicket.markup.html.autolink;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.autolink.sub.PageB;
-import org.apache.wicket.markup.resolver.AutoLinkResolver;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
@@ -29,13 +26,11 @@ import org.slf4j.LoggerFactory;
*/
public class AutolinkTest extends WicketTestCase
{
- /** Logging */
- private static final Logger log = LoggerFactory.getLogger(AutoLinkResolver.class);
-
/**
*
* @throws Exception
*/
+ @Test
public void test_1() throws Exception
{
executeTest(MyPage.class, "MyPageExpectedResult.html");
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 5500d29..dae082c 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
@@ -18,6 +18,7 @@ package org.apache.wicket.markup.html.basic;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.util.tester.DiffUtil;
+import org.junit.Test;
/**
* @author jcompagner
@@ -27,6 +28,7 @@ public class HomePageRedirectTest extends WicketTestCase
/**
* @throws Exception
*/
+ @Test
public void testRenderHomePagePageRedirect() throws Exception
{
tester.startPage(HomePagePageRedirect.class);
@@ -41,6 +43,7 @@ public class HomePageRedirectTest extends WicketTestCase
/**
* @throws Exception
*/
+ @Test
public void testRenderHomePageClassRedirect() throws Exception
{
tester.startPage(HomePageClassRedirect.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 182c95b..53cd69f 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
@@ -25,6 +25,7 @@ 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.junit.Test;
public class ListMultipleChoiceTest extends WicketTestCase
{
@@ -35,15 +36,16 @@ public class ListMultipleChoiceTest extends WicketTestCase
public TestPage()
{
- Form<Void> form = new Form<Void>("form");
+ Form<Void> form = new Form<>("form");
this.add(form);
form.add(newListMultipleChoice("list", selectedValues, choices));
}
}
+ @Test
public void testSelectionWorks() throws Exception
{
- TestPage page = (TestPage)tester.startPage(new TestPage());
+ TestPage page = tester.startPage(new TestPage());
FormTester form = tester.newFormTester("form");
form.select("list", 1);
form.select("list", 3);
@@ -55,6 +57,7 @@ public class ListMultipleChoiceTest extends WicketTestCase
assertTrue(page.selectedValues.getObject().contains("f"));
}
+ @Test
public void testSelectionAccumulates() throws Exception
{
final TestPage page = new TestPage();
@@ -75,6 +78,6 @@ public class ListMultipleChoiceTest extends WicketTestCase
protected ListMultipleChoice<String> newListMultipleChoice(String id,
IModel<List<String>> selectedValues, List<String> choices)
{
- return new ListMultipleChoice<String>(id, selectedValues, choices);
+ return new ListMultipleChoice<>(id, selectedValues, choices);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 64bb94d..e321e77 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
@@ -20,6 +20,7 @@ import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.util.tester.FormTester;
import org.junit.Before;
+import org.junit.Test;
/**
* Simple test using the WicketTester
@@ -37,9 +38,7 @@ public class TestHomePage extends WicketTestCase
tester.assertRenderedPage(HomePage.class);
}
- /**
- *
- */
+ @Test
public void testWithBorder2()
{
FormTester formTester = tester.newFormTester("border:form");
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 0d6c87e..0e2cd49 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
@@ -18,6 +18,7 @@ package org.apache.wicket.markup.html.form.border;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.util.tester.FormTester;
+import org.junit.Test;
/**
* Simple test using the WicketTester
@@ -27,6 +28,7 @@ public class TestHomePage_2134 extends WicketTestCase
/**
* WICKET-2134: two forms inside a border throw a ConversionException error
*/
+ @Test
public void testRenderMyPage()
{
// start and render the test page
@@ -46,6 +48,7 @@ public class TestHomePage_2134 extends WicketTestCase
/**
* WICKET-2134: two forms inside a border throw a ConversionException error
*/
+ @Test
public void testRenderMyPage2()
{
// start and render the test page
@@ -67,6 +70,7 @@ public class TestHomePage_2134 extends WicketTestCase
/**
* WICKET-2134: two forms inside a border throw a ConversionException error
*/
+ @Test
public void testRenderMyPage3()
{
// start and render the test page
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 ca7a930..f84d64c 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,12 +16,10 @@
*/
package org.apache.wicket.markup.html.form.login;
-import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.Session;
import org.apache.wicket.WicketTestCase;
-import org.apache.wicket.authorization.Action;
import org.apache.wicket.authorization.IAuthorizationStrategy;
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
@@ -29,8 +27,6 @@ import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Response;
import org.apache.wicket.request.component.IRequestableComponent;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.request.resource.IResource;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.tester.FormTester;
import org.junit.Test;
@@ -136,10 +132,6 @@ public class InterceptTest extends WicketTestCase
return MockLoginPage.class;
}
- /**
- *
- * @see org.apache.wicket.ISessionFactory#newSession(Request, Response)
- */
@Override
public Session newSession(Request request, Response response)
{
@@ -158,7 +150,6 @@ public class InterceptTest extends WicketTestCase
private String username;
/**
- * @param tester
* @param request
*/
protected MySession(Request request)
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 6683b36..16347fa 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
@@ -19,15 +19,14 @@ package org.apache.wicket.markup.html.form.panelBorder;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.util.tester.FormTester;
+import org.junit.Test;
/**
* Simple test using the WicketTester
*/
public class TestHomePage extends WicketTestCase
{
- /**
- *
- */
+ @Test
public void testWithBorder2()
{
tester.startPage(HomePage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 7d779da..979f4be 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
@@ -18,6 +18,7 @@ package org.apache.wicket.markup.html.form.panelBorder;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.util.tester.FormTester;
+import org.junit.Test;
/**
* Simple test using the WicketTester
@@ -27,6 +28,7 @@ public class TestHomePage_2134 extends WicketTestCase
/**
* WICKET-2134: two forms inside a border throw a ConversionException error
*/
+ @Test
public void testRenderMyPage()
{
// start and render the test page
@@ -46,6 +48,7 @@ public class TestHomePage_2134 extends WicketTestCase
/**
* WICKET-2134: two forms inside a border throw a ConversionException error
*/
+ @Test
public void testRenderMyPage2()
{
// start and render the test page
@@ -67,6 +70,7 @@ public class TestHomePage_2134 extends WicketTestCase
/**
* WICKET-2134: two forms inside a border throw a ConversionException error
*/
+ @Test
public void testRenderMyPage3()
{
// start and render the test page
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 38d1809..67911ce 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
@@ -18,6 +18,7 @@ package org.apache.wicket.markup.html.form.submitlink;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.util.tester.FormTester;
+import org.junit.Test;
/**
*/
@@ -26,6 +27,7 @@ public class TestHomePage extends WicketTestCase
/**
* testSubmitLinkByClickingLink()
*/
+ @Test
public void testSubmitLinkByClickingLink()
{
tester.startPage(HomePage.class);
@@ -45,6 +47,7 @@ public class TestHomePage extends WicketTestCase
/**
* testSubmitLinkBySubmittingForm()
*/
+ @Test
public void testSubmitLinkBySubmittingForm()
{
tester.startPage(HomePage.class);
@@ -65,6 +68,7 @@ public class TestHomePage extends WicketTestCase
/**
* testSubmitLinkByUsingFormTester()
*/
+ @Test
public void testSubmitLinkByUsingFormTester()
{
tester.startPage(HomePage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 4bcdb21..e658772 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
@@ -23,6 +23,7 @@ import org.apache.wicket.WicketTestCase;
import org.apache.wicket.util.file.File;
import org.apache.wicket.util.tester.FormTester;
import org.junit.Before;
+import org.junit.Test;
/**
* see WICKET-2015
@@ -53,6 +54,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()
{
formTester.submit();
@@ -62,6 +64,7 @@ public class FileUploadErrorTest extends WicketTestCase
/**
* FileUpload is filled on submit: TexttField is required.
*/
+ @Test
public void testSubmit_NoInput_FileUploaded()
{
formTester.setFile(fileUploadId, new File(testUploadFilePath), "UTF-8");
@@ -73,6 +76,7 @@ public class FileUploadErrorTest extends WicketTestCase
/**
* FileUpload is empty on submit: Validation fails to report too short TextField input.
*/
+ @Test
public void testSubmit_NotValidTextFieldValue()
{
formTester.setValue(textFieldId, "te");
@@ -85,6 +89,7 @@ public class FileUploadErrorTest extends WicketTestCase
/**
* FileUpload is empty on submit: Validation fails to report too short TextField input.
*/
+ @Test
public void testSubmit_NotValidTextFieldValue2()
{
formTester.setValue(textFieldId, "12345678901");
@@ -97,6 +102,7 @@ public class FileUploadErrorTest extends WicketTestCase
/**
* FileUpload is filled on submit: Validation reports too short TextField input.
*/
+ @Test
public void testSubmit_NotValidTextFieldValue_FileUploaded()
{
formTester.setValue(textFieldId, "te");
@@ -110,6 +116,7 @@ public class FileUploadErrorTest extends WicketTestCase
/**
* Throwing exception confirms that value is received.
*/
+ @Test
public void testSubmit_ValidTextField_NoFile()
{
formTester.setValue(textFieldId, FileUploadError.THIS_VALUE_SHOULD_THROW_EXCEPTION);
@@ -126,8 +133,7 @@ public class FileUploadErrorTest extends WicketTestCase
}
}
- /**
- */
+ @Test
public void testSubmit_ValidTextField_WithFile()
{
formTester.setValue(textFieldId, "test value");
@@ -137,8 +143,7 @@ public class FileUploadErrorTest extends WicketTestCase
tester.assertNoErrorMessage();
}
- /**
- */
+ @Test
public void testSubmit_RequiredFileUpload_Ok()
{
((FileUploadField)tester.getLastRenderedPage().get("form:" + fileUploadId)).setRequired(true);
@@ -150,8 +155,7 @@ public class FileUploadErrorTest extends WicketTestCase
tester.assertNoErrorMessage();
}
- /**
- */
+ @Test
public void testSubmit_RequiredFileUpload_ShouldFailWithValidationError()
{
((FileUploadField)tester.getLastRenderedPage().get("form:" + fileUploadId)).setRequired(true);
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 0f3ffb0..90e0c0d 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,6 +19,7 @@ package org.apache.wicket.markup.html.image;
import java.util.Locale;
import org.apache.wicket.WicketTestCase;
+import org.junit.Test;
/**
* @author Juergen Donnerstag
@@ -30,6 +31,7 @@ public class ImageTest extends WicketTestCase
*
* @throws Exception
*/
+ @Test
public void test_1() throws Exception
{
Locale.setDefault(new Locale("en", "US"));
@@ -57,6 +59,7 @@ public class ImageTest extends WicketTestCase
/**
* testParentRelativeImage()
*/
+ @Test
public void testParentRelativeImage()
{
tester.getApplication().getResourceSettings().setParentFolderPlaceholder("$up$");
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 3eb2340..d3cb297 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
@@ -18,6 +18,7 @@ package org.apache.wicket.markup.html.image;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.util.tester.TagTester;
+import org.junit.Test;
/**
* Test for {@link NonCachingImage}.
@@ -30,6 +31,7 @@ public class NonCachingImageTest extends WicketTestCase
/**
* {@link NonCachingImage} always adds anticache.
*/
+ @Test
public void test()
{
NonCachingImagePage page = tester.startPage(NonCachingImagePage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 3c1ae8b..743d2c0 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
@@ -48,6 +48,7 @@ public class EnclosureTest extends WicketTestCase
/**
* @throws Exception
*/
+ @Test
public void testRenderHomePage() throws Exception
{
executeTest(EnclosurePage_1.class, "EnclosurePageExpectedResult_1.html");
@@ -56,6 +57,7 @@ public class EnclosureTest extends WicketTestCase
/**
* @throws Exception
*/
+ @Test
public void testRenderHomePage2() throws Exception
{
executeTest(EnclosurePage_2.class, "EnclosurePageExpectedResult_2.html");
@@ -64,6 +66,7 @@ public class EnclosureTest extends WicketTestCase
/**
* @throws Exception
*/
+ @Test
public void testRenderHomePage3() throws Exception
{
executeTest(EnclosurePage_3.class, "EnclosurePageExpectedResult_3.html");
@@ -72,6 +75,7 @@ public class EnclosureTest extends WicketTestCase
/**
* @throws Exception
*/
+ @Test
public void testRenderHomePage4() throws Exception
{
executeTest(EnclosurePage_4.class, new PageParameters().set("visible", false),
@@ -81,6 +85,7 @@ public class EnclosureTest extends WicketTestCase
/**
* @throws Exception
*/
+ @Test
public void testRenderHomePage4_1() throws Exception
{
executeTest(EnclosurePage_4.class, new PageParameters().set("visible", true),
@@ -90,6 +95,7 @@ public class EnclosureTest extends WicketTestCase
/**
* @throws Exception
*/
+ @Test
public void testRenderHomePage5() throws Exception
{
executeTest(EnclosurePage_5.class, new PageParameters().set("visible", false),
@@ -99,6 +105,7 @@ public class EnclosureTest extends WicketTestCase
/**
* @throws Exception
*/
+ @Test
public void testRenderHomePage5_1() throws Exception
{
executeTest(EnclosurePage_5.class, new PageParameters().set("visible", true),
@@ -110,6 +117,7 @@ public class EnclosureTest extends WicketTestCase
*
* @throws Exception
*/
+ @Test
public void testVisibilityOfChildren() throws Exception
{
// render with enclosure initially visible
@@ -134,6 +142,7 @@ public class EnclosureTest extends WicketTestCase
/**
*
*/
+ @Test
public void testRender()
{
tester.startPage(EnclosurePage_7.class);
@@ -143,6 +152,7 @@ public class EnclosureTest extends WicketTestCase
* @throws Exception
*
*/
+ @Test
public void testRender8() throws Exception
{
executeTest(EnclosurePage_8.class, "EnclosurePageExpectedResult_8.html");
@@ -172,6 +182,7 @@ public class EnclosureTest extends WicketTestCase
/**
* @throws Exception
*/
+ @Test
public void testRender9() throws Exception
{
executePage(new EnclosurePage_9(), "EnclosurePageExpectedResult_9.html");
@@ -228,6 +239,7 @@ public class EnclosureTest extends WicketTestCase
/**
* @throws Exception
*/
+ @Test
public void testRender9a() throws Exception
{
Class<? extends Page> clazz = EnclosurePage_9.class;
@@ -270,6 +282,7 @@ public class EnclosureTest extends WicketTestCase
*
* @throws Exception
*/
+ @Test
public void testRender10() throws Exception
{
Class<? extends Page> clazz = EnclosurePage_10.class;
@@ -310,6 +323,7 @@ public class EnclosureTest extends WicketTestCase
/**
* @throws Exception
*/
+ @Test
public void testRenderPage11() throws Exception
{
executeTest(EnclosurePage_11.class, "EnclosurePageExpectedResult_11.html");
@@ -318,6 +332,7 @@ public class EnclosureTest extends WicketTestCase
/**
* @throws Exception
*/
+ @Test
public void testRenderPage12() throws Exception
{
executeTest(EnclosurePage_12.class, "EnclosurePageExpectedResult_12.html");
@@ -326,6 +341,7 @@ public class EnclosureTest extends WicketTestCase
/**
* @throws Exception
*/
+ @Test
public void testRenderPage13() throws Exception
{
tester = new WicketTester(new MockApplication()
@@ -353,6 +369,7 @@ public class EnclosureTest extends WicketTestCase
/**
* https://issues.apache.org/jira/browse/WICKET-3842
*/
+ @Test
public void testAtrribute()
{
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 32c778c..8a843f0 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
@@ -23,6 +23,7 @@ import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
+import org.junit.Test;
/**
@@ -46,9 +47,7 @@ public class TogglePageTest extends WicketTestCase
return webApplication;
}
- /**
- *
- */
+ @Test
public void testNoAjaxPage()
{
{
@@ -76,9 +75,7 @@ public class TogglePageTest extends WicketTestCase
}
}
- /**
- *
- */
+ @Test
public void testTraditionalAjaxEnclosurePage()
{
{
@@ -109,9 +106,7 @@ public class TogglePageTest extends WicketTestCase
}
}
- /**
- *
- */
+ @Test
public void testInlineEnclosureWithAdditionalAjaxTarget()
{
{
@@ -147,9 +142,7 @@ public class TogglePageTest extends WicketTestCase
}
}
- /**
- *
- */
+ @Test
public void testInlineEnclosureAjaxPage()
{
String inlineEnclosureIdPrefix = "wicket__InlineEnclosure_";
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 25f81ed..27c0adb 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,17 +19,17 @@ package org.apache.wicket.markup.html.link;
import java.util.Locale;
import org.apache.wicket.WicketTestCase;
+import org.junit.Test;
/**
* @since 1.5
*/
public class ClientSideImageMapTest extends WicketTestCase
{
- private static final long serialVersionUID = 1L;
-
/**
* @throws Exception
*/
+ @Test
public void testRenderClientSideImageMapPage_1() throws Exception
{
tester.getSession().setLocale(Locale.US);
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 8d005d6..0ba7676 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,6 +18,7 @@ package org.apache.wicket.markup.html.markupId;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.protocol.http.WebApplication;
+import org.junit.Test;
/**
* Simple test using the WicketTester
@@ -34,6 +35,7 @@ public class TestHomePage extends WicketTestCase
/**
* testRenderMyPage()
*/
+ @Test
public void testRenderMyPage()
{
// start and render the test page
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 0d61b6c..b7e5ede 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,6 +17,7 @@
package org.apache.wicket.markup.html.page;
import org.apache.wicket.WicketTestCase;
+import org.junit.Test;
/**
* Simple test using the WicketTester
@@ -26,6 +27,7 @@ public class TestHomePage extends WicketTestCase
/**
*
*/
+ @Test
public void testRenderMyPage()
{
// no exception should occur
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestCase.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestCase.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestCase.java
index 7ea378b..61accdc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestCase.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestCase.java
@@ -17,15 +17,14 @@
package org.apache.wicket.markup.html.panel;
import org.apache.wicket.WicketTestCase;
+import org.junit.Test;
/**
*
*/
public class FragmentTestCase extends WicketTestCase
{
- /**
- *
- */
+ @Test
public void testFragments()
{
tester.startComponentInPage(FragmentTestPanel.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 325643e..36cc92e 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,6 +17,7 @@
package org.apache.wicket.markup.parser;
import org.apache.wicket.WicketTestCase;
+import org.junit.Test;
/**
*
@@ -26,6 +27,7 @@ public class TestHomePage extends WicketTestCase
/**
* Wicket-2105
*/
+ @Test
public void testRenderMyPage()
{
// start and render the test page
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 b6ba28e..1718f8e 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,6 +17,7 @@
package org.apache.wicket.markup.parser.filter;
import org.apache.wicket.WicketTestCase;
+import org.junit.Test;
/**
* @author jcompagner
@@ -28,6 +29,7 @@ public class DoubleHeaderPartPageTest extends WicketTestCase
/**
* @throws Exception
*/
+ @Test
public void testRenderHeaderPartPage() throws Exception
{
executeTest(DoubleHeaderPartPage.class, "DoubleHeaderPartPageExpectedResult.html");
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 78dab31..7208591 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,6 +17,7 @@
package org.apache.wicket.markup.resolver;
import org.apache.wicket.WicketTestCase;
+import org.junit.Test;
/**
* Simple test using the WicketTester
@@ -24,9 +25,7 @@ import org.apache.wicket.WicketTestCase;
public class TestHomePage extends WicketTestCase
{
- /**
- *
- */
+ @Test
public void testRenderMyPage_1()
{
// start and render the test page
@@ -41,7 +40,7 @@ public class TestHomePage extends WicketTestCase
String href = "href=\"../resource/org.apache.wicket.markup.resolver.HomePage_1/main.css\"";
- String doc = tester.getLastResponseAsString();
+// String doc = tester.getLastResponseAsString();
tester.assertContains(href);
// When rendered the 2nd time, the result should be same. The href must not contain the
@@ -50,9 +49,7 @@ public class TestHomePage extends WicketTestCase
tester.assertContains(href);
}
- /**
- *
- */
+ @Test
public void testRenderMyPage_2()
{
// start and render the test page
@@ -60,7 +57,7 @@ public class TestHomePage extends WicketTestCase
String href = "href=\"../resource/org.apache.wicket.markup.resolver.HomePage_2/main.css\"";
- String doc = tester.getLastResponseAsString();
+// String doc = tester.getLastResponseAsString();
tester.assertContains(href);
// When rendered the 2nd time, the result should be same. The href must not contain the
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 2ab47c9..d1efd39 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
@@ -22,6 +22,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.junit.Test;
/**
* @author Pedro Santos
@@ -32,6 +33,7 @@ public class DetachableTest extends WicketTestCase
/**
* <a href="https://issues.apache.org/jira/browse/WICKET-3872">WICKET-3872</a>
*/
+ @Test
public void testDetachRemovedChildrenTree()
{
DetachableComponent a = new DetachableComponent("a");
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 f8c7f1d..66ed353 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
@@ -20,6 +20,7 @@ import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.value.ValueMap;
+import org.junit.Test;
/**
* Tests the inheritance of models.
@@ -29,6 +30,7 @@ public class InheritedModelTest extends WicketTestCase
/**
* Tests the CPM inheritance by setting a different root model using a rendered scenario.
*/
+ @Test
public void testCompoundPropertyModelRendered()
{
ValueMap data1 = new ValueMap();
@@ -40,11 +42,11 @@ public class InheritedModelTest extends WicketTestCase
InheritedTestPage page = new InheritedTestPage();
- page.setDefaultModel(new CompoundPropertyModel<ValueMap>(data1));
+ page.setDefaultModel(new CompoundPropertyModel<>(data1));
tester.startPage(page);
tester.assertLabel("label", "foo");
- page.setDefaultModel(new CompoundPropertyModel<ValueMap>(data2));
+ page.setDefaultModel(new CompoundPropertyModel<>(data2));
tester.startPage(page);
tester.assertLabel("label", "bar");
}
@@ -52,6 +54,7 @@ public class InheritedModelTest extends WicketTestCase
/**
* Tests the CPM by setting a different root model using a direct scenario.
*/
+ @Test
public void testCompoundPropertyModelDirect()
{
ValueMap data1 = new ValueMap();
@@ -64,10 +67,10 @@ public class InheritedModelTest extends WicketTestCase
Label label = new Label("label");
parent.add(label);
- parent.setDefaultModel(new CompoundPropertyModel<ValueMap>(data1));
+ parent.setDefaultModel(new CompoundPropertyModel<>(data1));
assertEquals("foo", label.getDefaultModelObject());
- parent.setDefaultModel(new CompoundPropertyModel<ValueMap>(data2));
+ parent.setDefaultModel(new CompoundPropertyModel<>(data2));
assertEquals("bar", label.getDefaultModelObject());
data2.put("label", "foo");
@@ -77,6 +80,7 @@ public class InheritedModelTest extends WicketTestCase
/**
* Tests if Component#FLAG_INHERITABLE_MODEL reset after model change (WICKET-3413).
*/
+ @Test
public void testResetInheritedModelFlag()
{
ValueMap data1 = new ValueMap();
@@ -87,7 +91,7 @@ public class InheritedModelTest extends WicketTestCase
InheritedTestPage page = new InheritedTestPage();
- page.setDefaultModel(new CompoundPropertyModel<ValueMap>(data1));
+ page.setDefaultModel(new CompoundPropertyModel<>(data1));
tester.startPage(page);
assertEquals("foo", page.label.getDefaultModelObject());
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 801157b..9350489 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,14 @@ package org.apache.wicket.model;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.util.tester.FormTester;
+import org.junit.Test;
/**
* Simple test for CompoundPropertyModel and id's like "A.B"
*/
public class TestHomePage extends WicketTestCase
{
- /**
- *
- */
+ @Test
public void testRenderMyPage()
{
// start and render the test page
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 fc5e88f..d7fc81c 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
@@ -21,6 +21,7 @@ import java.util.ArrayList;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.mock.MockWebResponse;
import org.apache.wicket.request.http.WebResponse;
+import org.junit.Test;
/**
@@ -37,6 +38,7 @@ public class BufferedWebResponseTest extends WicketTestCase
*
* WICKET-3618
*/
+ @Test
public void testBufferedResponsePostponeWriteResponseAction()
{
final ArrayList<TestAction> actionsSequence = new ArrayList<TestAction>();
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 cbc6285..4bec673 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,6 +17,7 @@
package org.apache.wicket.redirect;
import org.apache.wicket.WicketTestCase;
+import org.junit.Test;
/**
*/
@@ -26,6 +27,7 @@ public class RestartWithMountedPageTest extends WicketTestCase
/**
* Tests that a protected page can redirect to a login page from mounted pages.
*/
+ @Test
public void testWithMountedLoginPage()
{
tester.getApplication().mountPage("/login", LoginPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 56b567a..b26988a 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
@@ -21,6 +21,7 @@ import org.junit.Assert;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.request.http.flow.AbortWithHttpErrorCodeException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.junit.Test;
/**
* Testcase for WICKET-1418, throwing an abortexception during rendering.
@@ -35,6 +36,7 @@ public class AbortExceptionTest extends WicketTestCase
/**
* Test page without throwing abort.
*/
+ @Test
public void testNoAbort()
{
tester.startPage(AbortExceptionPage.class, new PageParameters().set("trigger", false));
@@ -44,6 +46,7 @@ public class AbortExceptionTest extends WicketTestCase
/**
* Test page with throwing abort.
*/
+ @Test
public void testAbort()
{
try
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 9f9a34d..f7e0a17 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,6 +23,7 @@ import org.apache.wicket.authorization.IAuthorizationStrategy;
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.component.IRequestableComponent;
+import org.junit.Test;
/**
* Testcase for bug WICKET-1292.
@@ -74,6 +75,7 @@ public class InterceptTest extends WicketTestCase
* Testcase for the behavior of WicketTester with respect to continueToOrginialDestination.
* Tests a non homepage class.
*/
+ @Test
public void testRestartResponseAtInterceptPageAndContinueTorOriginalDestination()
{
tester.startPage(TargetPage.class);
@@ -86,6 +88,7 @@ public class InterceptTest extends WicketTestCase
* Testcase for the behavior of WicketTester with respect to continueToOrginialDestination.
* Tests homepage class.
*/
+ @Test
public void testRestartResponseAtInterceptPageAndContinueTorOriginalDestination2()
{
tester.startPage(HomePage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 6188248..38d974f 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
@@ -18,7 +18,6 @@ package org.apache.wicket.request.handler;
import java.nio.charset.Charset;
-import junit.framework.TestCase;
import org.apache.wicket.IPageManagerProvider;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.AjaxEventBehavior;
@@ -38,11 +37,15 @@ 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;
/**
* @author Pedro Santos
*/
-public class PageIdPoliticTest extends TestCase
+public class PageIdPoliticTest extends Assert
{
private WicketTester tester;
private InMemoryPageStore dataStore;
@@ -55,6 +58,7 @@ public class PageIdPoliticTest extends TestCase
*
* @see <a href="https://issues.apache.org/jira/browse/WICKET-3667">WICKET-3667</a>
*/
+ @Test
public void testPageGetsTouchedInAjaxRequest()
{
TestPage testPage = new TestPage();
@@ -68,6 +72,7 @@ public class PageIdPoliticTest extends TestCase
/**
*
*/
+ @Test
public void testPageIdDontGetIncreasedInAjaxRequest()
{
TestPage testPage = new TestPage();
@@ -78,8 +83,8 @@ public class PageIdPoliticTest extends TestCase
assertTrue(testPage.ajaxCallbackExecuted);
}
- @Override
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
application = new MockApplication();
dataStore = new InMemoryPageStore()
@@ -111,8 +116,8 @@ public class PageIdPoliticTest extends TestCase
};
}
- @Override
- protected void tearDown() throws Exception
+ @After
+ public void tearDown() throws Exception
{
tester.destroy();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 91eba94..e04c2d8 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
@@ -29,6 +29,7 @@ public class Test extends WicketTestCase
/**
*
*/
+ @org.junit.Test
public void testRedirect()
{
final IAuthorizationStrategy authorizationStrategy = new SimplePageAuthorizationStrategy(
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 f8a8e25..dc36f5c 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
@@ -22,6 +22,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.junit.Before;
+import org.junit.Test;
/**
@@ -47,6 +48,7 @@ public class AjaxLinkClickTest extends WicketTestCase
/**
* Test that an AjaxLink's onClick method is actually invoked.
*/
+ @Test
public void testBasicAjaxLinkClick()
{
// Create a link, which we test is actually invoked
@@ -77,6 +79,7 @@ public class AjaxLinkClickTest extends WicketTestCase
* AjaxFallbackLinks should be clicked and interpreted as an AjaxLink, which means that
* AjaxRequestTarget is not null.
*/
+ @Test
public void testAjaxFallbackLinkClick()
{
final Page page = new MockPageWithLink();
@@ -105,6 +108,7 @@ public class AjaxLinkClickTest extends WicketTestCase
* Test that when AJAX is disabled, the AjaxFallbackLink is invoked with null as
* AjaxRequestTarget.
*/
+ @Test
public void testFallbackLinkWithAjaxDisabled()
{
final Page page = new MockPageWithLink();
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 0d463ed..588c0db 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
@@ -22,6 +22,7 @@ import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.util.tester.apps_5.MockPageWithFormAndLink.MockPojo;
import org.junit.Before;
+import org.junit.Test;
/**
@@ -45,6 +46,7 @@ public class AjaxSubmitLinkClickTest extends WicketTestCase
/**
*
*/
+ @Test
public void testClickLinkInsideForm_ajaxSubmitLink()
{
MockPojo mockPojo = new MockPageWithFormAndLink.MockPojo();
@@ -90,6 +92,7 @@ public class AjaxSubmitLinkClickTest extends WicketTestCase
/**
*
*/
+ @Test
public void testClickLink_ajaxSubmitLink()
{
MockPojo mockPojo = new MockPageWithFormAndLink.MockPojo();
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 cf52b53..213807c 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,6 +17,7 @@
package org.apache.wicket.util.tester.apps_7;
import org.apache.wicket.WicketTestCase;
+import org.junit.Test;
/**
* Simple test using the WicketTester
@@ -24,6 +25,7 @@ import org.apache.wicket.WicketTestCase;
public class TestHomePage extends WicketTestCase
{
/** */
+ @Test
public void testAjaxSubmitWhileAnotherButtonIsNotVisible()
{
// start and render the test page
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 099f14a..81dcad4 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
@@ -30,6 +30,7 @@ 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.junit.Test;
/**
* Tests validator work as validators and behaviors
@@ -42,6 +43,7 @@ public class ValidatorBehaviorTest extends WicketTestCase
/**
* Tests validators are treated as behaviors
*/
+ @Test
public void testActAsBehavior()
{
TestPage page = new TestPage();
@@ -62,6 +64,7 @@ public class ValidatorBehaviorTest extends WicketTestCase
/**
* Tests validators are treated as validators
*/
+ @Test
public void testActAsValidator()
{
TestPage page = new TestPage();
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 82fb72d..4ce3c5c 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,36 +16,20 @@
*/
package org.apache.wicket.validation.validator;
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
/**
* Tests a couple of valid and invalid email patterns.
*
* @author Maurice Marrink
*/
-public class EmailValidatorTest extends TestCase
+public class EmailValidatorTest extends Assert
{
/**
- * Constructor.
- */
- public EmailValidatorTest()
- {
- super();
- }
-
- /**
- * Constructor.
- *
- * @param name
- */
- public EmailValidatorTest(String name)
- {
- super(name);
- }
-
- /**
* Tests a couple of emails that should be valid.
*/
+ @Test
public void testValidEmails()
{
EmailAddressValidator test = new EmailAddressValidator();
@@ -60,6 +44,7 @@ public class EmailValidatorTest extends TestCase
/**
* Tests a couple of emails that should not be valid.
*/
+ @Test
public void testInvalidEmails()
{
EmailAddressValidator test = new EmailAddressValidator();
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 febc2ad..236720a 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,14 +16,16 @@
*/
package org.apache.wicket.validation.validator;
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
/**
* {@link UrlValidator} test
*
* @author igor.vaynberg
*/
-public class UrlValidatorTest extends TestCase
+public class UrlValidatorTest extends Assert
{
private final boolean printStatus = false;
@@ -35,8 +37,8 @@ public class UrlValidatorTest extends TestCase
/**
*
*/
- @Override
- protected void setUp()
+ @Before
+ public void setUp()
{
for (int index = 0; index < testPartsIndex.length - 1; index++)
{
@@ -45,16 +47,9 @@ public class UrlValidatorTest extends TestCase
}
/**
- *
- */
- @Override
- protected void tearDown()
- {
- }
-
- /**
* WICKET-5112
*/
+ @Test
public void testParentheses()
{
String[] schemes = { "http" };
@@ -65,6 +60,7 @@ public class UrlValidatorTest extends TestCase
/**
* test
*/
+ @Test
public void testIsValid()
{
testIsValid(testUrlParts, UrlValidator.ALLOW_ALL_SCHEMES);
@@ -78,6 +74,7 @@ public class UrlValidatorTest extends TestCase
/**
* test
*/
+ @Test
public void testIsValidScheme()
{
if (printStatus)
@@ -117,7 +114,7 @@ public class UrlValidatorTest extends TestCase
* Used to create a url.
* @param options
*/
- public void testIsValid(Object[] testObjects, int options)
+ private void testIsValid(Object[] testObjects, int options)
{
UrlValidator urlVal = new UrlValidator(null, options);
assertTrue(urlVal.isValid("http://www.google.com"));
@@ -197,6 +194,7 @@ public class UrlValidatorTest extends TestCase
/**
* test
*/
+ @Test
public void testValidator202()
{
String[] schemes = { "http", "https" };
@@ -207,6 +205,7 @@ public class UrlValidatorTest extends TestCase
/**
* test
*/
+ @Test
public void testValidator204()
{
String[] schemes = { "http", "https" };
@@ -217,6 +216,7 @@ public class UrlValidatorTest extends TestCase
/**
* test
*/
+ @Test
public void testValidator206()
{
UrlValidator urlVal = new UrlValidator(null, UrlValidator.ALLOW_ALL_SCHEMES);
@@ -282,14 +282,6 @@ public class UrlValidatorTest extends TestCase
}
- /**
- * test
- */
- public void testValidateUrl()
- {
- assertTrue(true);
- }
-
// -------------------- Test data for creating a composite URL
/**
* The data given below approximates the 4 parts of a URL <scheme>://<authority><path>?<query>
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 6e310c5..72f12a8 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,26 +16,28 @@
*/
package org.apache.wicket.devutils.inspector;
-import junit.framework.TestCase;
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;
/**
* @author Pedro Santos
*/
-public class SessionSizeModelTest extends TestCase
+public class SessionSizeModelTest extends Assert
{
/**
* @see <a href="https://issues.apache.org/jira/browse/WICKET-3355">WICKET-3355</a>
*/
+ @Test
public void testTorelanceOnProblematicSessions()
{
- WicketTester tester = new WicketTester(new MockApplication()
+ new WicketTester(new MockApplication()
{
@Override
public Session newSession(final Request request, final Response response)
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd3c7c8c/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 d710a91..c02f936 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,15 +16,18 @@
*/
package org.apache.wicket.devutils.stateless;
-import junit.framework.TestCase;
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;
/**
* @author Marat Radchenko
*/
-public class StatelessCheckerTest extends TestCase
+public class StatelessCheckerTest extends Assert
{
/**
*
@@ -55,7 +58,7 @@ public class StatelessCheckerTest extends TestCase
/**
* @see junit.framework.TestCase#setUp()
*/
- @Override
+ @Before
public void setUp()
{
tester = new WicketTester();
@@ -64,15 +67,13 @@ public class StatelessCheckerTest extends TestCase
/**
* @see junit.framework.TestCase#tearDown()
*/
- @Override
+ @After
public void tearDown()
{
tester.destroy();
}
- /**
- *
- */
+ @Test
public void testNonBookmarkablePage()
{
boolean hit = false;
@@ -88,9 +89,7 @@ public class StatelessCheckerTest extends TestCase
assertTrue("Expected exception", hit);
}
- /**
- *
- */
+ @Test
public void testPositive()
{
tester.getApplication().getComponentPostOnBeforeRenderListeners().add(checker);