This is an automated email from the ASF dual-hosted git repository. ddekany pushed a commit to branch 2.3-gae in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit a504e6e42e922de483adb0048ef2a31508000b6b Author: ddekany <[email protected]> AuthorDate: Tue Dec 31 00:56:21 2019 +0100 Fixed withArgs Manual tests --- ...thArgsExamples-usingWithArgsSpecialVariable.ftl | 18 ++++++++ ...gsExamples-usingWithArgsSpecialVariable.ftl.out | 18 ++++++++ .../freemarker/manual/WithArgsLastExamples.ftl | 18 ++++++++ .../freemarker/manual/WithArgsLastExamples.ftl.out | 49 ++++++++++++++++++++++ 4 files changed, 103 insertions(+) diff --git a/src/test/resources/freemarker/manual/WithArgsExamples-usingWithArgsSpecialVariable.ftl b/src/test/resources/freemarker/manual/WithArgsExamples-usingWithArgsSpecialVariable.ftl index 9819fa0..583b444 100644 --- a/src/test/resources/freemarker/manual/WithArgsExamples-usingWithArgsSpecialVariable.ftl +++ b/src/test/resources/freemarker/manual/WithArgsExamples-usingWithArgsSpecialVariable.ftl @@ -1,3 +1,21 @@ +<#-- + 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. +--> <#macro m1 a b c> m1 does things with ${a}, ${b}, ${c} </#macro> diff --git a/src/test/resources/freemarker/manual/WithArgsExamples-usingWithArgsSpecialVariable.ftl.out b/src/test/resources/freemarker/manual/WithArgsExamples-usingWithArgsSpecialVariable.ftl.out index 54488c3..aa3a8ab 100644 --- a/src/test/resources/freemarker/manual/WithArgsExamples-usingWithArgsSpecialVariable.ftl.out +++ b/src/test/resources/freemarker/manual/WithArgsExamples-usingWithArgsSpecialVariable.ftl.out @@ -1,3 +1,21 @@ +/* + * 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. + */ m2 does things with 1, 2, 3 Delegate to m1: diff --git a/src/test/resources/freemarker/manual/WithArgsLastExamples.ftl b/src/test/resources/freemarker/manual/WithArgsLastExamples.ftl index 4494b13..9cea85f 100644 --- a/src/test/resources/freemarker/manual/WithArgsLastExamples.ftl +++ b/src/test/resources/freemarker/manual/WithArgsLastExamples.ftl @@ -1,3 +1,21 @@ +<#-- + 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. +--> <#function f a b c d> <#return "a=${a}, b=${b}, c=${c}, d=${d}"> </#function> diff --git a/src/test/resources/freemarker/manual/WithArgsLastExamples.ftl.out b/src/test/resources/freemarker/manual/WithArgsLastExamples.ftl.out new file mode 100644 index 0000000..c9d17b6 --- /dev/null +++ b/src/test/resources/freemarker/manual/WithArgsLastExamples.ftl.out @@ -0,0 +1,49 @@ +/* + * 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. + */ + +a=2, b=3, c=1, d=2 +a=1, b=2, c=2, d=3 + + a=1 + b=2 + others: + e = 5 + f = 6 + c = 3 + d = 4 + a=1 + b=2 + others: + c = 3 + d = 4 + e = 5 + f = 6 + + a = 1 + b = 2 + e = 5 + f = 6 + c = 3 + d = 4 + a = 1 + b = 2 + c = 3 + d = 4 + e = 5 + f = 6
