Updated Branches: refs/heads/master 49cf23ef4 -> 53e7e235c
corrected order of expected and actual parameter Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/53e7e235 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/53e7e235 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/53e7e235 Branch: refs/heads/master Commit: 53e7e235c1b78d9d0ac2f4b352d9354f8628339f Parents: 49cf23e Author: svenmeier <svenme...@apache.org> Authored: Wed Aug 22 19:30:55 2012 +0200 Committer: svenmeier <svenme...@apache.org> Committed: Wed Aug 22 19:30:55 2012 +0200 ---------------------------------------------------------------------- .../test/java/org/apache/wicket/LocalizerTest.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/53e7e235/wicket-core/src/test/java/org/apache/wicket/LocalizerTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/LocalizerTest.java b/wicket-core/src/test/java/org/apache/wicket/LocalizerTest.java index cf73e95..db1767e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/LocalizerTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/LocalizerTest.java @@ -242,7 +242,7 @@ public class LocalizerTest extends Assert tester.getApplication().getResourceSettings().setUseDefaultOnMissingResource(false); String option = localizer.getStringIgnoreSettings("dummy.null", page.drop1, null, "default"); - assertEquals(option, "default"); + assertEquals("default", option); option = localizer.getStringIgnoreSettings("dummy.null", page.drop1, null, null); assertNull(option); @@ -250,7 +250,7 @@ public class LocalizerTest extends Assert { option = localizer.getString("null", page.drop1, "CHOOSE_ONE"); } - assertEquals(option, "value 1"); + assertEquals("value 1", option); tester.getApplication().getResourceSettings().setThrowExceptionOnMissingResource(false); tester.getApplication().getResourceSettings().setUseDefaultOnMissingResource(false); @@ -262,7 +262,7 @@ public class LocalizerTest extends Assert tester.getApplication().getResourceSettings().setUseDefaultOnMissingResource(true); option = localizer.getString("dummy.null", page.drop1, null, "default"); - assertEquals(option, "default"); + assertEquals("default", option); try { @@ -272,8 +272,8 @@ public class LocalizerTest extends Assert catch (MissingResourceException ex) { assertEquals( - ex.getMessage(), - "Unable to find property: 'dummy.null' for component: form:drop1 [class=org.apache.wicket.markup.html.form.DropDownChoice]. Locale: null, style: null"); + "Unable to find property: 'dummy.null' for component: form:drop1 [class=org.apache.wicket.markup.html.form.DropDownChoice]. Locale: null, style: null", + ex.getMessage()); } }
