Repository: wicket Updated Branches: refs/heads/master b31fffd80 -> d608aede1
http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_2/Test.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_2/Test.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_2/Test.java index e04c2d8..3124a4c 100644 --- a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_2/Test.java +++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_2/Test.java @@ -16,9 +16,9 @@ */ package org.apache.wicket.util.tester.apps_2; -import org.apache.wicket.WicketTestCase; import org.apache.wicket.authorization.IAuthorizationStrategy; import org.apache.wicket.authorization.strategies.page.SimplePageAuthorizationStrategy; +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/util/tester/apps_3/FormTesterTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_3/FormTesterTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_3/FormTesterTest.java index 57b03ec..d5b9741 100644 --- a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_3/FormTesterTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_3/FormTesterTest.java @@ -20,8 +20,8 @@ import java.util.Arrays; import java.util.List; import org.apache.wicket.WicketRuntimeException; -import org.apache.wicket.WicketTestCase; import org.apache.wicket.util.tester.FormTester; +import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.util.tester.apps_1.Book; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_4/FormTesterTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_4/FormTesterTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_4/FormTesterTest.java index d57aa0e..61da3f7 100644 --- a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_4/FormTesterTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_4/FormTesterTest.java @@ -18,9 +18,9 @@ package org.apache.wicket.util.tester.apps_4; import java.util.List; -import org.apache.wicket.WicketTestCase; import org.apache.wicket.feedback.FeedbackMessage; 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/util/tester/apps_5/AjaxLinkClickTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java index dc36f5c..9e79501 100644 --- a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java @@ -17,10 +17,10 @@ package org.apache.wicket.util.tester.apps_5; import org.apache.wicket.Page; -import org.apache.wicket.WicketTestCase; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxFallbackLink; import org.apache.wicket.ajax.markup.html.AjaxLink; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java index 588c0db..b5c2bcd 100644 --- a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java @@ -16,10 +16,10 @@ */ package org.apache.wicket.util.tester.apps_5; -import org.apache.wicket.WicketTestCase; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink; import org.apache.wicket.markup.html.form.Form; +import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.util.tester.apps_5.MockPageWithFormAndLink.MockPojo; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_7/TestHomePage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_7/TestHomePage.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_7/TestHomePage.java index 649a7e8..13fd28d 100644 --- a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_7/TestHomePage.java +++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_7/TestHomePage.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.util.tester.apps_7; -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/validation/ValidatorBehaviorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/validation/ValidatorBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/validation/ValidatorBehaviorTest.java index db69a10..ea8093b 100644 --- a/wicket-core/src/test/java/org/apache/wicket/validation/ValidatorBehaviorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/validation/ValidatorBehaviorTest.java @@ -18,7 +18,6 @@ package org.apache.wicket.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; @@ -30,6 +29,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-datetime/src/test/java/org/apache/wicket/WicketTestCase.java ---------------------------------------------------------------------- diff --git a/wicket-datetime/src/test/java/org/apache/wicket/WicketTestCase.java b/wicket-datetime/src/test/java/org/apache/wicket/WicketTestCase.java deleted file mode 100644 index f776c58..0000000 --- a/wicket-datetime/src/test/java/org/apache/wicket/WicketTestCase.java +++ /dev/null @@ -1,146 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.wicket; - -import junit.framework.TestCase; -import org.apache.wicket.behavior.AbstractAjaxBehavior; -import org.apache.wicket.request.mapper.parameter.PageParameters; -import org.apache.wicket.util.tester.WicketTester; - -/** - * Base class for tests which require comparing wicket response with a file. - * <p> - * To create/replace the expected result file with the new content, define the system property like - * -Dwicket.replace.expected.results=true - * - */ -public abstract class WicketTestCase extends TestCase -{ - /** */ - public WicketTester tester; - - @Override - protected void setUp() throws Exception - { - tester = new WicketTester(); - } - - @Override - protected void tearDown() throws Exception - { - tester.destroy(); - } - - - /** - * Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected - * output file. - * - * @param <T> - * - * @param pageClass - * @param filename - * @throws Exception - */ - protected <T extends Page> void executeTest(final Class<T> pageClass, final String filename) - throws Exception - { - System.out.println("=== " + pageClass.getName() + " ==="); - - tester.startPage(pageClass); - tester.assertRenderedPage(pageClass); - tester.assertResultPage(getClass(), filename); - } - - /** - * Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected - * output file. - * - * @param <T> - * - * @param pageClass - * @param parameters - * @param filename - * @throws Exception - */ - protected <T extends Page> void executeTest(final Class<T> pageClass, - PageParameters parameters, final String filename) throws Exception - { - System.out.println("=== " + pageClass.getName() + " ==="); - - tester.startPage(pageClass, parameters); - tester.assertRenderedPage(pageClass); - tester.assertResultPage(getClass(), filename); - } - - /** - * - * @param clazz - * @param component - * @param filename - * @throws Exception - */ - protected void executedListener(final Class<?> clazz, final Component component, - final String filename) throws Exception - { - assertNotNull(component); - - System.out.println("=== " + clazz.getName() + " : " + component.getPageRelativePath() + - " ==="); - - tester.executeListener(component); - tester.assertResultPage(clazz, filename); - } - - /** - * - * @param clazz - * @param behavior - * @param filename - * @throws Exception - */ - protected void executedBehavior(final Class<?> clazz, final AbstractAjaxBehavior behavior, - final String filename) throws Exception - { - assertNotNull(behavior); - - System.out.println("=== " + clazz.getName() + " : " + behavior.toString() + " ==="); - - tester.executeBehavior(behavior); - tester.assertResultPage(clazz, filename); - } - - /** - * Returns the current Maven build directory taken from the <tt>basedir</tt> system property, or - * null if not set - * - * @return path with a trailing slash - */ - public static String getBasedir() - { - String basedir = System.getProperty("basedir"); - if (basedir != null) - { - basedir = basedir + "/"; - } - else - { - basedir = ""; - } - return basedir; - } -} http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatePickerTest.java ---------------------------------------------------------------------- diff --git a/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatePickerTest.java b/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatePickerTest.java index f2a45c7..478d7d4 100644 --- a/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatePickerTest.java +++ b/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatePickerTest.java @@ -25,17 +25,18 @@ import java.util.Locale; import java.util.TimeZone; import org.apache.wicket.Page; -import org.apache.wicket.WicketTestCase; import org.apache.wicket.datetime.StyleDateConverter; import org.apache.wicket.extensions.yui.calendar.DateTimeField.AM_PM; import org.apache.wicket.protocol.http.request.WebClientInfo; import org.apache.wicket.util.tester.DiffUtil; import org.apache.wicket.util.tester.FormTester; +import org.apache.wicket.util.tester.WicketTestCase; import org.joda.time.DateTimeFieldType; import org.joda.time.DateTimeZone; import org.joda.time.MutableDateTime; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; +import org.junit.After; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,15 +52,16 @@ public class DatePickerTest extends WicketTestCase private TimeZone defaultTz = TimeZone.getDefault(); /** - * @see org.apache.wicket.WicketTestCase#tearDown() + * @see org.apache.wicket.util.tester.WicketTestCase#tearDown() */ @Override - protected void tearDown() throws Exception + @After + public void commonAfter() { TimeZone.setDefault(defaultTz); DateTimeZone.setDefault(DateTimeZone.forTimeZone(defaultTz)); - super.tearDown(); + super.commonAfter(); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DateTimeFieldTest.java ---------------------------------------------------------------------- diff --git a/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DateTimeFieldTest.java b/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DateTimeFieldTest.java index ea9333e..c5f636b 100644 --- a/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DateTimeFieldTest.java +++ b/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DateTimeFieldTest.java @@ -18,8 +18,8 @@ package org.apache.wicket.extensions.yui.calendar; import java.util.TimeZone; -import org.apache.wicket.WicketTestCase; import org.apache.wicket.model.Model; +import org.apache.wicket.util.tester.WicketTestCase; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.Assert; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-examples/src/test/java/org/apache/wicket/examples/WicketTestCase.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/WicketTestCase.java b/wicket-examples/src/test/java/org/apache/wicket/examples/WicketTestCase.java deleted file mode 100644 index 3c1d626..0000000 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/WicketTestCase.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.wicket.examples; - -import org.apache.wicket.util.tester.WicketTester; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; - -/** - * - */ -public abstract class WicketTestCase extends Assert -{ - /***/ - public WicketTester tester; - - /** - * - */ - @Before - public void before() - { - tester = new WicketTester(); - } - - /** - * - */ - @After - public void after() - { - tester.destroy(); - } - - -} http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/prototype/AjaxTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/prototype/AjaxTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/prototype/AjaxTest.java index c5850a9..fb50195 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/prototype/AjaxTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/prototype/AjaxTest.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.examples.ajax.prototype; -import org.apache.wicket.examples.WicketTestCase; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-examples/src/test/java/org/apache/wicket/examples/compref/ComprefTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/compref/ComprefTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/compref/ComprefTest.java index f6a5044..c80fee9 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/compref/ComprefTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/compref/ComprefTest.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.examples.compref; -import org.apache.wicket.examples.WicketTestCase; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-examples/src/test/java/org/apache/wicket/examples/encodings/EncodingTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/encodings/EncodingTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/encodings/EncodingTest.java index a365c92..f97a887 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/encodings/EncodingTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/encodings/EncodingTest.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.examples.encodings; -import org.apache.wicket.examples.WicketTestCase; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java index d5e1c64..253bfea 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.examples.forminput; -import org.apache.wicket.examples.WicketTestCase; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java index f5c9db6..042f4b5 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java @@ -18,9 +18,9 @@ package org.apache.wicket.examples.guestbook; import java.util.ArrayList; -import org.apache.wicket.examples.WicketTestCase; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.util.tester.FormTester; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/WordGeneratorTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/WordGeneratorTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/WordGeneratorTest.java index e838dd4..cf64669 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/WordGeneratorTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/WordGeneratorTest.java @@ -19,7 +19,7 @@ package org.apache.wicket.examples.hangman; import java.util.HashSet; import java.util.Set; -import org.apache.wicket.examples.WicketTestCase; +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-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java index 39c3d19..2def352 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.examples.helloworld; -import org.apache.wicket.examples.WicketTestCase; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-examples/src/test/java/org/apache/wicket/examples/linkomatic/LinkomaticTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/linkomatic/LinkomaticTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/linkomatic/LinkomaticTest.java index 4fd8687..adaf5ff 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/linkomatic/LinkomaticTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/linkomatic/LinkomaticTest.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.examples.linkomatic; -import org.apache.wicket.examples.WicketTestCase; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-extensions/src/test/java/org/apache/wicket/WicketTestCase.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/WicketTestCase.java b/wicket-extensions/src/test/java/org/apache/wicket/WicketTestCase.java deleted file mode 100644 index 93c7ec2..0000000 --- a/wicket-extensions/src/test/java/org/apache/wicket/WicketTestCase.java +++ /dev/null @@ -1,166 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.wicket; - -import org.apache.wicket.behavior.AbstractAjaxBehavior; -import org.apache.wicket.request.mapper.parameter.PageParameters; -import org.apache.wicket.util.tester.WicketTester; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; - -/** - * Base class for tests which require comparing wicket response with a file. - * <p> - * To create/replace the expected result file with the new content, define the system property like - * -Dwicket.replace.expected.results=true - * - */ -public abstract class WicketTestCase extends Assert -{ - /** */ - public WicketTester tester; - - /** - * prevent wicket from launching a desktop window: once someone uses AWT-specific classes the - * java runtime environment will automatically allocate a desktop window for interaction unless - * you tell java to run in 'headless-mode'. since wicket is supposed to run on servers, not - * desktops, this will be the default. - * - * @see "http://java.sun.com/developer/technicalArticles/J2SE/Desktop/headless"; - */ - static - { - System.setProperty("java.awt.headless", "true"); - } - - /** - * - */ - @Before - public void before() - { - tester = new WicketTester(); - } - - /** - * - */ - @After - public void after() - { - tester.destroy(); - } - - /** - * Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected - * output file. - * - * @param <T> - * - * @param pageClass - * @param filename - * @throws Exception - */ - protected <T extends Page> void executeTest(final Class<T> pageClass, final String filename) - throws Exception - { - System.out.println("=== " + pageClass.getName() + " ==="); - - tester.startPage(pageClass); - tester.assertRenderedPage(pageClass); - tester.assertResultPage(getClass(), filename); - } - - /** - * Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected - * output file. - * - * @param <T> - * - * @param pageClass - * @param parameters - * @param filename - * @throws Exception - */ - protected <T extends Page> void executeTest(final Class<T> pageClass, - final PageParameters parameters, final String filename) throws Exception - { - System.out.println("=== " + pageClass.getName() + " ==="); - - tester.startPage(pageClass, parameters); - tester.assertRenderedPage(pageClass); - tester.assertResultPage(getClass(), filename); - } - - /** - * - * @param clazz - * @param component - * @param filename - * @throws Exception - */ - protected void executedListener(final Class<?> clazz, final Component component, - final String filename) throws Exception - { - assertNotNull(component); - - System.out.println("=== " + clazz.getName() + " : " + component.getPageRelativePath() + - " ==="); - - tester.executeListener(component); - tester.assertResultPage(clazz, filename); - } - - /** - * - * @param clazz - * @param behavior - * @param filename - * @throws Exception - */ - protected void executedBehavior(final Class<?> clazz, final AbstractAjaxBehavior behavior, - final String filename) throws Exception - { - assertNotNull(behavior); - - System.out.println("=== " + clazz.getName() + " : " + behavior.toString() + " ==="); - - tester.executeBehavior(behavior); - tester.assertResultPage(clazz, filename); - } - - /** - * Returns the current Maven build directory taken from the <tt>basedir</tt> system property, or - * null if not set - * - * @return path with a trailing slash - */ - public static String getBasedir() - { - String basedir = System.getProperty("basedir"); - if (basedir != null) - { - basedir = basedir + "/"; - } - else - { - basedir = ""; - } - return basedir; - } -} http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java index 5a95ce1..f918469 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java @@ -21,7 +21,6 @@ import static org.hamcrest.CoreMatchers.instanceOf; import java.util.Arrays; import org.apache.wicket.Page; -import org.apache.wicket.WicketTestCase; import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.behavior.AbstractAjaxBehavior; import org.apache.wicket.markup.html.form.FormComponent; @@ -30,6 +29,7 @@ import org.apache.wicket.model.IObjectClassAwareModel; import org.apache.wicket.model.Model; import org.apache.wicket.request.IWritableRequestParameters; import org.apache.wicket.util.string.StringValue; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTest.java index 93dedef..640073c 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTest.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.extensions.ajax.markup.html.autocomplete; -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-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java index 8aeed10..5ee746a 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java @@ -17,10 +17,10 @@ package org.apache.wicket.extensions.markup.html; import org.apache.wicket.Component; -import org.apache.wicket.WicketTestCase; import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel; import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanelTester; import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/DateTextFieldTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/DateTextFieldTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/DateTextFieldTest.java index fa18642..2a1b8f7 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/DateTextFieldTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/DateTextFieldTest.java @@ -19,7 +19,6 @@ package org.apache.wicket.extensions.markup.html.form; import java.util.Date; 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; @@ -28,6 +27,7 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTest.java index 48d86a7..526111e 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTest.java @@ -22,11 +22,11 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; -import org.apache.wicket.WicketTestCase; import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.util.ListModel; 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-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTest.java index ff4cff0..d6a80230 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTest.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.extensions.markup.html.form.select; -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-extensions/src/test/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResourceTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResourceTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResourceTest.java index 27112fb..1e28a69 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResourceTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResourceTest.java @@ -23,8 +23,8 @@ import java.io.InputStream; import javax.imageio.ImageIO; -import org.apache.wicket.WicketTestCase; import org.apache.wicket.markup.html.image.resource.DefaultButtonImageResource; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java index 4ce110b..9b365f6 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java @@ -23,7 +23,6 @@ import java.util.Iterator; import java.util.List; 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.repeater.data.IDataProvider; @@ -33,6 +32,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.string.StringValue; +import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.util.tester.WicketTester; import org.junit.Assert; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelTest.java index 9407c90..b6b6070 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelTest.java @@ -19,12 +19,12 @@ package org.apache.wicket.extensions.markup.html.tabs; import java.util.ArrayList; import java.util.List; -import org.apache.wicket.WicketTestCase; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.Model; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelVisibilityTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelVisibilityTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelVisibilityTest.java index dca2a81..67bb4a4 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelVisibilityTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelVisibilityTest.java @@ -18,8 +18,8 @@ package org.apache.wicket.extensions.markup.html.tabs; import java.util.List; -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-extensions/src/test/java/org/apache/wicket/extensions/markup/html/upload/UploadFormWithProgressBarTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/upload/UploadFormWithProgressBarTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/upload/UploadFormWithProgressBarTest.java index ab24d3f..dcd9927 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/upload/UploadFormWithProgressBarTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/upload/UploadFormWithProgressBarTest.java @@ -17,7 +17,6 @@ package org.apache.wicket.extensions.markup.html.upload; import org.apache.wicket.MarkupContainer; -import org.apache.wicket.WicketTestCase; import org.apache.wicket.extensions.ajax.markup.html.form.upload.UploadProgressBar; import org.apache.wicket.markup.IMarkupResourceStreamProvider; import org.apache.wicket.markup.html.WebPage; @@ -26,6 +25,7 @@ import org.apache.wicket.markup.html.form.upload.FileUploadField; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c390a566/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/WizardModelTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/WizardModelTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/WizardModelTest.java index 720d614..661078a 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/WizardModelTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/WizardModelTest.java @@ -18,7 +18,7 @@ package org.apache.wicket.extensions.wizard; import java.util.Iterator; -import org.apache.wicket.WicketTestCase; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /**
