Restructured project so that freemarker-test-utils depends on freemarker-core (and hence can provide common classes for testing templates, and can use utility classes defined in the core). As a consequence of this, freemarker-core tests were moved into their own project, freemarker-core-test (and freemarker-core-test-java8, which has existed earlier too).
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/28a276c8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/28a276c8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/28a276c8 Branch: refs/heads/3 Commit: 28a276c80496b164b35a8dc04d6ad87ea1ddc800 Parents: b053951 Author: ddekany <ddek...@apache.org> Authored: Mon May 15 20:46:41 2017 +0200 Committer: ddekany <ddek...@apache.org> Committed: Mon May 15 23:22:55 2017 +0200 ---------------------------------------------------------------------- freemarker-core-java8-test/build.gradle | 19 - .../src/main/resources/META-INF/DISCLAIMER | 8 - .../src/main/resources/META-INF/LICENSE | 202 --- .../core/model/impl/BridgeMethodsBean.java | 30 - .../core/model/impl/BridgeMethodsBeanBase.java | 29 - ...Java8BridgeMethodsWithDefaultMethodBean.java | 29 - ...ava8BridgeMethodsWithDefaultMethodBean2.java | 23 - ...8BridgeMethodsWithDefaultMethodBeanBase.java | 31 - ...BridgeMethodsWithDefaultMethodBeanBase2.java | 28 - .../model/impl/Java8DefaultMethodsBean.java | 84 - .../model/impl/Java8DefaultMethodsBeanBase.java | 97 -- ...a8DefaultObjectWrapperBridgeMethodsTest.java | 65 - .../impl/Java8DefaultObjectWrapperTest.java | 160 -- freemarker-core-test-java8/build.gradle | 25 + .../src/main/resources/META-INF/DISCLAIMER | 8 + .../src/main/resources/META-INF/LICENSE | 202 +++ .../core/model/impl/BridgeMethodsBean.java | 30 + .../core/model/impl/BridgeMethodsBeanBase.java | 29 + ...Java8BridgeMethodsWithDefaultMethodBean.java | 29 + ...ava8BridgeMethodsWithDefaultMethodBean2.java | 23 + ...8BridgeMethodsWithDefaultMethodBeanBase.java | 31 + ...BridgeMethodsWithDefaultMethodBeanBase2.java | 28 + .../model/impl/Java8DefaultMethodsBean.java | 84 + .../model/impl/Java8DefaultMethodsBeanBase.java | 97 ++ ...a8DefaultObjectWrapperBridgeMethodsTest.java | 65 + .../impl/Java8DefaultObjectWrapperTest.java | 160 ++ freemarker-core-test/build.gradle | 19 + .../core/ASTBasedErrorMessagesTest.java | 74 + .../org/apache/freemarker/core/ASTPrinter.java | 438 +++++ .../org/apache/freemarker/core/ASTTest.java | 103 ++ .../core/ActualNamingConvetionTest.java | 66 + .../freemarker/core/ActualTagSyntaxTest.java | 68 + .../freemarker/core/BreakPlacementTest.java | 56 + .../apache/freemarker/core/CamelCaseTest.java | 486 ++++++ .../freemarker/core/CanonicalFormTest.java | 68 + .../freemarker/core/CoercionToTextualTest.java | 149 ++ .../freemarker/core/ConfigurableTest.java | 176 ++ .../freemarker/core/ConfigurationTest.java | 1486 +++++++++++++++++ .../freemarker/core/CoreLocaleUtilsTest.java | 73 + .../freemarker/core/CustomAttributeTest.java | 163 ++ .../apache/freemarker/core/DateFormatTest.java | 464 ++++++ .../freemarker/core/DirectiveCallPlaceTest.java | 249 +++ .../freemarker/core/EncodingOverrideTest.java | 62 + .../EnvironmentGetTemplateVariantsTest.java | 214 +++ .../apache/freemarker/core/ExceptionTest.java | 115 ++ .../apache/freemarker/core/GetSourceTest.java | 52 + .../freemarker/core/HeaderParsingTest.java | 60 + .../IncludeAndImportConfigurableLayersTest.java | 354 +++++ .../freemarker/core/IncludeAndImportTest.java | 270 ++++ .../freemarker/core/IncudeFromNamelessTest.java | 58 + .../core/InterpretAndEvalTemplateNameTest.java | 70 + .../core/InterpretSettingInheritanceTest.java | 104 ++ .../freemarker/core/IteratorIssuesTest.java | 64 + .../core/JavaCCExceptionAsEOFFixTest.java | 126 ++ .../apache/freemarker/core/ListErrorsTest.java | 130 ++ .../freemarker/core/MiscErrorMessagesTest.java | 48 + .../core/MistakenlyPublicImportAPIsTest.java | 104 ++ .../core/MistakenlyPublicMacroAPIsTest.java | 88 + .../core/NewBiObjectWrapperRestrictionTest.java | 117 ++ .../core/ObjectBuilderSettingsTest.java | 1499 ++++++++++++++++++ .../core/OptInTemplateClassResolverTest.java | 230 +++ .../freemarker/core/OutputFormatTest.java | 1068 +++++++++++++ .../ParseTimeParameterBIErrorMessagesTest.java | 46 + .../core/ParsingErrorMessagesTest.java | 116 ++ .../core/RestrictedObjectWrapperTest.java | 72 + .../core/RestrictedObjetWrapperTest.java | 112 ++ .../apache/freemarker/core/SQLTimeZoneTest.java | 371 +++++ .../freemarker/core/SettingDirectiveTest.java | 40 + .../freemarker/core/SpecialVariableTest.java | 114 ++ .../core/StringLiteralInterpolationTest.java | 135 ++ .../org/apache/freemarker/core/TabSizeTest.java | 91 ++ .../core/TagSyntaxVariationsTest.java | 186 +++ .../core/TemplateConfigurationTest.java | 909 +++++++++++ ...gurationWithDefaultTemplateResolverTest.java | 267 ++++ .../core/TemplateConstructorsTest.java | 113 ++ .../core/TemplateGetEncodingTest.java | 64 + .../core/TemplateLookupStrategyTest.java | 669 ++++++++ .../core/TemplateNameSpecialVariablesTest.java | 159 ++ .../core/TemplateNotFoundMessageTest.java | 207 +++ .../core/TheadInterruptingSupportTest.java | 163 ++ .../freemarker/core/TypeErrorMessagesTest.java | 105 ++ .../freemarker/core/UnclosedCommentTest.java | 41 + .../org/apache/freemarker/core/VersionTest.java | 227 +++ .../core/WhitespaceStrippingTest.java | 63 + .../freemarker/core/XHTMLOutputFormatTest.java | 59 + .../freemarker/core/XMLOutputFormatTest.java | 59 + .../impl/AbstractParallelIntrospectionTest.java | 126 ++ .../model/impl/AlphabeticalMethodSorter.java | 45 + .../CommonSupertypeForUnwrappingHintTest.java | 129 ++ .../model/impl/DefaultObjectWrapperDesc.java | 31 + .../model/impl/DefaultObjectWrapperInc.java | 31 + ...jectWrapperModelFactoryRegistrationTest.java | 63 + .../DefaultObjectWrapperSingletonsTest.java | 675 ++++++++ .../model/impl/DefaultObjectWrapperTest.java | 901 +++++++++++ .../core/model/impl/EnumModelsTest.java | 85 + .../core/model/impl/ErrorMessagesTest.java | 170 ++ .../impl/FineTuneMethodAppearanceTest.java | 65 + .../GetlessMethodsAsPropertyGettersRule.java | 67 + .../core/model/impl/IsApplicableTest.java | 171 ++ .../impl/IsMoreSpecificParameterTypeTest.java | 98 ++ .../Java7MembersOnlyDefaultObjectWrapper.java | 101 ++ .../impl/ManyObjectsOfDifferentClasses.java | 249 +++ .../impl/ManyStaticsOfDifferentClasses.java | 236 +++ .../model/impl/MiscNumericalOperationsTest.java | 111 ++ .../model/impl/ModelAPINewInstanceTest.java | 134 ++ .../core/model/impl/ModelCacheTest.java | 71 + .../model/impl/OverloadedNumberUtilTest.java | 585 +++++++ .../impl/ParameterListPreferabilityTest.java | 445 ++++++ .../impl/PrallelObjectIntrospectionTest.java | 43 + .../impl/PrallelStaticIntrospectionTest.java | 47 + .../core/model/impl/RationalNumber.java | 90 ++ .../core/model/impl/StaticModelsTest.java | 91 ++ .../core/model/impl/TypeFlagsTest.java | 671 ++++++++ .../core/outputformat/_OutputFormatTestAPI.java | 35 + .../impl/CombinedMarkupOutputFormatTest.java | 194 +++ .../outputformat/impl/HTMLOutputFormatTest.java | 187 +++ .../outputformat/impl/RTFOutputFormatTest.java | 129 ++ .../DefaultTemplateResolverTest.java | 365 +++++ .../FileTemplateLoaderTest.java | 122 ++ .../MultiTemplateLoaderTest.java | 99 ++ .../TemplateConfigurationFactoryTest.java | 203 +++ .../TemplateNameFormatTest.java | 330 ++++ .../TemplateSourceMatcherTest.java | 188 +++ .../AppMetaTemplateDateFormatFactory.java | 129 ++ .../BaseNTemplateNumberFormatFactory.java | 128 ++ .../core/userpkg/CustomHTMLOutputFormat.java | 72 + .../core/userpkg/CustomTemplateHTMLModel.java | 34 + .../core/userpkg/DummyOutputFormat.java | 65 + ...EpochMillisDivTemplateDateFormatFactory.java | 102 ++ .../EpochMillisTemplateDateFormatFactory.java | 92 ++ .../HTMLISOTemplateDateFormatFactory.java | 114 ++ .../userpkg/HexTemplateNumberFormatFactory.java | 77 + ...AndTZSensitiveTemplateDateFormatFactory.java | 97 ++ ...aleSensitiveTemplateNumberFormatFactory.java | 78 + .../core/userpkg/PackageVisibleAll.java | 26 + .../userpkg/PackageVisibleAllWithBuilder.java | 26 + .../PackageVisibleAllWithBuilderBuilder.java | 28 + .../PackageVisibleWithPublicConstructor.java | 27 + .../PrintfGTemplateNumberFormatFactory.java | 138 ++ .../freemarker/core/userpkg/PublicAll.java | 24 + .../userpkg/PublicWithMixedConstructors.java | 38 + .../PublicWithPackageVisibleConstructor.java | 26 + .../core/userpkg/SeldomEscapedOutputFormat.java | 71 + .../core/userpkg/TemplateDummyOutputModel.java | 34 + .../TemplateSeldomEscapedOutputModel.java | 34 + .../freemarker/core/util/DateUtilTest.java | 1085 +++++++++++++ .../freemarker/core/util/FTLUtilTest.java | 117 ++ .../freemarker/core/util/NumberUtilTest.java | 215 +++ .../freemarker/core/util/StringUtilTest.java | 403 +++++ .../core/valueformat/NumberFormatTest.java | 365 +++++ .../impl/ExtendedDecimalFormatTest.java | 343 ++++ .../apache/freemarker/dom/DOMSiblingTest.java | 99 ++ .../freemarker/dom/DOMSimplifiersTest.java | 201 +++ .../java/org/apache/freemarker/dom/DOMTest.java | 159 ++ .../manualtest/AutoEscapingExample.java | 72 + .../ConfigureOutputFormatExamples.java | 105 ++ .../manualtest/CustomFormatsExample.java | 84 + .../manualtest/GettingStartedExample.java | 69 + .../apache/freemarker/manualtest/Product.java | 49 + .../TemplateConfigurationExamples.java | 191 +++ .../UnitAwareTemplateNumberFormatFactory.java | 80 + .../UnitAwareTemplateNumberModel.java | 43 + .../test/templatesuite/TemplateTestCase.java | 515 ++++++ .../test/templatesuite/TemplateTestSuite.java | 298 ++++ .../templatesuite/models/AllTemplateModels.java | 128 ++ .../templatesuite/models/BeanTestClass.java | 93 ++ .../templatesuite/models/BeanTestInterface.java | 25 + .../models/BeanTestSuperclass.java | 30 + .../models/BooleanAndScalarModel.java | 40 + .../models/BooleanAndStringTemplateModel.java | 38 + .../test/templatesuite/models/BooleanHash1.java | 58 + .../test/templatesuite/models/BooleanHash2.java | 50 + .../test/templatesuite/models/BooleanList1.java | 62 + .../test/templatesuite/models/BooleanList2.java | 53 + .../models/BooleanVsStringMethods.java | 40 + .../templatesuite/models/EnumTestClass.java | 34 + .../templatesuite/models/ExceptionModel.java | 39 + .../models/HashAndScalarModel.java | 84 + .../templatesuite/models/JavaObjectInfo.java | 35 + .../test/templatesuite/models/Listables.java | 185 +++ .../test/templatesuite/models/MultiModel1.java | 116 ++ .../test/templatesuite/models/MultiModel2.java | 63 + .../test/templatesuite/models/MultiModel3.java | 69 + .../test/templatesuite/models/MultiModel4.java | 77 + .../test/templatesuite/models/MultiModel5.java | 81 + .../test/templatesuite/models/NewTestModel.java | 52 + .../templatesuite/models/NewTestModel2.java | 52 + .../models/NumberAndStringModel.java | 47 + .../models/OverloadedConstructor.java | 46 + .../templatesuite/models/OverloadedMethods.java | 191 +++ .../models/OverloadedMethods2.java | 1110 +++++++++++++ .../SimpleMapAndCollectionObjectWrapper.java | 60 + .../templatesuite/models/SimpleTestMethod.java | 49 + .../models/TransformHashWrapper.java | 79 + .../models/TransformMethodWrapper1.java | 49 + .../models/TransformMethodWrapper2.java | 64 + .../templatesuite/models/TransformModel1.java | 175 ++ .../templatesuite/models/VarArgTestModel.java | 63 + .../freemarker/test/templatesuite/package.html | 42 + .../org/apache/freemarker/core/ast-1.ast | 187 +++ .../org/apache/freemarker/core/ast-1.ftl | 29 + .../apache/freemarker/core/ast-assignments.ast | 172 ++ .../apache/freemarker/core/ast-assignments.ftl | 29 + .../org/apache/freemarker/core/ast-builtins.ast | 59 + .../org/apache/freemarker/core/ast-builtins.ftl | 23 + .../apache/freemarker/core/ast-locations.ast | 155 ++ .../apache/freemarker/core/ast-locations.ftl | 36 + .../core/ast-mixedcontentsimplifications.ast | 38 + .../core/ast-mixedcontentsimplifications.ftl | 26 + .../core/ast-multipleignoredchildren.ast | 30 + .../core/ast-multipleignoredchildren.ftl | 33 + .../core/ast-nestedignoredchildren.ast | 20 + .../core/ast-nestedignoredchildren.ftl | 19 + .../org/apache/freemarker/core/ast-range.ast | 281 ++++ .../org/apache/freemarker/core/ast-range.ftl | 47 + .../freemarker/core/ast-strlitinterpolation.ast | 82 + .../freemarker/core/ast-strlitinterpolation.ftl | 25 + .../freemarker/core/ast-whitespacestripping.ast | 70 + .../freemarker/core/ast-whitespacestripping.ftl | 40 + .../apache/freemarker/core/cano-assignments.ftl | 35 + .../freemarker/core/cano-assignments.ftl.out | 34 + .../apache/freemarker/core/cano-builtins.ftl | 23 + .../freemarker/core/cano-builtins.ftl.out | 23 + .../core/cano-identifier-escaping.ftl | 76 + .../core/cano-identifier-escaping.ftl.out | 44 + .../org/apache/freemarker/core/cano-macros.ftl | 29 + .../apache/freemarker/core/cano-macros.ftl.out | 28 + .../core/cano-strlitinterpolation.ftl | 19 + .../core/cano-strlitinterpolation.ftl.out | 19 + .../core/encodingOverride-ISO-8859-1.ftl | 20 + .../freemarker/core/encodingOverride-UTF-8.ftl | 20 + .../freemarker/core/templateresolver/test.ftl | 19 + .../org/apache/freemarker/core/toCache1.ftl | 19 + .../org/apache/freemarker/core/toCache2.ftl | 19 + .../apache/freemarker/dom/DOMSiblingTest.xml | 31 + .../manualtest/AutoEscapingExample-capture.ftlh | 21 + .../AutoEscapingExample-capture.ftlh.out | 20 + .../manualtest/AutoEscapingExample-convert.ftlh | 27 + .../AutoEscapingExample-convert.ftlh.out | 25 + .../manualtest/AutoEscapingExample-convert2.ftl | 25 + .../AutoEscapingExample-convert2.ftl.out | 21 + .../manualtest/AutoEscapingExample-infoBox.ftlh | 26 + .../AutoEscapingExample-infoBox.ftlh.out | 25 + .../manualtest/AutoEscapingExample-markup.ftlh | 28 + .../AutoEscapingExample-markup.ftlh.out | 26 + .../AutoEscapingExample-stringConcat.ftlh | 19 + .../AutoEscapingExample-stringConcat.ftlh.out | 19 + .../AutoEscapingExample-stringLiteral.ftlh | 21 + .../AutoEscapingExample-stringLiteral.ftlh.out | 20 + .../AutoEscapingExample-stringLiteral2.ftlh | 25 + .../AutoEscapingExample-stringLiteral2.ftlh.out | 21 + .../ConfigureOutputFormatExamples1.properties | 21 + .../ConfigureOutputFormatExamples2.properties | 31 + .../manualtest/CustomFormatsExample-alias1.ftlh | 22 + .../CustomFormatsExample-alias1.ftlh.out | 22 + .../manualtest/CustomFormatsExample-alias2.ftlh | 19 + .../CustomFormatsExample-alias2.ftlh.out | 19 + .../CustomFormatsExample-modelAware.ftlh | 20 + .../CustomFormatsExample-modelAware.ftlh.out | 20 + .../TemplateConfigurationExamples1.properties | 25 + .../TemplateConfigurationExamples2.properties | 32 + .../TemplateConfigurationExamples3.properties | 47 + .../org/apache/freemarker/manualtest/test.ftlh | 28 + .../org/apache/freemarker/test/servlet/web.xml | 101 ++ .../test/templatesuite/expected/arithmetic.txt | 46 + .../expected/boolean-formatting.txt | 31 + .../test/templatesuite/expected/boolean.txt | 102 ++ .../expected/charset-in-header.txt | 26 + .../test/templatesuite/expected/comment.txt | 34 + .../test/templatesuite/expected/comparisons.txt | 93 ++ .../test/templatesuite/expected/compress.txt | 40 + .../templatesuite/expected/dateformat-java.txt | 55 + .../expected/default-object-wrapper.txt | 55 + .../templatesuite/expected/default-xmlns.txt | 25 + .../test/templatesuite/expected/default.txt | 26 + .../expected/encoding-builtins.txt | 44 + .../test/templatesuite/expected/escapes.txt | 49 + .../test/templatesuite/expected/exception.txt | 43 + .../test/templatesuite/expected/exception2.txt | 47 + .../test/templatesuite/expected/exception3.txt | 21 + .../test/templatesuite/expected/exthash.txt | 76 + .../test/templatesuite/expected/hashconcat.txt | 138 ++ .../test/templatesuite/expected/hashliteral.txt | 74 + .../test/templatesuite/expected/helloworld.txt | 31 + .../expected/identifier-escaping.txt | 57 + .../expected/identifier-non-ascii.txt | 19 + .../test/templatesuite/expected/if.txt | 104 ++ .../test/templatesuite/expected/import.txt | 40 + .../test/templatesuite/expected/include.txt | 67 + .../test/templatesuite/expected/include2.txt | 28 + .../test/templatesuite/expected/interpret.txt | 23 + .../test/templatesuite/expected/iterators.txt | 84 + .../templatesuite/expected/lastcharacter.txt | 31 + .../test/templatesuite/expected/list-bis.txt | 51 + .../test/templatesuite/expected/list.txt | 51 + .../test/templatesuite/expected/list2.txt | 211 +++ .../test/templatesuite/expected/list3.txt | 57 + .../test/templatesuite/expected/listhash.txt | 157 ++ .../templatesuite/expected/listhashliteral.txt | 36 + .../test/templatesuite/expected/listliteral.txt | 75 + .../templatesuite/expected/localization.txt | 32 + .../test/templatesuite/expected/logging.txt | 27 + .../templatesuite/expected/loopvariable.txt | 54 + .../templatesuite/expected/macros-return.txt | 23 + .../test/templatesuite/expected/macros.txt | 67 + .../test/templatesuite/expected/macros2.txt | 22 + .../test/templatesuite/expected/multimodels.txt | 93 ++ .../test/templatesuite/expected/nested.txt | 25 + .../expected/new-allowsnothing.txt | 19 + .../expected/new-defaultresolver.txt | 19 + .../test/templatesuite/expected/new-optin.txt | 32 + .../test/templatesuite/expected/newlines1.txt | 29 + .../test/templatesuite/expected/newlines2.txt | 30 + .../test/templatesuite/expected/noparse.txt | 54 + .../templatesuite/expected/number-format.txt | 33 + .../templatesuite/expected/number-literal.txt | 79 + .../templatesuite/expected/number-to-date.txt | 31 + .../templatesuite/expected/numerical-cast.txt | 462 ++++++ .../templatesuite/expected/output-encoding1.txt | 27 + .../templatesuite/expected/output-encoding2.txt | Bin 0 -> 1972 bytes .../templatesuite/expected/output-encoding3.txt | 26 + .../test/templatesuite/expected/precedence.txt | 48 + .../test/templatesuite/expected/recover.txt | 26 + .../test/templatesuite/expected/root.txt | 44 + .../expected/sequence-builtins.txt | 404 +++++ .../test/templatesuite/expected/specialvars.txt | 25 + .../string-builtins-regexps-matches.txt | 99 ++ .../expected/string-builtins-regexps.txt | 112 ++ .../templatesuite/expected/string-builtins1.txt | 112 ++ .../templatesuite/expected/string-builtins2.txt | 135 ++ .../templatesuite/expected/stringbimethods.txt | 29 + .../templatesuite/expected/stringliteral.txt | Bin 0 -> 1550 bytes .../test/templatesuite/expected/switch.txt | 80 + .../test/templatesuite/expected/transforms.txt | 68 + .../templatesuite/expected/type-builtins.txt | 33 + .../test/templatesuite/expected/var-layers.txt | 37 + .../test/templatesuite/expected/varargs.txt | 44 + .../test/templatesuite/expected/variables.txt | 62 + .../templatesuite/expected/whitespace-trim.txt | 60 + .../templatesuite/expected/wstrip-in-header.txt | 23 + .../test/templatesuite/expected/wstripping.txt | 39 + .../templatesuite/expected/xml-fragment.txt | 25 + .../expected/xml-ns_prefix-scope.txt | 29 + .../test/templatesuite/expected/xml.txt | 65 + .../test/templatesuite/expected/xmlns1.txt | 63 + .../test/templatesuite/expected/xmlns3.txt | 47 + .../test/templatesuite/expected/xmlns4.txt | 47 + .../test/templatesuite/expected/xmlns5.txt | 26 + .../models/BeansTestResources.properties | 19 + .../test/templatesuite/models/defaultxmlns1.xml | 24 + .../models/xml-ns_prefix-scope.xml | 26 + .../test/templatesuite/models/xml.xml | 31 + .../test/templatesuite/models/xmlfragment.xml | 19 + .../test/templatesuite/models/xmlns.xml | 32 + .../test/templatesuite/models/xmlns2.xml | 32 + .../test/templatesuite/models/xmlns3.xml | 32 + .../templatesuite/templates/api-builtins.ftl | 40 + .../test/templatesuite/templates/arithmetic.ftl | 50 + .../templatesuite/templates/assignments.ftl | 108 ++ .../templates/boolean-formatting.ftl | 82 + .../test/templatesuite/templates/boolean.ftl | 142 ++ .../templates/charset-in-header.ftl | 27 + .../templates/charset-in-header_inc1.ftl | 20 + .../templates/charset-in-header_inc2.ftl | 19 + .../test/templatesuite/templates/comment.ftl | 50 + .../templatesuite/templates/comparisons.ftl | 218 +++ .../test/templatesuite/templates/compress.ftl | 59 + .../templates/date-type-builtins.ftl | 47 + .../templates/dateformat-iso-bi.ftl | 163 ++ .../templates/dateformat-iso-like.ftl | 155 ++ .../templatesuite/templates/dateformat-java.ftl | 71 + .../templatesuite/templates/dateparsing.ftl | 84 + .../templates/default-object-wrapper.ftl | 59 + .../templatesuite/templates/default-xmlns.ftl | 28 + .../test/templatesuite/templates/default.ftl | 34 + .../templates/encoding-builtins.ftl | 52 + .../test/templatesuite/templates/escapes.ftl | 79 + .../test/templatesuite/templates/exception.ftl | 31 + .../test/templatesuite/templates/exception2.ftl | 31 + .../test/templatesuite/templates/exception3.ftl | 31 + .../templates/existence-operators.ftl | 141 ++ .../test/templatesuite/templates/hashconcat.ftl | 60 + .../templatesuite/templates/hashliteral.ftl | 100 ++ .../test/templatesuite/templates/helloworld.ftl | 30 + .../templates/identifier-escaping.ftl | 81 + .../templates/identifier-non-ascii.ftl | 21 + .../test/templatesuite/templates/if.ftl | 109 ++ .../test/templatesuite/templates/import.ftl | 45 + .../test/templatesuite/templates/import_lib.ftl | 31 + .../test/templatesuite/templates/include.ftl | 47 + .../templates/include2-included.ftl | 19 + .../test/templatesuite/templates/include2.ftl | 32 + .../test/templatesuite/templates/included.ftl | 30 + .../test/templatesuite/templates/interpret.ftl | 25 + .../test/templatesuite/templates/iterators.ftl | 71 + .../templatesuite/templates/lastcharacter.ftl | 31 + .../test/templatesuite/templates/list-bis.ftl | 48 + .../test/templatesuite/templates/list.ftl | 44 + .../test/templatesuite/templates/list2.ftl | 90 ++ .../test/templatesuite/templates/list3.ftl | 70 + .../test/templatesuite/templates/listhash.ftl | 70 + .../templatesuite/templates/listhashliteral.ftl | 35 + .../templatesuite/templates/listliteral.ftl | 84 + .../templatesuite/templates/localization.ftl | 32 + .../templatesuite/templates/localization_en.ftl | 32 + .../templates/localization_en_AU.ftl | 32 + .../test/templatesuite/templates/logging.ftl | 42 + .../templatesuite/templates/loopvariable.ftl | 49 + .../templatesuite/templates/macros-return.ftl | 34 + .../test/templatesuite/templates/macros.ftl | 101 ++ .../test/templatesuite/templates/macros2.ftl | 35 + .../templatesuite/templates/multimodels.ftl | 84 + .../test/templatesuite/templates/nested.ftl | 29 + .../templatesuite/templates/nestedinclude.ftl | 21 + .../templates/new-defaultresolver.ftl | 23 + .../test/templatesuite/templates/new-optin.ftl | 30 + .../test/templatesuite/templates/newlines1.ftl | 29 + .../test/templatesuite/templates/newlines2.ftl | 33 + .../test/templatesuite/templates/noparse.ftl | 62 + .../templatesuite/templates/number-format.ftl | 42 + .../templatesuite/templates/number-literal.ftl | 133 ++ .../templates/number-math-builtins.ftl | 78 + .../templatesuite/templates/number-to-date.ftl | 35 + .../templatesuite/templates/numerical-cast.ftl | 82 + .../templates/output-encoding1.ftl | 30 + .../templates/output-encoding2.ftl | 28 + .../templates/output-encoding3.ftl | 28 + .../templates/overloaded-methods.ftl | 411 +++++ .../test/templatesuite/templates/precedence.ftl | 61 + .../templatesuite/templates/range-common.ftl | 314 ++++ .../test/templatesuite/templates/range.ftl | 50 + .../test/templatesuite/templates/recover.ftl | 47 + .../test/templatesuite/templates/root.ftl | 47 + .../templates/sequence-builtins.ftl | 360 +++++ .../test/templatesuite/templates/setting.ftl | 53 + .../templates/simplehash-char-key.ftl | 44 + .../templatesuite/templates/specialvars.ftl | 38 + .../templates/string-builtin-coercion.ftl | 34 + .../string-builtins-regexps-matches.ftl | 118 ++ .../templates/string-builtins-regexps.ftl | 136 ++ .../templates/string-builtins1.ftl | 129 ++ .../templates/string-builtins2.ftl | 135 ++ .../templates/string-builtins3.ftl | 225 +++ .../templatesuite/templates/stringbimethods.ftl | 36 + .../templatesuite/templates/stringliteral.ftl | 69 + .../templates/subdir/include-subdir.ftl | 27 + .../templates/subdir/include-subdir2.ftl | 19 + .../templates/subdir/new-optin-2.ftl | 24 + .../templates/subdir/new-optin.ftl | 26 + .../templates/subdir/subsub/new-optin.ftl | 24 + .../templatesuite/templates/switch-builtin.ftl | 54 + .../test/templatesuite/templates/switch.ftl | 139 ++ .../templatesuite/templates/then-builtin.ftl | 53 + .../test/templatesuite/templates/transforms.ftl | 100 ++ .../templatesuite/templates/type-builtins.ftl | 44 + .../test/templatesuite/templates/undefined.ftl | 19 + .../test/templatesuite/templates/url.ftl | 24 + .../test/templatesuite/templates/var-layers.ftl | 39 + .../test/templatesuite/templates/varargs.ftl | 45 + .../test/templatesuite/templates/variables.ftl | 70 + .../templatesuite/templates/varlayers_lib.ftl | 28 + .../templatesuite/templates/whitespace-trim.ftl | 102 ++ .../templates/wsstripinheader_inc.ftl | 22 + .../templates/wstrip-in-header.ftl | 26 + .../templatesuite/templates/xml-fragment.ftl | 26 + .../templates/xml-ns_prefix-scope-lib.ftl | 23 + .../templates/xml-ns_prefix-scope-main.ftl | 36 + .../test/templatesuite/templates/xml.ftl | 47 + .../test/templatesuite/templates/xmlns1.ftl | 53 + .../test/templatesuite/templates/xmlns3.ftl | 70 + .../test/templatesuite/templates/xmlns4.ftl | 70 + .../test/templatesuite/templates/xmlns5.ftl | 28 + .../freemarker/test/templatesuite/testcases.xml | 211 +++ freemarker-core/src/test/README.txt | 7 + .../core/ASTBasedErrorMessagesTest.java | 74 - .../org/apache/freemarker/core/ASTPrinter.java | 438 ----- .../org/apache/freemarker/core/ASTTest.java | 103 -- .../core/ActualNamingConvetionTest.java | 66 - .../freemarker/core/ActualTagSyntaxTest.java | 68 - .../freemarker/core/BreakPlacementTest.java | 56 - .../apache/freemarker/core/CamelCaseTest.java | 486 ------ .../freemarker/core/CanonicalFormTest.java | 68 - .../freemarker/core/CoercionToTextualTest.java | 149 -- .../freemarker/core/ConfigurableTest.java | 176 -- .../freemarker/core/ConfigurationTest.java | 1486 ----------------- .../freemarker/core/CoreLocaleUtilsTest.java | 73 - .../freemarker/core/CustomAttributeTest.java | 163 -- .../apache/freemarker/core/DateFormatTest.java | 464 ------ .../freemarker/core/DirectiveCallPlaceTest.java | 249 --- .../freemarker/core/EncodingOverrideTest.java | 62 - .../EnvironmentGetTemplateVariantsTest.java | 214 --- .../apache/freemarker/core/ExceptionTest.java | 115 -- .../apache/freemarker/core/GetSourceTest.java | 52 - .../freemarker/core/HeaderParsingTest.java | 60 - .../IncludeAndImportConfigurableLayersTest.java | 354 ----- .../freemarker/core/IncludeAndImportTest.java | 270 ---- .../freemarker/core/IncudeFromNamelessTest.java | 58 - .../core/InterpretAndEvalTemplateNameTest.java | 70 - .../core/InterpretSettingInheritanceTest.java | 104 -- .../freemarker/core/IteratorIssuesTest.java | 64 - .../core/JavaCCExceptionAsEOFFixTest.java | 126 -- .../apache/freemarker/core/ListErrorsTest.java | 130 -- .../freemarker/core/MiscErrorMessagesTest.java | 48 - .../core/MistakenlyPublicImportAPIsTest.java | 104 -- .../core/MistakenlyPublicMacroAPIsTest.java | 88 - .../core/NewBiObjectWrapperRestrictionTest.java | 50 - .../core/ObjectBuilderSettingsTest.java | 1499 ------------------ .../core/OptInTemplateClassResolverTest.java | 230 --- .../freemarker/core/OutputFormatTest.java | 1068 ------------- .../ParseTimeParameterBIErrorMessagesTest.java | 46 - .../core/ParsingErrorMessagesTest.java | 116 -- .../core/RestrictedObjectWrapperTest.java | 72 - .../core/RestrictedObjetWrapperTest.java | 112 -- .../apache/freemarker/core/SQLTimeZoneTest.java | 371 ----- .../freemarker/core/SettingDirectiveTest.java | 40 - .../freemarker/core/SpecialVariableTest.java | 114 -- .../core/StringLiteralInterpolationTest.java | 135 -- .../org/apache/freemarker/core/TabSizeTest.java | 91 -- .../core/TagSyntaxVariationsTest.java | 186 --- .../core/TemplateConfigurationTest.java | 909 ----------- ...gurationWithDefaultTemplateResolverTest.java | 267 ---- .../core/TemplateConstructorsTest.java | 113 -- .../core/TemplateGetEncodingTest.java | 64 - .../core/TemplateLookupStrategyTest.java | 669 -------- .../core/TemplateNameSpecialVariablesTest.java | 159 -- .../core/TemplateNotFoundMessageTest.java | 207 --- .../core/TheadInterruptingSupportTest.java | 163 -- .../freemarker/core/TypeErrorMessagesTest.java | 105 -- .../freemarker/core/UnclosedCommentTest.java | 41 - .../org/apache/freemarker/core/VersionTest.java | 227 --- .../core/WhitespaceStrippingTest.java | 63 - .../freemarker/core/XHTMLOutputFormatTest.java | 59 - .../freemarker/core/XMLOutputFormatTest.java | 59 - .../impl/AbstractParallelIntrospectionTest.java | 126 -- .../model/impl/AlphabeticalMethodSorter.java | 45 - .../CommonSupertypeForUnwrappingHintTest.java | 129 -- .../model/impl/DefaultObjectWrapperDesc.java | 31 - .../model/impl/DefaultObjectWrapperInc.java | 31 - ...jectWrapperModelFactoryRegistrationTest.java | 63 - .../DefaultObjectWrapperSingletonsTest.java | 675 -------- .../model/impl/DefaultObjectWrapperTest.java | 901 ----------- .../core/model/impl/EnumModelsTest.java | 85 - .../core/model/impl/ErrorMessagesTest.java | 170 -- .../impl/FineTuneMethodAppearanceTest.java | 65 - .../GetlessMethodsAsPropertyGettersRule.java | 67 - .../core/model/impl/IsApplicableTest.java | 171 -- .../impl/IsMoreSpecificParameterTypeTest.java | 98 -- .../Java7MembersOnlyDefaultObjectWrapper.java | 101 -- .../impl/ManyObjectsOfDifferentClasses.java | 249 --- .../impl/ManyStaticsOfDifferentClasses.java | 236 --- .../model/impl/MiscNumericalOperationsTest.java | 111 -- .../model/impl/ModelAPINewInstanceTest.java | 134 -- .../core/model/impl/ModelCacheTest.java | 71 - .../model/impl/OverloadedNumberUtilTest.java | 585 ------- .../impl/ParameterListPreferabilityTest.java | 445 ------ .../impl/PrallelObjectIntrospectionTest.java | 43 - .../impl/PrallelStaticIntrospectionTest.java | 47 - .../core/model/impl/RationalNumber.java | 90 -- .../core/model/impl/StaticModelsTest.java | 91 -- .../core/model/impl/TypeFlagsTest.java | 671 -------- .../core/outputformat/_OutputFormatTestAPI.java | 35 - .../impl/CombinedMarkupOutputFormatTest.java | 194 --- .../outputformat/impl/HTMLOutputFormatTest.java | 187 --- .../outputformat/impl/RTFOutputFormatTest.java | 129 -- .../DefaultTemplateResolverTest.java | 365 ----- .../FileTemplateLoaderTest.java | 122 -- .../MultiTemplateLoaderTest.java | 99 -- .../TemplateConfigurationFactoryTest.java | 203 --- .../TemplateNameFormatTest.java | 330 ---- .../TemplateSourceMatcherTest.java | 188 --- .../AppMetaTemplateDateFormatFactory.java | 129 -- .../BaseNTemplateNumberFormatFactory.java | 128 -- .../core/userpkg/CustomHTMLOutputFormat.java | 72 - .../core/userpkg/CustomTemplateHTMLModel.java | 34 - .../core/userpkg/DummyOutputFormat.java | 65 - ...EpochMillisDivTemplateDateFormatFactory.java | 102 -- .../EpochMillisTemplateDateFormatFactory.java | 92 -- .../HTMLISOTemplateDateFormatFactory.java | 114 -- .../userpkg/HexTemplateNumberFormatFactory.java | 77 - ...AndTZSensitiveTemplateDateFormatFactory.java | 97 -- ...aleSensitiveTemplateNumberFormatFactory.java | 78 - .../core/userpkg/PackageVisibleAll.java | 26 - .../userpkg/PackageVisibleAllWithBuilder.java | 26 - .../PackageVisibleAllWithBuilderBuilder.java | 28 - .../PackageVisibleWithPublicConstructor.java | 27 - .../PrintfGTemplateNumberFormatFactory.java | 138 -- .../freemarker/core/userpkg/PublicAll.java | 24 - .../userpkg/PublicWithMixedConstructors.java | 38 - .../PublicWithPackageVisibleConstructor.java | 26 - .../core/userpkg/SeldomEscapedOutputFormat.java | 71 - .../core/userpkg/TemplateDummyOutputModel.java | 34 - .../TemplateSeldomEscapedOutputModel.java | 34 - .../freemarker/core/util/DateUtilTest.java | 1085 ------------- .../freemarker/core/util/FTLUtilTest.java | 117 -- .../freemarker/core/util/NumberUtilTest.java | 215 --- .../freemarker/core/util/StringUtilTest.java | 403 ----- .../core/valueformat/NumberFormatTest.java | 365 ----- .../impl/ExtendedDecimalFormatTest.java | 343 ---- .../apache/freemarker/dom/DOMSiblingTest.java | 99 -- .../freemarker/dom/DOMSimplifiersTest.java | 201 --- .../java/org/apache/freemarker/dom/DOMTest.java | 159 -- .../manualtest/AutoEscapingExample.java | 72 - .../ConfigureOutputFormatExamples.java | 105 -- .../manualtest/CustomFormatsExample.java | 84 - .../manualtest/GettingStartedExample.java | 69 - .../apache/freemarker/manualtest/Product.java | 49 - .../TemplateConfigurationExamples.java | 191 --- .../UnitAwareTemplateNumberFormatFactory.java | 80 - .../UnitAwareTemplateNumberModel.java | 43 - .../CopyrightCommentRemoverTemplateLoader.java | 104 -- .../test/MonitoredTemplateLoader.java | 325 ---- .../apache/freemarker/test/TemplateTest.java | 341 ---- .../test/TestConfigurationBuilder.java | 92 -- .../freemarker/test/hamcerst/Matchers.java | 34 - .../hamcerst/StringContainsIgnoringCase.java | 47 - .../org/apache/freemarker/test/package.html | 28 - .../test/templatesuite/TemplateTestCase.java | 515 ------ .../test/templatesuite/TemplateTestSuite.java | 298 ---- .../templatesuite/models/AllTemplateModels.java | 128 -- .../templatesuite/models/BeanTestClass.java | 93 -- .../templatesuite/models/BeanTestInterface.java | 25 - .../models/BeanTestSuperclass.java | 30 - .../models/BooleanAndScalarModel.java | 40 - .../models/BooleanAndStringTemplateModel.java | 38 - .../test/templatesuite/models/BooleanHash1.java | 58 - .../test/templatesuite/models/BooleanHash2.java | 50 - .../test/templatesuite/models/BooleanList1.java | 62 - .../test/templatesuite/models/BooleanList2.java | 53 - .../models/BooleanVsStringMethods.java | 40 - .../templatesuite/models/EnumTestClass.java | 34 - .../templatesuite/models/ExceptionModel.java | 39 - .../models/HashAndScalarModel.java | 84 - .../templatesuite/models/JavaObjectInfo.java | 35 - .../test/templatesuite/models/Listables.java | 185 --- .../test/templatesuite/models/MultiModel1.java | 116 -- .../test/templatesuite/models/MultiModel2.java | 63 - .../test/templatesuite/models/MultiModel3.java | 69 - .../test/templatesuite/models/MultiModel4.java | 77 - .../test/templatesuite/models/MultiModel5.java | 81 - .../test/templatesuite/models/NewTestModel.java | 52 - .../templatesuite/models/NewTestModel2.java | 52 - .../models/NumberAndStringModel.java | 47 - .../models/OverloadedConstructor.java | 46 - .../templatesuite/models/OverloadedMethods.java | 191 --- .../models/OverloadedMethods2.java | 1110 ------------- .../templatesuite/models/SimpleTestMethod.java | 49 - .../models/TransformHashWrapper.java | 79 - .../models/TransformMethodWrapper1.java | 49 - .../models/TransformMethodWrapper2.java | 64 - .../templatesuite/models/TransformModel1.java | 175 -- .../templatesuite/models/VarArgTestModel.java | 63 - .../freemarker/test/templatesuite/package.html | 42 - .../freemarker/test/util/AssertDirective.java | 73 - .../test/util/AssertEqualsDirective.java | 91 -- .../test/util/AssertFailsDirective.java | 152 -- .../AssertationFailedInTemplateException.java | 46 - .../test/util/BadParameterTypeException.java | 60 - .../freemarker/test/util/CoreTestUtil.java | 19 - .../test/util/EntirelyCustomObjectWrapper.java | 91 -- .../freemarker/test/util/FileTestCase.java | 217 --- .../util/MissingRequiredParameterException.java | 51 - .../freemarker/test/util/NoOutputDirective.java | 50 - .../test/util/ParameterException.java | 54 - .../SimpleMapAndCollectionObjectWrapper.java | 60 - .../util/UnsupportedParameterException.java | 50 - .../apache/freemarker/test/util/XMLLoader.java | 138 -- .../org/apache/freemarker/core/ast-1.ast | 187 --- .../org/apache/freemarker/core/ast-1.ftl | 29 - .../apache/freemarker/core/ast-assignments.ast | 172 -- .../apache/freemarker/core/ast-assignments.ftl | 29 - .../org/apache/freemarker/core/ast-builtins.ast | 59 - .../org/apache/freemarker/core/ast-builtins.ftl | 23 - .../apache/freemarker/core/ast-locations.ast | 155 -- .../apache/freemarker/core/ast-locations.ftl | 36 - .../core/ast-mixedcontentsimplifications.ast | 38 - .../core/ast-mixedcontentsimplifications.ftl | 26 - .../core/ast-multipleignoredchildren.ast | 30 - .../core/ast-multipleignoredchildren.ftl | 33 - .../core/ast-nestedignoredchildren.ast | 20 - .../core/ast-nestedignoredchildren.ftl | 19 - .../org/apache/freemarker/core/ast-range.ast | 281 ---- .../org/apache/freemarker/core/ast-range.ftl | 47 - .../freemarker/core/ast-strlitinterpolation.ast | 82 - .../freemarker/core/ast-strlitinterpolation.ftl | 25 - .../freemarker/core/ast-whitespacestripping.ast | 70 - .../freemarker/core/ast-whitespacestripping.ftl | 40 - .../apache/freemarker/core/cano-assignments.ftl | 35 - .../freemarker/core/cano-assignments.ftl.out | 34 - .../apache/freemarker/core/cano-builtins.ftl | 23 - .../freemarker/core/cano-builtins.ftl.out | 23 - .../core/cano-identifier-escaping.ftl | 76 - .../core/cano-identifier-escaping.ftl.out | 44 - .../org/apache/freemarker/core/cano-macros.ftl | 29 - .../apache/freemarker/core/cano-macros.ftl.out | 28 - .../core/cano-strlitinterpolation.ftl | 19 - .../core/cano-strlitinterpolation.ftl.out | 19 - .../core/encodingOverride-ISO-8859-1.ftl | 20 - .../freemarker/core/encodingOverride-UTF-8.ftl | 20 - .../freemarker/core/templateresolver/test.ftl | 19 - .../org/apache/freemarker/core/toCache1.ftl | 19 - .../org/apache/freemarker/core/toCache2.ftl | 19 - .../apache/freemarker/dom/DOMSiblingTest.xml | 31 - .../manualtest/AutoEscapingExample-capture.ftlh | 21 - .../AutoEscapingExample-capture.ftlh.out | 20 - .../manualtest/AutoEscapingExample-convert.ftlh | 27 - .../AutoEscapingExample-convert.ftlh.out | 25 - .../manualtest/AutoEscapingExample-convert2.ftl | 25 - .../AutoEscapingExample-convert2.ftl.out | 21 - .../manualtest/AutoEscapingExample-infoBox.ftlh | 26 - .../AutoEscapingExample-infoBox.ftlh.out | 25 - .../manualtest/AutoEscapingExample-markup.ftlh | 28 - .../AutoEscapingExample-markup.ftlh.out | 26 - .../AutoEscapingExample-stringConcat.ftlh | 19 - .../AutoEscapingExample-stringConcat.ftlh.out | 19 - .../AutoEscapingExample-stringLiteral.ftlh | 21 - .../AutoEscapingExample-stringLiteral.ftlh.out | 20 - .../AutoEscapingExample-stringLiteral2.ftlh | 25 - .../AutoEscapingExample-stringLiteral2.ftlh.out | 21 - .../ConfigureOutputFormatExamples1.properties | 21 - .../ConfigureOutputFormatExamples2.properties | 31 - .../manualtest/CustomFormatsExample-alias1.ftlh | 22 - .../CustomFormatsExample-alias1.ftlh.out | 22 - .../manualtest/CustomFormatsExample-alias2.ftlh | 19 - .../CustomFormatsExample-alias2.ftlh.out | 19 - .../CustomFormatsExample-modelAware.ftlh | 20 - .../CustomFormatsExample-modelAware.ftlh.out | 20 - .../TemplateConfigurationExamples1.properties | 25 - .../TemplateConfigurationExamples2.properties | 32 - .../TemplateConfigurationExamples3.properties | 47 - .../org/apache/freemarker/manualtest/test.ftlh | 28 - .../org/apache/freemarker/test/servlet/web.xml | 101 -- .../test/templatesuite/expected/arithmetic.txt | 46 - .../expected/boolean-formatting.txt | 31 - .../test/templatesuite/expected/boolean.txt | 102 -- .../expected/charset-in-header.txt | 26 - .../test/templatesuite/expected/comment.txt | 34 - .../test/templatesuite/expected/comparisons.txt | 93 -- .../test/templatesuite/expected/compress.txt | 40 - .../templatesuite/expected/dateformat-java.txt | 55 - .../expected/default-object-wrapper.txt | 55 - .../templatesuite/expected/default-xmlns.txt | 25 - .../test/templatesuite/expected/default.txt | 26 - .../expected/encoding-builtins.txt | 44 - .../test/templatesuite/expected/escapes.txt | 49 - .../test/templatesuite/expected/exception.txt | 43 - .../test/templatesuite/expected/exception2.txt | 47 - .../test/templatesuite/expected/exception3.txt | 21 - .../test/templatesuite/expected/exthash.txt | 76 - .../test/templatesuite/expected/hashconcat.txt | 138 -- .../test/templatesuite/expected/hashliteral.txt | 74 - .../test/templatesuite/expected/helloworld.txt | 31 - .../expected/identifier-escaping.txt | 57 - .../expected/identifier-non-ascii.txt | 19 - .../test/templatesuite/expected/if.txt | 104 -- .../test/templatesuite/expected/import.txt | 40 - .../test/templatesuite/expected/include.txt | 67 - .../test/templatesuite/expected/include2.txt | 28 - .../test/templatesuite/expected/interpret.txt | 23 - .../test/templatesuite/expected/iterators.txt | 84 - .../templatesuite/expected/lastcharacter.txt | 31 - .../test/templatesuite/expected/list-bis.txt | 51 - .../test/templatesuite/expected/list.txt | 51 - .../test/templatesuite/expected/list2.txt | 211 --- .../test/templatesuite/expected/list3.txt | 57 - .../test/templatesuite/expected/listhash.txt | 157 -- .../templatesuite/expected/listhashliteral.txt | 36 - .../test/templatesuite/expected/listliteral.txt | 75 - .../templatesuite/expected/localization.txt | 32 - .../test/templatesuite/expected/logging.txt | 27 - .../templatesuite/expected/loopvariable.txt | 54 - .../templatesuite/expected/macros-return.txt | 23 - .../test/templatesuite/expected/macros.txt | 67 - .../test/templatesuite/expected/macros2.txt | 22 - .../test/templatesuite/expected/multimodels.txt | 93 -- .../test/templatesuite/expected/nested.txt | 25 - .../expected/new-allowsnothing.txt | 19 - .../expected/new-defaultresolver.txt | 19 - .../test/templatesuite/expected/new-optin.txt | 32 - .../test/templatesuite/expected/newlines1.txt | 29 - .../test/templatesuite/expected/newlines2.txt | 30 - .../test/templatesuite/expected/noparse.txt | 54 - .../templatesuite/expected/number-format.txt | 33 - .../templatesuite/expected/number-literal.txt | 79 - .../templatesuite/expected/number-to-date.txt | 31 - .../templatesuite/expected/numerical-cast.txt | 462 ------ .../templatesuite/expected/output-encoding1.txt | 27 - .../templatesuite/expected/output-encoding2.txt | Bin 1972 -> 0 bytes .../templatesuite/expected/output-encoding3.txt | 26 - .../test/templatesuite/expected/precedence.txt | 48 - .../test/templatesuite/expected/recover.txt | 26 - .../test/templatesuite/expected/root.txt | 44 - .../expected/sequence-builtins.txt | 404 ----- .../test/templatesuite/expected/specialvars.txt | 25 - .../string-builtins-regexps-matches.txt | 99 -- .../expected/string-builtins-regexps.txt | 112 -- .../templatesuite/expected/string-builtins1.txt | 112 -- .../templatesuite/expected/string-builtins2.txt | 135 -- .../templatesuite/expected/stringbimethods.txt | 29 - .../templatesuite/expected/stringliteral.txt | Bin 1550 -> 0 bytes .../test/templatesuite/expected/switch.txt | 80 - .../test/templatesuite/expected/transforms.txt | 68 - .../templatesuite/expected/type-builtins.txt | 33 - .../test/templatesuite/expected/var-layers.txt | 37 - .../test/templatesuite/expected/varargs.txt | 44 - .../test/templatesuite/expected/variables.txt | 62 - .../templatesuite/expected/whitespace-trim.txt | 60 - .../templatesuite/expected/wstrip-in-header.txt | 23 - .../test/templatesuite/expected/wstripping.txt | 39 - .../templatesuite/expected/xml-fragment.txt | 25 - .../expected/xml-ns_prefix-scope.txt | 29 - .../test/templatesuite/expected/xml.txt | 65 - .../test/templatesuite/expected/xmlns1.txt | 63 - .../test/templatesuite/expected/xmlns3.txt | 47 - .../test/templatesuite/expected/xmlns4.txt | 47 - .../test/templatesuite/expected/xmlns5.txt | 26 - .../models/BeansTestResources.properties | 19 - .../test/templatesuite/models/defaultxmlns1.xml | 24 - .../models/xml-ns_prefix-scope.xml | 26 - .../test/templatesuite/models/xml.xml | 31 - .../test/templatesuite/models/xmlfragment.xml | 19 - .../test/templatesuite/models/xmlns.xml | 32 - .../test/templatesuite/models/xmlns2.xml | 32 - .../test/templatesuite/models/xmlns3.xml | 32 - .../templatesuite/templates/api-builtins.ftl | 40 - .../test/templatesuite/templates/arithmetic.ftl | 50 - .../templatesuite/templates/assignments.ftl | 108 -- .../templates/boolean-formatting.ftl | 82 - .../test/templatesuite/templates/boolean.ftl | 142 -- .../templates/charset-in-header.ftl | 27 - .../templates/charset-in-header_inc1.ftl | 20 - .../templates/charset-in-header_inc2.ftl | 19 - .../test/templatesuite/templates/comment.ftl | 50 - .../templatesuite/templates/comparisons.ftl | 218 --- .../test/templatesuite/templates/compress.ftl | 59 - .../templates/date-type-builtins.ftl | 47 - .../templates/dateformat-iso-bi.ftl | 163 -- .../templates/dateformat-iso-like.ftl | 155 -- .../templatesuite/templates/dateformat-java.ftl | 71 - .../templatesuite/templates/dateparsing.ftl | 84 - .../templates/default-object-wrapper.ftl | 59 - .../templatesuite/templates/default-xmlns.ftl | 28 - .../test/templatesuite/templates/default.ftl | 34 - .../templates/encoding-builtins.ftl | 52 - .../test/templatesuite/templates/escapes.ftl | 79 - .../test/templatesuite/templates/exception.ftl | 31 - .../test/templatesuite/templates/exception2.ftl | 31 - .../test/templatesuite/templates/exception3.ftl | 31 - .../templates/existence-operators.ftl | 141 -- .../test/templatesuite/templates/hashconcat.ftl | 60 - .../templatesuite/templates/hashliteral.ftl | 100 -- .../test/templatesuite/templates/helloworld.ftl | 30 - .../templates/identifier-escaping.ftl | 81 - .../templates/identifier-non-ascii.ftl | 21 - .../test/templatesuite/templates/if.ftl | 109 -- .../test/templatesuite/templates/import.ftl | 45 - .../test/templatesuite/templates/import_lib.ftl | 31 - .../test/templatesuite/templates/include.ftl | 47 - .../templates/include2-included.ftl | 19 - .../test/templatesuite/templates/include2.ftl | 32 - .../test/templatesuite/templates/included.ftl | 30 - .../test/templatesuite/templates/interpret.ftl | 25 - .../test/templatesuite/templates/iterators.ftl | 71 - .../templatesuite/templates/lastcharacter.ftl | 31 - .../test/templatesuite/templates/list-bis.ftl | 48 - .../test/templatesuite/templates/list.ftl | 44 - .../test/templatesuite/templates/list2.ftl | 90 -- .../test/templatesuite/templates/list3.ftl | 70 - .../test/templatesuite/templates/listhash.ftl | 70 - .../templatesuite/templates/listhashliteral.ftl | 35 - .../templatesuite/templates/listliteral.ftl | 84 - .../templatesuite/templates/localization.ftl | 32 - .../templatesuite/templates/localization_en.ftl | 32 - .../templates/localization_en_AU.ftl | 32 - .../test/templatesuite/templates/logging.ftl | 42 - .../templatesuite/templates/loopvariable.ftl | 49 - .../templatesuite/templates/macros-return.ftl | 34 - .../test/templatesuite/templates/macros.ftl | 101 -- .../test/templatesuite/templates/macros2.ftl | 35 - .../templatesuite/templates/multimodels.ftl | 84 - .../test/templatesuite/templates/nested.ftl | 29 - .../templatesuite/templates/nestedinclude.ftl | 21 - .../templates/new-defaultresolver.ftl | 23 - .../test/templatesuite/templates/new-optin.ftl | 30 - .../test/templatesuite/templates/newlines1.ftl | 29 - .../test/templatesuite/templates/newlines2.ftl | 33 - .../test/templatesuite/templates/noparse.ftl | 62 - .../templatesuite/templates/number-format.ftl | 42 - .../templatesuite/templates/number-literal.ftl | 133 -- .../templates/number-math-builtins.ftl | 78 - .../templatesuite/templates/number-to-date.ftl | 35 - .../templatesuite/templates/numerical-cast.ftl | 82 - .../templates/output-encoding1.ftl | 30 - .../templates/output-encoding2.ftl | 28 - .../templates/output-encoding3.ftl | 28 - .../templates/overloaded-methods.ftl | 411 ----- .../test/templatesuite/templates/precedence.ftl | 61 - .../templatesuite/templates/range-common.ftl | 314 ---- .../test/templatesuite/templates/range.ftl | 50 - .../test/templatesuite/templates/recover.ftl | 47 - .../test/templatesuite/templates/root.ftl | 47 - .../templates/sequence-builtins.ftl | 360 ----- .../test/templatesuite/templates/setting.ftl | 53 - .../templates/simplehash-char-key.ftl | 44 - .../templatesuite/templates/specialvars.ftl | 38 - .../templates/string-builtin-coercion.ftl | 34 - .../string-builtins-regexps-matches.ftl | 118 -- .../templates/string-builtins-regexps.ftl | 136 -- .../templates/string-builtins1.ftl | 129 -- .../templates/string-builtins2.ftl | 135 -- .../templates/string-builtins3.ftl | 225 --- .../templatesuite/templates/stringbimethods.ftl | 36 - .../templatesuite/templates/stringliteral.ftl | 69 - .../templates/subdir/include-subdir.ftl | 27 - .../templates/subdir/include-subdir2.ftl | 19 - .../templates/subdir/new-optin-2.ftl | 24 - .../templates/subdir/new-optin.ftl | 26 - .../templates/subdir/subsub/new-optin.ftl | 24 - .../templatesuite/templates/switch-builtin.ftl | 54 - .../test/templatesuite/templates/switch.ftl | 139 -- .../templatesuite/templates/then-builtin.ftl | 53 - .../test/templatesuite/templates/transforms.ftl | 100 -- .../templatesuite/templates/type-builtins.ftl | 44 - .../test/templatesuite/templates/undefined.ftl | 19 - .../test/templatesuite/templates/url.ftl | 24 - .../test/templatesuite/templates/var-layers.ftl | 39 - .../test/templatesuite/templates/varargs.ftl | 45 - .../test/templatesuite/templates/variables.ftl | 70 - .../templatesuite/templates/varlayers_lib.ftl | 28 - .../templatesuite/templates/whitespace-trim.ftl | 102 -- .../templates/wsstripinheader_inc.ftl | 22 - .../templates/wstrip-in-header.ftl | 26 - .../templatesuite/templates/xml-fragment.ftl | 26 - .../templates/xml-ns_prefix-scope-lib.ftl | 23 - .../templates/xml-ns_prefix-scope-main.ftl | 36 - .../test/templatesuite/templates/xml.ftl | 47 - .../test/templatesuite/templates/xmlns1.ftl | 53 - .../test/templatesuite/templates/xmlns3.ftl | 70 - .../test/templatesuite/templates/xmlns4.ftl | 70 - .../test/templatesuite/templates/xmlns5.ftl | 28 - .../freemarker/test/templatesuite/testcases.xml | 211 --- freemarker-test-utils/build.gradle | 2 + .../CopyrightCommentRemoverTemplateLoader.java | 105 ++ .../apache/freemarker/test/FileTestCase.java | 216 +++ .../test/MonitoredTemplateLoader.java | 325 ++++ .../freemarker/test/ResourcesExtractor.java | 14 +- .../apache/freemarker/test/TemplateTest.java | 340 ++++ .../test/TestConfigurationBuilder.java | 92 ++ .../org/apache/freemarker/test/TestUtil.java | 85 +- .../org/apache/freemarker/test/XMLLoader.java | 138 ++ .../apache/freemarker/test/_TStringUtil.java | 65 - .../freemarker/test/hamcerst/Matchers.java | 34 + .../hamcerst/StringContainsIgnoringCase.java | 47 + .../test/templateutil/AssertDirective.java | 73 + .../templateutil/AssertEqualsDirective.java | 91 ++ .../test/templateutil/AssertFailsDirective.java | 152 ++ .../AssertationFailedInTemplateException.java | 46 + .../templateutil/BadParameterTypeException.java | 60 + .../MissingRequiredParameterException.java | 51 + .../test/templateutil/NoOutputDirective.java | 50 + .../test/templateutil/ParameterException.java | 54 + .../UnsupportedParameterException.java | 50 + settings.gradle | 3 +- 962 files changed, 48802 insertions(+), 48913 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core-java8-test/build.gradle ---------------------------------------------------------------------- diff --git a/freemarker-core-java8-test/build.gradle b/freemarker-core-java8-test/build.gradle deleted file mode 100644 index ad08d33..0000000 --- a/freemarker-core-java8-test/build.gradle +++ /dev/null @@ -1,19 +0,0 @@ -// Override inherited default Java version: -sourceCompatibility = "1.8" -targetCompatibility = "1.8" -[compileJava, compileTestJava]*.options*.bootClasspath = bootClasspathJava8 - -dependencies { - compile project(":freemarker-core") -} - -// We have nothing to put into the jar, as we have test classes only -jar.enabled = false - -javadoc.enabled = false - -// Must not be deployed to a public Maven repository -uploadArchives.enabled = false - -// Doesn't make sense to Maven "install" this, as the artifact won't contain test classes -install.enabled = false http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core-java8-test/src/main/resources/META-INF/DISCLAIMER ---------------------------------------------------------------------- diff --git a/freemarker-core-java8-test/src/main/resources/META-INF/DISCLAIMER b/freemarker-core-java8-test/src/main/resources/META-INF/DISCLAIMER deleted file mode 100644 index 569ba05..0000000 --- a/freemarker-core-java8-test/src/main/resources/META-INF/DISCLAIMER +++ /dev/null @@ -1,8 +0,0 @@ -Apache FreeMarker is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of -all newly accepted projects until a further review indicates that the -infrastructure, communications, and decision making process have stabilized in -a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the -ASF. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core-java8-test/src/main/resources/META-INF/LICENSE ---------------------------------------------------------------------- diff --git a/freemarker-core-java8-test/src/main/resources/META-INF/LICENSE b/freemarker-core-java8-test/src/main/resources/META-INF/LICENSE deleted file mode 100644 index d645695..0000000 --- a/freemarker-core-java8-test/src/main/resources/META-INF/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/BridgeMethodsBean.java ---------------------------------------------------------------------- diff --git a/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/BridgeMethodsBean.java b/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/BridgeMethodsBean.java deleted file mode 100644 index 2c9d4e9..0000000 --- a/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/BridgeMethodsBean.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.freemarker.core.model.impl; - -public class BridgeMethodsBean extends BridgeMethodsBeanBase<String> { - - static final String M1_RETURN_VALUE = "m1ReturnValue"; - - @Override - public String m1() { - return M1_RETURN_VALUE; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/BridgeMethodsBeanBase.java ---------------------------------------------------------------------- diff --git a/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/BridgeMethodsBeanBase.java b/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/BridgeMethodsBeanBase.java deleted file mode 100644 index 4ecec7c..0000000 --- a/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/BridgeMethodsBeanBase.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.freemarker.core.model.impl; - -public abstract class BridgeMethodsBeanBase<T> { - - public abstract T m1(); - - public T m2() { - return null; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean.java ---------------------------------------------------------------------- diff --git a/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean.java b/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean.java deleted file mode 100644 index c7d27a6..0000000 --- a/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.freemarker.core.model.impl; - -public class Java8BridgeMethodsWithDefaultMethodBean implements Java8BridgeMethodsWithDefaultMethodBeanBase<String> { - - static final String M1_RETURN_VALUE = "m1ReturnValue"; - - public String m1() { - return M1_RETURN_VALUE; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean2.java ---------------------------------------------------------------------- diff --git a/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean2.java b/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean2.java deleted file mode 100644 index 7dfb39a..0000000 --- a/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean2.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.freemarker.core.model.impl; - -public class Java8BridgeMethodsWithDefaultMethodBean2 implements Java8BridgeMethodsWithDefaultMethodBeanBase2 { - // All inherited -} http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase.java ---------------------------------------------------------------------- diff --git a/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase.java b/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase.java deleted file mode 100644 index fdd8821..0000000 --- a/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.freemarker.core.model.impl; - -public interface Java8BridgeMethodsWithDefaultMethodBeanBase<T> { - - default T m1() { - return null; - } - - default T m2() { - return null; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase2.java ---------------------------------------------------------------------- diff --git a/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase2.java b/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase2.java deleted file mode 100644 index 6f68dc7..0000000 --- a/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase2.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.freemarker.core.model.impl; - -public interface Java8BridgeMethodsWithDefaultMethodBeanBase2 extends Java8BridgeMethodsWithDefaultMethodBeanBase<String> { - - @Override - default String m1() { - return Java8BridgeMethodsWithDefaultMethodBean.M1_RETURN_VALUE; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultMethodsBean.java ---------------------------------------------------------------------- diff --git a/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultMethodsBean.java b/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultMethodsBean.java deleted file mode 100644 index eabc3d0..0000000 --- a/freemarker-core-java8-test/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultMethodsBean.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.freemarker.core.model.impl; - -public class Java8DefaultMethodsBean implements Java8DefaultMethodsBeanBase { - - static final String NORMAL_PROP = "normalProp"; - static final String NORMAL_PROP_VALUE = "normalPropValue"; - static final String PROP_2_OVERRIDE_VALUE = "prop2OverrideValue"; - static final int NOT_AN_INDEXED_PROP_VALUE = 1; - static final String ARRAY_PROP_2_VALUE_0 = "arrayProp2[0].value"; - private static final int NOT_AN_INDEXED_PROP_3_VALUE = 3; - private static final String NOT_AN_INDEXED_PROP_2_VALUE = "notAnIndecedProp2Value"; - static final String INDEXED_PROP_4 = "indexedProp4"; - static final String INDEXED_PROP_GETTER_4 = "getIndexedProp4"; - static final String INDEXED_PROP_4_VALUE = "indexedProp4Value[0]"; - static final String NORMAL_ACTION = "normalAction"; - static final String NORMAL_ACTION_RETURN_VALUE = "normalActionReturnValue"; - static final String OVERRIDDEN_DEFAULT_METHOD_ACTION_RETURN_VALUE = "overriddenValue"; - - public String getNormalProp() { - return NORMAL_PROP_VALUE; - } - - @Override - public String getDefaultMethodProp2() { - return PROP_2_OVERRIDE_VALUE; - } - - public String[] getDefaultMethodIndexedProp2() { - return new String[] { ARRAY_PROP_2_VALUE_0 }; - } - - /** - * There's a matching non-indexed reader method in the base class, but as this is indexed, it takes over. - */ - public String getDefaultMethodIndexedProp3(int index) { - return ""; - } - - public int getDefaultMethodNotAnIndexedProp() { - return NOT_AN_INDEXED_PROP_VALUE; - } - - /** Actually, this will be indexed if the default method support is off. */ - public String getDefaultMethodNotAnIndexedProp2(int index) { - return NOT_AN_INDEXED_PROP_2_VALUE; - } - - /** Actually, this will be indexed if the default method support is off. */ - public int getDefaultMethodNotAnIndexedProp3(int index) { - return NOT_AN_INDEXED_PROP_3_VALUE; - } - - public String getIndexedProp4(int index) { - return INDEXED_PROP_4_VALUE; - } - - public String normalAction() { - return NORMAL_ACTION_RETURN_VALUE; - } - - @Override - public String overriddenDefaultMethodAction() { - return OVERRIDDEN_DEFAULT_METHOD_ACTION_RETURN_VALUE; - } - -}
