http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/MetaInfStaticResourceReferenceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/MetaInfStaticResourceReferenceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/MetaInfStaticResourceReferenceTest.java index 5333e31..dd899ca 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/MetaInfStaticResourceReferenceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/MetaInfStaticResourceReferenceTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket.request.resource; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import java.lang.reflect.Field; import java.net.MalformedURLException; import java.net.URL; @@ -26,17 +29,16 @@ import org.apache.wicket.protocol.http.mock.MockServletContext; import org.apache.wicket.request.IRequestHandler; import org.apache.wicket.request.Url; import org.apache.wicket.util.tester.BaseWicketTester; -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; /** * Tests for {@link MetaInfStaticResourceReference}. * * @author akiraly */ -public class MetaInfStaticResourceReferenceTest +class MetaInfStaticResourceReferenceTest { private static final String STATIC_RESOURCE_NAME = "sample.js"; @@ -47,7 +49,7 @@ public class MetaInfStaticResourceReferenceTest * should not happen */ @Test - public void testWithServlet30() throws MalformedURLException + void testWithServlet30() throws MalformedURLException { MockApplication application = new MockApplication(); MockServletContext servletContext = new MockServletContext(application, "/"); @@ -61,11 +63,9 @@ public class MetaInfStaticResourceReferenceTest Url packUrl = tester.getRequestCycle().mapUrlFor(packRes, null); Url metaUrl = tester.getRequestCycle().mapUrlFor(metaRes, null); - Assert.assertNotNull(metaUrl); - Assert.assertNotNull(packUrl); - Assert.assertFalse( - "Meta and pack resource should not map to the same url under servlet 3.0.", - metaUrl.equals(packUrl)); + assertNotNull(metaUrl); + assertNotNull(packUrl); + assertFalse(metaUrl.equals(packUrl), "Meta and pack resource should not map to the same url under servlet 3.0."); String metaUrlStr = metaUrl.toString(); if (metaUrlStr.charAt(1) != '/') @@ -76,7 +76,7 @@ public class MetaInfStaticResourceReferenceTest // meta resource is served by the servlet container under 3.0 URL metaNetUrl = servletContext.getResource(metaUrlStr); - Assert.assertNotNull("Meta resource is not found by the 3.0 servlet container.", metaNetUrl); + assertNotNull(metaNetUrl, "Meta resource is not found by the 3.0 servlet container."); MockWebRequest request = new MockWebRequest(packUrl); @@ -85,7 +85,7 @@ public class MetaInfStaticResourceReferenceTest .mapRequest(request); // the pack resource is still served by wicket - Assert.assertNotNull(requestHandler); + assertNotNull(requestHandler); } /** @@ -96,8 +96,8 @@ public class MetaInfStaticResourceReferenceTest * @throws Exception * if the reflection magic failed */ - @Before - public void before() throws Exception + @BeforeEach + void before() throws Exception { Field field = MetaInfStaticResourceReference.class.getDeclaredField("META_INF_RESOURCES_SUPPORTED"); field.setAccessible(true); @@ -110,8 +110,8 @@ public class MetaInfStaticResourceReferenceTest * @throws Exception * if before fails */ - @After - public void after() throws Exception + @AfterEach + void after() throws Exception { before(); }
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/MinifiedAwareResourceReferenceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/MinifiedAwareResourceReferenceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/MinifiedAwareResourceReferenceTest.java index 934281c..7bec622 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/MinifiedAwareResourceReferenceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/MinifiedAwareResourceReferenceTest.java @@ -16,16 +16,18 @@ */ package org.apache.wicket.request.resource; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.Locale; + import org.apache.wicket.Application; import org.apache.wicket.core.util.resource.locator.ResourceStreamLocator; import org.apache.wicket.request.resource.IResource.Attributes; import org.apache.wicket.response.ByteArrayResponse; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Before; -import org.junit.Test; - -import java.util.Locale; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Testcases for minified aware resources. @@ -34,10 +36,10 @@ import java.util.Locale; * * @author papegaaij */ -public class MinifiedAwareResourceReferenceTest extends WicketTestCase +class MinifiedAwareResourceReferenceTest extends WicketTestCase { - @Before - public void before() + @BeforeEach + void before() { tester.getSession().setLocale(Locale.US); } @@ -55,7 +57,7 @@ public class MinifiedAwareResourceReferenceTest extends WicketTestCase * Tests is a pre-minified resource is detected */ @Test - public void minifiedResourceAvailable() + void minifiedResourceAvailable() { Application.get().getResourceSettings().setUseMinifiedResources(true); ResourceReference reference = new JavaScriptResourceReference( @@ -69,7 +71,7 @@ public class MinifiedAwareResourceReferenceTest extends WicketTestCase * Tests fallback to normal resource when pre-minified is not available */ @Test - public void noMinifiedResourceAvailable() + void noMinifiedResourceAvailable() { MinCountingResourceStreamLocator locator = new MinCountingResourceStreamLocator(); @@ -88,7 +90,7 @@ public class MinifiedAwareResourceReferenceTest extends WicketTestCase private class MinCountingResourceStreamLocator extends ResourceStreamLocator { - public int minLocated = 0; + int minLocated = 0; @Override public IResourceStream locate(Class<?> clazz, String path) http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java index 0af08da..426ee24 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java @@ -16,6 +16,11 @@ */ package org.apache.wicket.request.resource; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.IOException; import java.io.InputStream; import java.util.Locale; @@ -32,15 +37,13 @@ import org.apache.wicket.request.resource.ResourceReference.UrlAttributes; import org.apache.wicket.response.ByteArrayResponse; import org.apache.wicket.util.io.IOUtils; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Pedro Santos */ -public class PackageResourceReferenceTest extends WicketTestCase +class PackageResourceReferenceTest extends WicketTestCase { private static Class<PackageResourceReferenceTest> scope = PackageResourceReferenceTest.class; private static Locale[] locales = { null, new Locale("en"), new Locale("en", "US") }; @@ -50,8 +53,8 @@ public class PackageResourceReferenceTest extends WicketTestCase /** * @throws Exception */ - @Before - public void before() throws Exception + @BeforeEach + void before() throws Exception { // some locale outside those in locales array tester.getSession().setLocale(Locale.CHINA); @@ -61,7 +64,7 @@ public class PackageResourceReferenceTest extends WicketTestCase * */ @Test - public void resourceResolution() + void resourceResolution() { for (Locale locale : locales) { @@ -106,7 +109,7 @@ public class PackageResourceReferenceTest extends WicketTestCase * */ @Test - public void resourceResponse() + void resourceResponse() { for (Locale locale : locales) { @@ -147,7 +150,7 @@ public class PackageResourceReferenceTest extends WicketTestCase * Asserting if user did not set any locale or style, those from session get used if any */ @Test - public void sessionAttributesRelevance() + void sessionAttributesRelevance() { for (Locale locale : new Locale[] { new Locale("en"), new Locale("en", "US") }) { @@ -172,7 +175,7 @@ public class PackageResourceReferenceTest extends WicketTestCase * Assert preference for specified locale and style over session ones */ @Test - public void userAttributesPreference() + void userAttributesPreference() { tester.getSession().setLocale(new Locale("en")); tester.getSession().setStyle("style"); @@ -199,19 +202,19 @@ public class PackageResourceReferenceTest extends WicketTestCase * see WICKET-5251 : Proper detection of already minified resources */ @Test - public void testMinifiedNameDetectMinInName() + void testMinifiedNameDetectMinInName() { final PackageResourceReference html5minjs = new PackageResourceReference("html5.min.js"); - Assert.assertEquals("html5.min.js", html5minjs.getMinifiedName()); + assertEquals("html5.min.js", html5minjs.getMinifiedName()); final PackageResourceReference html5notminjs = new PackageResourceReference("html5.notmin.js"); - Assert.assertEquals("html5.notmin.min.js", html5notminjs.getMinifiedName()); + assertEquals("html5.notmin.min.js", html5notminjs.getMinifiedName()); final PackageResourceReference html5notmin = new PackageResourceReference("html5notmin"); - Assert.assertEquals("html5notmin.min", html5notmin.getMinifiedName()); + assertEquals("html5notmin.min", html5notmin.getMinifiedName()); final PackageResourceReference html5min = new PackageResourceReference("html5.min"); - Assert.assertEquals("html5.min", html5min.getMinifiedName()); + assertEquals("html5.min", html5min.getMinifiedName()); } @@ -219,47 +222,47 @@ public class PackageResourceReferenceTest extends WicketTestCase * see WICKET-5250 - for JavaScriptResourceReference */ @Test - public void testJavaScriptResourceReferenceRespectsMinifiedResourcesDetection() + void testJavaScriptResourceReferenceRespectsMinifiedResourcesDetection() { Application.get().getResourceSettings().setUseMinifiedResources(true); final JavaScriptResourceReference notMinified = new JavaScriptResourceReference(PackageResourceReferenceTest.class, "a.js"); final JavaScriptPackageResource notMinifiedResource = notMinified.getResource(); - Assert.assertTrue("Not minified resource should got its compress flag set to true", notMinifiedResource.getCompress()); + assertTrue(notMinifiedResource.getCompress(), "Not minified resource should got its compress flag set to true"); final JavaScriptResourceReference alreadyMinified = new JavaScriptResourceReference(PackageResourceReferenceTest.class, "b.min.js"); final JavaScriptPackageResource alreadyMinifiedResource = alreadyMinified.getResource(); - Assert.assertFalse("Already minified resource should got its compress flag set to false", alreadyMinifiedResource.getCompress()); + assertFalse(alreadyMinifiedResource.getCompress(), "Already minified resource should got its compress flag set to false"); } /** * see WICKET-5250 - for CSSResourceReference */ @Test - public void testCSSResourceReferenceRespectsMinifiedResourcesDetection() + void testCSSResourceReferenceRespectsMinifiedResourcesDetection() { Application.get().getResourceSettings().setUseMinifiedResources(true); final CssResourceReference notMinified = new CssResourceReference(PackageResourceReferenceTest.class, "a.css"); final CssPackageResource notMinifiedResource = notMinified.getResource(); - Assert.assertTrue("Not minified resource should got its compress flag set to true", notMinifiedResource.getCompress()); + assertTrue(notMinifiedResource.getCompress(), "Not minified resource should got its compress flag set to true"); final CssResourceReference alreadyMinified = new CssResourceReference(PackageResourceReferenceTest.class, "b.min.css"); final CssPackageResource alreadyMinifiedResource = alreadyMinified.getResource(); - Assert.assertFalse("Already minified resource should got its compress flag set to false", alreadyMinifiedResource.getCompress()); + assertFalse(alreadyMinifiedResource.getCompress(), "Already minified resource should got its compress flag set to false"); } /** * See WICKET-5819 - Media tags */ @Test - public void testContentRange() + void testContentRange() { // Test range - Assert.assertEquals("resource", makeRangeRequest("bytes=0-7")); - Assert.assertEquals("ource", makeRangeRequest("bytes=3-7")); - Assert.assertEquals("resource_var_style_en.txt", makeRangeRequest("bytes=0-")); - Assert.assertEquals("var_style_en.txt", makeRangeRequest("bytes=9-")); - Assert.assertEquals("resource_var_style_en.txt", makeRangeRequest("bytes=-")); - Assert.assertEquals("resource_var_style_en.txt", makeRangeRequest("bytes=-25")); + assertEquals("resource", makeRangeRequest("bytes=0-7")); + assertEquals("ource", makeRangeRequest("bytes=3-7")); + assertEquals("resource_var_style_en.txt", makeRangeRequest("bytes=0-")); + assertEquals("var_style_en.txt", makeRangeRequest("bytes=9-")); + assertEquals("resource_var_style_en.txt", makeRangeRequest("bytes=-")); + assertEquals("resource_var_style_en.txt", makeRangeRequest("bytes=-25")); } private String makeRangeRequest(String range) @@ -283,7 +286,7 @@ public class PackageResourceReferenceTest extends WicketTestCase * @throws IOException */ @Test - public void testContentRangeLarge() throws IOException + void testContentRangeLarge() throws IOException { InputStream resourceAsStream = null; try @@ -334,7 +337,7 @@ public class PackageResourceReferenceTest extends WicketTestCase * See WICKET-5819 - Media tags */ @Test - public void testContentRangeHeaders() + void testContentRangeHeaders() { // Test header fields ResourceReference reference = new PackageResourceReference(scope, "resource.txt", @@ -344,7 +347,7 @@ public class PackageResourceReferenceTest extends WicketTestCase MockHttpServletResponse mockHttpServletResponse = (MockHttpServletResponse)response.getContainerResponse(); Attributes mockAttributes = new Attributes(request, response); reference.getResource().respond(mockAttributes); - Assert.assertEquals(ContentRangeType.BYTES.getTypeName(), + assertEquals(ContentRangeType.BYTES.getTypeName(), mockHttpServletResponse.getHeader("Accept-Range")); // For normal: If a resource supports content range no content is delivered // if no "Range" header is given, but we have to deliver it, because @@ -352,7 +355,7 @@ public class PackageResourceReferenceTest extends WicketTestCase // detecting media requests and automatically add the "Range" header for // partial content and they don't make an initial request to detect if a media // resource supports Content-Range (by the Accept-Range header) - Assert.assertEquals("resource_var_style_en.txt", + assertEquals("resource_var_style_en.txt", new String(mockHttpServletResponse.getBinaryContent())); } @@ -360,7 +363,7 @@ public class PackageResourceReferenceTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-6031 */ @Test - public void noRequestCycle() + void noRequestCycle() { ThreadContext.setRequestCycle(null); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/ResouceBundleTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/ResouceBundleTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/ResouceBundleTest.java index 4bc7ff5..7bde976 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/ResouceBundleTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/ResouceBundleTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.request.resource; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.Arrays; import java.util.Locale; @@ -24,8 +26,8 @@ import org.apache.wicket.request.Url; import org.apache.wicket.resource.bundles.ConcatBundleResource; import org.apache.wicket.resource.bundles.ResourceBundleReference; 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 cases for resource bundles @@ -34,8 +36,8 @@ import org.junit.Test; */ public class ResouceBundleTest extends WicketTestCase { - @Before - public void before() + @BeforeEach + void before() { tester.getSession().setLocale(Locale.ENGLISH); } @@ -44,7 +46,7 @@ public class ResouceBundleTest extends WicketTestCase * Tests the concatenation of 2 javascript files */ @Test - public void concatBundle() + void concatBundle() { ConcatBundleResource bundle = new ConcatBundleResource(Arrays.asList( JavaScriptHeaderItem.forReference(new JavaScriptResourceReference( @@ -62,7 +64,7 @@ public class ResouceBundleTest extends WicketTestCase * @throws Exception */ @Test - public void providedResource() throws Exception + void providedResource() throws Exception { tester.getApplication() .getResourceBundles() @@ -79,7 +81,7 @@ public class ResouceBundleTest extends WicketTestCase * @throws Exception */ @Test - public void providedResourceWithDefer() throws Exception + void providedResourceWithDefer() throws Exception { tester.getApplication() .getResourceBundles() @@ -96,7 +98,7 @@ public class ResouceBundleTest extends WicketTestCase * @throws Exception */ @Test - public void externalBundle() throws Exception + void externalBundle() throws Exception { ResourceBundleReference bundle = new ResourceBundleReference( new UrlResourceReference( http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceLambdaTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceLambdaTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceLambdaTest.java index 010cb69..a31d65f 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceLambdaTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceLambdaTest.java @@ -16,12 +16,14 @@ */ package org.apache.wicket.request.resource; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.util.tester.WicketTester; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class ResourceReferenceLambdaTest extends WicketTestCase +class ResourceReferenceLambdaTest extends WicketTestCase { private final String output = "lambda resource"; @@ -42,7 +44,7 @@ public class ResourceReferenceLambdaTest extends WicketTestCase } @Test - public void lambdaBasedResurceReference() throws Exception + void lambdaBasedResurceReference() throws Exception { tester.executeUrl("./test"); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceLocatingTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceLocatingTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceLocatingTest.java index 5b96599..e36243b 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceLocatingTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceLocatingTest.java @@ -17,6 +17,7 @@ package org.apache.wicket.request.resource; import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; import java.io.BufferedReader; import java.io.InputStream; @@ -24,25 +25,23 @@ import java.io.StringReader; import java.util.ArrayList; import java.util.List; import java.util.Locale; +import java.util.stream.Stream; import org.apache.wicket.util.io.Streams; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; + /** * Test case for WICKET-5967 - Unable to load i18n minified js. */ @SuppressWarnings("javadoc") -@RunWith(Parameterized.class) public class ResourceReferenceLocatingTest extends WicketTestCase { /** Loads the test cases from a spread sheet in semi-colon separated format. */ - @Parameters(name = "{0}") - public static List<Object[]> parameters() + private static Stream<TestCase> parameters() { try (InputStream is = ResourceReferenceLocatingTest.class .getResourceAsStream("ResourceReferenceLocatingTest.csv")) @@ -50,15 +49,16 @@ public class ResourceReferenceLocatingTest extends WicketTestCase String csv = Streams.readString(is); StringReader sr = new StringReader(csv); BufferedReader br = new BufferedReader(sr); - List<Object[]> result = new ArrayList<>(); + List<TestCase> result = new ArrayList<>(); String line = br.readLine(); // read header line while ((line = br.readLine()) != null) { if (!line.isEmpty()) - result.add(new Object[] { TestCase.fromLine(line) }); + result.add(TestCase.fromLine(line)); } - return result; + + return result.stream(); } catch (Exception e) { @@ -66,6 +66,83 @@ public class ResourceReferenceLocatingTest extends WicketTestCase } } + @BeforeEach + void before() + { + tester.getSession().setLocale(Locale.ENGLISH); + } + + /** + * Locate a resource without a minification requirement. + */ + @ParameterizedTest + @MethodSource("parameters") + void locateNonMinifiedJavaScriptResourceReference(TestCase testCase) + { + tester.getApplication().getResourceSettings().setUseMinifiedResources(false); + + checkNonStrictUsingJavaScriptResourceReference(testCase, testCase.getNonMinifiedContents()); + } + + /** */ + @ParameterizedTest + @MethodSource("parameters") + void locateNonMinifiedPackageResourceReference(TestCase testCase) + { + tester.getApplication().getResourceSettings().setUseMinifiedResources(false); + + checkNonStrictUsingPackageResourceReference(testCase, testCase.getNonMinifiedContents()); + } + + /** */ + @ParameterizedTest + @MethodSource("parameters") + void locateMinifiedJavaScriptResourceReference(TestCase testCase) + { + tester.getApplication().getResourceSettings().setUseMinifiedResources(true); + + checkNonStrictUsingJavaScriptResourceReference(testCase, testCase.getMinifiedContents()); + } + + /** */ + @ParameterizedTest + @MethodSource("parameters") + void locateMinifiedPackageResourceReference(TestCase testCase) + { + tester.getApplication().getResourceSettings().setUseMinifiedResources(true); + + checkNonStrictUsingPackageResourceReference(testCase, testCase.getMinifiedContents()); + } + + private void checkNonStrictUsingJavaScriptResourceReference(TestCase test, String expected) + { + Locale locale = test.getLocale(); + String style = test.getStyle(); + String variation = test.getVariation(); + String extension = test.getExtension(); + + JavaScriptResourceReference reference = new JavaScriptResourceReference( + ResourceReferenceLocatingTest.class, "b.js", locale, style, variation); + tester.startResourceReference(reference); + + assertThat(test.toString(), tester.getLastResponseAsString().trim(), + is("// " + expected)); + } + + private void checkNonStrictUsingPackageResourceReference(TestCase test, String expected) + { + Locale locale = test.getLocale(); + String style = test.getStyle(); + String variation = test.getVariation(); + String extension = test.getExtension(); + + PackageResourceReference reference = new PackageResourceReference( + ResourceReferenceLocatingTest.class, "b.js", locale, style, variation); + tester.startResourceReference(reference); + assertThat(test.toString(), tester.getLastResponseAsString().trim(), + is("// " + expected)); + } + public static class TestCase { private Locale locale; @@ -101,7 +178,7 @@ public class ResourceReferenceLocatingTest extends WicketTestCase return isNull(s) ? null : s; } - public static TestCase fromLine(String line) + static TestCase fromLine(String line) { String splitter; if (line.contains("\t")) @@ -131,32 +208,32 @@ public class ResourceReferenceLocatingTest extends WicketTestCase return test; } - public Locale getLocale() + Locale getLocale() { return locale; } - public String getStyle() + String getStyle() { return style; } - public String getVariation() + String getVariation() { return variation; } - public String getExtension() + String getExtension() { return extension; } - public String getNonMinifiedContents() + String getNonMinifiedContents() { return nonMinifiedContents; } - public String getMinifiedContents() + String getMinifiedContents() { return minifiedContents; } @@ -178,83 +255,4 @@ public class ResourceReferenceLocatingTest extends WicketTestCase ", extension=" + extension + "]"; } } - - private TestCase test; - - public ResourceReferenceLocatingTest(TestCase test) - { - this.test = test; - } - - @Before - public void before() - { - tester.getSession().setLocale(Locale.ENGLISH); - } - - /** - * Locate a resource without a minification requirement. - */ - @Test - public void locateNonMinifiedJavaScriptResourceReference() - { - tester.getApplication().getResourceSettings().setUseMinifiedResources(false); - - checkNonStrictUsingJavaScriptResourceReference(test.getNonMinifiedContents()); - } - - /** */ - @Test - public void locateNonMinifiedPackageResourceReference() - { - tester.getApplication().getResourceSettings().setUseMinifiedResources(false); - - checkNonStrictUsingPackageResourceReference(test.getNonMinifiedContents()); - } - - /** */ - @Test - public void locateMinifiedJavaScriptResourceReference() - { - tester.getApplication().getResourceSettings().setUseMinifiedResources(true); - - checkNonStrictUsingJavaScriptResourceReference(test.getMinifiedContents()); - } - - /** */ - @Test - public void locateMinifiedPackageResourceReference() - { - tester.getApplication().getResourceSettings().setUseMinifiedResources(true); - - checkNonStrictUsingPackageResourceReference(test.getMinifiedContents()); - } - - private void checkNonStrictUsingJavaScriptResourceReference(String expectedResult) - { - Locale locale = test.getLocale(); - String style = test.getStyle(); - String variation = test.getVariation(); - String extension = test.getExtension(); - - JavaScriptResourceReference reference = new JavaScriptResourceReference( - ResourceReferenceLocatingTest.class, "b.js", locale, style, variation); - tester.startResourceReference(reference); - assertThat(test.toString(), tester.getLastResponseAsString().trim(), - is("// " + expectedResult)); - } - - private void checkNonStrictUsingPackageResourceReference(String expectedResult) - { - Locale locale = test.getLocale(); - String style = test.getStyle(); - String variation = test.getVariation(); - String extension = test.getExtension(); - - PackageResourceReference reference = new PackageResourceReference( - ResourceReferenceLocatingTest.class, "b.js", locale, style, variation); - tester.startResourceReference(reference); - assertThat(test.toString(), tester.getLastResponseAsString().trim(), - is("// " + expectedResult)); - } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceRegistryTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceRegistryTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceRegistryTest.java index 2cd31c8..ca4c0b5 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceRegistryTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/ResourceReferenceRegistryTest.java @@ -16,23 +16,24 @@ */ package org.apache.wicket.request.resource; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.Matchers.is; +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; /** * Tests for {@link ResourceReferenceRegistry} */ -public class ResourceReferenceRegistryTest extends WicketTestCase +class ResourceReferenceRegistryTest extends WicketTestCase { /** * https://issues.apache.org/jira/browse/WICKET-3890 */ @Test - public void addRemove() + void addRemove() { ResourceReferenceRegistry registry = new ResourceReferenceRegistry(); assertEquals(0, registry.getSize()); @@ -52,7 +53,7 @@ public class ResourceReferenceRegistryTest extends WicketTestCase * {@link PackageResource} and register it */ @Test - public void addSharedResourceReference() + void addSharedResourceReference() { ResourceReferenceRegistry registry = new ResourceReferenceRegistry(); assertEquals(0, registry.getSize()); @@ -64,26 +65,26 @@ public class ResourceReferenceRegistryTest extends WicketTestCase } @Test - public void setNullResourceReferenceFactoryStillUsesTheDefault() + void setNullResourceReferenceFactoryStillUsesTheDefault() { ResourceReferenceRegistry registry = new ResourceReferenceRegistry(); registry.setResourceReferenceFactory(null); ResourceReference.Key key = new ResourceReference.Key(ResourceReferenceRegistryTest.class.getName(), "a.css", null, null, null); ResourceReference reference = registry.createDefaultResourceReference(key); - assertThat(reference, is(instanceOf(ResourceReference.class))); - assertThat(reference.getResource(), is(instanceOf(CssPackageResource.class))); + assertThat(reference, instanceOf(ResourceReference.class)); + assertThat(reference.getResource(), instanceOf(CssPackageResource.class)); } @Test - public void createLessResourceReference() + void createLessResourceReference() { ResourceReferenceRegistry registry = new ResourceReferenceRegistry(); registry.setResourceReferenceFactory(new LessResourceReferenceTest.LessResourceReferenceFactory()); ResourceReference.Key key = new ResourceReference.Key(ResourceReferenceRegistryTest.class.getName(), "LessResourceReference.less", null, null, null); ResourceReference reference = registry.createDefaultResourceReference(key); - assertThat(reference, is(instanceOf(LessResourceReferenceTest.LessResourceReference.class))); - assertThat(reference.getResource(), is(instanceOf(LessResourceReferenceTest.LessPackageResource.class))); + assertThat(reference, instanceOf(LessResourceReferenceTest.LessResourceReference.class)); + assertThat(reference.getResource(), instanceOf(LessResourceReferenceTest.LessPackageResource.class)); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/UrlResourceReferenceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/UrlResourceReferenceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/UrlResourceReferenceTest.java index 37c9546..81b6554 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/UrlResourceReferenceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/UrlResourceReferenceTest.java @@ -16,6 +16,10 @@ */ package org.apache.wicket.request.resource; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.apache.wicket.MarkupContainer; import org.apache.wicket.markup.IMarkupResourceStreamProvider; import org.apache.wicket.markup.head.IHeaderResponse; @@ -25,15 +29,15 @@ import org.apache.wicket.request.Url; 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; /** * @since 6.0 */ -public class UrlResourceReferenceTest extends WicketTestCase +class UrlResourceReferenceTest extends WicketTestCase { @Test - public void relativeUrl() + void relativeUrl() { Url url = Url.parse("some/relative/url"); UrlResourceReference reference = new UrlResourceReference(url); @@ -45,7 +49,7 @@ public class UrlResourceReferenceTest extends WicketTestCase } @Test - public void absoluteUrl() + void absoluteUrl() { Url url = Url.parse("http://www.example.com/some/path.ext";); UrlResourceReference reference = new UrlResourceReference(url); @@ -58,7 +62,7 @@ public class UrlResourceReferenceTest extends WicketTestCase } @Test - public void contextAbsoluteUrl() + void contextAbsoluteUrl() { Url url = Url.parse("/some/path.ext"); UrlResourceReference reference = new UrlResourceReference(url); @@ -70,16 +74,19 @@ public class UrlResourceReferenceTest extends WicketTestCase assertNull(reference.getResource()); } - @Test(expected = IllegalStateException.class) - public void cannotMakeAnAbsoluteUrlContextRelative() + @Test + void cannotMakeAnAbsoluteUrlContextRelative() { Url url = Url.parse("http://www.example.com/some/path.ext";); UrlResourceReference reference = new UrlResourceReference(url); - reference.setContextRelative(true); + + assertThrows(IllegalStateException.class, () -> { + reference.setContextRelative(true); + }); } @Test - public void contextRelativeUrl() + void contextRelativeUrl() { tester.getApplication().mountPage("/some/mount/path", TestPage.class); tester.startPage(new TestPage()); @@ -90,7 +97,7 @@ public class UrlResourceReferenceTest extends WicketTestCase /** * A test page for #contextRelativeUrl() */ - public static class TestPage extends WebPage implements IMarkupResourceStreamProvider + public static class TestPage extends WebPage implements IMarkupResourceStreamProvider { @Override public void renderHead(IHeaderResponse response) http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/WriteCallbackTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/WriteCallbackTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/WriteCallbackTest.java index 028d9e3..1dba5f6 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/WriteCallbackTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/WriteCallbackTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.request.resource; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -26,20 +28,18 @@ import org.apache.wicket.request.Url; import org.apache.wicket.request.resource.AbstractResource.WriteCallback; import org.apache.wicket.request.resource.IResource.Attributes; import org.apache.wicket.response.ByteArrayResponse; -import org.junit.Assert; -import org.junit.Test; - +import org.junit.jupiter.api.Test; /** * @author Kent Tong */ -public class WriteCallbackTest extends Assert +class WriteCallbackTest { /** */ @Test - public void writeStream() throws IOException + void writeStream() throws IOException { WriteCallback callback = new WriteCallback() { @@ -59,7 +59,7 @@ public class WriteCallbackTest extends Assert } InputStream in = new ByteArrayInputStream(srcData); callback.writeStream(attributes, in); - assertTrue("Content not equal", Arrays.equals(response.getBytes(), srcData)); + assertTrue(Arrays.equals(response.getBytes(), srcData), "Content not equal"); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/ContextRelativeResourceCachingTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/ContextRelativeResourceCachingTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/ContextRelativeResourceCachingTest.java index e4bfeb2..3aeac68 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/ContextRelativeResourceCachingTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/ContextRelativeResourceCachingTest.java @@ -16,7 +16,9 @@ */ package org.apache.wicket.request.resource.caching; -import static org.hamcrest.CoreMatchers.instanceOf; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.nio.charset.Charset; import java.util.Locale; @@ -31,12 +33,12 @@ import org.apache.wicket.request.resource.SharedResourceReference; import org.apache.wicket.request.resource.caching.version.IResourceVersion; import org.apache.wicket.request.resource.caching.version.StaticResourceVersion; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * */ -public class ContextRelativeResourceCachingTest extends WicketTestCase +class ContextRelativeResourceCachingTest extends WicketTestCase { private static final Charset CHARSET = Charset.forName("UTF-8"); private static final String SHARED_NAME = "contextresource"; @@ -93,7 +95,7 @@ public class ContextRelativeResourceCachingTest extends WicketTestCase * */ @Test - public void mapHandler() + void mapHandler() { ContextRelativeResource resource = new ContextRelativeResource("/style.css"); init(resource, "/test/resource"); @@ -101,7 +103,7 @@ public class ContextRelativeResourceCachingTest extends WicketTestCase Request request = createRequest("test/resource-version-123?bla=4567"); final IRequestHandler handler = tester.getApplication().getRootRequestMapper() .mapRequest(request); - assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class)); + assertThat(handler).isInstanceOf(ResourceReferenceRequestHandler.class); assertEquals(((ResourceReferenceRequestHandler)handler).getResource(), resource); } @@ -109,7 +111,7 @@ public class ContextRelativeResourceCachingTest extends WicketTestCase * */ @Test - public void mapRequest() + void mapRequest() { ContextRelativeResource resource = new ContextRelativeResource("/style.css"); init(resource, "/test/resource"); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/FilenameWithVersionResourceCachingStrategyTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/FilenameWithVersionResourceCachingStrategyTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/FilenameWithVersionResourceCachingStrategyTest.java index 0c82205..0d37fbb 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/FilenameWithVersionResourceCachingStrategyTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/FilenameWithVersionResourceCachingStrategyTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.request.resource.caching; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.wicket.Application; import org.apache.wicket.ThreadContext; import org.apache.wicket.request.cycle.RequestCycle; @@ -27,15 +29,14 @@ import org.apache.wicket.request.resource.caching.version.MessageDigestResourceV import org.apache.wicket.util.tester.BaseWicketTester; import org.apache.wicket.util.tester.WicketTester; import org.apache.wicket.util.time.Duration; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for FilenameWithVersionResourceCachingStrategy */ -public class FilenameWithVersionResourceCachingStrategyTest extends Assert +class FilenameWithVersionResourceCachingStrategyTest { - public static final String TEST_RESOURCE_VERSION = "9A0364B9E99BB480DD25E1F0284C8555"; + private static final String TEST_RESOURCE_VERSION = "9A0364B9E99BB480DD25E1F0284C8555"; private final String versionPrefix = "--vers--"; private final IResourceVersion resourceVersion = new MessageDigestResourceVersion(); @@ -43,7 +44,7 @@ public class FilenameWithVersionResourceCachingStrategyTest extends Assert new FilenameWithVersionResourceCachingStrategy(versionPrefix, resourceVersion); @Test - public void testDecorateUrl() throws Exception + void testDecorateUrl() throws Exception { ResourceUrl resourceUrl = new ResourceUrl("some-resource.txt", new PageParameters()); strategy.decorateUrl(resourceUrl, new TestResource()); @@ -58,7 +59,7 @@ public class FilenameWithVersionResourceCachingStrategyTest extends Assert } @Test - public void testUndecorateUrl() throws Exception + void testUndecorateUrl() throws Exception { ResourceUrl resourceUrl = new ResourceUrl("some-resource--vers--"+TEST_RESOURCE_VERSION+".txt", new PageParameters()); strategy.undecorateUrl(resourceUrl); @@ -79,7 +80,7 @@ public class FilenameWithVersionResourceCachingStrategyTest extends Assert } @Test - public void testDecorateResponse() throws Exception + void testDecorateResponse() throws Exception { Duration defaultDuration = Duration.minutes(60); @@ -115,7 +116,7 @@ public class FilenameWithVersionResourceCachingStrategyTest extends Assert } @Test - public void testUrlVersionStoredInRequestCycle() + void testUrlVersionStoredInRequestCycle() { WicketTester tester = new WicketTester(); tester.getApplication().getResourceSettings().setCachingStrategy(strategy); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/QueryStringWithVersionResourceCachingStrategyTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/QueryStringWithVersionResourceCachingStrategyTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/QueryStringWithVersionResourceCachingStrategyTest.java index 7e7b6db..0eabafe 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/QueryStringWithVersionResourceCachingStrategyTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/QueryStringWithVersionResourceCachingStrategyTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket.request.resource.caching; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + import org.apache.wicket.Application; import org.apache.wicket.ThreadContext; import org.apache.wicket.request.cycle.RequestCycle; @@ -28,15 +31,14 @@ import org.apache.wicket.request.resource.caching.version.MessageDigestResourceV import org.apache.wicket.util.tester.BaseWicketTester; import org.apache.wicket.util.tester.WicketTester; import org.apache.wicket.util.time.Duration; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for QueryStringWithVersionResourceCachingStrategy */ -public class QueryStringWithVersionResourceCachingStrategyTest extends Assert +class QueryStringWithVersionResourceCachingStrategyTest { - public static final String TEST_RESOURCE_VERSION = "9A0364B9E99BB480DD25E1F0284C8555"; + private static final String TEST_RESOURCE_VERSION = "9A0364B9E99BB480DD25E1F0284C8555"; private final String versionParameter = "vers"; private final IResourceVersion resourceVersion = new MessageDigestResourceVersion(); @@ -44,7 +46,7 @@ public class QueryStringWithVersionResourceCachingStrategyTest extends Assert new QueryStringWithVersionResourceCachingStrategy(versionParameter, resourceVersion); @Test - public void testDecorateUrl() throws Exception + void testDecorateUrl() throws Exception { ResourceUrl resourceUrl = new ResourceUrl("some-resource.txt", new PageParameters()); strategy.decorateUrl(resourceUrl, new TestResource()); @@ -54,7 +56,7 @@ public class QueryStringWithVersionResourceCachingStrategyTest extends Assert } @Test - public void testUndecorateUrl() throws Exception + void testUndecorateUrl() throws Exception { PageParameters urlParameters = new PageParameters(); urlParameters.add(versionParameter, TEST_RESOURCE_VERSION, INamedParameters.Type.QUERY_STRING); @@ -66,7 +68,7 @@ public class QueryStringWithVersionResourceCachingStrategyTest extends Assert } @Test - public void testDecorateResponse() throws Exception + void testDecorateResponse() throws Exception { Duration defaultDuration = Duration.minutes(60); @@ -102,7 +104,7 @@ public class QueryStringWithVersionResourceCachingStrategyTest extends Assert } @Test - public void testUrlVersionStoredInRequestCycle() + void testUrlVersionStoredInRequestCycle() { WicketTester tester = new WicketTester(); tester.getApplication().getResourceSettings().setCachingStrategy(strategy); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/ApplicationStringResourceLoaderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/ApplicationStringResourceLoaderTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/ApplicationStringResourceLoaderTest.java index 923b97b..17c1131 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/ApplicationStringResourceLoaderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/ApplicationStringResourceLoaderTest.java @@ -16,11 +16,13 @@ */ package org.apache.wicket.resource; +import static org.junit.jupiter.api.Assertions.assertNull; + import java.util.Locale; import org.apache.wicket.resource.loader.ClassStringResourceLoader; import org.apache.wicket.resource.loader.IStringResourceLoader; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for the <code>ApplicationStringResourceLoader</code> class. @@ -48,8 +50,8 @@ public class ApplicationStringResourceLoaderTest extends StringResourceLoaderTes public void loaderUnknownResources() { assertNull( - "Unknown resource should return null", createLoader().loadStringResource(component.getClass(), - "test.string.that.does.not.exist", Locale.getDefault(), null, null)); + "test.string.that.does.not.exist", Locale.getDefault(), null, null), + "Unknown resource should return null"); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/BundleStringResourceLoaderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/BundleStringResourceLoaderTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/BundleStringResourceLoaderTest.java index c9c9e97..c92303e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/BundleStringResourceLoaderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/BundleStringResourceLoaderTest.java @@ -16,11 +16,14 @@ */ package org.apache.wicket.resource; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + import java.util.Locale; import org.apache.wicket.resource.loader.BundleStringResourceLoader; import org.apache.wicket.resource.loader.IStringResourceLoader; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test case for the <code>BundleStringResourceLoader</code> class. @@ -36,7 +39,7 @@ public class BundleStringResourceLoaderTest extends StringResourceLoaderTestBase * @return The loader instance to test */ @Override - protected IStringResourceLoader createLoader() + protected IStringResourceLoader createLoader() { return new BundleStringResourceLoader("org.apache.wicket.resource.DummyResources"); } @@ -46,10 +49,11 @@ public class BundleStringResourceLoaderTest extends StringResourceLoaderTestBase */ @Override @Test - public void loaderValidKeyStyleNoLocale() + void loaderValidKeyStyleNoLocale() { - String s = loader.loadStringResource(component.getClass(), "test.string", null, "alt", null); - assertEquals("Resource should be loaded", "This is a test", s); + String s = loader.loadStringResource(component.getClass(), "test.string", null, "alt", + null); + assertEquals("This is a test", s, "Resource should be loaded"); } /** @@ -57,11 +61,11 @@ public class BundleStringResourceLoaderTest extends StringResourceLoaderTestBase */ @Override @Test - public void loaderUnknownResources() + public void loaderUnknownResources() { IStringResourceLoader loader = new BundleStringResourceLoader("unknown.resource"); - assertNull("Unknown resource should return null", loader.loadStringResource( - component.getClass(), "test.string", Locale.getDefault(), null, null)); + assertNull(loader.loadStringResource(component.getClass(), "test.string", + Locale.getDefault(), null, null), "Unknown resource should return null"); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/ComponentStringResourceLoaderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/ComponentStringResourceLoaderTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/ComponentStringResourceLoaderTest.java index 45543a9..b43dec4 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/ComponentStringResourceLoaderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/ComponentStringResourceLoaderTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket.resource; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + import java.util.Locale; import org.apache.wicket.Component; @@ -23,7 +26,7 @@ import org.apache.wicket.markup.html.panel.EmptyPanel; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.resource.loader.ComponentStringResourceLoader; import org.apache.wicket.resource.loader.IStringResourceLoader; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test case for the <code>ComponentStringResourceLoader</code> class. @@ -39,7 +42,7 @@ public class ComponentStringResourceLoaderTest extends StringResourceLoaderTestB * @return The loader instance to test */ @Override - protected IStringResourceLoader createLoader() + protected IStringResourceLoader createLoader() { return new ComponentStringResourceLoader(); } @@ -49,7 +52,7 @@ public class ComponentStringResourceLoaderTest extends StringResourceLoaderTestB */ @Override @Test - public void loaderUnknownResources() + public void loaderUnknownResources() { Component c = new DummyComponent("hello", tester.getApplication()) { @@ -58,25 +61,25 @@ public class ComponentStringResourceLoaderTest extends StringResourceLoaderTestB DummyPage page = new DummyPage(); page.add(c); IStringResourceLoader loader = new ComponentStringResourceLoader(); - assertNull("Missing resource should return null", loader.loadStringResource(c.getClass(), - "test.string.bad", Locale.getDefault(), null, null)); + assertNull(loader.loadStringResource(c.getClass(), "test.string.bad", Locale.getDefault(), + null, null), "Missing resource should return null"); } /** * */ @Test - public void nullComponent() + void nullComponent() { - assertNull("Null component should skip resource load", loader.loadStringResource( - (Component)null, "test.string", Locale.getDefault(), null, null)); + assertNull(loader.loadStringResource((Component)null, "test.string", Locale.getDefault(), + null, null), "Null component should skip resource load"); } /** * */ @Test - public void multiLevelEmbeddedComponentLoadFromComponent() + void multiLevelEmbeddedComponentLoadFromComponent() { DummyPage p = new DummyPage(); Panel panel = new EmptyPanel("panel"); @@ -84,37 +87,36 @@ public class ComponentStringResourceLoaderTest extends StringResourceLoaderTestB DummyComponent c = new DummyComponent("hello", tester.getApplication()); panel.add(c); IStringResourceLoader loader = new ComponentStringResourceLoader(); - assertEquals("Valid resourse string should be found", "Component string", - loader.loadStringResource(c.getClass(), "component.string", Locale.getDefault(), null, - null)); + assertEquals("Component string", loader + .loadStringResource(c.getClass(), "component.string", Locale.getDefault(), null, null), "Valid resourse string should be found"); } /** * */ @Test - public void loadDirectFromPage() + void loadDirectFromPage() { DummyPage p = new DummyPage(); IStringResourceLoader loader = new ComponentStringResourceLoader(); - assertEquals("Valid resourse string should be found", "Another string", - loader.loadStringResource(p.getClass(), "another.test.string", Locale.getDefault(), - null, null)); + assertEquals("Another string", loader.loadStringResource(p.getClass(), + "another.test.string", Locale.getDefault(), null, null), + "Valid resourse string should be found"); } /** * */ @Test - public void searchClassHierarchyFromPage() + void searchClassHierarchyFromPage() { DummySubClassPage p = new DummySubClassPage(); IStringResourceLoader loader = new ComponentStringResourceLoader(); - assertEquals("Valid resource string should be found", "SubClass Test String", - loader.loadStringResource(p.getClass(), "subclass.test.string", Locale.getDefault(), - null, null)); - assertEquals("Valid resource string should be found", "Another string", - loader.loadStringResource(p.getClass(), "another.test.string", Locale.getDefault(), - null, null)); + assertEquals("SubClass Test String", loader.loadStringResource(p.getClass(), + "subclass.test.string", Locale.getDefault(), null, null), + "Valid resource string should be found"); + assertEquals("Another string", loader.loadStringResource(p.getClass(), + "another.test.string", Locale.getDefault(), null, null), + "Valid resource string should be found"); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/CssUrlReplacerTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/CssUrlReplacerTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/CssUrlReplacerTest.java index 5681eaa..e693efe 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/CssUrlReplacerTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/CssUrlReplacerTest.java @@ -16,8 +16,10 @@ */ package org.apache.wicket.resource; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Locale; @@ -32,10 +34,10 @@ import org.apache.wicket.request.resource.caching.IStaticCacheableResource; import org.apache.wicket.request.resource.caching.ResourceUrl; import org.apache.wicket.request.resource.caching.version.MessageDigestResourceVersion; 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; -public class CssUrlReplacerTest extends WicketTestCase +class CssUrlReplacerTest extends WicketTestCase { private static final String DECORATION_SUFFIX = "--decorated"; @@ -71,14 +73,14 @@ public class CssUrlReplacerTest extends WicketTestCase }; } - @Before - public void before() + @BeforeEach + void before() { tester.getSession().setLocale(Locale.ENGLISH); } @Test - public void doNotProcessFullUrls() + void doNotProcessFullUrls() { String input = ".class {background-image: url('http://example.com/some.img');}"; Class<?> scope = CssUrlReplacerTest.class; @@ -86,11 +88,11 @@ public class CssUrlReplacerTest extends WicketTestCase CssUrlReplacer replacer = new CssUrlReplacer(); String processed = replacer.process(input, scope, cssRelativePath); - assertThat(processed, is(input)); + assertEquals(input, processed); } @Test - public void doNotProcessDataUrls_WICKET_6290() + void doNotProcessDataUrls_WICKET_6290() { String input = ".class {background-image: url(data:image/gif;base64,R0lGODlhEAAQAMQAAORHH);}"; Class<?> scope = CssUrlReplacerTest.class; @@ -98,11 +100,11 @@ public class CssUrlReplacerTest extends WicketTestCase CssUrlReplacer replacer = new CssUrlReplacer(); String processed = replacer.process(input, scope, cssRelativePath); - assertThat(processed, is(input)); + assertEquals(input, processed); } @Test - public void doNotProcessContextAbsoluteUrls() + void doNotProcessContextAbsoluteUrls() { String input = ".class {background-image: url('/some.img');}"; Class<?> scope = CssUrlReplacerTest.class; @@ -110,11 +112,11 @@ public class CssUrlReplacerTest extends WicketTestCase CssUrlReplacer replacer = new CssUrlReplacer(); String processed = replacer.process(input, scope, cssRelativePath); - assertThat(processed, is(input)); + assertEquals(input, processed); } @Test - public void sameFolderSingleQuotes() + void sameFolderSingleQuotes() { String input = ".class {background-image: url('some.img');}"; Class<?> scope = CssUrlReplacerTest.class; @@ -129,7 +131,7 @@ public class CssUrlReplacerTest extends WicketTestCase } @Test - public void sameFolderDoubleQuotes() + void sameFolderDoubleQuotes() { String input = ".class {background-image: url(\"some.img\");}"; Class<?> scope = CssUrlReplacerTest.class; @@ -144,7 +146,7 @@ public class CssUrlReplacerTest extends WicketTestCase } @Test - public void parentFolderAppendFolder() + void parentFolderAppendFolder() { String input = ".class {background-image: url('../images/some.img');}"; Class<?> scope = CssUrlReplacerTest.class; @@ -159,7 +161,7 @@ public class CssUrlReplacerTest extends WicketTestCase } @Test - public void sameFolderAppendFolder() + void sameFolderAppendFolder() { String input = ".class {background-image: url('./images/some.img');}"; Class<?> scope = CssUrlReplacerTest.class; @@ -174,7 +176,7 @@ public class CssUrlReplacerTest extends WicketTestCase } @Test - public void base64EncodedImage() + void base64EncodedImage() { String input = ".class {background-image: url('Beer.gif?embedBase64');}"; Class<?> scope = ImageTest.class; @@ -187,7 +189,7 @@ public class CssUrlReplacerTest extends WicketTestCase } @Test - public void severalUrls() + void severalUrls() { String input = ".class {\n" + "a: url('../images/a.img');\n" + "b: url('./b.img');\n" + "}"; Class<?> scope = CssUrlReplacerTest.class; http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/FileSystemResourceReferenceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/FileSystemResourceReferenceTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/FileSystemResourceReferenceTest.java index dab0e44..0fa16f0 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/FileSystemResourceReferenceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/FileSystemResourceReferenceTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.resource; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.io.IOException; import java.io.InputStream; import java.net.URI; @@ -27,8 +29,7 @@ import org.apache.wicket.core.util.lang.WicketObjects; import org.apache.wicket.util.io.ByteArrayOutputStream; import org.apache.wicket.util.io.IOUtils; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for FileSystemResourceReference @@ -36,7 +37,7 @@ import org.junit.Test; * @author Tobias Soloschenko * */ -public class FileSystemResourceReferenceTest extends WicketTestCase +class FileSystemResourceReferenceTest extends WicketTestCase { /** @@ -48,7 +49,7 @@ public class FileSystemResourceReferenceTest extends WicketTestCase * if the URI is not readable */ @Test - public void testFileSystemResourceReferenceWithZip() throws IOException, URISyntaxException + void testFileSystemResourceReferenceWithZip() throws IOException, URISyntaxException { InputStream inputStream = null; try @@ -69,13 +70,13 @@ public class FileSystemResourceReferenceTest extends WicketTestCase } }; // Size - Assert.assertEquals(fileSystemResource.getSize(), 39); + assertEquals(fileSystemResource.getSize(), 39); // Content inputStream = fileSystemResource.getInputStream(); ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); IOUtils.copy(inputStream, outputStream); - Assert.assertEquals("FileSystemResourceReference.zip content", outputStream.toString()); + assertEquals("FileSystemResourceReference.zip content", outputStream.toString()); } finally { @@ -92,7 +93,7 @@ public class FileSystemResourceReferenceTest extends WicketTestCase * if the URI is not readable */ @Test - public void testFileSystemResourceReferenceWithNormalFile() throws IOException, + void testFileSystemResourceReferenceWithNormalFile() throws IOException, URISyntaxException { InputStream inputStream = null; @@ -113,13 +114,13 @@ public class FileSystemResourceReferenceTest extends WicketTestCase } }; // Size - Assert.assertEquals(fileSystemResource.getSize(), 54); + assertEquals(fileSystemResource.getSize(), 54); // Content inputStream = fileSystemResource.getInputStream(); ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); IOUtils.copy(inputStream, outputStream); - Assert.assertEquals("FileSystemResourceReference.zip content in normal file", + assertEquals("FileSystemResourceReference.zip content in normal file", outputStream.toString()); } finally @@ -137,7 +138,7 @@ public class FileSystemResourceReferenceTest extends WicketTestCase * if the URI is not readable */ @Test - public void testMimeTypeEqual() throws IOException, URISyntaxException + void testMimeTypeEqual() throws IOException, URISyntaxException { URL resource = FileSystemResourceReferenceTest.class.getResource("FileSystemResourceReference.txt"); Path path = FileSystemResourceReference.getPath(resource.toURI()); @@ -162,7 +163,7 @@ public class FileSystemResourceReferenceTest extends WicketTestCase return fileSystemResource; } }; - Assert.assertEquals("test/mime1", fileSystemResource.getMimeType()); + assertEquals("test/mime1", fileSystemResource.getMimeType()); } /** @@ -174,7 +175,7 @@ public class FileSystemResourceReferenceTest extends WicketTestCase * if the */ @Test - public void testMimeTypeDetection() throws IOException, URISyntaxException + void testMimeTypeDetection() throws IOException, URISyntaxException { // uke > unknown extension :-) URL resource = FileSystemResourceReferenceTest.class.getResource("FileSystemResourceReference.uke"); @@ -192,7 +193,7 @@ public class FileSystemResourceReferenceTest extends WicketTestCase } }; - Assert.assertEquals("text/plain_provided_by_detector", fileSystemResource.getMimeType()); + assertEquals("text/plain_provided_by_detector", fileSystemResource.getMimeType()); final FileSystemResource fileSystemResourceMime = new FileSystemResource(path) { @@ -214,14 +215,14 @@ public class FileSystemResourceReferenceTest extends WicketTestCase return fileSystemResourceMime; } }; - Assert.assertEquals("text/plain", fileSystemResourceMime.getMimeType()); + assertEquals("text/plain", fileSystemResourceMime.getMimeType()); } /** * Test serialization of {@link FileSystemResource} */ @Test - public void testSerialization() throws IOException, URISyntaxException + void testSerialization() throws IOException, URISyntaxException { InputStream inputStream = null; try @@ -231,13 +232,13 @@ public class FileSystemResourceReferenceTest extends WicketTestCase final FileSystemResource fileSystemResource = new FileSystemResource(path); final FileSystemResource cloned = WicketObjects.cloneObject(fileSystemResource); - Assert.assertEquals(cloned.getSize(), 54); + assertEquals(cloned.getSize(), 54); // Content inputStream = cloned.getInputStream(); ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); IOUtils.copy(inputStream, outputStream); - Assert.assertEquals("FileSystemResourceReference.zip content in normal file", + assertEquals("FileSystemResourceReference.zip content in normal file", outputStream.toString()); } finally http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/PageWithUTF8Properties.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/PageWithUTF8Properties.java b/wicket-core/src/test/java/org/apache/wicket/resource/PageWithUTF8Properties.java index 3a41412..de5bdbb 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/PageWithUTF8Properties.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/PageWithUTF8Properties.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.resource; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.wicket.util.tester.DummyHomePage; http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/PageWithXmlProperties.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/PageWithXmlProperties.java b/wicket-core/src/test/java/org/apache/wicket/resource/PageWithXmlProperties.java index 258be1e..0ce82cf 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/PageWithXmlProperties.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/PageWithXmlProperties.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.resource; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.wicket.util.tester.DummyHomePage; http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/ResourceUtilTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/ResourceUtilTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/ResourceUtilTest.java index 7ce3980..92b84ba 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/ResourceUtilTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/ResourceUtilTest.java @@ -16,20 +16,21 @@ */ package org.apache.wicket.resource; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + import java.util.Locale; import org.apache.wicket.request.Url; import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.request.resource.ResourceReference.UrlAttributes; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; - -public class ResourceUtilTest extends Assert +class ResourceUtilTest { @Test - public void decodeResourceReferenceAttributesWithString() throws Exception + void decodeResourceReferenceAttributesWithString() throws Exception { String urlParameter = "en_GB-style-variation"; UrlAttributes attributes = ResourceUtil.decodeResourceReferenceAttributes(urlParameter); @@ -61,7 +62,7 @@ public class ResourceUtilTest extends Assert } @Test - public void decodeResourceReferenceAttributesWithUrl() throws Exception + void decodeResourceReferenceAttributesWithUrl() throws Exception { Url url = Url.parse("www.funny.url/?param1=value1"); UrlAttributes attributes = ResourceUtil.decodeResourceReferenceAttributes(url); @@ -82,7 +83,7 @@ public class ResourceUtilTest extends Assert } @Test - public void encodeResourceReferenceAttributes() throws Exception + void encodeResourceReferenceAttributes() throws Exception { UrlAttributes attributes = new UrlAttributes(null, null, null); assertNull(ResourceUtil.encodeResourceReferenceAttributes(attributes)); @@ -97,7 +98,7 @@ public class ResourceUtilTest extends Assert } @Test - public void encodeResourceReferenceAttributesWithResource() throws Exception + void encodeResourceReferenceAttributesWithResource() throws Exception { ResourceReference resourceReference = Mockito.mock(ResourceReference.class); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/StringResourceLoaderTestBase.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/StringResourceLoaderTestBase.java b/wicket-core/src/test/java/org/apache/wicket/resource/StringResourceLoaderTestBase.java index e073bc9..186515d 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/StringResourceLoaderTestBase.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/StringResourceLoaderTestBase.java @@ -16,15 +16,17 @@ */ package org.apache.wicket.resource; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + import java.util.Locale; import org.apache.wicket.Component; import org.apache.wicket.resource.loader.IStringResourceLoader; 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; /** * Abstract base class providing common test functionality to ensure that all loader implementations @@ -32,15 +34,15 @@ import org.junit.Test; * * @author Chris Turner */ -public abstract class StringResourceLoaderTestBase extends Assert +public abstract class StringResourceLoaderTestBase { - protected WicketTester tester; + WicketTester tester; // The loader to test protected IStringResourceLoader loader; // The dummy component - protected Component component; + Component component; /** @@ -53,8 +55,8 @@ public abstract class StringResourceLoaderTestBase extends Assert /** * @throws Exception */ - @Before - public void before() throws Exception + @BeforeEach + void before() throws Exception { tester = new WicketTester(new DummyApplication()); component = new DummyComponent("test", tester.getApplication()); @@ -66,8 +68,8 @@ public abstract class StringResourceLoaderTestBase extends Assert /** * @throws Exception */ - @After - public void after() throws Exception + @AfterEach + void after() throws Exception { tester.destroy(); } @@ -76,57 +78,58 @@ public abstract class StringResourceLoaderTestBase extends Assert * */ @Test - public void loaderValidKeyNoStyleDefaultLocale() + void loaderValidKeyNoStyleDefaultLocale() { String s = loader.loadStringResource(component.getClass(), "test.string", Locale.getDefault(), null, null); - Assert.assertEquals("Resource should be loaded", "This is a test", s); + assertEquals("This is a test", s, "Resource should be loaded"); // And do it again to ensure caching path is exercised s = loader.loadStringResource(component.getClass(), "test.string", Locale.getDefault(), null, null); - Assert.assertEquals("Resource should be loaded", "This is a test", s); + assertEquals("This is a test", s, "Resource should be loaded"); } /** * */ @Test - public void loaderInvalidKeyNoStyleDefaultLocale() + void loaderInvalidKeyNoStyleDefaultLocale() { - Assert.assertNull("Missing key should return null", loader.loadStringResource( - component.getClass(), "unknown.string", Locale.getDefault(), null, null)); + assertNull(loader.loadStringResource(component.getClass(), "unknown.string", + Locale.getDefault(), null, null), "Missing key should return null"); } /** * */ @Test - public void loaderValidKeyNoStyleAlternativeLocale() + void loaderValidKeyNoStyleAlternativeLocale() { String s = loader.loadStringResource(component.getClass(), "test.string", new Locale("zz"), null, null); - Assert.assertEquals("Resource should be loaded", "Flib flob", s); + assertEquals("Flib flob", s, "Resource should be loaded"); } /** * */ @Test - public void loaderInvalidKeyNoStyleAlternativeLocale() + void loaderInvalidKeyNoStyleAlternativeLocale() { - Assert.assertNull("Missing key should return null", loader.loadStringResource( - component.getClass(), "unknown.string", new Locale("zz"), null, null)); + assertNull(loader.loadStringResource(component.getClass(), "unknown.string", + new Locale("zz"), null, null), "Missing key should return null"); } /** * */ @Test - public void loaderValidKeyStyleNoLocale() + void loaderValidKeyStyleNoLocale() { - String s = loader.loadStringResource(component.getClass(), "test.string", null, "alt", null); - Assert.assertEquals("Resource should be loaded", "Alt test string", s); + String s = loader.loadStringResource(component.getClass(), "test.string", null, "alt", + null); + assertEquals("Alt test string", s, "Resource should be loaded"); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/TextTemplateResourceReferenceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/TextTemplateResourceReferenceTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/TextTemplateResourceReferenceTest.java index 7f5b039..2a37ca9 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/TextTemplateResourceReferenceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/TextTemplateResourceReferenceTest.java @@ -20,22 +20,21 @@ import java.util.HashMap; import java.util.Map; import org.apache.wicket.MarkupContainer; -import org.apache.wicket.Page; import org.apache.wicket.markup.IMarkupResourceStreamProvider; import org.apache.wicket.markup.head.IHeaderResponse; +import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.model.Model; import org.apache.wicket.request.resource.PackageResourceReference; -import org.apache.wicket.markup.head.JavaScriptHeaderItem; 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; /** * https://issues.apache.org/jira/browse/WICKET-3971 */ -public class TextTemplateResourceReferenceTest extends WicketTestCase +class TextTemplateResourceReferenceTest extends WicketTestCase { private static final String TEMPLATE_NAME = "textTemplateResRef.tmpl"; @@ -48,7 +47,7 @@ public class TextTemplateResourceReferenceTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-3971 */ @Test - public void renderInterpolatedTemplate() + void renderInterpolatedTemplate() { // the page will render just <script> element with url to the template // this will register it in the application's ResourceReferenceRegistry http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/UtfPropertiesFilePropertiesLoaderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/UtfPropertiesFilePropertiesLoaderTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/UtfPropertiesFilePropertiesLoaderTest.java index 9c246cb..e124e2b 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/UtfPropertiesFilePropertiesLoaderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/UtfPropertiesFilePropertiesLoaderTest.java @@ -18,18 +18,18 @@ package org.apache.wicket.resource; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test {@link UtfPropertiesFilePropertiesLoader}. */ -public class UtfPropertiesFilePropertiesLoaderTest extends WicketTestCase +class UtfPropertiesFilePropertiesLoaderTest extends WicketTestCase { /** * Test encoding. */ @Test - public void encoding() + void encoding() { tester.startPage(PageWithUTF8Properties.class); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/XmlFilePropertiesLoaderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/XmlFilePropertiesLoaderTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/XmlFilePropertiesLoaderTest.java index a11c233..a85cde1 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/XmlFilePropertiesLoaderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/XmlFilePropertiesLoaderTest.java @@ -16,19 +16,18 @@ */ package org.apache.wicket.resource; - import java.util.HashMap; import java.util.Locale; import java.util.Map; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * WICKET-2035 Change naming convention for xml properties files to *.properties.xml instead of * *.xml */ -public class XmlFilePropertiesLoaderTest extends WicketTestCase +class XmlFilePropertiesLoaderTest extends WicketTestCase { static Map<Locale, String> EXPECTED_LOCALIZATIONS = new HashMap<Locale, String>(); static @@ -42,7 +41,7 @@ public class XmlFilePropertiesLoaderTest extends WicketTestCase * (PageWithXmlProperties_locale).properties.xml */ @Test - public void wicket2035() + void wicket2035() { for (Locale locale : EXPECTED_LOCALIZATIONS.keySet()) { http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorRenderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorRenderTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorRenderTest.java index f3d475d..aa5a537 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorRenderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorRenderTest.java @@ -17,14 +17,14 @@ package org.apache.wicket.resource.aggregator; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for the {@link org.apache.wicket.markup.head.ResourceAggregator} class. * * @author Hielke Hoeve */ -public class ResourceAggregatorRenderTest extends WicketTestCase +class ResourceAggregatorRenderTest extends WicketTestCase { /** * tests a simple script, including jquery and wicket event js as deps @@ -32,7 +32,7 @@ public class ResourceAggregatorRenderTest extends WicketTestCase * @throws Exception */ @Test - public void testPage1() throws Exception + void testPage1() throws Exception { tester.startPage(ResourceAggregatorTest1Page.class); tester.assertResultPage(ResourceAggregatorTest1Page.class, @@ -45,7 +45,7 @@ public class ResourceAggregatorRenderTest extends WicketTestCase * @throws Exception */ @Test - public void testPage2() throws Exception + void testPage2() throws Exception { tester.startPage(ResourceAggregatorTest2Page.class); tester.assertResultPage(ResourceAggregatorTest2Page.class,
