Repository: wicket Updated Branches: refs/heads/master 5b7547fb8 -> d4f0bba42
WICKET-6243 better testing session locale changes in auto link rendering Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d4f0bba4 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d4f0bba4 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d4f0bba4 Branch: refs/heads/master Commit: d4f0bba426cb4106576f35cc430392f81bd9e759 Parents: 5b7547f Author: Pedro Henrique Oliveira dos Santos <[email protected]> Authored: Wed Sep 14 00:15:00 2016 -0300 Committer: Pedro Henrique Oliveira dos Santos <[email protected]> Committed: Wed Sep 14 00:16:45 2016 -0300 ---------------------------------------------------------------------- .../markup/resolver/AutoLinkResolverTest.java | 42 +++++++++++++++----- .../apache/wicket/markup/resolver/resource.ext | 0 2 files changed, 33 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/d4f0bba4/wicket-core/src/test/java/org/apache/wicket/markup/resolver/AutoLinkResolverTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/AutoLinkResolverTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/AutoLinkResolverTest.java index 32ed85c..d517fcc 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/AutoLinkResolverTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/AutoLinkResolverTest.java @@ -16,29 +16,53 @@ */ package org.apache.wicket.markup.resolver; -import static org.junit.Assert.assertThat; +import static org.hamcrest.CoreMatchers.containsString; import java.util.Locale; -import org.apache.wicket.util.tester.WicketTester; -import org.hamcrest.CoreMatchers; +import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; -public class AutoLinkResolverTest +/** + * @author Pedro Santos + */ +public class AutoLinkResolverTest extends WicketTestCase { + private static final Locale DEFAULT_LOCALE = Locale.US; + private static final Locale EXISTENT_RESOURCE_LOCALE = Locale.CANADA; + private static final Locale NON_EXISTENT_RESOURCE_LOCALE = Locale.FRANCE; @Test public void shouldAutoLinkLocalizedResources() { - Locale.setDefault(Locale.US); + PageWithAutoLinkedLocalResource instance = new PageWithAutoLinkedLocalResource(); - WicketTester tester = new WicketTester(); + tester.getSession().setLocale(DEFAULT_LOCALE); - tester.getSession().setLocale(Locale.CANADA); + tester.startPage(instance); - tester.startPage(PageWithAutoLinkedLocalResource.class); + tester.getSession().setLocale(EXISTENT_RESOURCE_LOCALE); + + tester.startPage(instance); - assertThat(tester.getLastResponseAsString(), CoreMatchers.containsString("en_CA")); + assertThat(tester.getLastResponseAsString(), + containsString(EXISTENT_RESOURCE_LOCALE.getCountry())); } + @Test + public void shouldAutoLinkExistentLocalizedResources() + { + tester.getSession().setLocale(NON_EXISTENT_RESOURCE_LOCALE); + + tester.startPage(PageWithAutoLinkedLocalResource.class); + + tester.getSession().setLocale(EXISTENT_RESOURCE_LOCALE); + + // works if the page is recreated only + // TODO: render existent resource's URL if previously not shown by this page instance? + tester.startPage(PageWithAutoLinkedLocalResource.class); + + assertThat(tester.getLastResponseAsString(), + containsString(EXISTENT_RESOURCE_LOCALE.getCountry())); + } } http://git-wip-us.apache.org/repos/asf/wicket/blob/d4f0bba4/wicket-core/src/test/java/org/apache/wicket/markup/resolver/resource.ext ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/resource.ext b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/resource.ext deleted file mode 100644 index e69de29..0000000
