You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2018/09/26 13:39:50 UTC
[20/45] wicket git commit: wicket-core: Migrate to Junit 5
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormSubmitTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormSubmitTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormSubmitTest.java
index 631865e..350d843 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormSubmitTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormSubmitTest.java
@@ -16,19 +16,21 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class NestedFormSubmitTest extends WicketTestCase
+class NestedFormSubmitTest extends WicketTestCase
{
- public class TestForm<S> extends Form<S>
+ class TestForm<S> extends Form<S>
{
private final IModel<Boolean> submitted;
private final Button submit;
@@ -66,15 +68,15 @@ public class NestedFormSubmitTest extends WicketTestCase
}
}
- public class TestPage extends WebPage
+ class TestPage extends WebPage
{
private final TestForm<?> outer;
private final TestForm<?> middle;
private final TestForm<?> inner;
- public TestPage(IModel<Boolean> submittedOuter, boolean outerWantsInclusion,
- IModel<Boolean> submittedMiddle, boolean middleWantsInclusion,
- boolean middleWantsExclusion, IModel<Boolean> submittedInner)
+ TestPage(IModel<Boolean> submittedOuter, boolean outerWantsInclusion,
+ IModel<Boolean> submittedMiddle, boolean middleWantsInclusion,
+ boolean middleWantsExclusion, IModel<Boolean> submittedInner)
{
outer = new TestForm<Void>("outer", submittedOuter, outerWantsInclusion, true);
this.add(outer);
@@ -91,16 +93,16 @@ public class NestedFormSubmitTest extends WicketTestCase
private Model<Boolean> submittedInner;
private TestPage page;
- @Before
- public void setUp() throws Exception
+ @BeforeEach
+ void setUp() throws Exception
{
submittedOuter = Model.of(false);
submittedMiddle = Model.of(false);
submittedInner = Model.of(false);
}
- @After
- public void tearDown() throws Exception
+ @AfterEach
+ void tearDown() throws Exception
{
submittedInner.setObject(false);
submittedMiddle.setObject(false);
@@ -134,55 +136,55 @@ public class NestedFormSubmitTest extends WicketTestCase
private void assertFormsAreSubmitted(boolean expectSubmittedOuter,
boolean expectSubmittedMiddle, boolean expectSubmittedInner)
{
- assertEquals("outer", expectSubmittedOuter, submittedOuter.getObject().booleanValue());
- assertEquals("middle", expectSubmittedMiddle, submittedMiddle.getObject().booleanValue());
- assertEquals("inner", expectSubmittedInner, submittedInner.getObject().booleanValue());
+ assertEquals(expectSubmittedOuter, submittedOuter.getObject().booleanValue(), "outer");
+ assertEquals(expectSubmittedMiddle, submittedMiddle.getObject().booleanValue(), "middle");
+ assertEquals(expectSubmittedInner, submittedInner.getObject().booleanValue(), "inner");
}
@Test
- public void testDefaultOuterSubmitShouldSubmitAll() throws Exception
+ void testDefaultOuterSubmitShouldSubmitAll() throws Exception
{
startPage(false, false, true);
assertFormSubmitOuter(true, true, true);
}
@Test
- public void testDefaultMiddleSubmitShouldSubmitMiddleAndInner() throws Exception
+ void testDefaultMiddleSubmitShouldSubmitMiddleAndInner() throws Exception
{
startPage(false, false, true);
assertFormSubmitMiddle(false, true, true);
}
@Test
- public void testDefaultInnerSubmitShouldSubmitOnlyInner() throws Exception
+ void testDefaultInnerSubmitShouldSubmitOnlyInner() throws Exception
{
startPage(false, false, true);
assertFormSubmitInner(false, false, true);
}
@Test
- public void testWithOuterInclusionOuterIsSubmittedOnMiddleSubmit() throws Exception
+ void testWithOuterInclusionOuterIsSubmittedOnMiddleSubmit() throws Exception
{
startPage(true, false, true);
assertFormSubmitMiddle(true, true, true);
}
@Test
- public void testWithOuterInclusionOuterIsSubmittedOnInnerSubmit() throws Exception
+ void testWithOuterInclusionOuterIsSubmittedOnInnerSubmit() throws Exception
{
startPage(true, false, true);
assertFormSubmitInner(true, true, true);
}
@Test
- public void testWithMiddleInclusionMiddleIsSubmittedOnInnerSubmit() throws Exception
+ void testWithMiddleInclusionMiddleIsSubmittedOnInnerSubmit() throws Exception
{
startPage(false, true, true);
assertFormSubmitInner(false, true, true);
}
@Test
- public void testWithMiddleAndOuterInclusionMiddleAndOuterIsSubmittedOnInnerSubmit()
+ void testWithMiddleAndOuterInclusionMiddleAndOuterIsSubmittedOnInnerSubmit()
throws Exception
{
startPage(true, true, true);
@@ -190,7 +192,7 @@ public class NestedFormSubmitTest extends WicketTestCase
}
@Test
- public void testWithMiddleExclusionAndOuterIsSubmitted() throws Exception
+ void testWithMiddleExclusionAndOuterIsSubmitted() throws Exception
{
startPage(false, false, false);
assertFormSubmitOuter(true, false, false);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsPage.java
index 494894f..8b056eb 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsPage.java
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
public class NestedFormsPage extends WebPage
{
private static final long serialVersionUID = 1L;
- static Logger logger = LoggerFactory.getLogger(NestedFormsPage.class);
+ private static Logger logger = LoggerFactory.getLogger(NestedFormsPage.class);
private final FeedbackPanel feedback;
@@ -83,7 +83,7 @@ public class NestedFormsPage extends WebPage
* @param id
* the form's id
*/
- public NestableForm(String id)
+ NestableForm(String id)
{
super(id);
setDefaultModel(new CompoundPropertyModel<NestableForm>(this));
@@ -139,7 +139,7 @@ public class NestedFormsPage extends WebPage
private final Form<?> form;
- public ToggleLink(String id, Form<?> form)
+ ToggleLink(String id, Form<?> form)
{
super(id);
this.form = form;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsTest.java
index 6b5b8c4..856d3f0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.ArrayList;
import java.util.List;
@@ -27,18 +29,18 @@ 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;
+import org.junit.jupiter.api.Test;
/**
* @author Pedro Santos
*/
-public class NestedFormsTest extends WicketTestCase
+class NestedFormsTest extends WicketTestCase
{
/**
*
*/
@Test
- public void postOrderSequenceSubmittingRootForm()
+ void postOrderSequenceSubmittingRootForm()
{
tester.startPage(TestPage.class);
TestPage testPage = (TestPage)tester.getLastRenderedPage();
@@ -54,7 +56,7 @@ public class NestedFormsTest extends WicketTestCase
*
*/
@Test
- public void postOrderSequenceSubmittingInnerForm()
+ void postOrderSequenceSubmittingInnerForm()
{
tester.startPage(TestPage.class);
TestPage testPage = (TestPage)tester.getLastRenderedPage();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NumberTextFieldTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NumberTextFieldTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NumberTextFieldTest.java
index 04418ac..9bcb41d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NumberTextFieldTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NumberTextFieldTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.math.BigDecimal;
import java.util.Locale;
@@ -27,21 +30,21 @@ 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;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link NumberTextField}.
*
* @author svenmeier
*/
-public class NumberTextFieldTest extends WicketTestCase
+class NumberTextFieldTest extends WicketTestCase
{
/**
* WICKET-4884, WICKET-3591
*/
@Test
- public void convertBigDecimal()
+ void convertBigDecimal()
{
TestPage<BigDecimal> testPage = new TestPage<>();
testPage.textField.setType(BigDecimal.class);
@@ -63,7 +66,7 @@ public class NumberTextFieldTest extends WicketTestCase
* WICKET-4884, WICKET-3591
*/
@Test
- public void convertDouble()
+ void convertDouble()
{
TestPage<Double> testPage = new TestPage<Double>();
testPage.textField.setType(Double.class);
@@ -85,7 +88,7 @@ public class NumberTextFieldTest extends WicketTestCase
* WICKET-4884, WICKET-3591
*/
@Test
- public void convertLong()
+ void convertLong()
{
TestPage<Long> testPage = new TestPage<Long>();
testPage.textField.setType(Long.class);
@@ -107,7 +110,7 @@ public class NumberTextFieldTest extends WicketTestCase
* WICKET-5467
*/
@Test
- public void respectStepAny()
+ void respectStepAny()
{
TestPage<Double> testPage = new TestPage<Double>();
testPage.textField.setType(Double.class);
@@ -123,7 +126,7 @@ public class NumberTextFieldTest extends WicketTestCase
* WICKET-5467
*/
@Test
- public void respectStepWithNumberValue()
+ void respectStepWithNumberValue()
{
TestPage<Double> testPage = new TestPage<Double>();
testPage.textField.setType(Double.class);
@@ -149,7 +152,7 @@ public class NumberTextFieldTest extends WicketTestCase
NumberTextField<N> textField;
/** */
- public TestPage()
+ TestPage()
{
add(form = new Form<Void>("form")
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/OnValidateModelObjectsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/OnValidateModelObjectsTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/OnValidateModelObjectsTest.java
index ff2fc80..ac1098e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/OnValidateModelObjectsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/OnValidateModelObjectsTest.java
@@ -16,26 +16,26 @@
*/
package org.apache.wicket.markup.html.form;
-import static org.hamcrest.CoreMatchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.wicket.Page;
import org.apache.wicket.markup.html.form.onFormValidateModelObjects.AddressFormPanel;
import org.apache.wicket.markup.html.form.onFormValidateModelObjects.OnFormValidateModelObjectsPage;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test case for https://issues.apache.org/jira/browse/WICKET-4344
*/
-public class OnValidateModelObjectsTest extends WicketTestCase
+class OnValidateModelObjectsTest extends WicketTestCase
{
/**
* Asserts that submitting the outer form will call {@link Form#onValidateModelObjects()}
* for both the outer form and the inner form(s)
*/
@Test
- public void onValidateModelObjects()
+ void onValidateModelObjects()
{
tester.startPage(OnFormValidateModelObjectsPage.class);
FormTester formTester = tester.newFormTester("parentForm");
@@ -43,9 +43,9 @@ public class OnValidateModelObjectsTest extends WicketTestCase
Page page = tester.getLastRenderedPage();
OnFormValidateModelObjectsPage.ParentModel parentModel = (OnFormValidateModelObjectsPage.ParentModel) page.getDefaultModelObject();
- assertThat(parentModel.isParentValidated(), is(true));
+ assertEquals(true, parentModel.isParentValidated());
AddressFormPanel.ChildModel childPanel = (AddressFormPanel.ChildModel) page.get("parentForm:addressInfo").getDefaultModelObject();
- assertThat(childPanel.isChildValidated(), is(true));
+ assertEquals(true, childPanel.isChildValidated());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/PasswordTextFieldTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/PasswordTextFieldTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/PasswordTextFieldTest.java
index 9b93fcc..53d4951 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/PasswordTextFieldTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/PasswordTextFieldTest.java
@@ -16,20 +16,24 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.model.IModel;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link PasswordTextField}.
*
* @author svenmeier
*/
-public class PasswordTextFieldTest extends WicketTestCase
+class PasswordTextFieldTest extends WicketTestCase
{
@Test
- public void nullifyPassword()
+ void nullifyPassword()
{
TestModel model = new TestModel();
@@ -42,7 +46,7 @@ public class PasswordTextFieldTest extends WicketTestCase
}
@Test
- public void nullifyPasswordOnNullModel()
+ void nullifyPasswordOnNullModel()
{
PasswordTextField field = new PasswordTextField("password");
field.setVisible(false);
@@ -53,7 +57,7 @@ public class PasswordTextFieldTest extends WicketTestCase
@Test
- public void nullifyNoReset()
+ void nullifyNoReset()
{
TestModel model = new TestModel();
@@ -68,9 +72,9 @@ public class PasswordTextFieldTest extends WicketTestCase
private class TestModel implements IModel<String>
{
- public boolean detached;
+ boolean detached;
- public String password = "test";
+ String password = "test";
@Override
public String getObject()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/PrimitiveTypeRequiredTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/PrimitiveTypeRequiredTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/PrimitiveTypeRequiredTest.java
index db1520a..0b7862c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/PrimitiveTypeRequiredTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/PrimitiveTypeRequiredTest.java
@@ -16,22 +16,24 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* @author jcompagner
*/
-public class PrimitiveTypeRequiredTest extends WicketTestCase
+class PrimitiveTypeRequiredTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void primitiveClass() throws Exception
+ void primitiveClass() throws Exception
{
TextField<Integer> tf = new TextField<Integer>("test", int.class);
assertTrue(tf.isRequired());
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioChoiceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioChoiceTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioChoiceTest.java
index c5e4897..02e1184 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioChoiceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioChoiceTest.java
@@ -19,12 +19,12 @@ package org.apache.wicket.markup.html.form;
import java.util.Arrays;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class RadioChoiceTest extends WicketTestCase
+class RadioChoiceTest extends WicketTestCase
{
@Test
- public void defaultLabelPositionIsAfter() throws Exception
+ void defaultLabelPositionIsAfter() throws Exception
{
RadioChoice<Integer> radioChoice = new RadioChoice<Integer>("testid", Arrays.asList(1));
tester.startComponentInPage(radioChoice);
@@ -33,7 +33,7 @@ public class RadioChoiceTest extends WicketTestCase
}
@Test
- public void labelPositionBefore() throws Exception
+ void labelPositionBefore() throws Exception
{
RadioChoice<Integer> radioChoice = new RadioChoice<Integer>("testid", Arrays.asList(1));
radioChoice.setLabelPosition(AbstractChoice.LabelPosition.BEFORE);
@@ -43,7 +43,7 @@ public class RadioChoiceTest extends WicketTestCase
}
@Test
- public void labelPositionWrapBefore() throws Exception
+ void labelPositionWrapBefore() throws Exception
{
RadioChoice<Integer> radioChoice = new RadioChoice<Integer>("testid", Arrays.asList(1));
radioChoice.setLabelPosition(AbstractChoice.LabelPosition.WRAP_BEFORE);
@@ -53,7 +53,7 @@ public class RadioChoiceTest extends WicketTestCase
}
@Test
- public void labelPositionWrapAfter() throws Exception
+ void labelPositionWrapAfter() throws Exception
{
RadioChoice<Integer> radioChoice = new RadioChoice<Integer>("testid", Arrays.asList(1));
radioChoice.setLabelPosition(AbstractChoice.LabelPosition.WRAP_AFTER);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
index 6165a02..c8bbaa9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
@@ -16,11 +16,14 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Test for RadioGroup and Radio components
@@ -28,13 +31,13 @@ import org.junit.Test;
* @author igor
*
*/
-public class RadioGroupTest extends WicketTestCase
+class RadioGroupTest extends WicketTestCase
{
/**
* test component form processing
*/
@Test
- public void formProcessing()
+ void formProcessing()
{
// object used to test regular model
Model<String> model = new Model<String>();
@@ -46,24 +49,21 @@ public class RadioGroupTest extends WicketTestCase
tester.startPage(page);
tester.submitForm(page.form);
- assertTrue("group: running with nothing selected - model must be set to null",
- model.getObject() == null);
+ assertTrue(model.getObject() == null, "group: running with nothing selected - model must be set to null");
tester.getRequest()
.getPostParameters()
.setParameterValue(page.group.getInputName(), page.radio1.getValue());
tester.submitForm(page.form);
- assertEquals("group: running with choice1 selected - model must be set to value of radio1",
- model.getObject(), "radio1");
+ assertEquals("radio1", model.getObject(), "group: running with choice1 selected - model must be set to value of radio1");
tester.getRequest()
.getPostParameters()
.setParameterValue(page.group.getInputName(), page.radio2.getValue());
tester.submitForm(page.form);
- assertEquals("group: running with choice2 selected - model must be set to value of radio2",
- model.getObject(), "radio2");
+ assertEquals("radio2", model.getObject(), "group: running with choice2 selected - model must be set to value of radio2");
tester.getRequest()
.getPostParameters()
@@ -86,7 +86,7 @@ public class RadioGroupTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void rendering() throws Exception
+ void rendering() throws Exception
{
executeTest(RadioGroupTestPage1.class, "RadioGroupTestPage1_expected.html");
try
@@ -110,7 +110,7 @@ public class RadioGroupTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void radioGroupTestPage3() throws Exception
+ void radioGroupTestPage3() throws Exception
{
// this test fails. You can make the test pass by closing the input tags
// this was not the case in beta1
@@ -121,7 +121,7 @@ public class RadioGroupTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void disabledRadioGroup() throws Exception
+ void disabledRadioGroup() throws Exception
{
executeTest(RadioGroupDisabledTestPage.class, "RadioGroupDisabledTestPage_expected.html");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TestFormHasError.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TestFormHasError.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TestFormHasError.java
index a065110..6b81374 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TestFormHasError.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TestFormHasError.java
@@ -17,18 +17,18 @@
package org.apache.wicket.markup.html.form;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*/
-public class TestFormHasError extends WicketTestCase
+class TestFormHasError extends WicketTestCase
{
/**
* testFormHasError()
*/
@Test
- public void testFormHasError()
+ void testFormHasError()
{
tester.startPage(FormHasErrorPage.class);
tester.assertRenderedPage(FormHasErrorPage.class);
@@ -40,7 +40,7 @@ public class TestFormHasError extends WicketTestCase
* testFormComponentHasError()
*/
@Test
- public void testFormComponentHasError()
+ void testFormComponentHasError()
{
tester.startPage(FormHasErrorPage.class);
tester.assertRenderedPage(FormHasErrorPage.class);
@@ -52,7 +52,7 @@ public class TestFormHasError extends WicketTestCase
* testComponentHasError()
*/
@Test
- public void testComponentHasError()
+ void testComponentHasError()
{
tester.startPage(FormHasErrorPage.class);
tester.assertRenderedPage(FormHasErrorPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextAreaTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextAreaTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextAreaTest.java
index a75bcd3..daf5b26 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextAreaTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextAreaTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.html.HTML5Attributes;
@@ -26,18 +28,18 @@ import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.TagTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class TextAreaTest extends WicketTestCase
+class TextAreaTest extends WicketTestCase
{
/**
* https://issues.apache.org/jira/browse/WICKET-5289
*/
@Test
- public void requiredAttribute()
+ void requiredAttribute()
{
TestPage testPage = new TestPage();
testPage.textArea.setOutputMarkupId(true);
@@ -60,7 +62,7 @@ public class TextAreaTest extends WicketTestCase
IModel<String> textModel = Model.of((String)null);
/** */
- public TestPage()
+ TestPage()
{
add(form = new Form<>("form"));
form.add(textArea = new TextArea<>("textarea", textModel));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextFieldTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextFieldTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextFieldTest.java
index 5af5917..be0ca52 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextFieldTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TextFieldTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.html.HTML5Attributes;
@@ -29,16 +32,16 @@ import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.TagTester;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.validation.validator.StringValidator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Pedro Santos
*/
-public class TextFieldTest extends WicketTestCase
+class TextFieldTest extends WicketTestCase
{
/** */
@Test
- public void emptyInputConvertedToNull()
+ void emptyInputConvertedToNull()
{
TestPage testPage = new TestPage();
testPage.textField.setType(String.class);
@@ -54,7 +57,7 @@ public class TextFieldTest extends WicketTestCase
* Asserting that the value attribute on tag input is escaped once by default
*/
@Test
- public void valueAttribute()
+ void valueAttribute()
{
TestPage testPage = new TestPage();
String text = "some text & another text";
@@ -67,7 +70,7 @@ public class TextFieldTest extends WicketTestCase
* Assert that null input is not validated.
*/
@Test
- public void nullIsNotValidated()
+ void nullIsNotValidated()
{
TestPage testPage = new TestPage();
testPage.textField.setType(String.class);
@@ -85,7 +88,7 @@ public class TextFieldTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-5289
*/
@Test
- public void requiredAttribute()
+ void requiredAttribute()
{
TestPage testPage = new TestPage();
testPage.textField.setOutputMarkupId(true);
@@ -108,7 +111,7 @@ public class TextFieldTest extends WicketTestCase
IModel<String> textModel = Model.of((String)null);
/** */
- public TestPage()
+ TestPage()
{
add(form = new Form<>("form"));
form.add(textField = new TextField<>("text", textModel));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java
index e4231c8..8ed791d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.markup.html.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import java.util.Locale;
import java.util.MissingResourceException;
@@ -23,7 +26,7 @@ import org.apache.wicket.properties.MyApplication;
import org.apache.wicket.properties.TestPage;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
@@ -33,7 +36,7 @@ import org.junit.Test;
*
* @author Juergen Donnerstag
*/
-public class ValidatorPropertiesTest extends WicketTestCase
+class ValidatorPropertiesTest extends WicketTestCase
{
@Override
@@ -46,7 +49,7 @@ public class ValidatorPropertiesTest extends WicketTestCase
*
*/
@Test
- public void test1()
+ void test1()
{
tester.getSession().setLocale(Locale.ENGLISH);
@@ -296,7 +299,7 @@ public class ValidatorPropertiesTest extends WicketTestCase
*
*/
@Test
- public void test2()
+ void test2()
{
tester.getApplication().getResourceSettings().setThrowExceptionOnMissingResource(false);
@@ -311,7 +314,7 @@ public class ValidatorPropertiesTest extends WicketTestCase
*
*/
@Test
- public void test3()
+ void test3()
{
tester.getApplication().getResourceSettings().setThrowExceptionOnMissingResource(true);
@@ -324,6 +327,7 @@ public class ValidatorPropertiesTest extends WicketTestCase
{
hit = true;
}
- assertEquals("MissingResourceException expected", hit, true);
+
+ assertEquals(true, hit, "MissingResourceException expected");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage.java
index aa909bf..b3c5f91 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage.java
@@ -16,22 +16,24 @@
*/
package org.apache.wicket.markup.html.form.border;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
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;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Simple test using the WicketTester
*/
-public class TestHomePage extends WicketTestCase
+class TestHomePage extends WicketTestCase
{
/**
*
*/
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
// Start and render the test page
tester.startPage(HomePage.class);
@@ -39,7 +41,7 @@ public class TestHomePage extends WicketTestCase
}
@Test
- public void testWithBorder2()
+ void testWithBorder2()
{
FormTester formTester = tester.newFormTester("border:form");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage_2134.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage_2134.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage_2134.java
index 72dcf83..e93f4d4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage_2134.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage_2134.java
@@ -16,20 +16,22 @@
*/
package org.apache.wicket.markup.html.form.border;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Simple test using the WicketTester
*/
-public class TestHomePage_2134 extends WicketTestCase
+class TestHomePage_2134 extends WicketTestCase
{
/**
* WICKET-2134: two forms inside a border throw a ConversionException error
*/
@Test
- public void testRenderMyPage()
+ void testRenderMyPage()
{
// start and render the test page
tester.startPage(CommonModelPage.class);
@@ -49,7 +51,7 @@ public class TestHomePage_2134 extends WicketTestCase
* WICKET-2134: two forms inside a border throw a ConversionException error
*/
@Test
- public void testRenderMyPage2()
+ void testRenderMyPage2()
{
// start and render the test page
tester.startPage(CommonModelPage.class);
@@ -71,7 +73,7 @@ public class TestHomePage_2134 extends WicketTestCase
* WICKET-2134: two forms inside a border throw a ConversionException error
*/
@Test
- public void testRenderMyPage3()
+ void testRenderMyPage3()
{
// start and render the test page
tester.startPage(CommonModelPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/encryption/CryptTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/encryption/CryptTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/encryption/CryptTest.java
index 1211580..8eea58d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/encryption/CryptTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/encryption/CryptTest.java
@@ -16,20 +16,22 @@
*/
package org.apache.wicket.markup.html.form.encryption;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import org.apache.wicket.util.crypt.ICrypt;
import org.apache.wicket.util.crypt.NoCrypt;
import org.apache.wicket.util.crypt.SunJceCrypt;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* @author Juergen Donnerstag
*/
-public class CryptTest extends WicketTestCase
+class CryptTest extends WicketTestCase
{
@Test
- public void crypt()
+ void crypt()
{
final ICrypt crypt = new SunJceCrypt();
crypt.setKey("someStableKey");
@@ -58,7 +60,7 @@ public class CryptTest extends WicketTestCase
*
*/
@Test
- public void noCrypt()
+ void noCrypt()
{
// The NoCrypt implementation does not modify the string at all
final ICrypt crypt = new NoCrypt();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FormFeedbackTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FormFeedbackTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FormFeedbackTest.java
index 2f50b5c..57a2f9c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FormFeedbackTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FormFeedbackTest.java
@@ -18,19 +18,19 @@ package org.apache.wicket.markup.html.form.feedback;
import org.apache.wicket.Page;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author jcompagner
*/
-public class FormFeedbackTest extends WicketTestCase
+class FormFeedbackTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void formComponentFeedbackBorder() throws Exception
+ void formComponentFeedbackBorder() throws Exception
{
Page page = tester.startPage(FeedbackFormPage.class);
tester.assertRenderedPage(FeedbackFormPage.class);
@@ -44,7 +44,7 @@ public class FormFeedbackTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void formComponentFeedbackIndicator() throws Exception
+ void formComponentFeedbackIndicator() throws Exception
{
Page page = tester.startPage(FeedbackIndicatorFormPage.class);
tester.assertRenderedPage(FeedbackIndicatorFormPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/formComponentPanel/SimplePageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/formComponentPanel/SimplePageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/formComponentPanel/SimplePageTest.java
index 0137cf8..bc6fbe9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/formComponentPanel/SimplePageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/formComponentPanel/SimplePageTest.java
@@ -16,16 +16,18 @@
*/
package org.apache.wicket.markup.html.form.formComponentPanel;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
*
*/
-public class SimplePageTest extends WicketTestCase
+class SimplePageTest extends WicketTestCase
{
private static final Logger log = LoggerFactory.getLogger(SimplePageTest.class);
@@ -33,7 +35,7 @@ public class SimplePageTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage() throws Exception
+ void renderHomePage() throws Exception
{
tester.startComponentInPage(MyFormComponentPanel.class);
String doc = tester.getLastResponseAsString();
@@ -47,7 +49,7 @@ public class SimplePageTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePageWithHeaderContribution() throws Exception
+ void renderHomePageWithHeaderContribution() throws Exception
{
tester.startComponentInPage(MyFormComponentPanel.class);
String doc = tester.getLastResponse().getDocument();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/ImageButtonTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/ImageButtonTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/ImageButtonTest.java
index 1239848..7e7ffae 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/ImageButtonTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/ImageButtonTest.java
@@ -19,19 +19,19 @@ package org.apache.wicket.markup.html.form.imagebutton;
import java.util.Locale;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Juergen Donnerstag
*/
-public class ImageButtonTest extends WicketTestCase
+class ImageButtonTest extends WicketTestCase
{
/**
*
* @throws Exception
*/
@Test
- public void imageButton() throws Exception
+ void imageButton() throws Exception
{
Locale.setDefault(new Locale("en", "US"));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonTest.java
index acfcf96..b6a9160 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonTest.java
@@ -17,17 +17,17 @@
package org.apache.wicket.markup.html.form.imagebutton;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*/
-public class InvalidImageButtonTest extends WicketTestCase
+class InvalidImageButtonTest extends WicketTestCase
{
/**
* testInvalidImage()
*/
@Test
- public void invalidImage()
+ void invalidImage()
{
tester.startPage(InvalidImageButtonPage.class);
tester.assertRenderedPage(InvalidImageButtonPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java
index 8afc459..d736a0d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java
@@ -24,7 +24,7 @@ import org.apache.wicket.protocol.http.WebApplication;
*
* @author Jonathan Locke
*/
-public class PubApplication extends WebApplication
+class PubApplication extends WebApplication
{
/**
* Constructor
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
index 6eb693b..665d232 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup.html.form.login;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.Page;
import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.Session;
@@ -29,14 +31,13 @@ import org.apache.wicket.request.component.IRequestableComponent;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* @author marrink
*
*/
-public class InterceptTest extends WicketTestCase
+class InterceptTest extends WicketTestCase
{
@Override
protected WebApplication newApplication()
@@ -48,7 +49,7 @@ public class InterceptTest extends WicketTestCase
*
*/
@Test
- public void formSubmit()
+ void formSubmit()
{
// same as above but uses different technique to login
tester.startPage(tester.getApplication().getHomePage());
@@ -65,7 +66,7 @@ public class InterceptTest extends WicketTestCase
*
*/
@Test
- public void clickLink()
+ void clickLink()
{
tester.startPage(tester.getApplication().getHomePage());
MockLoginPage loginPage = (MockLoginPage)tester.getLastRenderedPage();
@@ -86,7 +87,7 @@ public class InterceptTest extends WicketTestCase
*
*/
@Test
- public void clickLink2()
+ void clickLink2()
{
// same as above but uses different technique to login
tester.startPage(tester.getApplication().getHomePage());
@@ -129,7 +130,7 @@ public class InterceptTest extends WicketTestCase
*
* @return Class
*/
- public Class<? extends Page> getLoginPage()
+ Class<? extends Page> getLoginPage()
{
return MockLoginPage.class;
}
@@ -154,7 +155,7 @@ public class InterceptTest extends WicketTestCase
/**
* @param request
*/
- protected MySession(Request request)
+ MySession(Request request)
{
super(request);
}
@@ -164,7 +165,7 @@ public class InterceptTest extends WicketTestCase
return username;
}
- protected final void setUsername(String username)
+ final void setUsername(String username)
{
this.username = username;
}
@@ -173,7 +174,7 @@ public class InterceptTest extends WicketTestCase
*
* @return boolean
*/
- public boolean isLoggedIn()
+ boolean isLoggedIn()
{
return !Strings.isEmpty(username);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java
index 52f4a8a..637543f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java
@@ -64,7 +64,7 @@ public class MockLoginPage extends WebPage
* @param username
* @return boolean
*/
- public boolean login(String username)
+ private boolean login(String username)
{
((MySession)Session.get()).setUsername(username);
continueToOriginalDestination();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/onFormValidateModelObjects/OnFormValidateModelObjectsPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/onFormValidateModelObjects/OnFormValidateModelObjectsPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/onFormValidateModelObjects/OnFormValidateModelObjectsPage.java
index bc94321..d6e93f9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/onFormValidateModelObjects/OnFormValidateModelObjectsPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/onFormValidateModelObjects/OnFormValidateModelObjectsPage.java
@@ -129,7 +129,7 @@ public class OnFormValidateModelObjectsPage extends WebPage
boolean parentValidated;
- public ParentModel()
+ ParentModel()
{
super();
}
@@ -159,7 +159,7 @@ public class OnFormValidateModelObjectsPage extends WebPage
return parentValidated;
}
- public void setParentValidated(boolean parentValid)
+ void setParentValidated(boolean parentValid)
{
this.parentValidated = parentValid;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/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 1c9e388..d628173 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,18 +16,20 @@
*/
package org.apache.wicket.markup.html.form.panelBorder;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
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;
+import org.junit.jupiter.api.Test;
/**
* Simple test using the WicketTester
*/
-public class TestHomePage extends WicketTestCase
+class TestHomePage extends WicketTestCase
{
@Test
- public void testWithBorder2()
+ void testWithBorder2()
{
tester.startPage(HomePage.class);
tester.assertRenderedPage(HomePage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/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 3150d0f..b6d7054 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,20 +16,22 @@
*/
package org.apache.wicket.markup.html.form.panelBorder;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Simple test using the WicketTester
*/
-public class TestHomePage_2134 extends WicketTestCase
+class TestHomePage_2134 extends WicketTestCase
{
/**
* WICKET-2134: two forms inside a border throw a ConversionException error
*/
@Test
- public void testRenderMyPage()
+ void testRenderMyPage()
{
// start and render the test page
tester.startPage(CommonModelPage.class);
@@ -49,7 +51,7 @@ public class TestHomePage_2134 extends WicketTestCase
* WICKET-2134: two forms inside a border throw a ConversionException error
*/
@Test
- public void testRenderMyPage2()
+ void testRenderMyPage2()
{
// start and render the test page
tester.startPage(CommonModelPage.class);
@@ -71,7 +73,7 @@ public class TestHomePage_2134 extends WicketTestCase
* WICKET-2134: two forms inside a border throw a ConversionException error
*/
@Test
- public void testRenderMyPage3()
+ void testRenderMyPage3()
{
// start and render the test page
tester.startPage(CommonModelPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/submitlink/HomePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/submitlink/HomePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/submitlink/HomePage.java
index a8db477..8ce997b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/submitlink/HomePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/submitlink/HomePage.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.markup.html.form.submitlink;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.form.Form;
@@ -29,10 +29,10 @@ import org.apache.wicket.model.PropertyModel;
*/
public class HomePage extends WebPage
{
- boolean submitted = false;
- boolean submittedViaLinkBefore = false;
- boolean submittedViaLinkAfter = false;
- String text;
+ private boolean submitted = false;
+ private boolean submittedViaLinkBefore = false;
+ private boolean submittedViaLinkAfter = false;
+ private String text;
/**
*
*/
@@ -70,14 +70,14 @@ public class HomePage extends WebPage
public void onSubmit()
{
submittedViaLinkBefore = true;
- assertFalse("before must be the first!", submittedViaLinkAfter);
+ assertFalse(submittedViaLinkAfter, "before must be the first!");
}
@Override
public void onAfterSubmit()
{
- assertTrue("before must have been called!", submittedViaLinkBefore);
+ assertTrue(submittedViaLinkBefore, "before must have been called!");
submittedViaLinkAfter = true;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/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 6a9981b..f799df2 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,19 +16,22 @@
*/
package org.apache.wicket.markup.html.form.submitlink;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*/
-public class TestHomePage extends WicketTestCase
+class TestHomePage extends WicketTestCase
{
/**
* testSubmitLinkByClickingLink()
*/
@Test
- public void testSubmitLinkByClickingLink()
+ void testSubmitLinkByClickingLink()
{
tester.startPage(HomePage.class);
tester.assertRenderedPage(HomePage.class);
@@ -36,11 +39,10 @@ public class TestHomePage extends WicketTestCase
tester.getRequest().getPostParameters().setParameterValue("text", "Hello");
tester.clickLink("form:link");
assertEquals("Hello", home.getText());
- assertTrue("Form.onSubmit() has not been called!", home.isSubmitted());
- assertTrue("SubmitLink.onSubmit() has not been called!",
- home.isSubmittedViaLinkBefore());
- assertTrue("SubmitLink.onAfterSubmit() has not been called!",
- home.isSubmittedViaLinkAfter());
+ assertTrue(home.isSubmitted(), "Form.onSubmit() has not been called!");
+ assertTrue(home.isSubmittedViaLinkBefore(), "SubmitLink.onSubmit() has not been called!");
+ assertTrue(home.isSubmittedViaLinkAfter(),
+ "SubmitLink.onAfterSubmit() has not been called!");
}
@@ -48,7 +50,7 @@ public class TestHomePage extends WicketTestCase
* testSubmitLinkBySubmittingForm()
*/
@Test
- public void testSubmitLinkBySubmittingForm()
+ void testSubmitLinkBySubmittingForm()
{
tester.startPage(HomePage.class);
tester.assertRenderedPage(HomePage.class);
@@ -58,18 +60,17 @@ public class TestHomePage extends WicketTestCase
tester.getRequest().getPostParameters().setParameterValue("link", "");
tester.submitForm("form");
assertEquals("Hello", home.getText());
- assertTrue("Form.onSubmit() has not been called!", home.isSubmitted());
- assertTrue("SubmitLink.onSubmit() has not been called!",
- home.isSubmittedViaLinkBefore());
- assertTrue("SubmitLink.onAfterSubmit() has not been called!",
- home.isSubmittedViaLinkAfter());
+ assertTrue(home.isSubmitted(), "Form.onSubmit() has not been called!");
+ assertTrue(home.isSubmittedViaLinkBefore(), "SubmitLink.onSubmit() has not been called!");
+ assertTrue(home.isSubmittedViaLinkAfter(),
+ "SubmitLink.onAfterSubmit() has not been called!");
}
/**
* testSubmitLinkByUsingFormTester()
*/
@Test
- public void testSubmitLinkByUsingFormTester()
+ void testSubmitLinkByUsingFormTester()
{
tester.startPage(HomePage.class);
tester.assertRenderedPage(HomePage.class);
@@ -78,11 +79,10 @@ public class TestHomePage extends WicketTestCase
formTester.setValue("text", "Hello");
formTester.submit("link");
assertEquals("Hello", home.getText());
- assertTrue("Form.onSubmit() has not been called!", home.isSubmitted());
- assertTrue("SubmitLink.onSubmit() has not been called!",
- home.isSubmittedViaLinkBefore());
- assertTrue("SubmitLink.onAfterSubmit() has not been called!",
- home.isSubmittedViaLinkAfter());
+ assertTrue(home.isSubmitted(), "Form.onSubmit() has not been called!");
+ assertTrue(home.isSubmittedViaLinkBefore(), "SubmitLink.onSubmit() has not been called!");
+ assertTrue(home.isSubmittedViaLinkAfter(),
+ "SubmitLink.onAfterSubmit() has not been called!");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/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 a3d47c7..ccf1ea1 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
@@ -16,19 +16,21 @@
*/
package org.apache.wicket.markup.html.form.upload;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.util.Locale;
-import org.apache.wicket.WicketRuntimeException;
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;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* see WICKET-2015
*/
-public class FileUploadErrorTest extends WicketTestCase
+class FileUploadErrorTest extends WicketTestCase
{
private FormTester formTester;
private final String textFieldId = "textField";
@@ -38,8 +40,8 @@ public class FileUploadErrorTest extends WicketTestCase
/**
*
*/
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
// Start and render the test page
tester.startPage(FileUploadError.class);
@@ -55,7 +57,7 @@ public class FileUploadErrorTest extends WicketTestCase
* FileUpload is empty on submit: Validation fails to see that TextField is also required.
*/
@Test
- public void testSubmit_NoInput()
+ void testSubmit_NoInput()
{
formTester.submit();
tester.assertErrorMessages("'textField' is required.");
@@ -65,7 +67,7 @@ public class FileUploadErrorTest extends WicketTestCase
* FileUpload is filled on submit: TexttField is required.
*/
@Test
- public void testSubmit_NoInput_FileUploaded()
+ void testSubmit_NoInput_FileUploaded()
{
formTester.setFile(fileUploadId, new File(testUploadFilePath), "UTF-8");
formTester.submit();
@@ -77,7 +79,7 @@ public class FileUploadErrorTest extends WicketTestCase
* FileUpload is empty on submit: Validation fails to report too short TextField input.
*/
@Test
- public void testSubmit_NotValidTextFieldValue()
+ void testSubmit_NotValidTextFieldValue()
{
formTester.setValue(textFieldId, "te");
formTester.submit();
@@ -90,7 +92,7 @@ public class FileUploadErrorTest extends WicketTestCase
* FileUpload is empty on submit: Validation fails to report too short TextField input.
*/
@Test
- public void testSubmit_NotValidTextFieldValue2()
+ void testSubmit_NotValidTextFieldValue2()
{
formTester.setValue(textFieldId, "12345678901");
formTester.submit();
@@ -103,7 +105,7 @@ public class FileUploadErrorTest extends WicketTestCase
* FileUpload is filled on submit: Validation reports too short TextField input.
*/
@Test
- public void testSubmit_NotValidTextFieldValue_FileUploaded()
+ void testSubmit_NotValidTextFieldValue_FileUploaded()
{
formTester.setValue(textFieldId, "te");
formTester.setFile(fileUploadId, new File(testUploadFilePath), "UTF-8");
@@ -117,7 +119,7 @@ public class FileUploadErrorTest extends WicketTestCase
* Throwing exception confirms that value is received.
*/
@Test
- public void testSubmit_ValidTextField_NoFile()
+ void testSubmit_ValidTextField_NoFile()
{
formTester.setValue(textFieldId, FileUploadError.THIS_VALUE_SHOULD_THROW_EXCEPTION);
try
@@ -133,7 +135,7 @@ public class FileUploadErrorTest extends WicketTestCase
}
@Test
- public void testSubmit_ValidTextField_WithFile()
+ void testSubmit_ValidTextField_WithFile()
{
formTester.setValue(textFieldId, "test value");
formTester.setFile(fileUploadId, new File(testUploadFilePath), "UTF-8");
@@ -143,7 +145,7 @@ public class FileUploadErrorTest extends WicketTestCase
}
@Test
- public void testSubmit_RequiredFileUpload_Ok()
+ void testSubmit_RequiredFileUpload_Ok()
{
((FileUploadField)tester.getLastRenderedPage().get("form:" + fileUploadId)).setRequired(true);
@@ -155,7 +157,7 @@ public class FileUploadErrorTest extends WicketTestCase
}
@Test
- public void testSubmit_RequiredFileUpload_ShouldFailWithValidationError()
+ void testSubmit_RequiredFileUpload_ShouldFailWithValidationError()
{
((FileUploadField)tester.getLastRenderedPage().get("form:" + fileUploadId)).setRequired(true);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/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 7454602..89dc8d8 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
@@ -16,6 +16,12 @@
*/
package org.apache.wicket.markup.html.form.upload;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.io.BufferedOutputStream;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -30,15 +36,14 @@ 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;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Test of FileUploadField
*
* @author Frank Bille (billen)
*/
-public class FileUploadFieldTest extends WicketTestCase
+class FileUploadFieldTest extends WicketTestCase
{
private static final String TEST_FILE_NAME = FileUploadFieldTest.class.getName();
@@ -49,7 +54,7 @@ public class FileUploadFieldTest extends WicketTestCase
* '
*/
@Test
- public void internalDetach() throws IOException
+ void internalDetach() throws IOException
{
tester.startPage(MockPageWithFormAndUploadField.class);
@@ -113,7 +118,7 @@ public class FileUploadFieldTest extends WicketTestCase
* @throws IOException
*/
@Test
- public void fileUploadCanBeValidated() throws IOException
+ void fileUploadCanBeValidated() throws IOException
{
tester.startPage(TestValidationPage.class);
// creating the file expected by form validators
@@ -130,7 +135,7 @@ public class FileUploadFieldTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-5691
*/
@Test
- public void testEmptyField() throws Exception
+ void testEmptyField() throws Exception
{
tester.startPage(TestValidationPage.class);
@@ -153,7 +158,7 @@ public class FileUploadFieldTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-6270
*/
@Test
- public void testEmptyFieldAsBrowserSendsIt() throws Exception
+ void testEmptyFieldAsBrowserSendsIt() throws Exception
{
tester.startPage(TestValidationPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadServletPartTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadServletPartTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadServletPartTest.java
index 629371f..7012727 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadServletPartTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadServletPartTest.java
@@ -16,9 +16,12 @@
*/
package org.apache.wicket.markup.html.form.upload;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -29,7 +32,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
-
import javax.servlet.http.Part;
import org.apache.wicket.protocol.http.mock.MockHttpServletRequest;
@@ -37,13 +39,12 @@ import org.apache.wicket.request.resource.AbstractResource;
import org.apache.wicket.util.io.IOUtils;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Test of FileUpload with simulated Servlet 3.0 multipart config
*/
-public class FileUploadServletPartTest extends WicketTestCase
+class FileUploadServletPartTest extends WicketTestCase
{
/**
* Tests support for uploading files with Servlet 3.0 multipart upload
@@ -52,7 +53,7 @@ public class FileUploadServletPartTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void uploadServlet30Multipart() throws Exception
+ void uploadServlet30Multipart() throws Exception
{
MockPageWithFormAndUploadField page = tester.startPage(MockPageWithFormAndUploadField.class);
@@ -69,24 +70,24 @@ public class FileUploadServletPartTest extends WicketTestCase
assertEquals(Servlet3Part.CONTENT_TYPE, fileUpload.getContentType());
assertArrayEquals(Servlet3Part.DATA, IOUtils.toByteArray(fileUpload.getInputStream()));
- assertThat(part.written.get(), is(nullValue()));
+ assertNull(part.written.get());
fileUpload.writeToTempFile();
- assertThat(part.written.get(), is(notNullValue()));
+ assertNotNull(part.written.get());
- assertThat(part.deleted.get(), is(false));
+ assertFalse(part.deleted.get());
fileUpload.delete();
- assertThat(part.deleted.get(), is(true));
+ assertTrue(part.deleted.get());
}
private static class Servlet3Part implements Part
{
private static final byte[] DATA = new byte[] {1, 2, 3};
- public static final String CONTENT_TYPE = "text/plain";
+ static final String CONTENT_TYPE = "text/plain";
private final AtomicReference<String> written = new AtomicReference<>();
private final AtomicBoolean deleted = new AtomicBoolean(false);
private final LinkedHashMap<String, List<String>> headers = new LinkedHashMap<>();
- public final String fieldName;
+ final String fieldName;
private Servlet3Part(String fieldName) {
this.fieldName = fieldName;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/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 6315d20..2de0ba0 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
@@ -16,6 +16,12 @@
*/
package org.apache.wicket.markup.html.form.upload;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Field;
@@ -30,8 +36,7 @@ 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;
-
+import org.junit.jupiter.api.Test;
/**
* Test of FileUpload
@@ -49,7 +54,7 @@ public class FileUploadTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void getInputStream() throws Exception
+ void getInputStream() throws Exception
{
final IFileCleaner fileUploadCleaner = new FileCleaner();
@@ -110,7 +115,7 @@ public class FileUploadTest extends WicketTestCase
* @throws IOException
*/
@Test
- public void writeToTempFile() throws IOException
+ void writeToTempFile() throws IOException
{
tester.startPage(TestPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MockPageWithFormAndUploadField.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MockPageWithFormAndUploadField.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MockPageWithFormAndUploadField.java
index 75806ba..571e447 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MockPageWithFormAndUploadField.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MockPageWithFormAndUploadField.java
@@ -34,7 +34,7 @@ public class MockPageWithFormAndUploadField extends WebPage
public static final String FORM_ID = "form";
private final Form<?> form;
- protected final FileUploadField fileUploadField;
+ final FileUploadField fileUploadField;
private FileUpload fileUpload;
/**
@@ -64,7 +64,7 @@ public class MockPageWithFormAndUploadField extends WebPage
add(form);
}
- protected void handleFormSubmit() throws Exception
+ void handleFormSubmit() throws Exception
{
fileUpload = fileUploadField.getFileUpload();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/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 139f41b..ac90bbd 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
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.markup.html.form.upload;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -32,12 +35,12 @@ 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;
+import org.junit.jupiter.api.Test;
/**
* Tests for MultiFileUploadField
*/
-public class MultiFileUploadFieldTest extends WicketTestCase
+class MultiFileUploadFieldTest extends WicketTestCase
{
/**
* FormTester supports MultiFileUploadField
@@ -45,7 +48,7 @@ public class MultiFileUploadFieldTest extends WicketTestCase
* https://issues.apache.org/jira/browse/WICKET-5346
*/
@Test
- public void submitMultiFileUploadFields()
+ void submitMultiFileUploadFields()
{
final AtomicBoolean submitted = new AtomicBoolean(false);
final ListModel<FileUpload> filesModel = new ListModel<>(new ArrayList<FileUpload>());
@@ -86,14 +89,14 @@ public class MultiFileUploadFieldTest extends WicketTestCase
ft.setFile("muf", new File("target/test-classes/org/apache/wicket/markup/html/form/upload/MultiFileUploadFieldTest1.txt"), "plain/text");
ft.submit();
- assertEquals("The form is not submitted", true, submitted.get());
+ assertEquals(true, submitted.get(), "The form is not submitted");
}
/**
* https://issues.apache.org/jira/browse/WICKET-6198
*/
@Test
- public void disabledMultiFileUploadFields()
+ void disabledMultiFileUploadFields()
{
final ListModel<FileUpload> filesModel = new ListModel<>(new ArrayList<FileUpload>());
@@ -106,9 +109,9 @@ public class MultiFileUploadFieldTest extends WicketTestCase
private static class TestPage extends WebPage implements IMarkupResourceStreamProvider
{
- public TestPage(final ListModel<FileUpload> model)
+ TestPage(final ListModel<FileUpload> model)
{
- Form f = new Form("f")
+ Form f = new Form<>("f")
{
@Override
protected void onSubmit()
@@ -123,7 +126,7 @@ public class MultiFileUploadFieldTest extends WicketTestCase
f.add(new MultiFileUploadField("muf", model));
}
- protected void onSubmit()
+ void onSubmit()
{
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/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 863eb44..6e02842 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
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.markup.html.form.validation;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.behavior.Behavior;
@@ -31,17 +34,17 @@ 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;
+import org.junit.jupiter.api.Test;
/**
*/
-public class FormValidatorBehaviorTest extends WicketTestCase
+class FormValidatorBehaviorTest extends WicketTestCase
{
/**
* Tests validators are treated as behaviors
*/
@Test
- public void actAsBehavior()
+ void actAsBehavior()
{
TestPage page = new TestPage();
@@ -64,7 +67,7 @@ public class FormValidatorBehaviorTest extends WicketTestCase
* Tests validators are treated as validators
*/
@Test
- public void actAsValidator()
+ void actAsValidator()
{
TestPage page = new TestPage();
@@ -138,7 +141,7 @@ public class FormValidatorBehaviorTest extends WicketTestCase
*
* @param field
*/
- public MaxLenValidator(TextField<String> field)
+ MaxLenValidator(TextField<String> field)
{
this.field = field;
}
@@ -179,7 +182,7 @@ public class FormValidatorBehaviorTest extends WicketTestCase
*
* @param field
*/
- public MinLenValidator(TextField<String> field)
+ MinLenValidator(TextField<String> field)
{
this.field = field;
}
@@ -207,14 +210,14 @@ public class FormValidatorBehaviorTest extends WicketTestCase
{
private static final long serialVersionUID = 1L;
/** */
- public TextField<String> name;
+ TextField<String> name;
/** */
- public Form<Void> form;
+ Form<Void> form;
/**
* Construct.
*/
- public TestPage()
+ TestPage()
{
form = new Form<Void>("form");
add(form);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java
index 1128395..86e74e6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java
@@ -47,7 +47,7 @@ public class HomePage extends WebPage
public String textfield2;
/** */
- public int formSubmitted = 0;
+ private int formSubmitted = 0;
/** */
public static int AJAX = 2;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/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 5f544c0..73057e7 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,24 +16,28 @@
*/
package org.apache.wicket.markup.html.form.validation;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
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;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Simple test using the WicketTester
*/
-public class HomePageTest extends WicketTestCase
+class HomePageTest extends WicketTestCase
{
/**
*
*/
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
tester.startPage(HomePage.class);
tester.assertRenderedPage(HomePage.class);
@@ -43,11 +47,10 @@ public class HomePageTest extends WicketTestCase
*
*/
@Test
- public void withoutBorder()
+ void withoutBorder()
{
tester.executeAjaxEvent("form:submit", "click");
- assertEquals("Expected one error message",
- tester.getMessages(FeedbackMessage.ERROR).size(), 2);
+ assertEquals(2, tester.getMessages(FeedbackMessage.ERROR).size(), "Expected one error message");
assertTrue(((HomePage)tester.getLastRenderedPage()).hitOnError);
assertFalse(((HomePage)tester.getLastRenderedPage()).hitOnSubmit);
}
@@ -56,7 +59,7 @@ public class HomePageTest extends WicketTestCase
*
*/
@Test
- public void withoutBorder2()
+ void withoutBorder2()
{
FormTester formTester = tester.newFormTester("form");
formTester.setValue("textfield1", "testxxx");
@@ -70,11 +73,10 @@ public class HomePageTest extends WicketTestCase
*
*/
@Test
- public void withBorder()
+ void withBorder()
{
tester.executeAjaxEvent("border:form2:submit", "click");
- assertEquals("Expected one error message",
- tester.getMessages(FeedbackMessage.ERROR).size(), 2);
+ assertEquals(2, tester.getMessages(FeedbackMessage.ERROR).size(), "Expected one error message");
assertTrue(((MyBorder)tester.getLastRenderedPage().get("border")).hitOnError);
assertFalse(((MyBorder)tester.getLastRenderedPage().get("border")).hitOnSubmit);
}
@@ -83,7 +85,7 @@ public class HomePageTest extends WicketTestCase
*
*/
@Test
- public void withBorder2()
+ void withBorder2()
{
TextField<?> textfield = (TextField<?>)tester.getLastRenderedPage().get(
"border:form2:border_body:textfield1");
@@ -100,7 +102,7 @@ public class HomePageTest extends WicketTestCase
* wicket-2202
*/
@Test
- public void withPanelAjax()
+ void withPanelAjax()
{
tester.executeAjaxEvent("form3:submit", "click");
@@ -112,7 +114,7 @@ public class HomePageTest extends WicketTestCase
* wicket-2202
*/
@Test
- public void withPanelForm()
+ void withPanelForm()
{
tester.clickLink("form3:submit2");
HomePage page = (HomePage)tester.getLastRenderedPage();
@@ -123,7 +125,7 @@ public class HomePageTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void test_2589() throws Exception
+ void test_2589() throws Exception
{
tester.startPage(HomePage1.class);
tester.assertRenderedPage(HomePage1.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/MyBorder.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/MyBorder.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/MyBorder.java
index 845f370..a9f63b7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/MyBorder.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/MyBorder.java
@@ -28,7 +28,7 @@ import org.apache.wicket.markup.html.panel.FeedbackPanel;
public class MyBorder extends Border
{
private static final long serialVersionUID = 1L;
- Form<Void> form;
+ private Form<Void> form;
boolean hitOnSubmit = false;
boolean hitOnError = false;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/BasePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/BasePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/BasePage.java
index 8829229..2911589 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/BasePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/innerfeedback/BasePage.java
@@ -30,7 +30,7 @@ public class BasePage extends WebPage
/**
* Construct.
*/
- public BasePage()
+ BasePage()
{
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/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 e1848e6..e919ca9 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
@@ -22,12 +22,12 @@ 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;
+import org.junit.jupiter.api.Test;
/**
* Test for Wicket-2974
*/
-public class InnerFeedbackTest extends WicketTestCase
+class InnerFeedbackTest extends WicketTestCase
{
@Override
@@ -60,7 +60,7 @@ public class InnerFeedbackTest extends WicketTestCase
*
*/
@Test
- public void innerFeedback()
+ void innerFeedback()
{
tester.getSession().setLocale(Locale.ENGLISH);
tester.startPage(HomePage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/BasePanel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/BasePanel.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/BasePanel.java
index f552968..ed14ec6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/BasePanel.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/BasePanel.java
@@ -31,7 +31,7 @@ public class BasePanel extends Panel
*
* @param id
*/
- public BasePanel(String id)
+ BasePanel(String id)
{
super(id);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/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 538359d..f45198c 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
@@ -17,12 +17,12 @@
package org.apache.wicket.markup.html.header;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class HeaderScopingTest extends WicketTestCase
+class HeaderScopingTest extends WicketTestCase
{
/**
@@ -30,7 +30,7 @@ public class HeaderScopingTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void headerScoping1() throws Exception
+ void headerScoping1() throws Exception
{
executeTest(MyPage.class, "MyPageExpectedResult.html");
}
@@ -40,7 +40,7 @@ public class HeaderScopingTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void headerScoping2() throws Exception
+ void headerScoping2() throws Exception
{
executeTest(MyPage2.class, "MyPage2_ExpectedResult.html");
}