You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2017/03/19 20:04:48 UTC
[2/3] incubator-freemarker git commit: Configuration.getTemplate has
no "parse" parameter anymore. Similarly #include has no "parse" parameter
anymore. Whether a template is parsed can be specified via
Configuration.templateConfigurations, for example ba
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e365f11b/src/test/java/org/apache/freemarker/core/TemplateLookupStrategyTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/TemplateLookupStrategyTest.java b/src/test/java/org/apache/freemarker/core/TemplateLookupStrategyTest.java
index 6df2469..e991df8 100644
--- a/src/test/java/org/apache/freemarker/core/TemplateLookupStrategyTest.java
+++ b/src/test/java/org/apache/freemarker/core/TemplateLookupStrategyTest.java
@@ -332,7 +332,7 @@ public class TemplateLookupStrategyTest {
{
final Locale locale = new Locale("xx");
final String domain = "foo.com";
- final Template t = cfg.getTemplate("t.ftl", locale, domain, "utf-8", true, false);
+ final Template t = cfg.getTemplate("t.ftl", locale, domain, "utf-8", false);
assertEquals("t.ftl", t.getName());
assertEquals("@foo.com/t.ftl", t.getSourceName());
assertEquals(locale, t.getLocale());
@@ -355,7 +355,7 @@ public class TemplateLookupStrategyTest {
{
final Locale locale = new Locale("xx");
final String domain = "bar.com";
- final Template t = cfg.getTemplate("t.ftl", locale, domain, "utf-8", true, false);
+ final Template t = cfg.getTemplate("t.ftl", locale, domain, "utf-8", false);
assertEquals("t.ftl", t.getName());
assertEquals("@bar.com/t.ftl", t.getSourceName());
assertEquals(locale, t.getLocale());
@@ -380,7 +380,7 @@ public class TemplateLookupStrategyTest {
{
final Locale locale = new Locale("xx", "YY");
final String domain = "baaz.com";
- final Template t = cfg.getTemplate("t.ftl", locale, domain, "utf-8", true, false);
+ final Template t = cfg.getTemplate("t.ftl", locale, domain, "utf-8", false);
assertEquals("t.ftl", t.getName());
assertEquals("@default/t.ftl", t.getSourceName());
assertEquals(locale, t.getLocale());
@@ -405,7 +405,7 @@ public class TemplateLookupStrategyTest {
{
final Locale locale = new Locale("xx", "YY");
final String domain = "nosuch.com";
- final Template t = cfg.getTemplate("i.ftl", locale, domain, "utf-8", true, false);
+ final Template t = cfg.getTemplate("i.ftl", locale, domain, "utf-8", false);
assertEquals("i.ftl", t.getName());
assertEquals("@default/i_xx.ftl", t.getSourceName());
assertEquals(locale, t.getLocale());
@@ -425,7 +425,7 @@ public class TemplateLookupStrategyTest {
cfg.setLocalizedLookup(false);
final Locale locale = new Locale("xx", "YY");
final String domain = "nosuch.com";
- final Template t = cfg.getTemplate("i.ftl", locale, domain, "utf-8", true, false);
+ final Template t = cfg.getTemplate("i.ftl", locale, domain, "utf-8", false);
assertEquals("i.ftl", t.getName());
assertEquals("@default/i.ftl", t.getSourceName());
assertEquals(locale, t.getLocale());
@@ -443,7 +443,7 @@ public class TemplateLookupStrategyTest {
{
final Locale locale = new Locale("xx");
final String domain = "foo.com";
- final Template t = cfg.getTemplate("t2.ftl", locale, domain, "utf-8", true, false);
+ final Template t = cfg.getTemplate("t2.ftl", locale, domain, "utf-8", false);
assertOutputEquals(t2XxLocaleExpectedOutput, t);
assertEquals(
ImmutableList.of(
@@ -459,7 +459,7 @@ public class TemplateLookupStrategyTest {
{
final Locale locale = new Locale("yy");
final String domain = "foo.com";
- final Template t = cfg.getTemplate("t2.ftl", locale, domain, "utf-8", true, false);
+ final Template t = cfg.getTemplate("t2.ftl", locale, domain, "utf-8", false);
assertOutputEquals(t2OtherLocaleExpectedOutput, t);
assertEquals(
ImmutableList.of(
@@ -476,7 +476,7 @@ public class TemplateLookupStrategyTest {
cfg.setLocalizedLookup(false);
final Locale locale = new Locale("xx");
final String domain = "foo.com";
- final Template t = cfg.getTemplate("t2.ftl", locale, domain, "utf-8", true, false);
+ final Template t = cfg.getTemplate("t2.ftl", locale, domain, "utf-8", false);
assertOutputEquals(t2OtherLocaleExpectedOutput, t);
assertEquals(
ImmutableList.of(
@@ -493,7 +493,7 @@ public class TemplateLookupStrategyTest {
{
final Locale locale = new Locale("xx");
final String domain = "foo.com";
- cfg.getTemplate("i3.ftl", locale, domain, "utf-8", true, false);
+ cfg.getTemplate("i3.ftl", locale, domain, "utf-8", false);
assertEquals(
ImmutableList.of("@foo.com/i3_xx.ftl"),
tl.getLoadNames());
@@ -506,7 +506,7 @@ public class TemplateLookupStrategyTest {
final Locale locale = new Locale("xx");
final String domain = "bar.com";
try {
- cfg.getTemplate("i3.ftl", locale, domain, "utf-8", true, false);
+ cfg.getTemplate("i3.ftl", locale, domain, "utf-8", false);
} catch (TemplateNotFoundException e) {
assertEquals("i3.ftl", e.getTemplateName());
assertEquals(domain, e.getCustomLookupCondition());
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e365f11b/src/test/java/org/apache/freemarker/core/TemplateNotFoundMessageTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/TemplateNotFoundMessageTest.java b/src/test/java/org/apache/freemarker/core/TemplateNotFoundMessageTest.java
index b6b2de6..6758771 100644
--- a/src/test/java/org/apache/freemarker/core/TemplateNotFoundMessageTest.java
+++ b/src/test/java/org/apache/freemarker/core/TemplateNotFoundMessageTest.java
@@ -161,7 +161,7 @@ public class TemplateNotFoundMessageTest {
}
try {
- cfg.getTemplate("./missing", null, "example.com", null, true, false);
+ cfg.getTemplate("./missing", null, "example.com", null, false);
fail();
} catch (TemplateNotFoundException e) {
showErrorMessage(e.getMessage());
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e365f11b/src/test/java/org/apache/freemarker/core/templateresolver/DefaultTemplateResolverTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/templateresolver/DefaultTemplateResolverTest.java b/src/test/java/org/apache/freemarker/core/templateresolver/DefaultTemplateResolverTest.java
index 80f6d56..ab27c2a 100644
--- a/src/test/java/org/apache/freemarker/core/templateresolver/DefaultTemplateResolverTest.java
+++ b/src/test/java/org/apache/freemarker/core/templateresolver/DefaultTemplateResolverTest.java
@@ -55,13 +55,13 @@ public class DefaultTemplateResolverTest {
tr.setTemplateUpdateDelayMilliseconds(1000L);
loader.setThrowException(true);
try {
- tr.getTemplate("t", Locale.getDefault(), null, "", true).getTemplate();
+ tr.getTemplate("t", Locale.getDefault(), null, "").getTemplate();
fail();
} catch (IOException e) {
assertEquals("mock IO exception", e.getMessage());
assertEquals(1, loader.getLoadAttemptCount());
try {
- tr.getTemplate("t", Locale.getDefault(), null, "", true).getTemplate();
+ tr.getTemplate("t", Locale.getDefault(), null, "").getTemplate();
fail();
} catch (IOException e2) {
// Still 1 - returned cached exception
@@ -72,7 +72,7 @@ public class DefaultTemplateResolverTest {
assertEquals(1, loader.getLoadAttemptCount());
try {
Thread.sleep(1100L);
- tr.getTemplate("t", Locale.getDefault(), null, "", true).getTemplate();
+ tr.getTemplate("t", Locale.getDefault(), null, "").getTemplate();
fail();
} catch (IOException e3) {
// Cache had to retest
@@ -91,13 +91,13 @@ public class DefaultTemplateResolverTest {
DefaultTemplateNameFormat.INSTANCE, new Configuration());
cache.setTemplateUpdateDelayMilliseconds(1000L);
cache.setLocalizedLookup(false);
- assertNull(cache.getTemplate("t", Locale.getDefault(), null, "", true).getTemplate());
+ assertNull(cache.getTemplate("t", Locale.getDefault(), null, "").getTemplate());
assertEquals(1, loader.getLoadAttemptCount());
- assertNull(cache.getTemplate("t", Locale.getDefault(), null, "", true).getTemplate());
+ assertNull(cache.getTemplate("t", Locale.getDefault(), null, "").getTemplate());
// Still 1 - returned cached exception
assertEquals(1, loader.getLoadAttemptCount());
Thread.sleep(1100L);
- assertNull(cache.getTemplate("t", Locale.getDefault(), null, "", true).getTemplate());
+ assertNull(cache.getTemplate("t", Locale.getDefault(), null, "").getTemplate());
// Cache had to retest
assertEquals(2, loader.getLoadAttemptCount());
}
@@ -455,7 +455,7 @@ public class DefaultTemplateResolverTest {
Configuration cfg = new Configuration(Configuration.VERSION_3_0_0);
cfg.setTemplateNameFormat(DefaultTemplateNameFormat.INSTANCE);
try {
- cfg.getTemplate("../x", null, null, null, true, true);
+ cfg.getTemplate("../x", null, null, null, true);
fail();
} catch (MalformedTemplateNameException e) {
// expected
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e365f11b/src/test/resources/org/apache/freemarker/test/templatesuite/expected/include.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/freemarker/test/templatesuite/expected/include.txt b/src/test/resources/org/apache/freemarker/test/templatesuite/expected/include.txt
index 8255470..c72d69c 100644
--- a/src/test/resources/org/apache/freemarker/test/templatesuite/expected/include.txt
+++ b/src/test/resources/org/apache/freemarker/test/templatesuite/expected/include.txt
@@ -39,19 +39,6 @@ Hello, world!
assigning from included template
I'm here, mon!
-<p>Test unparsed includes:</p>
-<p>A test of included files:</p>
-
-<#if .globals.message?exists>
- <p>Message exists!:<br />
- ${.globals.message}</p>
-<#else>
- <p>No message :(</p>
-</#if>
-
-<#assign foo="assigning from included template", bar=" Can you see me? ">
-<#macro twice><#nested/>${bar}<#nested/></#macro>
-<#include "nestedinclude.ftl">
Kilroy
Can you see me? Kilroy
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e365f11b/src/test/resources/org/apache/freemarker/test/templatesuite/expected/include2.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/freemarker/test/templatesuite/expected/include2.txt b/src/test/resources/org/apache/freemarker/test/templatesuite/expected/include2.txt
index 5037260..ad47d13 100644
--- a/src/test/resources/org/apache/freemarker/test/templatesuite/expected/include2.txt
+++ b/src/test/resources/org/apache/freemarker/test/templatesuite/expected/include2.txt
@@ -19,17 +19,6 @@
A pr�ba
A pr�ba
-A pr�ba
-A pr�ba
-A pr�ba
-A pr�ba
-A pr�ba
-
-${'A'} pr�ba
-${'A'} pr�ba
-${'A'} pr�ba
-${'A'} pr�ba
-
A próba
A próba
A pr�ba
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e365f11b/src/test/resources/org/apache/freemarker/test/templatesuite/templates/include.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/freemarker/test/templatesuite/templates/include.ftl b/src/test/resources/org/apache/freemarker/test/templatesuite/templates/include.ftl
index 08f4df7..3e997e7 100644
--- a/src/test/resources/org/apache/freemarker/test/templatesuite/templates/include.ftl
+++ b/src/test/resources/org/apache/freemarker/test/templatesuite/templates/include.ftl
@@ -36,8 +36,6 @@ ${message}
${foo}
${nestedMessage}
-<p>Test unparsed includes:</p>
-<#include "included.ftl" parse=false>
<@twice>
Kilroy
</...@twice>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e365f11b/src/test/resources/org/apache/freemarker/test/templatesuite/templates/include2.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/freemarker/test/templatesuite/templates/include2.ftl b/src/test/resources/org/apache/freemarker/test/templatesuite/templates/include2.ftl
index 4111910..41b8ed5 100644
--- a/src/test/resources/org/apache/freemarker/test/templatesuite/templates/include2.ftl
+++ b/src/test/resources/org/apache/freemarker/test/templatesuite/templates/include2.ftl
@@ -20,27 +20,14 @@
<#assign s = "de">
<#include "inclu" + s + "2-included.ftl">
-<#assign bTrue=true>
-<#assign sY='y'>
-<#include "include2-included.ftl">
-<#include "include2-included.ftl" parse=true>
-<#include "include2-included.ftl" parse=bTrue>
-<#include "include2-included.ftl" parse='y'>
-<#include "include2-included.ftl" parse=sY>
-
-<#assign bFalse=false>
-<#assign sN='n'>
-<#include "include2-included.ftl" parse=false>
-<#include "include2-included.ftl" parse=bFalse>
-<#include "include2-included.ftl" parse='n'>
-<#include "include2-included.ftl" parse=sN>
-
<#assign sEncoding="ISO-8859-1">
<#include "include2-included.ftl" encoding="ISO-8859-1">
<#include "include2-included.ftl" encoding=sEncoding>
<#include "include2-included-encoding.ftl" encoding="ISO-8859-1">
<#include "include2-included-encoding.ftl" encoding=sEncoding>
+<#assign bTrue=true>
+<#assign bFalse=false>
<#include "include2-included.ftl" ignore_missing=true>
<#include "include2-included.ftl" ignore_missing=bTrue>
<#include "include2-included.ftl" ignore_missing=false>