You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mo...@apache.org on 2015/11/08 18:02:28 UTC
wicket git commit: Build fixed with non-US default locale
Repository: wicket
Updated Branches:
refs/heads/master 9585b0072 -> 6d88caf83
Build fixed with non-US default locale
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6d88caf8
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6d88caf8
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6d88caf8
Branch: refs/heads/master
Commit: 6d88caf83d737551d8c3d2656425a9d9b74115d8
Parents: 9585b00
Author: Michael Mosmann <mo...@apache.org>
Authored: Sun Nov 8 17:44:03 2015 +0100
Committer: Michael Mosmann <mo...@apache.org>
Committed: Sun Nov 8 17:44:03 2015 +0100
----------------------------------------------------------------------
.../deployment/AbstractDeploymentTest.java | 8 +++++++-
.../http/mock/MockHttpServletRequest.java | 21 ++++++++++++++------
.../wicket/util/tester/BaseWicketTester.java | 6 +++++-
.../wicket/util/tester/WicketTestCase.java | 12 ++++++++++-
.../wicket/resource/CssUrlReplacerTest.java | 14 ++++++++++++-
.../wicket/util/tester/WicketTesterTest.java | 12 +++++------
6 files changed, 57 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/6d88caf8/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
----------------------------------------------------------------------
diff --git a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
index 9108d1e..25ecd7d 100644
--- a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
+++ b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import java.io.File;
+import java.util.Locale;
import javax.servlet.ServletContext;
@@ -112,7 +113,12 @@ public abstract class AbstractDeploymentTest {
*/
public WicketTester getWicketTester() {
if(wicketTester == null) {
- wicketTester = new WicketTester(useServletContextContainer(),false);
+ wicketTester = new WicketTester(useServletContextContainer(),false) {
+ @Override
+ protected Locale servletRequestLocale() {
+ return Locale.US;
+ }
+ };
}
return wicketTester;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/6d88caf8/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java
index 6e758c7..96f92b2 100755
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java
@@ -212,14 +212,22 @@ public class MockHttpServletRequest implements HttpServletRequest
* The session object
* @param context
* The current servlet context
+ * @param locale
+ * The current locale
*/
public MockHttpServletRequest(final Application application, final HttpSession session,
- final ServletContext context)
+ final ServletContext context, Locale locale)
{
this.application = application;
this.session = session;
this.context = context;
- initialize();
+ initialize(locale);
+ }
+
+ public MockHttpServletRequest(final Application application, final HttpSession session,
+ final ServletContext context)
+ {
+ this(application, session, context, Locale.getDefault());
}
/**
@@ -1219,13 +1227,14 @@ public class MockHttpServletRequest implements HttpServletRequest
/**
* Reset the request back to a default state.
+ * @param locale
*/
- public void initialize()
+ public void initialize(Locale locale)
{
authType = null;
method = "post";
cookies.clear();
- setDefaultHeaders();
+ setDefaultHeaders(locale);
path = null;
url = null;
characterEncoding = "UTF-8";
@@ -1500,14 +1509,14 @@ public class MockHttpServletRequest implements HttpServletRequest
/**
* Helper method to create some default headers for the request
+ * @param l
*/
- private void setDefaultHeaders()
+ private void setDefaultHeaders(Locale l)
{
headers.clear();
addHeader("Accept", "text/xml,application/xml,application/xhtml+xml,"
+ "text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5");
addHeader("Accept-Charset", "ISO-8859-1,utf-8;q=0.7,*;q=0.7");
- Locale l = Locale.getDefault();
addHeader("Accept-Language", l.getLanguage().toLowerCase() + "-"
+ l.getCountry().toLowerCase() + "," + l.getLanguage().toLowerCase() + ";q=0.5");
addHeader("User-Agent",
http://git-wip-us.apache.org/repos/asf/wicket/blob/6d88caf8/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
index fcfdb56..47c7099 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
@@ -407,7 +407,7 @@ public class BaseWicketTester
*/
private void setupNextRequestCycle()
{
- request = new MockHttpServletRequest(application, httpSession, servletContext);
+ request = new MockHttpServletRequest(application, httpSession, servletContext, servletRequestLocale());
request.setURL(request.getContextPath() + request.getServletPath() + "/");
// assign protocol://host:port to next request unless the last request was ajax
@@ -485,6 +485,10 @@ public class BaseWicketTester
}
}
+ protected Locale servletRequestLocale() {
+ return Locale.getDefault();
+ }
+
/**
* Cleans up feedback messages. This usually happens on detach, but is disabled in unit testing
* so feedback mesasges can be examined.
http://git-wip-us.apache.org/repos/asf/wicket/blob/6d88caf8/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTestCase.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTestCase.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTestCase.java
index 9c698a1..ec9d846 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTestCase.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTestCase.java
@@ -17,14 +17,19 @@
package org.apache.wicket.util.tester;
import java.io.IOException;
+import java.util.Locale;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
+import org.apache.wicket.Session;
import org.apache.wicket.ThreadContext;
import org.apache.wicket.behavior.AbstractAjaxBehavior;
import org.apache.wicket.markup.IMarkupFragment;
import org.apache.wicket.mock.MockApplication;
+import org.apache.wicket.mock.MockWebRequest;
import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.request.Request;
+import org.apache.wicket.request.Response;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.junit.After;
import org.junit.Assert;
@@ -71,7 +76,12 @@ public abstract class WicketTestCase extends Assert
*/
protected WicketTester newWicketTester(final WebApplication app)
{
- return new WicketTester(app);
+ return new WicketTester(app) {
+ @Override
+ protected Locale servletRequestLocale() {
+ return Locale.US;
+ }
+ };
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/6d88caf8/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..045b21a 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,9 +19,14 @@ 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.Session;
import org.apache.wicket.markup.html.image.ImageTest;
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.request.Request;
+import org.apache.wicket.request.Response;
import org.apache.wicket.request.resource.caching.FilenameWithVersionResourceCachingStrategy;
import org.apache.wicket.request.resource.caching.IStaticCacheableResource;
import org.apache.wicket.request.resource.caching.ResourceUrl;
@@ -43,7 +48,6 @@ public class CssUrlReplacerTest extends WicketTestCase
protected void init()
{
super.init();
-
getResourceSettings().setCachingStrategy(
new FilenameWithVersionResourceCachingStrategy("=VER=",
new MessageDigestResourceVersion())
@@ -55,6 +59,14 @@ public class CssUrlReplacerTest extends WicketTestCase
}
});
}
+
+ @Override
+ public Session newSession(Request request, Response response) {
+ Session newSession = super.newSession(request, response);
+ newSession.setLocale(Locale.ROOT);
+ return newSession;
+ }
+
};
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/6d88caf8/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
index 2948005..8de2cc7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
@@ -244,7 +244,7 @@ public class WicketTesterTest extends WicketTestCase
tester.clickLink("ajaxLinkWithSetResponsePageClass");
throw new RuntimeException("Disabled link should not be clickable.");
}
- catch (AssertionError _)
+ catch (AssertionError ex)
{
;
}
@@ -268,7 +268,7 @@ public class WicketTesterTest extends WicketTestCase
tester.executeAjaxEvent("ajaxLinkWithSetResponsePageClass", "click");
throw new RuntimeException("Disabled link should not be clickable.");
}
- catch (AssertionError _)
+ catch (AssertionError ex)
{
;
}
@@ -292,7 +292,7 @@ public class WicketTesterTest extends WicketTestCase
tester.assertEnabled("ajaxLinkWithSetResponsePageClass");
fail("The link must not be enabled.");
}
- catch (AssertionError _)
+ catch (AssertionError ex)
{
;
}
@@ -316,7 +316,7 @@ public class WicketTesterTest extends WicketTestCase
tester.assertDisabled("ajaxLinkWithSetResponsePageClass");
fail("The link must not be disabled.");
}
- catch (AssertionError _)
+ catch (AssertionError ex)
{
;
}
@@ -344,7 +344,7 @@ public class WicketTesterTest extends WicketTestCase
tester.assertRequired("createForm:id");
fail("Book ID component must not be required anymore!");
}
- catch (AssertionError _)
+ catch (AssertionError ex)
{
;
}
@@ -354,7 +354,7 @@ public class WicketTesterTest extends WicketTestCase
// test #3: "createForm" is not a FormComponent
tester.assertRequired("createForm");
}
- catch (AssertionError _)
+ catch (AssertionError ex)
{
;
}