Repository: wicket Updated Branches: refs/heads/wicket-7.x 3695e16b4 -> 1a6594b1c
WICKET-6109 Enclosure - "IllegalArgumentException: Argument 'markup' may not be null" after app restart Set locale as Locale.US for InlineEnclosureWithWicketMessagePage so that the tests which use it pass also on systems with different locales Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1a6594b1 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1a6594b1 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1a6594b1 Branch: refs/heads/wicket-7.x Commit: 1a6594b1c724a0d4f235ed63b83dc458ffc51d3c Parents: 3695e16 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed Mar 16 10:30:58 2016 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Mar 16 10:30:58 2016 +0100 ---------------------------------------------------------------------- .../html/internal/InlineEnclosureWithWicketMessagePage.java | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/1a6594b1/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage.java index aebf680..963db5e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage.java @@ -19,6 +19,8 @@ package org.apache.wicket.markup.html.internal; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; +import java.util.Locale; + /** * Test page for InlineEnclosureTest. * Tests methods: @@ -33,4 +35,9 @@ public class InlineEnclosureWithWicketMessagePage extends WebPage { add(new Label("child", "A Label").setVisible(childVisible)); } + + @Override + public Locale getLocale() { + return Locale.US; + } }
