Repository: wicket Updated Branches: refs/heads/wicket-7.x 5bfa280b2 -> 091dbbe4a
fix CssUrlReplacerTest to work again with other locales Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/091dbbe4 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/091dbbe4 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/091dbbe4 Branch: refs/heads/wicket-7.x Commit: 091dbbe4a714018517127665923b9030ae9376cb Parents: 5bfa280 Author: Carl-Eric Menzel <cmen...@apache.org> Authored: Thu Dec 8 11:56:44 2016 +0100 Committer: Carl-Eric Menzel <cmen...@apache.org> Committed: Thu Dec 8 12:12:22 2016 +0100 ---------------------------------------------------------------------- .../org/apache/wicket/resource/CssUrlReplacerTest.java | 11 +++++++++++ 1 file changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/091dbbe4/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 675c665..ed8a811 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 @@ -19,6 +19,8 @@ package org.apache.wicket.resource; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; +import java.util.Locale; + import org.apache.wicket.markup.html.image.ImageTest; import org.apache.wicket.mock.MockApplication; import org.apache.wicket.protocol.http.WebApplication; @@ -27,6 +29,7 @@ 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; public class CssUrlReplacerTest extends WicketTestCase @@ -58,6 +61,14 @@ public class CssUrlReplacerTest extends WicketTestCase }; } + @Before + public void before() + { + // if not ENGLISH then the #base64EncodedImage test will pick up a different GIF than the one we're expecting + // here. + tester.getSession().setLocale(Locale.ENGLISH); + } + @Test public void doNotProcessFullUrls() {