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 10:28:32 UTC
git commit: WICKET-5201 Remove deprecated classes/methods/fields
Updated Branches:
refs/heads/master 5ce35bdac -> 3441330f4
WICKET-5201 Remove deprecated classes/methods/fields
Replace deprecated junit.framework with org.junit
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3441330f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3441330f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3441330f
Branch: refs/heads/master
Commit: 3441330f4683de8dbee23c1784731565eaf8ec6e
Parents: 5ce35bd
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Jun 19 10:26:05 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Jun 19 10:26:05 2013 +0200
----------------------------------------------------------------------
.../main/java/org/apache/wicket/util/tester/DiffUtil.java | 2 +-
.../main/java/org/apache/wicket/util/tester/FormTester.java | 2 +-
.../java/org/apache/wicket/util/tester/WicketTester.java | 8 ++++----
.../org/apache/wicket/util/tester/WicketTesterHelper.java | 2 +-
.../test/java/org/apache/wicket/ApplicationSettingsTest.java | 2 +-
.../org/apache/wicket/AttributeModifierComponentTest.java | 2 +-
.../test/java/org/apache/wicket/FeedbackMessagesTest.java | 2 +-
wicket-core/src/test/java/org/apache/wicket/VisitorTest.java | 2 +-
.../src/test/java/org/apache/wicket/WicketJUnitRunner.java | 6 +++---
.../java/org/apache/wicket/ajax/AjaxBehaviorEnabledPage.java | 2 +-
.../test/java/org/apache/wicket/markup/MarkupParserTest.java | 2 +-
.../org/apache/wicket/markup/html/ComponentMarkupIdTest.java | 2 +-
.../apache/wicket/markup/html/form/FormComponentTest.java | 2 +-
.../org/apache/wicket/markup/html/form/FormHasErrorPage.java | 2 +-
.../apache/wicket/markup/html/form/submitlink/HomePage.java | 3 ++-
.../wicket/markup/html/internal/HeaderResponseTest.java | 6 ++----
.../markup/html/internal/TraditionalEnclosureAjaxPage.java | 2 +-
.../wicket/markup/html/link/submitLink/FormPage2Test.java | 2 +-
.../wicket/markup/html/link/submitLink/FormPageTest.java | 2 +-
.../apache/wicket/protocol/http/request/UserAgentTest.java | 4 ++--
.../protocol/http/servlet/WicketSessionFilterTest.java | 8 +++-----
.../org/apache/wicket/redirect/abort/AbortExceptionTest.java | 2 +-
.../apache/wicket/response/filter/ResponseFilterTest.java | 2 +-
.../org/apache/wicket/settings/ISecuritySettingsTest.java | 2 +-
.../test/java/org/apache/wicket/util/tester/CookiePage.java | 2 +-
.../apache/wicket/examples/base/markdown/MarkdownTest.java | 3 +--
.../markup/html/repeater/tree/table/NodeModelTest.java | 2 +-
.../wicket/util/license/AbstractLicenseHeaderHandler.java | 2 +-
.../apache/wicket/util/license/CssLicenseHeaderHandler.java | 2 +-
.../apache/wicket/util/license/JavaLicenseHeaderHandler.java | 2 +-
.../wicket/util/license/PropertiesLicenseHeaderHandler.java | 2 +-
.../wicket/util/license/VelocityLicenseHeaderHandler.java | 2 +-
.../apache/wicket/util/license/XmlLicenseHeaderHandler.java | 2 +-
.../apache/wicket/util/license/XmlPrologHeaderHandler.java | 2 +-
34 files changed, 44 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 571290e..e29e81a 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
@@ -22,7 +22,7 @@ import java.io.InputStream;
import java.io.PrintWriter;
import java.net.URL;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.wicket.markup.MarkupParser;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.util.diff.Diff;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 ab3bf72..180eaaa 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
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.wicket.Component;
import org.apache.wicket.WicketRuntimeException;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 56362c6..a8b6032 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,10 +16,10 @@
*/
package org.apache.wicket.util.tester;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertEquals;
+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;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 0fdaa69..668d574 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
@@ -21,7 +21,7 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.wicket.Component;
import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.Page;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 a7b65bc..9a62f12 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ApplicationSettingsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ApplicationSettingsTest.java
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.mock.MockServletContext;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/wicket-core/src/test/java/org/apache/wicket/AttributeModifierComponentTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/AttributeModifierComponentTest.java b/wicket-core/src/test/java/org/apache/wicket/AttributeModifierComponentTest.java
index f456db5..ec8acd6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/AttributeModifierComponentTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/AttributeModifierComponentTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.wicket.protocol.http.documentvalidation.HtmlDocumentValidator;
import org.apache.wicket.protocol.http.documentvalidation.Tag;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 ef13cec..3f111dd 100644
--- a/wicket-core/src/test/java/org/apache/wicket/FeedbackMessagesTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/FeedbackMessagesTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 a3eb37b..fd6bffc 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,7 @@
*/
package org.apache.wicket;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.FormComponent;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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
index 7dcc3ce..64a4220 100644
--- a/wicket-core/src/test/java/org/apache/wicket/WicketJUnitRunner.java
+++ b/wicket-core/src/test/java/org/apache/wicket/WicketJUnitRunner.java
@@ -53,7 +53,7 @@ public class WicketJUnitRunner extends BlockJUnit4ClassRunner
@Override
protected List<FrameworkMethod> computeTestMethods()
{
- List<FrameworkMethod> methods = new ArrayList<FrameworkMethod>();
+ List<FrameworkMethod> methods = new ArrayList<>();
methods.addAll(super.computeTestMethods());
for (Method javaMethod : getTestClass().getJavaClass().getMethods())
@@ -71,7 +71,7 @@ public class WicketJUnitRunner extends BlockJUnit4ClassRunner
@Override
protected Statement withBefores(FrameworkMethod method, Object target, Statement statement)
{
- List<FrameworkMethod> befores = new ArrayList<FrameworkMethod>();
+ List<FrameworkMethod> befores = new ArrayList<>();
befores.addAll(getTestClass().getAnnotatedMethods(Before.class));
findMethod(getTestClass(), befores, "setUp");
@@ -81,7 +81,7 @@ public class WicketJUnitRunner extends BlockJUnit4ClassRunner
@Override
protected Statement withAfters(FrameworkMethod method, Object target, Statement statement)
{
- List<FrameworkMethod> afters = new ArrayList<FrameworkMethod>();
+ List<FrameworkMethod> afters = new ArrayList<>();
afters.addAll(getTestClass().getAnnotatedMethods(After.class));
findMethod(getTestClass(), afters, "tearDown");
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 1d9f396..509570e 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,7 +16,7 @@
*/
package org.apache.wicket.ajax;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 11aa0d5..4ca7a9c 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
@@ -21,7 +21,7 @@ import java.text.ParseException;
import java.util.Locale;
import java.util.regex.Matcher;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.border.Border;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 0eb38bc..f487589 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,7 +16,7 @@
*/
package org.apache.wicket.markup.html;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.wicket.Component;
import org.apache.wicket.WicketTestCase;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 01d8ab0..86f47f3 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,7 @@
*/
package org.apache.wicket.markup.html.form;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.WicketTestCase;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 ce2f85e..546005c 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 junit.framework.Assert;
+import org.junit.Assert;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 675dc91..a8db477 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,7 +16,8 @@
*/
package org.apache.wicket.markup.html.form.submitlink;
-import static junit.framework.Assert.*;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.form.Form;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 a8ec452..5c7910e 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
@@ -22,9 +22,8 @@ import static org.mockito.Mockito.when;
import java.nio.charset.Charset;
-import junit.framework.Assert;
-
import org.apache.wicket.ThreadContext;
+import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.internal.HeaderResponse;
@@ -36,10 +35,9 @@ import org.apache.wicket.request.cycle.RequestCycle;
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.markup.head.CssHeaderItem;
import org.apache.wicket.response.StringResponse;
-import org.apache.wicket.util.tester.WicketTester;
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 f36b943..712a9c8 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,7 +16,7 @@
*/
package org.apache.wicket.markup.html.internal;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.html.WebMarkupContainer;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 4169c2d..e45e0a4 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,7 +16,7 @@
*/
package org.apache.wicket.markup.html.link.submitLink;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.util.tester.FormTester;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 7dfe3a2..dce3d81 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,7 +16,7 @@
*/
package org.apache.wicket.markup.html.link.submitLink;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.util.tester.FormTester;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/UserAgentTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/UserAgentTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/UserAgentTest.java
index 8686f3c..9293457 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/UserAgentTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/UserAgentTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.protocol.http.request;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 2094cbb..003a7d5 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
@@ -28,9 +28,6 @@ import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import junit.framework.Assert;
-import junit.framework.AssertionFailedError;
-
import org.apache.wicket.Application;
import org.apache.wicket.Session;
import org.apache.wicket.WicketTestCase;
@@ -41,6 +38,7 @@ import org.apache.wicket.session.ISessionStore;
import org.apache.wicket.util.IProvider;
import org.apache.wicket.util.tester.WicketTester;
import org.apache.wicket.util.time.Duration;
+import org.junit.Assert;
import org.junit.Test;
/**
@@ -190,12 +188,12 @@ public class WicketSessionFilterTest extends WicketTestCase
{
if (Application.exists() == false)
{
- throw new AssertionFailedError("The application is not available!");
+ throw new AssertionError("The application is not available!");
}
if (Session.exists() == false)
{
- throw new AssertionFailedError("The session is not available!");
+ throw new AssertionError("The session is not available!");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 e09d036..56b567a 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,7 +16,7 @@
*/
package org.apache.wicket.redirect.abort;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.request.http.flow.AbortWithHttpErrorCodeException;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 5492673..aff4a92 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
@@ -18,7 +18,7 @@ package org.apache.wicket.response.filter;
import java.util.concurrent.atomic.AtomicInteger;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.wicket.MockPageWithLink;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.ajax.AjaxEventBehavior;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 7822531..3c44692 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,7 +16,7 @@
*/
package org.apache.wicket.settings;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.wicket.MockPageWithLink;
import org.apache.wicket.WicketTestCase;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 0c4d97f..fce6756 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
@@ -18,7 +18,7 @@ package org.apache.wicket.util.tester;
import javax.servlet.http.Cookie;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.http.WebResponse;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/wicket-experimental/wicket-examples-parent/wicket-examples-jar/src/test/java/org/apache/wicket/examples/base/markdown/MarkdownTest.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-examples-parent/wicket-examples-jar/src/test/java/org/apache/wicket/examples/base/markdown/MarkdownTest.java b/wicket-experimental/wicket-examples-parent/wicket-examples-jar/src/test/java/org/apache/wicket/examples/base/markdown/MarkdownTest.java
index fbcf14b..3f3e81b 100644
--- a/wicket-experimental/wicket-examples-parent/wicket-examples-jar/src/test/java/org/apache/wicket/examples/base/markdown/MarkdownTest.java
+++ b/wicket-experimental/wicket-examples-parent/wicket-examples-jar/src/test/java/org/apache/wicket/examples/base/markdown/MarkdownTest.java
@@ -19,8 +19,7 @@ package org.apache.wicket.examples.base.markdown;
import java.io.IOException;
import java.nio.charset.Charset;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.Test;
import com.google.common.io.Resources;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 3e18a59..15bb8b7 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,8 +16,8 @@
*/
package org.apache.wicket.extensions.markup.html.repeater.tree.table;
-import junit.framework.Assert;
import org.apache.wicket.model.IModel;
+import org.junit.Assert;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 958fe6c..74583c2 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
@@ -24,7 +24,7 @@ import java.io.InputStreamReader;
import java.io.LineNumberReader;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.wicket.util.io.IOUtils;
import org.apache.wicket.util.string.Strings;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 c078fe7..7be607c 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,7 +20,7 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.wicket.util.diff.Diff;
import org.apache.wicket.util.diff.Revision;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 77b58b5..bbc0eac 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
@@ -22,7 +22,7 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.wicket.util.string.Strings;
class JavaLicenseHeaderHandler extends AbstractLicenseHeaderHandler
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 116c88e..98cbbe3 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
@@ -20,7 +20,7 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.wicket.util.diff.Diff;
import org.apache.wicket.util.diff.Revision;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 0521c78..6e923b9 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
@@ -20,7 +20,7 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.wicket.util.diff.Diff;
import org.apache.wicket.util.diff.Revision;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 2757d6b..98f1f45 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
@@ -22,7 +22,7 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import junit.framework.Assert;
+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;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3441330f/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 0775ea3..8dc23e3 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
@@ -20,7 +20,7 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
class XmlPrologHeaderHandler extends XmlLicenseHeaderHandler
{