You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2016/03/30 16:32:12 UTC
wicket git commit: Set specific locales so that tests pass even with
de_DE system locale
Repository: wicket
Updated Branches:
refs/heads/wicket-7.x 65c43f29f -> b83c5d7ba
Set specific locales so that tests pass even with de_DE system locale
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b83c5d7b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b83c5d7b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b83c5d7b
Branch: refs/heads/wicket-7.x
Commit: b83c5d7ba5712fb72819e3b2caa4a2acd9d4c237
Parents: 65c43f2
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Mar 30 16:31:33 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Mar 30 16:31:33 2016 +0200
----------------------------------------------------------------------
.../resource/MinifiedAwareResourceReferenceTest.java | 14 +++++++++-----
.../wicket/request/resource/ResouceBundleTest.java | 8 ++++++++
.../resource/ResourceReferenceLocatingTest.java | 7 +++++++
.../apache/wicket/resource/CssUrlReplacerTest.java | 9 +++++++++
4 files changed, 33 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/b83c5d7b/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 653adb8..934281c 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,18 +16,17 @@
*/
package org.apache.wicket.request.resource;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Properties;
-
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;
+
/**
* Testcases for minified aware resources.
* There is a logic in PackageResourceReference to use a minified version of a resource
@@ -37,6 +36,11 @@ import org.junit.Test;
*/
public class MinifiedAwareResourceReferenceTest extends WicketTestCase
{
+ @Before
+ public void before()
+ {
+ tester.getSession().setLocale(Locale.US);
+ }
private String renderResource(ResourceReference reference)
{
@@ -97,4 +101,4 @@ public class MinifiedAwareResourceReferenceTest extends WicketTestCase
return super.locate(clazz, path);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/b83c5d7b/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 d336f83..658fada 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
@@ -17,12 +17,14 @@
package org.apache.wicket.request.resource;
import java.util.Arrays;
+import java.util.Locale;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
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;
/**
@@ -32,6 +34,12 @@ import org.junit.Test;
*/
public class ResouceBundleTest extends WicketTestCase
{
+ @Before
+ public void before()
+ {
+ tester.getSession().setLocale(Locale.ENGLISH);
+ }
+
/**
* Tests the concatenation of 2 javascript files
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/b83c5d7b/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 b2eca5f..5b96599 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
@@ -27,6 +27,7 @@ import java.util.Locale;
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;
@@ -185,6 +186,12 @@ public class ResourceReferenceLocatingTest extends WicketTestCase
this.test = test;
}
+ @Before
+ public void before()
+ {
+ tester.getSession().setLocale(Locale.ENGLISH);
+ }
+
/**
* Locate a resource without a minification requirement.
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/b83c5d7b/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 31fbff6..63b2b38 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
@@ -27,8 +27,11 @@ 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 java.util.Locale;
+
public class CssUrlReplacerTest extends WicketTestCase
{
@@ -58,6 +61,12 @@ public class CssUrlReplacerTest extends WicketTestCase
};
}
+ @Before
+ public void before()
+ {
+ tester.getSession().setLocale(Locale.ENGLISH);
+ }
+
@Test
public void doNotProcessFullUrls()
{