http://git-wip-us.apache.org/repos/asf/struts/blob/8bf77a1d/core/src/test/java/com/opensymphony/xwork2/util/DefaultLocalizedTextProviderTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/util/DefaultLocalizedTextProviderTest.java b/core/src/test/java/com/opensymphony/xwork2/util/DefaultLocalizedTextProviderTest.java deleted file mode 100644 index a9dca08..0000000 --- a/core/src/test/java/com/opensymphony/xwork2/util/DefaultLocalizedTextProviderTest.java +++ /dev/null @@ -1,267 +0,0 @@ -/* - * Copyright 2002-2006,2009 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.opensymphony.xwork2.util; - -import com.mockobjects.dynamic.Mock; -import com.opensymphony.xwork2.*; -import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider; -import com.opensymphony.xwork2.test.ModelDrivenAction2; -import com.opensymphony.xwork2.test.TestBean2; - -import java.text.DateFormat; -import java.text.ParseException; -import java.util.Date; -import java.util.HashMap; -import java.util.Locale; -import java.util.ResourceBundle; - - -/** - * Unit test for {@link DefaultLocalizedTextProvider}. - * - * @author jcarreira - * @author tm_jee - * - * @version $Date$ $Id$ - */ -public class DefaultLocalizedTextProviderTest extends XWorkTestCase { - - private LocalizedTextProvider localizedTextProvider; - - public void testNpeWhenClassIsPrimitive() throws Exception { - ValueStack stack = ActionContext.getContext().getValueStack(); - stack.push(new MyObject()); - String result = localizedTextProvider.findText(MyObject.class, "someObj.someI18nKey", Locale.ENGLISH, "default message", null, stack); - System.out.println(result); - } - - public static class MyObject extends ActionSupport { - public boolean getSomeObj() { - return true; - } - } - - public void testActionGetTextWithNullObject() throws Exception { - MyAction action = new MyAction(); - container.inject(action); - - Mock mockActionInvocation = new Mock(ActionInvocation.class); - mockActionInvocation.expectAndReturn("getAction", action); - ActionContext.getContext().setActionInvocation((ActionInvocation) mockActionInvocation.proxy()); - ActionContext.getContext().getValueStack().push(action); - - String message = action.getText("barObj.title"); - assertEquals("Title:", message); - } - - - public static class MyAction extends ActionSupport { - private Bar testBean2; - - public Bar getBarObj() { - return testBean2; - } - public void setBarObj(Bar testBean2) { - this.testBean2 = testBean2; - } - } - - public void testActionGetText() throws Exception { - ModelDrivenAction2 action = new ModelDrivenAction2(); - container.inject(action); - - TestBean2 bean = (TestBean2) action.getModel(); - Bar bar = new Bar(); - bean.setBarObj(bar); - - Mock mockActionInvocation = new Mock(ActionInvocation.class); - mockActionInvocation.expectAndReturn("getAction", action); - ActionContext.getContext().setActionInvocation((ActionInvocation) mockActionInvocation.proxy()); - ActionContext.getContext().getValueStack().push(action); - ActionContext.getContext().getValueStack().push(action.getModel()); - - String message = action.getText("barObj.title"); - assertEquals("Title:", message); - } - - public void testNullKeys() { - localizedTextProvider.findText(this.getClass(), null, Locale.getDefault()); - } - - public void testActionGetTextXXX() throws Exception { - localizedTextProvider.addDefaultResourceBundle("com/opensymphony/xwork2/util/FindMe"); - - SimpleAction action = new SimpleAction(); - container.inject(action); - - Mock mockActionInvocation = new Mock(ActionInvocation.class); - mockActionInvocation.expectAndReturn("getAction", action); - ActionContext.getContext().setActionInvocation((ActionInvocation) mockActionInvocation.proxy()); - ActionContext.getContext().getValueStack().push(action); - - String message = action.getText("bean.name"); - String foundBean2 = action.getText("bean2.name"); - - assertEquals("Okay! You found Me!", foundBean2); - assertEquals("Haha you cant FindMe!", message); - } - - public void testAddDefaultResourceBundle() { - String text = localizedTextProvider.findDefaultText("foo.range", Locale.getDefault()); - assertNull("Found message when it should not be available.", text); - - localizedTextProvider.addDefaultResourceBundle("com/opensymphony/xwork2/SimpleAction"); - - String message = localizedTextProvider.findDefaultText("foo.range", Locale.US); - assertEquals("Foo Range Message", message); - } - - public void testAddDefaultResourceBundle2() throws Exception { - localizedTextProvider.addDefaultResourceBundle("com/opensymphony/xwork2/SimpleAction"); - - ActionProxy proxy = actionProxyFactory.createActionProxy("/", "packagelessAction", null, new HashMap<String, Object>(), false, true); - proxy.execute(); - } - - public void testDefaultMessage() throws Exception { - String message = localizedTextProvider.findDefaultText("xwork.error.action.execution", Locale.getDefault()); - assertEquals("Error during Action invocation", message); - } - - public void testDefaultMessageOverride() throws Exception { - String message = localizedTextProvider.findDefaultText("xwork.error.action.execution", Locale.getDefault()); - assertEquals("Error during Action invocation", message); - - localizedTextProvider.addDefaultResourceBundle("com/opensymphony/xwork2/test"); - - message = localizedTextProvider.findDefaultText("xwork.error.action.execution", Locale.getDefault()); - assertEquals("Testing resource bundle override", message); - } - - public void testFindTextInChildProperty() throws Exception { - ModelDriven action = new ModelDrivenAction2(); - TestBean2 bean = (TestBean2) action.getModel(); - Bar bar = new Bar(); - bean.setBarObj(bar); - - Mock mockActionInvocation = new Mock(ActionInvocation.class); - mockActionInvocation.expectAndReturn("hashCode", 0); - mockActionInvocation.expectAndReturn("getAction", action); - ActionContext.getContext().setActionInvocation((ActionInvocation) mockActionInvocation.proxy()); - ActionContext.getContext().getValueStack().push(action); - ActionContext.getContext().getValueStack().push(action.getModel()); - - String message = localizedTextProvider.findText(ModelDrivenAction2.class, "invalid.fieldvalue.barObj.title", Locale.getDefault()); - assertEquals("Title is invalid!", message); - } - - public void testFindTextInInterface() throws Exception { - Action action = new ModelDrivenAction2(); - Mock mockActionInvocation = new Mock(ActionInvocation.class); - mockActionInvocation.expectAndReturn("getAction", action); - ActionContext.getContext().setActionInvocation((ActionInvocation) mockActionInvocation.proxy()); - - String message = localizedTextProvider.findText(ModelDrivenAction2.class, "test.foo", Locale.getDefault()); - assertEquals("Foo!", message); - } - - public void testFindTextInPackage() throws Exception { - ModelDriven action = new ModelDrivenAction2(); - - Mock mockActionInvocation = new Mock(ActionInvocation.class); - mockActionInvocation.expectAndReturn("getAction", action); - ActionContext.getContext().setActionInvocation((ActionInvocation) mockActionInvocation.proxy()); - - String message = localizedTextProvider.findText(ModelDrivenAction2.class, "package.properties", Locale.getDefault()); - assertEquals("It works!", message); - } - - public void testParameterizedDefaultMessage() throws Exception { - String message = localizedTextProvider.findDefaultText("xwork.exception.missing-action", Locale.getDefault(), new String[]{"AddUser"}); - assertEquals("There is no Action mapped for action name AddUser.", message); - } - - public void testParameterizedDefaultMessageWithPackage() throws Exception { - String message = localizedTextProvider.findDefaultText("xwork.exception.missing-package-action", Locale.getDefault(), new String[]{"blah", "AddUser"}); - assertEquals("There is no Action mapped for namespace blah and action name AddUser.", message); - } - - public void testLocalizedDateFormatIsUsed() throws ParseException { - localizedTextProvider.addDefaultResourceBundle("com/opensymphony/xwork2/util/LocalizedTextUtilTest"); - Date date = DateFormat.getDateInstance(DateFormat.SHORT, Locale.US).parse("01/01/2015"); - Object[] params = new Object[]{ date }; - String usDate = localizedTextProvider.findDefaultText("test.format.date", Locale.US, params); - String germanDate = localizedTextProvider.findDefaultText("test.format.date", Locale.GERMANY, params); - assertEquals(usDate, "1/1/15"); - assertEquals(germanDate, "01.01.15"); - } - - public void testXW377() { - localizedTextProvider.addDefaultResourceBundle("com/opensymphony/xwork2/util/LocalizedTextUtilTest"); - - String text = localizedTextProvider.findText(Bar.class, "xw377", ActionContext.getContext().getLocale(), "xw377", null, ActionContext.getContext().getValueStack()); - assertEquals("xw377", text); // should not log - - String text2 = localizedTextProvider.findText(DefaultLocalizedTextProviderTest.class, "notinbundle", ActionContext.getContext().getLocale(), "hello", null, ActionContext.getContext().getValueStack()); - assertEquals("hello", text2); // should log WARN - - String text3 = localizedTextProvider.findText(DefaultLocalizedTextProviderTest.class, "notinbundle.key", ActionContext.getContext().getLocale(), "notinbundle.key", null, ActionContext.getContext().getValueStack()); - assertEquals("notinbundle.key", text3); // should log WARN - - String text4 = localizedTextProvider.findText(DefaultLocalizedTextProviderTest.class, "xw377", ActionContext.getContext().getLocale(), "hello", null, ActionContext.getContext().getValueStack()); - assertEquals("xw377", text4); // should not log - - String text5 = localizedTextProvider.findText(DefaultLocalizedTextProviderTest.class, "username", ActionContext.getContext().getLocale(), null, null, ActionContext.getContext().getValueStack()); - assertEquals("Santa", text5); // should not log - } - - public void testXW404() { - // This tests will try to load bundles from the 3 locales but we only have files for France and Germany. - // Before this fix loading the bundle for Germany failed since Italy have previously failed and thus the misses cache - // contained a false entry - - ResourceBundle rbFrance = localizedTextProvider.findResourceBundle("com/opensymphony/xwork2/util/XW404", Locale.FRANCE); - ResourceBundle rbItaly = localizedTextProvider.findResourceBundle("com/opensymphony/xwork2/util/XW404", Locale.ITALY); - ResourceBundle rbGermany = localizedTextProvider.findResourceBundle("com/opensymphony/xwork2/util/XW404", Locale.GERMANY); - - assertNotNull(rbFrance); - assertEquals("Bonjour", rbFrance.getString("hello")); - - assertNull(rbItaly); - - assertNotNull(rbGermany); - assertEquals("Hallo", rbGermany.getString("hello")); - } - - @Override - protected void setUp() throws Exception { - super.setUp(); - XmlConfigurationProvider provider = new XmlConfigurationProvider("xwork-sample.xml"); - container.inject(provider); - loadConfigurationProviders(provider); - - localizedTextProvider = container.getInstance(LocalizedTextProvider.class); - - ActionContext.getContext().setLocale(Locale.US); - } - - @Override - protected void tearDown() throws Exception { - super.tearDown(); - localizedTextProvider = null; - } - -}
http://git-wip-us.apache.org/repos/asf/struts/blob/8bf77a1d/core/src/test/java/com/opensymphony/xwork2/util/StrutsLocalizedTextProviderTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/util/StrutsLocalizedTextProviderTest.java b/core/src/test/java/com/opensymphony/xwork2/util/StrutsLocalizedTextProviderTest.java new file mode 100644 index 0000000..237db80 --- /dev/null +++ b/core/src/test/java/com/opensymphony/xwork2/util/StrutsLocalizedTextProviderTest.java @@ -0,0 +1,267 @@ +/* + * Copyright 2002-2006,2009 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.opensymphony.xwork2.util; + +import com.mockobjects.dynamic.Mock; +import com.opensymphony.xwork2.*; +import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider; +import com.opensymphony.xwork2.test.ModelDrivenAction2; +import com.opensymphony.xwork2.test.TestBean2; + +import java.text.DateFormat; +import java.text.ParseException; +import java.util.Date; +import java.util.HashMap; +import java.util.Locale; +import java.util.ResourceBundle; + + +/** + * Unit test for {@link StrutsLocalizedTextProvider}. + * + * @author jcarreira + * @author tm_jee + * + * @version $Date$ $Id$ + */ +public class StrutsLocalizedTextProviderTest extends XWorkTestCase { + + private LocalizedTextProvider localizedTextProvider; + + public void testNpeWhenClassIsPrimitive() throws Exception { + ValueStack stack = ActionContext.getContext().getValueStack(); + stack.push(new MyObject()); + String result = localizedTextProvider.findText(MyObject.class, "someObj.someI18nKey", Locale.ENGLISH, "default message", null, stack); + System.out.println(result); + } + + public static class MyObject extends ActionSupport { + public boolean getSomeObj() { + return true; + } + } + + public void testActionGetTextWithNullObject() throws Exception { + MyAction action = new MyAction(); + container.inject(action); + + Mock mockActionInvocation = new Mock(ActionInvocation.class); + mockActionInvocation.expectAndReturn("getAction", action); + ActionContext.getContext().setActionInvocation((ActionInvocation) mockActionInvocation.proxy()); + ActionContext.getContext().getValueStack().push(action); + + String message = action.getText("barObj.title"); + assertEquals("Title:", message); + } + + + public static class MyAction extends ActionSupport { + private Bar testBean2; + + public Bar getBarObj() { + return testBean2; + } + public void setBarObj(Bar testBean2) { + this.testBean2 = testBean2; + } + } + + public void testActionGetText() throws Exception { + ModelDrivenAction2 action = new ModelDrivenAction2(); + container.inject(action); + + TestBean2 bean = (TestBean2) action.getModel(); + Bar bar = new Bar(); + bean.setBarObj(bar); + + Mock mockActionInvocation = new Mock(ActionInvocation.class); + mockActionInvocation.expectAndReturn("getAction", action); + ActionContext.getContext().setActionInvocation((ActionInvocation) mockActionInvocation.proxy()); + ActionContext.getContext().getValueStack().push(action); + ActionContext.getContext().getValueStack().push(action.getModel()); + + String message = action.getText("barObj.title"); + assertEquals("Title:", message); + } + + public void testNullKeys() { + localizedTextProvider.findText(this.getClass(), null, Locale.getDefault()); + } + + public void testActionGetTextXXX() throws Exception { + localizedTextProvider.addDefaultResourceBundle("com/opensymphony/xwork2/util/FindMe"); + + SimpleAction action = new SimpleAction(); + container.inject(action); + + Mock mockActionInvocation = new Mock(ActionInvocation.class); + mockActionInvocation.expectAndReturn("getAction", action); + ActionContext.getContext().setActionInvocation((ActionInvocation) mockActionInvocation.proxy()); + ActionContext.getContext().getValueStack().push(action); + + String message = action.getText("bean.name"); + String foundBean2 = action.getText("bean2.name"); + + assertEquals("Okay! You found Me!", foundBean2); + assertEquals("Haha you cant FindMe!", message); + } + + public void testAddDefaultResourceBundle() { + String text = localizedTextProvider.findDefaultText("foo.range", Locale.getDefault()); + assertNull("Found message when it should not be available.", text); + + localizedTextProvider.addDefaultResourceBundle("com/opensymphony/xwork2/SimpleAction"); + + String message = localizedTextProvider.findDefaultText("foo.range", Locale.US); + assertEquals("Foo Range Message", message); + } + + public void testAddDefaultResourceBundle2() throws Exception { + localizedTextProvider.addDefaultResourceBundle("com/opensymphony/xwork2/SimpleAction"); + + ActionProxy proxy = actionProxyFactory.createActionProxy("/", "packagelessAction", null, new HashMap<String, Object>(), false, true); + proxy.execute(); + } + + public void testDefaultMessage() throws Exception { + String message = localizedTextProvider.findDefaultText("xwork.error.action.execution", Locale.getDefault()); + assertEquals("Error during Action invocation", message); + } + + public void testDefaultMessageOverride() throws Exception { + String message = localizedTextProvider.findDefaultText("xwork.error.action.execution", Locale.getDefault()); + assertEquals("Error during Action invocation", message); + + localizedTextProvider.addDefaultResourceBundle("com/opensymphony/xwork2/test"); + + message = localizedTextProvider.findDefaultText("xwork.error.action.execution", Locale.getDefault()); + assertEquals("Testing resource bundle override", message); + } + + public void testFindTextInChildProperty() throws Exception { + ModelDriven action = new ModelDrivenAction2(); + TestBean2 bean = (TestBean2) action.getModel(); + Bar bar = new Bar(); + bean.setBarObj(bar); + + Mock mockActionInvocation = new Mock(ActionInvocation.class); + mockActionInvocation.expectAndReturn("hashCode", 0); + mockActionInvocation.expectAndReturn("getAction", action); + ActionContext.getContext().setActionInvocation((ActionInvocation) mockActionInvocation.proxy()); + ActionContext.getContext().getValueStack().push(action); + ActionContext.getContext().getValueStack().push(action.getModel()); + + String message = localizedTextProvider.findText(ModelDrivenAction2.class, "invalid.fieldvalue.barObj.title", Locale.getDefault()); + assertEquals("Title is invalid!", message); + } + + public void testFindTextInInterface() throws Exception { + Action action = new ModelDrivenAction2(); + Mock mockActionInvocation = new Mock(ActionInvocation.class); + mockActionInvocation.expectAndReturn("getAction", action); + ActionContext.getContext().setActionInvocation((ActionInvocation) mockActionInvocation.proxy()); + + String message = localizedTextProvider.findText(ModelDrivenAction2.class, "test.foo", Locale.getDefault()); + assertEquals("Foo!", message); + } + + public void testFindTextInPackage() throws Exception { + ModelDriven action = new ModelDrivenAction2(); + + Mock mockActionInvocation = new Mock(ActionInvocation.class); + mockActionInvocation.expectAndReturn("getAction", action); + ActionContext.getContext().setActionInvocation((ActionInvocation) mockActionInvocation.proxy()); + + String message = localizedTextProvider.findText(ModelDrivenAction2.class, "package.properties", Locale.getDefault()); + assertEquals("It works!", message); + } + + public void testParameterizedDefaultMessage() throws Exception { + String message = localizedTextProvider.findDefaultText("xwork.exception.missing-action", Locale.getDefault(), new String[]{"AddUser"}); + assertEquals("There is no Action mapped for action name AddUser.", message); + } + + public void testParameterizedDefaultMessageWithPackage() throws Exception { + String message = localizedTextProvider.findDefaultText("xwork.exception.missing-package-action", Locale.getDefault(), new String[]{"blah", "AddUser"}); + assertEquals("There is no Action mapped for namespace blah and action name AddUser.", message); + } + + public void testLocalizedDateFormatIsUsed() throws ParseException { + localizedTextProvider.addDefaultResourceBundle("com/opensymphony/xwork2/util/LocalizedTextUtilTest"); + Date date = DateFormat.getDateInstance(DateFormat.SHORT, Locale.US).parse("01/01/2015"); + Object[] params = new Object[]{ date }; + String usDate = localizedTextProvider.findDefaultText("test.format.date", Locale.US, params); + String germanDate = localizedTextProvider.findDefaultText("test.format.date", Locale.GERMANY, params); + assertEquals(usDate, "1/1/15"); + assertEquals(germanDate, "01.01.15"); + } + + public void testXW377() { + localizedTextProvider.addDefaultResourceBundle("com/opensymphony/xwork2/util/LocalizedTextUtilTest"); + + String text = localizedTextProvider.findText(Bar.class, "xw377", ActionContext.getContext().getLocale(), "xw377", null, ActionContext.getContext().getValueStack()); + assertEquals("xw377", text); // should not log + + String text2 = localizedTextProvider.findText(StrutsLocalizedTextProviderTest.class, "notinbundle", ActionContext.getContext().getLocale(), "hello", null, ActionContext.getContext().getValueStack()); + assertEquals("hello", text2); // should log WARN + + String text3 = localizedTextProvider.findText(StrutsLocalizedTextProviderTest.class, "notinbundle.key", ActionContext.getContext().getLocale(), "notinbundle.key", null, ActionContext.getContext().getValueStack()); + assertEquals("notinbundle.key", text3); // should log WARN + + String text4 = localizedTextProvider.findText(StrutsLocalizedTextProviderTest.class, "xw377", ActionContext.getContext().getLocale(), "hello", null, ActionContext.getContext().getValueStack()); + assertEquals("xw377", text4); // should not log + + String text5 = localizedTextProvider.findText(StrutsLocalizedTextProviderTest.class, "username", ActionContext.getContext().getLocale(), null, null, ActionContext.getContext().getValueStack()); + assertEquals("Santa", text5); // should not log + } + + public void testXW404() { + // This tests will try to load bundles from the 3 locales but we only have files for France and Germany. + // Before this fix loading the bundle for Germany failed since Italy have previously failed and thus the misses cache + // contained a false entry + + ResourceBundle rbFrance = localizedTextProvider.findResourceBundle("com/opensymphony/xwork2/util/XW404", Locale.FRANCE); + ResourceBundle rbItaly = localizedTextProvider.findResourceBundle("com/opensymphony/xwork2/util/XW404", Locale.ITALY); + ResourceBundle rbGermany = localizedTextProvider.findResourceBundle("com/opensymphony/xwork2/util/XW404", Locale.GERMANY); + + assertNotNull(rbFrance); + assertEquals("Bonjour", rbFrance.getString("hello")); + + assertNull(rbItaly); + + assertNotNull(rbGermany); + assertEquals("Hallo", rbGermany.getString("hello")); + } + + @Override + protected void setUp() throws Exception { + super.setUp(); + XmlConfigurationProvider provider = new XmlConfigurationProvider("xwork-sample.xml"); + container.inject(provider); + loadConfigurationProviders(provider); + + localizedTextProvider = container.getInstance(LocalizedTextProvider.class); + + ActionContext.getContext().setLocale(Locale.US); + } + + @Override + protected void tearDown() throws Exception { + super.tearDown(); + localizedTextProvider = null; + } + +}
