http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/java/org/apache/freemarker/core/OptInTemplateClassResolverTest.java ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/OptInTemplateClassResolverTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/OptInTemplateClassResolverTest.java index 06e863c..1a24838 100644 --- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/OptInTemplateClassResolverTest.java +++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/OptInTemplateClassResolverTest.java @@ -128,8 +128,8 @@ public class OptInTemplateClassResolverTest extends TestCase { { Configuration cfg = new TestConfigurationBuilder() .setting( - "new_builtin_class_resolver", - "trusted_templates: foo.ftl, \"lib/*\"") + "newBuiltinClassResolver", + "trustedTemplates: foo.ftl, \"lib/*\"") .build(); TemplateClassResolver res = cfg.getNewBuiltinClassResolver(); @@ -149,8 +149,8 @@ public class OptInTemplateClassResolverTest extends TestCase { { Configuration cfg = new TestConfigurationBuilder() .setting( - "new_builtin_class_resolver", - "allowed_classes: java.lang.String, java.lang.Integer") + "newBuiltinClassResolver", + "allowedClasses: java.lang.String, java.lang.Integer") .build(); TemplateClassResolver res = cfg.getNewBuiltinClassResolver(); @@ -170,8 +170,8 @@ public class OptInTemplateClassResolverTest extends TestCase { { Configuration cfg = new TestConfigurationBuilder() .setting( - "new_builtin_class_resolver", - "trusted_templates: foo.ftl, 'lib/*', allowed_classes: 'java.lang.String'," + "newBuiltinClassResolver", + "trustedTemplates: foo.ftl, 'lib/*', allowedClasses: 'java.lang.String'," + " java.lang.Integer") .build(); TemplateClassResolver res = cfg.getNewBuiltinClassResolver(); @@ -200,7 +200,7 @@ public class OptInTemplateClassResolverTest extends TestCase { } try { - new TestConfigurationBuilder().setSetting("new_builtin_class_resolver", "wrong: foo"); + new TestConfigurationBuilder().setSetting("newBuiltinClassResolver", "wrong: foo"); fail(); } catch (ConfigurationException e) { // Expected @@ -209,8 +209,8 @@ public class OptInTemplateClassResolverTest extends TestCase { { Configuration cfg = new TestConfigurationBuilder() .setting( - "new_builtin_class_resolver", - "\"allowed_classes\" : java.lang.String , 'trusted_templates' :\"lib:*\"") + "newBuiltinClassResolver", + "\"allowedClasses\" : java.lang.String , 'trustedTemplates' :\"lib:*\"") .build(); TemplateClassResolver res = cfg.getNewBuiltinClassResolver(); assertEquals(String.class, res.resolve("java.lang.String", null,
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/java/org/apache/freemarker/core/OutputFormatTest.java ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/OutputFormatTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/OutputFormatTest.java index 538a01f..2bda427 100644 --- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/OutputFormatTest.java +++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/OutputFormatTest.java @@ -439,7 +439,7 @@ public class OutputFormatTest extends TemplateTest { @Test public void testStringBIsFail() { - assertErrorContains("<#ftl outputFormat='HTML'>${'<b>foo</b>'?esc?upperCase}", "string", "markup_output"); + assertErrorContains("<#ftl outputFormat='HTML'>${'<b>foo</b>'?esc?upperCase}", "string", "markupOutput"); } @Test @@ -544,7 +544,7 @@ public class OutputFormatTest extends TemplateTest { addTemplate("tN.ftl", "<#ftl outputFormat='RTF' autoEsc=false>" + commonFTL); assertOutputForNamed("tN.ftl", "RTF false"); - assertOutput("${.output_format} ${.auto_esc?c}", "undefined false"); + assertOutput("${.outputFormat} ${.autoEsc?c}", "undefined false"); } @Test @@ -613,10 +613,10 @@ public class OutputFormatTest extends TemplateTest { + "${.outputFormat}${'\\''}", "undefined' HTML' XML' HTML' undefined'"); assertOutput( - "<#ftl output_format='XML'>" - + "${.output_format}${'\\''} " - + "<#outputformat 'HTML'>${.output_format}${'\\''}</#outputformat> " - + "${.output_format}${'\\''}", + "<#ftl outputFormat='XML'>" + + "${.outputFormat}${'\\''} " + + "<#outputFormat 'HTML'>${.outputFormat}${'\\''}</#outputFormat> " + + "${.outputFormat}${'\\''}", "XML' HTML' XML'"); // Custom format: @@ -644,28 +644,20 @@ public class OutputFormatTest extends TemplateTest { "<#outputFormat true></#outputFormat>", "string", "boolean"); - // Naming convention: - assertErrorContains( - "<#outputFormat 'HTML'></#outputformat>", - "convention", "#outputFormat", "#outputformat"); - assertErrorContains( - "<#outputformat 'HTML'></#outputFormat>", - "convention", "#outputFormat", "#outputformat"); - // Empty block: assertOutput( - "${.output_format} " - + "<#outputformat 'HTML'></#outputformat>" - + "${.output_format}", + "${.outputFormat} " + + "<#outputFormat 'HTML'></#outputFormat>" + + "${.outputFormat}", "undefined undefined"); // WS stripping: assertOutput( - "${.output_format}\n" - + "<#outputformat 'HTML'>\n" + "${.outputFormat}\n" + + "<#outputFormat 'HTML'>\n" + " x\n" - + "</#outputformat>\n" - + "${.output_format}", + + "</#outputFormat>\n" + + "${.outputFormat}", "undefined\n x\nundefined"); } @@ -682,13 +674,13 @@ public class OutputFormatTest extends TemplateTest { + "${.autoEsc?c}${'&'}", "true& false& true& false& true&"); assertOutput( - "<#ftl auto_esc=false output_format='XML'>" - + "${.auto_esc?c}${'&'} " - + "<#autoesc>${.auto_esc?c}${'&'}</#autoesc> " - + "${.auto_esc?c}${'&'}", + "<#ftl autoEsc=false outputFormat='XML'>" + + "${.autoEsc?c}${'&'} " + + "<#autoEsc>${.autoEsc?c}${'&'}</#autoEsc> " + + "${.autoEsc?c}${'&'}", "false& true& false&"); - // Bad came case: + // Bad camel case: assertErrorContains( "<#noAutoesc></#noAutoesc>", "Unknown directive"); @@ -702,34 +694,19 @@ public class OutputFormatTest extends TemplateTest { // Empty block: assertOutput( - "${.auto_esc?c} " - + "<#noautoesc></#noautoesc>" - + "${.auto_esc?c}", + "${.autoEsc?c} " + + "<#noAutoEsc></#noAutoEsc>" + + "${.autoEsc?c}", "true true"); // WS stripping: assertOutput( - "${.auto_esc?c}\n" - + "<#noautoesc>\n" + "${.autoEsc?c}\n" + + "<#noAutoEsc>\n" + " x\n" - + "</#noautoesc>\n" - + "${.auto_esc?c}", + + "</#noAutoEsc>\n" + + "${.autoEsc?c}", "true\n x\ntrue"); - - - // Naming convention: - assertErrorContains( - "<#autoEsc></#autoesc>", - "convention", "#autoEsc", "#autoesc"); - assertErrorContains( - "<#autoesc></#autoEsc>", - "convention", "#autoEsc", "#autoesc"); - assertErrorContains( - "<#noAutoEsc></#noautoesc>", - "convention", "#noAutoEsc", "#noautoesc"); - assertErrorContains( - "<#noautoesc></#noAutoEsc>", - "convention", "#noAutoEsc", "#noautoesc"); } @Test @@ -910,27 +887,27 @@ public class OutputFormatTest extends TemplateTest { @Test public void testLegacyEscaperBIsBypassMOs() throws Exception { assertOutput("${htmlPlain?html} ${htmlMarkup?html}", "a < {h'} <p>c"); - assertErrorContains("${xmlPlain?html}", "?html", "string", "markup_output", "XML"); - assertErrorContains("${xmlMarkup?html}", "?html", "string", "markup_output", "XML"); - assertErrorContains("${rtfPlain?html}", "?html", "string", "markup_output", "RTF"); - assertErrorContains("${rtfMarkup?html}", "?html", "string", "markup_output", "RTF"); + assertErrorContains("${xmlPlain?html}", "?html", "string", "markupOutput", "XML"); + assertErrorContains("${xmlMarkup?html}", "?html", "string", "markupOutput", "XML"); + assertErrorContains("${rtfPlain?html}", "?html", "string", "markupOutput", "RTF"); + assertErrorContains("${rtfMarkup?html}", "?html", "string", "markupOutput", "RTF"); assertOutput("${htmlPlain?xhtml} ${htmlMarkup?xhtml}", "a < {h'} <p>c"); - assertErrorContains("${xmlPlain?xhtml}", "?xhtml", "string", "markup_output", "XML"); - assertErrorContains("${xmlMarkup?xhtml}", "?xhtml", "string", "markup_output", "XML"); - assertErrorContains("${rtfPlain?xhtml}", "?xhtml", "string", "markup_output", "RTF"); - assertErrorContains("${rtfMarkup?xhtml}", "?xhtml", "string", "markup_output", "RTF"); + assertErrorContains("${xmlPlain?xhtml}", "?xhtml", "string", "markupOutput", "XML"); + assertErrorContains("${xmlMarkup?xhtml}", "?xhtml", "string", "markupOutput", "XML"); + assertErrorContains("${rtfPlain?xhtml}", "?xhtml", "string", "markupOutput", "RTF"); + assertErrorContains("${rtfMarkup?xhtml}", "?xhtml", "string", "markupOutput", "RTF"); assertOutput("${xmlPlain?xml} ${xmlMarkup?xml}", "a < {x'} <p>c</p>"); assertOutput("${htmlPlain?xml} ${htmlMarkup?xml}", "a < {h'} <p>c"); - assertErrorContains("${rtfPlain?xml}", "?xml", "string", "markup_output", "RTF"); - assertErrorContains("${rtfMarkup?xml}", "?xml", "string", "markup_output", "RTF"); + assertErrorContains("${rtfPlain?xml}", "?xml", "string", "markupOutput", "RTF"); + assertErrorContains("${rtfMarkup?xml}", "?xml", "string", "markupOutput", "RTF"); assertOutput("${rtfPlain?rtf} ${rtfMarkup?rtf}", "\\\\par a & b \\par c"); - assertErrorContains("${xmlPlain?rtf}", "?rtf", "string", "markup_output", "XML"); - assertErrorContains("${xmlMarkup?rtf}", "?rtf", "string", "markup_output", "XML"); - assertErrorContains("${htmlPlain?rtf}", "?rtf", "string", "markup_output", "HTML"); - assertErrorContains("${htmlMarkup?rtf}", "?rtf", "string", "markup_output", "HTML"); + assertErrorContains("${xmlPlain?rtf}", "?rtf", "string", "markupOutput", "XML"); + assertErrorContains("${xmlMarkup?rtf}", "?rtf", "string", "markupOutput", "XML"); + assertErrorContains("${htmlPlain?rtf}", "?rtf", "string", "markupOutput", "HTML"); + assertErrorContains("${htmlMarkup?rtf}", "?rtf", "string", "markupOutput", "HTML"); } @Test @@ -1010,7 +987,6 @@ public class OutputFormatTest extends TemplateTest { addToDataModel("m2", HTMLOutputFormat.INSTANCE.fromMarkup("x")); addToDataModel("s", "x"); assertOutput("${m1?isMarkupOutput?c} ${m2?isMarkupOutput?c} ${s?isMarkupOutput?c}", "true true false"); - assertOutput("${m1?is_markup_output?c}", "true"); } private TestConfigurationBuilder createDefaultConfigurationBuilder() throws TemplateModelException { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/java/org/apache/freemarker/core/ParsingErrorMessagesTest.java ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/ParsingErrorMessagesTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/ParsingErrorMessagesTest.java index 05d44dc..de746d5 100644 --- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/ParsingErrorMessagesTest.java +++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/ParsingErrorMessagesTest.java @@ -116,8 +116,7 @@ public class ParsingErrorMessagesTest { @Test public void testUnknownHeaderParameter() { assertErrorContains("<#ftl foo=1>", "Unknown", "foo"); - assertErrorContains("<#ftl attributes={}>", "Unknown", "attributes", "custom_settings"); - assertErrorContains("<#ftl outputFormat='HTML' attributes={}>", "Unknown", "attributes", "customSettings"); + assertErrorContains("<#ftl attributes={}>", "Unknown", "attributes", "customSettings"); } } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/java/org/apache/freemarker/core/SQLTimeZoneTest.java ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/SQLTimeZoneTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/SQLTimeZoneTest.java index 7aca106..5dbc2bb 100644 --- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/SQLTimeZoneTest.java +++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/SQLTimeZoneTest.java @@ -94,7 +94,7 @@ public class SQLTimeZoneTest extends TemplateTest { + "${sqlTimestamp?string.xs_fz} ${javaDate?datetime?string.xs_fz}\n" + "${sqlDate?string.xs} ${sqlTime?string.xs} " + "${sqlTimestamp?string.xs} ${javaDate?datetime?string.xs}\n" - + "<#setting time_zone='GMT'>\n" + + "<#setting timeZone='GMT'>\n" + "${sqlDate} ${sqlTime} ${sqlTimestamp} ${javaDate?datetime}\n" + "${sqlDate?string.iso_fz} ${sqlTime?string.iso_fz} " + "${sqlTimestamp?string.iso_fz} ${javaDate?datetime?string.iso_fz}\n" @@ -220,19 +220,19 @@ public class SQLTimeZoneTest extends TemplateTest { + "2014-07-11 Fr, 10:30:05 Do, 2014-07-12T10:30:05 Sa, 2014-07-12T10:30:05 Sa, 2014-07-12 Sa, 10:30:05 Sa\n"); assertOutput( "${sqlDate}, ${sqlTime}, ${sqlTimestamp}, ${javaDate?datetime}, ${javaDate?date}, ${javaDate?time}\n" - + "<#setting date_format='yyyy-MM-dd'>\n" + + "<#setting dateFormat='yyyy-MM-dd'>\n" + "${sqlDate}, ${sqlTime}, ${sqlTimestamp}, ${javaDate?datetime}, ${javaDate?date}, ${javaDate?time}\n", "2014-07-11 Fri, 10:30:05 Thu, 2014-07-12T10:30:05 Sat, 2014-07-12T10:30:05 Sat, 2014-07-12 Sat, 10:30:05 Sat\n" + "2014-07-11, 10:30:05 Thu, 2014-07-12T10:30:05 Sat, 2014-07-12T10:30:05 Sat, 2014-07-12, 10:30:05 Sat\n"); assertOutput( "${sqlDate}, ${sqlTime}, ${sqlTimestamp}, ${javaDate?datetime}, ${javaDate?date}, ${javaDate?time}\n" - + "<#setting time_format='HH:mm:ss'>\n" + + "<#setting timeFormat='HH:mm:ss'>\n" + "${sqlDate}, ${sqlTime}, ${sqlTimestamp}, ${javaDate?datetime}, ${javaDate?date}, ${javaDate?time}\n", "2014-07-11 Fri, 10:30:05 Thu, 2014-07-12T10:30:05 Sat, 2014-07-12T10:30:05 Sat, 2014-07-12 Sat, 10:30:05 Sat\n" + "2014-07-11 Fri, 10:30:05, 2014-07-12T10:30:05 Sat, 2014-07-12T10:30:05 Sat, 2014-07-12 Sat, 10:30:05\n"); assertOutput( "${sqlDate}, ${sqlTime}, ${sqlTimestamp}, ${javaDate?datetime}, ${javaDate?date}, ${javaDate?time}\n" - + "<#setting datetime_format='yyyy-MM-dd\\'T\\'HH:mm:ss'>\n" + + "<#setting dateTimeFormat='yyyy-MM-dd\\'T\\'HH:mm:ss'>\n" + "${sqlDate}, ${sqlTime}, ${sqlTimestamp}, ${javaDate?datetime}, ${javaDate?date}, ${javaDate?time}\n", "2014-07-11 Fri, 10:30:05 Thu, 2014-07-12T10:30:05 Sat, 2014-07-12T10:30:05 Sat, 2014-07-12 Sat, 10:30:05 Sat\n" + "2014-07-11 Fri, 10:30:05 Thu, 2014-07-12T10:30:05, 2014-07-12T10:30:05, 2014-07-12 Sat, 10:30:05 Sat\n"); @@ -246,19 +246,19 @@ public class SQLTimeZoneTest extends TemplateTest { + "2014-07-12 Sa, 12:30:05 Do, 2014-07-12T10:30:05 Sa, 2014-07-12T10:30:05 Sa, 2014-07-12 Sa, 10:30:05 Sa\n"); assertOutput( "${sqlDate}, ${sqlTime}, ${sqlTimestamp}, ${javaDate?datetime}, ${javaDate?date}, ${javaDate?time}\n" - + "<#setting date_format='yyyy-MM-dd'>\n" + + "<#setting dateFormat='yyyy-MM-dd'>\n" + "${sqlDate}, ${sqlTime}, ${sqlTimestamp}, ${javaDate?datetime}, ${javaDate?date}, ${javaDate?time}\n", "2014-07-12 Sat, 12:30:05 Thu, 2014-07-12T10:30:05 Sat, 2014-07-12T10:30:05 Sat, 2014-07-12 Sat, 10:30:05 Sat\n" + "2014-07-12, 12:30:05 Thu, 2014-07-12T10:30:05 Sat, 2014-07-12T10:30:05 Sat, 2014-07-12, 10:30:05 Sat\n"); assertOutput( "${sqlDate}, ${sqlTime}, ${sqlTimestamp}, ${javaDate?datetime}, ${javaDate?date}, ${javaDate?time}\n" - + "<#setting time_format='HH:mm:ss'>\n" + + "<#setting timeFormat='HH:mm:ss'>\n" + "${sqlDate}, ${sqlTime}, ${sqlTimestamp}, ${javaDate?datetime}, ${javaDate?date}, ${javaDate?time}\n", "2014-07-12 Sat, 12:30:05 Thu, 2014-07-12T10:30:05 Sat, 2014-07-12T10:30:05 Sat, 2014-07-12 Sat, 10:30:05 Sat\n" + "2014-07-12 Sat, 12:30:05, 2014-07-12T10:30:05 Sat, 2014-07-12T10:30:05 Sat, 2014-07-12 Sat, 10:30:05\n"); assertOutput( "${sqlDate}, ${sqlTime}, ${sqlTimestamp}, ${javaDate?datetime}, ${javaDate?date}, ${javaDate?time}\n" - + "<#setting datetime_format='yyyy-MM-dd\\'T\\'HH:mm:ss'>\n" + + "<#setting dateTimeFormat='yyyy-MM-dd\\'T\\'HH:mm:ss'>\n" + "${sqlDate}, ${sqlTime}, ${sqlTimestamp}, ${javaDate?datetime}, ${javaDate?date}, ${javaDate?time}\n", "2014-07-12 Sat, 12:30:05 Thu, 2014-07-12T10:30:05 Sat, 2014-07-12T10:30:05 Sat, 2014-07-12 Sat, 10:30:05 Sat\n" + "2014-07-12 Sat, 12:30:05 Thu, 2014-07-12T10:30:05, 2014-07-12T10:30:05, 2014-07-12 Sat, 10:30:05 Sat\n"); @@ -283,10 +283,10 @@ public class SQLTimeZoneTest extends TemplateTest { assertOutput( "${javaDayErrorDate?date} ${javaDayErrorDate?time} ${sqlTimestamp?date} ${sqlTimestamp?time} " + "${sqlDate?date} ${sqlTime?time}\n" - + "<#setting time_zone='GMT+02'>\n" + + "<#setting timeZone='GMT+02'>\n" + "${javaDayErrorDate?date} ${javaDayErrorDate?time} ${sqlTimestamp?date} ${sqlTimestamp?time} " + "${sqlDate?date} ${sqlTime?time}\n" - + "<#setting time_zone='GMT-11'>\n" + + "<#setting timeZone='GMT-11'>\n" + "${javaDayErrorDate?date} ${javaDayErrorDate?time} ${sqlTimestamp?date} ${sqlTimestamp?time} " + "${sqlDate?date} ${sqlTime?time}\n", "2014-07-11 22:00:00 2014-07-12 10:30:05 2014-07-12 12:30:05\n" @@ -303,21 +303,21 @@ public class SQLTimeZoneTest extends TemplateTest { assertOutput( "${sqlDate}, ${sqlTime}, ${sqlTimestamp}, ${javaDate?datetime}\n" - + "<#setting sql_date_and_time_time_zone='GMT+02'>\n" + + "<#setting sqlDateAndTimeTimeZone='GMT+02'>\n" + "${sqlDate}, ${sqlTime}, ${sqlTimestamp}, ${javaDate?datetime}\n" - + "<#setting sql_date_and_time_time_zone='null'>\n" + + "<#setting sqlDateAndTimeTimeZone='null'>\n" + "${sqlDate}, ${sqlTime}, ${sqlTimestamp}, ${javaDate?datetime}\n" - + "<#setting time_zone='GMT+03'>\n" + + "<#setting timeZone='GMT+03'>\n" + "${sqlDate}, ${sqlTime}, ${sqlTimestamp}, ${javaDate?datetime}\n" - + "<#setting sql_date_and_time_time_zone='GMT+02'>\n" + + "<#setting sqlDateAndTimeTimeZone='GMT+02'>\n" + "${sqlDate}, ${sqlTime}, ${sqlTimestamp}, ${javaDate?datetime}\n" - + "<#setting sql_date_and_time_time_zone='GMT-11'>\n" + + "<#setting sqlDateAndTimeTimeZone='GMT-11'>\n" + "${sqlDate}, ${sqlTime}, ${sqlTimestamp}, ${javaDate?datetime}\n" - + "<#setting date_format='xs fz'>\n" + + "<#setting dateFormat='xs fz'>\n" + "${sqlDate}, ${sqlTime}, ${sqlTimestamp}, ${javaDate?datetime}\n" - + "<#setting time_format='xs fz'>\n" + + "<#setting timeFormat='xs fz'>\n" + "${sqlDate}, ${sqlTime}, ${sqlTimestamp}, ${javaDate?datetime}\n" - + "<#setting datetime_format='iso m'>\n" + + "<#setting dateTimeFormat='iso m'>\n" + "${sqlDate}, ${sqlTime}, ${sqlTimestamp}, ${javaDate?datetime}\n", "2014-07-11, 10:30:05, 2014-07-12T10:30:05, 2014-07-12T10:30:05\n" + "2014-07-12, 12:30:05, 2014-07-12T10:30:05, 2014-07-12T10:30:05\n" @@ -338,17 +338,17 @@ public class SQLTimeZoneTest extends TemplateTest { .build()); assertOutput( - "<#setting date_format='xs fz'><#setting time_format='xs fz'>\n" + "<#setting dateFormat='xs fz'><#setting timeFormat='xs fz'>\n" + "${sqlDate}, ${sqlTime}, ${javaDate?time}\n" - + "<#setting date_format='xs fz u'><#setting time_format='xs fz u'>\n" + + "<#setting dateFormat='xs fz u'><#setting timeFormat='xs fz u'>\n" + "${sqlDate}, ${sqlTime}, ${javaDate?time}\n" - + "<#setting sql_date_and_time_time_zone='GMT+03'>\n" + + "<#setting sqlDateAndTimeTimeZone='GMT+03'>\n" + "${sqlDate}, ${sqlTime}, ${javaDate?time}\n" - + "<#setting sql_date_and_time_time_zone='null'>\n" + + "<#setting sqlDateAndTimeTimeZone='null'>\n" + "${sqlDate}, ${sqlTime}, ${javaDate?time}\n" - + "<#setting date_format='xs fz'><#setting time_format='xs fz'>\n" + + "<#setting dateFormat='xs fz'><#setting timeFormat='xs fz'>\n" + "${sqlDate}, ${sqlTime}, ${javaDate?time}\n" - + "<#setting date_format='xs fz fu'><#setting time_format='xs fz fu'>\n" + + "<#setting dateFormat='xs fz fu'><#setting timeFormat='xs fz fu'>\n" + "${sqlDate}, ${sqlTime}, ${javaDate?time}\n", "2014-07-12+02:00, 12:30:05+02:00, 09:30:05-01:00\n" + "2014-07-12+02:00, 12:30:05+02:00, 10:30:05Z\n" http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/java/org/apache/freemarker/core/SpecialVariableTest.java ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/SpecialVariableTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/SpecialVariableTest.java index c74dfd7..664de58 100644 --- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/SpecialVariableTest.java +++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/SpecialVariableTest.java @@ -33,7 +33,7 @@ public class SpecialVariableTest extends TemplateTest { @Test public void testNamesSorted() throws Exception { String prevName = null; - for (String name : ASTExpBuiltInVariable.SPEC_VAR_NAMES) { + for (String name : ASTExpBuiltInVariable.BUILT_IN_VARIABLE_NAMES) { if (prevName != null) { assertThat(name, greaterThan(prevName)); } @@ -56,7 +56,7 @@ public class SpecialVariableTest extends TemplateTest { setConfiguration(new Configuration.Builder(Configuration.getVersion()).build()); assertOutput( - "${.incompatible_improvements}", + "${.incompatibleImprovements}", getConfiguration().getIncompatibleImprovements().toString()); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/java/org/apache/freemarker/core/TagSyntaxVariationsTest.java ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/TagSyntaxVariationsTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/TagSyntaxVariationsTest.java index 7b2473b..536be44 100644 --- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/TagSyntaxVariationsTest.java +++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/TagSyntaxVariationsTest.java @@ -30,7 +30,7 @@ import junit.framework.TestCase; /** * Test various generated templates (permutations), including some deliberately - * wrong ones, with various tag_syntax settings. + * wrong ones, with various tagSyntax settings. */ public class TagSyntaxVariationsTest extends TestCase { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/java/org/apache/freemarker/core/TemplateConfigurationTest.java ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/TemplateConfigurationTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/TemplateConfigurationTest.java index 355c6e7..bd1405c 100644 --- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/TemplateConfigurationTest.java +++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/TemplateConfigurationTest.java @@ -179,7 +179,6 @@ public class TemplateConfigurationTest { // Parser-only settings: SETTING_ASSIGNMENTS.put("templateLanguage", TemplateLanguage.STATIC_TEXT); SETTING_ASSIGNMENTS.put("tagSyntax", TagSyntax.SQUARE_BRACKET); - SETTING_ASSIGNMENTS.put("namingConvention", NamingConvention.LEGACY); SETTING_ASSIGNMENTS.put("whitespaceStripping", false); SETTING_ASSIGNMENTS.put("strictSyntaxMode", false); SETTING_ASSIGNMENTS.put("autoEscapingPolicy", AutoEscapingPolicy.DISABLE); @@ -535,15 +534,7 @@ public class TemplateConfigurationTest { tcb.setTagSyntax(TagSyntax.SQUARE_BRACKET); TemplateConfiguration tc = tcb.build(); assertOutputWithoutAndWithTC(tc, "[#if true]y[/#if]", "[#if true]y[/#if]", "y"); - testedProps.add(Configuration.ExtendableBuilder.TAG_SYNTAX_KEY_CAMEL_CASE); - } - - { - TemplateConfiguration.Builder tcb = new TemplateConfiguration.Builder(); - tcb.setNamingConvention(NamingConvention.CAMEL_CASE); - TemplateConfiguration tc = tcb.build(); - assertOutputWithoutAndWithTC(tc, "<#if true>y<#elseif false>n</#if>", "y", null); - testedProps.add(Configuration.ExtendableBuilder.NAMING_CONVENTION_KEY_CAMEL_CASE); + testedProps.add(Configuration.ExtendableBuilder.TAG_SYNTAX_KEY); } { @@ -551,7 +542,7 @@ public class TemplateConfigurationTest { tcb.setWhitespaceStripping(false); TemplateConfiguration tc = tcb.build(); assertOutputWithoutAndWithTC(tc, "<#if true>\nx\n</#if>\n", "x\n", "\nx\n\n"); - testedProps.add(Configuration.ExtendableBuilder.WHITESPACE_STRIPPING_KEY_CAMEL_CASE); + testedProps.add(Configuration.ExtendableBuilder.WHITESPACE_STRIPPING_KEY); } { @@ -559,7 +550,7 @@ public class TemplateConfigurationTest { tcb.setArithmeticEngine(new DummyArithmeticEngine()); TemplateConfiguration tc = tcb.build(); assertOutputWithoutAndWithTC(tc, "${1} ${1+1}", "1 2", "11 22"); - testedProps.add(Configuration.ExtendableBuilder.ARITHMETIC_ENGINE_KEY_CAMEL_CASE); + testedProps.add(Configuration.ExtendableBuilder.ARITHMETIC_ENGINE_KEY); } { @@ -569,7 +560,7 @@ public class TemplateConfigurationTest { assertOutputWithoutAndWithTC(tc, "${.outputFormat} ${\"a'b\"}", UndefinedOutputFormat.INSTANCE.getName() + " a'b", XMLOutputFormat.INSTANCE.getName() + " a'b"); - testedProps.add(Configuration.ExtendableBuilder.OUTPUT_FORMAT_KEY_CAMEL_CASE); + testedProps.add(Configuration.ExtendableBuilder.OUTPUT_FORMAT_KEY); } { @@ -578,7 +569,7 @@ public class TemplateConfigurationTest { tcb.setAutoEscapingPolicy(AutoEscapingPolicy.DISABLE); TemplateConfiguration tc = tcb.build(); assertOutputWithoutAndWithTC(tc, "${'a&b'}", "a&b", "a&b"); - testedProps.add(Configuration.ExtendableBuilder.AUTO_ESCAPING_POLICY_KEY_CAMEL_CASE); + testedProps.add(Configuration.ExtendableBuilder.AUTO_ESCAPING_POLICY_KEY); } { @@ -588,7 +579,7 @@ public class TemplateConfigurationTest { tc.setParentConfiguration(new Configuration(new Version(2, 3, 0))); assertOutputWithoutAndWithTC(tc, "<#foo>", null, "<#foo>"); */ - testedProps.add(Configuration.ExtendableBuilder.INCOMPATIBLE_IMPROVEMENTS_KEY_CAMEL_CASE); + testedProps.add(Configuration.ExtendableBuilder.INCOMPATIBLE_IMPROVEMENTS_KEY); } { @@ -597,7 +588,7 @@ public class TemplateConfigurationTest { TemplateConfiguration tc = tcb.build(); assertOutputWithoutAndWithTC(tc, "adhoc.ftlh", "${.outputFormat}", HTMLOutputFormat.INSTANCE.getName(), UndefinedOutputFormat.INSTANCE.getName()); - testedProps.add(Configuration.ExtendableBuilder.RECOGNIZE_STANDARD_FILE_EXTENSIONS_KEY_CAMEL_CASE); + testedProps.add(Configuration.ExtendableBuilder.RECOGNIZE_STANDARD_FILE_EXTENSIONS_KEY); } { @@ -609,7 +600,7 @@ public class TemplateConfigurationTest { + "${.error?replace('(?s).*?column ([0-9]+).*', '$1', 'r')}" + "</#attempt>", "13", "8"); - testedProps.add(Configuration.ExtendableBuilder.TAB_SIZE_KEY_CAMEL_CASE); + testedProps.add(Configuration.ExtendableBuilder.TAB_SIZE_KEY); } { @@ -641,7 +632,7 @@ public class TemplateConfigurationTest { assertEquals("${1+1}", out.toString()); } - testedProps.add(Configuration.ExtendableBuilder.TEMPLATE_LANGUAGE_KEY_CAMEL_CASE); + testedProps.add(Configuration.ExtendableBuilder.TEMPLATE_LANGUAGE_KEY); } { @@ -674,7 +665,7 @@ public class TemplateConfigurationTest { assertEquals("próba", out.toString()); } - testedProps.add(Configuration.ExtendableBuilder.SOURCE_ENCODING_KEY_CAMEL_CASE); + testedProps.add(Configuration.ExtendableBuilder.SOURCE_ENCODING_KEY); } if (!PARSER_PROP_NAMES.equals(testedProps)) { @@ -764,39 +755,13 @@ public class TemplateConfigurationTest { { Charset outputEncoding = ISO_8859_2; + TemplateConfiguration tc = new TemplateConfiguration.Builder() + .outputEncoding(outputEncoding) + .build(); - String legacyNCFtl = "${r'.output_encoding!\"null\"'?eval}"; - String camelCaseNCFtl = "${r'.outputEncoding!\"null\"'?eval}"; - - { - TemplateConfiguration tc = new TemplateConfiguration.Builder() - .outputEncoding(outputEncoding) - .build(); - - // Default is re-auto-detecting in ?eval: - assertOutputWithoutAndWithTC(tc, legacyNCFtl, "null", outputEncoding.name()); - assertOutputWithoutAndWithTC(tc, camelCaseNCFtl, "null", outputEncoding.name()); - } - - { - TemplateConfiguration tc = new TemplateConfiguration.Builder() - .outputEncoding(outputEncoding) - .namingConvention(NamingConvention.CAMEL_CASE) // Force camelCase - .build(); - - assertOutputWithoutAndWithTC(tc, legacyNCFtl, "null", null); - assertOutputWithoutAndWithTC(tc, camelCaseNCFtl, "null", outputEncoding.name()); - } - - { - TemplateConfiguration tc = new TemplateConfiguration.Builder() - .outputEncoding(outputEncoding) - .namingConvention(NamingConvention.LEGACY) // Force legacy - .build(); - - assertOutputWithoutAndWithTC(tc, legacyNCFtl, "null", outputEncoding.name()); - assertOutputWithoutAndWithTC(tc, camelCaseNCFtl, "null", null); - } + // Default is re-auto-detecting in ?eval: + assertOutputWithoutAndWithTC(tc, "${r'.outputEncoding!\"null\"'?eval}", + "null", outputEncoding.name()); } } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/java/org/apache/freemarker/core/UnclosedCommentTest.java ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/UnclosedCommentTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/UnclosedCommentTest.java index 99bf5d3..a45ffff 100644 --- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/UnclosedCommentTest.java +++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/UnclosedCommentTest.java @@ -32,10 +32,10 @@ public class UnclosedCommentTest extends TemplateTest { assertErrorContains("foo<#-- ", "Unclosed", "<#--"); assertErrorContains("foo<#--bar", "Unclosed", "<#--"); assertErrorContains("foo\n<#--\n", "Unclosed", "<#--"); - assertErrorContains("foo<#noparse>", "end of file"); // Not too good... - assertErrorContains("foo<#noparse> ", "Unclosed", "#noparse"); - assertErrorContains("foo<#noparse>bar", "Unclosed", "#noparse"); - assertErrorContains("foo\n<#noparse>\n", "Unclosed", "#noparse"); + assertErrorContains("foo<#noParse>", "end of file"); // Not too good... + assertErrorContains("foo<#noParse> ", "Unclosed", "#noParse"); + assertErrorContains("foo<#noParse>bar", "Unclosed", "#noParse"); + assertErrorContains("foo\n<#noParse>\n", "Unclosed", "#noParse"); } } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/ErrorMessagesTest.java ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/ErrorMessagesTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/ErrorMessagesTest.java index 4306a50..29e8b9b 100644 --- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/ErrorMessagesTest.java +++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/ErrorMessagesTest.java @@ -66,8 +66,8 @@ public class ErrorMessagesTest { fail(); } catch (TemplateModelException e) { assertThat(e.getMessage(), allOf( - containsString("String"), containsString("convert"), containsString("markup_output"), - containsString("Tip:"), containsString("?markup_string"))); + containsString("String"), containsString("convert"), containsString("markupOutput"), + containsString("Tip:"), containsString("?markupString"))); } } @@ -78,8 +78,8 @@ public class ErrorMessagesTest { fail(); } catch (TemplateModelException e) { assertThat(e.getMessage(), allOf( - containsString("Date"), containsString("convert"), containsString("markup_output"), - not(containsString("?markup_string")))); + containsString("Date"), containsString("convert"), containsString("markupOutput"), + not(containsString("?markupString")))); } } @@ -91,8 +91,8 @@ public class ErrorMessagesTest { } catch (TemplateModelException e) { assertThat(e.getMessage(), allOf( containsString("No compatible overloaded"), - containsString("String"), containsString("markup_output"), - containsString("Tip:"), containsString("?markup_string"))); + containsString("String"), containsString("markupOutput"), + containsString("Tip:"), containsString("?markupString"))); } } @@ -104,8 +104,8 @@ public class ErrorMessagesTest { } catch (TemplateModelException e) { assertThat(e.getMessage(), allOf( containsString("No compatible overloaded"), - containsString("Integer"), containsString("markup_output"), - not(containsString("?markup_string")))); + containsString("Integer"), containsString("markupOutput"), + not(containsString("?markupString")))); } } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-1.ast ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-1.ast b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-1.ast index 9021a8c..90b4956 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-1.ast +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-1.ast @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -#mixed_content // o.a.f.c.ASTImplicitParent +#mixedContent // o.a.f.c.ASTImplicitParent #text // o.a.f.c.ASTStaticText - content: "1 " // String @ // o.a.f.c.ASTDirUserDefined @@ -63,7 +63,7 @@ - namespace: null // Null #text // o.a.f.c.ASTStaticText - content: "\n4 " // String - #if-#elseif-#else-container // o.a.f.c.ASTDirIfElseIfElseContainer + #if-#elseIf-#else-container // o.a.f.c.ASTDirIfElseIfElseContainer #if // o.a.f.c.ASTDirIfOrElseOrElseIf - condition: == // o.a.f.c.ASTExpComparison - left-hand operand: + // o.a.f.c.ASTExpAddOrConcat @@ -175,12 +175,12 @@ - content: " A comment " // String #text // o.a.f.c.ASTStaticText - content: "\n11 " // String - #outputformat // o.a.f.c.ASTDirOutputFormat + #outputFormat // o.a.f.c.ASTDirOutputFormat - value: "XML" // o.a.f.c.ASTExpStringLiteral - #noautoesc // o.a.f.c.ASTDirNoAutoEsc + #noAutoEsc // o.a.f.c.ASTDirNoAutoEsc ${...} // o.a.f.c.ASTDollarInterpolation - content: a // o.a.f.c.ASTExpVariable - #autoesc // o.a.f.c.ASTDirAutoEsc + #autoEsc // o.a.f.c.ASTDirAutoEsc ${...} // o.a.f.c.ASTDollarInterpolation - content: b // o.a.f.c.ASTExpVariable ${...} // o.a.f.c.ASTDollarInterpolation http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-assignments.ast ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-assignments.ast b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-assignments.ast index 4839892..479f868 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-assignments.ast +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-assignments.ast @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -#mixed_content // o.a.f.c.ASTImplicitParent +#mixedContent // o.a.f.c.ASTImplicitParent #text // o.a.f.c.ASTStaticText - content: "1 " // String #assign // o.a.f.c.ASTDirAssignment http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-builtins.ast ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-builtins.ast b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-builtins.ast index 02f1a3b..538dd05 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-builtins.ast +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-builtins.ast @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -#mixed_content // o.a.f.c.ASTImplicitParent +#mixedContent // o.a.f.c.ASTImplicitParent ${...} // o.a.f.c.ASTDollarInterpolation - content: ?trim // o.a.f.c.BuiltInsForStringsBasic$trimBI - left-hand operand: x // o.a.f.c.ASTExpVariable http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-locations.ast ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-locations.ast b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-locations.ast index 7770d72..2466cfd 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-locations.ast +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-locations.ast @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -#mixed_content // o.a.f.c.ASTImplicitParent; Location 1:1-18:8 +#mixedContent // o.a.f.c.ASTImplicitParent; Location 1:1-18:8 #if // o.a.f.c.ASTDirIfOrElseOrElseIf; Location 1:1-1:15 - condition: exp // o.a.f.c.ASTExpVariable; Location 1:6-1:8 - AST-node subtype: "0" // Integer @@ -36,14 +36,14 @@ - content: "2" // String #text // o.a.f.c.ASTStaticText; Location 3:21-3:21 - content: "\n" // String - #if-#elseif-#else-container // o.a.f.c.ASTDirIfElseIfElseContainer; Location 4:1-4:22 + #if-#elseIf-#else-container // o.a.f.c.ASTDirIfElseIfElseContainer; Location 4:1-4:22 #if // o.a.f.c.ASTDirIfOrElseOrElseIf; Location 4:1-4:9 - condition: exp // o.a.f.c.ASTExpVariable; Location 4:6-4:8 - AST-node subtype: "0" // Integer #else // o.a.f.c.ASTDirIfOrElseOrElseIf; Location 4:10-4:16 - condition: null // Null - AST-node subtype: "1" // Integer - #if-#elseif-#else-container // o.a.f.c.ASTDirIfElseIfElseContainer; Location 5:1-5:24 + #if-#elseIf-#else-container // o.a.f.c.ASTDirIfElseIfElseContainer; Location 5:1-5:24 #if // o.a.f.c.ASTDirIfOrElseOrElseIf; Location 5:1-5:10 - condition: exp // o.a.f.c.ASTExpVariable; Location 5:6-5:8 - AST-node subtype: "0" // Integer @@ -56,7 +56,7 @@ - content: "1" // String #text // o.a.f.c.ASTStaticText; Location 5:25-5:25 - content: "\n" // String - #if-#elseif-#else-container // o.a.f.c.ASTDirIfElseIfElseContainer; Location 6:1-6:32 + #if-#elseIf-#else-container // o.a.f.c.ASTDirIfElseIfElseContainer; Location 6:1-6:32 #if // o.a.f.c.ASTDirIfOrElseOrElseIf; Location 6:1-6:14 - condition: exp // o.a.f.c.ASTExpVariable; Location 6:6-6:8 - AST-node subtype: "0" // Integer @@ -73,18 +73,18 @@ - content: "2" // String #text // o.a.f.c.ASTStaticText; Location 6:33-6:33 - content: "\n" // String - #if-#elseif-#else-container // o.a.f.c.ASTDirIfElseIfElseContainer; Location 7:1-7:28 + #if-#elseIf-#else-container // o.a.f.c.ASTDirIfElseIfElseContainer; Location 7:1-7:28 #if // o.a.f.c.ASTDirIfOrElseOrElseIf; Location 7:1-7:9 - condition: exp // o.a.f.c.ASTExpVariable; Location 7:6-7:8 - AST-node subtype: "0" // Integer - #elseif // o.a.f.c.ASTDirIfOrElseOrElseIf; Location 7:10-7:22 + #elseIf // o.a.f.c.ASTDirIfOrElseOrElseIf; Location 7:10-7:22 - condition: exp // o.a.f.c.ASTExpVariable; Location 7:19-7:21 - AST-node subtype: "2" // Integer - #if-#elseif-#else-container // o.a.f.c.ASTDirIfElseIfElseContainer; Location 8:1-8:29 + #if-#elseIf-#else-container // o.a.f.c.ASTDirIfElseIfElseContainer; Location 8:1-8:29 #if // o.a.f.c.ASTDirIfOrElseOrElseIf; Location 8:1-8:9 - condition: exp // o.a.f.c.ASTExpVariable; Location 8:6-8:8 - AST-node subtype: "0" // Integer - #elseif // o.a.f.c.ASTDirIfOrElseOrElseIf; Location 8:10-8:23 + #elseIf // o.a.f.c.ASTDirIfOrElseOrElseIf; Location 8:10-8:23 - condition: exp // o.a.f.c.ASTExpVariable; Location 8:19-8:21 - AST-node subtype: "2" // Integer #text // o.a.f.c.ASTStaticText; Location 8:23-8:23 http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-multipleignoredchildren.ast ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-multipleignoredchildren.ast b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-multipleignoredchildren.ast index 7675522..90fd2c6 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-multipleignoredchildren.ast +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-multipleignoredchildren.ast @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -#mixed_content // o.a.f.c.ASTImplicitParent +#mixedContent // o.a.f.c.ASTImplicitParent #text // o.a.f.c.ASTStaticText - content: "a\n" // String #text // o.a.f.c.ASTStaticText http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-nestedignoredchildren.ast ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-nestedignoredchildren.ast b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-nestedignoredchildren.ast index eefa5b1..e2d278a 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-nestedignoredchildren.ast +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-nestedignoredchildren.ast @@ -16,5 +16,5 @@ * specific language governing permissions and limitations * under the License. */ -#outputformat // o.a.f.c.ASTDirOutputFormat +#outputFormat // o.a.f.c.ASTDirOutputFormat - value: "HTML" // o.a.f.c.ASTExpStringLiteral http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-range.ast ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-range.ast b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-range.ast index 6fb5ab7..474b298 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-range.ast +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-range.ast @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -#mixed_content // o.a.f.c.ASTImplicitParent +#mixedContent // o.a.f.c.ASTImplicitParent #assign // o.a.f.c.ASTDirAssignment - assignment target: "x" // String - assignment operator: "=" // String http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-strlitinterpolation.ast ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-strlitinterpolation.ast b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-strlitinterpolation.ast index 97aca52..da4cf66 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-strlitinterpolation.ast +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-strlitinterpolation.ast @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -#mixed_content // o.a.f.c.ASTImplicitParent +#mixedContent // o.a.f.c.ASTImplicitParent #text // o.a.f.c.ASTStaticText - content: "1. " // String @ // o.a.f.c.ASTDirUserDefined http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-whitespacestripping.ast ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-whitespacestripping.ast b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-whitespacestripping.ast index 868fc69..41e3b12 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-whitespacestripping.ast +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-whitespacestripping.ast @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -#mixed_content // o.a.f.c.ASTImplicitParent +#mixedContent // o.a.f.c.ASTImplicitParent #assign // o.a.f.c.ASTDirAssignment - assignment target: "xs" // String - assignment operator: "=" // String http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/expected/noparse.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/expected/noparse.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/expected/noparse.txt index 5e8486c..d91e5d5 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/expected/noparse.txt +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/expected/noparse.txt @@ -37,15 +37,15 @@ ${message@#$%&} </#if> </p> -Here's another edge case, this time, trying to output a <noparse> -inside another <noparse> +Here's another edge case, this time, trying to output a <noParse> +inside another <noParse> -This is what the noparse instruction looks like: +This is what the noParse instruction looks like: -<#noparse>This part of the template wont be parsed by the +<#noParse>This part of the template wont be parsed by the FreeMarker parser. Instead, it will be treated as verbatim text information, -and output as such.</#noparse> +and output as such.</#noParse> The rest of the template appears here. http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/expected/string-builtins1.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/expected/string-builtins1.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/expected/string-builtins1.txt index 6e689ac..d79e7dc 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/expected/string-builtins1.txt +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/expected/string-builtins1.txt @@ -19,20 +19,20 @@ FreeMarker: Encoding string built-in tests -cap_first: DieBugsDie! * vazzZE 123456 --cdc-- --<<--@ x ${"kigyo"?upper_case} -uncap_first: dieBugsDie! * vazzZE 123456 --cdc-- --<<--@ x ${"kigyo"?upper_case} -uncap_first:blah -capitalize: Diebugsdie! * Vazzze 123456 --cdc-- --<<--@ X ${"kigyo"?upper_case} -html: dieBugsDie! * vazzZE 123456 --cdc-- --<<--@ x ${"kigyo"?upper_case} -length: 71 -lower_case: diebugsdie! * vazzze 123456 --cdc-- --<<--@ x ${"kigyo"?upper_case} -rtf: dieBugsDie! * vazzZE 123456 --cdc-- --<<--@ x $\{"kigyo"?upper_case\} -trim: dieBugsDie! * vazzZE 123456 --cdc-- --<<--@ x ${"kigyo"?upper_case} +capFirst: DieBugsDie! * vazzZE 123456 --cdc-- --<<--@ x ${"kigyo"?upperCase} ; +uncapFirst: dieBugsDie! * vazzZE 123456 --cdc-- --<<--@ x ${"kigyo"?upperCase} ; +uncapFirst: blah +capitalize: Diebugsdie! * Vazzze 123456 --cdc-- --<<--@ X ${"kigyo"?uppercase} ; +html: dieBugsDie! * vazzZE 123456 --cdc-- --<<--@ x ${"kigyo"?upperCase} ; +length: 70; +lowerCase: diebugsdie! * vazzze 123456 --cdc-- --<<--@ x ${"kigyo"?uppercase} ; +rtf: dieBugsDie! * vazzZE 123456 --cdc-- --<<--@ x $\{"kigyo"?upperCase\} ; +trim: dieBugsDie! * vazzZE 123456 --cdc-- --<<--@ x ${"kigyo"?upperCase}; trim2: foo bar trim3: foo bar trim4: foo bar -upper_case: DIEBUGSDIE! * VAZZZE 123456 --CDC-- --<<--@ X ${"KIGYO"?UPPER_CASE} -xml: dieBugsDie! * vazzZE 123456 --cdc-- --<<--@ x ${"kigyo"?upper_case} +upperCase: DIEBUGSDIE! * VAZZZE 123456 --CDC-- --<<--@ X ${"KIGYO"?UPPERCASE} ; +xml: dieBugsDie! * vazzZE 123456 --cdc-- --<<--@ x ${"kigyo"?upperCase} ; xhtml: "Blah's is > 1 & < 2" word_list: @@ -43,7 +43,7 @@ word_list: - --cdc-- - --<<--@ - x -- ${"kigyo"?upper_case} +- ${"kigyo"?upperCase} interpret: dieBugsDie! * vazzZE 123456 --cdc-- --<<--@ x KIGYO number: -122,35 http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/comment.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/comment.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/comment.ftl index 9c47168..c5cb54b 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/comment.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/comment.ftl @@ -41,7 +41,7 @@ ${message@#$%&} </#if> a <#-- < --> b -a <#-- </#noparse> - -- --> b +a <#-- </#noParse> - -- --> b ${1 + 2 + [#-- c --] <#-- c --> <!-- c --> 3} ${<!-- > -> -- #> #] --> 7} http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateformat-iso-like.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateformat-iso-like.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateformat-iso-like.ftl index be4d31b..e4dd980 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateformat-iso-like.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateformat-iso-like.ftl @@ -104,19 +104,19 @@ <@assertEquals actual=d?string.iso expected="0000-05-13" /> <#assign dt = "2010-05-15T01:02:03"?datetime.xs> -<#setting datetimeFormat="xs"> +<#setting dateTimeFormat="xs"> <@assertEquals actual=dt?string expected="2010-05-15T01:02:03-05:00" /> -<#setting datetimeFormat="xs u"> +<#setting dateTimeFormat="xs u"> <@assertEquals actual=dt?string expected="2010-05-15T06:02:03Z" /> -<#setting datetimeFormat="iso u"> +<#setting dateTimeFormat="iso u"> <@assertEquals actual=dt?string expected="2010-05-15T06:02:03Z" /> -<#setting datetimeFormat="xs fz"> +<#setting dateTimeFormat="xs fz"> <@assertEquals actual=dt?string expected="2010-05-15T01:02:03-05:00" /> -<#setting datetimeFormat="xs fz u"> +<#setting dateTimeFormat="xs fz u"> <@assertEquals actual=dt?string expected="2010-05-15T06:02:03Z" /> -<#setting datetimeFormat="xs nz u"> +<#setting dateTimeFormat="xs nz u"> <@assertEquals actual=dt?string expected="2010-05-15T06:02:03" /> -<#setting datetimeFormat="iso m nz"> +<#setting dateTimeFormat="iso m nz"> <@assertEquals actual=dt?string expected="2010-05-15T01:02" /> <#assign d = dt?date> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateformat-java.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateformat-java.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateformat-java.ftl index 5d64c68..219f0a4 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateformat-java.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateformat-java.ftl @@ -18,7 +18,7 @@ --> <#setting locale="en_US"> <#setting timeZone="GMT"> -<#setting datetimeFormat=""> +<#setting dateTimeFormat=""> ${date} ${unknownDate?datetime} ${date?string} @@ -46,26 +46,26 @@ ${date?time?string.short} ${date?time?string.medium} ${date?time?string.long} <#setting locale="hu_hu"> -<#setting datetimeFormat="long_long"> +<#setting dateTimeFormat="long_long"> ${date} <#setting locale="en_US"> -<#setting datetimeFormat="EEE, dd MMM yyyyy HH:mm:ss z"> +<#setting dateTimeFormat="EEE, dd MMM yyyyy HH:mm:ss z"> ${date} ${unknownDate?string["EEE, dd MMM yyyy HH:mm:ss z"]} ${unknownDate?string("EEE, dd MMM yyyy HH:mm:ss z")} ${unknownDate?string.yyyy} -<#setting datetimeFormat="yyyy"> +<#setting dateTimeFormat="yyyy"> <#assign s = date?string> ${s} -<#setting datetimeFormat="MM"> +<#setting dateTimeFormat="MM"> ${s} <#-- Check ?string lazy evaluation bug was fixed: --> -<#setting datetimeFormat="yyyy"> +<#setting dateTimeFormat="yyyy"> <#assign s = date?string> <#-- no ${s} --> -<#setting datetimeFormat="MM"> +<#setting dateTimeFormat="MM"> ${s} <#assign s = date?string> ${s} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateparsing.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateparsing.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateparsing.ftl index c5155f0..63716cb 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateparsing.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateparsing.ftl @@ -18,7 +18,7 @@ --> <#setting locale="en_US"> <#setting timeZone="GMT"> -<#setting datetimeFormat="G yyyy-MM-dd HH:mm:ss.S Z"> +<#setting dateTimeFormat="G yyyy-MM-dd HH:mm:ss.S Z"> <#setting dateFormat="G yyyy-MM-dd Z"> <#setting timeFormat="HH:mm:ss.S Z"> @@ -52,7 +52,7 @@ <#list ['xs', 'xs_nz', 'xs_fz', 'xs s', 'xs ms'] as format> <#setting dateFormat=format> <#setting timeFormat=format> - <#setting datetimeFormat=format> + <#setting dateTimeFormat=format> <@assertEquals expected=refDate actual="1998-10-30Z"?date /> <@assertEquals expected=refTime actual="15:30:44.512Z"?time /> <@assertEquals expected=refDateTime actual="1998-10-30T15:30:44.512Z"?datetime /> @@ -60,7 +60,7 @@ <#list ['iso', 'iso_nz', 'iso_fz', 'iso m'] as format> <#setting dateFormat=format> <#setting timeFormat=format> - <#setting datetimeFormat=format> + <#setting dateTimeFormat=format> <@assertEquals expected=refDate actual="1998-10-30"?date /> <@assertEquals expected=refDate actual="19981030"?date /> <@assertEquals expected=refTime actual="15:30:44,512Z"?time /> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/if.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/if.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/if.ftl index ca84253..47a8c71 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/if.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/if.ftl @@ -103,7 +103,7 @@ </#list></#list> <#-- parsing errors --> -<@assertFails message="valid #if-#elseif-#else"><@"<#if t><#else><#elseif t2></#if>"?interpret /></@> -<@assertFails message="valid #if-#elseif-#else"><@"<#if t><#else><#else></#if>"?interpret /></@> -<@assertFails message="valid #if-#elseif-#else"><@"<#else></#else>"?interpret /></@> -<@assertFails message="valid #if-#elseif-#else"><@"<#elseif t></#elseif>"?interpret /></@> +<@assertFails message="valid #if-#elseIf-#else"><@"<#if t><#else><#elseIf t2></#if>"?interpret /></@> +<@assertFails message="valid #if-#elseIf-#else"><@"<#if t><#else><#else></#if>"?interpret /></@> +<@assertFails message="valid #if-#elseIf-#else"><@"<#else></#else>"?interpret /></@> +<@assertFails message="valid #if-#elseIf-#else"><@"<#elseIf t></#elseIf>"?interpret /></@> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/noparse.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/noparse.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/noparse.ftl index cbf4dc1..cc85c9c 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/noparse.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/noparse.ftl @@ -43,16 +43,16 @@ ${message@#$%&} </p> </#if> -Here's another edge case, this time, trying to output a <noparse> -inside another <noparse> +Here's another edge case, this time, trying to output a <noParse> +inside another <noParse> <#noParse> -This is what the noparse instruction looks like: +This is what the noParse instruction looks like: -<#nop</#noParse><#noParse>arse>This part of the template wont be parsed by the +<#noP</#noParse><#noParse>arse>This part of the template wont be parsed by the FreeMarker parser. Instead, it will be treated as verbatim text information, -and output as such.</#nop</#noParse><#noParse>arse> +and output as such.</#noP</#noParse><#noParse>arse> The rest of the template appears here. </#noParse> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/setting.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/setting.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/setting.ftl index 1b58b59..de60a84 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/setting.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/setting.ftl @@ -33,7 +33,7 @@ <#setting timeFormat="'tf'"> <@assertEquals expected='tf' actual=.now?time?string /> -<#setting datetimeFormat="'dtf'"> +<#setting dateTimeFormat="'dtf'"> <@assertEquals expected='dtf' actual=.now?string /> <#setting timeZone='GMT+00'> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/string-builtins1.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/string-builtins1.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/string-builtins1.ftl index 6e8255a..be1b19e 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/string-builtins1.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/string-builtins1.ftl @@ -18,22 +18,22 @@ --> FreeMarker: Encoding string built-in tests -<#assign x = r' dieBugsDie! * vazzZE 123456 --cdc-- --<<--@ x ${"kigyo"?upper_case} '> +<#assign x = r' dieBugsDie! * vazzZE 123456 --cdc-- --<<--@ x ${"kigyo"?upperCase} '> -cap_first: ${x?capFirst} -uncap_first:${x?uncapFirst} -uncap_first:${"Blah"?uncapFirst} -capitalize: ${x?capitalize} -html: ${x?html} -length: ${x?length} -lower_case: ${x?lowerCase} -rtf: ${x?rtf} -trim: ${x?trim} +capFirst: ${x?capFirst}; +uncapFirst: ${x?uncapFirst}; +uncapFirst: ${"Blah"?uncapFirst} +capitalize: ${x?capitalize}; +html: ${x?html}; +length: ${x?length}; +lowerCase: ${x?lowerCase}; +rtf: ${x?rtf}; +trim: ${x?trim}; trim2: ${"foo bar"?trim} trim3: ${" foo bar"?trim} trim4: ${"foo bar "?trim} -upper_case: ${x?upperCase} -xml: ${x?xml} +upperCase: ${x?upperCase}; +xml: ${x?xml}; xhtml: ${"\"Blah's is > 1 & < 2\""?xhtml} <@assertEquals actual="'"?html expected="'" /> <@assertEquals actual="'"?xhtml expected="'" /> @@ -105,7 +105,7 @@ ${matches?groups[2]} </#list> -<#assign a = "foo", b="bar", c="(a+b)?upper_case"> +<#assign a = "foo", b="bar", c="(a+b)?upperCase"> ${c?eval} [${"a"?jString}] = [a] http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/testcases.xml ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/testcases.xml b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/testcases.xml index 55ed29d..a02ad3c 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/testcases.xml +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/testcases.xml @@ -33,29 +33,29 @@ <!ELEMENT setting EMPTY> <!ATTLIST setting - auto_import CDATA #IMPLIED - source_encoding CDATA #IMPLIED + autoImports CDATA #IMPLIED + sourceEncoding CDATA #IMPLIED locale CDATA #IMPLIED - object_wrapper CDATA #IMPLIED - output_encoding CDATA #IMPLIED + objectWrapper CDATA #IMPLIED + outputEncoding CDATA #IMPLIED output_dir CDATA #IMPLIED - new_builtin_class_resolver CDATA #IMPLIED - url_escaping_charset CDATA #IMPLIED - incompatible_improvements CDATA #IMPLIED - time_zone CDATA #IMPLIED - api_builtin_enabled CDATA #IMPLIED + newBuiltinClassResolver CDATA #IMPLIED + urlEscapingCharset CDATA #IMPLIED + incompatibleImprovements CDATA #IMPLIED + timeZone CDATA #IMPLIED + apiBuiltinEnabled CDATA #IMPLIED > ]> <!-- -Note that for the incompatible_improvements setting you can specify a list of versions, for example: -<setting incompatible_improvements="min, 3.0.5, max" /> +Note that for the incompatibleImprovements setting you can specify a list of versions, for example: +<setting incompatibleImprovements="min, 3.0.5, max" /> --> <testCases> - <setting source_encoding="UTF-8" output_encoding="UTF-8" /> + <setting sourceEncoding="UTF-8" outputEncoding="UTF-8" /> <testCase name="api-builtins" noOutput="true"> - <setting api_builtin_enabled="true" /> + <setting apiBuiltinEnabled="true" /> </testCase> <testCase name="assignments" noOutput="true" /> <testCase name="boolean" /> @@ -70,7 +70,7 @@ Note that for the incompatible_improvements setting you can specify a list of ve <testCase name="dateparsing" noOutput="true" /> <testCase name="default"/> <testCase name="default-object-wrapper"> - <setting api_builtin_enabled="true" /> + <setting apiBuiltinEnabled="true" /> </testCase> <testCase name="encoding-builtins" /> <testCase name="escapes" /> @@ -78,36 +78,36 @@ Note that for the incompatible_improvements setting you can specify a list of ve <testCase name="identifier-non-ascii" /> <testCase name="identifier-escaping" /> <testCase name="import"> - <setting auto_import="import_lib.ftl as my"/> + <setting autoImports="import_lib.ftl as my"/> </testCase> <testCase name="include" /> <testCase name="include2"> - <setting source_encoding="utf-8" /> + <setting sourceEncoding="utf-8" /> </testCase> <testCase name="interpret"/> <testCase name="iterators"/> <testCase name="lastcharacter"/> <testCase name="list[#endTN]-simpleTemplateModels" expected="list.txt"> - <setting object_wrapper="org.apache.freemarker.core.templatesuite.models.SimpleMapAndCollectionObjectWrapper(3.0.0)" /> + <setting objectWrapper="org.apache.freemarker.core.templatesuite.models.SimpleMapAndCollectionObjectWrapper(3.0.0)" /> </testCase> <testCase name="list[#endTN]-collectionAdapter" expected="list.txt"> - <setting object_wrapper="DefaultObjectWrapper(3.0.0)" /> + <setting objectWrapper="DefaultObjectWrapper(3.0.0)" /> </testCase> <testCase name="list2[#endTN]-simpleTemplateModels" expected="list2.txt"> - <setting object_wrapper="org.apache.freemarker.core.templatesuite.models.SimpleMapAndCollectionObjectWrapper(3.0.0)" /> + <setting objectWrapper="org.apache.freemarker.core.templatesuite.models.SimpleMapAndCollectionObjectWrapper(3.0.0)" /> </testCase> <testCase name="list2[#endTN]-collectionAdapter" expected="list2.txt"> - <setting object_wrapper="DefaultObjectWrapper(3.0.0)" /> + <setting objectWrapper="DefaultObjectWrapper(3.0.0)" /> </testCase> <testCase name="list3[#endTN]-simpleTemplateModels" expected="list3.txt"> - <setting object_wrapper="org.apache.freemarker.core.templatesuite.models.SimpleMapAndCollectionObjectWrapper(3.0.0)" /> + <setting objectWrapper="org.apache.freemarker.core.templatesuite.models.SimpleMapAndCollectionObjectWrapper(3.0.0)" /> </testCase> <testCase name="list3[#endTN]-collectionAdapter" expected="list3.txt"> - <setting object_wrapper="DefaultObjectWrapper(3.0.0)" /> + <setting objectWrapper="DefaultObjectWrapper(3.0.0)" /> </testCase> <testCase name="list-bis" /> <testCase name="list-bis[#endTN]-collectionAdapter" expected="list-bis.txt"> - <setting object_wrapper="DefaultObjectWrapper(3.0.0)" /> + <setting objectWrapper="DefaultObjectWrapper(3.0.0)" /> </testCase> <testCase name="listhash" /> <testCase name="listhashliteral" /> @@ -131,10 +131,10 @@ Note that for the incompatible_improvements setting you can specify a list of ve <testCase name="numerical-cast" /> <testCase name="output-encoding1"/> <testCase name="output-encoding2"> - <setting output_encoding="UTF-16"/> + <setting outputEncoding="UTF-16"/> </testCase> <testCase name="output-encoding3"> - <setting output_encoding="ISO-8859-1" url_escaping_charset="UTF-16" /> + <setting outputEncoding="ISO-8859-1" urlEscapingCharset="UTF-16" /> </testCase> <testCase name="precedence"/> <testCase name="range" noOutput="true" /> @@ -142,13 +142,13 @@ Note that for the incompatible_improvements setting you can specify a list of ve <testCase name="root" /> <testCase name="setting" noOutput="true" /> <testCase name="sequence-builtins[#endTN]-with-SimpleTemplateModel" expected="sequence-builtins.txt"> - <setting object_wrapper="org.apache.freemarker.core.templatesuite.models.SimpleMapAndCollectionObjectWrapper(3.0.0)" /> + <setting objectWrapper="org.apache.freemarker.core.templatesuite.models.SimpleMapAndCollectionObjectWrapper(3.0.0)" /> </testCase> <testCase name="sequence-builtins[#endTN]-with-DefaultObjectWrapper" expected="sequence-builtins.txt"> - <setting object_wrapper="default"/> + <setting objectWrapper="default"/> </testCase> <testCase name="sequence-builtins[#endTN]-with-DefaultObjectWrapper-collAdapters" expected="sequence-builtins.txt"> - <setting object_wrapper="DefaultObjectWrapper(3.0.0)"/> + <setting objectWrapper="DefaultObjectWrapper(3.0.0)"/> </testCase> <testCase name="simplehash-char-key" noOutput="true" /> <testCase name="existence-operators" noOutput="true" /> @@ -173,19 +173,19 @@ Note that for the incompatible_improvements setting you can specify a list of ve <testCase name="hashconcat"/> <testCase name="new-defaultresolver" /> <testCase name="new-unrestricted" template="new-defaultresolver.ftl" expected="new-defaultresolver.txt"> - <setting new_builtin_class_resolver="unrestricted"/> + <setting newBuiltinClassResolver="unrestricted"/> </testCase> <testCase name="new-allowsnothing" template="new-defaultresolver.ftl"> - <setting new_builtin_class_resolver="allow_nothing"/> + <setting newBuiltinClassResolver="allowNothing"/> </testCase> <testCase name="new-optin"> - <setting new_builtin_class_resolver=" - allowed_classes: org.apache.freemarker.core.templatesuite.models.NewTestModel, - trusted_templates: subdir/new-optin.ftl, subdir/subsub/*" + <setting newBuiltinClassResolver=" + allowedClasses: org.apache.freemarker.core.templatesuite.models.NewTestModel, + trustedTemplates: subdir/new-optin.ftl, subdir/subsub/*" /> </testCase> <testCase name="specialvars"> - <setting locale="en_US" output_encoding="utf-8" url_escaping_charset="iso-8859-1"/> + <setting locale="en_US" outputEncoding="utf-8" urlEscapingCharset="iso-8859-1"/> </testCase> <testCase name="number-to-date" /> <testCase name="varargs" /> @@ -194,9 +194,9 @@ Note that for the incompatible_improvements setting you can specify a list of ve <testCase name="string-builtin-coercion" noOutput="true" /> <testCase name="overloaded-methods[#endTN]-inc-dow" noOutput="true"> - <setting object_wrapper="org.apache.freemarker.core.model.impl.DefaultObjectWrapperInc"/> + <setting objectWrapper="org.apache.freemarker.core.model.impl.DefaultObjectWrapperInc"/> </testCase> <testCase name="overloaded-methods[#endTN]-desc-dow" noOutput="true"> - <setting object_wrapper="org.apache.freemarker.core.model.impl.DefaultObjectWrapperDesc"/> + <setting objectWrapper="org.apache.freemarker.core.model.impl.DefaultObjectWrapperDesc"/> </testCase> </testCases> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDebugBreak.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDebugBreak.java b/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDebugBreak.java index 577daff..562a2cb 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDebugBreak.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDebugBreak.java @@ -63,7 +63,7 @@ class ASTDebugBreak extends ASTElement { @Override String getASTNodeDescriptor() { - return "#debug_break"; + return "#debugBreak"; } @Override http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirAutoEsc.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirAutoEsc.java b/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirAutoEsc.java index 0f44975..b982e56 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirAutoEsc.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirAutoEsc.java @@ -46,7 +46,7 @@ final class ASTDirAutoEsc extends ASTDirective { @Override String getASTNodeDescriptor() { - return "#autoesc"; + return "#autoEsc"; } @Override http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirCapturingAssignment.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirCapturingAssignment.java b/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirCapturingAssignment.java index 4624b65..28edbf2 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirCapturingAssignment.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirCapturingAssignment.java @@ -142,7 +142,7 @@ final class ASTDirCapturingAssignment extends ASTDirective { sb.append(getASTNodeDescriptor()); sb.append('>'); } else { - sb.append(" = .nested_output"); + sb.append(" = .nestedOutput"); } return sb.toString(); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirIfElseIfElseContainer.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirIfElseIfElseContainer.java b/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirIfElseIfElseContainer.java index b24bca8..8a250bf 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirIfElseIfElseContainer.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirIfElseIfElseContainer.java @@ -22,7 +22,7 @@ package org.apache.freemarker.core; import java.io.IOException; /** - * AST directive node: Container for a group of related {@code #if}, {@code #elseif} and {@code #else} directives. + * AST directive node: Container for a group of related {@code #if}, {@code #elseIf} and {@code #else} directives. * Each such block is a nested {@link ASTDirIfOrElseOrElseIf}. Note that if an {@code #if} stands alone, * {@link ASTDirIfOrElseOrElseIf} doesn't need this parent element. */ @@ -81,7 +81,7 @@ final class ASTDirIfElseIfElseContainer extends ASTDirective { @Override String getASTNodeDescriptor() { - return "#if-#elseif-#else-container"; + return "#if-#elseIf-#else-container"; } @Override http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirIfOrElseOrElseIf.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirIfOrElseOrElseIf.java b/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirIfOrElseOrElseIf.java index 5dd0ba0..28178d9 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirIfOrElseOrElseIf.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirIfOrElseOrElseIf.java @@ -24,8 +24,8 @@ import java.io.IOException; import org.apache.freemarker.core.util.BugException; /** - * AST directive node: An element that represents a conditionally executed block: {@code #if}, {@code #elseif} or - * {@code #elseif}. Note that when an {@code #if} has related {@code #elseif}-s or {@code #else}, an + * AST directive node: An element that represents a conditionally executed block: {@code #if}, {@code #elseIf} or + * {@code #elseIf}. Note that when an {@code #if} has related {@code #elseIf}-s or {@code #else}, an * {@link ASTDirIfElseIfElseContainer} parent must be used. For a lonely {@code #if}, no such parent is needed. */ final class ASTDirIfOrElseOrElseIf extends ASTDirective { @@ -77,7 +77,7 @@ final class ASTDirIfOrElseOrElseIf extends ASTDirective { } else if (type == TYPE_IF) { return "#if"; } else if (type == TYPE_ELSE_IF) { - return "#elseif"; + return "#elseIf"; } else { throw new BugException("Unknown type"); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirNoAutoEsc.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirNoAutoEsc.java b/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirNoAutoEsc.java index 73812bb..a3ef03d 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirNoAutoEsc.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirNoAutoEsc.java @@ -22,7 +22,7 @@ package org.apache.freemarker.core; import java.io.IOException; /** - * AST directive node: {@code #noautoesc}. + * AST directive node: {@code #noAutoEsc}. */ final class ASTDirNoAutoEsc extends ASTDirective { @@ -46,7 +46,7 @@ final class ASTDirNoAutoEsc extends ASTDirective { @Override String getASTNodeDescriptor() { - return "#noautoesc"; + return "#noAutoEsc"; } @Override http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirNoEscape.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirNoEscape.java b/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirNoEscape.java index e7decca..61a32b8 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirNoEscape.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirNoEscape.java @@ -22,7 +22,7 @@ package org.apache.freemarker.core; import java.io.IOException; /** - * AST directive node: {@code #noescape}. + * AST directive node: {@code #noEscape}. */ class ASTDirNoEscape extends ASTDirective { @@ -62,7 +62,7 @@ class ASTDirNoEscape extends ASTDirective { @Override String getASTNodeDescriptor() { - return "#noescape"; + return "#noEscape"; } @Override http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/51dba882/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirOutputFormat.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirOutputFormat.java b/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirOutputFormat.java index 3cd7090..c2aa7b8 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirOutputFormat.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/ASTDirOutputFormat.java @@ -22,7 +22,7 @@ package org.apache.freemarker.core; import java.io.IOException; /** - * AST directive node: {@code #outputformat}. + * AST directive node: {@code #outputFormat}. */ final class ASTDirOutputFormat extends ASTDirective { @@ -50,7 +50,7 @@ final class ASTDirOutputFormat extends ASTDirective { @Override String getASTNodeDescriptor() { - return "#outputformat"; + return "#outputFormat"; } @Override
