Previous commit restored the ordering feature, thus testFindTextInChildProperty test also has been restored.
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/685bb1d0 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/685bb1d0 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/685bb1d0 Branch: refs/heads/develop Commit: 685bb1d069623d59103187d7fee4671e31c353cb Parents: c74f283 Author: Luigi Fugaro <l.fug...@gmail.com> Authored: Mon Aug 18 16:27:13 2014 +0200 Committer: Luigi Fugaro <l.fug...@gmail.com> Committed: Mon Aug 18 16:27:13 2014 +0200 ---------------------------------------------------------------------- .../com/opensymphony/xwork2/util/LocalizedTextUtilTest.java | 6 ------ 1 file changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/685bb1d0/xwork-core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java index 02e493d..bac41ba 100644 --- a/xwork-core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java +++ b/xwork-core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java @@ -133,11 +133,6 @@ public class LocalizedTextUtilTest extends XWorkTestCase { assertEquals("Error during Action invocation", message); } - /* FIXME - Stated that property's management does not care about ordering, - in fact it's held by a Set instead of List, - you cannot override a previous bundle, thus the test is wrong. - public void testDefaultMessageOverride() throws Exception { String message = LocalizedTextUtil.findDefaultText(XWorkMessages.ACTION_EXECUTION_ERROR, Locale.getDefault()); assertEquals("Error during Action invocation", message); @@ -147,7 +142,6 @@ public class LocalizedTextUtilTest extends XWorkTestCase { message = LocalizedTextUtil.findDefaultText(XWorkMessages.ACTION_EXECUTION_ERROR, Locale.getDefault()); assertEquals("Testing resource bundle override", message); } - */ public void testFindTextInChildProperty() throws Exception { ModelDriven action = new ModelDrivenAction2();
