You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2015/06/19 10:43:05 UTC
[3/6] wicket git commit: Removed all the replicated WicktTestCase
classes. Only the one from wicket-core has been left
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/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 16347fa..1c9e388 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/panelBorder/TestHomePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/panelBorder/TestHomePage.java
@@ -16,9 +16,9 @@
*/
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.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/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 979f4be..3150d0f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/panelBorder/TestHomePage_2134.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/panelBorder/TestHomePage_2134.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.markup.html.form.panelBorder;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.util.tester.FormTester;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/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 67911ce..6a9981b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/submitlink/TestHomePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/submitlink/TestHomePage.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.markup.html.form.submitlink;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.util.tester.FormTester;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/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 e658772..61f9f33 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
@@ -19,9 +19,9 @@ package org.apache.wicket.markup.html.form.upload;
import java.util.Locale;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.util.file.File;
import org.apache.wicket.util.tester.FormTester;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Before;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java
index a9f6c51..7f17962 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java
@@ -24,9 +24,9 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.util.file.File;
import org.apache.wicket.util.tester.FormTester;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.ValidationError;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadTest.java
index 9a25b3b..6315d20 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadTest.java
@@ -24,12 +24,12 @@ import java.util.List;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.io.FileCleaningTracker;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.util.file.File;
import org.apache.wicket.util.file.FileCleaner;
import org.apache.wicket.util.file.FileCleanerTrackerAdapter;
import org.apache.wicket.util.file.IFileCleaner;
import org.apache.wicket.util.tester.FormTester;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadFieldTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadFieldTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadFieldTest.java
index 3d81ab8..012473d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadFieldTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadFieldTest.java
@@ -24,7 +24,6 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.form.Form;
@@ -34,6 +33,7 @@ import org.apache.wicket.util.io.IOUtils;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.FormTester;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/FormValidatorBehaviorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/FormValidatorBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/FormValidatorBehaviorTest.java
index 9ba9005..863eb44 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/FormValidatorBehaviorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/FormValidatorBehaviorTest.java
@@ -18,7 +18,6 @@ package org.apache.wicket.markup.html.form.validation;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.feedback.FeedbackCollector;
import org.apache.wicket.markup.ComponentTag;
@@ -31,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.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePageTest.java
index 1f0e55f..5f544c0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePageTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.wicket.markup.html.form.validation;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.feedback.FeedbackMessage;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.util.tester.FormTester;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Before;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/InnerFeedbackTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/InnerFeedbackTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/InnerFeedbackTest.java
index 51f0a72..e1848e6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/InnerFeedbackTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/InnerFeedbackTest.java
@@ -18,10 +18,10 @@ package org.apache.wicket.markup.html.form.validation.innerfeedback;
import java.util.Locale;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.FormTester;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/header/HeaderScopingTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/HeaderScopingTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/HeaderScopingTest.java
index 4ab5f77..538359d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/HeaderScopingTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/HeaderScopingTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.header;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java
index 92686f8..233dc3b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.header.inheritance;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/HeaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/HeaderTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/HeaderTest.java
index 1c49f5e..a031bc0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/HeaderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/HeaderTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.header.testing;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/HeaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/HeaderTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/HeaderTest.java
index c12cd60..9aa1eac 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/HeaderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/HeaderTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.header.testing2;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/HeaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/HeaderTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/HeaderTest.java
index a5a4af7..36794ea 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/HeaderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/HeaderTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.header.testing3;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/InheritanceHeadTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/InheritanceHeadTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/InheritanceHeadTest.java
index bf9046a..20e5b11 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/InheritanceHeadTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/InheritanceHeadTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.header.threelayers;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/InheritanceHeadTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/InheritanceHeadTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/InheritanceHeadTest.java
index 834e1fd..610b585 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/InheritanceHeadTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/InheritanceHeadTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.header.threelayers2;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/image/AjaxUpdatedImageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/AjaxUpdatedImageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/AjaxUpdatedImageTest.java
index f235ff6..68d8a77 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/AjaxUpdatedImageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/AjaxUpdatedImageTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.markup.html.image;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.util.tester.TagTester;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/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 90e0c0d..8cc8c26 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
@@ -18,7 +18,7 @@ package org.apache.wicket.markup.html.image;
import java.util.Locale;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InlineImageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InlineImageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InlineImageTest.java
index 58a8439..f1c5068 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InlineImageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InlineImageTest.java
@@ -17,7 +17,7 @@
package org.apache.wicket.markup.html.image;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InvalidImageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InvalidImageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InvalidImageTest.java
index 6e52511..ccd9d33 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InvalidImageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InvalidImageTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.image;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/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 d3cb297..9e9ddf8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/NonCachingImageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/NonCachingImageTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.markup.html.image;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.util.tester.TagTester;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ResponsiveImageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ResponsiveImageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ResponsiveImageTest.java
index a7b0891..05c3030 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ResponsiveImageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ResponsiveImageTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.wicket.markup.html.image;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.TagTester;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
index ea032ff..f9a0bac 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
@@ -22,10 +22,10 @@ import java.util.regex.Pattern;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
-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.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/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 0498cfa..c0e8d33 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
@@ -21,7 +21,6 @@ import java.io.IOException;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.authorization.Action;
import org.apache.wicket.authorization.IAuthorizationStrategy;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
@@ -35,6 +34,7 @@ import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.DiffUtil;
import org.apache.wicket.util.tester.FormTester;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.tester.WicketTester;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainerTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainerTest.java
index df50cee..6c614fa 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainerTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.internal;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureTest.java
index 6c9e6de..cb18393 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureTest.java
@@ -21,9 +21,9 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.parser.filter.InlineEnclosureHandler;
import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/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 7d48517..3cf0b06 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
@@ -19,10 +19,10 @@ package org.apache.wicket.markup.html.internal;
import java.util.regex.Pattern;
import org.apache.wicket.Component;
-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.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/HtmlHeaderItemsContainerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/HtmlHeaderItemsContainerTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/HtmlHeaderItemsContainerTest.java
index 03f2da6..6239b58 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/HtmlHeaderItemsContainerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/HtmlHeaderItemsContainerTest.java
@@ -18,8 +18,8 @@ package org.apache.wicket.markup.html.internal.headeritems;
import static org.hamcrest.number.OrderingComparison.lessThan;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.MarkupException;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java
index cda714f..d4a598d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java
@@ -19,10 +19,10 @@ package org.apache.wicket.markup.html.link;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.wicket.MockPageWithLink;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.tester.TagTester;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkTest.java
index 92dc307..8f20ce2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.link;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksTest.java
index c664e84..2c764b6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.link;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
index f0412ef..c49bf32 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
@@ -17,8 +17,8 @@
package org.apache.wicket.markup.html.link;
import org.apache.wicket.MockPageWithLink;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/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 27c0adb..4396371 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
@@ -18,7 +18,7 @@ package org.apache.wicket.markup.html.link;
import java.util.Locale;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/link/DownloadLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/DownloadLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/DownloadLinkTest.java
index b711f1b..cf48b34 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/DownloadLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/DownloadLinkTest.java
@@ -20,12 +20,12 @@ import java.io.File;
import java.io.IOException;
import org.apache.wicket.Component;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IComponentAssignedModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.IWrapModel;
import org.apache.wicket.protocol.http.mock.MockServletContext;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkTest.java
index 23c14f3..2093da6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.link;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefTest.java
index be8f475..1be89c7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.link;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
index aef05be..0c89a9d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
@@ -19,11 +19,11 @@ package org.apache.wicket.markup.html.link;
import java.util.Arrays;
import java.util.Collection;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.core.request.mapper.PageInstanceMapper;
import org.apache.wicket.protocol.http.PageExpiredException;
import org.apache.wicket.request.mapper.parameter.INamedParameters;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/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 e45e0a4..cae4cb7 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
@@ -17,9 +17,8 @@
package org.apache.wicket.markup.html.link.submitLink;
import org.junit.Assert;
-
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.util.tester.FormTester;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/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 dce3d81..afcc983 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
@@ -17,9 +17,8 @@
package org.apache.wicket.markup.html.link.submitLink;
import org.junit.Assert;
-
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.util.tester.FormTester;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationTest.java
index 9e65199..b02ead5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationTest.java
@@ -17,8 +17,8 @@
package org.apache.wicket.markup.html.list;
import org.apache.wicket.Page;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java
index 8ebf50f..65ea789 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java
@@ -19,10 +19,10 @@ package org.apache.wicket.markup.html.list;
import java.util.ArrayList;
import java.util.List;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.util.ListModel;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java
index 6f4ae16..dd2799f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java
@@ -19,9 +19,9 @@ package org.apache.wicket.markup.html.list;
import java.util.List;
import java.util.Locale;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.util.tester.DiffUtil;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java
index 341e772..7df1da9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java
@@ -18,9 +18,9 @@ package org.apache.wicket.markup.html.list;
import java.util.Locale;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.util.tester.DiffUtil;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java
index a32f1a4..b4831a5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java
@@ -18,9 +18,9 @@ package org.apache.wicket.markup.html.list;
import java.util.Locale;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.util.tester.DiffUtil;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java
index 89babc9..14d0bd2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java
@@ -18,12 +18,12 @@ package org.apache.wicket.markup.html.list;
import java.util.Locale;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.protocol.http.documentvalidation.HtmlDocumentValidator;
import org.apache.wicket.protocol.http.documentvalidation.Tag;
import org.apache.wicket.protocol.http.documentvalidation.TextContent;
import org.apache.wicket.util.tester.DiffUtil;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java
index 612ed94..cc01a4a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.markup.html.list;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/list/TableTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/TableTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/TableTest.java
index 474b48b..7de4d12 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/TableTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/TableTest.java
@@ -19,8 +19,8 @@ package org.apache.wicket.markup.html.list;
import java.util.ArrayList;
import java.util.List;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.model.util.ListModel;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/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 0ba7676..0d76351 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
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.markup.html.markupId;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/media/MediaTagsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/media/MediaTagsTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/media/MediaTagsTest.java
index 6698d79..81b12e5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/media/MediaTagsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/media/MediaTagsTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.wicket.markup.html.media;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.TagTester;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
public class MediaTagsTest extends WicketTestCase
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/AbstractPagingNavigationTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/AbstractPagingNavigationTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/AbstractPagingNavigationTest.java
index 65bc98d..02966e5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/AbstractPagingNavigationTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/AbstractPagingNavigationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.navigation.paging;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/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 b7e5ede..bb7e947 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
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.page;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FeedbackPanelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FeedbackPanelTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FeedbackPanelTest.java
index 01cb2cf..0906a79 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FeedbackPanelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FeedbackPanelTest.java
@@ -18,12 +18,12 @@ package org.apache.wicket.markup.html.panel;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTest.java
index 845557b..85d7924 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.markup.html.panel;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.MarkupNotFoundException;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
index 50a4301..0ede2a9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
@@ -18,10 +18,10 @@ package org.apache.wicket.markup.html.panel;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.MarkupException;
import org.apache.wicket.markup.MarkupNotFoundException;
import org.apache.wicket.markup.html.markupId.MyPanel;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotClosedTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotClosedTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotClosedTest.java
index e1ee9e4..bca3e8e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotClosedTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotClosedTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.tags;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/OutputTransformerContainerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/OutputTransformerContainerTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/OutputTransformerContainerTest.java
index 599bc83..8c753c2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/OutputTransformerContainerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/OutputTransformerContainerTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.outputTransformer;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/parser/MergedMarkupTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/MergedMarkupTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/MergedMarkupTest.java
index b5794da..7403c2c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/MergedMarkupTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/MergedMarkupTest.java
@@ -17,11 +17,11 @@
package org.apache.wicket.markup.parser;
import org.apache.wicket.Page;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.Markup;
import org.apache.wicket.markup.MarkupParser;
import org.apache.wicket.markup.MarkupResourceStream;
import org.apache.wicket.markup.MarkupStream;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/parser/RelativePathPrefixHandlerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/RelativePathPrefixHandlerTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/RelativePathPrefixHandlerTest.java
index bfb8e47..db1a21a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/RelativePathPrefixHandlerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/RelativePathPrefixHandlerTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.parser;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/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 36cc92e..fc57358 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
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.parser;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/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 1718f8e..1eec781 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
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.parser.filter;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java
index 3824a4d..1d63c8f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java
@@ -17,8 +17,8 @@
package org.apache.wicket.markup.parser.filter;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.MarkupException;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHandlerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHandlerTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHandlerTest.java
index 78b09f2..2bd2ee6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHandlerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHandlerTest.java
@@ -17,11 +17,11 @@
package org.apache.wicket.markup.parser.filter;
import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandlerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandlerTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandlerTest.java
index 5388b8a..fb74ded 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandlerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandlerTest.java
@@ -17,12 +17,12 @@
package org.apache.wicket.markup.parser.filter;
import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.MarkupException;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
public class HtmlHeaderSectionHandlerTest extends WicketTestCase
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java
index 233d272..c71db14 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java
@@ -20,7 +20,6 @@ import static org.hamcrest.CoreMatchers.instanceOf;
import java.text.ParseException;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupElement;
import org.apache.wicket.markup.WicketTag;
@@ -28,6 +27,7 @@ import org.apache.wicket.markup.parser.AbstractMarkupFilter;
import org.apache.wicket.markup.parser.IMarkupFilter;
import org.apache.wicket.markup.parser.XmlTag;
import org.apache.wicket.markup.resolver.HtmlHeaderResolver;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.hamcrest.CoreMatchers;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/StyleAndScriptIdentifierTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/StyleAndScriptIdentifierTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/StyleAndScriptIdentifierTest.java
index ef32104..df814b3 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/StyleAndScriptIdentifierTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/StyleAndScriptIdentifierTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.wicket.markup.parser.filter;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.Markup;
import org.apache.wicket.markup.MarkupElement;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategyTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategyTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategyTest.java
index 447884d..516ce6e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategyTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategyTest.java
@@ -17,7 +17,7 @@
package org.apache.wicket.markup.renderStrategy;
import org.apache.wicket.Page;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.tester.WicketTester;
import org.junit.Test;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/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 7208591..0754d44 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
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.resolver;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketContainerResolverTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketContainerResolverTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketContainerResolverTest.java
index 4b3789c..028188f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketContainerResolverTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketContainerResolverTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.resolver;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketMessageResolverTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketMessageResolverTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketMessageResolverTest.java
index 8498bef..bdb986e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketMessageResolverTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketMessageResolverTest.java
@@ -17,8 +17,8 @@
package org.apache.wicket.markup.resolver;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.util.string.StringValueConversionException;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/WicketMessageResolverTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/WicketMessageResolverTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/WicketMessageResolverTest.java
index a511c57..448bbcc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/WicketMessageResolverTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/WicketMessageResolverTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.resolver.border;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/resolver/inparent/AutoLinkResolveInParentsMarkupTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/inparent/AutoLinkResolveInParentsMarkupTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/inparent/AutoLinkResolveInParentsMarkupTest.java
index 19ba697..120e2b7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/inparent/AutoLinkResolveInParentsMarkupTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/inparent/AutoLinkResolveInParentsMarkupTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.wicket.markup.resolver.inparent;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.resolver.inparent.base.BasePage;
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/MyTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/MyTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/MyTest.java
index 0d37702..ba67996 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/MyTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/MyTest.java
@@ -17,7 +17,7 @@
package org.apache.wicket.markup.resolver.issue3559;
import org.apache.wicket.Page;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue5569/Issue5569Test.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue5569/Issue5569Test.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue5569/Issue5569Test.java
index f34b216..bacb17f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue5569/Issue5569Test.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue5569/Issue5569Test.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.resolver.issue5569;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
public class Issue5569Test extends WicketTestCase
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markup/transformer/AbstractTransformerBehaviorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/transformer/AbstractTransformerBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/transformer/AbstractTransformerBehaviorTest.java
index 6b00f78..e8e6b10 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/transformer/AbstractTransformerBehaviorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/transformer/AbstractTransformerBehaviorTest.java
@@ -18,7 +18,6 @@ package org.apache.wicket.markup.transformer;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
@@ -26,6 +25,7 @@ import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/markupFragments/MarkupFragmentTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markupFragments/MarkupFragmentTest.java b/wicket-core/src/test/java/org/apache/wicket/markupFragments/MarkupFragmentTest.java
index fa91473..26123f5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markupFragments/MarkupFragmentTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markupFragments/MarkupFragmentTest.java
@@ -19,12 +19,12 @@ package org.apache.wicket.markupFragments;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.IMarkupFragment;
import org.apache.wicket.markup.html.border.Border;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.InlinePanelPage_1;
import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
@@ -42,13 +42,13 @@ public class MarkupFragmentTest extends WicketTestCase
public void page() throws Exception
{
IMarkupFragment markup = new MyPage().getAssociatedMarkup();
- compareMarkupWithFile(markup, "MyPage_ExpectedResult.html");
+ compareMarkupWithFile(markup, "MyPage_ExpectedResult.html", MyPage.class);
markup = new MyPage().getMarkup();
- compareMarkupWithFile(markup, "MyPage_ExpectedResult.html");
+ compareMarkupWithFile(markup, "MyPage_ExpectedResult.html", MyPage.class);
markup = new MyPage().getMarkup(null);
- compareMarkupWithFile(markup, "MyPage_ExpectedResult.html");
+ compareMarkupWithFile(markup, "MyPage_ExpectedResult.html", MyPage.class);
}
/**
@@ -64,7 +64,7 @@ public class MarkupFragmentTest extends WicketTestCase
// Get the associated markup file
IMarkupFragment markup = panel.getAssociatedMarkup();
- compareMarkupWithFile(markup, "MyPanel_ExpectedResult.html");
+ compareMarkupWithFile(markup, "MyPanel_ExpectedResult.html", MyPage.class);
// The Page is missing the tag to "call" the panel
assertNull(panel.getMarkup());
@@ -99,7 +99,7 @@ public class MarkupFragmentTest extends WicketTestCase
// Get the associated markup file
IMarkupFragment markup = panel.getAssociatedMarkup();
- compareMarkupWithFile(markup, "MyPanelWithAutoComponent_ExpectedResult.html");
+ compareMarkupWithFile(markup, "MyPanelWithAutoComponent_ExpectedResult.html", MyPage.class);
// The Page is missing the tag to "call" the panel
assertNull(panel.getMarkup());
@@ -166,7 +166,7 @@ public class MarkupFragmentTest extends WicketTestCase
// Get the associated markup file
IMarkupFragment markup = border.getAssociatedMarkup();
- compareMarkupWithFile(markup, "MyBorder_ExpectedResult.html");
+ compareMarkupWithFile(markup, "MyBorder_ExpectedResult.html", MyPage.class);
// getMarkup() returns the "calling" tags
markup = border.getMarkup();
@@ -205,7 +205,7 @@ public class MarkupFragmentTest extends WicketTestCase
// Get the associated markup file
IMarkupFragment markup = border.getAssociatedMarkup();
- compareMarkupWithFile(markup, "MyBorder2_ExpectedResult.html");
+ compareMarkupWithFile(markup, "MyBorder2_ExpectedResult.html", MyPage.class);
// getMarkup() returns the "calling" tags
markup = border.getMarkup();
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTest.java
index 31184d5..19c2b84 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.model;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/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 d1efd39..f1ea647 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
@@ -19,9 +19,9 @@ package org.apache.wicket.model;
import java.io.Serializable;
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.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/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 fe625fe..3d407ab 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/InheritedModelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/InheritedModelTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.wicket.model;
-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.tester.WicketTestCase;
import org.apache.wicket.util.value.ValueMap;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/model/LoadableDetachableModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/LoadableDetachableModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/LoadableDetachableModelTest.java
index 375b60a..0e96509 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/LoadableDetachableModelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/LoadableDetachableModelTest.java
@@ -25,7 +25,7 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/model/ModelToStringTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/ModelToStringTest.java b/wicket-core/src/test/java/org/apache/wicket/model/ModelToStringTest.java
index 0991f65..3cd6a14 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/ModelToStringTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/ModelToStringTest.java
@@ -18,7 +18,7 @@ package org.apache.wicket.model;
import java.util.Properties;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/model/PropertyModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/PropertyModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/PropertyModelTest.java
index 2d3e039..b7b8109 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/PropertyModelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/PropertyModelTest.java
@@ -19,7 +19,7 @@ package org.apache.wicket.model;
import static org.hamcrest.CoreMatchers.instanceOf;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Ignore;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/model/ResourceModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/ResourceModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/ResourceModelTest.java
index 42f4ed5..b076e6d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/ResourceModelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/ResourceModelTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.wicket.model;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
index e71f8ec..de2c365 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
@@ -22,9 +22,9 @@ import java.util.Calendar;
import java.util.Locale;
import org.apache.wicket.Session;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Before;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/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 9350489..828ba02 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
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.model;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.util.tester.FormTester;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/noheadnobody/NoHeadNoBodyTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/noheadnobody/NoHeadNoBodyTest.java b/wicket-core/src/test/java/org/apache/wicket/noheadnobody/NoHeadNoBodyTest.java
index 214d932..bd601e0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/noheadnobody/NoHeadNoBodyTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/noheadnobody/NoHeadNoBodyTest.java
@@ -20,7 +20,7 @@ import static org.hamcrest.Matchers.is;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/page/expirationrecovery/PageExpirationRecoveryTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/page/expirationrecovery/PageExpirationRecoveryTest.java b/wicket-core/src/test/java/org/apache/wicket/page/expirationrecovery/PageExpirationRecoveryTest.java
index da14ebd..fb8c164 100644
--- a/wicket-core/src/test/java/org/apache/wicket/page/expirationrecovery/PageExpirationRecoveryTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/page/expirationrecovery/PageExpirationRecoveryTest.java
@@ -19,11 +19,11 @@ package org.apache.wicket.page.expirationrecovery;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.protocol.http.PageExpiredException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.settings.PageSettings;
import org.apache.wicket.util.tester.FormTester;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Before;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/HttpSessionDataStoreTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/HttpSessionDataStoreTest.java b/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/HttpSessionDataStoreTest.java
index 81088fd..10b5268 100644
--- a/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/HttpSessionDataStoreTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/HttpSessionDataStoreTest.java
@@ -18,7 +18,7 @@ package org.apache.wicket.pageStore.memory;
import static org.junit.Assert.assertArrayEquals;
-import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/properties/PropertiesTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/properties/PropertiesTest.java b/wicket-core/src/test/java/org/apache/wicket/properties/PropertiesTest.java
index f0d13c9..a5fbc64 100644
--- a/wicket-core/src/test/java/org/apache/wicket/properties/PropertiesTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/properties/PropertiesTest.java
@@ -18,8 +18,8 @@ package org.apache.wicket.properties;
import java.util.Locale;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/protocol/http/AbstractRequestLoggerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/AbstractRequestLoggerTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/AbstractRequestLoggerTest.java
index bee0c3f..a5bdc22 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/AbstractRequestLoggerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/AbstractRequestLoggerTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.protocol.http;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.protocol.http.IRequestLogger.RequestData;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/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 4a2a942..bf71075 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
@@ -18,9 +18,9 @@ package org.apache.wicket.protocol.http;
import java.util.ArrayList;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.mock.MockWebResponse;
import org.apache.wicket.request.http.WebResponse;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;