Author: mgrigorov
Date: Fri Nov 11 09:02:15 2011
New Revision: 1200780
URL: http://svn.apache.org/viewvc?rev=1200780&view=rev
Log:
WICKET-3979 Upgrade Wicket's tests to JUnit4
Modified:
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/WicketTestCase.java
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResourceTest.java
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tree/MoveChildToParentNodeMarkedForRecreationTest.java
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/upload/UploadFormWithProgressBarTest.java
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/WizardModelTest.java
Modified:
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/WicketTestCase.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/WicketTestCase.java?rev=1200780&r1=1200779&r2=1200780&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/WicketTestCase.java
(original)
+++
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/WicketTestCase.java
Fri Nov 11 09:02:15 2011
@@ -16,11 +16,12 @@
*/
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;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
/**
* Base class for tests which require comparing wicket response with a file.
@@ -29,38 +30,42 @@ import org.apache.wicket.util.tester.Wic
* -Dwicket.replace.expected.results=true
*
*/
-public abstract class WicketTestCase extends TestCase
+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.
+ * 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
+ * @see
"http://java.sun.com/developer/technicalArticles/J2SE/Desktop/headless";
*/
static
{
System.setProperty("java.awt.headless", "true");
}
-
- @Override
- protected void setUp() throws Exception
+
+ /**
+ *
+ */
+ @Before
+ public void before()
{
tester = new WicketTester();
}
- @Override
- protected void tearDown() throws Exception
+ /**
+ *
+ */
+ @After
+ public void after()
{
tester.destroy();
}
-
/**
* Use <code>-Dwicket.replace.expected.results=true</code> to
automatically replace the expected
* output file.
Modified:
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java?rev=1200780&r1=1200779&r2=1200780&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
(original)
+++
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
Fri Nov 11 09:02:15 2011
@@ -21,6 +21,8 @@ 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;
+import org.junit.Before;
+import org.junit.Test;
/**
* Tests for {@link AjaxEditableLabel}
@@ -30,10 +32,12 @@ import org.apache.wicket.markup.html.for
public class AjaxEditableTest extends WicketTestCase
{
- @Override
- protected void setUp() throws Exception
+ /**
+ *
+ */
+ @Before
+ public void setUp()
{
- super.setUp();
tester.getApplication().getMarkupSettings().setStripWicketTags(false);
tester.startPage(AjaxEditableLabelPage.class);
tester.assertRenderedPage(AjaxEditableLabelPage.class);
@@ -44,6 +48,7 @@ public class AjaxEditableTest extends Wi
* Tests default AjaxEditableLabel behavior
*/
@SuppressWarnings({ "unchecked" })
+ @Test
public void testAjaxEditableLabel()
{
Page page = tester.getLastRenderedPage();
@@ -72,6 +77,7 @@ public class AjaxEditableTest extends Wi
* <code>LabelBehavior</code>
*/
@SuppressWarnings({ "unchecked" })
+ @Test
public void testDisabledAjaxEditableLabel()
{
Page page = tester.getLastRenderedPage();
@@ -103,6 +109,7 @@ public class AjaxEditableTest extends Wi
* A test that changes the value of the {@link AjaxEditableLabel}
*/
@SuppressWarnings({ "unchecked" })
+ @Test
public void testUpdateValue()
{
Page page = tester.getLastRenderedPage();
Modified:
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java?rev=1200780&r1=1200779&r2=1200780&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java
(original)
+++
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java
Fri Nov 11 09:02:15 2011
@@ -17,14 +17,11 @@
package org.apache.wicket.extensions.markup.html;
import org.apache.wicket.Component;
-import org.apache.wicket.Page;
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.markup.html.panel.Panel;
-import org.apache.wicket.util.tester.DummyPanelPage;
-import org.apache.wicket.util.tester.ITestPanelSource;
+import org.junit.Test;
/**
*
@@ -38,32 +35,24 @@ public class AjaxLazyLoadPanelTesterTest
/**
* Test
*/
+ @Test
public void test()
{
- final Page dummyPanelPage = new DummyPanelPage(new
ITestPanelSource()
+ AjaxLazyLoadPanel panel = new AjaxLazyLoadPanel("panel")
{
private static final long serialVersionUID = 1L;
- public Panel getTestPanel(final String panelId)
+ @Override
+ public Component getLazyLoadComponent(final String
markupId)
{
- return new AjaxLazyLoadPanel(panelId)
- {
- private static final long
serialVersionUID = 1L;
-
- @Override
- public Component
getLazyLoadComponent(final String markupId)
- {
- return new Label(markupId,
"lazy panel test").setRenderBodyOnly(true);
- }
- };
+ return new Label(markupId, "lazy panel
test").setRenderBodyOnly(true);
}
-
- });
- tester.startPage(dummyPanelPage);
+ };
+ tester.startComponentInPage(panel);
tester.assertLabel(
"panel:content",
"<img alt=\"Loading...\"
src=\"resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/indicator.gif\"/>");
- AjaxLazyLoadPanelTester.executeAjaxLazyLoadPanel(tester,
dummyPanelPage);
+ AjaxLazyLoadPanelTester.executeAjaxLazyLoadPanel(tester,
panel.getParent());
tester.debugComponentTrees();
tester.assertLabel("panel:content", "lazy panel test");
String doc = tester.getLastResponseAsString();
Modified:
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResourceTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResourceTest.java?rev=1200780&r1=1200779&r2=1200780&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResourceTest.java
(original)
+++
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResourceTest.java
Fri Nov 11 09:02:15 2011
@@ -25,6 +25,7 @@ import javax.imageio.ImageIO;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.image.resource.DefaultButtonImageResource;
+import org.junit.Test;
/**
@@ -37,6 +38,7 @@ public class ThumbnailImageResourceTest
*
* @throws IOException
*/
+ @Test
public void testThumbnailImageResource() throws IOException
{
DefaultButtonImageResource unscaled = new
DefaultButtonImageResource(60, 60, "");
Modified:
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java?rev=1200780&r1=1200779&r2=1200780&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java
(original)
+++
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java
Fri Nov 11 09:02:15 2011
@@ -22,8 +22,6 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import junit.framework.TestCase;
-
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.html.WebPage;
@@ -36,28 +34,37 @@ import org.apache.wicket.util.resource.S
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.tester.DiffUtil;
import org.apache.wicket.util.tester.WicketTester;
+import org.junit.After;
import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
*
*/
-public class DataTableTest extends TestCase
+public class DataTableTest extends Assert
{
/** Log for reporting. */
private static final Logger log =
LoggerFactory.getLogger(DataTableTest.class);
private WicketTester tester;
- @Override
- protected void setUp() throws Exception
+ /**
+ *
+ */
+ @Before
+ public void before()
{
tester = new WicketTester(new RepeaterApplication());
}
- @Override
- protected void tearDown() throws Exception
+ /**
+ *
+ */
+ @After
+ public void after()
{
tester.destroy();
}
@@ -65,6 +72,7 @@ public class DataTableTest extends TestC
/**
* @throws Exception
*/
+ @Test
public void test_1() throws Exception
{
tester.startPage(DataTablePage.class);
@@ -84,10 +92,10 @@ public class DataTableTest extends TestC
index = document.indexOf("<caption", index + 1);
assertTrue("There must be not be <caption>", index == -1);
- log.error(document);
- log.error("==============================================");
- log.error("==============================================");
- log.error(removeFillers(document));
+// log.error(document);
+// log.error("==============================================");
+// log.error("==============================================");
+// log.error(removeFillers(document));
String doc = removeFillers(document);
DiffUtil.validatePage(doc, getClass(),
"DataTablePage_ExpectedResult.html", true);
@@ -97,18 +105,19 @@ public class DataTableTest extends TestC
* Tests that DataTable doesn't produce thead/tfoot if there are no
top/bottom toolbars or if
* their children components are all invisible
*/
+ @Test
public void testWicket3603()
{
PageParameters parameters = new PageParameters();
parameters.add("empty", Boolean.TRUE);
tester.startPage(Wicket3603Page.class, parameters);
- System.err.println(tester.getLastResponseAsString());
+// System.err.println(tester.getLastResponseAsString());
Assert.assertTrue(tester.getLastResponseAsString().contains("thead"));
Assert.assertTrue(tester.getLastResponseAsString().contains("tfoot"));
parameters.set("empty", Boolean.FALSE);
tester.startPage(Wicket3603Page.class);
- System.err.println(tester.getLastResponseAsString());
+// System.err.println(tester.getLastResponseAsString());
Assert.assertFalse(tester.getLastResponseAsString().contains("thead"));
Assert.assertFalse(tester.getLastResponseAsString().contains("tfoot"));
}
@@ -117,6 +126,7 @@ public class DataTableTest extends TestC
* Tests that a {@link DataTable} with non-empty {@link
DataTable#getCaptionModel()} will render
* <caption> element.
*/
+ @Test
public void testWicket3886()
{
DataTablePage page = new DataTablePage()
Modified:
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tree/MoveChildToParentNodeMarkedForRecreationTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tree/MoveChildToParentNodeMarkedForRecreationTest.java?rev=1200780&r1=1200779&r2=1200780&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tree/MoveChildToParentNodeMarkedForRecreationTest.java
(original)
+++
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tree/MoveChildToParentNodeMarkedForRecreationTest.java
Fri Nov 11 09:02:15 2011
@@ -17,6 +17,7 @@
package org.apache.wicket.extensions.markup.html.tree;
import org.apache.wicket.WicketTestCase;
+import org.junit.Test;
/**
* Try to move the c3 node to the c2 at the described tree model:
@@ -36,6 +37,7 @@ public class MoveChildToParentNodeMarked
/**
* test()
*/
+ @Test
public void test()
{
MoveChildToParentNodeMarkedForRecreationTestPage testPage = new
MoveChildToParentNodeMarkedForRecreationTestPage();
Modified:
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/upload/UploadFormWithProgressBarTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/upload/UploadFormWithProgressBarTest.java?rev=1200780&r1=1200779&r2=1200780&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/upload/UploadFormWithProgressBarTest.java
(original)
+++
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/upload/UploadFormWithProgressBarTest.java
Fri Nov 11 09:02:15 2011
@@ -26,6 +26,7 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
+import org.junit.Test;
/**
*/
@@ -34,6 +35,7 @@ public class UploadFormWithProgressBarTe
/**
* @see "https://issues.apache.org/jira/browse/WICKET-3200";
*/
+ @Test
public void testReCreateTheForm()
{
UploadFormWithProgressBarTestPage testPage = null;
Modified:
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java?rev=1200780&r1=1200779&r2=1200780&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java
(original)
+++
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java
Fri Nov 11 09:02:15 2011
@@ -16,21 +16,22 @@
*/
package org.apache.wicket.extensions.validation.validator;
-import junit.framework.TestCase;
-
import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.Validatable;
+import org.junit.Assert;
+import org.junit.Test;
/**
* Test that it really validates RFC valid email addresses.
*
* @author Frank Bille
*/
-public class RfcCompliantEmailValidatorTest extends TestCase
+public class RfcCompliantEmailValidatorTest extends Assert
{
/**
* Test a couple of valid email addresses.
*/
+ @Test
public void testValidEmailAddresses()
{
IValidator<String> validator =
RfcCompliantEmailAddressValidator.getInstance();
@@ -52,6 +53,7 @@ public class RfcCompliantEmailValidatorT
/**
* Test a couple of invalid email addresses.
*/
+ @Test
public void testInValidEmailAddresses()
{
IValidator<String> validator =
RfcCompliantEmailAddressValidator.getInstance();
Modified:
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/WizardModelTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/WizardModelTest.java?rev=1200780&r1=1200779&r2=1200780&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/WizardModelTest.java
(original)
+++
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/WizardModelTest.java
Fri Nov 11 09:02:15 2011
@@ -19,6 +19,7 @@ package org.apache.wicket.extensions.wiz
import java.util.Iterator;
import org.apache.wicket.WicketTestCase;
+import org.junit.Test;
/**
* Test for {@link WizardModel}.
@@ -27,8 +28,9 @@ public class WizardModelTest extends Wic
{
/**
- * Test steps are intialized correctly.
+ * Test steps are initialized correctly.
*/
+ @Test
public void testResetInitsSteps()
{
WizardModel model = new WizardModel();
