http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelTest.java index cee2003..36cf933 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelTest.java @@ -16,30 +16,34 @@ */ package org.apache.wicket.markup.html.form; +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.Page; import org.apache.wicket.markup.IMarkupFragment; import org.apache.wicket.markup.Markup; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.model.Model; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests {@code wicket:for} attribute functionality * * @author igor */ -public class AutoLabelTest extends WicketTestCase +class AutoLabelTest extends WicketTestCase { /** */ @Test - public void labelIntoMarkupInsertion() + void labelIntoMarkupInsertion() { class MyTestPage extends TestPage { private static final long serialVersionUID = 1L; - public MyTestPage(String labelMarkup) + MyTestPage(String labelMarkup) { super("<label wicket:for='t'>" + labelMarkup + "</label>"); field.setLabel(Model.of("t")); @@ -72,13 +76,13 @@ public class AutoLabelTest extends WicketTestCase /** */ @Test - public void markupIntoLabelInsertion() + void markupIntoLabelInsertion() { class MyTestPage extends TestPage { private static final long serialVersionUID = 1L; - public MyTestPage(String labelMarkup) + MyTestPage(String labelMarkup) { super("<label wicket:for='t'>" + labelMarkup + "</label>"); } @@ -88,19 +92,19 @@ public class AutoLabelTest extends WicketTestCase MyTestPage page = new MyTestPage("<wicket:label>text</wicket:label>"); tester.startPage(page); - assertEquals("text", ((MyTestPage)tester.getLastRenderedPage()).field.getLabel() - .getObject()); + assertEquals("text", + ((MyTestPage)tester.getLastRenderedPage()).field.getLabel().getObject()); } /** */ @Test - public void labelTagClasses() + void labelTagClasses() { class MyTestPage extends TestPage { private static final long serialVersionUID = 1L; - public MyTestPage() + MyTestPage() { super("<label wicket:for='t'><span class='label-text'>field</span></label>"); } @@ -143,7 +147,7 @@ public class AutoLabelTest extends WicketTestCase { private static final long serialVersionUID = 1L; - public MyTestPage2() + MyTestPage2() { super( "<label class='long' wicket:for='t'><wicket:label>field</wicket:label></label>"); @@ -164,8 +168,8 @@ public class AutoLabelTest extends WicketTestCase tester.startPage(page); String markup = tester.getLastResponse().getDocument(); markup = markup.replace("'", "\""); - assertTrue("fragment: [" + markupFragment + "] not found in generated markup: [" + markup + - "]", markup.contains(markupFragment.replace("'", "\""))); + assertTrue(markup.contains(markupFragment.replace("'", "\"")), + "fragment: [" + markupFragment + "] not found in generated markup: [" + markup + "]"); } private void assertNotRendered(Page page, String markupFragment) @@ -173,19 +177,17 @@ public class AutoLabelTest extends WicketTestCase tester.startPage(page); String markup = tester.getLastResponse().getDocument(); markup = markup.replace("'", "\""); - assertFalse("fragment: [" + markupFragment + "] not found in generated markup: [" + markup + - "]", markup.contains(markupFragment.replace("'", "\""))); + assertFalse(markup.contains(markupFragment.replace("'", "\"")), + "fragment: [" + markupFragment + "] not found in generated markup: [" + markup + "]"); } private static class TestPage extends WebPage { private static final long serialVersionUID = 1L; - - TextField<String> field; - private final String labelMarkup; + TextField<String> field; - public TestPage(String labelMarkup) + TestPage(String labelMarkup) { this.labelMarkup = labelMarkup; Form<?> form = new Form<Void>("f");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithContentTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithContentTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithContentTest.java index 0cef9a8..ee1ebb5 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithContentTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithContentTest.java @@ -19,7 +19,7 @@ package org.apache.wicket.markup.html.form; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.model.Model; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Make sure AutoLabelForInputTagResolver works with nested {@literal <wicket:message>} and nested @@ -29,7 +29,7 @@ import org.junit.Test; * @author Carl-Eric Menzel <[email protected]> */ @SuppressWarnings({ "rawtypes", "unchecked" }) -public class AutoLabelWithContentTest extends WicketTestCase +class AutoLabelWithContentTest extends WicketTestCase { public static class LabelWithMessagePage extends WebPage { @@ -42,7 +42,7 @@ public class AutoLabelWithContentTest extends WicketTestCase } @Test - public void labelWithMessage() throws Exception + void labelWithMessage() throws Exception { tester.startPage(LabelWithMessagePage.class); tester.assertContains("<label wicket:for=\"textfield\" id=\"textfield2-w-lbl\" for=\"textfield2\"><wicket:message key=\"foo\">my test text</wicket:message></label>"); @@ -59,7 +59,7 @@ public class AutoLabelWithContentTest extends WicketTestCase } @Test - public void labelWithNestedComponent() + void labelWithNestedComponent() { tester.startPage(LabelWithNestedComponentsPage.class); tester.assertContains("<label wicket:for=\"textfield\" id=\"textfield2-w-lbl\" for=\"textfield2\"><input type=\"text\" wicket:id=\"textfield\" value=\"\" name=\"textfield\" id=\"textfield2\"/></label>"); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithinEnclosureTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithinEnclosureTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithinEnclosureTest.java index dac1263..398b9c2 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithinEnclosureTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithinEnclosureTest.java @@ -19,14 +19,14 @@ package org.apache.wicket.markup.html.form; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.model.Model; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; @SuppressWarnings({ "rawtypes", "serial", "unchecked" }) -public class AutoLabelWithinEnclosureTest extends WicketTestCase +class AutoLabelWithinEnclosureTest extends WicketTestCase { - public static class LabelWithinEnclosurePage extends WebPage + static class LabelWithinEnclosurePage extends WebPage { - public LabelWithinEnclosurePage(final boolean textFieldVisible) + LabelWithinEnclosurePage(final boolean textFieldVisible) { Form form = new Form("form"); add(form); @@ -42,7 +42,7 @@ public class AutoLabelWithinEnclosureTest extends WicketTestCase } @Test - public void labelWithinEnclosure_Visible() throws Exception + void labelWithinEnclosure_Visible() throws Exception { tester.startPage(new LabelWithinEnclosurePage(true)); tester.dumpPage(); @@ -50,7 +50,7 @@ public class AutoLabelWithinEnclosureTest extends WicketTestCase } @Test - public void labelWithinEnclosure_Invisible() throws Exception + void labelWithinEnclosure_Invisible() throws Exception { tester.startPage(new LabelWithinEnclosurePage(false)); tester.dumpPage(); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ButtonTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ButtonTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ButtonTest.java index fe303e6..dcb2d26 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ButtonTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ButtonTest.java @@ -16,10 +16,9 @@ */ package org.apache.wicket.markup.html.form; -import static org.hamcrest.Matchers.equalTo; -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.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import org.apache.wicket.MarkupContainer; import org.apache.wicket.markup.IMarkupResourceStreamProvider; @@ -31,19 +30,19 @@ 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; /** * @author svenmeier */ -public class ButtonTest extends WicketTestCase +class ButtonTest extends WicketTestCase { /** * WICKET-4734 Asserting that the value attribute on tag input is escaped once by default */ @Test - public void whenInputElement_thenModelObjectIsUsedForValueAttribute() + void whenInputElement_thenModelObjectIsUsedForValueAttribute() { tester.getApplication().getMarkupSettings().setStripWicketTags(false); String text = "some text & another text"; @@ -51,16 +50,16 @@ public class ButtonTest extends WicketTestCase tester.startPage(testPage); TagTester buttonTagTester = tester.getTagByWicketId("button"); - assertThat(buttonTagTester, is(notNullValue())); - assertThat(buttonTagTester.getAttribute("value"), is(equalTo(text))); - assertThat(buttonTagTester.getValue(), is(nullValue())); + assertNotNull(buttonTagTester); + assertEquals(text, buttonTagTester.getAttribute("value")); + assertNull(buttonTagTester.getValue()); } /** * https://issues.apache.org/jira/browse/WICKET-6225 */ @Test - public void whenButtonElement_thenModelObjectIsUsedAsTextContent() + void whenButtonElement_thenModelObjectIsUsedAsTextContent() { tester.getApplication().getMarkupSettings().setStripWicketTags(false); String text = "some text & another text"; @@ -75,16 +74,16 @@ public class ButtonTest extends WicketTestCase tester.startPage(testPage); TagTester buttonTagTester = tester.getTagByWicketId("button"); - assertThat(buttonTagTester, is(notNullValue())); - assertThat(buttonTagTester.getAttribute("value"), is(nullValue())); - assertThat(buttonTagTester.getValue(), is(equalTo(text))); + assertNotNull(buttonTagTester); + assertNull(buttonTagTester.getAttribute("value")); + assertEquals(text, buttonTagTester.getValue()); } /** * https://issues.apache.org/jira/browse/WICKET-6225 */ @Test - public void whenButtonElementWithoutModelObject_thenUseTextContentFromHtml() + void whenButtonElementWithoutModelObject_thenUseTextContentFromHtml() { tester.getApplication().getMarkupSettings().setStripWicketTags(false); String text = "some text & another text"; @@ -102,16 +101,16 @@ public class ButtonTest extends WicketTestCase tester.startPage(testPage); TagTester buttonTagTester = tester.getTagByWicketId("button"); - assertThat(buttonTagTester, is(notNullValue())); - assertThat(buttonTagTester.getAttribute("value"), is(nullValue())); - assertThat(buttonTagTester.getValue(), is(equalTo(textInHtml))); + assertNotNull(buttonTagTester); + assertNull(buttonTagTester.getAttribute("value")); + assertEquals(textInHtml, buttonTagTester.getValue()); } /** * WICKET-5235 button does not use an inherited model */ @Test - public void buttonDoesNotInheritModel() + void buttonDoesNotInheritModel() { TestPage testPage = new TestPage(null); tester.startPage(testPage); @@ -125,7 +124,7 @@ public class ButtonTest extends WicketTestCase Button button; /** */ - public TestPage(IModel<String> buttonModel) + TestPage(IModel<String> buttonModel) { add(form = new Form<Object>("form", new CompoundPropertyModel<>(new Object()))); form.add(button = new Button("button", buttonModel)); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceTest.java index 095da3a..465eb17 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceTest.java @@ -26,7 +26,7 @@ import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.util.value.IValueMap; import org.apache.wicket.util.value.ValueMap; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test the dynamic prefix/suffix feature introduced with @@ -34,7 +34,7 @@ import org.junit.Test; * * @author Carl-Eric Menzel <[email protected]> <[email protected]> */ -public class CheckBoxMultipleChoiceTest extends WicketTestCase +class CheckBoxMultipleChoiceTest extends WicketTestCase { /** */ public static class TestPage extends WebPage @@ -48,7 +48,7 @@ public class CheckBoxMultipleChoiceTest extends WicketTestCase * @param show2 * @param show3 */ - public TestPage(final boolean show1, final boolean show2, final boolean show3, boolean show4) + TestPage(final boolean show1, final boolean show2, final boolean show3, boolean show4) { List<? extends String> choices = Arrays.asList("a", "b", "c"); add(new CheckBoxMultipleChoice<String>("checkWithoutPrefix", choices) @@ -115,7 +115,7 @@ public class CheckBoxMultipleChoiceTest extends WicketTestCase /** */ @Test - public void noPrefix() + void noPrefix() { tester.startPage(new TestPage(true, false, false, false)); tester.assertContains("<div wicket:id=\"checkWithoutPrefix\"><input name=\"checkWithoutPrefix\""); @@ -123,7 +123,7 @@ public class CheckBoxMultipleChoiceTest extends WicketTestCase /** */ @Test - public void fixedPrefix() + void fixedPrefix() { tester.startPage(new TestPage(false, true, false, false)); tester.assertContains("<div wicket:id=\"checkWithFixedPrefix\">pre<input name=\"checkWithFixedPrefix\""); @@ -133,7 +133,7 @@ public class CheckBoxMultipleChoiceTest extends WicketTestCase /** */ @Test - public void dynamicPrefix() + void dynamicPrefix() { tester.startPage(new TestPage(false, false, true, false)); tester.assertContains("<div wicket:id=\"checkWithDynamicPrefix\">pre0a<input name=\"checkWithDynamicPrefix\""); @@ -142,14 +142,14 @@ public class CheckBoxMultipleChoiceTest extends WicketTestCase } @Test - public void disabledInHierarchy() + void disabledInHierarchy() { tester.startPage(new TestPage(false, false, false, true)); tester.assertContains("disabled=\"disabled\""); } @Test - public void defaultLabelPositionIsAfter() throws Exception + void defaultLabelPositionIsAfter() throws Exception { CheckBoxMultipleChoice<Integer> radioChoice = new CheckBoxMultipleChoice<Integer>("testid", Arrays.asList(1)) { @Override @@ -165,11 +165,12 @@ public class CheckBoxMultipleChoiceTest extends WicketTestCase }; tester.startComponentInPage(radioChoice); - tester.assertResultPage("<span wicket:id=\"testid\"><input name=\"testid\" type=\"checkbox\" value=\"0\" id=\"testid1-testid_0\" class=\"input0\"/><label for=\"testid1-testid_0\" class=\"label0\">1</label>\n</span>"); + tester.assertResultPage( + "<span wicket:id=\"testid\"><input name=\"testid\" type=\"checkbox\" value=\"0\" id=\"testid1-testid_0\" class=\"input0\"/><label for=\"testid1-testid_0\" class=\"label0\">1</label>\n</span>"); } @Test - public void labelPositionBefore() throws Exception + void labelPositionBefore() throws Exception { CheckBoxMultipleChoice<Integer> radioChoice = new CheckBoxMultipleChoice<Integer>("testid", Arrays.asList(1)) { @Override @@ -186,11 +187,12 @@ public class CheckBoxMultipleChoiceTest extends WicketTestCase radioChoice.setLabelPosition(AbstractChoice.LabelPosition.BEFORE); tester.startComponentInPage(radioChoice); - tester.assertResultPage("<span wicket:id=\"testid\"><label for=\"testid1-testid_0\" class=\"label0\">1</label><input name=\"testid\" type=\"checkbox\" value=\"0\" id=\"testid1-testid_0\" class=\"input0\"/>\n</span>"); + tester.assertResultPage( + "<span wicket:id=\"testid\"><label for=\"testid1-testid_0\" class=\"label0\">1</label><input name=\"testid\" type=\"checkbox\" value=\"0\" id=\"testid1-testid_0\" class=\"input0\"/>\n</span>"); } @Test - public void labelPositionWrapBefore() throws Exception + void labelPositionWrapBefore() throws Exception { CheckBoxMultipleChoice<Integer> radioChoice = new CheckBoxMultipleChoice<Integer>("testid", Arrays.asList(1)) { @Override @@ -207,11 +209,12 @@ public class CheckBoxMultipleChoiceTest extends WicketTestCase radioChoice.setLabelPosition(AbstractChoice.LabelPosition.WRAP_BEFORE); tester.startComponentInPage(radioChoice); - tester.assertResultPage("<span wicket:id=\"testid\"><label class=\"label0\">1 <input name=\"testid\" type=\"checkbox\" value=\"0\" id=\"testid1-testid_0\" class=\"input0\"/></label>\n</span>"); + tester.assertResultPage( + "<span wicket:id=\"testid\"><label class=\"label0\">1 <input name=\"testid\" type=\"checkbox\" value=\"0\" id=\"testid1-testid_0\" class=\"input0\"/></label>\n</span>"); } @Test - public void labelPositionWrapAfter() throws Exception + void labelPositionWrapAfter() throws Exception { CheckBoxMultipleChoice<Integer> radioChoice = new CheckBoxMultipleChoice<Integer>("testid", Arrays.asList(1)) { @Override http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java index 9c0da29..205b478 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java @@ -16,13 +16,15 @@ */ package org.apache.wicket.markup.html.form; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + import java.util.ArrayList; import java.util.List; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; - +import org.junit.jupiter.api.Test; /** * @author jcompagner @@ -33,13 +35,13 @@ import org.junit.Test; * @author igor * */ -public class CheckGroupTest extends WicketTestCase +class CheckGroupTest extends WicketTestCase { /** * test component form processing */ @Test - public void formProcessing() + void formProcessing() { // test model constructors @@ -52,42 +54,36 @@ public class CheckGroupTest extends WicketTestCase tester.submitForm(page.form); - assertTrue("running with nothing selected - model must be empty", list.size() == 0); + assertTrue(list.size() == 0, "running with nothing selected - model must be empty"); - tester.getRequest() - .getPostParameters() - .setParameterValue(page.group.getInputName(), page.check1.getValue()); + tester.getRequest().getPostParameters().setParameterValue(page.group.getInputName(), + page.check1.getValue()); tester.submitForm(page.form); - assertTrue("running with choice1 selected - model must only contain value of check1", - list.size() == 1 && list.contains("check1")); + assertTrue(list.size() == 1 && list.contains("check1"), + "running with choice1 selected - model must only contain value of check1"); - tester.getRequest() - .getPostParameters() - .setParameterValue(page.group.getInputName(), page.check2.getValue()); + tester.getRequest().getPostParameters().setParameterValue(page.group.getInputName(), + page.check2.getValue()); tester.submitForm(page.form); - assertTrue("running with choice2 selected - model must only contain value of check2", - list.size() == 1 && list.contains("check2")); + assertTrue(list.size() == 1 && list.contains("check2"), + "running with choice2 selected - model must only contain value of check2"); // throw in some nulls into the request param to make sure they are // ignored tester.getRequest().getPostParameters().addParameterValue(page.group.getInputName(), null); - tester.getRequest() - .getPostParameters() - .addParameterValue(page.group.getInputName(), page.check1.getValue()); - tester.getRequest() - .getPostParameters() - .addParameterValue(page.group.getInputName(), page.check2.getValue()); + tester.getRequest().getPostParameters().addParameterValue(page.group.getInputName(), + page.check1.getValue()); + tester.getRequest().getPostParameters().addParameterValue(page.group.getInputName(), + page.check2.getValue()); tester.submitForm(page.form); - assertTrue( - "running with choice1 and choice2 selected - model must only contain values of check1 and check2", - list.size() == 2 && list.contains("check1") && list.contains("check2")); + assertTrue(list.size() == 2 && list.contains("check1") && list.contains("check2"), + "running with choice1 and choice2 selected - model must only contain values of check1 and check2"); - tester.getRequest() - .getPostParameters() - .setParameterValue(page.group.getInputName(), "some weird choice uuid to test error"); + tester.getRequest().getPostParameters().setParameterValue(page.group.getInputName(), + "some weird choice uuid to test error"); try { tester.submitForm(page.form); @@ -104,7 +100,7 @@ public class CheckGroupTest extends WicketTestCase * @throws Exception */ @Test - public void rendering() throws Exception + void rendering() throws Exception { executeTest(CheckGroupTestPage1.class, "CheckGroupTestPage1_expected.html"); executeTest(CheckGroupTestPage2.class, "CheckGroupTestPage2_expected.html"); @@ -117,8 +113,8 @@ public class CheckGroupTest extends WicketTestCase } catch (WicketRuntimeException e) { - if (!e.getMessage().contains( - "Check component [4:form:check2] cannot find its parent CheckGroup")) + if (!e.getMessage() + .contains("Check component [4:form:check2] cannot find its parent CheckGroup")) { fail("failed with wrong exception"); } @@ -130,7 +126,7 @@ public class CheckGroupTest extends WicketTestCase * @throws Exception */ @Test - public void disabledCheckGroup() throws Exception + void disabledCheckGroup() throws Exception { executeTest(CheckGroupDisabledTestPage.class, "CheckGroupDisabledTestPage_expected.html"); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CollectionFormComponentTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CollectionFormComponentTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CollectionFormComponentTest.java index 55ca02b..e1c970a 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CollectionFormComponentTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CollectionFormComponentTest.java @@ -16,6 +16,10 @@ */ package org.apache.wicket.markup.html.form; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -29,8 +33,7 @@ import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Testing updating model collections through @@ -38,10 +41,10 @@ import org.junit.Test; * * @author svenmeier */ -public class CollectionFormComponentTest extends WicketTestCase +class CollectionFormComponentTest extends WicketTestCase { @Test - public void getSetNullList() + void getSetNullList() { final AtomicBoolean setCalled = new AtomicBoolean(); @@ -71,7 +74,7 @@ public class CollectionFormComponentTest extends WicketTestCase } @Test - public void getSetNullSet() + void getSetNullSet() { final AtomicBoolean setCalled = new AtomicBoolean(); @@ -100,8 +103,8 @@ public class CollectionFormComponentTest extends WicketTestCase assertEquals("[A, B]", choice.getDefaultModelObjectAsString()); } - @Test(expected = WicketRuntimeException.class) - public void getNullCollectionFails() + @Test + void getNullCollectionFails() { Object object = new Object() { @@ -115,11 +118,14 @@ public class CollectionFormComponentTest extends WicketTestCase Choice choice = new Choice(object); choice.setConvertedInput(Arrays.asList("A", "B")); - FormComponent.updateCollectionModel(choice); + + assertThrows(WicketRuntimeException.class, () -> { + FormComponent.updateCollectionModel(choice); + }); } @Test - public void getSetModifiableCollection() + void getSetModifiableCollection() { final AtomicBoolean setCalled = new AtomicBoolean(); @@ -149,7 +155,7 @@ public class CollectionFormComponentTest extends WicketTestCase } @Test - public void getModifiableCollection() + void getModifiableCollection() { Object object = new Object() { @@ -172,7 +178,7 @@ public class CollectionFormComponentTest extends WicketTestCase * WICKET-5518 */ @Test - public void getSetUnmodifiableList() + void getSetUnmodifiableList() { final AtomicBoolean setCalled = new AtomicBoolean(); @@ -202,7 +208,7 @@ public class CollectionFormComponentTest extends WicketTestCase } @Test - public void getSetUnmodifiableSet() + void getSetUnmodifiableSet() { final AtomicBoolean setCalled = new AtomicBoolean(); @@ -231,8 +237,8 @@ public class CollectionFormComponentTest extends WicketTestCase assertEquals("[A, B]", choice.getDefaultModelObjectAsString()); } - @Test(expected = WicketRuntimeException.class) - public void getUnmodifiableFails() + @Test + void getUnmodifiableFails() { Object object = new Object() { @@ -246,11 +252,14 @@ public class CollectionFormComponentTest extends WicketTestCase Choice choice = new Choice(object); choice.setConvertedInput(Arrays.asList("A", "B")); - FormComponent.updateCollectionModel(choice); + + assertThrows(WicketRuntimeException.class, () -> { + FormComponent.updateCollectionModel(choice); + }); } @Test - public void getUnmodifiableInCaseOfNoConvertedInput() + void getUnmodifiableInCaseOfNoConvertedInput() { LoadableDetachableModel<Collection<String>> model = new LoadableDetachableModel<Collection<String>>() { @@ -269,11 +278,11 @@ public class CollectionFormComponentTest extends WicketTestCase }; formComponent.setConvertedInput(null); FormComponent.updateCollectionModel(formComponent); - Assert.assertTrue(formComponent.getModelObject().isEmpty()); + assertTrue(formComponent.getModelObject().isEmpty()); } @Test - public void getModelCollectionIsNullInCaseOfNoConvertedInput() + void getModelCollectionIsNullInCaseOfNoConvertedInput() { LoadableDetachableModel<Collection<String>> model = new LoadableDetachableModel<Collection<String>>() { @@ -292,13 +301,13 @@ public class CollectionFormComponentTest extends WicketTestCase }; formComponent.setConvertedInput(null); FormComponent.updateCollectionModel(formComponent); - Assert.assertTrue(formComponent.getModelObject().isEmpty()); + assertTrue(formComponent.getModelObject().isEmpty()); } private class Choice extends FormComponent<Collection<String>> { - public Choice(Object object) + Choice(Object object) { super("choice", new PropertyModel(object, "strings")); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DisabledItemRetainingCheckBoxTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DisabledItemRetainingCheckBoxTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DisabledItemRetainingCheckBoxTest.java index 979ba16..1a65e68 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DisabledItemRetainingCheckBoxTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DisabledItemRetainingCheckBoxTest.java @@ -16,6 +16,10 @@ */ package org.apache.wicket.markup.html.form; +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 java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -25,18 +29,18 @@ import org.apache.wicket.model.PropertyModel; import org.apache.wicket.request.mapper.parameter.PageParameters; 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 the retainDisabledSelected flag on ListMultipleChoice. */ -public class DisabledItemRetainingCheckBoxTest extends WicketTestCase +class DisabledItemRetainingCheckBoxTest extends WicketTestCase { /** * testRenderMyPage() */ @Test - public void renderMyPage() + void renderMyPage() { TestPage page = tester.startPage(TestPage.class); tester.assertRenderedPage(TestPage.class); @@ -50,7 +54,7 @@ public class DisabledItemRetainingCheckBoxTest extends WicketTestCase * @throws Exception */ @Test - public void retainDisabledSelected_On() throws Exception + void retainDisabledSelected_On() throws Exception { TestPage page = tester.startPage(TestPage.class); FormTester form = tester.newFormTester("form"); @@ -65,7 +69,7 @@ public class DisabledItemRetainingCheckBoxTest extends WicketTestCase * @throws Exception */ @Test - public void retainDisabledSelected_Off() throws Exception + void retainDisabledSelected_Off() throws Exception { TestPage page = tester.startPage(TestPage.class); FormTester form = tester.newFormTester("form"); @@ -80,7 +84,7 @@ public class DisabledItemRetainingCheckBoxTest extends WicketTestCase * @throws Exception */ @Test - public void retainDisabledSelected_NoSelection() throws Exception + void retainDisabledSelected_NoSelection() throws Exception { TestPage page = tester.startPage(TestPage.class); FormTester form = tester.newFormTester("form"); @@ -94,7 +98,7 @@ public class DisabledItemRetainingCheckBoxTest extends WicketTestCase * @throws Exception */ @Test - public void retainDisabledSelected_Off_NoSelection() throws Exception + void retainDisabledSelected_Off_NoSelection() throws Exception { TestPage page = tester.startPage(TestPage.class); FormTester form = tester.newFormTester("form"); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTest.java index feb8404..ec00657 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTest.java @@ -19,21 +19,21 @@ package org.apache.wicket.markup.html.form; import java.util.Locale; 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; /** * @author Juergen Donnerstag * @author svenmeier */ -public class DropDownChoiceTest extends WicketTestCase +class DropDownChoiceTest extends WicketTestCase { /** * @throws Exception */ - @Before - public void before() throws Exception + @BeforeEach + void before() throws Exception { tester.getSession().setLocale(Locale.ENGLISH); } @@ -44,7 +44,7 @@ public class DropDownChoiceTest extends WicketTestCase * @throws Exception */ @Test - public void nullWithNullValidFalse() throws Exception + void nullWithNullValidFalse() throws Exception { executeTest(new DropDownChoiceTestPage(null, false), "DropDownChoiceTestPage_null_false_expected.html"); @@ -56,7 +56,7 @@ public class DropDownChoiceTest extends WicketTestCase * @throws Exception */ @Test - public void nullWithNullValidTrue() throws Exception + void nullWithNullValidTrue() throws Exception { executeTest(new DropDownChoiceTestPage(null, true), "DropDownChoiceTestPage_null_true_expected.html"); @@ -68,7 +68,7 @@ public class DropDownChoiceTest extends WicketTestCase * @throws Exception */ @Test - public void nonNullWithNullValidFalse() throws Exception + void nonNullWithNullValidFalse() throws Exception { executeTest(new DropDownChoiceTestPage("A", false), "DropDownChoiceTestPage_A_false_expected.html"); @@ -80,7 +80,7 @@ public class DropDownChoiceTest extends WicketTestCase * @throws Exception */ @Test - public void nonNullWithNullValidTrue() throws Exception + void nonNullWithNullValidTrue() throws Exception { executeTest(new DropDownChoiceTestPage("A", true), "DropDownChoiceTestPage_A_true_expected.html"); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EnumChoiceRendererTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EnumChoiceRendererTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EnumChoiceRendererTest.java index d33414e..c3b1c82 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EnumChoiceRendererTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EnumChoiceRendererTest.java @@ -16,21 +16,23 @@ */ package org.apache.wicket.markup.html.form; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; /** * Tests {@link EnumChoiceRenderer} * * @author igor.vaynberg */ -public class EnumChoiceRendererTest extends org.junit.Assert +public class EnumChoiceRendererTest { /** * */ @Test - public void testResourceKeyGenerationForAnonymousEnums() + void testResourceKeyGenerationForAnonymousEnums() { final EnumChoiceRenderer<TestEnum> renderer = new EnumChoiceRenderer<TestEnum>(); assertEquals("TestEnum.ANONYMOUS", renderer.resourceKey(TestEnum.ANONYMOUS)); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EscapeAttributesInChoicesTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EscapeAttributesInChoicesTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EscapeAttributesInChoicesTest.java index 0953587..142cf3f 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EscapeAttributesInChoicesTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EscapeAttributesInChoicesTest.java @@ -16,19 +16,22 @@ */ package org.apache.wicket.markup.html.form; +import static org.apache.wicket.util.tester.TagTester.createTagByAttribute; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + import org.apache.wicket.util.tester.TagTester; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; - -import static org.apache.wicket.util.tester.TagTester.createTagByAttribute; +import org.junit.jupiter.api.Test; /** * Test XSS vulnerability in RadioChoice and CheckBoxMultipleChoice */ -public class EscapeAttributesInChoicesTest extends WicketTestCase +class EscapeAttributesInChoicesTest extends WicketTestCase { @Test - public void escapeAttributes() + void escapeAttributes() { tester.startPage(EscapeAttributesInChoicesPage.class); String lastResponseAsString = tester.getLastResponseAsString(); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java index 4562d24..2566511 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java @@ -16,7 +16,8 @@ */ package org.apache.wicket.markup.html.form; -import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import java.io.Serializable; @@ -29,14 +30,14 @@ 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 form component panel related form processing * * @author ivaynberg */ -public class FormComponentPanelProcessingTest extends WicketTestCase +class FormComponentPanelProcessingTest extends WicketTestCase { /** @@ -44,7 +45,7 @@ public class FormComponentPanelProcessingTest extends WicketTestCase * should be processed first. */ @Test - public void processingOrder() + void processingOrder() { tester.startPage(new TestPage()); tester.assertRenderedPage(TestPage.class); @@ -53,16 +54,16 @@ public class FormComponentPanelProcessingTest extends WicketTestCase } @Test - public void clearInput() + void clearInput() { tester.startPage(new TestPage()); tester.assertRenderedPage(TestPage.class); TestFormComponentPanel fcp = (TestFormComponentPanel) tester.getComponentFromLastRenderedPage("form:panel"); - assertThat(fcp.isChildClearInputCalled(), is(false)); + assertEquals(false, fcp.isChildClearInputCalled()); fcp.clearInput(); - assertThat(fcp.isChildClearInputCalled(), is(true)); + assertEquals(true, fcp.isChildClearInputCalled()); } private static class TestFormComponentPanel extends FormComponentPanel<Serializable> @@ -152,7 +153,7 @@ public class FormComponentPanelProcessingTest extends WicketTestCase { private static final long serialVersionUID = 1L; - public TestPage() + TestPage() { Form<Void> form = new Form<>("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/FormComponentTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentTest.java index 3a84940..f7de1c4 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentTest.java @@ -16,7 +16,10 @@ */ package org.apache.wicket.markup.html.form; -import org.junit.Assert; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +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.WebPage; @@ -25,39 +28,39 @@ import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.validation.INullAcceptingValidator; import org.apache.wicket.validation.IValidatable; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * */ -public class FormComponentTest extends WicketTestCase +class FormComponentTest extends WicketTestCase { @Test - public void arrayType() + void arrayType() { final FormComponent<?> fc = new TextField<String>("foo"); fc.setType(String[].class); - Assert.assertSame(String[].class, fc.getType()); + assertSame(String[].class, fc.getType()); } @Test - public void multiDimentionalArrayType() + void multiDimentionalArrayType() { final FormComponent<?> fc = new TextField<String>("foo"); fc.setType(String[][][].class); - Assert.assertSame(String[][][].class, fc.getType()); + assertSame(String[][][].class, fc.getType()); } @Test - public void primitiveArrayType() + void primitiveArrayType() { final FormComponent<?> fc = new TextField<String>("foo"); fc.setType(boolean[].class); - Assert.assertSame(boolean[].class, fc.getType()); + assertSame(boolean[].class, fc.getType()); } @Test - public void getDefaultlabel() + void getDefaultlabel() { tester.startPage(TestPage1.class); TestPage1 page = (TestPage1)tester.getLastRenderedPage(); @@ -66,7 +69,7 @@ public class FormComponentTest extends WicketTestCase } @Test - public void nullAcceptingValidators() + void nullAcceptingValidators() { class MyValidator implements INullAcceptingValidator { @@ -88,11 +91,12 @@ public class FormComponentTest extends WicketTestCase assertTrue(validator.called); } - public static class TestPage1 extends WebPage implements IMarkupResourceStreamProvider + public static class TestPage1 extends WebPage implements IMarkupResourceStreamProvider { - public final TextField field1, field2; + final TextField field1; + final TextField field2; - public TestPage1() + public TestPage1() { Form form = new Form("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/FormHasErrorPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java index 546005c..1c2aef6 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.markup.html.form; -import org.junit.Assert; +import static org.junit.jupiter.api.Assertions.fail; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; @@ -42,7 +42,7 @@ public class FormHasErrorPage extends WebPage * * @param id */ - public InvalidPanel(String id) + InvalidPanel(String id) { super(id); } @@ -88,7 +88,7 @@ public class FormHasErrorPage extends WebPage { super.onSubmit(); labelModel.setObject("Test FAILED - an error was expected"); - Assert.fail("A validation error should've been detected by the Form processing"); + fail("A validation error should've been detected by the Form processing"); } @Override http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodMismatchTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodMismatchTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodMismatchTest.java index 83c3ab2..341ae2c 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodMismatchTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodMismatchTest.java @@ -16,25 +16,25 @@ */ package org.apache.wicket.markup.html.form; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.ajax.markup.html.form.AjaxButton; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.util.tester.FormTester; import org.apache.wicket.util.tester.WicketTester; -import org.junit.Test; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Test; -public class FormMethodMismatchTest { +class FormMethodMismatchTest { - public static class PlainFormPage extends WebPage { - public PlainFormPage(Form<Void> underTest) { + static class PlainFormPage extends WebPage { + PlainFormPage(Form<Void> underTest) { add(underTest); } } @Test - public void formSubmittedContinuesWithCorrectMethod() { + void formSubmittedContinuesWithCorrectMethod() { final WicketTester tester = new WicketTester(); final boolean[] onSubmitCalled = new boolean[1]; final Form<Void> underTest = new Form<Void>("underTest") { @@ -50,7 +50,7 @@ public class FormMethodMismatchTest { } @Test - public void formSubmittedContinuesByDefaultWithMismatchingMethod() { + void formSubmittedContinuesByDefaultWithMismatchingMethod() { final WicketTester tester = new WicketTester(); final boolean[] onSubmitCalled = new boolean[1]; final Form<Void> underTest = new Form<Void>("underTest") { @@ -67,7 +67,7 @@ public class FormMethodMismatchTest { } @Test - public void formSubmittedAbortsByWithMismatchingMethodWhenDesired() { + void formSubmittedAbortsByWithMismatchingMethodWhenDesired() { final WicketTester tester = new WicketTester(); final boolean[] onSubmitCalled = new boolean[1]; final Form<Void> underTest = new Form<Void>("underTest") { @@ -89,7 +89,7 @@ public class FormMethodMismatchTest { } @Test - public void formSubmittedContinuesByWithCorrectMethodWhenDesired() { + void formSubmittedContinuesByWithCorrectMethodWhenDesired() { final WicketTester tester = new WicketTester(); final boolean[] onSubmitCalled = new boolean[1]; final Form<Void> underTest = new Form<Void>("underTest") { @@ -109,15 +109,15 @@ public class FormMethodMismatchTest { assertTrue(onSubmitCalled[0]); } - public static class FormWithButtonPage extends WebPage { - public FormWithButtonPage(Form<Void> underTest) { + static class FormWithButtonPage extends WebPage { + FormWithButtonPage(Form<Void> underTest) { add(underTest); underTest.add(new Button("button")); } } @Test - public void withButtonFormSubmittedContinuesWithCorrectMethod() { + void withButtonFormSubmittedContinuesWithCorrectMethod() { final WicketTester tester = new WicketTester(); final boolean[] onSubmitCalled = new boolean[1]; final Form<Void> underTest = new Form<Void>("underTest") { @@ -133,7 +133,7 @@ public class FormMethodMismatchTest { } @Test - public void withButtonFormSubmittedContinuesByDefaultWithMismatchingMethod() { + void withButtonFormSubmittedContinuesByDefaultWithMismatchingMethod() { final WicketTester tester = new WicketTester(); final boolean[] onSubmitCalled = new boolean[1]; final Form<Void> underTest = new Form<Void>("underTest") { @@ -150,7 +150,7 @@ public class FormMethodMismatchTest { } @Test - public void withButtonFormSubmittedAbortsByWithMismatchingMethodWhenDesired() { + void withButtonFormSubmittedAbortsByWithMismatchingMethodWhenDesired() { final WicketTester tester = new WicketTester(); final boolean[] onSubmitCalled = new boolean[1]; final Form<Void> underTest = new Form<Void>("underTest") { @@ -172,7 +172,7 @@ public class FormMethodMismatchTest { } @Test - public void withButtonFormSubmittedContinuesByWithCorrectMethodWhenDesired() { + void withButtonFormSubmittedContinuesByWithCorrectMethodWhenDesired() { final WicketTester tester = new WicketTester(); final boolean[] onSubmitCalled = new boolean[1]; final Form<Void> underTest = new Form<Void>("underTest") { @@ -192,8 +192,8 @@ public class FormMethodMismatchTest { assertTrue(onSubmitCalled[0]); } - public static class FormWithAjaxButtonPage extends WebPage { - public FormWithAjaxButtonPage(Form<Void> underTest) { + static class FormWithAjaxButtonPage extends WebPage { + FormWithAjaxButtonPage(Form<Void> underTest) { add(underTest); underTest.add(new AjaxButton("button") { @@ -201,7 +201,7 @@ public class FormMethodMismatchTest { } } @Test - public void withAjaxButtonFormSubmittedContinuesWithCorrectMethod() { + void withAjaxButtonFormSubmittedContinuesWithCorrectMethod() { final WicketTester tester = new WicketTester(); final boolean[] onSubmitCalled = new boolean[1]; final Form<Void> underTest = new Form<Void>("underTest") { @@ -217,7 +217,7 @@ public class FormMethodMismatchTest { } @Test - public void withAjaxButtonFormSubmittedContinuesByDefaultWithMismatchingMethod() { + void withAjaxButtonFormSubmittedContinuesByDefaultWithMismatchingMethod() { final WicketTester tester = new WicketTester(); final boolean[] onSubmitCalled = new boolean[1]; final Form<Void> underTest = new Form<Void>("underTest") { @@ -234,7 +234,7 @@ public class FormMethodMismatchTest { } @Test - public void withAjaxButtonFormSubmittedAbortsByWithMismatchingMethodWhenDesired() { + void withAjaxButtonFormSubmittedAbortsByWithMismatchingMethodWhenDesired() { final WicketTester tester = new WicketTester(); final boolean[] onSubmitCalled = new boolean[1]; final Form<Void> underTest = new Form<Void>("underTest") { @@ -256,7 +256,7 @@ public class FormMethodMismatchTest { } @Test - public void withAjaxButtonFormSubmittedContinuesByWithCorrectMethodWhenDesired() { + void withAjaxButtonFormSubmittedContinuesByWithCorrectMethodWhenDesired() { final WicketTester tester = new WicketTester(); final boolean[] onSubmitCalled = new boolean[1]; final Form<Void> underTest = new Form<Void>("underTest") { http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMultiPartTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMultiPartTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMultiPartTest.java index cb8effb..4c273b0 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMultiPartTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMultiPartTest.java @@ -16,19 +16,21 @@ */ package org.apache.wicket.markup.html.form; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** */ -public class FormMultiPartTest extends WicketTestCase +class FormMultiPartTest extends WicketTestCase { - + @Test - public void multipartHard() + void multipartHard() { MultiPartFormPage page = new MultiPartFormPage(); - + page.form.setMultiPart(true); tester.startPage(page); @@ -38,7 +40,7 @@ public class FormMultiPartTest extends WicketTestCase } @Test - public void multipartHint() + void multipartHint() { MultiPartFormPage page = new MultiPartFormPage(); @@ -46,20 +48,20 @@ public class FormMultiPartTest extends WicketTestCase tester.startPage(page); assertEquals(1, page.asked); assertEquals(false, page.form.isMultiPart()); - + page.multiPart = true; tester.newFormTester("form").submit(page.button1); assertEquals(2, page.asked); assertEquals(true, page.form.isMultiPart()); - + page.multiPart = false; tester.newFormTester("form").submit(page.button1); assertEquals(3, page.asked); - assertEquals(false, page.form.isMultiPart()); + assertEquals(false, page.form.isMultiPart()); } - + @Test - public void multipartHintAjax() + void multipartHintAjax() { MultiPartFormPage page = new MultiPartFormPage(); @@ -67,15 +69,15 @@ public class FormMultiPartTest extends WicketTestCase tester.startPage(page); assertEquals(1, page.asked); assertEquals(false, page.form.isMultiPart()); - + page.multiPart = true; tester.executeAjaxEvent(page.button1, "click"); assertEquals(2, page.asked); assertEquals(true, page.form.isMultiPart()); - + page.multiPart = false; tester.executeAjaxEvent(page.button1, "click"); assertEquals(3, page.asked); - assertEquals(false, page.form.isMultiPart()); + assertEquals(false, page.form.isMultiPart()); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormParentDisabledRawInputTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormParentDisabledRawInputTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormParentDisabledRawInputTest.java index 63a6cc5..307a761 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormParentDisabledRawInputTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormParentDisabledRawInputTest.java @@ -16,17 +16,21 @@ */ package org.apache.wicket.markup.html.form; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.Component; +import org.apache.wicket.core.request.handler.ListenerInvocationNotAllowedException; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.util.tester.WicketTestCase; -import org.apache.wicket.core.request.handler.ListenerInvocationNotAllowedException; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** */ -public class FormParentDisabledRawInputTest extends WicketTestCase +class FormParentDisabledRawInputTest extends WicketTestCase { /** */ @@ -39,7 +43,7 @@ public class FormParentDisabledRawInputTest extends WicketTestCase /** * Construct. */ - public TestPage() + TestPage() { setStatelessHint(false); @@ -61,11 +65,9 @@ public class FormParentDisabledRawInputTest extends WicketTestCase } /** - * @throws Exception */ - @Test(expected = ListenerInvocationNotAllowedException.class) - public void disabledParent() throws Exception - { + @Test + void disabledParent() { TestPage page = new TestPage(); page.enabled = false; tester.startPage(page); @@ -76,6 +78,9 @@ public class FormParentDisabledRawInputTest extends WicketTestCase assertFalse(check.isEnabledInHierarchy()); // nothing should change with a submit that changes no values - tester.newFormTester("container:form").submit(); + + assertThrows(ListenerInvocationNotAllowedException.class, () -> { + tester.newFormTester("container:form").submit(); + }); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitOrderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitOrderTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitOrderTest.java index 29bea53..f9dee74 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitOrderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitOrderTest.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.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class FormSubmitOrderTest extends WicketTestCase +class FormSubmitOrderTest extends WicketTestCase { - public static class TestPage extends WebPage + public static class TestPage extends WebPage { String result = ""; - public TestPage() + public TestPage() { - Form form = new Form("form") + Form form = new Form<>("form") { @Override protected void onSubmit() @@ -58,7 +60,7 @@ public class FormSubmitOrderTest extends WicketTestCase } @Test - public void submitOrder() throws Exception + void submitOrder() throws Exception { TestPage page = tester.startPage(TestPage.class); tester.newFormTester("form").submit("button"); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitTest.java index 2c53348..9830627 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormSubmitTest.java @@ -16,13 +16,16 @@ */ package org.apache.wicket.markup.html.form; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; + import org.apache.wicket.Component; import org.apache.wicket.core.request.handler.ListenerInvocationNotAllowedException; import org.apache.wicket.markup.html.form.NestedFormsPage.NestableForm; 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; /** * Please see <a href="http://cwiki.apache.org/WICKET/nested-forms.html";>"Nested Forms"</a> for more @@ -30,7 +33,7 @@ import org.junit.Test; * * @author Gerolf Seitz */ -public class FormSubmitTest extends WicketTestCase +class FormSubmitTest extends WicketTestCase { private NestedFormsPage page; private NestableForm outerForm; @@ -40,8 +43,8 @@ public class FormSubmitTest extends WicketTestCase /** * */ - @Before - public void before() + @BeforeEach + void before() { tester.startPage(new NestedFormsPage()); page = (NestedFormsPage)tester.getLastRenderedPage(); @@ -54,7 +57,7 @@ public class FormSubmitTest extends WicketTestCase * */ @Test - public void allFormsEnabledSubmitOuterForm() + void allFormsEnabledSubmitOuterForm() { assertEnabledState(true, true, true); @@ -68,7 +71,7 @@ public class FormSubmitTest extends WicketTestCase private void assertSubmitOrder(NestableForm... forms) { - assertEquals("not submitted in expected order!", joinIds(forms), page.submitOrder); + assertEquals(joinIds(forms), page.submitOrder, "not submitted in expected order!"); } private String joinIds(Component[] comps) @@ -83,14 +86,14 @@ public class FormSubmitTest extends WicketTestCase private void assertErrorOrder(NestableForm... forms) { - assertEquals("not onError'd in expected order!", joinIds(forms), page.errorOrder); + assertEquals(joinIds(forms), page.errorOrder, "not onError'd in expected order!"); } /** * */ @Test - public void allFormsEnabledSubmitMiddleForm() + void allFormsEnabledSubmitMiddleForm() { assertEnabledState(true, true, true); @@ -106,7 +109,7 @@ public class FormSubmitTest extends WicketTestCase * */ @Test - public void allFormsEnabledSubmitInnerForm() + void allFormsEnabledSubmitInnerForm() { assertEnabledState(true, true, true); @@ -122,7 +125,7 @@ public class FormSubmitTest extends WicketTestCase * */ @Test - public void middleFormDisabledSubmitOuterForm() + void middleFormDisabledSubmitOuterForm() { // disable middle form middleForm.setEnabled(false); @@ -141,7 +144,7 @@ public class FormSubmitTest extends WicketTestCase * */ @Test - public void innerFormDisabledSubmitOuterForm() + void innerFormDisabledSubmitOuterForm() { // disable middle form innerForm.setEnabled(false); @@ -160,7 +163,7 @@ public class FormSubmitTest extends WicketTestCase * */ @Test - public void submitDisabledOuterForm() + void submitDisabledOuterForm() { outerForm.setEnabled(false); assertEnabledState(false, true, true); @@ -183,7 +186,7 @@ public class FormSubmitTest extends WicketTestCase * */ @Test - public void errorOnInnerFormSubmitOuterForm() + void errorOnInnerFormSubmitOuterForm() { assertEnabledState(true, true, true); @@ -198,7 +201,7 @@ public class FormSubmitTest extends WicketTestCase * */ @Test - public void errorOnMiddleFormSubmitOuterForm() + void errorOnMiddleFormSubmitOuterForm() { assertEnabledState(true, true, true); @@ -213,7 +216,7 @@ public class FormSubmitTest extends WicketTestCase * */ @Test - public void errorOnMiddleFormSubmitMiddleForm() + void errorOnMiddleFormSubmitMiddleForm() { assertEnabledState(true, true, true); @@ -228,7 +231,7 @@ public class FormSubmitTest extends WicketTestCase * */ @Test - public void errorOnInnerFormSubmitMiddleForm() + void errorOnInnerFormSubmitMiddleForm() { assertEnabledState(true, true, true); @@ -243,7 +246,7 @@ public class FormSubmitTest extends WicketTestCase * */ @Test - public void middleFormDisabledErrorOnOuterFormSubmitOuterForm() + void middleFormDisabledErrorOnOuterFormSubmitOuterForm() { middleForm.setEnabled(false); assertEnabledState(true, false, true); @@ -259,7 +262,7 @@ public class FormSubmitTest extends WicketTestCase * */ @Test - public void errorOnInnerFormDisabledMiddleFormSubmitOuterForm() + void errorOnInnerFormDisabledMiddleFormSubmitOuterForm() { middleForm.setEnabled(false); assertEnabledState(true, false, true); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java index b05740e..f6275f9 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java @@ -16,6 +16,10 @@ */ package org.apache.wicket.markup.html.form; +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.MarkupContainer; import org.apache.wicket.MockPageParametersAware; import org.apache.wicket.markup.IMarkupResourceStreamProvider; @@ -26,9 +30,8 @@ import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.string.Strings; import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.util.visit.IVisitor; -import org.junit.Before; -import org.junit.Test; - +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Pekka Enberg @@ -41,8 +44,8 @@ public class FormTest extends WicketTestCase /** * */ - @Before - public void before() + @BeforeEach + void before() { visitor = new Form.ValidationVisitor() { @@ -57,7 +60,7 @@ public class FormTest extends WicketTestCase * WICKET-6540 */ @Test - public void defaultButton() throws Exception + void defaultButton() throws Exception { executeTest(FormDefaultButtonTestPage.class, "FormDefaultButtonTestPage_expected.html"); } @@ -66,7 +69,7 @@ public class FormTest extends WicketTestCase * WICKET-6525 / WICKET-6348 */ @Test - public void formMethods() throws Exception + void formMethods() throws Exception { executeTest(FormMethodTestPage.class, "FormMethodTestPage_expected.html"); @@ -85,7 +88,7 @@ public class FormTest extends WicketTestCase * WICKET-3488 */ @Test - public void formReplacement() + void formReplacement() { tester.startPage(TestPage.class); tester.newFormTester("form").submit(); @@ -96,7 +99,7 @@ public class FormTest extends WicketTestCase * */ @Test - public void actionUrlNotDoubleEscaped() + void actionUrlNotDoubleEscaped() { tester.startPage(TestPage.class); String response = tester.getLastResponseAsString(); @@ -104,14 +107,14 @@ public class FormTest extends WicketTestCase } @Test - public void onValidateModelObjects() + void onValidateModelObjects() { class TestPage extends WebPage implements IMarkupResourceStreamProvider { boolean shouldFail, submit, error; - public TestPage() + TestPage() { add(new Form<Void>("form") { @@ -163,7 +166,7 @@ public class FormTest extends WicketTestCase { private static final long serialVersionUID = 1L; /** */ - public static final String TEST_QUERY_STRING = "&query_p_1=value_1"; + static final String TEST_QUERY_STRING = "&query_p_1=value_1"; @Override protected Form<Void> newForm(String id) @@ -188,7 +191,7 @@ public class FormTest extends WicketTestCase * @throws Exception */ @Test - public void pageWithParameters() throws Exception + void pageWithParameters() throws Exception { PageParameters parameters = new PageParameters(); parameters.add("first", "foo"); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormValidationDisabledFormComponentTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormValidationDisabledFormComponentTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormValidationDisabledFormComponentTest.java index faf9d7f..d5e496b 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormValidationDisabledFormComponentTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormValidationDisabledFormComponentTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket.markup.html.form; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.concurrent.atomic.AtomicBoolean; import org.apache.wicket.MarkupContainer; @@ -30,12 +33,12 @@ import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.FormTester; import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.util.tester.WicketTester; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test case for https://issues.apache.org/jira/browse/WICKET-5883 */ -public class FormValidationDisabledFormComponentTest extends WicketTestCase +class FormValidationDisabledFormComponentTest extends WicketTestCase { @Override protected WebApplication newApplication() @@ -68,7 +71,7 @@ public class FormValidationDisabledFormComponentTest extends WicketTestCase } @Test - public void formSubmitsEvenWithInvalidButInvisibleFormComponent() + void formSubmitsEvenWithInvalidButInvisibleFormComponent() { TestPage page = tester.startPage(TestPage.class); assertFalse(page.onSubmitCalled.get()); @@ -90,7 +93,7 @@ public class FormValidationDisabledFormComponentTest extends WicketTestCase } @Test - public void formSubmitsEvenWithInvalidButDisabledFormComponent() + void formSubmitsEvenWithInvalidButDisabledFormComponent() { TestPage page = tester.startPage(TestPage.class); assertFalse(page.onSubmitCalled.get()); @@ -113,14 +116,14 @@ public class FormValidationDisabledFormComponentTest extends WicketTestCase public static class TestPage extends WebPage implements IMarkupResourceStreamProvider { - public final AtomicBoolean onSubmitCalled = new AtomicBoolean(false); - public final AtomicBoolean onErrorCalled = new AtomicBoolean(false); - public final TextField field1; - public final Form form; + final AtomicBoolean onSubmitCalled = new AtomicBoolean(false); + final AtomicBoolean onErrorCalled = new AtomicBoolean(false); + final TextField field1; + final Form form; public TestPage() { - form = new Form("form") + form = new Form<>("form") { @Override protected void onSubmit() http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormValidationTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormValidationTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormValidationTest.java index b3dede8..0437ade 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormValidationTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormValidationTest.java @@ -16,7 +16,8 @@ */ package org.apache.wicket.markup.html.form; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.apache.wicket.MarkupContainer; import org.apache.wicket.markup.IMarkupResourceStreamProvider; @@ -25,19 +26,19 @@ import org.apache.wicket.model.Model; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.FormTester; -import org.apache.wicket.util.tester.WicketTesterScope; -import org.junit.Rule; -import org.junit.Test; +import org.apache.wicket.util.tester.WicketTesterExtension; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; /** * Form validation related tests * * @author igor */ -public class FormValidationTest +class FormValidationTest { - @Rule - public WicketTesterScope scope = new WicketTesterScope(); + @RegisterExtension + public WicketTesterExtension scope = new WicketTesterExtension(); /** * Tests validation of form components when all errors are rendered using a feedback panel. @@ -47,7 +48,7 @@ public class FormValidationTest * end of the request. */ @Test - public void renderedFeedbackMessages() + void renderedFeedbackMessages() { // start the page @@ -90,7 +91,7 @@ public class FormValidationTest * they should not block the component from re-validating. */ @Test - public void unrenderedFeedbackMessages() + void unrenderedFeedbackMessages() { // start the page @@ -122,12 +123,12 @@ public class FormValidationTest } - public static class TestPage extends WebPage implements IMarkupResourceStreamProvider + public static class TestPage extends WebPage implements IMarkupResourceStreamProvider { - public final TextField field1; - public final Form form; + final TextField field1; + final Form form; - public TestPage() + public TestPage() { form = new Form("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/FormWithMultipleButtonsTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java index 9a66640..447e174 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java @@ -16,6 +16,10 @@ */ package org.apache.wicket.markup.html.form; +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 java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -29,19 +33,19 @@ import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Pedro Santos */ -public class FormWithMultipleButtonsTest extends WicketTestCase +class FormWithMultipleButtonsTest extends WicketTestCase { /** * Testing if the correct submit button is invoked in an form with multiple submit buttons. The * browser set the clicked button input name as parameter on the HTTP request. */ @Test - public void findSubmittingButton() + void findSubmittingButton() { TestPage testPage = new TestPage(); tester.startPage(testPage); @@ -57,7 +61,7 @@ public class FormWithMultipleButtonsTest extends WicketTestCase * @see <a href="https://issues.apache.org/jira/browse/WICKET-1894";>WICKET-1894</a> */ @Test - public void ajaxFallbackButtonInvokedFirst() + void ajaxFallbackButtonInvokedFirst() { TestPage testPage = new TestPage(); tester.startPage(testPage); @@ -70,7 +74,7 @@ public class FormWithMultipleButtonsTest extends WicketTestCase * */ @Test - public void buttonInvokedFirst() + void buttonInvokedFirst() { TestPage testPage = new TestPage(); tester.startPage(testPage); @@ -93,7 +97,7 @@ public class FormWithMultipleButtonsTest extends WicketTestCase Button button; AjaxFallbackButton ajaxFallbackButton; - 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/ListMultipleChoiceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ListMultipleChoiceTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ListMultipleChoiceTest.java index 3987a58..4b17a26 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ListMultipleChoiceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ListMultipleChoiceTest.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.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -25,16 +28,16 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.util.ListModel; 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 ListMultipleChoiceTest extends WicketTestCase +class ListMultipleChoiceTest extends WicketTestCase { - public class TestPage extends WebPage + class TestPage extends WebPage { - public IModel<List<String>> selectedValues = new ListModel<String>(new ArrayList<String>()); - public List<String> choices = Arrays.asList("a", "b", "c", "d", "e", "f"); + IModel<List<String>> selectedValues = new ListModel<String>(new ArrayList<String>()); + List<String> choices = Arrays.asList("a", "b", "c", "d", "e", "f"); - public TestPage() + TestPage() { Form<Void> form = new Form<>("form"); this.add(form); @@ -43,7 +46,7 @@ public class ListMultipleChoiceTest extends WicketTestCase } @Test - public void testSelectionWorks() throws Exception + void testSelectionWorks() throws Exception { TestPage page = tester.startPage(new TestPage()); FormTester form = tester.newFormTester("form"); @@ -58,7 +61,7 @@ public class ListMultipleChoiceTest extends WicketTestCase } @Test - public void testSelectionAccumulates() throws Exception + void testSelectionAccumulates() throws Exception { final TestPage page = new TestPage(); page.selectedValues.getObject().add("a"); @@ -75,8 +78,8 @@ public class ListMultipleChoiceTest extends WicketTestCase assertTrue(page.selectedValues.getObject().contains("f")); } - protected ListMultipleChoice<String> newListMultipleChoice(String id, - IModel<List<String>> selectedValues, List<String> choices) + private ListMultipleChoice<String> newListMultipleChoice(String id, + IModel<List<String>> selectedValues, List<String> choices) { return new ListMultipleChoice<>(id, selectedValues, choices); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java index 57795d2..9d7e45b 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java @@ -19,19 +19,19 @@ package org.apache.wicket.markup.html.form; import java.util.Locale; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test case for checking localized error messages. */ -public class LocalizedErrorMessageTest extends WicketTestCase +class LocalizedErrorMessageTest extends WicketTestCase { /** * Test for checking if changing the session's locale to another language actually causes the * feedback messages to be altered as well. Testcase for WICKET-891. */ @Test - public void wicket891() + void wicket891() { tester.getSession().setLocale(new Locale("nl")); @@ -60,7 +60,7 @@ public class LocalizedErrorMessageTest extends WicketTestCase * WICKET-4608 vars should be properly converted */ @Test - public void testConvertedVars() + void testConvertedVars() { tester.getSession().setLocale(new Locale("de")); @@ -81,7 +81,7 @@ public class LocalizedErrorMessageTest extends WicketTestCase * */ @Test - public void wicket_1927() + void wicket_1927() { tester.getApplication().getMarkupSettings().setDefaultMarkupEncoding("UTF-8"); tester.getSession().setLocale(new Locale("de")); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedMessagePage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedMessagePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedMessagePage.java index 3fa2c55..851be86 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedMessagePage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedMessagePage.java @@ -34,7 +34,7 @@ public class LocalizedMessagePage extends WebPage /** */ public TextField<Double> field; /** */ - public FeedbackPanel feedback; + private FeedbackPanel feedback; /** * Construct. http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/MultiPartFormPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/MultiPartFormPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/MultiPartFormPage.java index e354ff9..86af382 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/MultiPartFormPage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/MultiPartFormPage.java @@ -39,7 +39,7 @@ public class MultiPartFormPage extends WebPage public AjaxFallbackButton button1; - public AjaxFallbackButton button2; + private AjaxFallbackButton button2; /** * Construct. @@ -54,7 +54,7 @@ public class MultiPartFormPage extends WebPage @Override public boolean isMultiPart() { asked++; - + return multiPart; } };
