feature/FREEMARKER-54: ConfigurationFactoryBean tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/2783387e Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/2783387e Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/2783387e Branch: refs/heads/3 Commit: 2783387eb495331042e72449f02b2a18527a9e13 Parents: 57270ec Author: Woonsan Ko <woon...@apache.org> Authored: Thu Jun 15 00:37:24 2017 -0400 Committer: Woonsan Ko <woon...@apache.org> Committed: Thu Jun 15 00:37:24 2017 -0400 ---------------------------------------------------------------------- .../freemarker/spring/ConfigurationFactoryBean.java | 2 ++ .../freemarker/spring/ConfigurationFactoryBeanTest.java | 12 ++++++++++++ 2 files changed, 14 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2783387e/freemarker-spring/src/main/java/org/apache/freemarker/spring/ConfigurationFactoryBean.java ---------------------------------------------------------------------- diff --git a/freemarker-spring/src/main/java/org/apache/freemarker/spring/ConfigurationFactoryBean.java b/freemarker-spring/src/main/java/org/apache/freemarker/spring/ConfigurationFactoryBean.java index ead823d..2761b9a 100644 --- a/freemarker-spring/src/main/java/org/apache/freemarker/spring/ConfigurationFactoryBean.java +++ b/freemarker-spring/src/main/java/org/apache/freemarker/spring/ConfigurationFactoryBean.java @@ -44,6 +44,8 @@ public class ConfigurationFactoryBean extends ExtendableBuilder<ConfigurationFac private Map<String, String> settings = new LinkedHashMap<>(); public ConfigurationFactoryBean() { + // By default, set the default version constant. + // #setIncompatibleImprovements(Version) can be used to change it. super(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS); delegate = new AbstractFactoryBean<Configuration>() { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2783387e/freemarker-spring/src/test/java/org/apache/freemarker/spring/ConfigurationFactoryBeanTest.java ---------------------------------------------------------------------- diff --git a/freemarker-spring/src/test/java/org/apache/freemarker/spring/ConfigurationFactoryBeanTest.java b/freemarker-spring/src/test/java/org/apache/freemarker/spring/ConfigurationFactoryBeanTest.java index 7dcbcc5..82a5e74 100644 --- a/freemarker-spring/src/test/java/org/apache/freemarker/spring/ConfigurationFactoryBeanTest.java +++ b/freemarker-spring/src/test/java/org/apache/freemarker/spring/ConfigurationFactoryBeanTest.java @@ -18,13 +18,16 @@ */ package org.apache.freemarker.spring; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; import org.apache.freemarker.core.Configuration; import org.apache.freemarker.core.Configuration.ExtendableBuilder; +import org.apache.freemarker.core.Version; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -55,9 +58,15 @@ public class ConfigurationFactoryBeanTest { final Map<String, String> settings = new LinkedHashMap<>(); settings.put(ExtendableBuilder.LOCALIZED_TEMPLATE_LOOKUP_KEY_CAMEL_CASE, "true"); + final Map<String, Object> sharedVars = new HashMap<>(); + sharedVars.put("sharedVar1", "sharedVal1"); + sharedVars.put("sharedVar2", "sharedVal2"); + BeanDefinition beanDef = BeanDefinitionBuilder.genericBeanDefinition(ConfigurationFactoryBean.class.getName()) + .addPropertyValue("incompatibleImprovements", new Version(3, 0, 0)) .addPropertyValue("settings", settings) + .addPropertyValue("sharedVariables", sharedVars) .getBeanDefinition(); appContext.registerBeanDefinition("freemarkerConfig", beanDef); @@ -68,7 +77,10 @@ public class ConfigurationFactoryBeanTest { assertTrue("Not a Configuration object: " + bean, bean instanceof Configuration); Configuration config = (Configuration) bean; + assertEquals(new Version(3, 0, 0), config.getIncompatibleImprovements()); assertTrue(config.getLocalizedTemplateLookup()); + assertEquals("sharedVal1", config.getSharedVariables().get("sharedVar1")); + assertEquals("sharedVal2", config.getSharedVariables().get("sharedVar2")); } }
