http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/StatelessCheckerTest.java ---------------------------------------------------------------------- diff --git a/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/StatelessCheckerTest.java b/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/StatelessCheckerTest.java index 8e588ad..bdb08ad 100644 --- a/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/StatelessCheckerTest.java +++ b/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/StatelessCheckerTest.java @@ -16,21 +16,23 @@ */ package org.apache.wicket.devutils.stateless; +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.MarkupContainer; import org.apache.wicket.behavior.Behavior; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.util.tester.DummyHomePage; import org.apache.wicket.util.tester.WicketTester; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Marat Radchenko */ -public class StatelessCheckerTest extends Assert +public class StatelessCheckerTest { @StatelessComponent public static class StatelessPage extends DummyHomePage @@ -97,7 +99,7 @@ public class StatelessCheckerTest extends Assert private WicketTester tester; - @Before + @BeforeEach public void setUp() { tester = new WicketTester(); @@ -105,7 +107,7 @@ public class StatelessCheckerTest extends Assert checkerQuietly = new StatelessCheckerQuietly(); } - @After + @AfterEach public void tearDown() { tester.destroy();
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-devutils/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java ---------------------------------------------------------------------- diff --git a/wicket-devutils/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java b/wicket-devutils/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java index a8e7628..88d9025 100644 --- a/wicket-devutils/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java +++ b/wicket-devutils/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.util.markup.xhtml; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Checks that the html markup files are well formed xml-s. http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java b/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java index cd00729..96ba0f8 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java @@ -16,22 +16,22 @@ */ package org.apache.wicket.examples; -import com.meterware.httpunit.HttpUnitOptions; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.webapp.WebAppContext; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; + +import com.meterware.httpunit.HttpUnitOptions; /** * Test decorator that starts a jetty instance * * @author ivaynberg */ -public class JettyTestCaseDecorator extends Assert +public class JettyTestCaseDecorator { private Server server; private String contextPath; @@ -41,7 +41,7 @@ public class JettyTestCaseDecorator extends Assert /** * @throws Exception */ - @Before + @BeforeEach public void before() throws Exception { HttpUnitOptions.setExceptionsThrownOnScriptError(false); @@ -87,7 +87,7 @@ public class JettyTestCaseDecorator extends Assert /** * @throws Exception */ - @After + @AfterEach public void after() throws Exception { contextPath = null; http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java b/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java index 46e42f9..a82de7a 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java @@ -16,10 +16,11 @@ */ package org.apache.wicket.examples; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; + import com.meterware.httpunit.WebConversation; import com.meterware.httpunit.WebResponse; -import org.junit.After; -import org.junit.Before; /** * WebTestCase for tests that need to run inside Jetty to test for example the wicket filter using @@ -48,7 +49,7 @@ public abstract class WicketWebTestCase extends JettyTestCaseDecorator * @throws Exception */ @Override - @Before + @BeforeEach public void before() throws Exception { super.before(); @@ -57,7 +58,7 @@ public abstract class WicketWebTestCase extends JettyTestCaseDecorator } @Override - @After + @AfterEach public void after() throws Exception { baseUrl = null; http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/prototype/AjaxTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/prototype/AjaxTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/prototype/AjaxTest.java index fb50195..d07e41d 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/prototype/AjaxTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/prototype/AjaxTest.java @@ -16,8 +16,10 @@ */ package org.apache.wicket.examples.ajax.prototype; +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; /** * jWebUnit test for Hello World. http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/compref/ComprefTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/compref/ComprefTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/compref/ComprefTest.java index c80fee9..0ebca5c 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/compref/ComprefTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/compref/ComprefTest.java @@ -17,7 +17,7 @@ package org.apache.wicket.examples.compref; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** @@ -27,12 +27,10 @@ public class ComprefTest extends WicketTestCase { /** * Test page. - * - * @throws Exception - */ + * + */ @Test - public void test_1() throws Exception - { + public void test_1() { tester.startPage(Index.class); tester.assertContains("Wicket Examples - component reference"); http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/encodings/EncodingTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/encodings/EncodingTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/encodings/EncodingTest.java index f97a887..9944d1d 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/encodings/EncodingTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/encodings/EncodingTest.java @@ -17,7 +17,7 @@ package org.apache.wicket.examples.encodings; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * jWebUnit test for Hello World. @@ -26,12 +26,10 @@ public class EncodingTest extends WicketTestCase { /** * Test page. - * - * @throws Exception - */ + * + */ @Test - public void test_1() throws Exception - { + public void test_1() { tester.startPage(Home.class); tester.assertContains("Wicket Examples - encodings"); // the non-printable characters are: ��� http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java index 253bfea..e41a70d 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java @@ -17,7 +17,7 @@ package org.apache.wicket.examples.forminput; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java index 042f4b5..d3d64ae 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java @@ -21,8 +21,8 @@ import java.util.ArrayList; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.util.tester.FormTester; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** @@ -33,7 +33,7 @@ public class GuestbookTest extends WicketTestCase /** * Sets up the test. */ - @Before + @BeforeEach public void setUp() { GuestBook.clear(); @@ -41,12 +41,10 @@ public class GuestbookTest extends WicketTestCase /** * Test page. - * - * @throws Exception + * */ @Test - public void test_1() throws Exception - { + public void test_1() { tester.startPage(GuestBook.class); tester.assertContains("Wicket Examples - guestbook"); http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java index b5bb61e..4d8425b 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java @@ -20,7 +20,7 @@ import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.util.tester.WicketTester; import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Testcase for the <code>Game</code> class. @@ -28,16 +28,14 @@ import org.junit.Test; * @author Chris Turner * @version 1.0 */ -public class HangManTest extends Assert +public class HangManTest { /** * Tests the hangman class directly for a winning game. - * - * @throws Exception - */ + * + */ @Test - public void test_1() throws Exception - { + public void test_1() { Game hangman = new Game(); hangman.newGame(5, new WordGenerator(new String[] { "testing" })); @@ -105,12 +103,10 @@ public class HangManTest extends Assert /** * Tests the hangman class directly for a lost game. - * - * @throws Exception - */ + * + */ @Test - public void testHangmanLoseGame() throws Exception - { + public void testHangmanLoseGame() { Game hangman = new Game(); hangman.newGame(2, new WordGenerator(new String[] { "foo" })); http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/WordGeneratorTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/WordGeneratorTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/WordGeneratorTest.java index cf64669..40bff2c 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/WordGeneratorTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/WordGeneratorTest.java @@ -16,11 +16,15 @@ */ package org.apache.wicket.examples.hangman; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.HashSet; import java.util.Set; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,12 +40,10 @@ public class WordGeneratorTest extends WicketTestCase /** * Tests word generator - * - * @throws Exception - */ + * + */ @Test - public void testWordGenerator() throws Exception - { + public void testWordGenerator() { WordGenerator wg = new WordGenerator(); int wordCount = wg.size(); Set<Word> words = new HashSet<>(); @@ -50,7 +52,7 @@ public class WordGeneratorTest extends WicketTestCase { Word word = wg.next(); log.info("Word found: " + word); - assertFalse("Word should not be returned twice", words.contains(word)); + Assertions.assertFalse(words.contains(word), "Word should not be returned twice"); words.add(word); } log.info("Second iteration..."); @@ -58,20 +60,18 @@ public class WordGeneratorTest extends WicketTestCase { Word word = wg.next(); log.info("Word found: " + word); - assertTrue("Word " + word + " should have been returned only once", words.remove(word)); + assertTrue(words.remove(word), "Word " + word + " should have been returned only once"); } - assertTrue("All words should have been returned twice", words.isEmpty()); + assertTrue(words.isEmpty(), "All words should have been returned twice"); } /** * Tests word generator - * - * @throws Exception + * */ @Test - public void testSuppliedWordConstructor() throws Exception - { + public void testSuppliedWordConstructor() { WordGenerator wg = new WordGenerator(new String[] { "testing" }); - assertEquals("Word should be as expected", "testing", wg.next().asString()); + assertEquals("testing", wg.next().asString(), "Word should be as expected"); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java index 2def352..54e4da8 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java @@ -17,7 +17,7 @@ package org.apache.wicket.examples.helloworld; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * jWebUnit test for Hello World. @@ -26,12 +26,10 @@ public class HelloWorldTest extends WicketTestCase { /** * Test page. - * - * @throws Exception - */ + * + */ @Test - public void testHelloWorld() throws Exception - { + public void testHelloWorld() { tester.startPage(HelloWorld.class); tester.assertContains("Wicket Examples - helloworld"); tester.assertLabel("message", "Hello World!"); http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/images/ImagesTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/images/ImagesTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/images/ImagesTest.java index d2baaaa..4c23147 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/images/ImagesTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/images/ImagesTest.java @@ -17,22 +17,19 @@ package org.apache.wicket.examples.images; import org.apache.wicket.util.tester.WicketTester; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * jWebUnit test for Hello World. */ -public class ImagesTest extends Assert +public class ImagesTest { /** * Test page. - * - * @throws Exception - */ + * + */ @Test - public void testImages() throws Exception - { + public void testImages() { WicketTester tester = new WicketTester(new ImagesApplication()); try { http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/library/LibraryTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/library/LibraryTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/library/LibraryTest.java index 20aa08d..04f97cb 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/library/LibraryTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/library/LibraryTest.java @@ -18,22 +18,19 @@ package org.apache.wicket.examples.library; import org.apache.wicket.util.tester.FormTester; import org.apache.wicket.util.tester.WicketTester; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * jWebUnit test for Hello World. */ -public class LibraryTest extends Assert +public class LibraryTest { /** * Test page. - * - * @throws Exception - */ + * + */ @Test - public void test_1() throws Exception - { + public void test_1() { WicketTester tester = new WicketTester(new LibraryApplication()); try { http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/linkomatic/LinkomaticTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/linkomatic/LinkomaticTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/linkomatic/LinkomaticTest.java index adaf5ff..67c3e6e 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/linkomatic/LinkomaticTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/linkomatic/LinkomaticTest.java @@ -17,7 +17,7 @@ package org.apache.wicket.examples.linkomatic; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * jWebUnit test for Hello World. http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/niceurl/NiceUrlTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/niceurl/NiceUrlTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/niceurl/NiceUrlTest.java index 7ae0420..2c2cf8e 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/niceurl/NiceUrlTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/niceurl/NiceUrlTest.java @@ -17,22 +17,21 @@ package org.apache.wicket.examples.niceurl; import org.apache.wicket.util.tester.WicketTester; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * jWebUnit test for Hello World. */ -public class NiceUrlTest extends Assert +public class NiceUrlTest { private WicketTester tester; /** * */ - @Before + @BeforeEach public void before() { tester = new WicketTester(new NiceUrlApplication()); @@ -42,7 +41,7 @@ public class NiceUrlTest extends Assert /** * */ - @After + @AfterEach public void tearDown() { tester.destroy(); http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/repeater/RepeaterTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/repeater/RepeaterTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/repeater/RepeaterTest.java index 271a4a3..ad439ea 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/repeater/RepeaterTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/repeater/RepeaterTest.java @@ -18,7 +18,7 @@ package org.apache.wicket.examples.repeater; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.util.tester.WicketTester; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for Repeater application http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/signin2/Signin2Test.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/signin2/Signin2Test.java b/wicket-examples/src/test/java/org/apache/wicket/examples/signin2/Signin2Test.java index 0e6cd95..d672317 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/signin2/Signin2Test.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/signin2/Signin2Test.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.examples.signin2; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.Collection; import javax.servlet.http.Cookie; @@ -26,14 +28,12 @@ import org.apache.wicket.examples.authentication2.SignIn2Application; import org.apache.wicket.examples.authentication2.SignOut; import org.apache.wicket.util.tester.FormTester; import org.apache.wicket.util.tester.WicketTester; -import org.junit.Assert; -import org.junit.Test; - +import org.junit.jupiter.api.Test; /** * jWebUnit test for Hello World. */ -public class Signin2Test extends Assert +public class Signin2Test { /** * Test page. http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/examples/template/TemplateTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/template/TemplateTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/template/TemplateTest.java index b78fbcc..a71e95f 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/template/TemplateTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/template/TemplateTest.java @@ -17,13 +17,12 @@ package org.apache.wicket.examples.template; import org.apache.wicket.util.tester.WicketTester; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for Template application */ -public class TemplateTest extends Assert +public class TemplateTest { /** * Test page. http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithFPTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithFPTest.java b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithFPTest.java index cb8c36a..82e234d 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithFPTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithFPTest.java @@ -16,8 +16,7 @@ */ package org.apache.wicket.filtertest; -import org.junit.Before; - +import org.junit.jupiter.api.BeforeEach; /** * jWebUnit test for Hello World. @@ -29,7 +28,7 @@ public class WithCPWithFPTest extends WithoutCPWithFPTest * @throws Exception */ @Override - @Before + @BeforeEach public void before() throws Exception { setContextPath("/somecontext"); http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithoutFPTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithoutFPTest.java b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithoutFPTest.java index 9eb625a..c5d8c16 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithoutFPTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithoutFPTest.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.filtertest; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; /** * jWebUnit test for Hello World. @@ -28,7 +28,7 @@ public class WithCPWithoutFPTest extends WithoutCPWithoutFPTest * */ @Override - @Before + @BeforeEach public void before() throws Exception { setContextPath("/somecontext"); http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithFPTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithFPTest.java b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithFPTest.java index 1e869ca..83356e2 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithFPTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithFPTest.java @@ -16,10 +16,13 @@ */ package org.apache.wicket.filtertest; -import com.meterware.httpunit.WebResponse; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.wicket.examples.WicketWebTestCase; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import com.meterware.httpunit.WebResponse; /** * jWebUnit test for Hello World. @@ -30,7 +33,7 @@ public class WithoutCPWithFPTest extends WicketWebTestCase * @throws Exception */ @Override - @Before + @BeforeEach public void before() throws Exception { if (getContextPath() == null) http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithoutFPTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithoutFPTest.java b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithoutFPTest.java index 2a77b16..2d85321 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithoutFPTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithoutFPTest.java @@ -16,10 +16,13 @@ */ package org.apache.wicket.filtertest; -import com.meterware.httpunit.WebResponse; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.wicket.examples.WicketWebTestCase; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import com.meterware.httpunit.WebResponse; /** * jWebUnit test for Hello World. @@ -30,7 +33,7 @@ public class WithoutCPWithoutFPTest extends WicketWebTestCase * @throws Exception */ @Override - @Before + @BeforeEach public void before() throws Exception { if (getContextPath() == null) http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-examples/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java b/wicket-examples/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java index 15bd94b..78f9e18 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java +++ b/wicket-examples/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.util.markup.xhtml; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Checks that the html markup files are well formed xml-s. http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java index f918469..4083705 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java @@ -16,7 +16,8 @@ */ package org.apache.wicket.extensions.ajax.markup.html; -import static org.hamcrest.CoreMatchers.instanceOf; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; @@ -30,8 +31,8 @@ import org.apache.wicket.model.Model; import org.apache.wicket.request.IWritableRequestParameters; import org.apache.wicket.util.string.StringValue; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for {@link AjaxEditableLabel} @@ -44,7 +45,7 @@ public class AjaxEditableTest extends WicketTestCase /** * */ - @Before + @BeforeEach public void setUp() { tester.getApplication().getMarkupSettings().setStripWicketTags(false); @@ -168,9 +169,9 @@ public class AjaxEditableTest extends WicketTestCase IWritableRequestParameters postParameters = (IWritableRequestParameters)tester .getRequestCycle().getRequest().getPostParameters(); postParameters.setParameterValues(editableLabel.getEditor().getInputName(), - Arrays.asList(new StringValue[] { StringValue.valueOf("5") })); + Arrays.asList(StringValue.valueOf("5"))); editableLabel.getEditor().processInput(); - assertThat(integerModel.getObject(), instanceOf(Integer.class)); + assertTrue(integerModel.getObject() instanceof Integer); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanelTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanelTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanelTest.java index e24a0cf..fd7fba3 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanelTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanelTest.java @@ -17,7 +17,7 @@ package org.apache.wicket.extensions.ajax.markup.html; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link AjaxLazyLoadPanel}. http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTest.java index 640073c..70af775 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTest.java @@ -16,8 +16,10 @@ */ package org.apache.wicket.extensions.ajax.markup.html.autocomplete; +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; /** * Test for {@link AutoCompleteBehavior}. http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java index 4ea40b8..c6d61a9 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java @@ -16,12 +16,14 @@ */ package org.apache.wicket.extensions.markup.html; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import org.apache.wicket.Component; import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel; import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanelTester; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParserTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParserTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParserTest.java index c5fb083..1f723b0 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParserTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParserTest.java @@ -16,15 +16,17 @@ */ package org.apache.wicket.extensions.markup.html.basic; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + +import org.junit.jupiter.api.Test; /** * Test for {@link DefaultLinkParser}. * * @author Juergen Donnerstag */ -public class DefaultLinkParserTest extends Assert +public class DefaultLinkParserTest { /** * @@ -61,7 +63,8 @@ public class DefaultLinkParserTest extends Assert assertEquals( "line 1 <a href=\"http://www.test.com/test/murx.jsp\";>http://www.test.com/test/murx.jsp</a> \nline2 <a href=\"mailto:m...@email.de\";>m...@email.de</a> \r\nline3", - parser.parse("line 1 http://www.test.com/test/murx.jsp \nline2 m...@email.de \r\nline3")); + parser + .parse("line 1 http://www.test.com/test/murx.jsp \nline2 m...@email.de \r\nline3")); } /** @@ -88,8 +91,8 @@ public class DefaultLinkParserTest extends Assert ILinkParser parser = new DefaultLinkParser(); final String result = parser.parse(testEmailAddress); - assertEquals("Expected chars to left of + to be included in the link.", testExpectedLink, - result); + assertEquals(testExpectedLink, result, + "Expected chars to left of + to be included in the link."); } /** @@ -103,7 +106,7 @@ public class DefaultLinkParserTest extends Assert ILinkParser parser = new DefaultLinkParser(); final String result = parser.parse(testEmailAddress); - assertEquals("Expected chars to left of - to be included in the link.", testExpectedLink, - result); + assertEquals(testExpectedLink, result, + "Expected chars to left of - to be included in the link."); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResourceTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResourceTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResourceTest.java index 94cb8c8..19a655f 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResourceTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResourceTest.java @@ -16,14 +16,14 @@ */ package org.apache.wicket.extensions.markup.html.captcha; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertSame; import java.util.HashSet; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the {@link org.apache.wicket.extensions.markup.html.captcha.CaptchaImageResource}. @@ -37,8 +37,8 @@ public class CaptchaImageResourceTest { CaptchaImageResource image1 = new CaptchaImageResource("wicket"); - assertThat(image1.getChallengeId(), is("wicket")); - assertThat(image1.getChallengeIdModel().getObject(), is("wicket")); + assertEquals("wicket", image1.getChallengeId()); + assertEquals("wicket", image1.getChallengeIdModel().getObject()); } @Test @@ -47,7 +47,7 @@ public class CaptchaImageResourceTest CaptchaImageResource image1 = new CaptchaImageResource("wicket"); CaptchaImageResource image2 = new CaptchaImageResource("wicket"); - assertThat(image1.getImageData(null), is(not(image2.getImageData(null)))); + assertNotEquals(image1.getImageData(null), image2.getImageData(null)); } @Test @@ -55,7 +55,7 @@ public class CaptchaImageResourceTest { CaptchaImageResource image1 = new CaptchaImageResource("wicket"); - assertThat(image1.getImageData(null), is(image1.getImageData(null))); + assertSame(image1.getImageData(null), image1.getImageData(null)); } @Test @@ -65,7 +65,7 @@ public class CaptchaImageResourceTest byte[] originalImageData = image1.getImageData(null); image1.invalidate(); - assertThat(originalImageData, is(not(image1.getImageData(null)))); + assertNotEquals(originalImageData, image1.getImageData(null)); } @Test @@ -79,6 +79,6 @@ public class CaptchaImageResourceTest challengeIds.add(new CaptchaImageResource().getChallengeId()); } - assertThat(challengeIds.size(), is(idsNumber)); + assertEquals(idsNumber, challengeIds.size()); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/DateTextFieldTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/DateTextFieldTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/DateTextFieldTest.java index 2a1b8f7..23a9296 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/DateTextFieldTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/DateTextFieldTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket.extensions.markup.html.form; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.util.Date; import org.apache.wicket.MarkupContainer; @@ -28,17 +31,13 @@ import org.apache.wicket.model.Model; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import org.junit.jupiter.api.Test; /** * */ public class DateTextFieldTest extends WicketTestCase { - @Rule - public ExpectedException expectedException = ExpectedException.none(); /** * https://issues.apache.org/jira/browse/WICKET-5286 @@ -46,7 +45,8 @@ public class DateTextFieldTest extends WicketTestCase @Test public void validInputType() { - String[] validInputTypes = { "text", "date", "datetime", "datetime-local", "month", "time", "week"}; + String[] validInputTypes = { "text", "date", "datetime", "datetime-local", "month", "time", + "week" }; for (String validType : validInputTypes) { @@ -63,11 +63,13 @@ public class DateTextFieldTest extends WicketTestCase { TestPage testPage = new TestPage("unsupportedType"); - expectedException.expect(MarkupException.class); - expectedException.expectMessage("Component [text] (path = [0:form:text]) must be applied to a tag" + - " with [type] attribute matching any of [text, date, datetime, datetime-local, month, time, week], " + - "not [unsupportedType]"); - tester.startPage(testPage); + Exception e = assertThrows(MarkupException.class, () -> { + tester.startPage(testPage); + }); + + assertEquals("Component [text] (path = [0:form:text]) must be applied to a tag" + + " with [type] attribute matching any of [text, date, datetime, datetime-local, month, time, week], " + + "not [unsupportedType]", e.getMessage()); } /** */ @@ -88,10 +90,11 @@ public class DateTextFieldTest extends WicketTestCase @Override public IResourceStream getMarkupResourceStream(MarkupContainer container, - Class<?> containerClass) + Class<?> containerClass) { - return new StringResourceStream(String.format("<html><body>" - + "<form wicket:id=\"form\"><input wicket:id=\"text\" type=\"%s\"/></form></body></html>", inputType)); + return new StringResourceStream(String.format("<html><body>" + + "<form wicket:id=\"form\"><input wicket:id=\"text\" type=\"%s\"/></form></body></html>", + inputType)); } } } http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/DateTimeFieldTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/DateTimeFieldTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/DateTimeFieldTest.java index 8296ad6..22c6909 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/DateTimeFieldTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/DateTimeFieldTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket.extensions.markup.html.form.datetime; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; @@ -31,17 +34,13 @@ 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.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import org.junit.jupiter.api.Test; /** * Test for {@link LocalDateTimeField}. */ public class DateTimeFieldTest extends WicketTestCase { - @Rule - public ExpectedException expectedException = ExpectedException.none(); @Test public void dateTimeNull() http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTextFieldTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTextFieldTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTextFieldTest.java index 0026e7f..65c25fd 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTextFieldTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTextFieldTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket.extensions.markup.html.form.datetime; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + import java.time.LocalDate; import org.apache.wicket.MarkupContainer; @@ -27,7 +30,7 @@ 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 LocalDateTextField}. http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/TimeFieldTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/TimeFieldTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/TimeFieldTest.java index 1d698b0..0191183 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/TimeFieldTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/TimeFieldTest.java @@ -16,6 +16,10 @@ */ package org.apache.wicket.extensions.markup.html.form.datetime; +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 java.time.LocalTime; import org.apache.wicket.MarkupContainer; @@ -27,7 +31,7 @@ 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 TimeField}. http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedToLocalDateTimeModelTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedToLocalDateTimeModelTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedToLocalDateTimeModelTest.java index 76caf09..ef83cb6 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedToLocalDateTimeModelTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedToLocalDateTimeModelTest.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.extensions.markup.html.form.datetime; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.time.LocalDateTime; import java.time.ZoneId; @@ -24,7 +24,7 @@ import java.time.ZonedDateTime; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link ZonedToLocalDateTimeModel}. http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTest.java index 5bb3a4e..c20676e 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket.extensions.markup.html.form.palette; +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.Collection; @@ -30,7 +33,7 @@ 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 for {@link Palette}. http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTest.java index 640efb3..6bb79d2 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTest.java @@ -16,8 +16,11 @@ */ package org.apache.wicket.extensions.markup.html.form.select; +import static org.junit.jupiter.api.Assertions.assertFalse; +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; /** * Test for {@link Select}. @@ -27,12 +30,10 @@ public class SelectTest extends WicketTestCase /** * WICKET-4276 - * - * @throws Exception - */ + * + */ @Test - public void rawInputKeepsSelectionOnError() throws Exception - { + public void rawInputKeepsSelectionOnError() { SelectTestPage page = new SelectTestPage(); tester.startPage(page); http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResourceTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResourceTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResourceTest.java index 1e28a69..03d142c 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResourceTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResourceTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.extensions.markup.html.image.resource; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -25,8 +27,7 @@ import javax.imageio.ImageIO; import org.apache.wicket.markup.html.image.resource.DefaultButtonImageResource; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; - +import org.junit.jupiter.api.Test; /** * @author Pedro Santos http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java index 74d6e1d..8570cd6 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket.extensions.markup.html.repeater.data.table; +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.Collections; @@ -34,9 +37,8 @@ import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.string.StringValue; import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.util.tester.WicketTester; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @@ -46,34 +48,32 @@ public class DataTableTest extends WicketTestCase /** * */ - @Before + @BeforeEach public void before() { tester = new WicketTester(new RepeaterApplication()); } /** - * @throws Exception */ @Test - public void test_1() throws Exception - { + public void test_1() { tester.startPage(DataTablePage.class); tester.assertRenderedPage(DataTablePage.class); String document = tester.getLastResponseAsString(); int index = document.indexOf("<thead"); - assertTrue("Expected at least on <thead>", index != -1); + assertTrue(index != -1, "Expected at least on <thead>"); index = document.indexOf("<thead", index + 1); - assertTrue("There must be only one <thead>", index == -1); + assertTrue(index == -1, "There must be only one <thead>"); index = document.indexOf("<tbody"); - assertTrue("Expected at least on <tbody>", index != -1); + assertTrue(index != -1, "Expected at least on <tbody>"); index = document.indexOf("<tbody", index + 1); - assertTrue("There must be only one <tbody>", index == -1); + assertTrue(index == -1, "There must be only one <tbody>"); index = document.indexOf("<caption", index + 1); - assertTrue("There must be not be <caption>", index == -1); + assertTrue(index == -1, "There must be not be <caption>"); } /** @@ -87,14 +87,14 @@ public class DataTableTest extends WicketTestCase parameters.add("empty", Boolean.TRUE); tester.startPage(Wicket3603Page.class, parameters); // System.err.println(tester.getLastResponseAsString()); - Assert.assertTrue(tester.getLastResponseAsString().contains("thead")); - Assert.assertTrue(tester.getLastResponseAsString().contains("tfoot")); + assertTrue(tester.getLastResponseAsString().contains("thead")); + assertTrue(tester.getLastResponseAsString().contains("tfoot")); parameters.set("empty", Boolean.FALSE); tester.startPage(Wicket3603Page.class); // System.err.println(tester.getLastResponseAsString()); - Assert.assertFalse(tester.getLastResponseAsString().contains("thead")); - Assert.assertFalse(tester.getLastResponseAsString().contains("tfoot")); + assertFalse(tester.getLastResponseAsString().contains("thead")); + assertFalse(tester.getLastResponseAsString().contains("tfoot")); } /** @@ -118,7 +118,7 @@ public class DataTableTest extends WicketTestCase String document = tester.getLastResponseAsString(); int index = document.indexOf("<caption wicket:id=\"caption\">Caption</caption>"); - assertTrue("Caption must be rendered!", index > -1); + assertTrue(index > -1, "Caption must be rendered!"); } http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/CSVDataExporterTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/CSVDataExporterTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/CSVDataExporterTest.java index 09a2061..59bef5b 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/CSVDataExporterTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/CSVDataExporterTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.extensions.markup.html.repeater.data.table.export; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.ArrayList; @@ -28,8 +30,8 @@ import org.apache.wicket.markup.repeater.data.IDataProvider; import org.apache.wicket.markup.repeater.data.ListDataProvider; import org.apache.wicket.model.Model; 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; /** * Test for {@link CSVDataExporter}. @@ -39,7 +41,7 @@ public class CSVDataExporterTest extends WicketTestCase private List<Contact> contacts; - @Before + @BeforeEach public void before() { contacts = Arrays.asList(new Contact(), new Contact()); contacts.get(0).setFirstName("first0"); http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTest.java index 4dd1772..d939cc6 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTest.java @@ -17,7 +17,7 @@ package org.apache.wicket.extensions.markup.html.repeater.data.table.filter; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class FilterFormTest extends WicketTestCase { http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeBorderTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeBorderTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeBorderTest.java index a8c5eea..404f3a4 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeBorderTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeBorderTest.java @@ -18,7 +18,7 @@ package org.apache.wicket.extensions.markup.html.repeater.tree.table; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.util.tester.WicketTester; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link NodeBorder}. http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeModelTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeModelTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeModelTest.java index 221c8ba..6d589bf 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeModelTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeModelTest.java @@ -16,16 +16,18 @@ */ package org.apache.wicket.extensions.markup.html.repeater.tree.table; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; + import org.apache.wicket.model.IModel; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link NodeModel}. * * @author svenmeier */ -public class NodeModelTest extends Assert +public class NodeModelTest { /** * Test equality. @@ -33,17 +35,15 @@ public class NodeModelTest extends Assert @Test public void equality() { - NodeModel<String> model = new NodeModel<String>(new StringModel("A"), new boolean[] { true, - false }); + NodeModel<String> model = new NodeModel<>(new StringModel("A"), + new boolean[] { true, false }); - assertTrue(model.equals(new NodeModel<String>(new StringModel("A"), new boolean[] { true, - false }))); + assertEquals(model, new NodeModel<>(new StringModel("A"), new boolean[] { true, false })); - assertFalse(model.equals(new NodeModel<String>(new StringModel("A"), new boolean[] { true, - true }))); + assertNotEquals(model, new NodeModel<>(new StringModel("A"), new boolean[] { true, true })); - assertFalse(model.equals(new NodeModel<String>(new StringModel("B"), new boolean[] { true, - false }))); + assertNotEquals(model, + new NodeModel<>(new StringModel("B"), new boolean[] { true, false })); } private class StringModel implements IModel<String> http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProviderTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProviderTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProviderTest.java index 6d36904..e2834d0 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProviderTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProviderTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket.extensions.markup.html.repeater.tree.table; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; + import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; @@ -24,13 +27,12 @@ import java.util.List; import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link TreeDataProvider}. */ -public class TreeDataProviderTest extends Assert +public class TreeDataProviderTest { /** http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubsetTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubsetTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubsetTest.java index dc1bac9..9efec01 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubsetTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/ProviderSubsetTest.java @@ -16,6 +16,11 @@ */ package org.apache.wicket.extensions.markup.html.repeater.util; +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 static org.junit.jupiter.api.Assertions.fail; + import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; @@ -23,15 +28,14 @@ import java.util.List; import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider; import org.apache.wicket.model.IModel; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link ProviderSubset}. * * @author svenmeier */ -public class ProviderSubsetTest extends Assert +public class ProviderSubsetTest { private ITreeProvider<String> provider = new EmptyProvider(); http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProviderTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProviderTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProviderTest.java index 4f86372..4a25709 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProviderTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProviderTest.java @@ -16,6 +16,10 @@ */ package org.apache.wicket.extensions.markup.html.repeater.util; +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.Iterator; import javax.swing.tree.DefaultMutableTreeNode; @@ -24,15 +28,14 @@ import javax.swing.tree.MutableTreeNode; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link TreeModelProvider}. * * @author svenmeier */ -public class TreeModelProviderTest extends Assert +public class TreeModelProviderTest { private DefaultMutableTreeNode root; http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelTest.java index b6b6070..9204061 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.extensions.markup.html.tabs; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.ArrayList; import java.util.List; @@ -25,7 +27,7 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.Model; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link TabbedPanel}. @@ -95,12 +97,10 @@ public class TabbedPanelTest extends WicketTestCase /** * No tabs thus no tab component rendered. - * - * @throws Exception - */ + * + */ @Test - public void renderNoTabs() throws Exception - { + public void renderNoTabs() { TestPage page = new TestPage(); page.tabbedPanel.getTabs().clear(); tester.startPage(page); @@ -116,12 +116,10 @@ public class TabbedPanelTest extends WicketTestCase /** * Switching between tabsS. - * - * @throws Exception - */ + * + */ @Test - public void renderDefaultTabsOnly() throws Exception - { + public void renderDefaultTabsOnly() { TestPage page = tester.startPage(new TestPage()); tester.assertContains("<span wicket:id=\"title\">default 1</span></a>"); tester.assertContains("<span wicket:id=\"label\">default 1</span>"); @@ -137,12 +135,10 @@ public class TabbedPanelTest extends WicketTestCase /** * Additional tabs are rendered. - * - * @throws Exception - */ + * + */ @Test - public void renderAdditionalTabs() throws Exception - { + public void renderAdditionalTabs() { TestPage page = tester.startPage(new TestPage()); page.tabbedPanel.getTabs().add(new AbstractTab(Model.of("added 1")) { @@ -177,12 +173,10 @@ public class TabbedPanelTest extends WicketTestCase /** * Changing model switches tab. - * - * @throws Exception - */ + * + */ @Test - public void renderModelChange() throws Exception - { + public void renderModelChange() { TestPage page = new TestPage(); tester.startPage(page); @@ -196,12 +190,10 @@ public class TabbedPanelTest extends WicketTestCase /** * Tab's component is aquired once only. - * - * @throws Exception - */ + * + */ @Test - public void tabComponentAquiredOnChangeOnly() throws Exception - { + public void tabComponentAquiredOnChangeOnly() { final int[] count = new int[1]; @@ -235,12 +227,10 @@ public class TabbedPanelTest extends WicketTestCase /** * An invisible tab gets replaced by another one. - * - * @throws Exception + * */ @Test - public void invisibleTabGetsReplaced() throws Exception - { + public void invisibleTabGetsReplaced() { final boolean[] visible = { true, true }; TestPage page = new TestPage(); http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelVisibilityTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelVisibilityTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelVisibilityTest.java index 67bb4a4..7d27f41 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelVisibilityTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelVisibilityTest.java @@ -16,11 +16,13 @@ */ package org.apache.wicket.extensions.markup.html.tabs; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.List; import org.apache.wicket.util.tester.TagTester; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for visibility of {@link ITab}s in a {@link TabbedPanel}. http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/upload/UploadFormWithProgressBarTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/upload/UploadFormWithProgressBarTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/upload/UploadFormWithProgressBarTest.java index dcd9927..689c538 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/upload/UploadFormWithProgressBarTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/upload/UploadFormWithProgressBarTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.extensions.markup.html.upload; +import static org.junit.jupiter.api.Assertions.assertNotSame; + import org.apache.wicket.MarkupContainer; import org.apache.wicket.extensions.ajax.markup.html.form.upload.UploadProgressBar; import org.apache.wicket.markup.IMarkupResourceStreamProvider; @@ -26,7 +28,7 @@ import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** */ http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java index f56d199..eeb0d01 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java @@ -16,17 +16,19 @@ */ package org.apache.wicket.extensions.validation.validator; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.validation.IValidator; import org.apache.wicket.validation.Validatable; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test that it really validates RFC valid email addresses. * * @author Frank Bille */ -public class RfcCompliantEmailValidatorTest extends Assert +public class RfcCompliantEmailValidatorTest { /** * Test a couple of valid email addresses. @@ -45,7 +47,7 @@ public class RfcCompliantEmailValidatorTest extends Assert { Validatable<String> validatable = new Validatable<>(emailAddress); validator.validate(validatable); - assertTrue(emailAddress + " wasn't valid but should be", validatable.isValid()); + assertTrue(validatable.isValid(), emailAddress + " wasn't valid but should be"); } } @@ -66,7 +68,7 @@ public class RfcCompliantEmailValidatorTest extends Assert { Validatable<String> validatable = new Validatable<>(emailAddress); validator.validate(validatable); - assertFalse(emailAddress + " was valid but shouldn't be", validatable.isValid()); + assertFalse(validatable.isValid(), emailAddress + " was valid but shouldn't be"); } } } http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/WizardModelTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/WizardModelTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/WizardModelTest.java index 38d502c..a811bfc 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/WizardModelTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/WizardModelTest.java @@ -16,11 +16,18 @@ */ package org.apache.wicket.extensions.wizard; +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.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + import java.util.Iterator; import org.apache.wicket.extensions.wizard.WizardModel.ICondition; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link WizardModel}. @@ -69,7 +76,7 @@ public class WizardModelTest extends WicketTestCase return false; } - }; + } WizardStep step3 = new ConditionWizadStep(); model.add(step3); http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardModelTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardModelTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardModelTest.java index 0366b5a..46a1ddb 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardModelTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardModelTest.java @@ -16,8 +16,13 @@ */ package org.apache.wicket.extensions.wizard.dynamic; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link DynamicWizardModel}. http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-extensions/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java b/wicket-extensions/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java index a8e7628..88d9025 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTest.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.util.markup.xhtml; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Checks that the html markup files are well formed xml-s. http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-guice/src/test/java/org/apache/wicket/guice/AbstractInjectorTest.java ---------------------------------------------------------------------- diff --git a/wicket-guice/src/test/java/org/apache/wicket/guice/AbstractInjectorTest.java b/wicket-guice/src/test/java/org/apache/wicket/guice/AbstractInjectorTest.java index cc71e12..741effd 100644 --- a/wicket-guice/src/test/java/org/apache/wicket/guice/AbstractInjectorTest.java +++ b/wicket-guice/src/test/java/org/apache/wicket/guice/AbstractInjectorTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.guice; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.lang.annotation.Annotation; import java.util.HashMap; import java.util.Map; @@ -30,10 +32,9 @@ import org.apache.wicket.mock.MockWebRequest; import org.apache.wicket.protocol.http.WebSession; import org.apache.wicket.protocol.http.mock.MockServletContext; import org.apache.wicket.request.Url; -import org.junit.After; -import org.junit.Assert; -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; import com.google.inject.Binder; import com.google.inject.Module; @@ -43,7 +44,7 @@ import com.google.inject.name.Names; /** */ -public abstract class AbstractInjectorTest extends Assert +public abstract class AbstractInjectorTest { protected abstract TestNoComponentInterface newTestNoComponent(); @@ -52,7 +53,7 @@ public abstract class AbstractInjectorTest extends Assert private final MockApplication app = new MockApplication(); - @Before + @BeforeEach public void before() { app.setServletContext(new MockServletContext(app, null)); @@ -72,12 +73,8 @@ public abstract class AbstractInjectorTest extends Assert public void configure(final Binder binder) { binder.bind(ITestService.class).to(TestService.class); - binder.bind(ITestService.class) - .annotatedWith(Red.class) - .to(TestServiceRed.class); - binder.bind(ITestService.class) - .annotatedWith(Blue.class) - .to(TestServiceBlue.class); + binder.bind(ITestService.class).annotatedWith(Red.class).to(TestServiceRed.class); + binder.bind(ITestService.class).annotatedWith(Blue.class).to(TestServiceBlue.class); binder.bind(new TypeLiteral<Map<String, String>>() { }).toProvider(new Provider<Map<String, String>>() @@ -93,19 +90,23 @@ public abstract class AbstractInjectorTest extends Assert } }); - binder.bind(String.class).annotatedWith(Names.named("named1")).toInstance("NAMED_1"); - binder.bind(String.class).annotatedWith(Names.named("named2")).toInstance("NAMED_2"); + binder.bind(String.class).annotatedWith(Names.named("named1")).toInstance( + "NAMED_1"); + binder.bind(String.class).annotatedWith(Names.named("named2")).toInstance( + "NAMED_2"); - binder.bind(String.class).annotatedWith(new Jsr330Named("named1")).toInstance("NAMED_1"); - binder.bind(String.class).annotatedWith(new Jsr330Named("named2")).toInstance("NAMED_2"); + binder.bind(String.class).annotatedWith(new Jsr330Named("named1")).toInstance( + "NAMED_1"); + binder.bind(String.class).annotatedWith(new Jsr330Named("named2")).toInstance( + "NAMED_2"); binder.bind(EvilTestService.class).toInstance(new EvilTestService("evil123", 5)); - } + } }); app.getComponentInstantiationListeners().add(injector); } - @After + @AfterEach public void after() { app.internalDestroy(); @@ -124,7 +125,8 @@ public abstract class AbstractInjectorTest extends Assert doChecksForComponent(testComponent); // Serialize and deserialize the object, and check it still works. - TestComponentInterface clonedComponent = (TestComponentInterface)WicketObjects.cloneObject(testComponent); + TestComponentInterface clonedComponent = WicketObjects + .cloneObject(testComponent); doChecksForComponent(clonedComponent); // Test injection of a class that does not extend Component http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceFieldValueFactoryTest.java ---------------------------------------------------------------------- diff --git a/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceFieldValueFactoryTest.java b/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceFieldValueFactoryTest.java index ba0a76c..9ae355b 100644 --- a/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceFieldValueFactoryTest.java +++ b/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceFieldValueFactoryTest.java @@ -16,9 +16,11 @@ */ package org.apache.wicket.guice; +import static org.junit.jupiter.api.Assertions.assertNull; + import java.lang.reflect.Field; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for GuiceFieldValueFactory http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceWebApplicationFactoryTest.java ---------------------------------------------------------------------- diff --git a/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceWebApplicationFactoryTest.java b/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceWebApplicationFactoryTest.java index 3bfddb3..6bcf58a 100644 --- a/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceWebApplicationFactoryTest.java +++ b/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceWebApplicationFactoryTest.java @@ -21,12 +21,13 @@ import java.util.Enumeration; import javax.servlet.FilterConfig; import javax.servlet.ServletContext; -import com.google.inject.AbstractModule; import org.apache.wicket.Page; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.protocol.http.WicketFilter; import org.apache.wicket.protocol.http.mock.MockServletContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import com.google.inject.AbstractModule; /** */ http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectGuiceInjectorTest.java ---------------------------------------------------------------------- diff --git a/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectGuiceInjectorTest.java b/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectGuiceInjectorTest.java index 1ea6598..7350d0a 100644 --- a/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectGuiceInjectorTest.java +++ b/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectGuiceInjectorTest.java @@ -16,17 +16,17 @@ */ package org.apache.wicket.guice; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; + +import javax.inject.Inject; import org.apache.wicket.ajax.attributes.IAjaxCallListener; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.google.inject.ConfigurationException; import com.google.inject.spi.Message; -import javax.inject.Inject; - /** */ public class JavaxInjectGuiceInjectorTest extends AbstractInjectorTest @@ -62,20 +62,25 @@ public class JavaxInjectGuiceInjectorTest extends AbstractInjectorTest catch (ConfigurationException cx) { Message message = cx.getErrorMessages().iterator().next(); - assertThat(message.getMessage(), is(equalTo("No implementation for org.apache.wicket.ajax.attributes.IAjaxCallListener was bound."))); + assertEquals( + "No implementation for org.apache.wicket.ajax.attributes.IAjaxCallListener was bound.", + message.getMessage()); } } - private static class MyJavaxInjectWithNonExistingTestComponent extends JavaxInjectTestComponent { + private static class MyJavaxInjectWithNonExistingTestComponent extends JavaxInjectTestComponent + { @Inject private IAjaxCallListener nonExisting; - public MyJavaxInjectWithNonExistingTestComponent() { + public MyJavaxInjectWithNonExistingTestComponent() + { super("id"); } - public IAjaxCallListener getNonExisting() { + public IAjaxCallListener getNonExisting() + { return nonExisting; } }
